Imported Upstream version 3.1.6-dfsgupstream/3.1.6-dfsg

177 files changed, 11812 insertions, 7113 deletions

diff --git a/Config.kmk b/Config.kmk
index 8297af151..d68d0cbc8 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -7,7 +7,7 @@
 #
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2010 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -154,7 +154,7 @@ VBOX_VERSION_MINOR = 1
 # This is the current build number. It should be increased every time we publish a
 # new build. The define is available in every source file. Only even build numbers
 # will be published, odd numbers are set during development.
-VBOX_VERSION_BUILD = 4
+VBOX_VERSION_BUILD = 6
 # Full version string (may include more than just x.y.z, but no spaces or other problematic chars).
 VBOX_VERSION_STRING = $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
 # Force the additions.sh script to get an exact additions build when we're doing the release.
@@ -410,7 +410,9 @@ ifdef VBOX_WITH_DBUS
 endif
 # Use the new VBI module on Solaris.
 #VBOX_WITH_SOLARIS_VBI = 1
-# Enable 64 bits guest pointers.
+# Enable the tradition raw-mode virtualization.
+VBOX_WITH_RAW_MODE = 1
+# Enable 64 bits guests
 VBOX_WITH_64_BITS_GUESTS = 1
 # Enable multi-core VCPUs.
 VBOX_WITH_MULTI_CORE = 1
@@ -601,9 +603,9 @@ ifeq ($(KBUILD_TARGET),darwin)
  # Later:
  VBOX_WITH_VRDP_AUTHMOD=
  VBOX_WITH_VRDP_RDESKTOP=
+ # Permanent (no working SDL).
+ VBOX_WITH_VBOXSDL=
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-  # Permanent (no working SDL).
-  VBOX_WITH_VBOXSDL=
   VBOX_WITH_VBOXBFE=
  endif
 endif
@@ -724,6 +726,9 @@ ifdef VBOX_OSE
   # Only the Linux, Solaris installers are public
   VBOX_WITH_INSTALLER=
  endif
+ if1of ($(KBUILD_TARGET), solaris)
+  VBOX_WITH_NEW_USB_CODE_ON_SOLARIS=
+ endif
  VBOX_WITH_HPET=
  VBOX_WITH_LPC=
  VBOX_WITH_SMC=
@@ -2069,126 +2074,128 @@ ifeq ($(KBUILD_TARGET),solaris)
  endif
 endif
 
-#
-# Template for building GC things.
-#
-TEMPLATE_VBOXGC = VBox GC
-TEMPLATE_VBOXGC_ASTOOL              = $(VBOX_ASTOOL)
-TEMPLATE_VBOXGC_ASFLAGS             = $(VBOX_ASFLAGS32)
-TEMPLATE_VBOXGC_DEFS                = IN_RC IPRT_NO_CRT RT_WITH_NOCRT_ALIASES $(ARCH_BITS_DEFS)
-TEMPLATE_VBOXGC_INCS                = $(PATH_ROOT)/include/iprt/nocrt
-TEMPLATE_VBOXGC_SYSSUFF             = .gc
-TEMPLATE_VBOXGC_BLD_TRG_ARCH        = x86
-
-ifeq ($(VBOX_LDR_FMT32),pe)
- ifdef VBOX_USE_VCC80
-  TEMPLATE_VBOXGC_TOOL              = VCC80X86
-  TEMPLATE_VBOXGC_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 -GS- -wd4996 -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP)
- else
-  TEMPLATE_VBOXGC_TOOL              = VCC70
-  TEMPLATE_VBOXGC_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP)
- endif
- TEMPLATE_VBOXGC_CFLAGS             = $(TEMPLATE_VBOXGC_CXXFLAGS)
- TEMPLATE_VBOXGC_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Lines -MapInfo:Exports -NoD
- ifndef VBOX_NOINC_MISC
-  include $(KBUILD_PATH)/sdks/W2K3DDKX86.kmk
- endif
- TEMPLATE_VBOXGC_LIBS               = \
- 	$(PATH_SDK_W2K3DDKX86_LIB)/int64.lib
-endif # pe
-
-ifeq ($(VBOX_LDR_FMT32),elf)
-TEMPLATE_VBOXGC_TOOL                = $(VBOX_GCC32_TOOL)
-TEMPLATE_VBOXGC_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
-TEMPLATE_VBOXGC_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
- ifeq ($(KBUILD_TARGET),solaris)
-  TEMPLATE_VBOXGC_LDFLAGS           = -r
- else
-  TEMPLATE_VBOXGC_LDFLAGS           = -nostdlib -Bsymbolic
-  # "temporarily", must fix the loader.
-  TEMPLATE_VBOXGC_LDFLAGS          += $(if $(VBOX_DO_STRIP_MODULES),-S,)
-  TEMPLATE_VBOXGC_LDFLAGS.release   = $(if $(VBOX_DO_STRIP_MODULES),-S,)
- endif
- ifn1of ($(KBUILD_TARGET), solaris freebsd)
+ifdef VBOX_WITH_RAW_MODE
+ #
+ # Template for building RC things.
+ #
+ TEMPLATE_VBOXGC = VBox Raw-Mode Context
+ TEMPLATE_VBOXGC_ASTOOL              = $(VBOX_ASTOOL)
+ TEMPLATE_VBOXGC_ASFLAGS             = $(VBOX_ASFLAGS32)
+ TEMPLATE_VBOXGC_DEFS                = IN_RC IPRT_NO_CRT RT_WITH_NOCRT_ALIASES $(ARCH_BITS_DEFS)
+ TEMPLATE_VBOXGC_INCS                = $(PATH_ROOT)/include/iprt/nocrt
+ TEMPLATE_VBOXGC_SYSSUFF             = .gc
+ TEMPLATE_VBOXGC_BLD_TRG_ARCH        = x86
+
+ ifeq ($(VBOX_LDR_FMT32),pe)
+  ifdef VBOX_USE_VCC80
+   TEMPLATE_VBOXGC_TOOL              = VCC80X86
+   TEMPLATE_VBOXGC_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 -GS- -wd4996 -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP)
+  else
+   TEMPLATE_VBOXGC_TOOL              = VCC70
+   TEMPLATE_VBOXGC_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP)
+  endif
+  TEMPLATE_VBOXGC_CFLAGS             = $(TEMPLATE_VBOXGC_CXXFLAGS)
+  TEMPLATE_VBOXGC_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Lines -MapInfo:Exports -NoD
+  ifndef VBOX_NOINC_MISC
+   include $(KBUILD_PATH)/sdks/W2K3DDKX86.kmk
+  endif
   TEMPLATE_VBOXGC_LIBS               = \
+ 	$(PATH_SDK_W2K3DDKX86_LIB)/int64.lib
+ endif # pe
+
+ ifeq ($(VBOX_LDR_FMT32),elf)
+ TEMPLATE_VBOXGC_TOOL                = $(VBOX_GCC32_TOOL)
+ TEMPLATE_VBOXGC_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
+ TEMPLATE_VBOXGC_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
+  ifeq ($(KBUILD_TARGET),solaris)
+   TEMPLATE_VBOXGC_LDFLAGS           = -r
+  else
+   TEMPLATE_VBOXGC_LDFLAGS           = -nostdlib -Bsymbolic
+   # "temporarily", must fix the loader.
+   TEMPLATE_VBOXGC_LDFLAGS          += $(if $(VBOX_DO_STRIP_MODULES),-S,)
+   TEMPLATE_VBOXGC_LDFLAGS.release   = $(if $(VBOX_DO_STRIP_MODULES),-S,)
+  endif
+  ifn1of ($(KBUILD_TARGET), solaris freebsd)
+   TEMPLATE_VBOXGC_LIBS               = \
   	$(VBOX_GCC32_LIBGCC) # instricts
+  endif
  endif
-endif
 
-ifeq ($(VBOX_LDR_FMT32),macho)
-TEMPLATE_VBOXGC_TOOL                = GXX4MACHO
-TEMPLATE_VBOXGC_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
-TEMPLATE_VBOXGC_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti
-TEMPLATE_VBOXGC_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -m32 -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing
-TEMPLATE_VBOXGC_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)  -m32 -nostdlib
-#TEMPLATE_VBOXGC_LDFLAGS.release     = -Wl,-S ???
-endif
+ ifeq ($(VBOX_LDR_FMT32),macho)
+ TEMPLATE_VBOXGC_TOOL                = GXX4MACHO
+ TEMPLATE_VBOXGC_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
+ TEMPLATE_VBOXGC_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti
+ TEMPLATE_VBOXGC_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -m32 -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing
+ TEMPLATE_VBOXGC_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)  -m32 -nostdlib
+ #TEMPLATE_VBOXGC_LDFLAGS.release     = -Wl,-S ???
+ endif
 
-ifeq ($(VBOX_LDR_FMT32),lx)
-TEMPLATE_VBOXGC_TOOL                = GXX3OMF
-TEMPLATE_VBOXGC_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti
-TEMPLATE_VBOXGC_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions
-TEMPLATE_VBOXGC_LDFLAGS             = -Zdll -nostdlib
-TEMPLATE_VBOXGC_LIBS                = \
+ ifeq ($(VBOX_LDR_FMT32),lx)
+ TEMPLATE_VBOXGC_TOOL                = GXX3OMF
+ TEMPLATE_VBOXGC_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti
+ TEMPLATE_VBOXGC_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions
+ TEMPLATE_VBOXGC_LDFLAGS             = -Zdll -nostdlib
+ TEMPLATE_VBOXGC_LIBS                = \
 	$(VBOX_GCC32_LIBGCC) \
 	$(VBOX_OBJ_SYS0) \
 	end
-endif
-
+ endif
 
-#
-# Template for building a GC ring-3 testcase (tstVMStructGC, tstDevStructGC).
-#
-TEMPLATE_VBOXGCEXE = VBox GC as ring-3 testcase
-TEMPLATE_VBOXGCEXE_EXTENDS = VBOXGC
-TEMPLATE_VBOXGCEXE_DEFS = $(filter-out IPRT_NO_CRT RT_WITH_NOCRT_ALIASES,$(TEMPLATE_VBOXGC_DEFS))
-TEMPLATE_VBOXGCEXE_INCS = $(NO_SUCH_VARIABLE)
 
-ifeq ($(VBOX_LDR_FMT32),pe)
- TEMPLATE_VBOXGCEXE_LDFLAGS = -Incremental:NO -MapInfo:Exports -NoD -Debug
- TEMPLATE_VBOXGCEXE_SDKS    = WIN32SDK
- ifdef VBOX_USE_VCC80
-  TEMPLATE_VBOXGCEXE_LIBS   = \
+ #
+ # Template for building a RC ring-3 testcase (tstVMStructGC, tstDevStructGC).
+ #
+ TEMPLATE_VBOXGCEXE = VBox Raw-Mode as ring-3 testcase
+ TEMPLATE_VBOXGCEXE_EXTENDS = VBOXGC
+ TEMPLATE_VBOXGCEXE_DEFS = $(filter-out IPRT_NO_CRT RT_WITH_NOCRT_ALIASES,$(TEMPLATE_VBOXGC_DEFS))
+ TEMPLATE_VBOXGCEXE_INCS = $(NO_SUCH_VARIABLE)
+
+ ifeq ($(VBOX_LDR_FMT32),pe)
+  TEMPLATE_VBOXGCEXE_LDFLAGS = -Incremental:NO -MapInfo:Exports -NoD -Debug
+  TEMPLATE_VBOXGCEXE_SDKS    = WIN32SDK
+  ifdef VBOX_USE_VCC80
+   TEMPLATE_VBOXGCEXE_LIBS   = \
 	$(PATH_TOOL_VCC80X86_LIB)/libcmt.lib \
 	$(PATH_TOOL_VCC80X86_LIB)/oldnames.lib
- else
-  TEMPLATE_VBOXGCEXE_LIBS   = \
+  else
+   TEMPLATE_VBOXGCEXE_LIBS   = \
 	$(PATH_TOOL_VCC70_LIB)/libcmt.lib \
 	$(PATH_TOOL_VCC70_LIB)/oldnames.lib
+  endif
  endif
-endif
 
-ifeq ($(VBOX_LDR_FMT32),elf)
- TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
- TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
- TEMPLATE_VBOXGCEXE_LDFLAGS  = -g
- TEMPLATE_VBOXGCEXE_LDFLAGS.dbgopt = -g
- TEMPLATE_VBOXGCEXE_LDFLAGS.strict = -g
- TEMPLATE_VBOXGCEXE_LDFLAGS.release = -g
- if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), freebsd.amd64)
-  # The FreeBSD port of gcc isn't picking up -m32 where it should. the .o order below isn't
-  # quite right (target source comes first), if it stops working we'll have to write a linker tool.
-  TEMPLATE_VBOXGCEXE_DEFS.$(KBUILD_TARGET)    = $(TEMPLATE_VBOXGC_DEFS.$(KBUILD_TARGET))    IPRT_DONT_USE_SYSTEM_STDINT_H
-  TEMPLATE_VBOXGCEXE_LDFLAGS.$(KBUILD_TARGET) = $(TEMPLATE_VBOXGC_LDFLAGS.$(KBUILD_TARGET)) -nostdlib -v
-  TEMPLATE_VBOXGCEXE_SOURCES.$(KBUILD_TARGET) = /usr/lib32/crtend.o /usr/lib32/crtn.o
-  TEMPLATE_VBOXGCEXE_SOURCES                  =	/usr/lib32/crt1.o /usr/lib32/crti.o /usr/lib32/crtbegin.o
-  TEMPLATE_VBOXGCEXE_LIBPATH.$(KBUILD_TARGET) = /usr/lib32
-  TEMPLATE_VBOXGCEXE_LIBS.$(KBUILD_TARGET)    = /usr/lib32/libc.so
+ ifeq ($(VBOX_LDR_FMT32),elf)
+  TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
+  TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
+  TEMPLATE_VBOXGCEXE_LDFLAGS  = -g
+  TEMPLATE_VBOXGCEXE_LDFLAGS.dbgopt = -g
+  TEMPLATE_VBOXGCEXE_LDFLAGS.strict = -g
+  TEMPLATE_VBOXGCEXE_LDFLAGS.release = -g
+  if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), freebsd.amd64)
+   # The FreeBSD port of gcc isn't picking up -m32 where it should. the .o order below isn't
+   # quite right (target source comes first), if it stops working we'll have to write a linker tool.
+   TEMPLATE_VBOXGCEXE_DEFS.$(KBUILD_TARGET)    = $(TEMPLATE_VBOXGC_DEFS.$(KBUILD_TARGET))    IPRT_DONT_USE_SYSTEM_STDINT_H
+   TEMPLATE_VBOXGCEXE_LDFLAGS.$(KBUILD_TARGET) = $(TEMPLATE_VBOXGC_LDFLAGS.$(KBUILD_TARGET)) -nostdlib -v
+   TEMPLATE_VBOXGCEXE_SOURCES.$(KBUILD_TARGET) = /usr/lib32/crtend.o /usr/lib32/crtn.o
+   TEMPLATE_VBOXGCEXE_SOURCES                  =	/usr/lib32/crt1.o /usr/lib32/crti.o /usr/lib32/crtbegin.o
+   TEMPLATE_VBOXGCEXE_LIBPATH.$(KBUILD_TARGET) = /usr/lib32
+   TEMPLATE_VBOXGCEXE_LIBS.$(KBUILD_TARGET)    = /usr/lib32/libc.so
+  endif
  endif
-endif
 
-ifeq ($(VBOX_LDR_FMT32),macho)
- TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -static -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
- TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -static -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
- TEMPLATE_VBOXGCEXE_LDFLAGS  = -g -m32
-endif
+ ifeq ($(VBOX_LDR_FMT32),macho)
+  TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -static -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
+  TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -static -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
+  TEMPLATE_VBOXGCEXE_LDFLAGS  = -g -m32
+ endif
 
-ifeq ($(VBOX_LDR_FMT32),lx)
- TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
- TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
- TEMPLATE_VBOXGCEXE_LDFLAGS  = -g
- TEMPLATE_VBOXGCEXE_LIBS     = $(NO_SUCH_VARIABLE)
-endif
+ ifeq ($(VBOX_LDR_FMT32),lx)
+  TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
+  TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
+  TEMPLATE_VBOXGCEXE_LDFLAGS  = -g
+  TEMPLATE_VBOXGCEXE_LIBS     = $(NO_SUCH_VARIABLE)
+ endif
+endif # VBOX_WITH_RAW_MODE
 
 
 #
@@ -2975,7 +2982,7 @@ TEMPLATE_VBOXMAINEXE_LIBPATH            += \
 else ifeq ($(KBUILD_TARGET),solaris)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
 TEMPLATE_VBOXMAINEXE_DEFS               += _REENTRANT
-TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) rt
+TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) rt thread
  else
 $(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!)
 TEMPLATE_VBOXMAINEXE_LIBS                =
@@ -3921,7 +3928,7 @@ endif
 SVN                    ?= svn$(HOSTSUFF_EXE)
 VBOX_SVN_REV_KMK        = $(PATH_OUT)/revision.kmk
 ifndef VBOX_SVN_REV
- VBOX_SVN_REV_FALLBACK := $(patsubst %:,,  $Rev: 57640 $  )
+ VBOX_SVN_REV_FALLBACK := $(patsubst %:,,  $Rev: 59338 $  )
  VBOX_SVN_DEP          := $(wildcard $(PATH_ROOT)/.svn/entries)
  ifeq ($(which $(SVN)),)
   VBOX_SVN_DEP         :=
diff --git a/include/VBox/VBoxHDD.h b/include/VBox/VBoxHDD.h
index 13f5b2e8f..6622f9be7 100644
--- a/include/VBox/VBoxHDD.h
+++ b/include/VBox/VBoxHDD.h
@@ -33,6 +33,7 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
 #include <iprt/mem.h>
+#include <iprt/net.h>
 #include <VBox/cdefs.h>
 #include <VBox/types.h>
 #include <VBox/err.h>
@@ -1010,6 +1011,24 @@ ion.
      */
     DECLR3CALLBACKMEMBER(int, pfnFlush, (RTSOCKET Sock));
 
+    /**
+     * Gets the address of the local side.
+     *
+     * @return  iprt status code.
+     * @param   Sock        Socket descriptor.
+     * @param   pAddr       Where to store the local address on success.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnGetLocalAddress, (RTSOCKET Sock, PRTNETADDR pAddr));
+
+    /**
+     * Gets the address of the other party.
+     *
+     * @return  iprt status code.
+     * @param   Sock        Socket descriptor.
+     * @param   pAddr       Where to store the peer address on success.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnGetPeerAddress, (RTSOCKET Sock, PRTNETADDR pAddr));
+
 } VDINTERFACETCPNET, *PVDINTERFACETCPNET;
 
 /**
diff --git a/include/VBox/com/EventQueue.h b/include/VBox/com/EventQueue.h
index d90343495..99c4499b0 100644
--- a/include/VBox/com/EventQueue.h
+++ b/include/VBox/com/EventQueue.h
@@ -81,7 +81,7 @@ protected:
  *  XPCOM/IPC events while waiting for its own (Event) events.
  *
  *  When using Windows, Darwin and OS/2, this will map onto the native thread
- *  queue/runloop.  So, windows messages and want not will be processed while
+ *  queue/runloop.  So, windows messages and what not will be processed while
  *  waiting for events.
  */
 class EventQueue
diff --git a/include/VBox/pgm.h b/include/VBox/pgm.h
index 67bbebc74..162580a96 100644
--- a/include/VBox/pgm.h
+++ b/include/VBox/pgm.h
@@ -396,6 +396,7 @@ VMMDECL(void)       PGMDynCheckLocks(PVM pVM);
 #  endif
 # endif
 VMMDECL(void)       PGMDynMapStartAutoSet(PVMCPU pVCpu);
+VMMDECL(bool)       PGMDynMapStartOrMigrateAutoSet(PVMCPU pVCpu);
 VMMDECL(void)       PGMDynMapReleaseAutoSet(PVMCPU pVCpu);
 VMMDECL(void)       PGMDynMapFlushAutoSet(PVMCPU pVCpu);
 VMMDECL(void)       PGMDynMapMigrateAutoSet(PVMCPU pVCpu);
diff --git a/include/iprt/asm.h b/include/iprt/asm.h
index 22cf45262..b8c18d680 100644
--- a/include/iprt/asm.h
+++ b/include/iprt/asm.h
@@ -33,7 +33,7 @@
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
 #include <iprt/assert.h>
-/** @todo #include <iprt/param.h> for PAGE_SIZE. */
+/** @todo @code #include <iprt/param.h> @endcode for PAGE_SIZE. */
 /** @def RT_INLINE_ASM_USES_INTRIN
  * Defined as 1 if we're using a _MSC_VER 1400.
  * Otherwise defined as 0.
@@ -116,17 +116,6 @@
 # define RT_INLINE_ASM_USES_INTRIN 0
 #endif
 
-/** @def RT_INLINE_ASM_GCC_4_3_X_X86
- * Used to work around some 4.3.x register allocation issues in this version of
- * the compiler. */
-#ifdef __GNUC__
-# define RT_INLINE_ASM_GCC_4_3_X_X86 (__GNUC__ == 4 && __GNUC_MINOR__ == 3 && defined(__i386__))
-#endif
-#ifndef RT_INLINE_ASM_GCC_4_3_X_X86
-# define RT_INLINE_ASM_GCC_4_3_X_X86 0
-#endif
-
-
 
 /** @defgroup grp_asm       ASM - Assembly Routines
  * @ingroup grp_rt
@@ -167,6 +156,32 @@
  * @{
  */
 
+/** @def RT_INLINE_ASM_GCC_4_3_X_X86
+ * Used to work around some 4.3.x register allocation issues in this version of
+ * the compiler. So far this workaround is still required for 4.4 and 4.5. */
+#ifdef __GNUC__
+# define RT_INLINE_ASM_GCC_4_3_X_X86 (__GNUC__ == 4 && __GNUC_MINOR__ >= 3 && defined(__i386__))
+#endif
+#ifndef RT_INLINE_ASM_GCC_4_3_X_X86
+# define RT_INLINE_ASM_GCC_4_3_X_X86 0
+#endif
+
+/** @def RT_INLINE_DONT_USE_CMPXCHG8B
+ * i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5493) screws up
+ * RTSemRWRequestWrite semsemrw-lockless-generic.cpp in release builds. PIC
+ * mode, x86.
+ *
+ * Some gcc 4.3.x versions may have register allocation issues with cmpxchg8b
+ * when in PIC mode on x86.
+ */
+#ifndef RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC
+# define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC \
+    (   (defined(PIC) || defined(__PIC__)) \
+     && defined(RT_ARCH_X86) \
+     && (   RT_INLINE_ASM_GCC_4_3_X_X86 \
+         || defined(RT_OS_DARWIN)) )
+#endif
+
 /** @def RT_INLINE_ASM_EXTERNAL
  * Defined as 1 if the compiler does not support inline assembly.
  * The ASM* functions will then be implemented in an external .asm file.
@@ -1048,7 +1063,6 @@ DECLINLINE(uint32_t) ASMGetCpuFamily(uint32_t uEAX)
  *
  * @returns Model.
  * @param   uEAX    EAX from ASMCpuId(1) or ASMCpuId(0x80000001).
- * @param   fIntel  Whether it's an intel CPU.
  */
 DECLINLINE(uint32_t) ASMGetCpuModelIntel(uint32_t uEAX)
 {
@@ -1063,7 +1077,6 @@ DECLINLINE(uint32_t) ASMGetCpuModelIntel(uint32_t uEAX)
  *
  * @returns Model.
  * @param   uEAX    EAX from ASMCpuId(1) or ASMCpuId(0x80000001).
- * @param   fIntel  Whether it's an intel CPU.
  */
 DECLINLINE(uint32_t) ASMGetCpuModelAMD(uint32_t uEAX)
 {
@@ -2809,7 +2822,8 @@ DECLINLINE(int32_t) ASMAtomicXchgS32(volatile int32_t *pi32, int32_t i32)
  * @param   pu64    Pointer to the 64-bit variable to update.
  * @param   u64     The 64-bit value to assign to *pu64.
  */
-#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
+#if (RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN) \
+ || RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC
 DECLASM(uint64_t) ASMAtomicXchgU64(volatile uint64_t *pu64, uint64_t u64);
 #else
 DECLINLINE(uint64_t) ASMAtomicXchgU64(volatile uint64_t *pu64, uint64_t u64)
@@ -3031,6 +3045,68 @@ DECLINLINE(RTR3PTR) ASMAtomicXchgR3Ptr(RTR3PTR volatile *ppvR3, RTR3PTR pvR3)
     } while (0)
 
 
+
+/**
+ * Atomically Compare and Exchange an unsigned 8-bit value, ordered.
+ *
+ * @returns true if xchg was done.
+ * @returns false if xchg wasn't done.
+ *
+ * @param   pu8         Pointer to the value to update.
+ * @param   u8New       The new value to assigned to *pu8.
+ * @param   u8Old       The old value to *pu8 compare with.
+ */
+#if RT_INLINE_ASM_EXTERNAL || !RT_INLINE_ASM_GNU_STYLE
+DECLASM(bool) ASMAtomicCmpXchgU8(volatile uint8_t *pu8, const uint8_t u8New, const uint8_t u8Old);
+#else
+DECLINLINE(bool) ASMAtomicCmpXchgU8(volatile uint8_t *pu8, const uint8_t u8New, uint8_t u8Old)
+{
+    uint8_t u8Ret;
+    __asm__ __volatile__("lock; cmpxchgb %3, %0\n\t"
+                         "setz  %1\n\t"
+                         : "=m" (*pu8),
+                           "=qm" (u8Ret),
+                           "=a" (u8Old)
+                         : "q" (u8New),
+                           "2" (u8Old),
+                           "m" (*pu8));
+    return (bool)u8Ret;
+}
+#endif
+
+
+/**
+ * Atomically Compare and Exchange a signed 8-bit value, ordered.
+ *
+ * @returns true if xchg was done.
+ * @returns false if xchg wasn't done.
+ *
+ * @param   pi8         Pointer to the value to update.
+ * @param   i8New       The new value to assigned to *pi8.
+ * @param   i8Old       The old value to *pi8 compare with.
+ */
+DECLINLINE(bool) ASMAtomicCmpXchgS8(volatile int8_t *pi8, const int8_t i8New, const int8_t i8Old)
+{
+    return ASMAtomicCmpXchgU8((volatile uint8_t *)pi8, (const uint8_t)i8New, (const uint8_t)i8Old);
+}
+
+
+/**
+ * Atomically Compare and Exchange a bool value, ordered.
+ *
+ * @returns true if xchg was done.
+ * @returns false if xchg wasn't done.
+ *
+ * @param   pf          Pointer to the value to update.
+ * @param   fNew        The new value to assigned to *pf.
+ * @param   fOld        The old value to *pf compare with.
+ */
+DECLINLINE(bool) ASMAtomicCmpXchgBool(volatile bool *pf, const bool fNew, const bool fOld)
+{
+    return ASMAtomicCmpXchgU8((volatile uint8_t *)pf, (const uint8_t)fNew, (const uint8_t)fOld);
+}
+
+
 /**
  * Atomically Compare and Exchange an unsigned 32-bit value, ordered.
  *
@@ -3114,10 +3190,10 @@ DECLINLINE(bool) ASMAtomicCmpXchgS32(volatile int32_t *pi32, const int32_t i32Ne
  * @param   u64Old  The value to compare with.
  */
 #if (RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN) \
- || (RT_INLINE_ASM_GCC_4_3_X_X86 && defined(IN_RING3) && defined(__PIC__))
+ || RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC
 DECLASM(bool) ASMAtomicCmpXchgU64(volatile uint64_t *pu64, const uint64_t u64New, const uint64_t u64Old);
 #else
-DECLINLINE(bool) ASMAtomicCmpXchgU64(volatile uint64_t *pu64, const uint64_t u64New, uint64_t u64Old)
+DECLINLINE(bool) ASMAtomicCmpXchgU64(volatile uint64_t *pu64, uint64_t u64New, uint64_t u64Old)
 {
 # if RT_INLINE_ASM_USES_INTRIN
    return _InterlockedCompareExchange64((__int64 *)pu64, u64New, u64Old) == u64Old;
@@ -3382,7 +3458,8 @@ DECLINLINE(bool) ASMAtomicCmpXchgExS32(volatile int32_t *pi32, const int32_t i32
  * @param   u64Old  The value to compare with.
  * @param   pu64Old     Pointer store the old value at.
  */
-#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
+#if (RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN) \
+ || RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC
 DECLASM(bool) ASMAtomicCmpXchgExU64(volatile uint64_t *pu64, const uint64_t u64New, const uint64_t u64Old, uint64_t *pu64Old);
 #else
 DECLINLINE(bool) ASMAtomicCmpXchgExU64(volatile uint64_t *pu64, const uint64_t u64New, const uint64_t u64Old, uint64_t *pu64Old)
@@ -3629,9 +3706,9 @@ DECLINLINE(int32_t) ASMAtomicAddS32(int32_t volatile *pi32, int32_t i32)
  * @param   pu32        Pointer to the value.
  * @param   u32         Number to subtract.
  */
-DECLINLINE(uint32_t) ASMAtomicSubU32(int32_t volatile *pi32, uint32_t u32)
-{
-    return ASMAtomicAddU32((uint32_t volatile *)pi32, (uint32_t)-(int32_t)u32);
+DECLINLINE(uint32_t) ASMAtomicSubU32(int32_t volatile *pi32, uint32_t u32) 
+{ 
+    return ASMAtomicAddU32((uint32_t volatile *)pi32, (uint32_t)-(int32_t)u32); 
 }
 
 
@@ -4161,7 +4238,7 @@ DECLINLINE(int32_t) ASMAtomicUoReadS32(volatile int32_t *pi32)
  * @remark  This will fault if the memory is read-only!
  */
 #if (RT_INLINE_ASM_EXTERNAL && !defined(RT_ARCH_AMD64)) \
- || (RT_INLINE_ASM_GCC_4_3_X_X86 && defined(IN_RING3) && defined(__PIC__))
+ || RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC
 DECLASM(uint64_t) ASMAtomicReadU64(volatile uint64_t *pu64);
 #else
 DECLINLINE(uint64_t) ASMAtomicReadU64(volatile uint64_t *pu64)
@@ -4239,7 +4316,8 @@ DECLINLINE(uint64_t) ASMAtomicReadU64(volatile uint64_t *pu64)
  *                  The memory pointed to must be writable.
  * @remark  This will fault if the memory is read-only!
  */
-#if RT_INLINE_ASM_EXTERNAL && !defined(RT_ARCH_AMD64)
+#if (RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN) \
+ || RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC
 DECLASM(uint64_t) ASMAtomicUoReadU64(volatile uint64_t *pu64);
 #else
 DECLINLINE(uint64_t) ASMAtomicUoReadU64(volatile uint64_t *pu64)
@@ -4283,7 +4361,7 @@ DECLINLINE(uint64_t) ASMAtomicUoReadU64(volatile uint64_t *pu64)
                          : "m" (u32EBX),
                            "S" (pu64));
 #   else /* !PIC */
-    __asm__ __volatile__("cmpxchg8b %1\n\t"
+    __asm__ __volatile__("lock; cmpxchg8b %1\n\t"
                          : "=A" (u64),
                            "+m" (*pu64)
                          : "0" (0),
diff --git a/include/iprt/net.h b/include/iprt/net.h
index d80d7d2e6..92638cf5a 100644
--- a/include/iprt/net.h
+++ b/include/iprt/net.h
@@ -57,9 +57,9 @@ typedef RTNETADDRIPV4 const *PCRTNETADDRIPV4;
  */
 typedef RTUINT128U RTNETADDRIPV6;
 AssertCompileSize(RTNETADDRIPV6, 16);
-/** Pointer to a IPv4 address. */
+/** Pointer to a IPv6 address. */
 typedef RTNETADDRIPV6 *PRTNETADDRIPV6;
-/** Pointer to a const IPv4 address. */
+/** Pointer to a const IPv6 address. */
 typedef RTNETADDRIPV6 const *PCRTNETADDRIPV6;
 
 /**
@@ -81,7 +81,9 @@ typedef RTNETADDRIPX *PRTNETADDRIPX;
 typedef RTNETADDRIPX const *PCRTNETADDRIPX;
 
 /**
- * Address union.
+ * Network address union.
+ *
+ * @remarks The size of this structure may change in the future.
  */
 typedef union RTNETADDRU
 {
@@ -108,6 +110,55 @@ typedef RTNETADDRU *PRTNETADDRU;
 /** Pointer to a const address union. */
 typedef RTNETADDRU const *PCRTNETADDRU;
 
+/**
+ * Network address type.
+ *
+ * @remarks The value assignments may change in the future.
+ */
+typedef enum RTNETADDRTYPE
+{
+    /** The invalid 0 entry. */
+    RTNETADDRTYPE_INVALID = 0,
+    /** IP version 4. */
+    RTNETADDRTYPE_IPV4,
+    /** IP version 6. */
+    RTNETADDRTYPE_IPV6,
+    /** IPX. */
+    RTNETADDRTYPE_IPX,
+    /** MAC address. */
+    RTNETADDRTYPE_MAC,
+    /** The end of the valid values. */
+    RTNETADDRTYPE_END,
+    /** The usual 32-bit hack. */
+    RTNETADDRTYPE_32_BIT_HACK = 0x7fffffff
+} RTNETADDRTYPE;
+/** Pointer to a network address type. */
+typedef RTNETADDRTYPE *PRTNETADDRTYPE;
+/** Pointer to a const network address type. */
+typedef RTNETADDRTYPE const  *PCRTNETADDRTYPE;
+
+/**
+ * Network address.
+ *
+ * @remarks The size and type values may change.
+ */
+typedef struct RTNETADDR
+{
+    /** The address union. */
+    RTNETADDRU      uAddr;
+    /** Indicates which view of @a u that is valid. */
+    RTNETADDRTYPE   enmType;
+    /** The port number for IPv4 and IPv6 addresses.  This is set to
+     *  RTNETADDR_NA_PORT if not applicable. */
+    uint32_t        uPort;
+} RTNETADDR;
+/** Pointer to a network address. */
+typedef RTNETADDR *PRTNETADDR;
+/** Pointer to a const network address. */
+typedef RTNETADDR const *PCRTNETADDR;
+
+/** The not applicable value of  RTNETADDR::uPort value use to inid. */
+#define RTNETADDR_PORT_NA       UINT32_MAX
 
 /**
  * Ethernet header.
diff --git a/include/iprt/tcp.h b/include/iprt/tcp.h
index 4c1ff5309..2d11e887a 100644
--- a/include/iprt/tcp.h
+++ b/include/iprt/tcp.h
@@ -33,6 +33,7 @@
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
 #include <iprt/thread.h>
+#include <iprt/net.h>
 
 #ifdef IN_RING0
 # error "There are no RTFile APIs available Ring-0 Host Context!"
@@ -223,6 +224,23 @@ RTR3DECL(int)  RTTcpAccept(RTSOCKET Sock, unsigned uPort, PRTSOCKET pSockAccepte
 
 #endif
 
+/**
+ * Gets the address of the local side.
+ *
+ * @returns IPRT status code.
+ * @param   Sock            Socket descriptor.
+ * @param   pAddr           Where to store the local address on success.
+ */
+RTR3DECL(int) RTTcpGetLocalAddress(RTSOCKET Sock, PRTNETADDR pAddr);
+
+/**
+ * Gets the address of the other party.
+ *
+ * @returns IPRT status code.
+ * @param   Sock            Socket descriptor.
+ * @param   pAddr           Where to store the peer address on success.
+ */
+RTR3DECL(int) RTTcpGetPeerAddress(RTSOCKET Sock, PRTNETADDR pAddr);
 
 /** @} */
 RT_C_DECLS_END
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
index 667441238..a5517fb9e 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
@@ -168,8 +168,6 @@ static uint16_t             g_uIOPortBase;
 static caddr_t              g_pMMIOBase;
 /** Size of the MMIO region. */
 static off_t                g_cbMMIO;
-/** VMMDev Version. */
-static uint32_t             g_u32Version;
 /** Pointer to the interrupt handle vector */
 static ddi_intr_handle_t   *g_pIntr;
 /** Number of actually allocated interrupt handles */
@@ -383,8 +381,9 @@ static int VBoxGuestSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd)
             ddi_regs_map_free(&g_PciIOHandle);
             ddi_regs_map_free(&g_PciMMIOHandle);
             ddi_remove_minor_node(pDip, NULL);
-
+            VBoxGuestDeleteDevExt(&g_DevExt);
             RTR0Term();
+            g_pDip = NULL;
             return DDI_SUCCESS;
         }
 
@@ -611,43 +610,45 @@ static int VBoxGuestSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArg, int Mode, cr
         LogRel((DEVICE_NAME "::IOCtl: bad magic %#x; pArg=%p Cmd=%#x.\n", ReqWrap.u32Magic, pArg, Cmd));
         return EINVAL;
     }
-    if (RT_UNLIKELY(   ReqWrap.cbData == 0
-                    || ReqWrap.cbData > _1M*16))
+    if (RT_UNLIKELY(ReqWrap.cbData > _1M*16))
     {
         LogRel((DEVICE_NAME "::IOCtl: bad size %#x; pArg=%p Cmd=%#x.\n", ReqWrap.cbData, pArg, Cmd));
         return EINVAL;
     }
 
     /*
-     * Read the request.
+     * Read the request payload if any; requests like VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS have no data payload.
      */
-    void *pvBuf = RTMemTmpAlloc(ReqWrap.cbData);
-    if (RT_UNLIKELY(!pvBuf))
+    void *pvBuf = NULL;
+    if (RT_LIKELY(ReqWrap.cbData > 0))
     {
-        LogRel((DEVICE_NAME "::IOCtl: RTMemTmpAlloc failed to alloc %d bytes.\n", ReqWrap.cbData));
-        return ENOMEM;
-    }
+        pvBuf = RTMemTmpAlloc(ReqWrap.cbData);
+        if (RT_UNLIKELY(!pvBuf))
+        {
+            LogRel((DEVICE_NAME "::IOCtl: RTMemTmpAlloc failed to alloc %d bytes.\n", ReqWrap.cbData));
+            return ENOMEM;
+        }
 
-    rc = ddi_copyin((void *)(uintptr_t)ReqWrap.pvDataR3, pvBuf, ReqWrap.cbData, Mode);
-    if (RT_UNLIKELY(rc))
-    {
-        RTMemTmpFree(pvBuf);
-        LogRel((DEVICE_NAME "::IOCtl: ddi_copyin failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc));
-        return EFAULT;
-    }
-    if (RT_UNLIKELY(   ReqWrap.cbData != 0
-                    && !VALID_PTR(pvBuf)))
-    {
-        RTMemTmpFree(pvBuf);
-        LogRel((DEVICE_NAME "::IOCtl: pvBuf invalid pointer %p\n", pvBuf));
-        return EINVAL;
+        rc = ddi_copyin((void *)(uintptr_t)ReqWrap.pvDataR3, pvBuf, ReqWrap.cbData, Mode);
+        if (RT_UNLIKELY(rc))
+        {
+            RTMemTmpFree(pvBuf);
+            LogRel((DEVICE_NAME "::IOCtl: ddi_copyin failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc));
+            return EFAULT;
+        }
+        if (RT_UNLIKELY(!VALID_PTR(pvBuf)))
+        {
+            RTMemTmpFree(pvBuf);
+            LogRel((DEVICE_NAME "::IOCtl: pvBuf invalid pointer %p\n", pvBuf));
+            return EINVAL;
+        }
     }
     Log((DEVICE_NAME "::IOCtl: pSession=%p pid=%d.\n", pSession, (int)RTProcSelf()));
 
     /*
      * Process the IOCtl.
      */
-    size_t cbDataReturned;
+    size_t cbDataReturned = 0;
     rc = VBoxGuestCommonIOCtl(Cmd, &g_DevExt, pSession, pvBuf, ReqWrap.cbData, &cbDataReturned);
     if (RT_SUCCESS(rc))
     {
@@ -677,7 +678,8 @@ static int VBoxGuestSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArg, int Mode, cr
         rc = RTErrConvertToErrno(rc);
     }
     *pVal = rc;
-    RTMemTmpFree(pvBuf);
+    if (pvBuf)
+        RTMemTmpFree(pvBuf);
     return rc;
 }
 
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
index 22947287f..0515a8b2e 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
@@ -356,7 +356,7 @@ int VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase,
         rc = RTSpinlockCreate(&pDevExt->SessionSpinlock);
     if (RT_FAILURE(rc))
     {
-        Log(("VBoxGuestInitDevExt: failed to spinlock, rc=%d!\n", rc));
+        LogRel(("VBoxGuestInitDevExt: failed to spinlock, rc=%d!\n", rc));
         if (pDevExt->EventSpinlock != NIL_RTSPINLOCK)
             RTSpinlockDestroy(pDevExt->EventSpinlock);
         return rc;
@@ -393,18 +393,24 @@ int VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase,
                         Log(("VBoxGuestInitDevExt: returns success\n"));
                         return VINF_SUCCESS;
                     }
+                    else
+                        LogRel(("VBoxGuestInitDevExt: VBoxGuestSetGuestCapabilities failed, rc=%Rrc\n", rc));
                 }
+                else
+                    LogRel(("VBoxGuestInitDevExt: vboxGuestSetFilterMask failed, rc=%Rrc\n", rc));
             }
+            else
+                LogRel(("VBoxGuestInitDevExt: vboxGuestInitReportGuestInfo failed, rc=%Rrc\n", rc));
 
-            /* failure cleanup */
+            VbglGRFree((VMMDevRequestHeader *)pDevExt->pIrqAckEvents);
         }
         else
-            Log(("VBoxGuestInitDevExt: VBoxGRAlloc failed, rc=%Rrc\n", rc));
+            LogRel(("VBoxGuestInitDevExt: VBoxGRAlloc failed, rc=%Rrc\n", rc));
 
         VbglTerminate();
     }
     else
-        Log(("VBoxGuestInitDevExt: VbglInit failed, rc=%Rrc\n", rc));
+        LogRel(("VBoxGuestInitDevExt: VbglInit failed, rc=%Rrc\n", rc));
 
     rc2 = RTSpinlockDestroy(pDevExt->EventSpinlock); AssertRC(rc2);
     rc2 = RTSpinlockDestroy(pDevExt->SessionSpinlock); AssertRC(rc2);
@@ -448,7 +454,7 @@ void VBoxGuestDeleteDevExt(PVBOXGUESTDEVEXT pDevExt)
 {
     int rc2;
     Log(("VBoxGuestDeleteDevExt:\n"));
-    LogRel(("VBoxGuest: The additions driver is terminating.\n"));
+    Log(("VBoxGuest: The additions driver is terminating.\n"));
 
     /*
      * Unfix the guest mappings, filter all events and clear
@@ -900,7 +906,7 @@ static int VBoxGuestCommonIOCtl_WaitEvent(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSE
              || rc == VERR_INTERRUPTED)
     {
         pInfo->u32Result = VBOXGUEST_WAITEVENT_INTERRUPTED;
-        rc == VERR_INTERRUPTED;
+        rc = VERR_INTERRUPTED;
         Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_INTERRUPTED\n"));
     }
     else if (rc == VERR_TIMEOUT)
@@ -953,7 +959,7 @@ static int VBoxGuestCommonIOCtl_CancelAllWaitEvents(PVBOXGUESTDEVEXT pDevExt, PV
             if (    pWait->pSession   == pSession
                 &&  pWait->fResEvents != UINT32_MAX)
             {
-                RTSEMEVENTMULTI     hEvent;
+                RTSEMEVENTMULTI hEvent = pWait->Event;
                 pWait->fResEvents = UINT32_MAX;
                 RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
                 /* HACK ALRET! This races wakeup + reuse! */
diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
index bd64a824f..2bb5484aa 100644
--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -188,7 +188,10 @@ VBoxOGL_LIBS = \
 	$(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
 if1of ($(KBUILD_TARGET),linux solaris)
  VBoxOGL_LIBS += \
- 	$(PATH_LIB)/libXcomposite.so
+ 	$(PATH_LIB)/libXcomposite.so \
+ 	$(PATH_LIB)/libXdamage.so \
+ 	$(PATH_LIB)/libXfixes.so \
+ 	$(PATH_LIB)/libXext.so
  ifdef VBoxOGL_FAKEDRI
   VBoxOGL_LIBS += \
   	dl
diff --git a/src/VBox/Additions/common/crOpenGL/context.c b/src/VBox/Additions/common/crOpenGL/context.c
index 36a28cffe..c375e797f 100644
--- a/src/VBox/Additions/common/crOpenGL/context.c
+++ b/src/VBox/Additions/common/crOpenGL/context.c
@@ -31,6 +31,10 @@
 #include "cr_environment.h"
 #include "stub.h"
 
+typedef struct {
+    WindowInfo *window;
+    GLboolean   windowInUse;
+} CtxCheckCurrentDrawableParams_t;
 
 /**
  * This function should be called from MakeCurrent().  It'll detect if
@@ -215,6 +219,7 @@ stubGetWindowInfo( Display *dpy, GLXDrawable drawable )
     winInfo->type = UNDECIDED;
     winInfo->spuWindow = -1;
     winInfo->mapped = -1; /* don't know */
+    winInfo->pOwner = NULL;
 #ifndef WINDOWS
     crHashtableAdd(stub.windowTable, (unsigned int) drawable, winInfo);
 #else
@@ -266,7 +271,6 @@ stubNewContext( const char *dpyName, GLint visBits, ContextType type,
     context->spuContext = spuContext;
     context->visBits = visBits;
     context->currentDrawable = NULL;
-    context->pOwnWindow = NULL;
     crStrncpy(context->dpyName, dpyName, MAX_DPY_NAME);
     context->dpyName[MAX_DPY_NAME-1] = 0;
 
@@ -785,6 +789,24 @@ stubCheckUseChromium( WindowInfo *window )
     return GL_TRUE;  /* use Chromium! */
 }
 
+static void stubWindowCheckOwnerCB(unsigned long key, void *data1, void *data2)
+{
+    WindowInfo *pWindow = (WindowInfo *) data1;
+    ContextInfo *pCtx = (ContextInfo *) data2;
+
+    if (pWindow->pOwner == pCtx)
+    {
+#ifdef WINDOWS
+            /* Note: can't use WindowFromDC(context->pOwnWindow->drawable) here
+               because GL context is already released from DC and actual guest window
+               could be destroyed.
+             */
+            crWindowDestroy((GLint)pWindow->hWnd);
+#else
+            crWindowDestroy((GLint)pWindow->drawable);
+#endif
+    }
+}
 
 GLboolean
 stubMakeCurrent( WindowInfo *window, ContextInfo *context )
@@ -834,9 +856,8 @@ stubMakeCurrent( WindowInfo *window, ContextInfo *context )
                                                           spuShareCtx );
             if (window->spuWindow == -1)
             {
+                /*crDebug("(1)stubMakeCurrent ctx=%p(%i) window=%p(%i)", context, context->spuContext, window, window->spuWindow);*/
                 window->spuWindow = stub.spu->dispatch_table.WindowCreate( window->dpyName, context->visBits );
-                CRASSERT(!context->pOwnWindow);
-                context->pOwnWindow = window;
             }
         }
         else {
@@ -880,8 +901,8 @@ stubMakeCurrent( WindowInfo *window, ContextInfo *context )
         CRASSERT(context->type == CHROMIUM);
         CRASSERT(context->spuContext >= 0);
 
-        if (context->currentDrawable && context->currentDrawable != window)
-            crWarning("Rebinding context %p to a different window", context);
+        /*if (context->currentDrawable && context->currentDrawable != window)
+            crDebug("Rebinding context %p to a different window", context);*/
 
         if (window->type == NATIVE) {
             crWarning("Can't rebind a chromium context to a native window\n");
@@ -890,9 +911,28 @@ stubMakeCurrent( WindowInfo *window, ContextInfo *context )
         else {
             if (window->spuWindow == -1)
             {
+                /*crDebug("(2)stubMakeCurrent ctx=%p(%i) window=%p(%i)", context, context->spuContext, window, window->spuWindow);*/
                 window->spuWindow = stub.spu->dispatch_table.WindowCreate( window->dpyName, context->visBits );
-                CRASSERT(!context->pOwnWindow);
-                context->pOwnWindow = window;
+                if (context->currentDrawable && context->currentDrawable->type==CHROMIUM 
+                    && context->currentDrawable->pOwner==context)
+                {
+#ifdef WINDOWS
+                        if (!WindowFromDC(context->currentDrawable->drawable))
+                        {
+                            crWindowDestroy((GLint)context->currentDrawable->hWnd);
+                        }
+#else
+                        Window root;
+                        int x, y;
+                        unsigned int border, depth, w, h;
+
+                        if (!XGetGeometry(context->currentDrawable->dpy, context->currentDrawable->drawable, &root, &x, &y, &w, &h, &border, &depth))
+                        {
+                            crWindowDestroy((GLint)context->currentDrawable->drawable);
+                        }
+#endif
+                    
+                }
             }
 
             if (window->spuWindow != (GLint)window->drawable)
@@ -905,6 +945,7 @@ stubMakeCurrent( WindowInfo *window, ContextInfo *context )
     }
 
     window->type = context->type;
+    window->pOwner = context;
     context->currentDrawable = window;
     stub.currentContext = context;
 
@@ -964,8 +1005,6 @@ stubMakeCurrent( WindowInfo *window, ContextInfo *context )
     return retVal;
 }
 
-
-
 void
 stubDestroyContext( unsigned long contextId )
 {
@@ -991,18 +1030,7 @@ stubDestroyContext( unsigned long contextId )
         /* Have pack SPU or tilesort SPU, etc. destroy the context */
         CRASSERT(context->spuContext >= 0);
         stub.spu->dispatch_table.DestroyContext( context->spuContext );
-        if (context->pOwnWindow)
-        {
-            /* Note: can't use WindowFromDC(context->pOwnWindow->drawable) here
-               because GL context is already released from DC and actual guest window
-               could be destroyed.
-             */
-#ifdef WINDOWS
-            crWindowDestroy((GLint)context->pOwnWindow->hWnd);
-#else
-            crWindowDestroy((GLint)context->pOwnWindow->drawable);
-#endif
-        }
+        crHashtableWalk(stub.windowTable, stubWindowCheckOwnerCB, context);
     }
 
     if (stub.currentContext == context) {
diff --git a/src/VBox/Additions/common/crOpenGL/load.c b/src/VBox/Additions/common/crOpenGL/load.c
index 59ea8b180..1639a3b68 100644
--- a/src/VBox/Additions/common/crOpenGL/load.c
+++ b/src/VBox/Additions/common/crOpenGL/load.c
@@ -79,18 +79,10 @@ static SwapBuffersFunc_t origSwapBuffers;
 static DrawBufferFunc_t origDrawBuffer;
 static ScissorFunc_t origScissor;
 
-static void stubCheckWindowState(void)
+static void stubCheckWindowState(WindowInfo *window)
 {
-    WindowInfo *window;
     bool bForceUpdate = false;
 
-    CRASSERT(stub.trackWindowSize || stub.trackWindowPos);
-
-    if (!stub.currentContext)
-        return;
-
-    window = stub.currentContext->currentDrawable;
-
 #ifdef WINDOWS
     /* @todo install hook and track for WM_DISPLAYCHANGE */
     {
@@ -128,6 +120,64 @@ static void stubCheckWindowState(void)
     }
 }
 
+static bool stubSystemWindowExist(WindowInfo *pWindow)
+{
+#ifdef WINDOWS
+    if (!WindowFromDC(pWindow->drawable))
+    {
+        return false;
+    }
+#else
+    Window root;
+    int x, y;
+    unsigned int border, depth, w, h;
+
+    if (!XGetGeometry(pWindow->dpy, pWindow->drawable, &root, &x, &y, &w, &h, &border, &depth))
+    {
+        return false;
+    }
+#endif
+
+    return true;
+}
+
+static void stubCheckWindowsCB(unsigned long key, void *data1, void *data2)
+{
+    WindowInfo *pWindow = (WindowInfo *) data1;
+    ContextInfo *pCtx = (ContextInfo *) data2;
+
+    if (pWindow == pCtx->currentDrawable
+        || pWindow->type!=CHROMIUM
+        || pWindow->pOwner!=pCtx)
+    {
+        return;
+    }
+
+    if (!stubSystemWindowExist(pWindow))
+    {
+#ifdef WINDOWS
+        crWindowDestroy((GLint)pWindow->hWnd);
+#else
+        crWindowDestroy((GLint)pWindow->drawable);
+#endif
+        return;
+    }
+
+    stubCheckWindowState(pWindow);
+}
+
+static void stubCheckWindowsState(void)
+{
+    CRASSERT(stub.trackWindowSize || stub.trackWindowPos);
+
+    if (!stub.currentContext)
+        return;
+
+    stubCheckWindowState(stub.currentContext->currentDrawable);
+
+    crHashtableWalk(stub.windowTable, stubCheckWindowsCB, stub.currentContext);
+}
+
 
 /**
  * Override the head SPU's glClear function.
@@ -136,7 +186,7 @@ static void stubCheckWindowState(void)
  */
 static void SPU_APIENTRY trapClear(GLbitfield mask)
 {
-    stubCheckWindowState();
+    stubCheckWindowsState();
     /* call the original SPU glClear function */
     origClear(mask);
 }
@@ -147,7 +197,7 @@ static void SPU_APIENTRY trapClear(GLbitfield mask)
  */
 static void SPU_APIENTRY trapViewport(GLint x, GLint y, GLsizei w, GLsizei h)
 {
-    stubCheckWindowState();
+    stubCheckWindowsState();
     /* call the original SPU glViewport function */
     if (!stub.viewportHack)
     {
@@ -166,13 +216,13 @@ static void SPU_APIENTRY trapViewport(GLint x, GLint y, GLsizei w, GLsizei h)
 
 static void SPU_APIENTRY trapSwapBuffers(GLint window, GLint flags)
 {
-    stubCheckWindowState();
+    stubCheckWindowsState();
     origSwapBuffers(window, flags);
 }
 
 static void SPU_APIENTRY trapDrawBuffer(GLenum buf)
 {
-    stubCheckWindowState();
+    stubCheckWindowsState();
     origDrawBuffer(buf);
 }
 
diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py b/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py
index f26dd52f3..0531594cc 100644
--- a/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py
+++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py
@@ -24,6 +24,23 @@ void PACKSPU_APIENTRY packspu_Begin( GLenum mode )
     /* XXX comparing mode >= 0 here is not needed since mode is unsigned */
     CRASSERT( mode >= GL_POINTS && mode <= GL_POLYGON );
 
+#if CR_ARB_vertex_buffer_object
+    {
+        GLboolean serverArrays = GL_FALSE;
+        GET_CONTEXT(ctx);
+        if (ctx->clientState->extensions.ARB_vertex_buffer_object)
+            serverArrays = crStateUseServerArrays();
+        if (serverArrays) {
+            CRClientState *clientState = &(ctx->clientState->client);
+            if (clientState->array.locked && !clientState->array.synced)
+            {
+                crPackLockArraysEXT(clientState->array.lockFirst, clientState->array.lockCount);
+                clientState->array.synced = GL_TRUE;
+            }
+        }
+    }
+#endif
+
     if (pack_spu.swap)
     {
         crPackBeginSWAP( mode );
diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c
index 1eb8fad5b..07248ad08 100644
--- a/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c
+++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c
@@ -191,12 +191,11 @@ packspu_ArrayElement( GLint index )
         GET_CONTEXT(ctx);
         CRClientState *clientState = &(ctx->clientState->client);
 
-        /*Note the comment in packspu_LockArraysEXT*/
-        if (clientState->array.locked && !clientState->array.synced)
-        {
-            crPackLockArraysEXT(clientState->array.lockFirst, clientState->array.lockCount);
-            clientState->array.synced = GL_TRUE;
-        }
+        /* LockArraysEXT can not be executed between glBegin/glEnd pair, it also
+         * leads to vertexpointers being adjusted on the host side between glBegin/glEnd calls which
+         * produces unpredictable results. Locking is done before the glBegin call instead.
+         */
+        CRASSERT(!clientState->array.locked || clientState->array.synced);
 
         /* Send the DrawArrays command over the wire */
         if (pack_spu.swap)
@@ -491,7 +490,7 @@ void PACKSPU_APIENTRY packspu_LockArraysEXT(GLint first, GLint count)
         crStateLockArraysEXT(first, count);
         /*Note: this is a workaround for quake3 based apps.
           It's modifying vertex data between glLockArraysEXT and glDrawElements calls,
-          so we'd pass data to host right before the glDrawSomething call.
+          so we'd pass data to host right before the glDrawSomething or glBegin call.
         */
         /*crPackLockArraysEXT(first, count);*/
     } 
diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c
index aa1db7e2c..c9f97b935 100644
--- a/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c
+++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c
@@ -96,7 +96,7 @@ const GLubyte * PACKSPU_APIENTRY packspu_GetString( GLenum name )
         case GL_EXTENSIONS:
             return GetExtensions();
         case GL_VERSION:
-#ifdef WINDOWS
+#if 0 && defined(WINDOWS)
             if (packspuRunningUnderWine())
             {
                 GetString(GL_REAL_VERSION, ctx->pszRealVersion);
diff --git a/src/VBox/Additions/common/crOpenGL/stub.h b/src/VBox/Additions/common/crOpenGL/stub.h
index 557b793f8..eab35b335 100644
--- a/src/VBox/Additions/common/crOpenGL/stub.h
+++ b/src/VBox/Additions/common/crOpenGL/stub.h
@@ -90,7 +90,7 @@ struct context_info_t
     unsigned long id;          /* the client-visible handle */
     GLint visBits;
     WindowInfo *currentDrawable;
-    WindowInfo *pOwnWindow; /* window created by first call to MakeCurrent with this context */
+
 #ifdef WINDOWS
     HGLRC hglrc;
 #elif defined(DARWIN)
@@ -135,6 +135,7 @@ struct window_info_t
     unsigned int width, height;
     ContextType type;
     GLint spuWindow;       /* returned by head SPU's WindowCreate() */
+    ContextInfo *pOwner;     /* ctx which created this window */
     GLboolean mapped;
 #ifdef WINDOWS
     HDC drawable;
diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
index a3e6b9893..6f07e2d3d 100644
--- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c
+++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c
@@ -87,7 +87,13 @@ static struct drm_driver driver = {
 		 .owner = THIS_MODULE,
 		 .open = drm_open,
 		 .release = drm_release,
+                 /* This was changed with Linux 2.6.33 but Fedora backported this
+                  * change to their 2.6.32 kernel. */
+#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 33)
+		 .unlocked_ioctl = drm_ioctl,
+#else
 		 .ioctl = drm_ioctl,
+#endif
 		 .mmap = drm_mmap,
 		 .poll = drm_poll,
 		 .fasync = drm_fasync,
diff --git a/src/VBox/Additions/linux/installer/vboxadd-service.sh b/src/VBox/Additions/linux/installer/vboxadd-service.sh
index 9bc990bf0..1e613de16 100755
--- a/src/VBox/Additions/linux/installer/vboxadd-service.sh
+++ b/src/VBox/Additions/linux/installer/vboxadd-service.sh
@@ -257,7 +257,7 @@ start() {
             exit 1
         }
         testbinary
-        daemon $binary
+        daemon $binary > /dev/null
         RETVAL=$?
         test $RETVAL -eq 0 && echo `pidof VBoxService` > $PIDFILE
         succ_msg
diff --git a/src/VBox/Additions/linux/installer/vboxadd-x11.sh b/src/VBox/Additions/linux/installer/vboxadd-x11.sh
index 097b4c802..eb0340cdb 100755
--- a/src/VBox/Additions/linux/installer/vboxadd-x11.sh
+++ b/src/VBox/Additions/linux/installer/vboxadd-x11.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Sun VirtualBox
-# Linux Additions X11 setup init script ($Revision: 56118 $)
+# Linux Additions X11 setup init script ($Revision: 59059 $)
 #
 
 #
@@ -73,6 +73,8 @@ if [ -f /etc/arch-release ]; then
     system=arch
 elif [ -f /etc/redhat-release ]; then
     system=redhat
+elif [ -f /etc/debian_version ]; then
+    system=debian
 elif [ -f /etc/SuSE-release ]; then
     system=suse
 elif [ -f /etc/gentoo-release ]; then
@@ -162,7 +164,7 @@ if [ "$system" = "lfs" ]; then
     }
 fi
 
-if [ "$system" = "other" ]; then
+if [ "$system" = "debian" -o "$system" = "other" ]; then
     fail_msg() {
         echo " ...fail!"
     }
@@ -287,8 +289,10 @@ setup()
     setupxorgconf="true"
     # But without the workaround for SUSE 11.1 not doing input auto-detection
     newmouse=""
-    # By default we want to use hal for auto-loading the mouse driver
-    usehal="--useHal"
+    # By default we want to use hal/udev/whatever for auto-loading the mouse driver
+    automouse="--autoMouse"
+    # But we only install the udev rule if we detect a server that needs it
+    udevmouse=""
     # We need to tell our xorg.conf hacking script whether /dev/psaux exists
     nopsaux="--nopsaux"
     test -c /dev/psaux && nopsaux=""
@@ -324,6 +328,7 @@ setup()
             vboxvideo_src=vboxvideo_drv_17.so
             vboxmouse_src=vboxmouse_drv_17.so
             setupxorgconf=""
+            test "$system" = "debian" && udevmouse="true"
             ;;
         1.5.99.* | 1.6.* )
             begin "Installing X.Org Server 1.6 modules"
@@ -348,14 +353,14 @@ setup()
             vboxvideo_src=vboxvideo_drv_15.so
             vboxmouse_src=vboxmouse_drv_15.so
             # SUSE with X.Org 1.5 is a special case, and is handled specially
-            test -r /etc/SuSE-release &&
-            { usehal=""; newmouse="--newMouse"; }
+            test "$system" = "suse" &&
+            { automouse=""; newmouse="--newMouse"; }
             ;;
         1.4.* )
             begin "Installing X.Org Server 1.4 modules"
             vboxvideo_src=vboxvideo_drv_14.so
             vboxmouse_src=vboxmouse_drv_14.so
-            usehal=""
+            automouse=""
             newmouse="--newMouse"
             ;;
         1.3.* )
@@ -364,21 +369,21 @@ setup()
             begin "Installing X.Org Server 1.3 modules"
             vboxvideo_src=vboxvideo_drv_13.so
             vboxmouse_src=vboxmouse_drv_13.so
-            usehal=""
+            automouse=""
             newmouse="--newMouse"
             ;;
         7.1.* | 7.2.* )
             begin "Installing X.Org 7.1 modules"
             vboxvideo_src=vboxvideo_drv_71.so
             vboxmouse_src=vboxmouse_drv_71.so
-            usehal=""
+            automouse=""
             testrandr=""
             ;;
         6.9.* | 7.0.* )
             begin "Installing X.Org 6.9/7.0 modules"
             vboxvideo_src=vboxvideo_drv_70.so
             vboxmouse_src=vboxmouse_drv_70.so
-            usehal=""
+            automouse=""
             testrandr=""
             ;;
         6.7* | 6.8.* | 4.2.* | 4.3.* )
@@ -388,7 +393,7 @@ setup()
             rm "$modules_dir/input/vboxmouse_drv.o" 2>/dev/null
             ln -s "$lib_dir/vboxvideo_drv.o" "$modules_dir/drivers/vboxvideo_drv.o"
             ln -s "$lib_dir/vboxmouse_drv.o" "$modules_dir/input/vboxmouse_drv.o"
-            usehal=""
+            automouse=""
             testrandr=""
             succ_msg
             ;;
@@ -424,11 +429,11 @@ EOF
         # video drivers.  Some versions have the directory and don't use it.
         # Those versions can autoload vboxvideo though, so we don't need to
         # hack the configuration file for them.
-        test -f /etc/debian_version -a -d /usr/share/xserver-xorg/pci &&
+        test "$system" = "debian" -a -d /usr/share/xserver-xorg/pci &&
         {
             rm -f "/usr/share/xserver-xorg/pci/vboxvideo.ids"
             ln -s "$share_dir/vboxvideo.ids" /usr/share/xserver-xorg/pci 2>/dev/null
-            test -n "$usehal" && setupxorgconf=""
+            test -n "$automouse" && setupxorgconf=""
         }
 
         # Do the XF86Config/xorg.conf hack for those versions that require it
@@ -440,7 +445,7 @@ EOF
                     if grep -q "VirtualBox generated" "$i"; then
                         generated="$generated  `printf "$i\n"`"
                     else
-                        "$lib_dir/x11config-new.pl" $newmouse $usehal $nopsaux "$i"
+                        "$lib_dir/x11config-new.pl" $newmouse $automouse $nopsaux "$i"
                     fi
                     configured="true"
                 fi
@@ -452,15 +457,15 @@ EOF
             # need a configuration file for VBoxVideo.
             main_cfg="/etc/X11/xorg.conf"
             nobak="/etc/X11/xorg.vbox.nobak"
-            if test -z "$configured" -a ! -r "$nobak"; then
+            if test -z "$configured"; then
                 touch "$main_cfg"
-                "$lib_dir/x11config-new.pl" --useHal --noBak "$main_cfg"
+                "$lib_dir/x11config-new.pl" $newmouse $automouse $nopsaux --noBak "$main_cfg"
                 touch "$nobak"
             fi
         fi
         # X.Org Server versions starting with 1.5 can do mouse auto-detection,
         # to make our lives easier and spare us the nasty hacks.
-        test -n "$usehal" &&
+        test -n "$automouse" &&
             if [ -d /etc/hal/fdi/policy ]
             then
                 # Install hal information about the mouse driver so that X.Org
@@ -469,6 +474,17 @@ EOF
                 # Delete the hal cache so that it notices our fdi file
                 rm -r /var/cache/hald/fdi-cache 2> /dev/null
             fi
+        test -n "$udevmouse" &&
+            if [ -d /etc/udev/rules.d ]
+            then
+                echo "KERNEL==\"vboxguest\",ENV{ID_INPUT}=\"1\"" > /etc/udev/rules.d/70-xorg-vboxmouse.rules
+                echo "KERNEL==\"vboxguest\",ENV{ID_INPUT_MOUSE}=\"1\"" >> /etc/udev/rules.d/70-xorg-vboxmouse.rules
+                echo "KERNEL==\"vboxguest\",ENV{x11_driver}=\"vboxmouse\"" >> /etc/udev/rules.d/70-xorg-vboxmouse.rules
+                # This is normally silent.  I have purposely not redirected
+                # error output as I want to know if something goes wrong,
+                # particularly if the command syntax ever changes.
+                udevadm trigger --action=change
+            fi
         succ_msg
         test -n "$generated" &&
             cat << EOF
@@ -598,6 +614,8 @@ EOF
 
     # Remove other files
     rm /etc/hal/fdi/policy/90-vboxguest.fdi 2>/dev/null
+    rm /etc/udev/rules.d/70-xorg-vboxmouse.rules 2>/dev/null
+    udevadm trigger --action=change 2>/dev/null
     rm /usr/share/xserver-xorg/pci/vboxvideo.ids 2>/dev/null
 }
 
diff --git a/src/VBox/Additions/linux/installer/vboxadd.sh b/src/VBox/Additions/linux/installer/vboxadd.sh
index de925a910..e0d5d5164 100755
--- a/src/VBox/Additions/linux/installer/vboxadd.sh
+++ b/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Sun VirtualBox
-# Linux Additions kernel module init script ($Revision: 56414 $)
+# Linux Additions kernel module init script ($Revision: 58884 $)
 #
 
 #
@@ -20,7 +20,7 @@
 #
 
 
-# chkconfig: 35 30 70
+# chkconfig: 357 30 70
 # description: VirtualBox Linux Additions kernel modules
 #
 ### BEGIN INIT INFO
@@ -400,6 +400,9 @@ setup()
 
     # Put mount.vboxsf in the right place
     ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
+    # At least Fedora 11 and Fedora 12 demand on the correct security context when
+    # executing this command from service scripts. Shouldn't hurt for other distributions.
+    chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1
 
     succ_msg
     if running_vboxguest || running_vboxadd; then
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c
new file mode 100644
index 000000000..f06bb43c1
--- /dev/null
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c
@@ -0,0 +1,710 @@
+/** @file
+ * VirtualBox File System for Solaris Guests, provider implementation.
+ */
+
+/*
+ * Copyright (C) 2008 Sun Microsystems, Inc.
+ *
+ * Sun Microsystems, Inc. confidential
+ * All rights reserved
+ */
+/*
+ * Provider interfaces for shared folder file system.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mntent.h>
+#include <sys/param.h>
+#include <sys/modctl.h>
+#include <sys/mount.h>
+#include <sys/policy.h>
+#include <sys/atomic.h>
+#include <sys/sysmacros.h>
+#include <sys/ddi.h>
+#include <sys/sunddi.h>
+#include "vboxfs_prov.h"
+#ifdef u
+#undef u
+#endif
+#include "../../common/VBoxGuestLib/VBoxCalls.h"
+
+#define	SFPROV_VERSION	1
+
+static VBSFCLIENT vbox_client;
+
+/*
+ * utility to create strings
+ */
+static SHFLSTRING *
+sfprov_string(char *path, int *sz)
+{
+	SHFLSTRING *str;
+	int len = strlen(path);
+
+	*sz = len + 1 + sizeof (*str) - sizeof (str->String);
+	str = kmem_zalloc(*sz, KM_SLEEP);
+	str->u16Size = len + 1;
+	str->u16Length = len;
+	strcpy(str->String.utf8, path);
+	return (str);
+}
+
+sfp_connection_t *
+sfprov_connect(int version)
+{
+	/*
+	 * only one version for now, so must match
+	 */
+	int rc = -1;
+	if (version != SFPROV_VERSION)
+	{
+		cmn_err(CE_WARN, "sfprov_connect: wrong version");
+		return NULL;
+	}
+	rc = vboxInit();
+	if (RT_SUCCESS(rc))
+	{
+	    rc = vboxConnect(&vbox_client);
+        if (RT_SUCCESS(rc))
+        {
+            rc = vboxCallSetUtf8(&vbox_client);
+            if (RT_SUCCESS(rc))
+            {
+            	return ((sfp_connection_t *)&vbox_client);
+            }
+            else
+        		cmn_err(CE_WARN, "sfprov_connect: vboxCallSetUtf8() failed");
+
+		    vboxDisconnect(&vbox_client);
+        }
+        else
+    		cmn_err(CE_WARN, "sfprov_connect: vboxConnect() failed rc=%d", rc);
+		vboxUninit();
+	}
+	else
+		cmn_err(CE_WARN, "sfprov_connect: vboxInit() failed rc=%d", rc);
+}
+
+void
+sfprov_disconnect(sfp_connection_t *conn)
+{
+	if (conn != (sfp_connection_t *)&vbox_client)
+		cmn_err(CE_WARN, "sfprov_disconnect: bad argument");
+	vboxDisconnect(&vbox_client);
+	vboxUninit();
+}
+
+
+/*
+ * representation of an active mount point
+ */
+struct sfp_mount {
+	VBSFMAP	map;
+};
+
+int
+sfprov_mount(sfp_connection_t *conn, char *path, sfp_mount_t **mnt)
+{
+	sfp_mount_t *m;
+	SHFLSTRING *str;
+	int size;
+	int rc;
+
+	m = kmem_zalloc(sizeof (*m), KM_SLEEP);
+	str = sfprov_string(path, &size);
+	rc = vboxCallMapFolder(&vbox_client, str, &m->map);
+	if (!VBOX_SUCCESS(rc)) {
+		cmn_err(CE_WARN, "sfprov_mount: vboxCallMapFolder() failed");
+		kmem_free(m, sizeof (*m));
+		*mnt = NULL;
+		rc = EINVAL;
+	} else {
+		*mnt = m;
+		rc = 0;
+	}
+	kmem_free(str, size);
+	return (rc);
+}
+
+int
+sfprov_unmount(sfp_mount_t *mnt)
+{
+	int rc;
+
+	rc = vboxCallUnmapFolder(&vbox_client, &mnt->map);
+	if (!VBOX_SUCCESS(rc)) {
+		cmn_err(CE_WARN, "sfprov_mount: vboxCallUnmapFolder() failed");
+		rc = EINVAL;
+	} else {
+		rc = 0;
+	}
+	kmem_free(mnt, sizeof (*mnt));
+	return (rc);
+}
+
+/*
+ * query information about a mounted file system
+ */
+int
+sfprov_get_blksize(sfp_mount_t *mnt, uint64_t *blksize)
+{
+	int rc;
+	SHFLVOLINFO info;
+	uint32_t bytes = sizeof(SHFLVOLINFO);
+
+	rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
+	    (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
+	if (VBOX_FAILURE(rc))
+		return (EINVAL);
+	*blksize = info.ulBytesPerAllocationUnit;
+	return (0);
+}
+
+int
+sfprov_get_blksused(sfp_mount_t *mnt, uint64_t *blksused)
+{
+	int rc;
+	SHFLVOLINFO info;
+	uint32_t bytes = sizeof(SHFLVOLINFO);
+
+	rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
+	    (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
+	if (VBOX_FAILURE(rc))
+		return (EINVAL);
+	*blksused = (info.ullTotalAllocationBytes -
+	    info.ullAvailableAllocationBytes) / info.ulBytesPerAllocationUnit;
+	return (0);
+}
+
+int
+sfprov_get_blksavail(sfp_mount_t *mnt, uint64_t *blksavail)
+{
+	int rc;
+	SHFLVOLINFO info;
+	uint32_t bytes = sizeof(SHFLVOLINFO);
+
+	rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
+	    (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
+	if (VBOX_FAILURE(rc))
+		return (EINVAL);
+	*blksavail =
+	    info.ullAvailableAllocationBytes / info.ulBytesPerAllocationUnit;
+	return (0);
+}
+
+int
+sfprov_get_maxnamesize(sfp_mount_t *mnt, uint32_t *maxnamesize)
+{
+	int rc;
+	SHFLVOLINFO info;
+	uint32_t bytes = sizeof(SHFLVOLINFO);
+
+	rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
+	    (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
+	if (VBOX_FAILURE(rc))
+		return (EINVAL);
+	*maxnamesize = info.fsProperties.cbMaxComponent;
+	return (0);
+}
+
+int
+sfprov_get_readonly(sfp_mount_t *mnt, uint32_t *readonly)
+{
+	int rc;
+	SHFLVOLINFO info;
+	uint32_t bytes = sizeof(SHFLVOLINFO);
+
+	rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
+	    (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
+	if (VBOX_FAILURE(rc))
+		return (EINVAL);
+	*readonly = info.fsProperties.fReadOnly;
+	return (0);
+}
+
+/*
+ * File operations: open/close/read/write/etc.
+ *
+ * open/create can return any relevant errno, however ENOENT
+ * generally means that the host file didn't exist.
+ */
+struct sfp_file {
+	SHFLHANDLE handle;
+	VBSFMAP map;	/* need this again for the close operation */
+};
+
+int
+sfprov_create(sfp_mount_t *mnt, char *path, sfp_file_t **fp)
+{
+	int rc;
+	SHFLCREATEPARMS parms;
+	SHFLSTRING *str;
+	int size;
+	sfp_file_t *newfp;
+
+	str = sfprov_string(path, &size);
+	parms.Handle = 0;
+	parms.Info.cbObject = 0;
+	parms.CreateFlags = SHFL_CF_ACT_CREATE_IF_NEW |
+	    SHFL_CF_ACT_REPLACE_IF_EXISTS | SHFL_CF_ACCESS_READWRITE;
+	rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+	kmem_free(str, size);
+
+	if (RT_FAILURE(rc))
+		return (EINVAL);
+	if (parms.Handle == SHFL_HANDLE_NIL) {
+		if (parms.Result == SHFL_FILE_EXISTS)
+			return (EEXIST);
+		return (ENOENT);
+	}
+	newfp = kmem_alloc(sizeof(sfp_file_t), KM_SLEEP);
+	newfp->handle = parms.Handle;
+	newfp->map = mnt->map;
+	*fp = newfp;
+	return (0);
+}
+
+int
+sfprov_open(sfp_mount_t *mnt, char *path, sfp_file_t **fp)
+{
+	int rc;
+	SHFLCREATEPARMS parms;
+	SHFLSTRING *str;
+	int size;
+	sfp_file_t *newfp;
+
+	/*
+	 * First we attempt to open it read/write. If that fails we
+	 * try read only.
+	 */
+	str = sfprov_string(path, &size);
+	parms.Handle = 0;
+	parms.Info.cbObject = 0;
+	parms.CreateFlags = SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READWRITE;
+	rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+
+	if (RT_FAILURE(rc)) {
+		kmem_free(str, size);
+		return (EINVAL);
+	}
+	if (parms.Handle == SHFL_HANDLE_NIL) {
+		if (parms.Result == SHFL_NO_RESULT ||
+		    parms.Result == SHFL_PATH_NOT_FOUND ||
+		    parms.Result == SHFL_FILE_NOT_FOUND) {
+			kmem_free(str, size);
+			return (ENOENT);
+		}
+		parms.CreateFlags =
+		    SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READ;
+		rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+		if (RT_FAILURE(rc)) {
+			kmem_free(str, size);
+			return (EINVAL);
+		}
+		if (parms.Handle == SHFL_HANDLE_NIL) {
+			kmem_free(str, size);
+			return (ENOENT);
+		}
+	}
+	newfp = kmem_alloc(sizeof(sfp_file_t), KM_SLEEP);
+	newfp->handle = parms.Handle;
+	newfp->map = mnt->map;
+	*fp = newfp;
+	return (0);
+}
+
+int
+sfprov_trunc(sfp_mount_t *mnt, char *path)
+{
+	int rc;
+	SHFLCREATEPARMS parms;
+	SHFLSTRING *str;
+	int size;
+	sfp_file_t *newfp;
+
+	/*
+	 * open it read/write.
+	 */
+	str = sfprov_string(path, &size);
+	parms.Handle = 0;
+	parms.Info.cbObject = 0;
+	parms.CreateFlags = SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READWRITE |
+	    SHFL_CF_ACT_OVERWRITE_IF_EXISTS;
+	rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+
+	if (RT_FAILURE(rc)) {
+		kmem_free(str, size);
+		return (EINVAL);
+	}
+	(void)vboxCallClose(&vbox_client, &mnt->map, parms.Handle);
+	return (0);
+}
+
+int
+sfprov_close(sfp_file_t *fp)
+{
+	int rc;
+
+	rc = vboxCallClose(&vbox_client, &fp->map, fp->handle);
+	kmem_free(fp, sizeof(sfp_file_t));
+	return (0);
+}
+
+int
+sfprov_read(sfp_file_t *fp, char *buffer, uint64_t offset, uint32_t *numbytes)
+{
+	int rc;
+
+	rc = vboxCallRead(&vbox_client, &fp->map, fp->handle, offset,
+	    numbytes, (uint8_t *)buffer, 0);	/* what is that last arg? */
+	if (RT_FAILURE(rc))
+		return (EINVAL);
+	return (0);
+}
+
+int
+sfprov_write(sfp_file_t *fp, char *buffer, uint64_t offset, uint32_t *numbytes)
+{
+	int rc;
+
+	rc = vboxCallWrite(&vbox_client, &fp->map, fp->handle, offset,
+	    numbytes, (uint8_t *)buffer, 0);	/* what is that last arg? */
+	if (RT_FAILURE(rc))
+		return (EINVAL);
+	return (0);
+}
+
+
+static int
+sfprov_getinfo(sfp_mount_t *mnt, char *path, RTFSOBJINFO *info)
+{
+	int rc;
+	SHFLCREATEPARMS parms;
+	SHFLSTRING *str;
+	int size;
+
+	str = sfprov_string(path, &size);
+	parms.Handle = 0;
+	parms.Info.cbObject = 0;
+	parms.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
+	rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+	kmem_free(str, size);
+
+	if (RT_FAILURE(rc))
+		return (EINVAL);
+	if (parms.Result != SHFL_FILE_EXISTS)
+		return (ENOENT);
+	*info = parms.Info;
+	return (0);
+}
+
+/*
+ * get information about a file (or directory)
+ */
+int
+sfprov_get_mode(sfp_mount_t *mnt, char *path, mode_t *mode)
+{
+	int rc;
+	RTFSOBJINFO info;
+	mode_t m = 0;
+
+	rc = sfprov_getinfo(mnt, path, &info);
+	if (rc)
+		return (rc);
+	if (RTFS_IS_DIRECTORY(info.Attr.fMode))
+		m |= S_IFDIR;
+	else if (RTFS_IS_FILE(info.Attr.fMode))
+		m |= S_IFREG;
+	else if (RTFS_IS_FIFO(info.Attr.fMode))
+		m |= S_IFDIR;
+	else if (RTFS_IS_DEV_CHAR(info.Attr.fMode))
+		m |= S_IFCHR;
+	else if (RTFS_IS_DEV_BLOCK(info.Attr.fMode))
+		m |= S_IFBLK;
+	else if (RTFS_IS_SYMLINK(info.Attr.fMode))
+		m |= S_IFLNK;
+	else if (RTFS_IS_SOCKET(info.Attr.fMode))
+		m |= S_IFSOCK;
+
+	if (info.Attr.fMode & RTFS_UNIX_IRUSR)
+		m |= S_IRUSR;
+	if (info.Attr.fMode & RTFS_UNIX_IWUSR)
+		m |= S_IWUSR;
+	if (info.Attr.fMode & RTFS_UNIX_IXUSR)
+		m |= S_IXUSR;
+	if (info.Attr.fMode & RTFS_UNIX_IRGRP)
+		m |= S_IRGRP;
+	if (info.Attr.fMode & RTFS_UNIX_IWGRP)
+		m |= S_IWGRP;
+	if (info.Attr.fMode & RTFS_UNIX_IXGRP)
+		m |= S_IXGRP;
+	if (info.Attr.fMode & RTFS_UNIX_IROTH)
+		m |= S_IROTH;
+	if (info.Attr.fMode & RTFS_UNIX_IWOTH)
+		m |= S_IWOTH;
+	if (info.Attr.fMode & RTFS_UNIX_IXOTH)
+		m |= S_IXOTH;
+	*mode = m;
+	return (0);
+}
+
+int
+sfprov_get_size(sfp_mount_t *mnt, char *path, uint64_t *size)
+{
+	int rc;
+	RTFSOBJINFO info;
+
+	rc = sfprov_getinfo(mnt, path, &info);
+	if (rc)
+		return (rc);
+	*size = info.cbObject;
+	return (0);
+}
+
+int
+sfprov_get_atime(sfp_mount_t *mnt, char *path, timestruc_t *time)
+{
+	int rc;
+	RTFSOBJINFO info;
+	uint64_t nanosec;
+
+	rc = sfprov_getinfo(mnt, path, &info);
+	if (rc)
+		return (rc);
+	nanosec = RTTimeSpecGetNano(&info.AccessTime);
+	time->tv_sec = nanosec / 1000000000;
+	time->tv_nsec = nanosec % 1000000000;
+	return (0);
+}
+
+int
+sfprov_get_mtime(sfp_mount_t *mnt, char *path, timestruc_t *time)
+{
+	int rc;
+	RTFSOBJINFO info;
+	uint64_t nanosec;
+
+	rc = sfprov_getinfo(mnt, path, &info);
+	if (rc)
+		return (rc);
+	nanosec = RTTimeSpecGetNano(&info.ModificationTime);
+	time->tv_sec = nanosec / 1000000000;
+	time->tv_nsec = nanosec % 1000000000;
+	return (0);
+}
+
+int
+sfprov_get_ctime(sfp_mount_t *mnt, char *path, timestruc_t *time)
+{
+	int rc;
+	RTFSOBJINFO info;
+	uint64_t nanosec;
+
+	rc = sfprov_getinfo(mnt, path, &info);
+	if (rc)
+		return (rc);
+	nanosec = RTTimeSpecGetNano(&info.ChangeTime);
+	time->tv_sec = nanosec / 1000000000;
+	time->tv_nsec = nanosec % 1000000000;
+	return (0);
+}
+
+/*
+ * Directory operations
+ */
+int
+sfprov_mkdir(sfp_mount_t *mnt, char *path, sfp_file_t **fp)
+{
+	int rc;
+	SHFLCREATEPARMS parms;
+	SHFLSTRING *str;
+	int size;
+	sfp_file_t *newfp;
+
+	str = sfprov_string(path, &size);
+	parms.Handle = 0;
+	parms.Info.cbObject = 0;
+	parms.CreateFlags = SHFL_CF_DIRECTORY | SHFL_CF_ACT_CREATE_IF_NEW |
+	    SHFL_CF_ACT_FAIL_IF_EXISTS | SHFL_CF_ACCESS_READ;
+	rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+	kmem_free(str, size);
+
+	if (RT_FAILURE(rc))
+		return (EINVAL);
+	if (parms.Handle == SHFL_HANDLE_NIL) {
+		if (parms.Result == SHFL_FILE_EXISTS)
+			return (EEXIST);
+		return (ENOENT);
+	}
+	newfp = kmem_alloc(sizeof(sfp_file_t), KM_SLEEP);
+	newfp->handle = parms.Handle;
+	newfp->map = mnt->map;
+	*fp = newfp;
+	return (0);
+}
+
+int
+sfprov_remove(sfp_mount_t *mnt, char *path)
+{
+	int rc;
+	SHFLSTRING *str;
+	int size;
+
+	str = sfprov_string(path, &size);
+	rc = vboxCallRemove(&vbox_client, &mnt->map, str, SHFL_REMOVE_FILE);
+	kmem_free(str, size);
+	if (RT_FAILURE(rc))
+		return (EINVAL);
+	return (0);
+}
+
+int
+sfprov_rmdir(sfp_mount_t *mnt, char *path)
+{
+	int rc;
+	SHFLSTRING *str;
+	int size;
+
+	str = sfprov_string(path, &size);
+	rc = vboxCallRemove(&vbox_client, &mnt->map, str, SHFL_REMOVE_DIR);
+	kmem_free(str, size);
+	if (RT_FAILURE(rc))
+		return (RTErrConvertToErrno(rc));
+	return (0);
+}
+
+int
+sfprov_rename(sfp_mount_t *mnt, char *from, char *to, uint_t is_dir)
+{
+	int rc;
+	SHFLSTRING *old, *new;
+	int old_size, new_size;
+
+	old = sfprov_string(from, &old_size);
+	new = sfprov_string(to, &new_size);
+	rc = vboxCallRename(&vbox_client, &mnt->map, old, new,
+	    (is_dir ? SHFL_RENAME_DIR : SHFL_RENAME_FILE) |
+	    SHFL_RENAME_REPLACE_IF_EXISTS);
+	kmem_free(old, old_size);
+	kmem_free(new, new_size);
+	if (RT_FAILURE(rc))
+		return (RTErrConvertToErrno(rc));
+	return (0);
+}
+
+
+/*
+ * Read all filenames in a directory.
+ *
+ * - success - all entries read and returned
+ * - ENOENT - Couldn't open the directory for reading
+ * - EINVAL - Internal error of some kind
+ *
+ * On successful return, buffer[0] is the start of an array of "char *"
+ * pointers to the filenames. The array ends with a NULL pointer.
+ * The remaining storage in buffer after that NULL pointer is where the
+ * filename strings actually are.
+ *
+ * On input nents is the max number of filenames the requestor can handle.
+ * On output nents is the number of entries at buff[0]
+ *
+ * The caller is responsible for freeing the returned buffer.
+ */
+int
+sfprov_readdir(
+	sfp_mount_t *mnt,
+	char *path,
+	void **buffer,
+	size_t *buffersize,
+	uint32_t *nents)
+{
+	int error;
+	char *cp;
+	int len;
+	SHFLSTRING *mask_str = NULL;	/* must be path with "/*" appended */
+	int mask_size;
+	sfp_file_t *fp;
+	void *buff_start = NULL;
+	char **curr_b;
+	char *buff_end;
+	size_t buff_size;
+	static char infobuff[2 * MAXNAMELEN];	/* not on stack!! */
+	SHFLDIRINFO *info = (SHFLDIRINFO *)&infobuff;
+	uint32_t numbytes = sizeof (infobuff);
+	uint32_t justone;
+	uint32_t cnt;
+	char **name_ptrs;
+
+	*buffer = NULL;
+	*buffersize = 0;
+	if (*nents == 0)
+		return (EINVAL);
+	error = sfprov_open(mnt, path, &fp);
+	if (error != 0)
+		return (ENOENT);
+
+	/*
+	 * Create mask that VBox expects. This needs to be the directory path,
+	 * plus a "*" wildcard to get all files.
+	 */
+	len = strlen(path) + 3;
+	cp = kmem_alloc(len, KM_SLEEP);
+	strcpy(cp, path);
+	strcat(cp, "/*");
+	mask_str = sfprov_string(cp, &mask_size);
+	kmem_free(cp, len);
+
+	/*
+	 * Allocate the buffer to use for return values. Each entry
+	 * in the buffer will have a pointer and the string itself.
+	 * The pointers go in the front of the buffer, the strings
+	 * at the end.
+	 */
+	buff_size = *nents * (sizeof(char *) + MAXNAMELEN);
+	name_ptrs = buff_start = kmem_alloc(buff_size, KM_SLEEP);
+	cp = (char *)buff_start + buff_size;
+
+	/*
+	 * Now loop using vboxCallDirInfo to get one file name at a time
+	 */
+	cnt = 0;
+	for (;;) {
+		justone = 1;
+		numbytes = sizeof (infobuff);
+		error = vboxCallDirInfo(&vbox_client, &fp->map, fp->handle,
+		    mask_str, SHFL_LIST_RETURN_ONE, cnt, &numbytes, info,
+		    &justone);
+		if (error == VERR_NO_MORE_FILES) {
+			break;
+		}
+		if (error == VERR_NO_TRANSLATION) {
+			continue;	/* ?? just skip this one */
+		}
+		if (error != VINF_SUCCESS || justone != 1) {
+			error = EINVAL;
+	 		goto done;
+		}
+
+		/*
+		 * Put this name in the buffer, stop if we run out of room.
+		 */
+		cp -= strlen(info->name.String.utf8) + 1;
+		if (cp < (char *)(&name_ptrs[cnt + 2]))
+			break;
+		strcpy(cp, info->name.String.utf8);
+		name_ptrs[cnt] = cp;
+		++cnt;
+	}
+	error = 0;
+	name_ptrs[cnt] = NULL;
+	*nents = cnt;
+	*buffer = buff_start;
+	*buffersize = buff_size;
+done:
+	if (error != 0)
+		kmem_free(buff_start, buff_size);
+	kmem_free(mask_str, mask_size);
+	sfprov_close(fp);
+	return (error);
+}
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h
new file mode 100644
index 000000000..c1ef4b89c
--- /dev/null
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h
@@ -0,0 +1,110 @@
+/** @file
+ * VirtualBox File System for Solaris Guests, provider header.
+ */
+
+/*
+ * Copyright (C) 2009 Sun Microsystems, Inc.
+ *
+ * Sun Microsystems, Inc. confidential
+ * All rights reserved
+ */
+
+#ifndef	__VBoxFS_prov_Solaris_h
+#define	__VBoxFS_prov_Solaris_h
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+ * These are the provider interfaces used by sffs to access the underlying
+ * shared file system.
+ */
+#define	SFPROV_VERSION	1
+
+/*
+ * Initialization and termination.
+ * sfprov_connect() is called once before any other interfaces and returns
+ * a handle used in further calls. The argument should be SFPROV_VERSION
+ * from above. On failure it returns a NULL pointer.
+ *
+ * sfprov_disconnect() must only be called after all sf file systems have been
+ * unmounted.
+ */
+typedef struct sfp_connection sfp_connection_t;
+
+extern sfp_connection_t *sfprov_connect(int);
+extern void sfprov_disconnect(sfp_connection_t *);
+
+
+/*
+ * Mount / Unmount a shared folder.
+ *
+ * sfprov_mount() takes as input the connection pointer and the name of
+ * the shared folder. On success, it returns zero and supplies an
+ * sfp_mount_t handle. On failure it returns any relevant errno value.
+ *
+ * sfprov_unmount() unmounts the mounted file system. It returns 0 on
+ * success and any relevant errno on failure.
+ */
+typedef struct sfp_mount sfp_mount_t;
+
+extern int sfprov_mount(sfp_connection_t *, char *, sfp_mount_t **);
+extern int sfprov_unmount(sfp_mount_t *);
+
+/*
+ * query information about a mounted file system
+ */
+extern int sfprov_get_blksize(sfp_mount_t *, uint64_t *);
+extern int sfprov_get_blksused(sfp_mount_t *, uint64_t *);
+extern int sfprov_get_blksavail(sfp_mount_t *, uint64_t *);
+extern int sfprov_get_maxnamesize(sfp_mount_t *, uint32_t *);
+extern int sfprov_get_readonly(sfp_mount_t *, uint32_t *);
+
+/*
+ * File operations: open/close/read/write/etc.
+ *
+ * open/create can return any relevant errno, however ENOENT
+ * generally means that the host file didn't exist.
+ */
+typedef struct sfp_file sfp_file_t;
+
+extern int sfprov_create(sfp_mount_t *, char *path, sfp_file_t **fp);
+extern int sfprov_open(sfp_mount_t *, char *path, sfp_file_t **fp);
+extern int sfprov_close(sfp_file_t *fp);
+extern int sfprov_read(sfp_file_t *, char * buffer, uint64_t offset,
+    uint32_t *numbytes);
+extern int sfprov_write(sfp_file_t *, char * buffer, uint64_t offset,
+    uint32_t *numbytes);
+
+
+/*
+ * get information about a file (or directory) using pathname
+ */
+extern int sfprov_get_mode(sfp_mount_t *, char *, mode_t *);
+extern int sfprov_get_size(sfp_mount_t *, char *, uint64_t *);
+extern int sfprov_get_atime(sfp_mount_t *, char *, timestruc_t *);
+extern int sfprov_get_mtime(sfp_mount_t *, char *, timestruc_t *);
+extern int sfprov_get_ctime(sfp_mount_t *, char *, timestruc_t *);
+
+
+/*
+ * File/Directory operations
+ */
+extern int sfprov_trunc(sfp_mount_t *, char *);
+extern int sfprov_remove(sfp_mount_t *, char *path);
+extern int sfprov_mkdir(sfp_mount_t *, char *path, sfp_file_t **fp);
+extern int sfprov_rmdir(sfp_mount_t *, char *path);
+extern int sfprov_rename(sfp_mount_t *, char *from, char *to, uint_t is_dir);
+
+/*
+ * Read directory entries.
+ */
+extern int sfprov_readdir(sfp_mount_t *mnt, char *path, void **buffer,
+	size_t *buffersize, uint32_t *nents);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* __VBoxFS_prov_Solaris_h */
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c
new file mode 100644
index 000000000..599224a7b
--- /dev/null
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c
@@ -0,0 +1,486 @@
+/** @file
+ * VirtualBox File System for Solaris Guests, VFS implementation.
+ */
+
+/*
+ * Copyright (C) 2009 Sun Microsystems, Inc.
+ *
+ * Sun Microsystems, Inc. confidential
+ * All rights reserved
+ */
+
+#include <VBox/log.h>
+#include <VBox/version.h>
+
+#include <sys/types.h>
+#include <sys/mntent.h>
+#include <sys/param.h>
+#include <sys/modctl.h>
+#include <sys/mount.h>
+#include <sys/policy.h>
+#include <sys/atomic.h>
+#include <sys/sysmacros.h>
+#include <sys/ddi.h>
+#include <sys/sunddi.h>
+#include <sys/vfs.h>
+#if !defined(VBOX_VFS_SOLARIS_10U6)
+#include <sys/vfs_opreg.h>
+#endif
+#include <sys/pathname.h>
+#include "vboxfs_prov.h"
+#include "vboxfs_vnode.h"
+#include "vboxfs_vfs.h"
+
+#ifdef u
+#undef u
+#endif
+
+#define VBOXSOLQUOTE2(x)                #x
+#define VBOXSOLQUOTE(x)                 VBOXSOLQUOTE2(x)
+/** The module name. */
+#define DEVICE_NAME                     "vboxfs"
+/** The module description as seen in 'modinfo'. */
+#define DEVICE_DESC                     "VirtualBox ShrdFS"
+
+
+/*
+ * Shared Folders filesystem implementation of the Solaris VFS interfaces.
+ * Much of this is cookie cutter code for Solaris filesystem implementation.
+ */
+
+/* forward declarations */
+static int sffs_init(int fstype, char *name);
+static int sffs_mount(vfs_t *, vnode_t *, struct mounta *, cred_t *);
+static int sffs_unmount(vfs_t *vfsp, int flag, cred_t *cr);
+static int sffs_root(vfs_t *vfsp, vnode_t **vpp);
+static int sffs_statvfs(vfs_t *vfsp, statvfs64_t *sbp);
+
+static mntopt_t sffs_options[] = {
+	/* Option	Cancels Opt	Arg	Flags		Data */
+	{"uid",		NULL,		NULL,	MO_HASVALUE,	NULL},
+	{"gid",		NULL,		NULL,	MO_HASVALUE,	NULL}
+};
+
+static mntopts_t sffs_options_table = {
+	sizeof (sffs_options) / sizeof (mntopt_t),
+	sffs_options
+};
+
+static vfsdef_t sffs_vfsdef = {
+	VFSDEF_VERSION,
+	DEVICE_NAME,
+	sffs_init,
+	VSW_HASPROTO,
+	&sffs_options_table
+};
+
+static int sffs_fstype;
+static int sffs_major;	/* major number for device */
+
+kmutex_t sffs_minor_lock;
+int sffs_minor;		/* minor number for device */
+
+/*
+ * Module linkage information
+ */
+static struct modlfs modlfs = {
+	&mod_fsops,
+	DEVICE_DESC " " VBOX_VERSION_STRING "r" VBOXSOLQUOTE(VBOX_SVN_REV),
+	&sffs_vfsdef
+};
+
+static struct modlinkage modlinkage = {
+	MODREV_1, &modlfs, NULL
+};
+
+static sfp_connection_t *sfprov = NULL;
+
+int
+_init()
+{
+	return (mod_install(&modlinkage));
+}
+
+int
+_info(struct modinfo *modinfop)
+{
+	return (mod_info(&modlinkage, modinfop));
+}
+
+
+int
+_fini()
+{
+	int error;
+
+	error = mod_remove(&modlinkage);
+	if (error)
+		return (error);
+
+	/*
+	 * Tear down the operations vectors
+	 */
+	sffs_vnode_fini();
+	(void) vfs_freevfsops_by_type(sffs_fstype);
+
+	/*
+	 * close connection to the provider
+	 */
+	sfprov_disconnect(sfprov);
+	return (0);
+}
+
+
+static int
+sffs_init(int fstype, char *name)
+{
+#if defined(VBOX_VFS_SOLARIS_10U6)
+	static const fs_operation_def_t sffs_vfsops_template[] = {
+		VFSNAME_MOUNT,		sffs_mount,
+		VFSNAME_UNMOUNT,	sffs_unmount,
+		VFSNAME_ROOT,		sffs_root,
+		VFSNAME_STATVFS,	sffs_statvfs,
+		NULL,			NULL
+	};
+#else
+	static const fs_operation_def_t sffs_vfsops_template[] = {
+		VFSNAME_MOUNT,		{ .vfs_mount = sffs_mount },
+		VFSNAME_UNMOUNT,	{ .vfs_unmount = sffs_unmount },
+		VFSNAME_ROOT,		{ .vfs_root = sffs_root },
+		VFSNAME_STATVFS,	{ .vfs_statvfs = sffs_statvfs },
+		NULL,			NULL
+	};
+#endif
+	int error;
+
+	ASSERT(fstype != 0);
+	sffs_fstype = fstype;
+	LogFlowFunc(("sffs_init() name=%s\n", name));
+
+	/*
+	 * This may seem a silly way to do things for now. But the code
+	 * is structured to easily allow it to be used on other hypervisors
+	 * which would have a different implementation of the provider.
+	 * Hopefully that'll never happen. :)
+	 */
+	sfprov = sfprov_connect(SFPROV_VERSION);
+	if (sfprov == NULL) {
+		cmn_err(CE_WARN, "sffs_init(): couldn't init sffs provider");
+		return (ENODEV);
+	}
+
+	error = vfs_setfsops(fstype, sffs_vfsops_template, NULL);
+	if (error != 0) {
+		cmn_err(CE_WARN, "sffs_init: bad vfs ops template");
+		return (error);
+	}
+
+	error = sffs_vnode_init();
+	if (error != 0) {
+		(void) vfs_freevfsops_by_type(fstype);
+		cmn_err(CE_WARN, "sffs_init: bad vnode ops template");
+		return (error);
+	}
+
+	if ((sffs_major = getudev()) == (major_t)-1) {
+		cmn_err(CE_WARN, "sffs_init: Can't get unique device number.");
+		sffs_major = 0;
+	}
+	mutex_init(&sffs_minor_lock, NULL, MUTEX_DEFAULT, NULL);
+	return (0);
+}
+
+/*
+ * wrapper for pn_get
+ */
+static int
+sf_pn_get(char *rawpath, struct mounta *uap, char **outpath)
+{
+	pathname_t path;
+	int error;
+
+	error = pn_get(rawpath, (uap->flags & MS_SYSSPACE) ? UIO_SYSSPACE :
+	    UIO_USERSPACE, &path);
+	if (error) {
+		LogFlowFunc(("pn_get(%s) failed\n", rawpath));
+		return (error);
+	}
+	*outpath = kmem_alloc(path.pn_pathlen + 1, KM_SLEEP);
+	strcpy(*outpath, path.pn_path);
+	pn_free(&path);
+	return (0);
+}
+
+static int
+sffs_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr)
+{
+	sffs_data_t *sffs;
+	char *mount_point = NULL;
+	char *share_name = NULL;
+	int error;
+	dev_t dev;
+	uid_t uid = 0;
+	gid_t gid = 0;
+	char *optval;
+	long val;
+	char *path;
+	sfp_mount_t *handle;
+	sfnode_t *sfnode;
+
+	/*
+	 * check we have permission to do the mount
+	 */
+	LogFlowFunc(("sffs_mount() started\n"));
+	error = secpolicy_fs_mount(cr, mvp, vfsp);
+	if (error != 0)
+		return (error);
+
+	/*
+	 * Mount point must be a directory
+	 */
+	if (mvp->v_type != VDIR)
+		return (ENOTDIR);
+
+	/*
+	 * no support for remount (what is it?)
+	 */
+	if (uap->flags & MS_REMOUNT)
+		return (ENOTSUP);
+
+	/*
+	 * Ensure that nothing else is actively in/under the mount point
+	 */
+	mutex_enter(&mvp->v_lock);
+	if ((uap->flags & MS_OVERLAY) == 0 &&
+	    (mvp->v_count != 1 || (mvp->v_flag & VROOT))) {
+		mutex_exit(&mvp->v_lock);
+		return (EBUSY);
+	}
+	mutex_exit(&mvp->v_lock);
+
+	/*
+	 * check for read only has to be done early
+	 */
+	if (uap->flags & MS_RDONLY) {
+		vfsp->vfs_flag |= VFS_RDONLY;
+		vfs_setmntopt(vfsp, MNTOPT_RO, NULL, 0);
+	}
+
+	/*
+	 * UID to use for all files
+	 */
+	if (vfs_optionisset(vfsp, "uid", &optval) &&
+	    ddi_strtol(optval, NULL, 10, &val) == 0 &&
+	    (uid_t)val == val)
+		uid = val;
+
+	/*
+	 * GID to use for all files
+	 */
+	if (vfs_optionisset(vfsp, "gid", &optval) &&
+	    ddi_strtol(optval, NULL, 10, &val) == 0 &&
+	    (gid_t)val == val)
+		gid = val;
+
+	/*
+	 * Any unknown options are an error
+	 */
+	if ((uap->flags & MS_DATA) && uap->datalen > 0) {
+		cmn_err(CE_WARN, "sffs: unknown mount options specified");
+		return (EINVAL);
+	}
+
+	/*
+	 * get the mount point pathname
+	 */
+	error = sf_pn_get(uap->dir, uap, &mount_point);
+	if (error)
+		return (error);
+	
+	/*
+	 * find what we are mounting
+	 */
+	error = sf_pn_get(uap->spec, uap, &share_name);
+	if (error) {
+		kmem_free(mount_point, strlen(mount_point) + 1);
+		return (error);
+	}
+
+	/*
+	 * Invoke Hypervisor mount interface before proceeding
+	 */
+	error = sfprov_mount(sfprov, share_name, &handle);
+	if (error) {
+		kmem_free(share_name, strlen(share_name) + 1);
+		kmem_free(mount_point, strlen(mount_point) + 1);
+		return (error);
+	}
+
+        /*
+         * find an available minor device number for this mount
+         */
+        mutex_enter(&sffs_minor_lock);
+        do {
+                sffs_minor = (sffs_minor + 1) & L_MAXMIN32;
+                dev = makedevice(sffs_major, sffs_minor);
+	} while (vfs_devismounted(dev));
+	mutex_exit(&sffs_minor_lock);
+
+	/*
+	 * allocate and fill in the sffs structure
+	 */
+	sffs = kmem_alloc(sizeof (*sffs), KM_SLEEP);
+	sffs->sf_vfsp = vfsp;
+	sffs->sf_uid = uid;
+	sffs->sf_gid = gid;
+	sffs->sf_share_name = share_name;
+	sffs->sf_mntpath = mount_point;
+	sffs->sf_handle = handle;
+	sffs->sf_ino = 3;	/* root mount point is always '3' */
+
+	/*
+	 * fill in the vfs structure
+	 */
+	vfsp->vfs_data = (caddr_t)sffs;
+	vfsp->vfs_fstype = sffs_fstype;
+	vfsp->vfs_dev = dev;
+	vfsp->vfs_bsize = PAGESIZE; /* HERE JOE ??? */
+	vfsp->vfs_flag |= VFS_NOTRUNC; /* HERE JOE ???? */
+	vfs_make_fsid(&vfsp->vfs_fsid, dev, sffs_fstype);
+
+	/*
+	 * create the root vnode.
+	 * XXX JOE What should the path be here? is "/" really right?
+	 * other options?
+	 */
+	path = kmem_alloc(2, KM_SLEEP);
+	strcpy(path, ".");
+	mutex_enter(&sffs_lock);
+	sfnode = sfnode_make(sffs, path, VDIR, NULL, NULL);
+	sffs->sf_rootnode = sfnode_get_vnode(sfnode);
+	sffs->sf_rootnode->v_flag |= VROOT;
+	sffs->sf_rootnode->v_vfsp = vfsp;
+	mutex_exit(&sffs_lock);
+
+	LogFlowFunc(("sffs_mount() success sffs=0x%p\n", sffs));
+	return (error);
+}
+
+static int
+sffs_unmount(vfs_t *vfsp, int flag, cred_t *cr)
+{
+	sffs_data_t *sffs = (sffs_data_t *)vfsp->vfs_data;
+	int error;
+
+	/*
+	 * generic securty check
+	 */
+	LogFlowFunc(("sffs_unmount() of sffs=0x%p\n", sffs));
+	if ((error = secpolicy_fs_unmount(cr, vfsp)) != 0)
+		return (error);
+
+	/*
+	 * forced unmount is not supported by this file system
+	 * and thus, ENOTSUP, is being returned.
+	 */
+	if (flag & MS_FORCE)
+		return (ENOTSUP);
+
+	/*
+	 * Make sure nothing is still in use.
+	 */
+	if (sffs_purge(sffs) != 0)
+		return (EBUSY);
+
+	/*
+	 * Invoke Hypervisor unmount interface before proceeding
+	 */
+	error = sfprov_unmount(sffs->sf_handle);
+	if (error != 0) {
+		/* TBD anything here? */
+	}
+
+	kmem_free(sffs->sf_share_name, strlen(sffs->sf_share_name) + 1);
+	kmem_free(sffs->sf_mntpath, strlen(sffs->sf_mntpath) + 1);
+	kmem_free(sffs, sizeof(*sffs));
+	LogFlowFunc(("sffs_unmount() done\n"));
+	return (0);
+}
+
+/*
+ * return the vnode for the root of the mounted file system
+ */
+static int
+sffs_root(vfs_t *vfsp, vnode_t **vpp)
+{
+	sffs_data_t *sffs = (sffs_data_t *)vfsp->vfs_data;
+	vnode_t *vp = sffs->sf_rootnode;
+
+	VN_HOLD(vp);
+	*vpp = vp;
+	return (0);
+}
+
+/*
+ * get some stats.. fake up the rest
+ */
+static int
+sffs_statvfs(vfs_t *vfsp, statvfs64_t *sbp)
+{
+	sffs_data_t *sffs = (sffs_data_t *)vfsp->vfs_data;
+	uint64_t x;
+	uint32_t u;
+	dev32_t d32;
+	int error;
+
+	bzero(sbp, sizeof(*sbp));
+	error = sfprov_get_blksize(sffs->sf_handle, &x);
+	if (error != 0)
+		return (error);
+	sbp->f_bsize = x;
+	sbp->f_frsize = x;
+
+	error = sfprov_get_blksavail(sffs->sf_handle, &x);
+	if (error != 0)
+		return (error);
+	sbp->f_bfree = x;
+	sbp->f_bavail = x;
+	sbp->f_files = x / 4;	/* some kind of reasonable value */
+	sbp->f_ffree = x / 4;
+	sbp->f_favail = x / 4;
+
+	error = sfprov_get_blksused(sffs->sf_handle, &x);
+	if (error != 0)
+		return (error);
+	sbp->f_blocks = x + sbp->f_bavail;
+
+	(void) cmpldev(&d32, vfsp->vfs_dev);
+	sbp->f_fsid = d32;
+	strcpy(&sbp->f_basetype[0], "sffs");
+	sbp->f_flag |= ST_NOSUID;
+
+	error = sfprov_get_readonly(sffs->sf_handle, &u);
+	if (error != 0)
+		return (error);
+	if (u)
+		sbp->f_flag |= ST_RDONLY;
+
+	error = sfprov_get_maxnamesize(sffs->sf_handle, &u);
+	if (error != 0)
+		return (error);
+	sbp->f_namemax = u;
+	return (0);
+}
+
+static void sffs_print(sffs_data_t *sffs)
+{
+	Log(("sffs_data_t at 0x%p\n", sffs));
+	Log(("    vfs_t *sf_vfsp = 0x%p\n", sffs->sf_vfsp));
+	Log(("    vnode_t *sf_rootnode = 0x%p\n", sffs->sf_rootnode));
+	Log(("    uid_t sf_uid = 0x%l\n", (ulong_t)sffs->sf_uid));
+	Log(("    gid_t sf_gid = 0x%l\n", (ulong_t)sffs->sf_gid));
+	Log(("    char *sf_share_name = %s\n", sffs->sf_share_name));
+	Log(("    char *sf_mntpath = %s\n", sffs->sf_mntpath));
+	Log(("    sfp_mount_t *sf_handle = 0x%p\n", sffs->sf_handle));
+}
+
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h
new file mode 100644
index 000000000..95b93671b
--- /dev/null
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h
@@ -0,0 +1,38 @@
+/** @file
+ * VirtualBox File System Driver for Solaris Guests, VFS header.
+ */
+
+/*
+ * Copyright (C) 2009 Sun Microsystems, Inc.
+ *
+ * Sun Microsystems, Inc. confidential
+ * All rights reserved
+ */
+
+#ifndef	__VBoxFS_vfs_Solaris_h
+#define	__VBoxFS_vfs_Solaris_h
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+ * Shared Folders filesystem per-mount data structure.
+ */
+typedef struct sffs_data {
+	vfs_t		*sf_vfsp;	/* filesystem's vfs struct */
+	vnode_t		*sf_rootnode;	/* of vnode of the root directory */
+	uid_t		sf_uid;		/* owner of all shared folders */
+	gid_t		sf_gid;		/* group of all shared folders */
+	char		*sf_share_name;
+	char 		*sf_mntpath;	/* name of mount point */
+	sfp_mount_t	*sf_handle;
+	uint64_t	sf_ino;		/* per FS ino generator */
+} sffs_data_t;
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* __VBoxFS_vfs_Solaris_h */
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c
new file mode 100644
index 000000000..793fb8b8f
--- /dev/null
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c
@@ -0,0 +1,1630 @@
+/** @file
+ * VirtualBox File System for Solaris Guests, vnode implementation.
+ */
+
+/*
+ * Copyright (C) 2009 Sun Microsystems, Inc.
+ *
+ * Sun Microsystems, Inc. confidential
+ * All rights reserved
+ */
+
+/*
+ * Shared Folder File System is used from Solaris when run as a guest operating
+ * system on VirtualBox, though is meant to be usable with any hypervisor that
+ * can provide similar functionality. The sffs code handles all the Solaris
+ * specific semantics and relies on a provider module to actually access
+ * directories, files, etc. The provider interfaces are described in
+ * "vboxfs_prov.h" and the module implementing them is shipped as part of the
+ * VirtualBox Guest Additions for Solaris.
+ *
+ * The shared folder file system is similar to a networked file system,
+ * but with some caveats. The sffs code caches minimal information and proxies
+ * out to the provider whenever possible. Here are some things that are
+ * handled in this code and not by the proxy:
+ *
+ * - a way to open ".." from any already open directory
+ * - st_ino numbers
+ * - detecting directory changes that happened on the host.
+ *
+ * The implementation builds a cache of information for every file/directory
+ * ever accessed in all mounted sffs filesystems using sf_node structures.
+ *
+ * This information for both open or closed files can become invalid if
+ * asynchronous changes are made on the host. Solaris should not panic() in
+ * this event, but some file system operations may return unexpected errors.
+ * Information for such directories or files while they have active vnodes
+ * is removed from the regular cache and stored in a "stale" bucket until
+ * the vnode becomes completely inactive.
+ *
+ * No file data is cached in the guest. This means we don't support mmap() yet.
+ * A future version could relatively easily add support for read-only
+ * mmap(MAP_SHARED) and any mmap(MAP_PRIVATE). But a la ZFS, this data caching
+ * would not be coherent with normal simultaneous read()/write() operations,
+ * nor will it be coherent with data access on the host. Writable
+ * mmap(MAP_SHARED) access is possible, but guaranteeing any kind of coherency
+ * with concurrent activity on the host would be near impossible with the
+ * existing interfaces.
+ *
+ * A note about locking. sffs is not a high performance file system.
+ * No fine grained locking is done. The one sffs_lock protects just about
+ * everything.
+ */
+
+#include <VBox/log.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mntent.h>
+#include <sys/param.h>
+#include <sys/modctl.h>
+#include <sys/mount.h>
+#include <sys/policy.h>
+#include <sys/atomic.h>
+#include <sys/sysmacros.h>
+#include <sys/ddi.h>
+#include <sys/sunddi.h>
+#include <sys/vfs.h>
+#if !defined(VBOX_VFS_SOLARIS_10U6)
+#include <sys/vfs_opreg.h>
+#endif
+#include <sys/pathname.h>
+#include <sys/dirent.h>
+#include <sys/fs_subr.h>
+#include "vboxfs_prov.h"
+#include "vboxfs_vnode.h"
+#include "vboxfs_vfs.h"
+
+static struct vnodeops *sffs_ops = NULL;
+
+kmutex_t sffs_lock;
+static avl_tree_t sfnodes;
+static avl_tree_t stale_sfnodes;
+
+/*
+ * For now we'll use an I/O buffer that doesn't page fault for VirtualBox
+ * to transfer data into.
+ */
+char *sffs_buffer;
+
+/*
+ * sfnode_compare() is needed for AVL tree functionality.
+ * The nodes are sorted by mounted filesystem, then path. If the
+ * nodes are stale, the node pointer itself is used to force uniqueness.
+ */
+static int
+sfnode_compare(const void *a, const void *b)
+{
+	sfnode_t *x = (sfnode_t *)a;
+	sfnode_t *y = (sfnode_t *)b;
+	int diff;
+
+	if (x->sf_is_stale) {
+		ASSERT(y->sf_is_stale);
+		diff = strcmp(x->sf_path, y->sf_path);
+		if (diff == 0)
+			diff = (uintptr_t)y - (uintptr_t)x;
+	} else {
+		ASSERT(!y->sf_is_stale);
+		diff = (uintptr_t)y->sf_sffs - (uintptr_t)x->sf_sffs;
+		if (diff == 0)
+			diff = strcmp(x->sf_path, y->sf_path);
+	}
+	if (diff < 0)
+		return (-1);
+	if (diff > 0)
+		return (1);
+	return (0);
+}
+
+/*
+ * Construct a new pathname given an sfnode plus an optional tail component.
+ * This handles ".." and "."
+ */
+static char *
+sfnode_construct_path(sfnode_t *node, char *tail)
+{
+	char *p;
+
+	if (strcmp(tail, ".") == 0 || strcmp(tail, "..") == 0)
+		panic("construct path for %s", tail);
+	p = kmem_alloc(strlen(node->sf_path) + 1 + strlen(tail) + 1, KM_SLEEP);
+	strcpy(p, node->sf_path);
+	strcat(p, "/");
+	strcat(p, tail);
+	return (p);
+}
+
+/*
+ * Open the provider file associated with a vnode. Holding the file open is
+ * the only way we have of trying to have a vnode continue to refer to the
+ * same host file in the host in light of the possibility of host side renames.
+ */
+static void
+sfnode_open(sfnode_t *node)
+{
+	int error;
+	sfp_file_t *fp;
+
+	if (node->sf_file != NULL)
+		return;
+	error = sfprov_open(node->sf_sffs->sf_handle, node->sf_path, &fp);
+	if (error == 0)
+		node->sf_file = fp;
+}
+
+/*
+ * get a new vnode reference for an sfnode
+ */
+vnode_t *
+sfnode_get_vnode(sfnode_t *node)
+{
+	vnode_t *vp;
+
+	if (node->sf_vnode != NULL) {
+		VN_HOLD(node->sf_vnode);
+	} else {
+		vp = vn_alloc(KM_SLEEP);
+        LogFlowFunc(("  %s gets vnode 0x%p\n", node->sf_path, vp));
+		vp->v_type = node->sf_type;
+		vp->v_vfsp = node->sf_sffs->sf_vfsp;
+		VFS_HOLD(vp->v_vfsp);
+		vn_setops(vp, sffs_ops);
+		vp->v_flag = VNOMAP | VNOSWAP;
+		vn_exists(vp);
+		vp->v_data = node;
+		node->sf_vnode = vp;
+	}
+	sfnode_open(node);
+	return (node->sf_vnode);
+}
+
+/*
+ * Allocate and initialize a new sfnode and assign it a vnode
+ */
+sfnode_t *
+sfnode_make(
+	sffs_data_t	*sffs,
+	char		*path,
+	vtype_t		type,
+	sfp_file_t	*fp,
+	sfnode_t	*parent)	/* can be NULL for root */
+{
+	sfnode_t	*node;
+	avl_index_t	where;
+
+	ASSERT(MUTEX_HELD(&sffs_lock));
+	ASSERT(path != NULL);
+
+	/*
+	 * build the sfnode
+	 */
+    LogFlowFunc(("sffs_make(%s)\n", path));
+	node = kmem_alloc(sizeof (*node), KM_SLEEP);
+	node->sf_sffs = sffs;
+	node->sf_path = path;
+	node->sf_ino = sffs->sf_ino++;
+	node->sf_type = type;
+	node->sf_is_stale = 0;	/* never stale at creation */
+	node->sf_file = fp;
+	node->sf_vnode = NULL;	/* do this before any sfnode_get_vnode() */
+	node->sf_children = 0;
+	node->sf_parent = parent;
+	if (parent)
+		++parent->sf_children;
+
+	/*
+	 * add the new node to our cache
+	 */
+	if (avl_find(&sfnodes, node, &where) != NULL)
+		panic("sffs_create_sfnode(%s): duplicate sfnode_t", path);
+	avl_insert(&sfnodes, node, where);
+	return (node);
+}
+
+/*
+ * destroy an sfnode
+ */
+static void
+sfnode_destroy(sfnode_t *node)
+{
+	avl_index_t where;
+	avl_tree_t *tree;
+	sfnode_t *parent;
+top:
+	parent = node->sf_parent;
+	ASSERT(MUTEX_HELD(&sffs_lock));
+	ASSERT(node->sf_path != NULL);
+    LogFlowFunc(("sffs_destroy(%s)%s\n", node->sf_path, node->sf_is_stale ? " stale": ""));
+	if (node->sf_children != 0)
+		panic("sfnode_destroy(%s) has %d children", node->sf_children);
+	if (node->sf_vnode != NULL)
+		panic("sfnode_destroy(%s) has active vnode", node->sf_path);
+
+	if (node->sf_is_stale)
+		tree = &stale_sfnodes;
+	else
+		tree = &sfnodes;
+	if (avl_find(tree, node, &where) == NULL)
+		panic("sfnode_destroy(%s) not found", node->sf_path);
+	avl_remove(tree, node);
+
+	VFS_RELE(node->sf_sffs->sf_vfsp);
+	kmem_free(node->sf_path, strlen(node->sf_path) + 1);
+	kmem_free(node, sizeof (*node));
+	if (parent != NULL) {
+		if (parent->sf_children == 0)
+			panic("sfnode_destroy(%s) parent has no child");
+		--parent->sf_children;
+		if (parent->sf_children == 0 &&
+		    parent->sf_is_stale &&
+		    parent->sf_vnode == NULL) {
+			node = parent;
+			goto top;
+		}
+	}
+}
+
+/*
+ * Some sort of host operation on an sfnode has failed or it has been
+ * deleted. Mark this node and any children as stale, deleting knowledge
+ * about any which do not have active vnodes or children
+ * This also handle deleting an inactive node that was already stale.
+ */
+static void
+sfnode_make_stale(sfnode_t *node)
+{
+	sfnode_t *n;
+	int len;
+	ASSERT(MUTEX_HELD(&sffs_lock));
+	avl_index_t where;
+
+	/*
+	 * First deal with any children of a directory node.
+	 * If a directory becomes stale, anything below it becomes stale too.
+	 */
+	if (!node->sf_is_stale && node->sf_type == VDIR) {
+		len = strlen(node->sf_path);
+		
+		n = node;
+		while ((n = AVL_NEXT(&sfnodes, node)) != NULL) {
+			ASSERT(!n->sf_is_stale);
+
+			/*
+			 * quit when no longer seeing children of node
+			 */
+			if (n->sf_sffs != node->sf_sffs ||
+			    strncmp(node->sf_path, n->sf_path, len) != 0 ||
+			    n->sf_path[len] != '/')
+				break;
+
+			/*
+			 * Either mark the child as stale or destroy it
+			 */
+			if (n->sf_vnode == NULL && n->sf_children == 0) {
+				sfnode_destroy(n);
+			} else {
+                LogFlowFunc(("sffs_make_stale(%s) sub\n", n->sf_path));
+				if (avl_find(&sfnodes, n, &where) == NULL)
+					panic("sfnode_make_stale(%s)"
+					    " not in sfnodes", n->sf_path);
+				avl_remove(&sfnodes, n);
+				n->sf_is_stale = 1;
+				if (avl_find(&stale_sfnodes, n, &where) != NULL)
+					panic("sffs_make_stale(%s) duplicates",
+					    n->sf_path);
+				avl_insert(&stale_sfnodes, n, where);
+			}
+		}
+	}
+
+	/*
+	 * Now deal with the given node.
+	 */
+	if (node->sf_vnode == NULL && node->sf_children == 0) {
+		sfnode_destroy(node);
+	} else if (!node->sf_is_stale) {
+        LogFlowFunc(("sffs_make_stale(%s)\n", node->sf_path));
+		if (avl_find(&sfnodes, node, &where) == NULL)
+			panic("sfnode_make_stale(%s) not in sfnodes",
+			    node->sf_path);
+		avl_remove(&sfnodes, node);
+		node->sf_is_stale = 1;
+		if (avl_find(&stale_sfnodes, node, &where) != NULL)
+			panic("sffs_make_stale(%s) duplicates", node->sf_path);
+		avl_insert(&stale_sfnodes, node, where);
+	}
+}
+
+/*
+ * Rename a file or a directory
+ */
+static void
+sfnode_rename(sfnode_t *node, sfnode_t *newparent, char *path)
+{
+	sfnode_t *n;
+	sfnode_t template;
+	avl_index_t where;
+	int len = strlen(path);
+	int old_len;
+	char *new_path;
+	char *tail;
+	ASSERT(MUTEX_HELD(&sffs_lock));
+
+	ASSERT(!node->sf_is_stale);
+
+	/*
+	 * Have to remove anything existing that had the new name.
+	 */
+	template.sf_sffs = node->sf_sffs;
+	template.sf_path = path;
+	template.sf_is_stale = 0;
+	n = avl_find(&sfnodes, &template, &where);
+	if (n != NULL)
+		sfnode_make_stale(n);
+
+	/*
+	 * Do the renaming, deal with any children of this node first.
+	 */
+	if (node->sf_type == VDIR) {
+		old_len = strlen(node->sf_path);
+		while ((n = AVL_NEXT(&sfnodes, node)) != NULL) {
+
+			/*
+			 * quit when no longer seeing children of node
+			 */
+			if (n->sf_sffs != node->sf_sffs ||
+			    strncmp(node->sf_path, n->sf_path, old_len) != 0 ||
+			    n->sf_path[old_len] != '/')
+				break;
+
+			/*
+			 * Rename the child:
+			 * - build the new path name
+			 * - unlink the AVL node
+			 * - assign the new name
+			 * - re-insert the AVL name
+			 */
+			ASSERT(strlen(n->sf_path) > old_len);
+			tail = n->sf_path + old_len; /* includes intial "/" */
+			new_path = kmem_alloc(len + strlen(tail) + 1,
+			    KM_SLEEP);
+			strcpy(new_path, path);
+			strcat(new_path, tail);
+			if (avl_find(&sfnodes, n, &where) == NULL)
+				panic("sfnode_rename(%s) not in sfnodes",
+				   n->sf_path);
+			avl_remove(&sfnodes, n);
+            LogFlowFunc(("sfnode_rname(%s to %s) sub\n", n->sf_path, new_path));
+			kmem_free(n->sf_path, strlen(n->sf_path) + 1);
+			n->sf_path = new_path;
+			if (avl_find(&sfnodes, n, &where) != NULL)
+				panic("sfnode_rename(%s) duplicates",
+				    n->sf_path);
+			avl_insert(&sfnodes, n, where);
+		}
+	}
+
+	/*
+	 * Deal with the given node.
+	 */
+	if (avl_find(&sfnodes, node, &where) == NULL)
+		panic("sfnode_rename(%s) not in sfnodes", node->sf_path);
+	avl_remove(&sfnodes, node);
+    LogFlowFunc(("sfnode_rname(%s to %s)\n", node->sf_path, path));
+	kmem_free(node->sf_path, strlen(node->sf_path) + 1);
+	node->sf_path = path;
+	if (avl_find(&sfnodes, node, &where) != NULL)
+		panic("sfnode_rename(%s) duplicates", node->sf_path);
+	avl_insert(&sfnodes, node, where);
+
+	/*
+	 * change the parent
+	 */
+	if (node->sf_parent == NULL)
+		panic("sfnode_rename(%s) no parent", node->sf_path);
+	if (node->sf_parent->sf_children == 0)
+		panic("sfnode_rename(%s) parent has no child", node->sf_path);
+	--node->sf_parent->sf_children;
+	node->sf_parent = newparent;
+	++newparent->sf_children;
+}
+
+/*
+ * Look for a cached node, if not found either handle ".." or try looking
+ * via the provider. Create an entry in sfnodes if found but not cached yet.
+ * If the create flag is set, a file or directory is created. If the file
+ * already existed, an error is returned.
+ * Nodes returned from this routine always have a vnode with its ref count
+ * bumped by 1.
+ */
+static sfnode_t *
+sfnode_lookup(sfnode_t *dir, char *name, vtype_t create)
+{
+	avl_index_t	where;
+	sfnode_t	template;
+	sfnode_t	*node;
+	int		error;
+	int		type;
+	char		*fullpath;
+	sfp_file_t	*fp;
+
+	ASSERT(MUTEX_HELD(&sffs_lock));
+
+	/*
+	 * handle referencing myself
+	 */
+	if (strcmp(name, "") == 0 || strcmp(name, ".") == 0)
+		return (dir);
+
+	/*
+	 * deal with parent
+	 */
+	if (strcmp(name, "..") == 0)
+		return (dir->sf_parent);
+
+	/*
+	 * Look for an existing node. 
+	 */
+	fullpath = sfnode_construct_path(dir, name);
+	template.sf_sffs = dir->sf_sffs;
+	template.sf_path = fullpath;
+	template.sf_is_stale = 0;
+	node = avl_find(&sfnodes, &template, &where);
+	if (node != NULL) {
+		kmem_free(fullpath, strlen(fullpath) + 1);
+		if (create != VNON)
+			return (NULL);
+		return (node);
+	}
+
+	/*
+	 * No entry for this path currently.
+	 * Check if the file exists with the provider and get the type from
+	 * there.
+	 */
+	if (create == VREG) {
+		type = VREG;
+		error = sfprov_create(dir->sf_sffs->sf_handle, fullpath, &fp);
+	} else if (create == VDIR) {
+		type = VDIR;
+		error = sfprov_mkdir(dir->sf_sffs->sf_handle, fullpath, &fp);
+	} else {
+		mode_t m;
+		fp = NULL;
+		type = VNON;
+		error =
+		    sfprov_get_mode(dir->sf_sffs->sf_handle, fullpath, &m);
+		if (error != 0)
+			error = ENOENT;
+		else if (S_ISDIR(m))
+			type = VDIR;
+		else if (S_ISREG(m))
+			type = VREG;
+	}
+
+	/*
+	 * If no errors, make a new node and return it.
+	 */
+	if (error) {
+		kmem_free(fullpath, strlen(fullpath) + 1);
+		return (NULL);
+	}
+	node = sfnode_make(dir->sf_sffs, fullpath, type, fp, dir);
+	return (node);
+}
+
+
+/*
+ * uid and gid in sffs determine owner and group for all files.
+ */
+static int
+sfnode_access(sfnode_t *node, mode_t mode, cred_t *cr)
+{
+	sffs_data_t *sffs = node->sf_sffs;
+	mode_t m;
+	int shift = 0;
+	int error;
+	vnode_t *vp;
+
+	ASSERT(MUTEX_HELD(&sffs_lock));
+
+	/*
+	 * get the mode from the provider
+	 */
+	error = sfprov_get_mode(node->sf_sffs->sf_handle, node->sf_path, &m);
+	if (error != 0) {
+		m = 0;
+		if (error == ENOENT)
+			sfnode_make_stale(node);
+	}
+
+	/*
+	 * mask off the permissions based on uid/gid
+	 */
+	if (crgetuid(cr) != sffs->sf_uid) {
+		shift += 3;
+		if (groupmember(sffs->sf_gid, cr) == 0)
+			shift += 3;
+	}
+	mode &= ~(m << shift);
+
+	if (mode == 0) {
+		error = 0;
+	} else {
+		vp = sfnode_get_vnode(node);
+		error = secpolicy_vnode_access(cr, vp, sffs->sf_uid, mode);
+		VN_RELE(vp);
+	}
+	return (error);
+}
+
+
+/*
+ *
+ * Everything below this point are the vnode operations used by Solaris VFS
+ */
+static int
+sffs_readdir(
+	vnode_t		*vp,
+	uio_t		*uiop,
+	cred_t		*cred,
+	int		*eofp,
+	caller_context_t *ct,
+	int		flags)
+{
+	sfnode_t *dir = VN2SFN(vp);
+	sfnode_t *node;
+	struct dirent64 *dirent;
+	int dummy_eof;
+	int error = 0;
+	int namelen;
+	void *prov_buff = NULL;
+	size_t prov_buff_size;
+	char **names;
+	uint32_t nents;
+	uint32_t index;
+
+	if (uiop->uio_iovcnt != 1)
+		return (EINVAL);
+
+	if (vp->v_type != VDIR)
+		return (ENOTDIR);
+
+	if (eofp == NULL)
+		eofp = &dummy_eof;
+	*eofp = 0;
+
+	if (uiop->uio_loffset >= MAXOFF_T) {
+		*eofp = 1;
+		return (0);
+	}
+
+	dirent = kmem_zalloc(DIRENT64_RECLEN(MAXNAMELEN), KM_SLEEP);
+
+	/*
+	 * Get the directory entry names from the host. This gets all
+	 * entries, so add in starting offset. Max the caller can expect
+	 * would be the size of the UIO buffer / sizeof of a dirent for
+	 * file with name of length 1
+	 */
+	mutex_enter(&sffs_lock);
+	index = uiop->uio_loffset;
+	nents = index + (uiop->uio_resid / DIRENT64_RECLEN(1));
+	error = sfprov_readdir(dir->sf_sffs->sf_handle, dir->sf_path,
+	    &prov_buff, &prov_buff_size, &nents);
+	if (error != 0)
+		goto done;
+	if (nents <= index) {
+		*eofp = 1;
+		goto done;
+	}
+	names = (void *)prov_buff;
+	
+	/*
+	 * Lookup each of the names, so that we have ino's.
+	 */
+	for (; index < nents; ++index) {
+		if (strcmp(names[index], ".") == 0) {
+			node = dir;
+		} else if (strcmp(names[index], "..") == 0) {
+			node = dir->sf_parent;
+			if (node == NULL)
+				node = dir;
+		} else {
+			node = sfnode_lookup(dir, names[index], VNON);
+			if (node == NULL)
+				panic("sffs_readdir() lookup failed");
+		}
+		namelen = strlen(names[index]);
+		strcpy(&dirent->d_name[0], names[index]);
+		dirent->d_reclen = DIRENT64_RECLEN(namelen);
+		dirent->d_off = index;
+		dirent->d_ino = node->sf_ino;
+		if (dirent->d_reclen > uiop->uio_resid) {
+			error = ENOSPC;
+			break;
+		}
+		error = uiomove(dirent, dirent->d_reclen, UIO_READ, uiop);
+		if (error != 0)
+			break;
+		bzero(&dirent->d_name[0], namelen);
+	}
+	if (error == 0 && index >= nents)
+		*eofp = 1;
+done:
+	mutex_exit(&sffs_lock);
+	if (prov_buff != NULL)
+		kmem_free(prov_buff, prov_buff_size);
+	kmem_free(dirent, DIRENT64_RECLEN(MAXNAMELEN));
+	return (error);
+}
+
+
+#if defined(VBOX_VFS_SOLARIS_10U6)
+/*
+ * HERE JOE.. this may need more logic, need to look at other file systems
+ */
+static int
+sffs_pathconf(
+	vnode_t	*vp,
+	int	cmd,
+	ulong_t	*valp,
+	cred_t	*cr)
+{
+	return (fs_pathconf(vp, cmd, valp, cr));
+}
+#else
+/*
+ * HERE JOE.. this may need more logic, need to look at other file systems
+ */
+static int
+sffs_pathconf(
+	vnode_t	*vp,
+	int	cmd,
+	ulong_t	*valp,
+	cred_t	*cr,
+	caller_context_t *ct)
+{
+	return (fs_pathconf(vp, cmd, valp, cr, ct));
+}
+#endif
+
+static int
+sffs_getattr(
+	vnode_t		*vp,
+	vattr_t		*vap,
+	int		flags,
+	cred_t		*cred,
+	caller_context_t *ct)
+{
+	sfnode_t	*node = VN2SFN(vp);
+	sffs_data_t	*sffs = node->sf_sffs;
+	mode_t		mode;
+	timestruc_t	time;
+	uint64_t	x;
+	int		error;
+
+	mutex_enter(&sffs_lock);
+	vap->va_type = vp->v_type;
+	vap->va_uid = sffs->sf_uid;
+	vap->va_gid = sffs->sf_gid;
+	vap->va_fsid = sffs->sf_vfsp->vfs_dev;
+	vap->va_nodeid = node->sf_ino;
+	vap->va_nlink = 1;
+	vap->va_rdev =  sffs->sf_vfsp->vfs_dev;
+	vap->va_seq = 0;
+
+	error = sfprov_get_mode(node->sf_sffs->sf_handle, node->sf_path, &mode);
+	if (error == ENOENT)
+		sfnode_make_stale(node);
+	if (error != 0)
+		goto done;
+	vap->va_mode = mode & MODEMASK;
+
+	error = sfprov_get_size(node->sf_sffs->sf_handle, node->sf_path, &x);
+	if (error == ENOENT)
+		sfnode_make_stale(node);
+	if (error != 0)
+		goto done;
+	vap->va_size = x;
+	vap->va_blksize = 512;
+	vap->va_nblocks = (x + 511) / 512;
+
+	error =
+	    sfprov_get_atime(node->sf_sffs->sf_handle, node->sf_path, &time);
+	if (error == ENOENT)
+		sfnode_make_stale(node);
+	if (error != 0)
+		goto done;
+	vap->va_atime = time;
+
+	error =
+	    sfprov_get_mtime(node->sf_sffs->sf_handle, node->sf_path, &time);
+	if (error == ENOENT)
+		sfnode_make_stale(node);
+	if (error != 0)
+		goto done;
+	vap->va_mtime = time;
+
+	error =
+	    sfprov_get_ctime(node->sf_sffs->sf_handle, node->sf_path, &time);
+	if (error == ENOENT)
+		sfnode_make_stale(node);
+	if (error != 0)
+		goto done;
+	vap->va_ctime = time;
+
+done:
+	mutex_exit(&sffs_lock);
+	return (error);
+}
+
+/*ARGSUSED*/
+static int
+sffs_read(
+	vnode_t		*vp,
+	struct uio	*uio,
+	int		ioflag,
+	cred_t		*cred,
+	caller_context_t *ct)
+{
+	sfnode_t	*node = VN2SFN(vp);
+	int		error = 0;
+	uint32_t	bytes;
+	uint32_t	done;
+	ulong_t 	offset;
+	ssize_t		total;
+
+	if (vp->v_type == VDIR)
+		return (EISDIR);
+	if (vp->v_type != VREG)
+		return (EINVAL);
+	if (uio->uio_loffset >= MAXOFF_T)
+       		return (0);
+        if (uio->uio_loffset < 0)
+       		return (EINVAL);
+        total = uio->uio_resid;
+        if (total == 0)
+       		return (0);
+
+	mutex_enter(&sffs_lock);
+	sfnode_open(node);
+	if (node->sf_file == NULL) {
+		mutex_exit(&sffs_lock);
+		return (EINVAL);
+	}
+
+	do {
+		offset = uio->uio_offset;
+		done = bytes = MIN(PAGESIZE, uio->uio_resid);
+		error = sfprov_read(node->sf_file, sffs_buffer, offset, &done);
+		if (error == 0 && done > 0)
+			error = uiomove(sffs_buffer, done, UIO_READ, uio);
+	} while (error == 0 && uio->uio_resid > 0 && done > 0);
+
+	mutex_exit(&sffs_lock);
+
+	/*
+	 * a partial read is never an error
+	 */
+	if (total != uio->uio_resid)
+		error = 0;
+	return (error);
+}
+
+/*ARGSUSED*/
+static int
+sffs_write(
+	vnode_t		*vp,
+	struct uio	*uiop,
+	int		ioflag,
+	cred_t		*cred,
+	caller_context_t *ct)
+{
+	sfnode_t	*node = VN2SFN(vp);
+	int		error = 0;
+	uint32_t	bytes;
+	uint32_t	done;
+	ulong_t 	offset;
+	ssize_t		total;
+	rlim64_t	limit = uiop->uio_llimit;
+
+	if (vp->v_type == VDIR)
+		return (EISDIR);
+	if (vp->v_type != VREG)
+		return (EINVAL);
+
+	/*
+	 * We have to hold this lock for a long time to keep
+	 * multiple FAPPEND writes from intermixing
+	 */
+	mutex_enter(&sffs_lock);
+	sfnode_open(node);
+	if (node->sf_file == NULL) {
+		mutex_exit(&sffs_lock);
+		return (EINVAL);
+	}
+	if (ioflag & FAPPEND) {
+		uint64_t endoffile;
+
+		error = sfprov_get_size(node->sf_sffs->sf_handle,
+		    node->sf_path, &endoffile);
+		if (error == ENOENT)
+			sfnode_make_stale(node);
+		if (error != 0) {
+			mutex_exit(&sffs_lock);
+			return (error);
+		}
+		uiop->uio_loffset = endoffile;
+	}
+
+	if (vp->v_type != VREG || uiop->uio_loffset < 0) {
+		mutex_exit(&sffs_lock);
+       		return (EINVAL);
+	}
+	if (limit == RLIM64_INFINITY || limit > MAXOFFSET_T)
+                limit = MAXOFFSET_T;
+	if (limit > MAXOFF_T)
+                limit = MAXOFF_T;
+
+	if (uiop->uio_loffset >= limit) {
+		proc_t *p = ttoproc(curthread);
+		mutex_enter(&p->p_lock);
+		(void) rctl_action(rctlproc_legacy[RLIMIT_FSIZE], p->p_rctls,
+		    p, RCA_UNSAFE_SIGINFO);
+		mutex_exit(&p->p_lock);
+		mutex_exit(&sffs_lock);
+		return (EFBIG);
+	}
+
+	if (uiop->uio_loffset >= MAXOFF_T) {
+		mutex_exit(&sffs_lock);
+		return (EFBIG);
+	}
+
+
+        total = uiop->uio_resid;
+        if (total == 0) {
+		mutex_exit(&sffs_lock);
+       		return (0);
+	}
+
+	do {
+		offset = uiop->uio_offset;
+		bytes = MIN(PAGESIZE, uiop->uio_resid);
+		if (offset + bytes >= limit) {
+                	if (offset >= limit) {
+                       		error = EFBIG;
+                       		break;
+                        }
+                        bytes = limit - offset;
+		}
+		error = uiomove(sffs_buffer, bytes, UIO_WRITE, uiop);
+		if (error != 0)
+			break;
+		done = bytes;
+		if (error == 0)
+			error = sfprov_write(node->sf_file, sffs_buffer,
+			    offset, &done);
+		total -= done;
+		if (done != bytes) {
+			uiop->uio_resid += bytes - done;
+			break;
+		}
+	} while (error == 0 && uiop->uio_resid > 0 && done > 0);
+
+	mutex_exit(&sffs_lock);
+
+	/*
+	 * A short write is never really an error.
+	 */
+	if (total != uiop->uio_resid)
+		error = 0;
+	return (error);
+}
+
+/*ARGSUSED*/
+static int
+sffs_access(vnode_t *vp, int mode, int flags, cred_t *cr, caller_context_t *ct)
+{
+	sfnode_t *node = VN2SFN(vp);
+	int error;
+
+	mutex_enter(&sffs_lock);
+	error = sfnode_access(node, mode, cr);
+	mutex_exit(&sffs_lock);
+	return (error);
+}
+
+/*
+ * Lookup an entry in a directory and create a new vnode if found.
+ */
+/* ARGSUSED3 */
+static int
+sffs_lookup(
+	vnode_t		*dvp,		/* the directory vnode */
+	char		*name,		/* the name of the file or directory */
+	vnode_t		**vpp,		/* the vnode we found or NULL */
+	struct pathname	*pnp,
+	int		flags,
+	vnode_t		*rdir,
+	cred_t		*cred,
+	caller_context_t *ct,
+	int		*direntflags,
+	struct pathname	*realpnp)
+{
+	int		error;
+	sfnode_t	*node;
+
+	/*
+	 * dvp must be a directory
+	 */
+	if (dvp->v_type != VDIR)
+		return (ENOTDIR);
+
+	/*
+	 * An empty component name or just "." means the directory itself.
+	 * Don't do any further lookup or checking.
+	 */
+	if (strcmp(name, "") == 0 || strcmp(name, ".") == 0) {
+		VN_HOLD(dvp);
+		*vpp = dvp;
+		return (0);
+	}
+
+	/*
+	 * Check permission to look at this directory. We always allow "..".
+	 */
+	mutex_enter(&sffs_lock);
+	if (strcmp(name, "..") != 0) {
+		error = sfnode_access(VN2SFN(dvp), VEXEC, cred);
+		if (error) {
+			mutex_exit(&sffs_lock);
+			return (error);
+		}
+	}
+
+	/*
+	 * Lookup the node.
+	 */
+	node = sfnode_lookup(VN2SFN(dvp), name, VNON);
+	if (node != NULL)
+		*vpp = sfnode_get_vnode(node);
+	mutex_exit(&sffs_lock);
+	return ((node == NULL) ? ENOENT : 0);
+}
+
+/*ARGSUSED*/
+static int
+sffs_create(
+        vnode_t		*dvp,
+        char		*name,
+        struct vattr	*vap,
+        vcexcl_t	exclusive,
+        int		mode,
+        vnode_t		**vpp,
+        cred_t		*cr,
+        int		flag,
+        caller_context_t *ct,
+        vsecattr_t	*vsecp)
+{
+	vnode_t		*vp;
+	sfnode_t	*node;
+	int		error;
+
+	ASSERT(name != NULL);
+
+	/*
+	 * this is used for regular files, not mkdir
+	 */
+	if (vap->va_type == VDIR)
+		return (EISDIR);
+	if (vap->va_type != VREG)
+		return (EINVAL);
+
+	/*
+	 * is this a pre-existing file?
+	 */
+	error = sffs_lookup(dvp, name, &vp,
+	    NULL, 0, NULL, cr, ct, NULL, NULL);
+	if (error == ENOENT)
+		vp = NULL;
+	else if (error != 0)
+		return (error);
+
+	/*
+	 * Operation on a pre-existing file.
+	 */
+	if (vp != NULL) {
+		if (exclusive == EXCL) {
+			VN_RELE(vp);
+			return (EEXIST);
+		}
+		if (vp->v_type == VDIR && (mode & VWRITE) == VWRITE) {
+			VN_RELE(vp);
+			return (EISDIR);
+		}
+
+		mutex_enter(&sffs_lock);
+		node = VN2SFN(vp);
+		error = sfnode_access(node, mode, cr);
+		if (error != 0) {
+			mutex_exit(&sffs_lock);
+			VN_RELE(vp);
+			return (error);
+		}
+
+		/*
+		 * handle truncating an existing file
+		 */
+		if (vp->v_type == VREG && (vap->va_mask & AT_SIZE) &&
+		    vap->va_size == 0) {
+			sfnode_open(node);
+			if (node->sf_path == NULL)
+				error = ENOENT;
+			else
+				error = sfprov_trunc(node->sf_sffs->sf_handle,
+				    node->sf_path);
+			if (error) {
+				mutex_exit(&sffs_lock);
+				VN_RELE(vp);
+				return (error);
+			}
+		}
+		mutex_exit(&sffs_lock);
+		*vpp = vp;
+		return (0);
+	}
+
+	/*
+	 * Create a new node. First check for a race creating it.
+	 */
+	mutex_enter(&sffs_lock);
+	node = sfnode_lookup(VN2SFN(dvp), name, VNON);
+	if (node != NULL) {
+		mutex_exit(&sffs_lock);
+		return (EEXIST);
+	}
+
+	/*
+	 * Doesn't exist yet and we have the lock, so create it.
+	 */
+	node = sfnode_lookup(VN2SFN(dvp), name, VREG);
+	mutex_exit(&sffs_lock);
+	if (node == NULL)
+		return (EINVAL);
+	*vpp = sfnode_get_vnode(node);
+	return (0);
+}
+
+/*ARGSUSED*/
+static int
+sffs_mkdir(
+	vnode_t		*dvp,
+	char		*nm,
+	vattr_t		*va,
+	vnode_t		**vpp,
+	cred_t		*cred,
+	caller_context_t *ct,
+	int		flags,
+	vsecattr_t	*vsecp)
+{
+	sfnode_t	*node;
+	vnode_t		*vp;
+	int		error;
+
+	/*
+	 * These should never happen
+	 */
+	ASSERT(nm != NULL);
+	ASSERT(strcmp(nm, "") != 0);
+	ASSERT(strcmp(nm, ".") != 0);
+	ASSERT(strcmp(nm, "..") != 0);
+
+	/*
+	 * Do an unlocked look up first
+	 */
+	error = sffs_lookup(dvp, nm, &vp, NULL, 0, NULL, cred, ct, NULL, NULL);
+	if (error == 0) {
+		VN_RELE(vp);
+		return (EEXIST);
+	}
+	if (error != ENOENT)
+		return (error);
+
+	/*
+	 * Must be able to write in current directory
+	 */
+	mutex_enter(&sffs_lock);
+	error = sfnode_access(VN2SFN(dvp), VWRITE, cred);
+	if (error) {
+		mutex_exit(&sffs_lock);
+		return (error);
+	}
+
+	node = sfnode_lookup(VN2SFN(dvp), nm, VDIR);
+	mutex_exit(&sffs_lock);
+	if (node == NULL)
+		return (EACCES);
+	*vpp = sfnode_get_vnode(node);
+	return (0);
+}
+
+/*ARGSUSED*/
+static int
+sffs_rmdir(
+	struct vnode	*dvp,
+	char		*nm,
+	vnode_t		*cdir,
+	cred_t		*cred,
+	caller_context_t *ct,
+	int		flags)
+{
+	sfnode_t	 *node;
+	vnode_t		*vp;
+	int		error;
+
+	/*
+	 * Return error when removing . and ..
+	 */
+	if (strcmp(nm, ".") == 0 || strcmp(nm, "") == 0)
+		return (EINVAL);
+	if (strcmp(nm, "..") == 0)
+		return (EEXIST);
+
+	error = sffs_lookup(dvp, nm, &vp, NULL, 0, NULL, cred, ct, NULL, NULL);
+	if (error)
+		return (error);
+	if (vp->v_type != VDIR) {
+		VN_RELE(vp);
+		return (ENOTDIR);
+	}
+	if (vn_vfswlock(vp) || vn_mountedvfs(vp)) {
+		VN_RELE(vp);
+		return (EBUSY);
+	}
+
+	node = VN2SFN(vp);
+
+	mutex_enter(&sffs_lock);
+	error = sfnode_access(VN2SFN(dvp), VEXEC | VWRITE, cred);
+	if (error)
+		goto done;
+
+	/*
+	 * If anything else is using this vnode, then fail the remove.
+	 * Why?  Windows hosts can't remove something that is open,
+	 * so we have to sfprov_close() it first.
+	 * There is no errno for this - since it's not a problem on UNIX,
+	 * but EINVAL is the closest.
+	 */
+	if (node->sf_file != NULL) {
+		if (vp->v_count > 1) {
+			error = EINVAL;
+			goto done;
+		}
+		(void)sfprov_close(node->sf_file);
+		node->sf_file = NULL;
+	}
+
+	/*
+	 * Remove the directory on the host and mark the node as stale.
+	 */
+	error = sfprov_rmdir(node->sf_sffs->sf_handle, node->sf_path);
+	if (error == ENOENT || error == 0)
+		sfnode_make_stale(node);
+done:
+	mutex_exit(&sffs_lock);
+	VN_RELE(vp);
+	return (error);
+}
+
+
+/*ARGSUSED*/
+static int
+sffs_remove(
+	vnode_t		*dvp,
+	char		*name,
+	cred_t		*cred,
+	caller_context_t *ct,
+	int		flags)
+{
+	vnode_t		*vp;
+	sfnode_t	*node;
+	int		error;
+
+	/*
+	 * These should never happen
+	 */
+	ASSERT(name != NULL);
+	ASSERT(strcmp(name, "..") != 0);
+
+	error = sffs_lookup(dvp, name, &vp,
+	    NULL, 0, NULL, cred, ct, NULL, NULL);
+	if (error)
+		return (error);
+	node = VN2SFN(vp);
+
+	mutex_enter(&sffs_lock);
+	error = sfnode_access(VN2SFN(dvp), VEXEC | VWRITE, cred);
+	if (error)
+		goto done;
+
+	/*
+	 * If anything else is using this vnode, then fail the remove.
+	 * Why?  Windows hosts can't sfprov_remove() a file that is open,
+	 * so we have to sfprov_close() it first.
+	 * There is no errno for this - since it's not a problem on UNIX,
+	 * but ETXTBSY is the closest.
+	 */
+	if (node->sf_file != NULL) {
+		if (vp->v_count > 1) {
+			error = ETXTBSY;
+			goto done;
+		}
+		(void)sfprov_close(node->sf_file);
+		node->sf_file = NULL;
+	}
+
+	/*
+	 * Remove the file on the host and mark the node as stale.
+	 */
+	error = sfprov_remove(node->sf_sffs->sf_handle, node->sf_path);
+	if (error == ENOENT || error == 0)
+		sfnode_make_stale(node);
+done:
+	mutex_exit(&sffs_lock);
+	VN_RELE(vp);
+	return (error);
+}
+
+/*ARGSUSED*/
+static int
+sffs_rename(
+	vnode_t		*old_dir,
+	char		*old_nm,
+	vnode_t		*new_dir,
+	char		*new_nm,
+	cred_t		*cred,
+	caller_context_t *ct,
+	int		flags)
+{
+	char		*newpath;
+	int		error;
+	sfnode_t	*node;
+
+	if (strcmp(new_nm, "") == 0 ||
+	    strcmp(new_nm, ".") == 0 ||
+	    strcmp(new_nm, "..") == 0 ||
+	    strcmp(old_nm, "") == 0 ||
+	    strcmp(old_nm, ".") == 0 ||
+	    strcmp(old_nm, "..") == 0)
+		return (EINVAL);
+
+	/*
+	 * make sure we have permission to do the rename
+	 */
+	mutex_enter(&sffs_lock);
+	error = sfnode_access(VN2SFN(old_dir), VEXEC | VWRITE, cred);
+	if (error == 0 && new_dir != old_dir)
+		error = sfnode_access(VN2SFN(new_dir), VEXEC | VWRITE, cred);
+	if (error)
+		goto done;
+
+	node = sfnode_lookup(VN2SFN(old_dir), old_nm, VNON);
+	if (node == NULL) {
+		error = ENOENT;
+		goto done;
+	}
+
+
+	/*
+	 * Rename the file on the host and in our caches.
+	 */
+	newpath = sfnode_construct_path(VN2SFN(new_dir), new_nm);
+	error = sfprov_rename(node->sf_sffs->sf_handle, node->sf_path, newpath,
+	    node->sf_type == VDIR);
+	if (error == 0)
+		sfnode_rename(node, VN2SFN(new_dir), newpath);
+	else {
+		kmem_free(newpath, strlen(newpath) + 1);
+		if (error == ENOENT)
+			sfnode_make_stale(node);
+	}
+done:
+	mutex_exit(&sffs_lock);
+	return (error);
+}
+
+
+/*ARGSUSED*/
+static int
+sffs_fsync(vnode_t *vp, int flag, cred_t *cr, caller_context_t *ct)
+{
+#if 0
+	sfnode_t *node;
+
+	/*
+	 * Ask the host to sync any data it may have cached for open files.
+	 * I don't think we care about errors.
+	 */
+	mutex_enter(&sffs_lock);
+	node = VN2SFN(vp);
+	if (node->sf_file != NULL)
+		(void) sfprov_fsync(node->sf_file);
+	mutex_exit(&sffs_lock);
+#endif
+	return (0);
+}
+
+/*
+ * This may be the last reference, possibly time to close the file and
+ * destroy the vnode. If the sfnode is stale, we'll destroy that too.
+ */
+/*ARGSUSED*/
+static void
+sffs_inactive(vnode_t *vp, cred_t *cr, caller_context_t *ct)
+{
+	sfnode_t *node;
+
+	/*
+	 * nothing to do if this isn't the last use
+	 */
+	mutex_enter(&sffs_lock);
+	node = VN2SFN(vp);
+	mutex_enter(&vp->v_lock);
+	if (vp->v_count > 1) {
+		--vp->v_count;
+		mutex_exit(&vp->v_lock);
+		mutex_exit(&sffs_lock);
+		return;
+	}
+
+	/*
+	 * There should never be cached data, since we don't support mmap().
+	 */
+	if (vn_has_cached_data(vp))
+		panic("sffs_inactive() found cached data");
+
+	/*
+	 * destroy the vnode
+	 */
+	node->sf_vnode = NULL;
+	mutex_exit(&vp->v_lock);
+	vn_invalid(vp);
+	vn_free(vp);
+    LogFlowFunc(("  %s vnode cleared\n", node->sf_path));
+
+	/*
+	 * Close the sf_file for the node.
+	 */
+	if (node->sf_file != NULL) {
+		(void)sfprov_close(node->sf_file);
+		node->sf_file = NULL;
+	}
+
+	/*
+	 * If the node is stale, we can also destroy it.
+	 */
+	if (node->sf_is_stale && node->sf_children == 0)
+		sfnode_destroy(node);
+
+	mutex_exit(&sffs_lock);
+	return;
+}
+
+/*
+ * All the work for this is really done in lookup.
+ */
+/*ARGSUSED*/
+static int
+sffs_open(vnode_t **vpp, int flag, cred_t *cr, caller_context_t *ct)
+{
+	return (0);
+}
+
+/*
+ * All the work for this is really done in inactive.
+ */
+/*ARGSUSED*/
+static int
+sffs_close(
+	vnode_t *vp,
+	int flag,
+	int count,
+	offset_t offset,
+	cred_t *cr,
+	caller_context_t *ct)
+{
+	return (0);
+}
+
+/* ARGSUSED */
+static int
+sffs_seek(vnode_t *v, offset_t o, offset_t *no, caller_context_t *ct)
+{
+	if (*no < 0 || *no > MAXOFFSET_T)
+		return (EINVAL);
+	return (0);
+}
+
+
+
+/*
+ * By returning an error for this, we prevent anything in sffs from
+ * being re-exported by NFS
+ */
+/* ARGSUSED */
+static int
+sffs_fid(vnode_t *vp, fid_t *fidp, caller_context_t *ct)
+{
+	return (ENOTSUP);
+}
+
+/*
+ * vnode operations for regular files
+ */
+const fs_operation_def_t sffs_ops_template[] = {
+#if defined(VBOX_VFS_SOLARIS_10U6)
+	VOPNAME_ACCESS,		sffs_access,
+	VOPNAME_CLOSE,		sffs_close,
+	VOPNAME_CREATE,		sffs_create,
+	VOPNAME_FID,		sffs_fid,
+	VOPNAME_FSYNC,		sffs_fsync,
+	VOPNAME_GETATTR,	sffs_getattr,
+	VOPNAME_INACTIVE,	sffs_inactive,
+	VOPNAME_LOOKUP,		sffs_lookup,
+	VOPNAME_MKDIR,		sffs_mkdir,
+	VOPNAME_OPEN,		sffs_open,
+	VOPNAME_PATHCONF,	sffs_pathconf,
+	VOPNAME_READ,		sffs_read,
+	VOPNAME_READDIR,	sffs_readdir,
+	VOPNAME_REMOVE,		sffs_remove,
+	VOPNAME_RENAME,		sffs_rename,
+	VOPNAME_RMDIR,		sffs_rmdir,
+	VOPNAME_SEEK,		sffs_seek,
+	VOPNAME_WRITE,		sffs_write,
+	NULL,			NULL
+#else
+	VOPNAME_ACCESS,		{ .vop_access = sffs_access },
+	VOPNAME_CLOSE,		{ .vop_close = sffs_close },
+	VOPNAME_CREATE,		{ .vop_create = sffs_create },
+	VOPNAME_FID,		{ .vop_fid = sffs_fid },
+	VOPNAME_FSYNC,		{ .vop_fsync = sffs_fsync },
+	VOPNAME_GETATTR,	{ .vop_getattr = sffs_getattr },
+	VOPNAME_INACTIVE,	{ .vop_inactive = sffs_inactive },
+	VOPNAME_LOOKUP,		{ .vop_lookup = sffs_lookup },
+	VOPNAME_MKDIR,		{ .vop_mkdir = sffs_mkdir },
+	VOPNAME_OPEN,		{ .vop_open = sffs_open },
+	VOPNAME_PATHCONF,	{ .vop_pathconf = sffs_pathconf },
+	VOPNAME_READ,		{ .vop_read = sffs_read },
+	VOPNAME_READDIR,	{ .vop_readdir = sffs_readdir },
+	VOPNAME_REMOVE,		{ .vop_remove = sffs_remove },
+	VOPNAME_RENAME,		{ .vop_rename = sffs_rename },
+	VOPNAME_RMDIR,		{ .vop_rmdir = sffs_rmdir },
+	VOPNAME_SEEK,		{ .vop_seek = sffs_seek },
+	VOPNAME_WRITE,		{ .vop_write = sffs_write },
+	NULL,			NULL
+#endif
+};
+
+/*
+ * Also, init and fini functions...
+ */
+int
+sffs_vnode_init(void)
+{
+	int err;
+
+	err = vn_make_ops("sffs", sffs_ops_template, &sffs_ops);
+	if (err)
+		return (err);
+
+	avl_create(&sfnodes, sfnode_compare, sizeof (sfnode_t),
+	    offsetof(sfnode_t, sf_linkage));
+	avl_create(&stale_sfnodes, sfnode_compare, sizeof (sfnode_t),
+	    offsetof(sfnode_t, sf_linkage));
+
+	sffs_buffer = kmem_alloc(PAGESIZE, KM_SLEEP);
+
+	return (0);
+}
+
+void
+sffs_vnode_fini(void)
+{
+	if (sffs_ops)
+		vn_freevnodeops(sffs_ops);
+	ASSERT(avl_first(&sfnodes) == NULL);
+	avl_destroy(&sfnodes);
+	if (sffs_buffer != NULL) {
+		kmem_free(sffs_buffer, PAGESIZE);
+		sffs_buffer = NULL;
+	}
+}
+
+/*
+ * Utility at unmount to get all nodes in that mounted filesystem removed.
+ */
+int
+sffs_purge(struct sffs_data *sffs)
+{
+	sfnode_t *node;
+	sfnode_t *prev;
+
+	/*
+	 * Check that no vnodes are active.
+	 */
+	if (sffs->sf_rootnode->v_count > 1)
+		return (-1);
+	for (node = avl_first(&sfnodes); node;
+	    node = AVL_NEXT(&sfnodes, node)) {
+		if (node->sf_sffs == sffs && node->sf_vnode &&
+		    node->sf_vnode != sffs->sf_rootnode)
+			return (-1);
+	}
+	for (node = avl_first(&stale_sfnodes); node;
+	    node = AVL_NEXT(&stale_sfnodes, node)) {
+		if (node->sf_sffs == sffs && node->sf_vnode &&
+		    node->sf_vnode != sffs->sf_rootnode)
+			return (-1);
+	}
+
+	/*
+	 * All clear to destroy all node information. Since there are no
+	 * vnodes, the make stale will cause deletion.
+	 */
+	VN_RELE(sffs->sf_rootnode);
+	mutex_enter(&sffs_lock);
+	for (prev = NULL;;) {
+		if (prev == NULL)
+			node = avl_first(&sfnodes);
+		else
+			node = AVL_NEXT(&sfnodes, prev);
+
+		if (node == NULL)
+			break;
+
+		if (node->sf_sffs == sffs) {
+			if (node->sf_vnode != NULL)
+				panic("vboxfs: purge hit active vnode");
+			sfnode_make_stale(node);
+		} else {
+			prev = node;
+		}
+	}
+done:
+	mutex_exit(&sffs_lock);
+	return (0);
+}
+
+static void
+sfnode_print(sfnode_t *node)
+{
+	Log(("0x%p", node));
+	Log((" type=%s (%d)",
+	    node->sf_type == VDIR ? "VDIR" :
+	    node->sf_type == VNON ? "VNON" :
+	    node->sf_type == VREG ? "VREG" : "other", node->sf_type));
+	Log((" ino=%d", (uint_t)node->sf_ino));
+	Log((" path=%s", node->sf_path));
+	Log((" parent=0x%p", node->sf_parent));
+	if (node->sf_children)
+		Log((" children=%d", node->sf_children));
+	if (node->sf_vnode)
+		Log((" vnode=0x%p", node->sf_vnode));
+	Log(("%s\n", node->sf_is_stale ? " STALE" : ""));
+}
+
+void
+sfnode_list()
+{
+	sfnode_t *n;
+	for (n = avl_first(&sfnodes); n != NULL; n = AVL_NEXT(&sfnodes, n))
+		sfnode_print(n);
+	for (n = avl_first(&stale_sfnodes); n != NULL;
+	    n = AVL_NEXT(&stale_sfnodes, n))
+		sfnode_print(n);
+}
+
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h
new file mode 100644
index 000000000..83bf98561
--- /dev/null
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h
@@ -0,0 +1,67 @@
+/** @file
+ * VirtualBox File System for Solaris Guests, vnode header.
+ */
+
+/*
+ * Copyright (C) 2009 Sun Microsystems, Inc.
+ *
+ * Sun Microsystems, Inc. confidential
+ * All rights reserved
+ */
+
+#ifndef __VBoxFS_node_Solaris_h
+#define	__VBoxFS_node_Solaris_h
+
+#include <sys/t_lock.h>
+#include <sys/avl.h>
+#include <vm/seg.h>
+#include <vm/seg_vn.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+ * sfnode is the file system dependent vnode data for vboxsf.
+ * sfnode's also track all files ever accessed, both open and closed.
+ * It duplicates some of the information in vnode, since it holds
+ * information for files that may have been completely closed.
+ *
+ * The sfnode_t's are stored in an AVL tree sorted by:
+ *	sf_sffs, sf_path
+ */
+typedef struct sfnode {
+	avl_node_t	sf_linkage;	/* AVL tree linkage */
+	struct sffs_data *sf_sffs;	/* containing mounted file system */
+	char		*sf_path;	/* full pathname to file or dir */
+	uint64_t	sf_ino;		/* assigned unique ID number */
+	vnode_t		*sf_vnode;	/* vnode if active */
+	sfp_file_t	*sf_file;	/* non NULL if open */
+	struct sfnode	*sf_parent;	/* parent sfnode of this one */
+	uint16_t	sf_children;	/* number of children sfnodes */
+	uint8_t		sf_type;	/* VDIR or VREG */
+	uint8_t		sf_is_stale;	/* this is stale and should be purged */
+} sfnode_t;
+
+#define VN2SFN(vp) ((sfnode_t *)(vp)->v_data)
+
+#ifdef _KERNEL
+extern int sffs_vnode_init(void);
+extern void sffs_vnode_fini(void);
+extern sfnode_t *sfnode_make(struct sffs_data *, char *, vtype_t, sfp_file_t *,
+ sfnode_t *parent);
+extern vnode_t *sfnode_get_vnode(sfnode_t *);
+
+/*
+ * Purge all cached information about a shared file system at unmount
+ */
+extern int sffs_purge(struct sffs_data *);
+
+extern kmutex_t sffs_lock;
+#endif /* _KERNEL */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* __VBoxFS_node_Solaris_h */
diff --git a/src/VBox/Additions/x11/Installer/x11config-new.pl b/src/VBox/Additions/x11/Installer/x11config-new.pl
index 81e8012ab..edd4e205f 100755
--- a/src/VBox/Additions/x11/Installer/x11config-new.pl
+++ b/src/VBox/Additions/x11/Installer/x11config-new.pl
@@ -19,16 +19,16 @@
 # additional information or have any questions.
 #
 
-my $use_hal = 0;
+my $auto_mouse = 0;
 my $new_mouse = 0;
 my $no_bak = 0;
 my $old_mouse_dev = "/dev/psaux";
 
 foreach $arg (@ARGV)
 {
-    if (lc($arg) eq "--usehal")
+    if (lc($arg) eq "--autoMouse")
     {
-        $use_hal = 1;
+        $auto_mouse = 1;
     }
     elsif (lc($arg) eq "--newmouse")
     {
@@ -48,6 +48,7 @@ foreach $arg (@ARGV)
         my $CFG;
         my $xkbopts = "";
         my $kb_driver = "";
+		my $layout_kb = "";
         if (open(CFG, $cfg))
         {
             my $TMP;
@@ -108,9 +109,10 @@ $xkbopts  Option       "Protocol" "Standard"
   Option       "CoreKeyboard"
 EndSection
 EOF
+				$layout_kb = "  InputDevice  \"Keyboard[0]\" \"CoreKeyboard\"\n"
             }
 
-            if (!$use_hal && !$new_mouse) {
+            if (!$auto_mouse && !$new_mouse) {
                 print TMP <<EOF;
 
 Section "InputDevice"
@@ -127,8 +129,7 @@ EndSection
 
 Section "ServerLayout"
   Identifier   "Layout[all]"
-  InputDevice  "Keyboard[0]" "CoreKeyboard"
-  InputDevice  "Mouse[1]" "CorePointer"
+$layout_kb  InputDevice  "Mouse[1]" "CorePointer"
   Option       "Clone" "off"
   Option       "Xinerama" "off"
   Screen       "Screen[0]"
@@ -136,7 +137,7 @@ EndSection
 EOF
             }
 
-            if (!$use_hal && $new_mouse) {
+            if (!$auto_mouse && $new_mouse) {
                 print TMP <<EOF;
 
 Section "InputDevice"
diff --git a/src/VBox/Additions/x11/VBoxClient/clipboard.h b/src/VBox/Additions/x11/VBoxClient/clipboard.h
index 7ea0390a4..275140ffc 100644
--- a/src/VBox/Additions/x11/VBoxClient/clipboard.h
+++ b/src/VBox/Additions/x11/VBoxClient/clipboard.h
@@ -94,13 +94,13 @@ public:
      */
     int init(void)
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         int rc = mThreadFunction.init();
         if (RT_SUCCESS(rc))
             rc = mThread.start();
         if (RT_SUCCESS(rc))
             mInit = true;
-        LogFlowThisFunc(("returning %Rrc\n", rc));
+        LogRelFlowFunc(("returning %Rrc\n", rc));
         return rc;
     }
     /**
@@ -109,10 +109,10 @@ public:
      */
     void uninit(unsigned cMillies = RT_INDEFINITE_WAIT)
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         if (mInit)
             mThread.stop(cMillies, NULL);
-        LogFlowThisFunc(("returning\n"));
+        LogRelFlowFunc(("returning\n"));
     }
 
     VBoxGuestClipboard() : mThread(&mThreadFunction, 0, RTTHREADTYPE_MSG_PUMP,
@@ -120,12 +120,12 @@ public:
     { mInit = false; }
     ~VBoxGuestClipboard()
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         if (mInit)
             try {
                 uninit(2000);
             } catch (...) { }
-        LogFlowThisFunc(("returning\n"));
+        LogRelFlowFunc(("returning\n"));
     }
 };
 
diff --git a/src/VBox/Additions/x11/VBoxClient/display.cpp b/src/VBox/Additions/x11/VBoxClient/display.cpp
index 95d96f46a..3b6da5538 100644
--- a/src/VBox/Additions/x11/VBoxClient/display.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/display.cpp
@@ -44,7 +44,7 @@ static int initDisplay()
     int rcSystem, rcErrno;
     uint32_t fMouseFeatures = 0;
 
-    LogFlowFunc(("enabling dynamic resizing\n"));
+    LogRelFlowFunc(("enabling dynamic resizing\n"));
     rcSystem = system("VBoxRandR --test");
     if (-1 == rcSystem)
     {
@@ -62,9 +62,9 @@ static int initDisplay()
         VbglR3CtlFilterMask(0, VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST);
     /* Log and ignore the return value, as there is not much we can do with
      * it. */
-    LogFlowFunc(("dynamic resizing: result %Rrc\n", rc));
+    LogRelFlowFunc(("dynamic resizing: result %Rrc\n", rc));
     /* Enable support for switching between hardware and software cursors */
-    LogFlowFunc(("enabling relative mouse re-capturing support\n"));
+    LogRelFlowFunc(("enabling relative mouse re-capturing support\n"));
     rc = VbglR3GetMouseStatus(&fMouseFeatures, NULL, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -86,21 +86,21 @@ static int initDisplay()
         VbglR3SetMouseStatus(  fMouseFeatures
                              | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
     }
-    LogFlowFunc(("mouse re-capturing support: result %Rrc\n", rc));
+    LogRelFlowFunc(("mouse re-capturing support: result %Rrc\n", rc));
     return VINF_SUCCESS;
 }
 
 void cleanupDisplay(void)
 {
     uint32_t fMouseFeatures = 0;
-    LogFlowFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     VbglR3CtlFilterMask(0,   VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST
                            | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED);
     int rc = VbglR3GetMouseStatus(&fMouseFeatures, NULL, NULL);
     if (RT_SUCCESS(rc))
         VbglR3SetMouseStatus(  fMouseFeatures
                              | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
-    LogFlowFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /** This thread just runs a dummy X11 event loop to be sure that we get
@@ -123,8 +123,7 @@ static int x11ConnectionMonitor(RTTHREAD, void *)
  */
 int runDisplay()
 {
-    LogFlowFunc(("\n"));
-    uint32_t cx0 = 0, cy0 = 0, cBits0 = 0, iDisplay0 = 0;
+    LogRelFlowFunc(("\n"));
     Display *pDisplay = XOpenDisplay(NULL);
     if (pDisplay == NULL)
         return VERR_NOT_FOUND;
@@ -134,7 +133,6 @@ int runDisplay()
                    RTTHREADTYPE_INFREQUENT_POLLER, 0, "X11 monitor");
     if (RT_FAILURE(rc))
         return rc;
-    VbglR3GetDisplayChangeRequest(&cx0, &cy0, &cBits0, &iDisplay0, false);
     while (true)
     {
         uint32_t fEvents = 0, cx = 0, cy = 0, cBits = 0, iDisplay = 0;
@@ -145,20 +143,12 @@ int runDisplay()
         {
             int rc2 = VbglR3GetDisplayChangeRequest(&cx, &cy, &cBits,
                                                     &iDisplay, true);
-            /* Ignore the request if it is stale */
-            if ((cx != cx0) || (cy != cy0) || RT_FAILURE(rc2))
-            {
-	            /* If we are not stopping, sleep for a bit to avoid using up
-	                too much CPU while retrying. */
-	            if (RT_FAILURE(rc2))
-	                RTThreadYield();
-	            else
-	            {
-	                system("VBoxRandR");
-                    cx0 = cx;
-                    cy0 = cy;
-	            }
-            }
+            /* If we are not stopping, sleep for a bit to avoid using up
+                too much CPU while retrying. */
+            if (RT_FAILURE(rc2))
+                RTThreadYield();
+            else
+                system("VBoxRandR");
         }
         if (   RT_SUCCESS(rc)
             && (fEvents & VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED))
@@ -175,7 +165,7 @@ int runDisplay()
             XFlush(pDisplay);
         }
     }
-    LogFlowFunc(("returning VINF_SUCCESS\n"));
+    LogRelFlowFunc(("returning VINF_SUCCESS\n"));
     return VINF_SUCCESS;
 }
 
diff --git a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
index 05db468fc..e4e7d9959 100644
--- a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
@@ -51,7 +51,7 @@ public:
         conn = dbus_bus_get (DBUS_BUS_SESSON, NULL);
         if (conn == NULL)
         {
-            LogFlow(("Could not retrieve D-BUS session bus!\n"));
+            LogRelFlow(("Could not retrieve D-BUS session bus!\n"));
             rc = VERR_INVALID_HANDLE;
         }
         else
@@ -62,7 +62,7 @@ public:
                                                "Notify");
             if (msg == NULL)
             {
-                Log(("Could not create D-BUS message!\n"));
+                LogRel(("Could not create D-BUS message!\n"));
                 rc = VERR_INVALID_HANDLE;
             }
 	    else
@@ -108,7 +108,7 @@ public:
                 30 * 1000 /* 30 seconds timeout */, &err);
             if (dbus_error_is_set(&err))
             {
-                Log(("D-BUS returned an error while sending the notification: %s", err.message));
+                LogRel(("D-BUS returned an error while sending the notification: %s", err.message));
             }
             else if (reply)
             {
@@ -132,7 +132,7 @@ public:
     virtual int run(bool fDaemonised /* = false */)
     {
         int rc;
-        LogFlowFunc(("\n"));
+        LogRelFlowFunc(("\n"));
 
         /* Because we need desktop notifications to be displayed, wait
          * some time to make the desktop environment load (as a work around). */
@@ -153,7 +153,7 @@ public:
         {
             rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
             if (RT_FAILURE(rc))
-                Log(("Cannot connect to guest property service! rc = %Rrc\n", rc));
+                LogRel(("Cannot connect to guest property service! rc = %Rrc\n", rc));
         }
 
         if (RT_SUCCESS(rc))
@@ -178,7 +178,7 @@ public:
                     rc = showNotify(szTitle, szMsg);
                     LogRel(("VBoxClient: VirtualBox Guest Additions update available!"));
                     if (RT_FAILURE(rc))
-                        Log(("VBoxClient: Could not show version notifier tooltip! rc = %d\n", rc));
+                        LogRel(("VBoxClient: Could not show version notifier tooltip! rc = %d\n", rc));
                 }
 
                 /* Store host version to not notify again */
@@ -190,7 +190,7 @@ public:
             VbglR3GuestPropDisconnect(uGuestPropSvcClientID);
         }
 # endif /* VBOX_WITH_GUEST_PROPS */
-        LogFlowFunc(("returning %Rrc\n", rc));
+        LogRelFlowFunc(("returning %Rrc\n", rc));
         return rc;
     }
 
diff --git a/src/VBox/Additions/x11/VBoxClient/main.cpp b/src/VBox/Additions/x11/VBoxClient/main.cpp
index 21c516880..ea87e12a6 100644
--- a/src/VBox/Additions/x11/VBoxClient/main.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/main.cpp
@@ -40,7 +40,7 @@
 
 #include "VBoxClient.h"
 
-#define TRACE RTPrintf("%s: %d\n", __PRETTY_FUNCTION__, __LINE__); Log(("%s: %d\n", __PRETTY_FUNCTION__, __LINE__))
+#define TRACE RTPrintf("%s: %d\n", __PRETTY_FUNCTION__, __LINE__); LogRel(("%s: %d\n", __PRETTY_FUNCTION__, __LINE__))
 
 static int (*gpfnOldIOErrorHandler)(Display *) = NULL;
 
@@ -74,7 +74,7 @@ void VBoxClient::CleanUp()
  */
 void vboxClientSignalHandler(int cSignal)
 {
-    Log(("VBoxClient: terminated with signal %d\n", cSignal));
+    LogRel(("VBoxClient: terminated with signal %d\n", cSignal));
     /** Disable seamless mode */
     RTPrintf(("VBoxClient: terminating...\n"));
     VBoxClient::CleanUp();
@@ -98,7 +98,7 @@ int vboxClientXLibErrorHandler(Display *pDisplay, XErrorEvent *pError)
  */
 static int vboxClientXLibIOErrorHandler(Display *pDisplay)
 {
-    Log(("VBoxClient: a fatal guest X Window error occurred.  This may just mean that the Window system was shut down while the client was still running.\n"));
+    LogRel(("VBoxClient: a fatal guest X Window error occurred.  This may just mean that the Window system was shut down while the client was still running.\n"));
     VBoxClient::CleanUp();
     return 0;  /* We should never reach this. */
 }
@@ -111,7 +111,7 @@ void vboxClientSetSignalHandlers(void)
 {
     struct sigaction sigAction;
 
-    LogFlowFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     sigAction.sa_handler = vboxClientSignalHandler;
     sigemptyset(&sigAction.sa_mask);
     sigAction.sa_flags = 0;
@@ -124,7 +124,7 @@ void vboxClientSetSignalHandlers(void)
     sigaction(SIGTERM, &sigAction, NULL);
     sigaction(SIGUSR1, &sigAction, NULL);
     sigaction(SIGUSR2, &sigAction, NULL);
-    LogFlowFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /**
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
         if (RT_FAILURE(rc))
         {
             RTPrintf("VBoxClient: failed to daemonize.  Exiting.\n");
-            Log(("VBoxClient: failed to daemonize.  Exiting.\n"));
+            LogRel(("VBoxClient: failed to daemonize.  Exiting.\n"));
 # ifdef DEBUG
             RTPrintf("Error %Rrc\n", rc);
 # endif
@@ -233,27 +233,27 @@ int main(int argc, char *argv[])
     if (pszHome == NULL)
     {
         RTPrintf("VBoxClient: failed to get home directory.  Exiting.\n");
-        Log(("VBoxClient: failed to get home directory.  Exiting.\n"));
+        LogRel(("VBoxClient: failed to get home directory.  Exiting.\n"));
         return 1;
     }
     if (RTStrAPrintf(&g_pszPidFile, "%s/%s", pszHome, g_pService->getPidFilePath()) == -1)
     if (pszHome == NULL)
     {
         RTPrintf("VBoxClient: out of memory.  Exiting.\n");
-        Log(("VBoxClient: out of memory.  Exiting.\n"));
+        LogRel(("VBoxClient: out of memory.  Exiting.\n"));
         return 1;
     }
     /* Initialise the guest library. */
     if (RT_FAILURE(VbglR3InitUser()))
     {
         RTPrintf("Failed to connect to the VirtualBox kernel service\n");
-        Log(("Failed to connect to the VirtualBox kernel service\n"));
+        LogRel(("Failed to connect to the VirtualBox kernel service\n"));
         return 1;
     }
     if (g_pszPidFile && RT_FAILURE(VbglR3PidFile(g_pszPidFile, &g_hPidFile)))
     {
         RTPrintf("Failed to create a pidfile.  Exiting.\n");
-        Log(("Failed to create a pidfile.  Exiting.\n"));
+        LogRel(("Failed to create a pidfile.  Exiting.\n"));
         VbglR3Term();
         return 1;
     }
diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp b/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp
index b13b0a1d0..a9f8457f2 100644
--- a/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp
@@ -37,7 +37,7 @@ int VBoxGuestSeamlessHost::start(void)
 {
     int rc = VERR_NOT_SUPPORTED;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (mRunning)  /* Assertion */
     {
         LogRel(("VBoxClient: seamless service started twice!\n"));
@@ -51,7 +51,7 @@ int VBoxGuestSeamlessHost::start(void)
     rc = VbglR3SeamlessSetCap(true);
     if (RT_SUCCESS(rc))
     {
-        Log(("VBoxClient: enabled seamless capability on host.\n"));
+        LogRel(("VBoxClient: enabled seamless capability on host.\n"));
         rc = mThread.start();
         if (RT_SUCCESS(rc))
         {
@@ -65,16 +65,16 @@ int VBoxGuestSeamlessHost::start(void)
     }
     if (RT_FAILURE(rc))
     {
-        Log(("VBoxClient (seamless): failed to enable seamless capability on host, rc=%Rrc\n", rc));
+        LogRel(("VBoxClient (seamless): failed to enable seamless capability on host, rc=%Rrc\n", rc));
     }
-    LogFlowThisFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
 
 /** Stops the service. */
 void VBoxGuestSeamlessHost::stop(unsigned cMillies /* = RT_INDEFINITE_WAIT */)
 {
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
     if (!mRunning)  /* Assertion */
     {
         LogRel(("VBoxClient: tried to stop seamless service which is not running!\n"));
@@ -84,7 +84,7 @@ void VBoxGuestSeamlessHost::stop(unsigned cMillies /* = RT_INDEFINITE_WAIT */)
     VbglR3CtlFilterMask(0, VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST);
     VbglR3SeamlessSetCap(false);
     mRunning = false;
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /**
@@ -96,7 +96,7 @@ int VBoxGuestSeamlessHost::nextEvent(void)
 {
     VMMDevSeamlessMode newMode = VMMDev_Seamless_Disabled;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     int rc = VbglR3SeamlessWaitEvent(&newMode);
     if (RT_SUCCESS(rc))
     {
@@ -128,9 +128,9 @@ int VBoxGuestSeamlessHost::nextEvent(void)
     }
     else
     {
-        LogFunc(("VbglR3SeamlessWaitEvent returned %Rrc (VBoxClient)\n", rc));
+        LogRelFunc(("VbglR3SeamlessWaitEvent returned %Rrc (VBoxClient)\n", rc));
     }
-    LogFlowThisFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
 
@@ -139,14 +139,14 @@ int VBoxGuestSeamlessHost::nextEvent(void)
  */
 void VBoxGuestSeamlessHost::updateRects(std::auto_ptr<std::vector<RTRECT> > pRects)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (0 == pRects.get())  /* Assertion */
     {
         LogRelThisFunc(("ERROR: called with null pointer!\n"));
         return;
     }
     VbglR3SeamlessSendRects(pRects.get()->size(), pRects.get()->empty() ? NULL : &pRects.get()->front());
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /**
@@ -157,7 +157,7 @@ void VBoxGuestSeamlessHost::updateRects(std::auto_ptr<std::vector<RTRECT> > pRec
  */
 int VBoxGuestSeamlessHostThread::threadFunction(VBoxGuestThread *pThread)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (0 != mHost)
     {
         mThread = pThread;
@@ -171,7 +171,7 @@ int VBoxGuestSeamlessHostThread::threadFunction(VBoxGuestThread *pThread)
             }
         }
     }
-    LogFlowThisFunc(("returning VINF_SUCCESS\n"));
+    LogRelFlowFunc(("returning VINF_SUCCESS\n"));
     return VINF_SUCCESS;
 }
 
@@ -180,7 +180,7 @@ int VBoxGuestSeamlessHostThread::threadFunction(VBoxGuestThread *pThread)
  */
 void VBoxGuestSeamlessHostThread::stop(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (0 != mHost)
     {
         /**
@@ -195,5 +195,5 @@ void VBoxGuestSeamlessHostThread::stop(void)
             mThread->yield();
         }
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-host.h b/src/VBox/Additions/x11/VBoxClient/seamless-host.h
index 73c287283..a8134901c 100644
--- a/src/VBox/Additions/x11/VBoxClient/seamless-host.h
+++ b/src/VBox/Additions/x11/VBoxClient/seamless-host.h
@@ -125,14 +125,14 @@ public:
      */
     int init(VBoxGuestSeamlessObserver *pObserver)
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         if (mObserver != 0)  /* Assertion */
         {
             LogRel(("VBoxClient: ERROR: attempt to initialise seamless host object twice!\n"));
             return VERR_INTERNAL_ERROR;
         }
         mObserver = pObserver;
-        LogFlowThisFunc(("returning VINF_SUCCESS\n"));
+        LogRelFlowFunc(("returning VINF_SUCCESS\n"));
         return VINF_SUCCESS;
     }
 
@@ -167,7 +167,7 @@ public:
 
     ~VBoxGuestSeamlessHost()
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         if (mRunning)  /* Assertion */
         {
             LogRel(("VBoxClient: seamless host object still running!  Stopping...\n"));
@@ -177,7 +177,7 @@ public:
             }
             catch(...) {}
         }
-        LogFlowThisFunc(("returning\n"));
+        LogRelFlowFunc(("returning\n"));
     }
 };
 
diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp b/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp
index f247d8019..1bd9c260e 100644
--- a/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp
@@ -45,7 +45,7 @@
 static unsigned char *XXGetProperty (Display *aDpy, Window aWnd, Atom aPropType,
                                     const char *aPropName, unsigned long *nItems)
 {
-    LogFlowFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     Atom propNameAtom = XInternAtom (aDpy, aPropName,
                                      True /* only_if_exists */);
     if (propNameAtom == None)
@@ -64,7 +64,7 @@ static unsigned char *XXGetProperty (Display *aDpy, Window aWnd, Atom aPropType,
     if (rc != Success)
         return NULL;
 
-    LogFlowFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
     return propVal;
 }
 
@@ -77,7 +77,7 @@ int VBoxGuestSeamlessX11::init(VBoxGuestSeamlessObserver *pObserver)
 {
     int rc = VINF_SUCCESS;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (0 != mObserver)  /* Assertion */
     {
         LogRel(("VBoxClient: ERROR: attempt to initialise seamless guest object twice!\n"));
@@ -89,7 +89,7 @@ int VBoxGuestSeamlessX11::init(VBoxGuestSeamlessObserver *pObserver)
         return VERR_ACCESS_DENIED;
     }
     mObserver = pObserver;
-    LogFlowThisFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
 
@@ -107,12 +107,12 @@ int VBoxGuestSeamlessX11::start(void)
     /** Dummy values for XShapeQueryExtension */
     int error, event;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     mSupportsShape = XShapeQueryExtension(mDisplay, &event, &error);
     mEnabled = true;
     monitorClientList();
     rebuildWindowTree();
-    LogFlowThisFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
 
@@ -120,22 +120,22 @@ int VBoxGuestSeamlessX11::start(void)
     and stop requesting updates. */
 void VBoxGuestSeamlessX11::stop(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     mEnabled = false;
     unmonitorClientList();
     freeWindowTree();
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 void VBoxGuestSeamlessX11::monitorClientList(void)
 {
-    LogFlowThisFunc(("called\n"));
+    LogRelFlowFunc(("called\n"));
     XSelectInput(mDisplay, DefaultRootWindow(mDisplay.get()), SubstructureNotifyMask);
 }
 
 void VBoxGuestSeamlessX11::unmonitorClientList(void)
 {
-    LogFlowThisFunc(("called\n"));
+    LogRelFlowFunc(("called\n"));
     XSelectInput(mDisplay, DefaultRootWindow(mDisplay.get()), 0);
 }
 
@@ -145,7 +145,7 @@ void VBoxGuestSeamlessX11::unmonitorClientList(void)
  */
 void VBoxGuestSeamlessX11::rebuildWindowTree(void)
 {
-    LogFlowThisFunc(("called\n"));
+    LogRelFlowFunc(("called\n"));
     freeWindowTree();
     addClients(DefaultRootWindow(mDisplay.get()));
     mChanged = true;
@@ -169,19 +169,19 @@ void VBoxGuestSeamlessX11::addClients(const Window hRoot)
     /** The number of children of the root supplied */
     unsigned cChildren;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (!XQueryTree(mDisplay.get(), hRoot, &hRealRoot, &hParent, &phChildrenRaw, &cChildren))
         return;
     phChildren = phChildrenRaw;
     for (unsigned i = 0; i < cChildren; ++i)
         addClientWindow(phChildren.get()[i]);
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 
 void VBoxGuestSeamlessX11::addClientWindow(const Window hWin)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     XWindowAttributes winAttrib;
     bool fAddWin = true;
     char *pszWinName = NULL;
@@ -201,7 +201,7 @@ void VBoxGuestSeamlessX11::addClientWindow(const Window hWin)
     if (fAddWin && (!XGetWMNormalHints(mDisplay, hClient, &dummyHints,
                                        &dummyLong)))
     {
-        LogFlowFunc(("window %lu, client window %lu has no size hints\n",
+        LogRelFlowFunc(("window %lu, client window %lu has no size hints\n",
                      hWin, hClient));
         fAddWin = false;
     }
@@ -211,7 +211,7 @@ void VBoxGuestSeamlessX11::addClientWindow(const Window hWin)
         int cRects = 0, iOrdering;
         bool hasShape = false;
 
-        LogFlowFunc(("adding window %lu, client window %lu\n", hWin,
+        LogRelFlowFunc(("adding window %lu, client window %lu\n", hWin,
                      hClient));
         if (mSupportsShape)
         {
@@ -233,7 +233,7 @@ void VBoxGuestSeamlessX11::addClientWindow(const Window hWin)
         mGuestWindows.addWindow(hWin, hasShape, winAttrib.x, winAttrib.y,
                                 winAttrib.width, winAttrib.height, cRects, rects);
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 
@@ -249,7 +249,7 @@ bool VBoxGuestSeamlessX11::isVirtualRoot(Window hWin)
     unsigned long ulCount;
     bool rc = false;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     windowTypeRaw = XXGetProperty(mDisplay, hWin, XA_ATOM, WM_TYPE_PROP, &ulCount);
     if (windowTypeRaw != NULL)
     {
@@ -258,7 +258,7 @@ bool VBoxGuestSeamlessX11::isVirtualRoot(Window hWin)
             && (*windowType == XInternAtom(mDisplay, WM_TYPE_DESKTOP_PROP, True)))
             rc = true;
     }
-    LogFlowThisFunc(("returning %s\n", rc ? "true" : "false"));
+    LogRelFlowFunc(("returning %s\n", rc ? "true" : "false"));
     return rc;
 }
 
@@ -269,13 +269,13 @@ bool VBoxGuestSeamlessX11::isVirtualRoot(Window hWin)
 void VBoxGuestSeamlessX11::freeWindowTree(void)
 {
     /* We use post-increment in the operation to prevent the iterator from being invalidated. */
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     for (VBoxGuestWindowList::iterator it = mGuestWindows.begin(); it != mGuestWindows.end();
                  mGuestWindows.removeWindow(it++))
     {
         XShapeSelectInput(mDisplay, it->first, 0);
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 
@@ -288,7 +288,7 @@ void VBoxGuestSeamlessX11::nextEvent(void)
 {
     XEvent event;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     /* Start by sending information about the current window setup to the host.  We do this
        here because we want to send all such information from a single thread. */
     if (mChanged)
@@ -313,7 +313,7 @@ void VBoxGuestSeamlessX11::nextEvent(void)
     default:
         break;
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /**
@@ -323,7 +323,7 @@ void VBoxGuestSeamlessX11::nextEvent(void)
  */
 void VBoxGuestSeamlessX11::doConfigureEvent(Window hWin)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     VBoxGuestWindowList::iterator iter;
 
     iter = mGuestWindows.find(hWin);
@@ -351,7 +351,7 @@ void VBoxGuestSeamlessX11::doConfigureEvent(Window hWin)
         }
         mChanged = true;
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /**
@@ -361,7 +361,7 @@ void VBoxGuestSeamlessX11::doConfigureEvent(Window hWin)
  */
 void VBoxGuestSeamlessX11::doMapEvent(Window hWin)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     VBoxGuestWindowList::iterator iter;
 
     iter = mGuestWindows.find(hWin);
@@ -370,7 +370,7 @@ void VBoxGuestSeamlessX11::doMapEvent(Window hWin)
         addClientWindow(hWin);
         mChanged = true;
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 
@@ -381,7 +381,7 @@ void VBoxGuestSeamlessX11::doMapEvent(Window hWin)
  */
 void VBoxGuestSeamlessX11::doShapeEvent(Window hWin)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     VBoxGuestWindowList::iterator iter;
 
     iter = mGuestWindows.find(hWin);
@@ -399,7 +399,7 @@ void VBoxGuestSeamlessX11::doShapeEvent(Window hWin)
         iter->second->mapRects = rects;
         mChanged = true;
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /**
@@ -409,7 +409,7 @@ void VBoxGuestSeamlessX11::doShapeEvent(Window hWin)
  */
 void VBoxGuestSeamlessX11::doUnmapEvent(Window hWin)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     VBoxGuestWindowList::iterator iter;
 
     iter = mGuestWindows.find(hWin);
@@ -418,7 +418,7 @@ void VBoxGuestSeamlessX11::doUnmapEvent(Window hWin)
         mGuestWindows.removeWindow(iter);
         mChanged = true;
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /**
@@ -426,7 +426,7 @@ void VBoxGuestSeamlessX11::doUnmapEvent(Window hWin)
  */
 std::auto_ptr<std::vector<RTRECT> > VBoxGuestSeamlessX11::getRects(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     unsigned cRects = 0;
     std::auto_ptr<std::vector<RTRECT> > apRects(new std::vector<RTRECT>);
 
@@ -470,7 +470,7 @@ std::auto_ptr<std::vector<RTRECT> > VBoxGuestSeamlessX11::getRects(void)
         }
     }
     mcRects = cRects;
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
     return apRects;
 }
 
@@ -483,7 +483,7 @@ bool VBoxGuestSeamlessX11::interruptEvent(void)
 {
     bool rc = false;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     /* Message contents set to zero. */
     XClientMessageEvent clientMessage = { ClientMessage, 0, 0, 0, 0, 0, 8 };
 
@@ -493,6 +493,6 @@ bool VBoxGuestSeamlessX11::interruptEvent(void)
         XFlush(mDisplay);
         rc = true;
     }
-    LogFlowThisFunc(("returning %s\n", rc ? "true" : "false"));
+    LogRelFlowFunc(("returning %s\n", rc ? "true" : "false"));
     return rc;
 }
diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-x11.h b/src/VBox/Additions/x11/VBoxClient/seamless-x11.h
index 399adba4a..d5f4ced60 100644
--- a/src/VBox/Additions/x11/VBoxClient/seamless-x11.h
+++ b/src/VBox/Additions/x11/VBoxClient/seamless-x11.h
@@ -145,9 +145,9 @@ public:
     VBoxGuestX11Display(void) { mDisplay = NULL; }
     bool init(char *name = NULL)
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         mDisplay = XOpenDisplay(name);
-        LogFlowThisFunc(("returning\n"));
+        LogRelFlowFunc(("returning\n"));
         return (mDisplay != NULL);
     }
     operator Display *() { return mDisplay; }
@@ -155,10 +155,10 @@ public:
     bool isValid(void) { return (mDisplay != NULL); }
     int close(void)
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         int rc = XCloseDisplay(mDisplay);
         mDisplay = NULL;
-        LogFlowThisFunc(("returning\n"));
+        LogRelFlowFunc(("returning\n"));
         return rc;
     }
     ~VBoxGuestX11Display()
@@ -243,23 +243,23 @@ public:
     void addWindow(Window hWin, bool isMapped, int x, int y, int w, int h, int cRects,
                    VBoxGuestX11Pointer<XRectangle> rects)
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         VBoxGuestWinInfo *pInfo = new VBoxGuestWinInfo(isMapped, x, y, w, h, cRects,
                                                        rects);
         mWindows.insert(std::pair<Window, VBoxGuestWinInfo *>(hWin, pInfo));
-        LogFlowThisFunc(("returning\n"));
+        LogRelFlowFunc(("returning\n"));
     }
 
     void removeWindow(iterator it)
     {
-        LogFlowThisFunc(("called\n"));
+        LogRelFlowFunc(("called\n"));
         delete it->second;
         mWindows.erase(it);
     }
 
     void removeWindow(Window hWin)
     {
-        LogFlowThisFunc(("called\n"));
+        LogRelFlowFunc(("called\n"));
         removeWindow(find(hWin));
     }
 };
diff --git a/src/VBox/Additions/x11/VBoxClient/seamless.h b/src/VBox/Additions/x11/VBoxClient/seamless.h
index a665543b2..efce9793f 100644
--- a/src/VBox/Additions/x11/VBoxClient/seamless.h
+++ b/src/VBox/Additions/x11/VBoxClient/seamless.h
@@ -58,7 +58,7 @@ public:
     {
         int rc = VINF_SUCCESS;
 
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         rc = mGuest->start();
         if (RT_SUCCESS(rc))
         {
@@ -68,7 +68,7 @@ public:
             }
             mGuest->stop();
         }
-        LogFlowThisFunc(("returning %Rrc\n", rc));
+        LogRelFlowFunc(("returning %Rrc\n", rc));
         return rc;
     }
     /**
@@ -147,7 +147,7 @@ public:
     {
         int rc = VINF_SUCCESS;
 
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         if (isInitialised)  /* Assertion */
         {
             LogRelFunc(("error: called a second time! (VBoxClient)\n"));
@@ -171,15 +171,15 @@ public:
         }
         if (RT_FAILURE(rc))
         {
-            LogFunc(("returning %Rrc (VBoxClient)\n", rc));
+            LogRelFunc(("returning %Rrc (VBoxClient)\n", rc));
         }
-        LogFlowThisFunc(("returning %Rrc\n", rc));
+        LogRelFlowFunc(("returning %Rrc\n", rc));
         return rc;
     }
 
     void uninit(unsigned cMillies = RT_INDEFINITE_WAIT)
     {
-        LogFlowThisFunc(("\n"));
+        LogRelFlowFunc(("\n"));
         if (isInitialised)
         {
             mHost.stop(cMillies);
@@ -187,7 +187,7 @@ public:
             mGuest.uninit();
             isInitialised = false;
         }
-        LogFlowThisFunc(("returning\n"));
+        LogRelFlowFunc(("returning\n"));
     }
 
     VBoxGuestSeamless() : mGuestFunction(&mGuest, &mGuestObs),
diff --git a/src/VBox/Additions/x11/VBoxClient/thread.cpp b/src/VBox/Additions/x11/VBoxClient/thread.cpp
index c29eaf715..b7aeb037a 100644
--- a/src/VBox/Additions/x11/VBoxClient/thread.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/thread.cpp
@@ -29,7 +29,7 @@ int VBoxGuestThread::stop(unsigned cMillies, int *prc)
 {
     int rc = VINF_SUCCESS;
 
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (NIL_RTTHREAD == mSelf)  /* Assertion */
     {
         LogRelThisFunc(("Attempted to stop thread %s which is not running!\n", mName));
@@ -49,14 +49,14 @@ int VBoxGuestThread::stop(unsigned cMillies, int *prc)
             LogRelThisFunc(("Failed to stop thread %s!\n", mName));
         }
     }
-    LogFlowThisFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
 
 /** Destroy the class, stopping the thread if necessary. */
 VBoxGuestThread::~VBoxGuestThread(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (NIL_RTTHREAD != mSelf)
     {
         LogRelThisFunc(("Warning!  Stopping thread %s, as it is still running!\n", mName));
@@ -66,7 +66,7 @@ VBoxGuestThread::~VBoxGuestThread(void)
         }
         catch(...) {}
     }
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
 /** Start the thread. */
@@ -74,7 +74,7 @@ int VBoxGuestThread::start(void)
 {
     int rc = VINF_SUCCESS;
 
-    LogFlowThisFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
     if (NIL_RTTHREAD != mSelf)  /* Assertion */
     {
         LogRelThisFunc(("Attempted to start thead %s twice!\n", mName));
@@ -83,7 +83,7 @@ int VBoxGuestThread::start(void)
     mExit = false;
     rc = RTThreadCreate(&mSelf, threadFunction, reinterpret_cast<void *>(this),
                           mStack, mType, mFlags, mName);
-    LogFlowThisFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
 
@@ -98,7 +98,7 @@ int VBoxGuestThread::threadFunction(RTTHREAD self, void *pvUser)
 {
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     PSELF pSelf = reinterpret_cast<PSELF>(pvUser);
     pSelf->mRunning = true;
     try
@@ -116,6 +116,6 @@ int VBoxGuestThread::threadFunction(RTTHREAD self, void *pvUser)
         rc = VERR_UNRESOLVED_ERROR;
     }
     pSelf->mRunning = false;
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
diff --git a/src/VBox/Additions/x11/vboxvideo/undefined_68 b/src/VBox/Additions/x11/vboxvideo/undefined_68
index 4fc93af03..f8ee0f396 100644
--- a/src/VBox/Additions/x11/vboxvideo/undefined_68
+++ b/src/VBox/Additions/x11/vboxvideo/undefined_68
@@ -76,3 +76,4 @@ resVgaShared
 xf86SetBackingStore
 xf86snprintf
 XNFstrdup
+__stack_chk_fail
diff --git a/src/VBox/Additions/x11/x11stubs/Makefile.kmk b/src/VBox/Additions/x11/x11stubs/Makefile.kmk
index 7268ac735..b5a0aae54 100644
--- a/src/VBox/Additions/x11/x11stubs/Makefile.kmk
+++ b/src/VBox/Additions/x11/x11stubs/Makefile.kmk
@@ -33,5 +33,35 @@ libXcomposite_INST       = $(INST_LIB)
 libXcomposite_SONAME     = libXcomposite.so.1
 libXcomposite_SOURCES    = libXcomposite-1.0.0/libXcomposite.c
 
+#
+# libXdamage import library.
+#
+IMPORT_LIBS += libXdamage
+libXdamage_TEMPLATE   = VBOXR3
+libXdamage_INST       = $(INST_LIB)
+# This may need fixing later.
+libXdamage_SONAME     = libXdamage.so.1
+libXdamage_SOURCES    = libXdamage-1.1.0/libXdamage.c
+
+#
+# libXfixes import library.
+#
+IMPORT_LIBS += libXfixes
+libXfixes_TEMPLATE   = VBOXR3
+libXfixes_INST       = $(INST_LIB)
+# This may need fixing later.
+libXfixes_SONAME     = libXfixes.so.3
+libXfixes_SOURCES    = libXfixes-3.1.0/libXfixes.c
+
+#
+# libXfixes import library.
+#
+IMPORT_LIBS += libXext
+libXext_TEMPLATE   = VBOXR3
+libXext_INST       = $(INST_LIB)
+# This may need fixing later.
+libXext_SONAME     = libXext.so.6
+libXext_SOURCES    = libXext-6.4.0/libXext.c
+
 include $(KBUILD_PATH)/subfooter.kmk
 
diff --git a/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c b/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c
index c77643819..c3166584d 100644
--- a/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c
+++ b/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: libXcomposite.c $ */
 
 /** @file
  * X.Org libXcomposite.so linker stub
diff --git a/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c b/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c
new file mode 100644
index 000000000..8213fb6e1
--- /dev/null
+++ b/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c
@@ -0,0 +1,37 @@
+/* $Id: libXdamage.c $ */
+
+/** @file
+ * X.Org libXdamage.so linker stub
+ */
+
+/*
+ * Copyright (C) 2010 Sun Microsystems, Inc.
+ *
+ * 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.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ * Clara, CA 95054 USA or visit http://www.sun.com if you need
+ * additional information or have any questions.
+ */
+
+#include <iprt/cdefs.h>
+#include <iprt/types.h>
+
+#define DECLXSTUB(func) \
+    DECLEXPORT(void) func(void); \
+    void func(void) {}
+
+DECLXSTUB(XDamageCreate)
+DECLXSTUB(XDamageFindDisplay)
+DECLXSTUB(XDamageQueryExtension)
+DECLXSTUB(XDamageSubtract)
+DECLXSTUB(XDamageAdd)
+DECLXSTUB(XDamageDestroy)
+DECLXSTUB(XDamageExtensionInfo)
+DECLXSTUB(XDamageQueryVersion)
diff --git a/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c b/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c
new file mode 100644
index 000000000..1b9cd12dc
--- /dev/null
+++ b/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c
@@ -0,0 +1,156 @@
+/* $Id: libXext.c $ */
+
+/** @file
+ * X.Org libXext.so linker stub
+ */
+
+/*
+ * Copyright (C) 2010 Sun Microsystems, Inc.
+ *
+ * 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.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ * Clara, CA 95054 USA or visit http://www.sun.com if you need
+ * additional information or have any questions.
+ */
+
+#include <iprt/cdefs.h>
+#include <iprt/types.h>
+
+#define DECLXSTUB(func) \
+    DECLEXPORT(void) func(void); \
+    void func(void) {}
+
+DECLXSTUB(XSyncAwait)
+DECLXSTUB(XagCreateEmbeddedApplicationGroup)
+DECLXSTUB(XeviGetVisualInfo)
+DECLXSTUB(XSyncValueGreaterOrEqual)
+DECLXSTUB(XSyncIntToValue)
+DECLXSTUB(DPMSDisable)
+DECLXSTUB(XSyncValueSubtract)
+DECLXSTUB(DPMSEnable)
+DECLXSTUB(XShmQueryExtension)
+DECLXSTUB(DPMSGetVersion)
+DECLXSTUB(XTestFakeInput)
+DECLXSTUB(XdbeAllocateBackBufferName)
+DECLXSTUB(DPMSInfo)
+DECLXSTUB(XTestGetInput)
+DECLXSTUB(XmbufGetWindowAttributes)
+DECLXSTUB(XMITMiscGetBugMode)
+DECLXSTUB(XTestReset)
+DECLXSTUB(XSyncChangeAlarm)
+DECLXSTUB(XdbeDeallocateBackBufferName)
+DECLXSTUB(XSyncValueIsNegative)
+DECLXSTUB(XTestQueryInputSize)
+DECLXSTUB(XLbxQueryExtension)
+DECLXSTUB(XeviQueryVersion)
+DECLXSTUB(XShapeQueryExtension)
+DECLXSTUB(XmbufGetScreenInfo)
+DECLXSTUB(XSyncValueLow32)
+DECLXSTUB(XSyncIntsToValue)
+DECLXSTUB(XSyncValueAdd)
+DECLXSTUB(XSecurityGenerateAuthorization)
+DECLXSTUB(DPMSSetTimeouts)
+DECLXSTUB(XShapeQueryVersion)
+DECLXSTUB(XShmCreatePixmap)
+DECLXSTUB(XmbufDisplayBuffers)
+DECLXSTUB(XShapeCombineShape)
+DECLXSTUB(XMITMiscSetBugMode)
+DECLXSTUB(XmbufCreateBuffers)
+DECLXSTUB(XagGetApplicationGroupAttributes)
+DECLXSTUB(XSecurityQueryExtension)
+DECLXSTUB(DPMSGetTimeouts)
+DECLXSTUB(XSyncQueryCounter)
+DECLXSTUB(XextAddDisplay)
+DECLXSTUB(XSyncChangeCounter)
+DECLXSTUB(XSyncDestroyAlarm)
+DECLXSTUB(XeviQueryExtension)
+DECLXSTUB(XMissingExtension)
+DECLXSTUB(XmbufChangeWindowAttributes)
+DECLXSTUB(XSyncQueryAlarm)
+DECLXSTUB(XdbeGetVisualInfo)
+DECLXSTUB(XShmGetEventBase)
+DECLXSTUB(XSyncValueLessOrEqual)
+DECLXSTUB(XextFindDisplay)
+DECLXSTUB(XShapeQueryExtents)
+DECLXSTUB(XdbeQueryExtension)
+DECLXSTUB(XShapeOffsetShape)
+DECLXSTUB(XdbeFreeVisualInfo)
+DECLXSTUB(XShapeSelectInput)
+DECLXSTUB(XGEQueryVersion)
+DECLXSTUB(XagDestroyApplicationGroup)
+DECLXSTUB(XShmQueryVersion)
+DECLXSTUB(XSyncCreateAlarm)
+DECLXSTUB(XSyncValueEqual)
+DECLXSTUB(XSyncSetPriority)
+DECLXSTUB(xgeExtRegister)
+DECLXSTUB(DPMSQueryExtension)
+DECLXSTUB(XagCreateAssociation)
+DECLXSTUB(XSyncValueIsPositive)
+DECLXSTUB(XagQueryApplicationGroup)
+DECLXSTUB(XSetExtensionErrorHandler)
+DECLXSTUB(XmbufGetBufferAttributes)
+DECLXSTUB(XdbeBeginIdiom)
+DECLXSTUB(XSyncMinValue)
+DECLXSTUB(XagDestroyAssociation)
+DECLXSTUB(XTestFlush)
+DECLXSTUB(XSyncGetPriority)
+DECLXSTUB(XagCreateNonembeddedApplicationGroup)
+DECLXSTUB(XShmPutImage)
+DECLXSTUB(XagQueryVersion)
+DECLXSTUB(XSecurityAllocXauth)
+DECLXSTUB(XSyncDestroyCounter)
+DECLXSTUB(XShapeGetRectangles)
+DECLXSTUB(XShmDetach)
+DECLXSTUB(XSyncSetCounter)
+DECLXSTUB(XTestPressButton)
+DECLXSTUB(XSyncValueLessThan)
+DECLXSTUB(XTestMovePointer)
+DECLXSTUB(XSyncValueGreaterThan)
+DECLXSTUB(XLbxQueryVersion)
+DECLXSTUB(XShapeCombineRegion)
+DECLXSTUB(XextCreateExtension)
+DECLXSTUB(XShapeCombineRectangles)
+DECLXSTUB(XcupStoreColors)
+DECLXSTUB(XSecurityRevokeAuthorization)
+DECLXSTUB(XdbeGetBackBufferAttributes)
+DECLXSTUB(XmbufClearBufferArea)
+DECLXSTUB(XLbxGetEventBase)
+DECLXSTUB(XShmGetImage)
+DECLXSTUB(XTestStopInput)
+DECLXSTUB(XShmAttach)
+DECLXSTUB(XdbeEndIdiom)
+DECLXSTUB(XdbeSwapBuffers)
+DECLXSTUB(XmbufGetVersion)
+DECLXSTUB(XmbufCreateStereoWindow)
+DECLXSTUB(XmbufDestroyBuffers)
+DECLXSTUB(XGEQueryExtension)
+DECLXSTUB(XSyncValueIsZero)
+DECLXSTUB(XShapeCombineMask)
+DECLXSTUB(XSyncListSystemCounters)
+DECLXSTUB(XSyncCreateCounter)
+DECLXSTUB(DPMSCapable)
+DECLXSTUB(XcupGetReservedColormapEntries)
+DECLXSTUB(XmbufChangeBufferAttributes)
+DECLXSTUB(XSyncQueryExtension)
+DECLXSTUB(XmbufQueryExtension)
+DECLXSTUB(XShapeInputSelected)
+DECLXSTUB(XMITMiscQueryExtension)
+DECLXSTUB(XShmCreateImage)
+DECLXSTUB(XSecurityFreeXauth)
+DECLXSTUB(DPMSForceLevel)
+DECLXSTUB(XSyncValueHigh32)
+DECLXSTUB(XTestPressKey)
+DECLXSTUB(XSyncInitialize)
+DECLXSTUB(XShmPixmapFormat)
+DECLXSTUB(XextRemoveDisplay)
+DECLXSTUB(XSyncMaxValue)
+DECLXSTUB(XSyncFreeSystemCounterList)
+DECLXSTUB(XcupQueryVersion)
+DECLXSTUB(XextDestroyExtension)
diff --git a/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c b/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c
new file mode 100644
index 000000000..f7dbe2f2b
--- /dev/null
+++ b/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c
@@ -0,0 +1,65 @@
+/* $Id: libXfixes.c $ */
+
+/** @file
+ * X.Org libXfixes.so linker stub
+ */
+
+/*
+ * Copyright (C) 2010 Sun Microsystems, Inc.
+ *
+ * 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.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ * Clara, CA 95054 USA or visit http://www.sun.com if you need
+ * additional information or have any questions.
+ */
+
+#include <iprt/cdefs.h>
+#include <iprt/types.h>
+
+#define DECLXSTUB(func) \
+    DECLEXPORT(void) func(void); \
+    void func(void) {}
+
+DECLXSTUB(XFixesTranslateRegion)
+DECLXSTUB(XFixesRegionExtents)
+DECLXSTUB(XFixesFetchRegion)
+DECLXSTUB(XFixesExpandRegion)
+DECLXSTUB(XFixesSelectSelectionInput)
+DECLXSTUB(XFixesChangeCursorByName)
+DECLXSTUB(XFixesInvertRegion)
+DECLXSTUB(XFixesQueryVersion)
+DECLXSTUB(XFixesCreateRegionFromBitmap)
+DECLXSTUB(XFixesSetRegion)
+DECLXSTUB(XFixesCreateRegion)
+DECLXSTUB(XFixesGetCursorImage)
+DECLXSTUB(XFixesDestroyRegion)
+DECLXSTUB(XFixesSetCursorName)
+DECLXSTUB(XFixesIntersectRegion)
+DECLXSTUB(XFixesCopyRegion)
+DECLXSTUB(XFixesSelectCursorInput)
+DECLXSTUB(XFixesShowCursor)
+DECLXSTUB(XFixesHideCursor)
+DECLXSTUB(XFixesGetCursorName)
+DECLXSTUB(XFixesExtensionName)
+DECLXSTUB(XFixesVersion)
+DECLXSTUB(XFixesSetGCClipRegion)
+DECLXSTUB(XFixesQueryExtension)
+DECLXSTUB(XFixesFindDisplay)
+DECLXSTUB(XFixesChangeCursor)
+DECLXSTUB(XFixesSetWindowShapeRegion)
+DECLXSTUB(XFixesCreateRegionFromPicture)
+DECLXSTUB(XFixesSetPictureClipRegion)
+DECLXSTUB(XFixesFetchRegionAndBounds)
+DECLXSTUB(XFixesExtensionInfo)
+DECLXSTUB(XFixesSubtractRegion)
+DECLXSTUB(XFixesUnionRegion)
+DECLXSTUB(XFixesCreateRegionFromGC)
+DECLXSTUB(XFixesChangeSaveSet)
+DECLXSTUB(XFixesCreateRegionFromWindow)
diff --git a/src/VBox/Devices/Audio/pulse_stubs.c b/src/VBox/Devices/Audio/pulse_stubs.c
index 859b0e82b..f407a2ecb 100644
--- a/src/VBox/Devices/Audio/pulse_stubs.c
+++ b/src/VBox/Devices/Audio/pulse_stubs.c
@@ -1,10 +1,10 @@
+/* $Id: pulse_stubs.c $ */
 /** @file
- *
  * Stubs for libpulse.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -78,12 +78,15 @@ PROXY_STUB     (pa_stream_get_state, pa_stream_state_t,
 PROXY_STUB_VOID(pa_stream_set_state_callback,
                 (pa_stream *s, pa_stream_notify_cb_t cb, void *userdata),
                 (s, cb, userdata))
+PROXY_STUB     (pa_stream_flush, pa_operation*,
+                (pa_stream *s, pa_stream_success_cb_t cb, void *userdata),
+                (s, cb, userdata))
 PROXY_STUB     (pa_stream_drain, pa_operation*,
                 (pa_stream *s, pa_stream_success_cb_t cb, void *userdata),
                 (s, cb, userdata))
 PROXY_STUB     (pa_stream_trigger, pa_operation*,
                 (pa_stream *s, pa_stream_success_cb_t cb, void *userdata),
-		(s, cb, userdata))
+                (s, cb, userdata))
 PROXY_STUB     (pa_stream_new, pa_stream*,
                 (pa_context *c, const char *name, const pa_sample_spec *ss,
                  const pa_channel_map *map),
@@ -172,13 +175,16 @@ PROXY_STUB_VOID(pa_operation_unref,
                 (o))
 PROXY_STUB     (pa_operation_get_state, pa_operation_state_t,
                 (pa_operation *o),
-		(o))
+                (o))
+PROXY_STUB_VOID(pa_operation_cancel,
+                (pa_operation *o),
+                (o))
 PROXY_STUB     (pa_strerror, const char*,
                 (int error),
                 (error))
 PROXY_STUB     (pa_stream_readable_size, size_t,
                 (pa_stream *p),
-		(p))
+                (p))
 
 
 typedef struct
@@ -199,6 +205,7 @@ static SHARED_FUNC SharedFuncs[] =
     ELEMENT(pa_stream_unref),
     ELEMENT(pa_stream_get_state),
     ELEMENT(pa_stream_set_state_callback),
+    ELEMENT(pa_stream_flush),
     ELEMENT(pa_stream_drain),
     ELEMENT(pa_stream_trigger),
     ELEMENT(pa_stream_new),
@@ -230,6 +237,7 @@ static SHARED_FUNC SharedFuncs[] =
     ELEMENT(pa_channel_map_init_auto),
     ELEMENT(pa_operation_unref),
     ELEMENT(pa_operation_get_state),
+    ELEMENT(pa_operation_cancel),
     ELEMENT(pa_strerror),
     ELEMENT(pa_stream_readable_size)
 };
diff --git a/src/VBox/Devices/Audio/pulseaudio.c b/src/VBox/Devices/Audio/pulseaudio.c
index 21596908f..739e2d978 100644
--- a/src/VBox/Devices/Audio/pulseaudio.c
+++ b/src/VBox/Devices/Audio/pulseaudio.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -69,6 +69,7 @@ typedef struct PulseVoice
     const uint8_t  *pu8PeekBuf;
     size_t         cbPeekBuf;
     size_t         offPeekBuf;
+    pa_operation   *pDrainOp;
 } PulseVoice;
 
 /* The desired buffer length in milliseconds. Will be the target total stream
@@ -146,10 +147,44 @@ static int pulse_to_audfmt (pa_sample_format_t pulsefmt, audfmt_e *fmt, int *end
     return 0;
 }
 
-static void context_state_callback(pa_context *c, void *userdata)
+static void stream_success_callback(pa_stream *pStream, int fSuccess, void *userdata)
 {
     PulseVoice *pPulse = (PulseVoice *)userdata;
-    switch (pa_context_get_state(c))
+    pPulse->fOpSuccess = fSuccess;
+    if (!fSuccess)
+    {
+        if (pPulse->cErrors < MAX_LOG_REL_ERRORS)
+        {
+            int rc = pa_context_errno(g_pContext);
+            pPulse->cErrors++;
+            LogRel(("Pulse: Failed stream operation: %s\n", pa_strerror(rc)));
+        }
+    }
+    pa_threaded_mainloop_signal(g_pMainLoop, 0);
+}
+
+/**
+ * Synchronously wait until an operation completed.
+ */
+static int pulse_wait_for_operation (pa_operation *op)
+{
+    if (op)
+    {
+        while (pa_operation_get_state(op) == PA_OPERATION_RUNNING)
+            pa_threaded_mainloop_wait(g_pMainLoop);
+        pa_operation_unref(op);
+    }
+
+    return 1;
+}
+
+/**
+ * Context status changed.
+ */
+static void context_state_callback(pa_context *pContext, void *userdata)
+{
+    PulseVoice *pPulse = (PulseVoice *)userdata;
+    switch (pa_context_get_state(pContext))
     {
         case PA_CONTEXT_READY:
         case PA_CONTEXT_TERMINATED:
@@ -168,9 +203,12 @@ static void context_state_callback(pa_context *c, void *userdata)
     }
 }
 
-static void stream_state_callback(pa_stream *s, void *userdata)
+/**
+ * Stream status changed.
+ */
+static void stream_state_callback(pa_stream *pStream, void *userdata)
 {
-    switch (pa_stream_get_state(s))
+    switch (pa_stream_get_state(pStream))
     {
         case PA_STREAM_READY:
         case PA_STREAM_FAILED:
@@ -183,6 +221,29 @@ static void stream_state_callback(pa_stream *s, void *userdata)
     }
 }
 
+/**
+ * Callback called when our pa_stream_drain operation was completed.
+ */
+static void stream_drain_callback(pa_stream *pStream, int fSuccess, void *userdata)
+{
+    PulseVoice *pPulse = (PulseVoice *)userdata;
+    pPulse->fOpSuccess = fSuccess;
+    if (!fSuccess)
+    {
+        if (pPulse->cErrors < MAX_LOG_REL_ERRORS)
+        {
+            int rc = pa_context_errno(g_pContext);
+            pPulse->cErrors++;
+            LogRel(("Pulse: Failed stream operation: %s\n", pa_strerror(rc)));
+        }
+    }
+    else
+        pa_operation_unref(pa_stream_cork(pStream, 1, stream_success_callback, userdata));
+
+    pa_operation_unref(pPulse->pDrainOp);
+    pPulse->pDrainOp = NULL;
+}
+
 static int pulse_open (int fIn, pa_stream **ppStream, pa_sample_spec *pSampleSpec,
                        pa_buffer_attr *pBufAttr)
 {
@@ -228,6 +289,9 @@ static int pulse_open (int fIn, pa_stream **ppStream, pa_sample_spec *pSampleSpe
     flags |= PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE;
 #endif
 
+    /* no input/output right away after the stream was started */
+    flags |= PA_STREAM_START_CORKED;
+
     if (fIn)
     {
         LogRel(("Pulse: Requested record buffer attributes: maxlength=%d fragsize=%d\n",
@@ -245,8 +309,6 @@ static int pulse_open (int fIn, pa_stream **ppStream, pa_sample_spec *pSampleSpe
         LogRel(("Pulse: Requested playback buffer attributes: maxlength=%d tlength=%d prebuf=%d minreq=%d\n",
                 pBufAttr->maxlength, pBufAttr->tlength, pBufAttr->prebuf, pBufAttr->minreq));
 
-        flags |= PA_STREAM_START_CORKED;
-
         if (pa_stream_connect_playback(pStream, /*dev=*/NULL, pBufAttr, flags,
                                        /*cvolume=*/NULL, /*sync_stream=*/NULL) < 0)
         {
@@ -310,6 +372,8 @@ static int pulse_init_out (HWVoiceOut *hw, audsettings_t *as)
     audsettings_t obt_as;
     int cbBuf;
 
+    pPulse->pDrainOp            = NULL;
+
     pPulse->SampleSpec.format   = aud_to_pulsefmt (as->fmt);
     pPulse->SampleSpec.rate     = as->freq;
     pPulse->SampleSpec.channels = as->nchannels;
@@ -439,34 +503,6 @@ static int pulse_write (SWVoiceOut *sw, void *buf, int len)
     return audio_pcm_sw_write (sw, buf, len);
 }
 
-static void stream_success_callback(pa_stream *pStream, int success, void *userdata)
-{
-    PulseVoice *pPulse = (PulseVoice *) userdata;
-    pPulse->fOpSuccess = success;
-    if (!success)
-    {
-        if (pPulse->cErrors < MAX_LOG_REL_ERRORS)
-        {
-            int rc = pa_context_errno(g_pContext);
-            pPulse->cErrors++;
-            LogRel(("Pulse: Failed stream operation: %s\n", pa_strerror(rc)));
-        }
-    }
-    pa_threaded_mainloop_signal(g_pMainLoop, 0);
-}
-
-static int pulse_wait_for_operation (pa_operation *op)
-{
-    if (op)
-    {
-        while (pa_operation_get_state(op) == PA_OPERATION_RUNNING)
-            pa_threaded_mainloop_wait(g_pMainLoop);
-        pa_operation_unref(op);
-    }
-
-    return 1;
-}
-
 static int pulse_ctl_out (HWVoiceOut *hw, int cmd, ...)
 {
     PulseVoice *pPulse = (PulseVoice *) hw;
@@ -474,16 +510,36 @@ static int pulse_ctl_out (HWVoiceOut *hw, int cmd, ...)
     switch (cmd)
     {
         case VOICE_ENABLE:
+            /* Start audio output. */
             pa_threaded_mainloop_lock(g_pMainLoop);
-            pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 0, stream_success_callback, pPulse));
+            if (   pPulse->pDrainOp
+                && pa_operation_get_state(pPulse->pDrainOp) != PA_OPERATION_DONE)
+            {
+                pa_operation_cancel(pPulse->pDrainOp);
+                pa_operation_unref(pPulse->pDrainOp);
+                pPulse->pDrainOp = NULL;
+            }
+            else
+            {
+                /* should return immediately */
+                pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 0,
+                                                        stream_success_callback, pPulse));
+            }
             pa_threaded_mainloop_unlock(g_pMainLoop);
             break;
 
         case VOICE_DISABLE:
+            /* Pause audio output (the Pause bit of the AC97 x_CR register is set).
+             * Note that we must return immediately from here! */
             pa_threaded_mainloop_lock(g_pMainLoop);
-            pulse_wait_for_operation(pa_stream_trigger(pPulse->pStream, stream_success_callback, pPulse));
-            pulse_wait_for_operation(pa_stream_drain(pPulse->pStream, stream_success_callback, pPulse));
-            pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 1, stream_success_callback, pPulse));
+            if (!pPulse->pDrainOp)
+            {
+                /* should return immediately */
+                pulse_wait_for_operation(pa_stream_trigger(pPulse->pStream,
+                                                           stream_success_callback, pPulse));
+                pPulse->pDrainOp = pa_stream_drain(pPulse->pStream,
+                                                   stream_drain_callback, pPulse);
+            }
             pa_threaded_mainloop_unlock(g_pMainLoop);
             break;
 
@@ -643,7 +699,9 @@ static int pulse_ctl_in (HWVoiceIn *hw, int cmd, ...)
     {
         case VOICE_ENABLE:
             pa_threaded_mainloop_lock(g_pMainLoop);
-            pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 0, stream_success_callback, pPulse));
+            /* should return immediately */
+            pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 0,
+                                                    stream_success_callback, pPulse));
             pa_threaded_mainloop_unlock(g_pMainLoop);
             break;
 
@@ -654,7 +712,9 @@ static int pulse_ctl_in (HWVoiceIn *hw, int cmd, ...)
                 pa_stream_drop(pPulse->pStream);
                 pPulse->pu8PeekBuf = NULL;
             }
-            pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 1, stream_success_callback, pPulse));
+            /* should return immediately */
+            pulse_wait_for_operation(pa_stream_cork(pPulse->pStream, 1,
+                                                    stream_success_callback, pPulse));
             pa_threaded_mainloop_unlock(g_pMainLoop);
             break;
 
diff --git a/src/VBox/Devices/EFI/DevEFI.cpp b/src/VBox/Devices/EFI/DevEFI.cpp
index 4ad5393d4..c682046e3 100644
--- a/src/VBox/Devices/EFI/DevEFI.cpp
+++ b/src/VBox/Devices/EFI/DevEFI.cpp
@@ -912,7 +912,8 @@ static DECLCALLBACK(int)  efiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMN
     if (RT_FAILURE(rc))
         return rc;
 
-    FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
+    FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
+                          _4K - VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 
     rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,
                               PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "DMI tables");
diff --git a/src/VBox/Devices/Graphics/DevVGA.cpp b/src/VBox/Devices/Graphics/DevVGA.cpp
index 72cb5229c..c96dcd90d 100644
--- a/src/VBox/Devices/Graphics/DevVGA.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA.cpp
@@ -4984,58 +4984,62 @@ static DECLCALLBACK(int) vgaPortTakeScreenshot(PPDMIDISPLAYPORT pInterface, uint
      */
     size_t cbRequired = pThis->last_scr_width * 4 * pThis->last_scr_height;
 
-    uint8_t *pu8Data = (uint8_t *)RTMemAlloc(cbRequired);
-    if (pu8Data == NULL)
+    if (cbRequired)
     {
-        rc = VERR_NO_MEMORY;
-    }
-    else
-    {
-        /*
-         * Only 3 methods, assigned below, will be called during the screenshot update.
-         * All other are already set to NULL.
-         */
-
-        Connector.pu8Data       = pu8Data;
-        Connector.cBits         = 32;
-        Connector.cx            = pThis->last_scr_width;
-        Connector.cy            = pThis->last_scr_height;
-        Connector.cbScanline    = Connector.cx * 4;
-        Connector.pfnRefresh    = vgaDummyRefresh;
-        Connector.pfnResize     = vgaDummyResize;
-        Connector.pfnUpdateRect = vgaDummyUpdateRect;
-
-        /* Save & replace state data. */
-        PPDMIDISPLAYCONNECTOR pConnectorSaved = pThis->pDrv;
-        int32_t graphic_mode_saved = pThis->graphic_mode;
-        bool fRenderVRAMSaved = pThis->fRenderVRAM;
-
-        pThis->pDrv = &Connector;
-        pThis->graphic_mode = -1;           /* force a full refresh. */
-        pThis->fRenderVRAM = 1;             /* force the guest VRAM rendering to the given buffer. */
-
-        /* Make the screenshot.
-         *
-         * The second parameter is 'false' because the current display state, already updated by the
-         * pfnUpdateDisplayAll call above, is being rendered to an external buffer using a fake connector.
-         * That is if display is blanked, we expect a black screen in the external buffer.
-         */
-        rc = vga_update_display(pThis, false);
+        uint8_t *pu8Data = (uint8_t *)RTMemAlloc(cbRequired);
 
-        /* Restore. */
-        pThis->pDrv = pConnectorSaved;
-        pThis->graphic_mode = graphic_mode_saved;
-        pThis->fRenderVRAM = fRenderVRAMSaved;
-
-        if (rc == VINF_SUCCESS)
+        if (pu8Data == NULL)
+        {
+            rc = VERR_NO_MEMORY;
+        }
+        else
         {
             /*
-             * Return the result.
+             * Only 3 methods, assigned below, will be called during the screenshot update.
+             * All other are already set to NULL.
              */
-            *ppu8Data = pu8Data;
-            *pcbData = cbRequired;
-            *pcx = Connector.cx;
-            *pcy = Connector.cy;
+
+            Connector.pu8Data       = pu8Data;
+            Connector.cBits         = 32;
+            Connector.cx            = pThis->last_scr_width;
+            Connector.cy            = pThis->last_scr_height;
+            Connector.cbScanline    = Connector.cx * 4;
+            Connector.pfnRefresh    = vgaDummyRefresh;
+            Connector.pfnResize     = vgaDummyResize;
+            Connector.pfnUpdateRect = vgaDummyUpdateRect;
+
+            /* Save & replace state data. */
+            PPDMIDISPLAYCONNECTOR pConnectorSaved = pThis->pDrv;
+            int32_t graphic_mode_saved = pThis->graphic_mode;
+            bool fRenderVRAMSaved = pThis->fRenderVRAM;
+
+            pThis->pDrv = &Connector;
+            pThis->graphic_mode = -1;           /* force a full refresh. */
+            pThis->fRenderVRAM = 1;             /* force the guest VRAM rendering to the given buffer. */
+
+            /* Make the screenshot.
+             *
+             * The second parameter is 'false' because the current display state, already updated by the
+             * pfnUpdateDisplayAll call above, is being rendered to an external buffer using a fake connector.
+             * That is if display is blanked, we expect a black screen in the external buffer.
+             */
+            rc = vga_update_display(pThis, false);
+
+            /* Restore. */
+            pThis->pDrv = pConnectorSaved;
+            pThis->graphic_mode = graphic_mode_saved;
+            pThis->fRenderVRAM = fRenderVRAMSaved;
+
+            if (rc == VINF_SUCCESS)
+            {
+                /*
+                 * Return the result.
+                 */
+                *ppu8Data = pu8Data;
+                *pcbData = cbRequired;
+                *pcx = Connector.cx;
+                *pcy = Connector.cy;
+            }
         }
     }
 
diff --git a/src/VBox/Devices/Input/DevPS2.cpp b/src/VBox/Devices/Input/DevPS2.cpp
index 8669982b2..7792e06f6 100644
--- a/src/VBox/Devices/Input/DevPS2.cpp
+++ b/src/VBox/Devices/Input/DevPS2.cpp
@@ -960,7 +960,8 @@ static int kbd_write_data(void *opaque, uint32_t addr, uint32_t val)
     default:
         break;
     }
-    s->write_cmd = 0;
+    if (rc != VINF_IOM_HC_IOPORT_WRITE)
+        s->write_cmd = 0;
     return rc;
 }
 
diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk
index bd2eceb5d..b7eb0c47b 100644
--- a/src/VBox/Devices/Makefile.kmk
+++ b/src/VBox/Devices/Makefile.kmk
@@ -1,10 +1,10 @@
 # $Id: Makefile.kmk $
 ## @file
-# Top-level makefile for the devices, drivers and services.
+# Top-level sub-makefile for the devices, drivers and services.
 #
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2010 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -54,7 +54,10 @@ endif
 #
 LIBRARIES += DevicesR3 Drivers ServicesR0
 DLLS      += VBoxDDU VBoxDD VBoxDD2
-SYSMODS   += VBoxDDGC VBoxDD2GC VBoxDDR0 VBoxDD2R0
+SYSMODS   += VBoxDDR0 VBoxDD2R0
+ifdef VBOX_WITH_RAW_MODE
+ SYSMODS   += VBoxDDGC VBoxDD2GC
+endif
 
 
 #
@@ -480,104 +483,106 @@ Graphics/DevVGA.cpp_INCS = $(PATH_VgaBiosBin)
 Graphics/DevVGA.cpp_DEPS = $(PATH_VgaBiosBin)/vbetables.h
 
 
-#
-# VBoxDDGC (sysmod)
-#
-VBoxDDGC_TEMPLATE       = VBOXGC
-VBoxDDGC_SYSSUFF        = .gc
-ifeq ($(KBUILD_TARGET_ARCH),x86)
- VBoxDDGC_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
-endif
-VBoxDDGC_DEFS           =
-VBoxDDGC_INCS          := \
-	$(PATH_SUB_CURRENT)
-VBoxDDGC_SOURCES        = \
-	Bus/DevPCI.cpp \
-	Graphics/DevVGA.cpp \
-	Input/DevPS2.cpp \
-	PC/DevACPI.cpp \
-	PC/DevPit-i8254.cpp \
-	PC/DevPIC.cpp \
-	PC/DevRTC.cpp \
-	Storage/DevATA.cpp \
-	Network/DevPCNet.cpp \
-	Serial/DevSerial.cpp \
-	Parallel/DevParallel.cpp
-
-ifdef VBOX_DYNAMIC_NET_ATTACH
- VBoxDDGC_DEFS += VBOX_DYNAMIC_NET_ATTACH
-endif
+ifdef VBOX_WITH_RAW_MODE
+ #
+ # VBoxDDGC (sysmod)
+ #
+ VBoxDDGC_TEMPLATE       = VBOXGC
+ VBoxDDGC_SYSSUFF        = .gc
+ ifeq ($(KBUILD_TARGET_ARCH),x86)
+  VBoxDDGC_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
+ endif
+ VBoxDDGC_DEFS           =
+ VBoxDDGC_INCS          := \
+ 	$(PATH_SUB_CURRENT)
+ VBoxDDGC_SOURCES        = \
+ 	Bus/DevPCI.cpp \
+ 	Graphics/DevVGA.cpp \
+ 	Input/DevPS2.cpp \
+ 	PC/DevACPI.cpp \
+ 	PC/DevPit-i8254.cpp \
+ 	PC/DevPIC.cpp \
+ 	PC/DevRTC.cpp \
+ 	Storage/DevATA.cpp \
+ 	Network/DevPCNet.cpp \
+ 	Serial/DevSerial.cpp \
+ 	Parallel/DevParallel.cpp
+
+ ifdef VBOX_DYNAMIC_NET_ATTACH
+  VBoxDDGC_DEFS += VBOX_DYNAMIC_NET_ATTACH
+ endif
 
-ifdef VBOX_WITH_E1000
- VBoxDDGC_DEFS         += VBOX_WITH_E1000
- VBoxDDGC_SOURCES      += \
-	Network/DevE1000.cpp \
-	Network/DevE1000Phy.cpp
-endif
+ ifdef VBOX_WITH_E1000
+  VBoxDDGC_DEFS         += VBOX_WITH_E1000
+  VBoxDDGC_SOURCES      += \
+ 	Network/DevE1000.cpp \
+ 	Network/DevE1000Phy.cpp
+ endif
 
-ifdef VBOX_WITH_VIRTIO
- VBoxDDGC_DEFS         += VBOX_WITH_VIRTIO
- VBoxDDGC_SOURCES      += \
-	VirtIO/Virtio.cpp \
-	Network/DevVirtioNet.cpp
-endif
+ ifdef VBOX_WITH_VIRTIO
+  VBoxDDGC_DEFS         += VBOX_WITH_VIRTIO
+  VBoxDDGC_SOURCES      += \
+ 	VirtIO/Virtio.cpp \
+ 	Network/DevVirtioNet.cpp
+ endif
 
-ifdef VBOX_WITH_HGSMI
- VBoxDDGC_DEFS         += VBOX_WITH_HGSMI
-endif
+ ifdef VBOX_WITH_HGSMI
+  VBoxDDGC_DEFS         += VBOX_WITH_HGSMI
+ endif
 
-ifdef VBOX_WITH_USB
-VBoxDDGC_DEFS          += VBOX_WITH_USB IN_USB_GC
-VBoxDDGC_SOURCES       += \
-	USB/DevOHCI.cpp
+ ifdef VBOX_WITH_USB
+ VBoxDDGC_DEFS          += VBOX_WITH_USB
+ VBoxDDGC_SOURCES       += \
+ 	USB/DevOHCI.cpp
+
+  ifdef VBOX_WITH_EHCI
+   VBoxDDGC_DEFS        += VBOX_WITH_EHCI
+   VBoxDDGC_SOURCES     += \
+ 	USB/DevEHCI.cpp
+  endif
 
- ifdef VBOX_WITH_EHCI
-  VBoxDDGC_DEFS        += VBOX_WITH_EHCI
-  VBoxDDGC_SOURCES     += \
-	USB/DevEHCI.cpp
  endif
 
-endif
-
-ifdef VBOX_WITH_HGSMI
- VBoxDDGC_DEFS         += VBOX_WITH_HGSMI
-endif
-ifdef VBOX_WITH_VIDEOHWACCEL
- VBoxDDGC_DEFS         += VBOX_WITH_VIDEOHWACCEL
-endif
+ ifdef VBOX_WITH_HGSMI
+  VBoxDDGC_DEFS         += VBOX_WITH_HGSMI
+ endif
+ ifdef VBOX_WITH_VIDEOHWACCEL
+  VBoxDDGC_DEFS         += VBOX_WITH_VIDEOHWACCEL
+ endif
 
-ifdef VBOX_WITH_AHCI
-VBoxDDGC_DEFS          += VBOX_WITH_AHCI IN_AHCI_GC
-VBoxDDGC_SOURCES       += \
-	Storage/DevAHCI.cpp \
-	Storage/ATAController.cpp
-endif
+ ifdef VBOX_WITH_AHCI
+ VBoxDDGC_DEFS          += VBOX_WITH_AHCI IN_AHCI_GC
+ VBoxDDGC_SOURCES       += \
+ 	Storage/DevAHCI.cpp \
+ 	Storage/ATAController.cpp
+ endif
 
-ifdef VBOX_WITH_BUSLOGIC
-VBoxDDGC_DEFS          += VBOX_WITH_BUSLOGIC
-VBoxDDGC_SOURCES       += \
-	Storage/DevBusLogic.cpp
-endif
+ ifdef VBOX_WITH_BUSLOGIC
+ VBoxDDGC_DEFS          += VBOX_WITH_BUSLOGIC
+ VBoxDDGC_SOURCES       += \
+ 	Storage/DevBusLogic.cpp
+ endif
 
-ifdef VBOX_WITH_LSILOGIC
-VBoxDDGC_DEFS          += VBOX_WITH_LSILOGIC
-VBoxDDGC_SOURCES       += \
-	Storage/DevLsiLogicSCSI.cpp
-endif
+ ifdef VBOX_WITH_LSILOGIC
+ VBoxDDGC_DEFS          += VBOX_WITH_LSILOGIC
+ VBoxDDGC_SOURCES       += \
+ 	Storage/DevLsiLogicSCSI.cpp
+ endif
 
-ifdef VBOX_WITH_HPET
-VBoxDDGC_DEFS          += VBOX_WITH_HPET
-VBoxDDGC_SOURCES       += PC/DevHPET.cpp
-endif
+ ifdef VBOX_WITH_HPET
+ VBoxDDGC_DEFS          += VBOX_WITH_HPET
+ VBoxDDGC_SOURCES       += PC/DevHPET.cpp
+ endif
 
-ifeq ($(VBOX_LDR_FMT32),pe)
-VBoxDDGC_LDFLAGS        = -Entry:vgaMMIOWrite
-endif
-if1of ($(VBOX_LDR_FMT32), pe lx)
-VBoxDDGC_LIBS           = \
-	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \
-	$(PATH_LIB)/VMMGCImp$(VBOX_SUFF_LIB)
-endif
+ ifeq ($(VBOX_LDR_FMT32),pe)
+ VBoxDDGC_LDFLAGS        = -Entry:vgaMMIOWrite
+ endif
+ if1of ($(VBOX_LDR_FMT32), pe lx)
+ VBoxDDGC_LIBS           = \
+ 	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \
+ 	$(PATH_LIB)/VMMGCImp$(VBOX_SUFF_LIB)
+ endif
+endif # VBOX_WITH_RAW_MODE
 
 
 #
@@ -675,25 +680,27 @@ if1of ($(VBOX_LDR_FMT), pe lx)
 VBoxDDR0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
 endif
 
-#
-# VBoxDD2GC (LGPL sysmod)
-#
-VBoxDD2GC_TEMPLATE       = VBOXGC
-VBoxDD2GC_DEFS           =
-VBoxDD2GC_SYSSUFF        = .gc
-VBoxDD2GC_INCS          := \
-	$(PATH_SUB_CURRENT)
-VBoxDD2GC_SOURCES        = \
-	PC/DevAPIC.cpp
-ifeq ($(VBOX_LDR_FMT32),pe)
-VBoxDD2GC_LDFLAGS        = -Entry:apicMMIOWrite
-endif
-if1of ($(VBOX_LDR_FMT32), pe lx)
-VBoxDD2GC_LIBS           = \
-	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \
-	$(PATH_LIB)/VMMGCImp$(VBOX_SUFF_LIB)
-endif
 
+ifdef VBOX_WITH_RAW_MODE
+ #
+ # VBoxDD2GC (LGPL sysmod)
+ #
+ VBoxDD2GC_TEMPLATE       = VBOXGC
+ VBoxDD2GC_DEFS           =
+ VBoxDD2GC_SYSSUFF        = .gc
+ VBoxDD2GC_INCS          := \
+ 	$(PATH_SUB_CURRENT)
+ VBoxDD2GC_SOURCES        = \
+ 	PC/DevAPIC.cpp
+ ifeq ($(VBOX_LDR_FMT32),pe)
+ VBoxDD2GC_LDFLAGS        = -Entry:apicMMIOWrite
+ endif
+ if1of ($(VBOX_LDR_FMT32), pe lx)
+ VBoxDD2GC_LIBS           = \
+ 	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \
+ 	$(PATH_LIB)/VMMGCImp$(VBOX_SUFF_LIB)
+ endif
+endif
 
 #
 # VBoxDD2R0 (LGPL sysmod)
diff --git a/src/VBox/Devices/Network/DrvIntNet.cpp b/src/VBox/Devices/Network/DrvIntNet.cpp
index 225d140f5..f4bad6831 100644
--- a/src/VBox/Devices/Network/DrvIntNet.cpp
+++ b/src/VBox/Devices/Network/DrvIntNet.cpp
@@ -751,19 +751,22 @@ static DECLCALLBACK(void) drvIntNetDestruct(PPDMDRVINS pDrvIns)
     if (EventSuspended != NIL_RTSEMEVENT)
         RTSemEventDestroy(EventSuspended);
 
-    /*
-     * Deregister statistics in case we're being detached.
-     */
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cbStatRecv);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cbStatSend);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatRecvs);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatSends);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatLost);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatYieldsNok);
+    if (pThis->pBuf)
+    {
+        /*
+         * Deregister statistics in case we're being detached.
+         */
+        PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cbStatRecv);
+        PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cbStatSend);
+        PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatRecvs);
+        PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatSends);
+        PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatLost);
+        PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->pBuf->cStatYieldsNok);
 #ifdef VBOX_WITH_STATISTICS
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatReceive);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatTransmit);
+        PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatReceive);
+        PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatTransmit);
 #endif
+    }
 }
 
 
diff --git a/src/VBox/Devices/Network/DrvNAT.cpp b/src/VBox/Devices/Network/DrvNAT.cpp
index 7acf2c837..d2271119c 100644
--- a/src/VBox/Devices/Network/DrvNAT.cpp
+++ b/src/VBox/Devices/Network/DrvNAT.cpp
@@ -58,6 +58,13 @@
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
+
+/**
+ * @todo: This is a bad hack to prevent freezing the guest during high network
+ *        activity. Windows host only. This needs to be fixed properly.
+ */
+#define VBOX_NAT_DELAY_HACK
+
 #define GET_EXTRADATA(pthis, node, name, rc, type, type_name, var)                                  \
 do {                                                                                                \
     (rc) = CFGMR3Query ## type((node), name, &(var));                                               \
@@ -957,14 +964,17 @@ static DECLCALLBACK(void) drvNATDestruct(PPDMDRVINS pDrvIns)
 
     LogFlow(("drvNATDestruct:\n"));
 
-    slirp_term(pThis->pNATState);
-    slirp_deregister_statistics(pThis->pNATState, pDrvIns);
-    pThis->pNATState = NULL;
+    if (pThis->pNATState)
+    {
+        slirp_term(pThis->pNATState);
+        slirp_deregister_statistics(pThis->pNATState, pDrvIns);
 #ifdef VBOX_WITH_STATISTICS
 # define DRV_PROFILE_COUNTER(name, dsc)     DEREGISTER_COUNTER(name, pThis)
 # define DRV_COUNTING_COUNTER(name, dsc)    DEREGISTER_COUNTER(name, pThis)
 # include "counters.h"
 #endif
+        pThis->pNATState = NULL;
+    }
 }
 
 
diff --git a/src/VBox/Devices/Network/slirp/ip_icmp.c b/src/VBox/Devices/Network/slirp/ip_icmp.c
index d7fbfb328..05c645689 100644
--- a/src/VBox/Devices/Network/slirp/ip_icmp.c
+++ b/src/VBox/Devices/Network/slirp/ip_icmp.c
@@ -89,7 +89,7 @@ icmp_init(PNATState pData)
     if (pData->icmp_socket.s == -1)
     {
         int rc = RTErrConvertFromErrno(errno);
-        LogRel(("NAT: ICMP/ping not available (could open ICMP socket, error %Rrc)\n", rc));
+        LogRel(("NAT: ICMP/ping not available (could not open ICMP socket, error %Rrc)\n", rc));
         return 1;
     }
     fd_nonblock(pData->icmp_socket.s);
diff --git a/src/VBox/Devices/Network/slirp/libslirp.h b/src/VBox/Devices/Network/slirp/libslirp.h
index 55f443d11..2d552ffcb 100644
--- a/src/VBox/Devices/Network/slirp/libslirp.h
+++ b/src/VBox/Devices/Network/slirp/libslirp.h
@@ -121,7 +121,6 @@ void *slirp_get_queue(PNATState pData);
 void *slirp_ext_m_get(PNATState pData);
 void slirp_ext_m_free(PNATState pData, void *);
 void slirp_ext_m_append(PNATState pData, void *, uint8_t *, size_t);
-void slirp_push_recv_thread(void *pvUser);
 #endif
 
 /*
diff --git a/src/VBox/Devices/Network/slirp/mbuf.c b/src/VBox/Devices/Network/slirp/mbuf.c
index 0863f3b72..f58629fdd 100644
--- a/src/VBox/Devices/Network/slirp/mbuf.c
+++ b/src/VBox/Devices/Network/slirp/mbuf.c
@@ -378,6 +378,7 @@ void slirp_ext_m_free(PNATState pData, void *arg)
     struct mbuf *m = (struct mbuf *)arg;
     m_free(pData, m);
 }
+
 void slirp_ext_m_append(PNATState pData, void *arg, uint8_t *pu8Buf, size_t cbBuf)
 {
     char *c;
diff --git a/src/VBox/Devices/Network/slirp/slirp.c b/src/VBox/Devices/Network/slirp/slirp.c
index 838fcc623..288bc8109 100644
--- a/src/VBox/Devices/Network/slirp/slirp.c
+++ b/src/VBox/Devices/Network/slirp/slirp.c
@@ -1149,10 +1149,9 @@ void slirp_select_poll(PNATState pData, struct pollfd *polls, int ndfs)
          * Check for FD_CLOSE events.
          * in some cases once FD_CLOSE engaged on socket it could be flashed latter (for some reasons)
          */
-        if (    (NetworkEvents.lNetworkEvents & FD_CLOSE)
-            ||  (so->so_close == 1))
+        if (   (NetworkEvents.lNetworkEvents & FD_CLOSE)
+            || (so->so_close == 1))
         {
-            so->so_close = 1; /* mark it */
             /*
              * drain the socket
              */
@@ -1161,9 +1160,11 @@ void slirp_select_poll(PNATState pData, struct pollfd *polls, int ndfs)
                 ret = soread(pData, so);
                 if (ret > 0)
                     TCP_OUTPUT(pData, sototcpcb(so));
-                else
+                else 
                     break;
             }
+            /* mark the socket for termination _after_ it was drained */
+            so->so_close = 1;
             CONTINUE(tcp);
         }
 #endif
diff --git a/src/VBox/Devices/Network/slirp/socket.c b/src/VBox/Devices/Network/slirp/socket.c
index 0fad8b276..86ab88ddd 100644
--- a/src/VBox/Devices/Network/slirp/socket.c
+++ b/src/VBox/Devices/Network/slirp/socket.c
@@ -1056,9 +1056,23 @@ send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, c
     struct icmp_msg *icm;
     uint8_t proto;
     int type = 0;
+    int m_room;
 
     ip = (struct ip *)buff;
+#ifndef RT_OS_DARWIN
+    /* Darwin: send IP.IP_LEN in host format (payload only) */
+    ip->ip_len = RT_N2H_U16(ip->ip_len);
+#endif
+    /* Note: ip->ip_len in host byte order (all OS) */
+#if defined(RT_OS_SOLARIS) || defined(RT_OS_DARWIN)
+    ip->ip_len += (ip->ip_hl << 2); /* Solaris: reports only payload length */
+#endif
     hlen = (ip->ip_hl << 2);
+    if (ip->ip_len < hlen + ICMP_MINLEN)
+    {
+       Log(("send_icmp_to_guest: ICMP header is too small to understand which type/subtype of the datagram\n"));
+       return;
+    }
     icp = (struct icmp *)((char *)ip + hlen);
 
     Log(("ICMP:received msg(t:%d, c:%d)\n", icp->icmp_type, icp->icmp_code));
@@ -1069,10 +1083,30 @@ send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, c
         return;
     }
 
+    /*
+     * ICMP_ECHOREPLY, ICMP_TIMXCEED, ICMP_UNREACH minimal header size is
+     * ICMP_ECHOREPLY assuming data 0
+     * icmp_{type(8), code(8), cksum(16),identifier(16),seqnum(16)}
+     */
+    if (ip->ip_len < hlen + 8)
+    {
+        Log(("send_icmp_to_guest: NAT accept ICMP_{ECHOREPLY, TIMXCEED, UNREACH} the minimum size is 64 (see rfc792)\n"));
+        return;
+    }
+
     type = icp->icmp_type;
     if (   type == ICMP_TIMXCEED
         || type == ICMP_UNREACH)
     {
+        /*
+         * ICMP_TIMXCEED, ICMP_UNREACH minimal header size is
+         * icmp_{type(8), code(8), cksum(16),unused(32)} + IP header + 64 bit of original datagram
+         */
+        if (ip->ip_len < hlen + 2*8 + sizeof(struct ip))
+        {
+            Log(("send_icmp_to_guest: NAT accept ICMP_{TIMXCEED, UNREACH} the minimum size of ipheader + 64 bit of data (see rfc792)\n"));
+            return;
+        }
         ip = &icp->icmp_ip;
     }
 
@@ -1088,7 +1122,31 @@ send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, c
     Assert(m != NULL);
 
     src = addr->sin_addr.s_addr;
+    if (type == ICMP_ECHOREPLY)
+    {
+        struct ip *ip0 = mtod(m, struct ip *);
+        struct icmp *icp0 = (struct icmp *)((char *)ip0 + (ip0->ip_hl << 2));
+        if (icp0->icmp_type != ICMP_ECHO)
+        {
+            Log(("NAT: we haven't found echo for this reply\n"));
+            return;
+        }
+        /*
+         * while combining buffer to send (see ip_icmp.c) we control ICMP header only, 
+         * IP header combined by OS network stack, our local copy of IP header contians values 
+         * in host byte order so no byte order conversion is required. IP headers fields are converting
+         * in ip_output0 routine only.   
+         */
+        if (   (ip->ip_len - hlen )
+            != (ip0->ip_len - (ip0->ip_hl << 2))) 
+        {
+            Log(("NAT: ECHO(%d) lenght doesn't match ECHOREPLY(%d)\n",
+                (ip->ip_len - hlen ), (ip0->ip_len - (ip0->ip_hl << 2))));
+            return;
+        }
+    }
 
+    /* ip points on origianal ip header */
     ip = mtod(m, struct ip *);
     proto = ip->ip_p;
     /* Now ip is pointing on header we've sent from guest */
@@ -1108,12 +1166,25 @@ send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, c
     ip = mtod(m, struct ip *); /* ip is from mbuf we've overrided */
     original_hlen = ip->ip_hl << 2;
     /* saves original ip header and options */
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+    m_copyback(pData, m, original_hlen, len - hlen, buff + hlen);
+    ip->ip_len = m_length(m, NULL);
+#else
+    /* m_room space in the saved m buffer */
+    m_room = M_ROOM(m);
+    if (m_room < len - hlen + original_hlen)
+    {
+        /* we need involve ether header length into new buffer buffer calculation */
+        m_inc(m, if_maxlinkhdr + len - hlen + original_hlen);
+        if (m->m_size < if_maxlinkhdr + len - hlen + original_hlen)
+        {
+            Log(("send_icmp_to_guest: extending buffer was failed (packet is dropped)\n"));
+            return;
+        }
+    }
     memcpy(m->m_data + original_hlen, buff + hlen, len - hlen);
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
     m->m_len = len - hlen + original_hlen;
     ip->ip_len = m->m_len;
-#else
-    ip->ip_len = m_length(m, NULL);
 #endif
     ip->ip_p = IPPROTO_ICMP; /* the original package could be whatever, but we're response via ICMP*/
 
@@ -1274,44 +1345,28 @@ static void sorecvfrom_icmp_unix(PNATState pData, struct socket *so)
 {
     struct sockaddr_in addr;
     socklen_t addrlen = sizeof(struct sockaddr_in);
+    struct ip ip;
     char *buff;
     int len = 0;
-    int rc = 0;
-    static int signalled = 0;
 
-    rc = ioctlsocket(so->s, FIONREAD, &len);
-    if (   rc == -1
+    /* 1- step: read the ip header */
+    len = recvfrom(so->s, &ip, sizeof(struct ip), MSG_PEEK,
+                   (struct sockaddr *)&addr, &addrlen);
+    if (   len < 0
         && (   errno == EAGAIN
             || errno == EWOULDBLOCK
             || errno == EINPROGRESS
             || errno == ENOTCONN))
     {
+        Log(("sorecvfrom_icmp_unix: 1 - step can't read IP datagramm (would block)\n"));
         return;
     }
-    if (rc == -1 && signalled == 0)
-    {
-        signalled = 1;
-        LogRel(("NAT: fetching number of bits has been failed for ICMP socket (%d: %s)\n",
-            errno, strerror(errno)));
-        return;
-    }
-    len = (len != 0 && rc != -1 ? len : 1500);
-    buff = RTMemAlloc(len);
-    len = recvfrom(so->s, buff, len, 0,
-                   (struct sockaddr *)&addr, &addrlen);
-    /* XXX Check if reply is "correct"? */
 
-    if (len == -1 || len == 0)
+    if (   len < sizeof(struct ip)
+        || len < 0
+        || len == 0)
     {
         u_char code;
-        if (   len == -1
-            && (errno == EAGAIN
-            || errno == EWOULDBLOCK
-            || errno == EINPROGRESS
-            || errno == ENOTCONN))
-        {
-            return;
-        }
         code = ICMP_UNREACH_PORT;
 
         if (errno == EHOSTUNREACH)
@@ -1323,11 +1378,60 @@ static void sorecvfrom_icmp_unix(PNATState pData, struct socket *so)
                     errno, strerror(errno)));
         icmp_error(pData, so->so_m, ICMP_UNREACH, code, 0, strerror(errno));
         so->so_m = NULL;
+        Log(("sorecvfrom_icmp_unix: 1 - step can't read IP datagramm \n"));
+        return;
     }
-    else
+    /* basic check of IP header */
+    if (   ip.ip_v != IPVERSION
+#ifndef RT_OS_DARWIN
+        || ip.ip_p != IPPROTO_ICMP
+#endif
+    )
     {
-        send_icmp_to_guest(pData, buff, len, so, &addr);
+        Log(("sorecvfrom_icmp_unix: 1 - step IP isn't IPv4 \n"));
+        return;
+    }
+#ifndef RT_OS_DARWIN
+    /* Darwin reports IP header in host format */
+    ip.ip_len = RT_N2H_U16(ip.ip_len);
+#endif
+#if defined(RT_OS_SOLARIS) || defined(RT_OS_DARWIN)
+    ip.ip_len += (ip.ip_hl << 2); /* Solaris: reports only payload length */
+#endif
+    /* Note: ip->ip_len in host byte order (all OS) */
+    len = ip.ip_len;
+    buff = RTMemAlloc(len);
+    if (buff == NULL)
+    {
+        Log(("sorecvfrom_icmp_unix: 1 - step can't allocate enought room for datagram\n"));
+        return;
+    }
+    /* 2 - step: we're reading rest of the datagramm to the buffer */
+    addrlen = sizeof(struct sockaddr_in);
+    memset(&addr, 0, addrlen);
+    len = recvfrom(so->s, buff, len, 0,
+                   (struct sockaddr *)&addr, &addrlen);
+    if (   len < 0
+        && (   errno == EAGAIN
+            || errno == EWOULDBLOCK
+            || errno == EINPROGRESS
+            || errno == ENOTCONN))
+    {
+        Log(("sorecvfrom_icmp_unix: 2 - step can't read IP body (would block expected:%d)\n",
+            ip.ip_len));
+        RTMemFree(buff);
+        return;
+    }
+    if (   len < 0
+        || len == 0)
+    {
+        Log(("sorecvfrom_icmp_unix: 2 - step read of the rest of datagramm is fallen (errno:%d, len:%d expected: %d)\n",
+             errno, len, (ip.ip_len - sizeof(struct ip))));
+        RTMemFree(buff);
+        return;
     }
+    /* len is modified in 2nd read, when the rest of the datagramm was read */
+    send_icmp_to_guest(pData, buff, len, so, &addr);
     RTMemFree(buff);
 }
 #endif /* !RT_OS_WINDOWS */
diff --git a/src/VBox/Devices/PC/BIOS/rombios.c b/src/VBox/Devices/PC/BIOS/rombios.c
index ad8c67334..c4a24f211 100644
--- a/src/VBox/Devices/PC/BIOS/rombios.c
+++ b/src/VBox/Devices/PC/BIOS/rombios.c
@@ -10233,7 +10233,7 @@ pci_routing_table_structure:
 #if 0
   dw 32 + (30 * 16) ;; table size
 #else
-  dw 32 + (10 * 16) ;; table size
+  dw 32 + (20 * 16) ;; table size
 #endif
 #else /* !VBOX */
   dw 32 + (6 * 16) ;; table size
@@ -10385,39 +10385,39 @@ pci_routing_table_structure_start:
   ;; 11th slot entry: 10th PCI slot
   db 0 ;; pci bus number
   db 0x58 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x62 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x63 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x60 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x61 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 10 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 12th slot entry: 11th PCI slot
   db 0 ;; pci bus number
   db 0x60 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x63 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x60 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x61 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x62 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 11 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 13th slot entry: 12th PCI slot
   db 0 ;; pci bus number
   db 0x68 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x60 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x61 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x62 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x63 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 12 ;; physical slot (0 = embedded)
   db 0 ;; reserved
@@ -10437,39 +10437,39 @@ pci_routing_table_structure_start:
   ;; 15th slot entry: 14th PCI slot
   db 0 ;; pci bus number
   db 0x78 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x62 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x63 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x60 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x61 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 14 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 16th slot entry: 15th PCI slot
   db 0 ;; pci bus number
   db 0x80 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x63 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x60 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x61 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x62 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 15 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 17th slot entry: 16th PCI slot
   db 0 ;; pci bus number
   db 0x88 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x60 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x61 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x62 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x63 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 16 ;; physical slot (0 = embedded)
   db 0 ;; reserved
@@ -10489,43 +10489,43 @@ pci_routing_table_structure_start:
   ;; 19th slot entry: 18th PCI slot
   db 0 ;; pci bus number
   db 0x98 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x62 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x63 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x60 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x61 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 18 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 20th slot entry: 19th PCI slot
   db 0 ;; pci bus number
   db 0xa0 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x63 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x60 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x61 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x62 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 19 ;; physical slot (0 = embedded)
   db 0 ;; reserved
-  ;; 21th slot entry: 20th PCI slot
+  ;; 21st slot entry: 20th PCI slot
   db 0 ;; pci bus number
   db 0xa8 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0x60 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x61 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x62 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x63 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 20 ;; physical slot (0 = embedded)
   db 0 ;; reserved
-  ;; 21th slot entry: 20th PCI slot
+  ;; 22nd slot entry: 21st PCI slot
   db 0 ;; pci bus number
   db 0xb0 ;; pci device number (bit 7-3)
   db 0x61 ;; link value INTA#
@@ -10536,63 +10536,50 @@ pci_routing_table_structure_start:
   dw 0xdef8 ;; IRQ bitmap INTC#
   db 0x60 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
-  db 20 ;; physical slot (0 = embedded)
-  db 0 ;; reserved
-  ;; 22th slot entry: 21th PCI slot
-  db 0 ;; pci bus number
-  db 0xb8 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
-  dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
-  dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
-  dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
-  dw 0xdef8 ;; IRQ bitmap INTD#
   db 21 ;; physical slot (0 = embedded)
   db 0 ;; reserved
-  ;; 23th slot entry: 22th PCI slot
+  ;; 23rd slot entry: 22nd PCI slot
   db 0 ;; pci bus number
-  db 0xc0 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0xb8 ;; pci device number (bit 7-3)
+  db 0x62 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x63 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x60 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x61 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 22 ;; physical slot (0 = embedded)
   db 0 ;; reserved
-  ;; 24th slot entry: 23th PCI slot
+  ;; 24th slot entry: 23rd PCI slot
   db 0 ;; pci bus number
-  db 0xc8 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0xc0 ;; pci device number (bit 7-3)
+  db 0x63 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x60 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x61 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x62 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 23 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 25th slot entry: 24th PCI slot
   db 0 ;; pci bus number
-  db 0xd0 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0xc8 ;; pci device number (bit 7-3)
+  db 0x60 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x61 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x62 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x63 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 24 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 26th slot entry: 25th PCI slot
   db 0 ;; pci bus number
-  db 0xd8 ;; pci device number (bit 7-3)
+  db 0xd0 ;; pci device number (bit 7-3)
   db 0x61 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
   db 0x62 ;; link value INTB#
@@ -10605,46 +10592,46 @@ pci_routing_table_structure_start:
   db 0 ;; reserved
   ;; 27th slot entry: 26th PCI slot
   db 0 ;; pci bus number
-  db 0xe0 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0xd8 ;; pci device number (bit 7-3)
+  db 0x62 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x63 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x60 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x61 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 26 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 28th slot entry: 27th PCI slot
   db 0 ;; pci bus number
-  db 0xe8 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0xe0 ;; pci device number (bit 7-3)
+  db 0x63 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x60 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x61 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x62 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 27 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 29th slot entry: 28th PCI slot
   db 0 ;; pci bus number
-  db 0xf0 ;; pci device number (bit 7-3)
-  db 0x61 ;; link value INTA#
+  db 0xe8 ;; pci device number (bit 7-3)
+  db 0x60 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
-  db 0x62 ;; link value INTB#
+  db 0x61 ;; link value INTB#
   dw 0xdef8 ;; IRQ bitmap INTB#
-  db 0x63 ;; link value INTC#
+  db 0x62 ;; link value INTC#
   dw 0xdef8 ;; IRQ bitmap INTC#
-  db 0x60 ;; link value INTD#
+  db 0x63 ;; link value INTD#
   dw 0xdef8 ;; IRQ bitmap INTD#
   db 28 ;; physical slot (0 = embedded)
   db 0 ;; reserved
   ;; 30th slot entry: 29th PCI slot
   db 0 ;; pci bus number
-  db 0xf8 ;; pci device number (bit 7-3)
+  db 0xf0 ;; pci device number (bit 7-3)
   db 0x61 ;; link value INTA#
   dw 0xdef8 ;; IRQ bitmap INTA#
   db 0x62 ;; link value INTB#
diff --git a/src/VBox/Devices/PC/DevFwCommon.cpp b/src/VBox/Devices/PC/DevFwCommon.cpp
index 49dde949d..03a8ee2c6 100644
--- a/src/VBox/Devices/PC/DevFwCommon.cpp
+++ b/src/VBox/Devices/PC/DevFwCommon.cpp
@@ -310,13 +310,14 @@ static bool sharedfwChecksumOk(const uint8_t * const au8Data, uint32_t u32Length
  * @returns VBox status code.
  * @param   pDevIns             The device instance.
  * @param   pTable              Where to create the DMI table.
- * @param   cbMax               The max size of the DMI table.
+ * @param   cbMax               The maximum size of the DMI table.
  * @param   pUuid               Pointer to the UUID to use if the DmiUuid
  *                              configuration string isn't present.
  * @param   pCfgHandle          The handle to our config node.
  * @param   fPutSmbiosHeaders   Plant SMBIOS headers if true.
  */
-int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders)
+int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid,
+                          PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders)
 {
 #define CHECKSIZE(cbWant) \
     { \
@@ -390,6 +391,13 @@ int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, P
         } \
     }
 
+#define TERM_STRUCT \
+    { \
+        *pszStr++                    = '\0'; /* terminate set of text strings */ \
+        if (iStrNr == 1) \
+            *pszStr++                = '\0'; /* terminate a structure without strings */ \
+    }
+
     bool fForceDefault = false;
 #ifdef VBOX_BIOS_DMI_FALLBACK
     /*
@@ -491,7 +499,7 @@ int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, P
         pBIOSInf->u8CharacteristicsByte2 = 0
                                          /* any more?? */
                                          ;
-        *pszStr++                    = '\0';
+        TERM_STRUCT;
 
         /***********************************
          * DMI system information (Type 1) *
@@ -532,7 +540,7 @@ int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, P
         pSystemInf->u8WakeupType     = 6; /* Power Switch */
         pSystemInf->u8SKUNumber      = 0;
         READCFGSTR(pSystemInf->u8Family, DmiSystemFamily);
-        *pszStr++                    = '\0';
+        TERM_STRUCT;
 
         /********************************************
          * DMI System Enclosure or Chassis (Type 3) *
@@ -565,7 +573,7 @@ int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, P
         pChassis->u8ContElems        = 0; /* no contained elements */
         pChassis->u8ContElemRecLen   = 0; /* no contained elements */
 # endif
-        *pszStr++                    = '\0';
+        TERM_STRUCT;
 
         /*****************************
          * DMI OEM strings (Type 11) *
@@ -589,7 +597,7 @@ int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, P
         READCFGSTRDEF(pOEMStrings->u8VBoxVersion, "DmiOEMVBoxVer", szTmp);
         RTStrPrintf(szTmp, sizeof(szTmp), "vboxRev_%u", RTBldCfgRevision());
         READCFGSTRDEF(pOEMStrings->u8VBoxRevision, "DmiOEMVBoxRev", szTmp);
-        *pszStr++                    = '\0';
+        TERM_STRUCT;
 
         /* End-of-table marker - includes padding to account for fixed table size. */
         PDMIHDR pEndOfTable          = (PDMIHDR)pszStr;
@@ -672,9 +680,11 @@ AssertCompile(VBOX_DMI_TABLE_ENTR == 5);
  *                              At least one I/O APIC must be enabled.''
  *
  * @param   pDevIns    The device instance data.
- * @param   addr       physical address in guest memory.
+ * @param   pTable     Where to write the table.
+ * @param   cbMax      The maximum size of the MPS table.
+ * @param   cCpus      The number of guest CPUs.
  */
-void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, uint16_t cCpus)
+void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, uint16_t cCpus)
 {
     /* configuration table */
     PMPSCFGTBLHEADER pCfgTab      = (MPSCFGTBLHEADER*)pTable;
@@ -755,9 +765,9 @@ void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, uint16_t cCpus)
     pCfgTab->u16Length             = (uint8_t*)pIrqEntry - pTable;
     pCfgTab->u8Checksum            = fwCommonChecksum(pTable, pCfgTab->u16Length);
 
-    AssertMsg(pCfgTab->u16Length < 0x1000 - 0x100,
+    AssertMsg(pCfgTab->u16Length < cbMax,
               ("VBOX_MPS_TABLE_SIZE=%d, maximum allowed size is %d",
-              pCfgTab->u16Length, 0x1000-0x100));
+              pCfgTab->u16Length, cbMax));
 
     MPSFLOATPTR floatPtr;
     floatPtr.au8Signature[0]       = '_';
diff --git a/src/VBox/Devices/PC/DevFwCommon.h b/src/VBox/Devices/PC/DevFwCommon.h
index 6ca457ab8..3072b09cc 100644
--- a/src/VBox/Devices/PC/DevFwCommon.h
+++ b/src/VBox/Devices/PC/DevFwCommon.h
@@ -31,9 +31,10 @@
 #define VBOX_MPS_TABLE_BASE          (VBOX_DMI_TABLE_BASE+VBOX_DMI_TABLE_SIZE)
 
 /* Plant DMI table */
-int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders);
+int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid,
+                          PCFGMNODE pCfgHandle, bool fPutSmbiosHeaders);
 
 /* Plant MPS table */
-void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, uint16_t cCpus);
+void FwCommonPlantMpsTable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, uint16_t cCpus);
 
 #endif
diff --git a/src/VBox/Devices/PC/DevPcBios.cpp b/src/VBox/Devices/PC/DevPcBios.cpp
index f7e3d3697..6e93b3adf 100644
--- a/src/VBox/Devices/PC/DevPcBios.cpp
+++ b/src/VBox/Devices/PC/DevPcBios.cpp
@@ -746,7 +746,8 @@ static DECLCALLBACK(void) pcbiosReset(PPDMDEVINS pDevIns)
     LogFlow(("pcbiosReset:\n"));
 
     if (pThis->u8IOAPIC)
-        FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
+        FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
+                              _4K - VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 
     /*
      * Re-shadow the LAN ROM image and make it RAM/RAM.
@@ -1028,11 +1029,13 @@ static DECLCALLBACK(int)  pcbiosConstruct(PPDMDEVINS pDevIns, int iInstance, PCF
     uuid.Gen.u32TimeLow = RT_H2BE_U32(uuid.Gen.u32TimeLow);
     uuid.Gen.u16TimeMid = RT_H2BE_U16(uuid.Gen.u16TimeMid);
     uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
-    rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle, false /*fPutSmbiosHeaders*/);
+    rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage,
+                               VBOX_DMI_TABLE_SIZE, &uuid, pCfgHandle, /*fPutSmbiosHeaders=*/false);
     if (RT_FAILURE(rc))
         return rc;
     if (pThis->u8IOAPIC)
-        FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
+        FwCommonPlantMpsTable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
+                              _4K - VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 
     rc = PDMDevHlpROMRegister(pDevIns, VBOX_DMI_TABLE_BASE, _4K, pThis->au8DMIPage,
                               PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "DMI tables");
diff --git a/src/VBox/Devices/PC/DevPcBios.h b/src/VBox/Devices/PC/DevPcBios.h
index b68e10d6c..8a07803f4 100644
--- a/src/VBox/Devices/PC/DevPcBios.h
+++ b/src/VBox/Devices/PC/DevPcBios.h
@@ -26,7 +26,15 @@
 #define VBOX_DMI_TABLE_BASE          0xe1000
 #define VBOX_DMI_TABLE_VER           0x25
 #define VBOX_DMI_TABLE_ENTR          5
-#define VBOX_DMI_TABLE_SIZE          0x100
+
+/** def VBOX_DMI_TABLE_SIZE
+ *
+ * Must not be bigger than the minimal size of the DMI tables + 255 because
+ * the length field of the the DMI end-of-table marker is 8 bits only. And
+ * the size should be at least 16-byte aligned for a proper alignment of
+ * the MPS table.
+ */
+#define VBOX_DMI_TABLE_SIZE          352
 
 /** @def VBOX_VMI_BIOS_BASE
  *
@@ -37,6 +45,8 @@
 
 
 /** @def VBOX_LANBOOT_SEG
+ *
+ * Should usually start right after the DMI BIOS page
  */
 #define VBOX_LANBOOT_SEG             0xe200
 
diff --git a/src/VBox/Devices/PC/DrvACPI.cpp b/src/VBox/Devices/PC/DrvACPI.cpp
index e3c775933..a829d18aa 100644
--- a/src/VBox/Devices/PC/DrvACPI.cpp
+++ b/src/VBox/Devices/PC/DrvACPI.cpp
@@ -34,10 +34,10 @@
 #include <iprt/string.h>
 
 #ifdef RT_OS_LINUX
-# include <iprt/string.h>
-# include <sys/types.h>
-# include <dirent.h>
-# include <stdio.h>
+# include <iprt/critsect.h>
+# include <iprt/dir.h>
+# include <iprt/semaphore.h>
+# include <iprt/stream.h>
 #endif
 
 #ifdef RT_OS_DARWIN
@@ -74,6 +74,29 @@ typedef struct DRVACPI
     PPDMIACPIPORT       pPort;
     /** Pointer to the driver instance. */
     PPDMDRVINS          pDrvIns;
+
+#ifdef RT_OS_LINUX
+    /** The current power source. */
+    PDMACPIPOWERSOURCE  enmPowerSource;
+    /** true = one or more batteries preset, false = no battery present. */
+    bool                fBatteryPresent;
+    /** No need to RTThreadPoke the poller when set.  */
+    bool volatile       fDontPokePoller;
+    /** Remaining battery capacity. */
+    PDMACPIBATCAPACITY  enmBatteryRemainingCapacity;
+    /** Battery state. */
+    PDMACPIBATSTATE     enmBatteryState;
+    /** Preset battery charging/discharging rate. */
+    uint32_t            u32BatteryPresentRate;
+    /** The poller thread. */
+    PPDMTHREAD          pPollerThread;
+    /** Synchronize access to the above fields.
+     * XXX A spinlock is probaly cheaper ... */
+    RTCRITSECT          CritSect;
+    /** Event semaphore the poller thread is sleeping on. */
+    RTSEMEVENT          hPollerSleepEvent;
+#endif
+
 } DRVACPI, *PDRVACPI;
 
 
@@ -139,63 +162,14 @@ static DECLCALLBACK(int) drvACPIQueryPowerSource(PPDMIACPICONNECTOR pInterface,
                          GetLastError()));
         *pPowerSource = PDM_ACPI_POWER_SOURCE_UNKNOWN;
     }
-#elif defined (RT_OS_LINUX) /* !RT_OS_WINDOWS */
-    DIR *dfd;
-    struct dirent *dp;
-    FILE *statusFile = NULL;
-    char buff[NAME_MAX+50];
 
-    /* start with no result */
-    *pPowerSource = PDM_ACPI_POWER_SOURCE_UNKNOWN;
+#elif defined (RT_OS_LINUX)
+    PDRVACPI pThis = RT_FROM_MEMBER(pInterface, DRVACPI, IACPIConnector);
+    RTCritSectEnter(&pThis->CritSect);
+    *pPowerSource = pThis->enmPowerSource;
+    RTCritSectLeave(&pThis->CritSect);
 
-    dfd = opendir("/proc/acpi/ac_adapter/");
-    if (dfd)
-    {
-        for (;;)
-        {
-            dp = readdir(dfd);
-            if (dp == 0)
-                break;
-            if (strcmp(dp->d_name, ".") == 0 ||
-                strcmp(dp->d_name, "..") == 0)
-                continue;
-            strcpy(buff, "/proc/acpi/ac_adapter/");
-            strcat(buff, dp->d_name);
-            strcat(buff, "/status");
-            statusFile = fopen(buff, "r");
-            /* there's another possible name for this file */
-            if (!statusFile)
-            {
-                strcpy(buff, "/proc/acpi/ac_adapter/");
-                strcat(buff, dp->d_name);
-                strcat(buff, "/state");
-                statusFile = fopen(buff, "r");
-            }
-            if (statusFile)
-                break;
-        }
-        closedir(dfd);
-    }
-
-    if (statusFile)
-    {
-        for (;;)
-        {
-            char buff2[1024];
-            if (fgets(buff2, sizeof(buff), statusFile) == NULL)
-                break;
-            if (strstr(buff2, "Status:") != NULL ||
-                strstr(buff2, "state:") != NULL)
-            {
-                if (strstr(buff2, "on-line") != NULL)
-                    *pPowerSource = PDM_ACPI_POWER_SOURCE_OUTLET;
-                else
-                    *pPowerSource = PDM_ACPI_POWER_SOURCE_BATTERY;
-            }
-        }
-        fclose(statusFile);
-    }
-#elif defined (RT_OS_DARWIN) /* !RT_OS_LINUX */
+#elif defined (RT_OS_DARWIN)
     *pPowerSource = PDM_ACPI_POWER_SOURCE_UNKNOWN;
 
     CFTypeRef pBlob = IOPSCopyPowerSourcesInfo();
@@ -203,11 +177,11 @@ static DECLCALLBACK(int) drvACPIQueryPowerSource(PPDMIACPICONNECTOR pInterface,
 
     CFDictionaryRef pSource = NULL;
     const void *psValue;
-    bool result;
+    bool fResult;
 
     if (CFArrayGetCount(pSources) > 0)
     {
-        for(int i = 0; i < CFArrayGetCount(pSources); ++i)
+        for (int i = 0; i < CFArrayGetCount(pSources); ++i)
         {
             pSource = IOPSGetPowerSourceDescription(pBlob, CFArrayGetValueAtIndex(pSources, i));
             /* If the source is empty skip over to the next one. */
@@ -218,24 +192,25 @@ static DECLCALLBACK(int) drvACPIQueryPowerSource(PPDMIACPICONNECTOR pInterface,
             if (CFDictionaryGetValue(pSource, CFSTR(kIOPSIsPresentKey)) == kCFBooleanFalse)
                 continue;
             /* Only internal power types are of interest. */
-            result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSTransportTypeKey), &psValue);
-            if (result &&
-                CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSInternalType), 0) == kCFCompareEqualTo)
+            fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSTransportTypeKey), &psValue);
+            if (   fResult
+                && CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSInternalType), 0) == kCFCompareEqualTo)
             {
                 /* Check which power source we are connect on. */
-                result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSPowerSourceStateKey), &psValue);
-                if (result &&
-                    CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSACPowerValue), 0) == kCFCompareEqualTo)
+                fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSPowerSourceStateKey), &psValue);
+                if (   fResult
+                    && CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSACPowerValue), 0) == kCFCompareEqualTo)
                     *pPowerSource = PDM_ACPI_POWER_SOURCE_OUTLET;
-                else if (result &&
-                         CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSBatteryPowerValue), 0) == kCFCompareEqualTo)
+                else if (   fResult
+                         && CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSBatteryPowerValue), 0) == kCFCompareEqualTo)
                     *pPowerSource = PDM_ACPI_POWER_SOURCE_BATTERY;
             }
         }
     }
     CFRelease(pBlob);
     CFRelease(pSources);
-#elif defined(RT_OS_FREEBSD) /* !RT_OS_DARWIN */
+
+#elif defined(RT_OS_FREEBSD)
     int fAcLine = 0;
     size_t cbParameter = sizeof(fAcLine);
 
@@ -257,7 +232,8 @@ static DECLCALLBACK(int) drvACPIQueryPowerSource(PPDMIACPICONNECTOR pInterface,
     }
 #else /* !RT_OS_FREEBSD either - what could this be? */
     *pPowerSource = PDM_ACPI_POWER_SOURCE_OUTLET;
-#endif /* !RT_OS_WINDOWS */
+
+#endif /* !RT_OS_FREEBSD */
     return VINF_SUCCESS;
 }
 
@@ -265,9 +241,9 @@ static DECLCALLBACK(int) drvACPIQueryPowerSource(PPDMIACPICONNECTOR pInterface,
  * @copydoc PDMIACPICONNECTOR::pfnQueryBatteryStatus
  */
 static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface, bool *pfPresent,
-                                                   PPDMACPIBATCAPACITY penmRemainingCapacity,
-                                                   PPDMACPIBATSTATE penmBatteryState,
-                                                   uint32_t *pu32PresentRate)
+        PPDMACPIBATCAPACITY penmRemainingCapacity,
+        PPDMACPIBATSTATE penmBatteryState,
+        uint32_t *pu32PresentRate)
 {
     /* default return values for all architectures */
     *pfPresent              = false;   /* no battery present */
@@ -298,208 +274,29 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
     else
     {
         AssertMsgFailed(("Could not determine system power status, error: 0x%x\n",
-                        GetLastError()));
-    }
-#elif defined(RT_OS_LINUX)
-    DIR *dfd;
-    struct dirent *dp;
-    FILE *statusFile = NULL;
-    FILE *infoFile = NULL;
-    char buff[NAME_MAX+50];
-    /* the summed up maximum capacity */
-    int  maxCapacityTotal = ~0;
-    /* the summed up total capacity */
-    int  currentCapacityTotal = ~0;
-    int  presentRate = 0;
-    int  presentRateTotal = 0;
-    bool fBatteryPresent = false, fCharging=false, fDischarging=false, fCritical=false;
-
-    dfd = opendir("/proc/acpi/battery/");
-    if (dfd)
-    {
-        for (;;)
-        {
-            dp = readdir(dfd);
-            if (dp == 0)
-                break;
-            if (strcmp(dp->d_name, ".") == 0 ||
-                strcmp(dp->d_name, "..") == 0)
-                continue;
-            strcpy(buff, "/proc/acpi/battery/");
-            strcat(buff, dp->d_name);
-            strcat(buff, "/status");
-            statusFile = fopen(buff, "r");
-            /* there is a 2nd variant of that file */
-            if (!statusFile)
-            {
-                strcpy(buff, "/proc/acpi/battery/");
-                strcat(buff, dp->d_name);
-                strcat(buff, "/state");
-                statusFile = fopen(buff, "r");
-            }
-            strcpy(buff, "/proc/acpi/battery/");
-            strcat(buff, dp->d_name);
-            strcat(buff, "/info");
-            infoFile = fopen(buff, "r");
-            /* we need both files */
-            if (!statusFile || !infoFile)
-            {
-                if (statusFile)
-                    fclose(statusFile);
-                if (infoFile)
-                    fclose(infoFile);
-                break;
-            }
-
-            /* get 'present' status from the info file */
-            for (;;)
-            {
-                char buff2[1024];
-                if (fgets(buff2, sizeof(buff), infoFile) == NULL)
-                    break;
-
-                if (strstr(buff2, "present:") != NULL)
-                {
-                    if (strstr(buff2, "yes") != NULL)
-                        fBatteryPresent = true;
-                }
-            }
-
-            /* move file pointer back to start of file */
-            fseek(infoFile, 0, SEEK_SET);
-
-            if (fBatteryPresent)
-            {
-                /* get the maximum capacity from the info file */
-                for (;;)
-                {
-                    char buff2[1024];
-                    int maxCapacity = ~0;
-                    if (fgets(buff2, sizeof(buff), infoFile) == NULL)
-                        break;
-                    if (strstr(buff2, "last full capacity:") != NULL)
-                    {
-                        if (sscanf(buff2 + 19, "%d", &maxCapacity) <= 0)
-                            maxCapacity = ~0;
-
-                        /* did we get a valid capacity and it's the first value we got? */
-                        if (maxCapacityTotal < 0 && maxCapacity > 0)
-                        {
-                            /* take this as the maximum capacity */
-                            maxCapacityTotal = maxCapacity;
-                        }
-                        else
-                        {
-                            /* sum up the maximum capacity */
-                            if (maxCapacityTotal > 0 && maxCapacity > 0)
-                                maxCapacityTotal += maxCapacity;
-                        }
-                        /* we got all we need */
-                        break;
-                    }
-                }
-
-                /* get the current capacity/state from the status file */
-                bool gotRemainingCapacity=false, gotBatteryState=false,
-                     gotCapacityState=false,     gotPresentRate=false;
-                while (!gotRemainingCapacity || !gotBatteryState ||
-                       !gotCapacityState     || !gotPresentRate)
-                {
-                    char buff2[1024];
-                    int currentCapacity = ~0;
-                    if (fgets(buff2, sizeof(buff), statusFile) == NULL)
-                        break;
-                    if (strstr(buff2, "remaining capacity:") != NULL)
-                    {
-                        if (sscanf(buff2 + 19, "%d", &currentCapacity) <= 0)
-                            currentCapacity = ~0;
-
-                        /* is this the first valid value we see? If so, take it! */
-                        if (currentCapacityTotal < 0 && currentCapacity >= 0)
-                        {
-                            currentCapacityTotal = currentCapacity;
-                        }
-                        else
-                        {
-                            /* just sum up the current value */
-                            if (currentCapacityTotal > 0 && currentCapacity > 0)
-                                currentCapacityTotal += currentCapacity;
-                        }
-                        gotRemainingCapacity = true;
-                    }
-                    if (strstr(buff2, "charging state:") != NULL)
-                    {
-                        if (strstr(buff2 + 15, "discharging") != NULL)
-                            fDischarging = true;
-                        else if (strstr(buff2 + 15, "charging") != NULL)
-                            fCharging = true;
-                        gotBatteryState = true;
-                    }
-                    if (strstr(buff2, "capacity state:") != NULL)
-                    {
-                        if (strstr(buff2 + 15, "critical") != NULL)
-                            fCritical = true;
-                        gotCapacityState = true;
-                    }
-                    if (strstr(buff2, "present rate:") != NULL)
-                    {
-                        if (sscanf(buff2 + 13, "%d", &presentRate) <= 0)
-                            presentRate = 0;
-                        gotPresentRate = true;
-                    }
-                }
-            }
-
-            if (presentRate)
-            {
-                if (fDischarging)
-                    presentRateTotal -= presentRate;
-                else
-                    presentRateTotal += presentRate;
-            }
-
-            if (statusFile)
-                fclose(statusFile);
-            if (infoFile)
-                fclose(infoFile);
-
-        }
-        closedir(dfd);
+                    GetLastError()));
     }
 
-    *pfPresent = fBatteryPresent;
-
-    /* charging/discharging bits are mutual exclusive */
-    uint32_t uBs = PDM_ACPI_BAT_STATE_CHARGED;
-    if (fDischarging)
-        uBs = PDM_ACPI_BAT_STATE_DISCHARGING;
-    else if (fCharging)
-        uBs = PDM_ACPI_BAT_STATE_CHARGING;
-    if (fCritical)
-        uBs |= PDM_ACPI_BAT_STATE_CRITICAL;
-    *penmBatteryState = (PDMACPIBATSTATE)uBs;
-
-    if (presentRateTotal < 0)
-        presentRateTotal = -presentRateTotal;
+#elif defined(RT_OS_LINUX)
+    PDRVACPI pThis = RT_FROM_MEMBER(pInterface, DRVACPI, IACPIConnector);
+    RTCritSectEnter(&pThis->CritSect);
+    *pfPresent = pThis->fBatteryPresent;
+    *penmRemainingCapacity = pThis->enmBatteryRemainingCapacity;
+    *penmBatteryState = pThis->enmBatteryState;
+    *pu32PresentRate = pThis->u32BatteryPresentRate;
+    RTCritSectLeave(&pThis->CritSect);
 
-    if (maxCapacityTotal > 0 && currentCapacityTotal > 0)
-    {
-        /* calculate the percentage */
-        *penmRemainingCapacity = (PDMACPIBATCAPACITY)(((float)currentCapacityTotal / (float)maxCapacityTotal)
-                                                      * PDM_ACPI_BAT_CAPACITY_MAX);
-        *pu32PresentRate = (uint32_t)(((float)presentRateTotal / (float)maxCapacityTotal) * 1000);
-    }
 #elif defined(RT_OS_DARWIN)
     CFTypeRef pBlob = IOPSCopyPowerSourcesInfo();
     CFArrayRef pSources = IOPSCopyPowerSourcesList(pBlob);
 
     CFDictionaryRef pSource = NULL;
     const void *psValue;
-    bool result;
+    bool fResult;
 
     if (CFArrayGetCount(pSources) > 0)
     {
-        for(int i = 0; i < CFArrayGetCount(pSources); ++i)
+        for (int i = 0; i < CFArrayGetCount(pSources); ++i)
         {
             pSource = IOPSGetPowerSourceDescription(pBlob, CFArrayGetValueAtIndex(pSources, i));
             /* If the source is empty skip over to the next one. */
@@ -510,18 +307,18 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
             if (CFDictionaryGetValue(pSource, CFSTR(kIOPSIsPresentKey)) == kCFBooleanFalse)
                 continue;
             /* Only internal power types are of interest. */
-            result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSTransportTypeKey), &psValue);
-            if (result &&
-                CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSInternalType), 0) == kCFCompareEqualTo)
+            fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSTransportTypeKey), &psValue);
+            if (   fResult
+                    && CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSInternalType), 0) == kCFCompareEqualTo)
             {
                 PDMACPIPOWERSOURCE powerSource = PDM_ACPI_POWER_SOURCE_UNKNOWN;
                 /* First check which power source we are connect on. */
-                result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSPowerSourceStateKey), &psValue);
-                if (result &&
-                    CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSACPowerValue), 0) == kCFCompareEqualTo)
+                fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSPowerSourceStateKey), &psValue);
+                if (   fResult
+                        && CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSACPowerValue), 0) == kCFCompareEqualTo)
                     powerSource = PDM_ACPI_POWER_SOURCE_OUTLET;
-                else if (result &&
-                         CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSBatteryPowerValue), 0) == kCFCompareEqualTo)
+                else if (   fResult
+                        && CFStringCompare((CFStringRef)psValue, CFSTR(kIOPSBatteryPowerValue), 0) == kCFCompareEqualTo)
                     powerSource = PDM_ACPI_POWER_SOURCE_BATTERY;
 
                 /* At this point the power source is present. */
@@ -533,12 +330,12 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
                 float remCapacity = 0.0f;
 
                 /* Fetch the current capacity value of the power source */
-                result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSCurrentCapacityKey), &psValue);
-                if (result)
+                fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSCurrentCapacityKey), &psValue);
+                if (fResult)
                     CFNumberGetValue((CFNumberRef)psValue, kCFNumberSInt32Type, &curCapacity);
                 /* Fetch the maximum capacity value of the power source */
-                result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSMaxCapacityKey), &psValue);
-                if (result)
+                fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSMaxCapacityKey), &psValue);
+                if (fResult)
                     CFNumberGetValue((CFNumberRef)psValue, kCFNumberSInt32Type, &maxCapacity);
 
                 /* Calculate the remaining capacity in percent */
@@ -552,16 +349,16 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
                     *penmBatteryState = PDM_ACPI_BAT_STATE_DISCHARGING;
                     int timeToEmpty = -1;
                     /* Get the time till the battery source will be empty */
-                    result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSTimeToEmptyKey), &psValue);
-                    if (result)
+                    fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSTimeToEmptyKey), &psValue);
+                    if (fResult)
                         CFNumberGetValue((CFNumberRef)psValue, kCFNumberSInt32Type, &timeToEmpty);
                     if (timeToEmpty != -1)
                         /* 0...1000 */
                         *pu32PresentRate = (uint32_t)roundf((remCapacity / ((float)timeToEmpty/60.0)) * 10.0);
                 }
 
-                if (powerSource == PDM_ACPI_POWER_SOURCE_OUTLET &&
-                    CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSIsChargingKey), &psValue))
+                if (   powerSource == PDM_ACPI_POWER_SOURCE_OUTLET
+                        && CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSIsChargingKey), &psValue))
                 {
                     /* We are running on an AC power source, but we also have a
                      * battery power source present. */
@@ -571,8 +368,8 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
                         *penmBatteryState = PDM_ACPI_BAT_STATE_CHARGING;
                         int timeToFull = -1;
                         /* Get the time till the battery source will be charged */
-                        result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSTimeToFullChargeKey), &psValue);
-                        if (result)
+                        fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSTimeToFullChargeKey), &psValue);
+                        if (fResult)
                             CFNumberGetValue((CFNumberRef)psValue, kCFNumberSInt32Type, &timeToFull);
                         if (timeToFull != -1)
                             /* 0...1000 */
@@ -582,8 +379,8 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
 
                 /* Check for critical */
                 int criticalValue = 20;
-                result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSDeadWarnLevelKey), &psValue);
-                if (result)
+                fResult = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSDeadWarnLevelKey), &psValue);
+                if (fResult)
                     CFNumberGetValue((CFNumberRef)psValue, kCFNumberSInt32Type, &criticalValue);
                 if (remCapacity < criticalValue)
                     *penmBatteryState = (PDMACPIBATSTATE)(*penmBatteryState | PDM_ACPI_BAT_STATE_CRITICAL);
@@ -592,6 +389,7 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
     }
     CFRelease(pBlob);
     CFRelease(pSources);
+
 #elif defined(RT_OS_FREEBSD)
     /* We try to use /dev/acpi first and if that fails use the sysctls. */
     bool fSuccess = true;
@@ -656,7 +454,9 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
                              * The rate is in mA so we have to convert it.
                              * The current power rate can be calculated with P = U * I
                              */
-                            *pu32PresentRate = (uint32_t)((((float)BatteryIo.bst.volt/1000.0) * ((float)BatteryIo.bst.rate/1000.0)) * 1000.0);
+                            *pu32PresentRate = (uint32_t)(  (  ((float)BatteryIo.bst.volt/1000.0)
+                                        * ((float)BatteryIo.bst.rate/1000.0))
+                                    * 1000.0);
                         }
                     }
                 }
@@ -696,17 +496,428 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
                 int curCapacity = 0;
                 cbParameter = sizeof(curCapacity);
                 rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, NULL);
-                if ((!rc) && (curCapacity >= 0))
+                if (!rc && curCapacity >= 0)
                     *penmRemainingCapacity = (PDMACPIBATCAPACITY)curCapacity;
 
                 /* The rate can't be determined with sysctls. */
             }
         }
     }
+
 #endif /* RT_OS_FREEBSD */
+
     return VINF_SUCCESS;
 }
 
+#ifdef RT_OS_LINUX
+/**
+ * Poller thread for /proc/acpi status files.
+ *
+ * Reading these files takes ages (several seconds) on some hosts, therefore
+ * start this thread. The termination of this thread may take some seconds
+ * on such a hosts!
+ *
+ * @param   pDrvIns     The driver instance data.
+ * @param   pThread     The thread.
+ */
+static DECLCALLBACK(int) drvACPIPoller(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    PDRVACPI pThis = PDMINS_2_DATA(pDrvIns, PDRVACPI);
+
+    if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
+        return VINF_SUCCESS;
+
+    while (pThread->enmState == PDMTHREADSTATE_RUNNING)
+    {
+        ASMAtomicWriteBool(&pThis->fDontPokePoller, false);
+
+        PDMACPIPOWERSOURCE enmPowerSource = PDM_ACPI_POWER_SOURCE_UNKNOWN;
+        PRTSTREAM  pStrmStatus;
+        PRTSTREAM  pStrmType;
+        PRTDIR     pDir = NULL;
+        RTDIRENTRY DirEntry;
+        char       szLine[1024];
+        bool       fBatteryPresent = false;     /* one or more batteries present */
+        bool       fCharging = false;           /* one or more batteries charging */
+        bool       fDischarging = false;        /* one or more batteries discharging */
+        bool       fCritical = false;           /* one or more batteries in critical state */
+        int32_t    maxCapacityTotal = 0;        /* total capacity of all batteries */
+        int32_t    currentCapacityTotal = 0;    /* total current capacity of all batteries */
+        int32_t    presentRateTotal = 0;        /* total present (dis)charging rate of all batts */
+
+        int rc = RTDirOpen(&pDir, "/sys/class/power_supply/");
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * The new /sys interface introduced with Linux 2.6.25.
+             */
+            while (pThread->enmState == PDMTHREADSTATE_RUNNING)
+            {
+                rc = RTDirRead(pDir, &DirEntry, NULL);
+                if (RT_FAILURE(rc))
+                    break;
+                if (   strcmp(DirEntry.szName, ".") == 0
+                    || strcmp(DirEntry.szName, "..") == 0)
+                    continue;
+#define POWER_OPEN(s, n) RTStrmOpenF("r", s, "/sys/class/power_supply/%s/" n, DirEntry.szName)
+                rc = POWER_OPEN(&pStrmType, "type");
+                if (RT_FAILURE(rc))
+                    continue;
+                rc = RTStrmGetLine(pStrmType, szLine, sizeof(szLine));
+                if (RT_SUCCESS(rc))
+                {
+                    if (strcmp(szLine, "Mains") == 0)
+                    {
+                        /* AC adapter */
+                        rc = POWER_OPEN(&pStrmStatus, "online");
+                        if (RT_SUCCESS(rc))
+                        {
+                            rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                            if (   RT_SUCCESS(rc)
+                                && strcmp(szLine, "1") == 0)
+                                enmPowerSource = PDM_ACPI_POWER_SOURCE_OUTLET;
+                            else
+                                enmPowerSource = PDM_ACPI_POWER_SOURCE_BATTERY;
+                            RTStrmClose(pStrmStatus);
+                        }
+                    }
+                    else if (strcmp(szLine, "Battery") == 0)
+                    {
+                        /* Battery */
+                        rc = POWER_OPEN(&pStrmStatus, "present");
+                        if (RT_SUCCESS(rc))
+                        {
+                            rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                            RTStrmClose(pStrmStatus);
+                            if (   RT_SUCCESS(rc)
+                                && strcmp(szLine, "1") == 0)
+                            {
+                                fBatteryPresent = true;
+                                rc = RTStrmOpenF("r", &pStrmStatus,
+                                                 "/sys/class/power_supply/%s/status", DirEntry.szName);
+                                if (RT_SUCCESS(rc))
+                                {
+                                    rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                                    if (RT_SUCCESS(rc))
+                                    {
+                                        if (strcmp(szLine, "Discharging") == 0)
+                                            fDischarging = true;
+                                        else if (strcmp(szLine, "Charging") == 0)
+                                            fCharging = true;
+                                    }
+                                    RTStrmClose(pStrmStatus);
+                                }
+                                rc = POWER_OPEN(&pStrmStatus, "capacity_level");
+                                if (RT_SUCCESS(rc))
+                                {
+                                    rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                                    if (   RT_SUCCESS(rc)
+                                        && strcmp(szLine, "Critical") == 0)
+                                        fCritical = true;
+                                    RTStrmClose(pStrmStatus);
+                                }
+                                rc = POWER_OPEN(&pStrmStatus, "energy_full");
+                                if (RT_FAILURE(rc))
+                                    rc = POWER_OPEN(&pStrmStatus, "charge_full");
+                                if (RT_SUCCESS(rc))
+                                {
+                                    rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                                    if (RT_SUCCESS(rc))
+                                    {
+                                        int32_t maxCapacity = 0;
+                                        rc = RTStrToInt32Full(szLine, 0, &maxCapacity);
+                                        if (   RT_SUCCESS(rc)
+                                            && maxCapacity > 0)
+                                            maxCapacityTotal += maxCapacity;
+                                    }
+                                    RTStrmClose(pStrmStatus);
+                                }
+                                rc = POWER_OPEN(&pStrmStatus, "energy_now");
+                                if (RT_FAILURE(rc))
+                                    rc = POWER_OPEN(&pStrmStatus, "charge_now");
+                                if (RT_SUCCESS(rc))
+                                {
+                                    rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                                    if (RT_SUCCESS(rc))
+                                    {
+                                        int32_t currentCapacity = 0;
+                                        rc = RTStrToInt32Full(szLine, 0, &currentCapacity);
+                                        if (   RT_SUCCESS(rc)
+                                            && currentCapacity > 0)
+                                            currentCapacityTotal += currentCapacity;
+                                    }
+                                    RTStrmClose(pStrmStatus);
+                                }
+                                rc = POWER_OPEN(&pStrmStatus, "current_now");
+                                if (RT_SUCCESS(rc))
+                                {
+                                    rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                                    if (RT_SUCCESS(rc))
+                                    {
+                                        int32_t presentRate = 0;
+                                        rc = RTStrToInt32Full(szLine, 0, &presentRate);
+                                        if (   RT_SUCCESS(rc)
+                                            && presentRate > 0)
+                                        {
+                                            if (fDischarging)
+                                                presentRateTotal -= presentRate;
+                                            else
+                                                presentRateTotal += presentRate;
+                                        }
+                                    }
+                                    RTStrmClose(pStrmStatus);
+                                }
+                            }
+                        }
+                    }
+                }
+                RTStrmClose(pStrmType);
+#undef POWER_OPEN
+            }
+            RTDirClose(pDir);
+        }
+        else /* !/sys */
+        {
+            /*
+             * The old /proc/acpi interface
+             */
+            /*
+             * Read the status of the powerline-adapter.
+             */
+            rc = RTDirOpen(&pDir, "/proc/acpi/ac_adapter/");
+            if (RT_SUCCESS(rc))
+            {
+#define POWER_OPEN(s, n) RTStrmOpenF("r", s, "/proc/acpi/ac_adapter/%s/" n, DirEntry.szName)
+                while (pThread->enmState == PDMTHREADSTATE_RUNNING)
+                {
+                    rc = RTDirRead(pDir, &DirEntry, NULL);
+                    if (RT_FAILURE(rc))
+                        break;
+                    if (   strcmp(DirEntry.szName, ".") == 0
+                        || strcmp(DirEntry.szName, "..") == 0)
+                        continue;
+                    rc = POWER_OPEN(&pStrmStatus, "status");
+                    if (RT_FAILURE(rc))
+                        rc = POWER_OPEN(&pStrmStatus, "state");
+                    if (RT_SUCCESS(rc))
+                    {
+                        while (pThread->enmState == PDMTHREADSTATE_RUNNING)
+                        {
+                            rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                            if (RT_FAILURE(rc))
+                                break;
+                            if (   strstr(szLine, "Status:") != NULL
+                                || strstr(szLine, "state:") != NULL)
+                            {
+                                if (strstr(szLine, "on-line") != NULL)
+                                    enmPowerSource = PDM_ACPI_POWER_SOURCE_OUTLET;
+                                else
+                                    enmPowerSource = PDM_ACPI_POWER_SOURCE_BATTERY;
+                                break;
+                            }
+                        }
+                        RTStrmClose(pStrmStatus);
+                        break;
+                    }
+                }
+                RTDirClose(pDir);
+#undef POWER_OPEN
+            }
+
+            /*
+             * Read the status of all batteries and collect it into one.
+             */
+            rc = RTDirOpen(&pDir, "/proc/acpi/battery/");
+            if (RT_SUCCESS(rc))
+            {
+#define POWER_OPEN(s, n) RTStrmOpenF("r", s, "/proc/acpi/battery/%s/" n, DirEntry.szName)
+                bool fThisBatteryPresent = false;
+                bool fThisDischarging = false;
+
+                while (pThread->enmState == PDMTHREADSTATE_RUNNING)
+                {
+                    rc = RTDirRead(pDir, &DirEntry, NULL);
+                    if (RT_FAILURE(rc))
+                        break;
+                    if (   strcmp(DirEntry.szName, ".") == 0
+                        || strcmp(DirEntry.szName, "..") == 0)
+                        continue;
+
+                    rc = POWER_OPEN(&pStrmStatus, "status");
+                    /* there is a 2nd variant of that file */
+                    if (RT_FAILURE(rc))
+                        rc = POWER_OPEN(&pStrmStatus, "state");
+                    if (RT_FAILURE(rc))
+                        continue;
+
+                    PRTSTREAM pStrmInfo;
+                    rc = POWER_OPEN(&pStrmInfo, "info");
+                    if (RT_FAILURE(rc))
+                    {
+                        RTStrmClose(pStrmStatus);
+                        continue;
+                    }
+
+                    /* get 'present' status from the info file */
+                    while (pThread->enmState == PDMTHREADSTATE_RUNNING)
+                    {
+                        rc = RTStrmGetLine(pStrmInfo, szLine, sizeof(szLine));
+                        if (RT_FAILURE(rc))
+                            break;
+                        if (strstr(szLine, "present:") != NULL)
+                        {
+                            if (strstr(szLine, "yes") != NULL)
+                            {
+                                fThisBatteryPresent = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (fThisBatteryPresent)
+                    {
+                        fBatteryPresent = true;
+                        RTStrmRewind(pStrmInfo);
+
+                        /* get the maximum capacity from the info file */
+                        while (pThread->enmState == PDMTHREADSTATE_RUNNING)
+                        {
+                            rc = RTStrmGetLine(pStrmInfo, szLine, sizeof(szLine));
+                            if (RT_FAILURE(rc))
+                                break;
+                            if (strstr(szLine, "last full capacity:") != NULL)
+                            {
+                                char *psz;
+                                int32_t maxCapacity = 0;
+                                rc = RTStrToInt32Ex(RTStrStripL(&szLine[19]), &psz, 0, &maxCapacity);
+                                if (RT_FAILURE(rc))
+                                    maxCapacity = 0;
+                                maxCapacityTotal += maxCapacity;
+                                break;
+                            }
+                        }
+
+                        /* get the current capacity/state from the status file */
+                        int32_t presentRate = 0;
+                        bool fGotRemainingCapacity = false;
+                        bool fGotBatteryState = false;
+                        bool fGotCapacityState = false;
+                        bool fGotPresentRate = false;
+                        while (  (   !fGotRemainingCapacity
+                                  || !fGotBatteryState
+                                  || !fGotCapacityState
+                                  || !fGotPresentRate)
+                               && pThread->enmState == PDMTHREADSTATE_RUNNING)
+                        {
+                            rc = RTStrmGetLine(pStrmStatus, szLine, sizeof(szLine));
+                            if (RT_FAILURE(rc))
+                                break;
+                            if (strstr(szLine, "remaining capacity:") != NULL)
+                            {
+                                char *psz;
+                                int32_t currentCapacity = 0;
+                                rc = RTStrToInt32Ex(RTStrStripL(&szLine[19]), &psz, 0, &currentCapacity);
+                                if (   RT_SUCCESS(rc)
+                                    && currentCapacity > 0)
+                                    currentCapacityTotal += currentCapacity;
+                                fGotRemainingCapacity = true;
+                            }
+                            else if (strstr(szLine, "charging state:") != NULL)
+                            {
+                                if (strstr(szLine + 15, "discharging") != NULL)
+                                {
+                                    fDischarging = true;
+                                    fThisDischarging = true;
+                                }
+                                else if (strstr(szLine + 15, "charging") != NULL)
+                                    fCharging = true;
+                                fGotBatteryState = true;
+                            }
+                            else if (strstr(szLine, "capacity state:") != NULL)
+                            {
+                                if (strstr(szLine + 15, "critical") != NULL)
+                                    fCritical = true;
+                                fGotCapacityState = true;
+                            }
+                            if (strstr(szLine, "present rate:") != NULL)
+                            {
+                                char *psz;
+                                rc = RTStrToInt32Ex(RTStrStripL(&szLine[13]), &psz, 0, &presentRate);
+                                if (RT_FAILURE(rc))
+                                    presentRate = 0;
+                                fGotPresentRate = true;
+                            }
+                        }
+                        if (fThisDischarging)
+                            presentRateTotal -= presentRate;
+                        else
+                            presentRateTotal += presentRate;
+                    }
+                    RTStrmClose(pStrmStatus);
+                    RTStrmClose(pStrmInfo);
+                }
+                RTDirClose(pDir);
+#undef POWER_OPEN
+            }
+        } /* /proc/acpi */
+
+        /* atomic update of the state */
+        RTCritSectEnter(&pThis->CritSect);
+        pThis->enmPowerSource = enmPowerSource;
+        pThis->fBatteryPresent = fBatteryPresent;
+
+        /* charging/discharging bits are mutual exclusive */
+        uint32_t uBs = PDM_ACPI_BAT_STATE_CHARGED;
+        if (fDischarging)
+            uBs = PDM_ACPI_BAT_STATE_DISCHARGING;
+        else if (fCharging)
+            uBs = PDM_ACPI_BAT_STATE_CHARGING;
+        if (fCritical)
+            uBs |= PDM_ACPI_BAT_STATE_CRITICAL;
+        pThis->enmBatteryState = (PDMACPIBATSTATE)uBs;
+
+        if (maxCapacityTotal > 0 && currentCapacityTotal > 0)
+        {
+            if (presentRateTotal < 0)
+                presentRateTotal = -presentRateTotal;
+
+            /* calculate the percentage */
+            pThis->enmBatteryRemainingCapacity =
+                                 (PDMACPIBATCAPACITY)( (  (float)currentCapacityTotal
+                                                        / (float)maxCapacityTotal)
+                                                      * PDM_ACPI_BAT_CAPACITY_MAX);
+            pThis->u32BatteryPresentRate =
+                                 (uint32_t)((  (float)presentRateTotal
+                                             / (float)maxCapacityTotal) * 1000);
+        }
+        else
+        {
+            /* unknown capacity / state */
+            pThis->enmBatteryRemainingCapacity = PDM_ACPI_BAT_CAPACITY_UNKNOWN;
+            pThis->u32BatteryPresentRate = ~0;
+        }
+        RTCritSectLeave(&pThis->CritSect);
+
+        /* wait a bit (e.g. Ubuntu/GNOME polls every 30 seconds) */
+        ASMAtomicWriteBool(&pThis->fDontPokePoller, true);
+        rc = RTSemEventWait(pThis->hPollerSleepEvent, 20000);
+    }
+
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) drvACPIPollerWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    PDRVACPI pThis = PDMINS_2_DATA(pDrvIns, PDRVACPI);
+
+    RTSemEventSignal(pThis->hPollerSleepEvent);
+    if (!ASMAtomicReadBool(&pThis->fDontPokePoller))
+        RTThreadPoke(pThread->Thread);
+    return VINF_SUCCESS;
+}
+#endif /* RT_OS_LINUX */
+
+
 /**
  * Destruct a driver instance.
  *
@@ -717,7 +928,15 @@ static DECLCALLBACK(int) drvACPIQueryBatteryStatus(PPDMIACPICONNECTOR pInterface
  */
 static DECLCALLBACK(void) drvACPIDestruct(PPDMDRVINS pDrvIns)
 {
+    PDRVACPI pThis = PDMINS_2_DATA(pDrvIns, PDRVACPI);
+
     LogFlow(("drvACPIDestruct\n"));
+
+#ifdef RT_OS_LINUX
+    RTSemEventDestroy(pThis->hPollerSleepEvent);
+    pThis->hPollerSleepEvent = NIL_RTSEMEVENT;
+    RTCritSectDelete(&pThis->CritSect);
+#endif
 }
 
 /**
@@ -728,6 +947,7 @@ static DECLCALLBACK(void) drvACPIDestruct(PPDMDRVINS pDrvIns)
 static DECLCALLBACK(int) drvACPIConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
 {
     PDRVACPI pThis = PDMINS_2_DATA(pDrvIns, PDRVACPI);
+    int rc = VINF_SUCCESS;
 
     /*
      * Init the static parts.
@@ -763,7 +983,23 @@ static DECLCALLBACK(int) drvACPIConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHand
         return VERR_PDM_MISSING_INTERFACE_ABOVE;
     }
 
-    return VINF_SUCCESS;
+#ifdef RT_OS_LINUX
+    /*
+     * Start the poller thread.
+     */
+    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pPollerThread, pThis, drvACPIPoller,
+                                  drvACPIPollerWakeup, 0, RTTHREADTYPE_INFREQUENT_POLLER, "ACPI Poller");
+    if (RT_FAILURE(rc))
+        return rc;
+
+    rc = RTCritSectInit(&pThis->CritSect);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    rc = RTSemEventCreate(&pThis->hPollerSleepEvent);
+#endif
+
+    return rc;
 }
 
 
@@ -811,4 +1047,3 @@ const PDMDRVREG g_DrvACPI =
     /* u32EndVersion */
     PDM_DRVREG_VERSION
 };
-
diff --git a/src/VBox/Devices/Storage/DevBusLogic.cpp b/src/VBox/Devices/Storage/DevBusLogic.cpp
index 6a6378a90..85aabc9a3 100644
--- a/src/VBox/Devices/Storage/DevBusLogic.cpp
+++ b/src/VBox/Devices/Storage/DevBusLogic.cpp
@@ -1041,7 +1041,7 @@ static int buslogicDataBufferAlloc(PBUSLOGICTASKSTATE pTaskState)
                 GCPhysAddrScatterGatherCurrent += cScatterGatherGCRead * sizeof(ScatterGatherEntry);
             } while (cScatterGatherGCLeft > 0);
 
-            Log((": cbDataToTransfer=%d\n", cbDataToTransfer));
+            Log(("%s: cbDataToTransfer=%d\n", __FUNCTION__, cbDataToTransfer));
 
             /* Allocate buffer */
             pTaskState->DataSeg.cbSeg = cbDataToTransfer;
@@ -1088,7 +1088,8 @@ static int buslogicDataBufferAlloc(PBUSLOGICTASKSTATE pTaskState)
             }
 
         }
-        else if (pTaskState->CommandControlBlockGuest.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB)
+        else if (   pTaskState->CommandControlBlockGuest.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB
+                 || pTaskState->CommandControlBlockGuest.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB_RESIDUAL_DATA_LENGTH)
         {
             /* The buffer is not scattered. */
             RTGCPHYS GCPhysAddrDataBase     = (RTGCPHYS)pTaskState->CommandControlBlockGuest.u32PhysAddrData;
@@ -1169,7 +1170,8 @@ static void buslogicDataBufferFree(PBUSLOGICTASKSTATE pTaskState)
             } while (cScatterGatherGCLeft > 0);
 
         }
-        else if (pTaskState->CommandControlBlockGuest.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB)
+        else if (   pTaskState->CommandControlBlockGuest.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB
+                 || pTaskState->CommandControlBlockGuest.uOpcode == BUSLOGIC_CCB_OPCODE_INITIATOR_CCB_RESIDUAL_DATA_LENGTH)
         {
             /* The buffer is not scattered. */
             RTGCPHYS GCPhysAddrDataBase = (RTGCPHYS)pTaskState->CommandControlBlockGuest.u32PhysAddrData;
@@ -1327,6 +1329,7 @@ static int buslogicProcessCommand(PBUSLOGIC pBusLogic)
             pReply->fHostWideSCSI = true;
             pReply->fHostUltraSCSI = true;
             pReply->u16ScatterGatherLimit = 8192;
+            pBusLogic->regStatus |= BUSLOGIC_REGISTER_STATUS_INITIALIZATION_REQUIRED;
 
             break;
         }
@@ -1490,10 +1493,6 @@ static int buslogicRegisterRead(PBUSLOGIC pBusLogic, unsigned iRegister, uint32_
         case BUSLOGIC_REGISTER_INTERRUPT:
         {
             *pu32 = pBusLogic->regInterrupt;
-#if 0
-            if (pBusLogic->uOperationCode == BUSLOGICCOMMAND_DISABLE_HOST_ADAPTER_INTERRUPT)
-                rc = PDMDeviceDBGFStop(pBusLogic->CTX_SUFF(pDevIns), RT_SRC_POS, "Interrupt disable command\n");
-#endif
             break;
         }
         case BUSLOGIC_REGISTER_GEOMETRY:
diff --git a/src/VBox/Devices/Storage/DrvVD.cpp b/src/VBox/Devices/Storage/DrvVD.cpp
index 774a99d29..9d95c4202 100644
--- a/src/VBox/Devices/Storage/DrvVD.cpp
+++ b/src/VBox/Devices/Storage/DrvVD.cpp
@@ -621,6 +621,66 @@ static DECLCALLBACK(int) drvvdINIPFlush(RTSOCKET Sock)
                     (const char *)&fFlag, sizeof(fFlag));
     return VINF_SUCCESS;
 }
+
+/** @copydoc VDINTERFACETCPNET::pfnGetLocalAddress */
+static DECLCALLBACK(int) drvvdINIPGetLocalAddress(RTSOCKET Sock, PRTNETADDR pAddr)
+{
+   union
+    {
+        struct sockaddr     Addr;
+        struct sockaddr_in  Ipv4;
+    }               u;
+    socklen_t       cbAddr = sizeof(u);
+    RT_ZERO(u);
+    if (!lwip_getsockname(Sock, &u.Addr, &cbAddr))
+    {
+        /*
+         * Convert the address.
+         */
+        if (   cbAddr == sizeof(struct sockaddr_in)
+            && u.Addr.sa_family == AF_INET)
+        {
+            RT_ZERO(*pAddr);
+            pAddr->enmType      = RTNETADDRTYPE_IPV4;
+            pAddr->uPort        = RT_N2H_U16(u.Ipv4.sin_port);
+            pAddr->uAddr.IPv4.u = u.Ipv4.sin_addr.s_addr;
+        }
+        else
+            return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED;
+        return VINF_SUCCESS;
+    }
+    return VERR_NET_OPERATION_NOT_SUPPORTED;
+}
+
+/** @copydoc VDINTERFACETCPNET::pfnGetPeerAddress */
+static DECLCALLBACK(int) drvvdINIPGetPeerAddress(RTSOCKET Sock, PRTNETADDR pAddr)
+{
+   union
+    {
+        struct sockaddr     Addr;
+        struct sockaddr_in  Ipv4;
+    }               u;
+    socklen_t       cbAddr = sizeof(u);
+    RT_ZERO(u);
+    if (!lwip_getpeername(Sock, &u.Addr, &cbAddr))
+    {
+        /*
+         * Convert the address.
+         */
+        if (   cbAddr == sizeof(struct sockaddr_in)
+            && u.Addr.sa_family == AF_INET)
+        {
+            RT_ZERO(*pAddr);
+            pAddr->enmType      = RTNETADDRTYPE_IPV4;
+            pAddr->uPort        = RT_N2H_U16(u.Ipv4.sin_port);
+            pAddr->uAddr.IPv4.u = u.Ipv4.sin_addr.s_addr;
+        }
+        else
+            return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED;
+        return VINF_SUCCESS;
+    }
+    return VERR_NET_OPERATION_NOT_SUPPORTED;
+}
 #endif /* VBOX_WITH_INIP */
 
 
@@ -1132,6 +1192,8 @@ static DECLCALLBACK(int) drvvdConstruct(PPDMDRVINS pDrvIns,
             pThis->VDITcpNetCallbacks.pfnRead = RTTcpRead;
             pThis->VDITcpNetCallbacks.pfnWrite = RTTcpWrite;
             pThis->VDITcpNetCallbacks.pfnFlush = RTTcpFlush;
+            pThis->VDITcpNetCallbacks.pfnGetLocalAddress = RTTcpGetLocalAddress;
+            pThis->VDITcpNetCallbacks.pfnGetPeerAddress = RTTcpGetPeerAddress;
         }
         else
         {
@@ -1147,6 +1209,8 @@ static DECLCALLBACK(int) drvvdConstruct(PPDMDRVINS pDrvIns,
             pThis->VDITcpNetCallbacks.pfnRead = drvvdINIPRead;
             pThis->VDITcpNetCallbacks.pfnWrite = drvvdINIPWrite;
             pThis->VDITcpNetCallbacks.pfnFlush = drvvdINIPFlush;
+            pThis->VDITcpNetCallbacks.pfnGetLocalAddress = drvvdINIPGetLocalAddress;
+            pThis->VDITcpNetCallbacks.pfnGetPeerAddress = drvvdINIPGetPeerAddress;
 #endif /* VBOX_WITH_INIP */
         }
         if (RT_SUCCESS(rc))
diff --git a/src/VBox/Devices/Storage/ISCSIHDDCore.cpp b/src/VBox/Devices/Storage/ISCSIHDDCore.cpp
index 77a871304..a0f7a7d5d 100644
--- a/src/VBox/Devices/Storage/ISCSIHDDCore.cpp
+++ b/src/VBox/Devices/Storage/ISCSIHDDCore.cpp
@@ -1,9 +1,10 @@
+/* $Id: ISCSIHDDCore.cpp $ */
 /** @file
  * iSCSI initiator driver, VD backend.
  */
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -312,7 +313,7 @@ typedef struct ISCSIIMAGE
     uint32_t            cbSector;
     /** Size of volume in sectors. */
     uint64_t            cVolume;
-    /** Total volume size in bytes. Easiert that multiplying the above values all the time. */
+    /** Total volume size in bytes. Easier than multiplying the above values all the time. */
     uint64_t            cbSize;
 
     /** Negotiated maximum data length when sending to target. */
@@ -353,6 +354,8 @@ typedef struct ISCSIIMAGE
     RTSOCKET            Socket;
     /** Timeout for read operations on the TCP connection (in milliseconds). */
     uint32_t            uReadTimeout;
+    /** Flag whether to automatically generate the initiator name. */
+    bool                fAutomaticInitiatorName;
     /** Flag whether to use the host IP stack or DevINIP. */
     bool                fHostIP;
 } ISCSIIMAGE, *PISCSIIMAGE;
@@ -416,15 +419,12 @@ typedef struct ISCSIPARAMETER
 *   Static Variables                                                           *
 *******************************************************************************/
 
-/** Counter for getting unique instance IDs. */
-static uint32_t s_u32iscsiID = 0;
+/** Default initiator basename. */
+static const char *s_iscsiDefaultInitiatorBasename = "iqn.2009-08.com.sun.virtualbox.initiator";
 
 /** Default LUN. */
 static const char *s_iscsiConfigDefaultLUN = "0";
 
-/** Default initiator name. */
-static const char *s_iscsiConfigDefaultInitiatorName = "iqn.2009-08.com.sun.virtualbox.initiator";
-
 /** Default timeout, 10 seconds. */
 static const char *s_iscsiConfigDefaultTimeout = "10000";
 
@@ -441,7 +441,7 @@ static const VDCONFIGINFO s_iscsiConfigInfo[] =
     /* LUN is defined of string type to handle the "enc" prefix. */
     { "LUN",                s_iscsiConfigDefaultLUN,            VDCFGVALUETYPE_STRING,  VD_CFGKEY_MANDATORY },
     { "TargetAddress",      NULL,                               VDCFGVALUETYPE_STRING,  VD_CFGKEY_MANDATORY },
-    { "InitiatorName",      s_iscsiConfigDefaultInitiatorName,  VDCFGVALUETYPE_STRING,  0 },
+    { "InitiatorName",      NULL,                               VDCFGVALUETYPE_STRING,  0 },
     { "InitiatorUsername",  NULL,                               VDCFGVALUETYPE_STRING,  0 },
     { "InitiatorSecret",    NULL,                               VDCFGVALUETYPE_BYTES,   0 },
     { "TargetUsername",     NULL,                               VDCFGVALUETYPE_STRING,  VD_CFGKEY_EXPERT },
@@ -499,6 +499,50 @@ DECLINLINE(int) iscsiError(PISCSIIMAGE pImage, int rc, RT_SRC_POS_DECL,
 }
 
 
+static int iscsiTransportConnect(PISCSIIMAGE pImage)
+{
+    int rc;
+    if (!pImage->pszHostname)
+        return VERR_NET_DEST_ADDRESS_REQUIRED;
+
+    rc = pImage->pInterfaceNetCallbacks->pfnClientConnect(pImage->pszHostname, pImage->uPort, &pImage->Socket);
+    if (RT_UNLIKELY(   RT_FAILURE(rc)
+                    && (   rc == VERR_NET_CONNECTION_REFUSED
+                        || rc == VERR_NET_CONNECTION_RESET
+                        || rc == VERR_NET_UNREACHABLE
+                        || rc == VERR_NET_HOST_UNREACHABLE
+                        || rc == VERR_NET_CONNECTION_TIMED_OUT)))
+    {
+        /* Standardize return value for no connection. */
+        return VERR_NET_CONNECTION_REFUSED;
+    }
+
+    /* Make initiator name and ISID unique on this host. */
+    RTNETADDR LocalAddr;
+    rc = pImage->pInterfaceNetCallbacks->pfnGetLocalAddress(pImage->Socket,
+                                                            &LocalAddr);
+    if (RT_FAILURE(rc))
+        return rc;
+    if (   LocalAddr.uPort == RTNETADDR_PORT_NA
+        || LocalAddr.uPort > 65535)
+        return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED;
+    pImage->ISID &= ~65535ULL;
+    pImage->ISID |= LocalAddr.uPort;
+    /* Eliminate the port so that it isn't included below. */
+    LocalAddr.uPort = RTNETADDR_PORT_NA;
+    if (pImage->fAutomaticInitiatorName)
+    {
+        if (pImage->pszInitiatorName)
+            RTStrFree(pImage->pszInitiatorName);
+        RTStrAPrintf(&pImage->pszInitiatorName, "%s:01:%RTnaddr",
+                     s_iscsiDefaultInitiatorBasename, &LocalAddr);
+        if (!pImage->pszInitiatorName)
+            return VERR_NO_MEMORY;
+    }
+    return VINF_SUCCESS;
+}
+
+
 static int iscsiTransportRead(PISCSIIMAGE pImage, PISCSIRES paResponse, unsigned int cnResponse)
 {
     int rc = VINF_SUCCESS;
@@ -509,21 +553,9 @@ static int iscsiTransportRead(PISCSIIMAGE pImage, PISCSIRES paResponse, unsigned
     LogFlowFunc(("cnResponse=%d (%s:%d)\n", cnResponse, pImage->pszHostname, pImage->uPort));
     if (pImage->Socket == NIL_RTSOCKET)
     {
-        /* Attempt to reconnect if the connection was previously broken. */
-        if (pImage->pszHostname != NULL)
-        {
-            rc = pImage->pInterfaceNetCallbacks->pfnClientConnect(pImage->pszHostname, pImage->uPort, &pImage->Socket);
-            if (RT_UNLIKELY(   RT_FAILURE(rc)
-                            && (   rc == VERR_NET_CONNECTION_REFUSED
-                                || rc == VERR_NET_CONNECTION_RESET
-                                || rc == VERR_NET_UNREACHABLE
-                                || rc == VERR_NET_HOST_UNREACHABLE
-                                || rc == VERR_NET_CONNECTION_TIMED_OUT)))
-            {
-                /* Standardize return value for no connection. */
-                rc = VERR_NET_CONNECTION_REFUSED;
-            }
-        }
+        /* Reconnecting makes no sense in this case, as there will be nothing
+         * to receive. We would just run into a timeout. */
+        rc = VERR_BROKEN_PIPE;
     }
 
     if (RT_SUCCESS(rc) && paResponse[0].cbSeg >= 48)
@@ -645,20 +677,7 @@ static int iscsiTransportWrite(PISCSIIMAGE pImage, PISCSIREQ paRequest, unsigned
     if (pImage->Socket == NIL_RTSOCKET)
     {
         /* Attempt to reconnect if the connection was previously broken. */
-        if (pImage->pszHostname != NULL)
-        {
-            rc = pImage->pInterfaceNetCallbacks->pfnClientConnect(pImage->pszHostname, pImage->uPort, &pImage->Socket);
-            if (RT_UNLIKELY(   RT_FAILURE(rc)
-                            && (   rc == VERR_NET_CONNECTION_REFUSED
-                                || rc == VERR_NET_CONNECTION_RESET
-                                || rc == VERR_NET_UNREACHABLE
-                                || rc == VERR_NET_HOST_UNREACHABLE
-                                || rc == VERR_NET_CONNECTION_TIMED_OUT)))
-            {
-                /* Standardize return value for no connection. */
-                rc = VERR_NET_CONNECTION_REFUSED;
-            }
-        }
+        rc = iscsiTransportConnect(pImage);
     }
 
     if (RT_SUCCESS(rc))
@@ -788,7 +807,12 @@ static int iscsiTransportOpen(PISCSIIMAGE pImage)
         }
     }
 
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+    {
+        if (pImage->Socket == NIL_RTSOCKET)
+            rc = iscsiTransportConnect(pImage);
+    }
+    else
     {
         if (pImage->pszHostname)
         {
@@ -798,8 +822,6 @@ static int iscsiTransportOpen(PISCSIIMAGE pImage)
         pImage->uPort = 0;
     }
 
-    /* Note that in this implementation the actual connection establishment is
-     * delayed until a PDU is read or written. */
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -827,7 +849,7 @@ static int iscsiTransportClose(PISCSIIMAGE pImage)
  * Full Feature Phase.
  *
  * @returns VBox status.
- * @param   pImage  The iSCSI connection state to be used.
+ * @param   pImage      The iSCSI connection state to be used.
  */
 static int iscsiAttach(PISCSIIMAGE pImage)
 {
@@ -883,6 +905,13 @@ static int iscsiAttach(PISCSIIMAGE pImage)
     iscsiTransportClose(pImage);
 
 restart:
+    if (pImage->Socket == NIL_RTSOCKET)
+    {
+        rc = iscsiTransportOpen(pImage);
+        if (RT_FAILURE(rc))
+            goto out;
+    }
+
     pImage->state = ISCSISTATE_IN_LOGIN;
     pImage->ITT = 1;
     pImage->FirstRecvPDU = true;
@@ -1259,7 +1288,7 @@ out:
  * Detach from an iSCSI target.
  *
  * @returns VBox status.
- * @param   pImage  The iSCSI connection state to be used.
+ * @param   pImage      The iSCSI connection state to be used.
  */
 static int iscsiDetach(PISCSIIMAGE pImage)
 {
@@ -1347,11 +1376,11 @@ static int iscsiDetach(PISCSIIMAGE pImage)
  * Full Feature Phase.
  *
  * @returns VBOX status.
- * @param   pImage  The iSCSI connection state to be used.
- * @param   pRequest        Command descriptor. Contains all information about
- *                          the command, its transfer directions and pointers
- *                          to the buffer(s) used for transferring data and
- *                          status information.
+ * @param   pImage      The iSCSI connection state to be used.
+ * @param   pRequest    Command descriptor. Contains all information about
+ *                      the command, its transfer directions and pointers
+ *                      to the buffer(s) used for transferring data and
+ *                      status information.
  */
 static int iscsiCommand(PISCSIIMAGE pImage, PSCSIREQ pRequest)
 {
@@ -1364,7 +1393,7 @@ static int iscsiCommand(PISCSIIMAGE pImage, PSCSIREQ pRequest)
 
     uint32_t *pDst = NULL;
     size_t cbBufLength;
-    uint32_t aStat[64];
+    uint32_t aStatus[256]; /**< Plenty of buffer for status information. */
     uint32_t ExpDataSN = 0;
     bool final = false;
 
@@ -1463,8 +1492,8 @@ static int iscsiCommand(PISCSIIMAGE pImage, PSCSIREQ pRequest)
         }
         /* Always reserve space for the status - it's impossible to tell
          * beforehand whether this will be the final PDU or not. */
-        aISCSIRes[cnISCSIRes].pvSeg = aStat;
-        aISCSIRes[cnISCSIRes].cbSeg = sizeof(aStat);
+        aISCSIRes[cnISCSIRes].pvSeg = aStatus;
+        aISCSIRes[cnISCSIRes].cbSeg = sizeof(aStatus);
         cnISCSIRes++;
 
         rc = iscsiRecvPDU(pImage, itt, aISCSIRes, cnISCSIRes);
@@ -1489,19 +1518,27 @@ static int iscsiCommand(PISCSIIMAGE pImage, PSCSIREQ pRequest)
              * status. Thus the status may have ended up partially in the
              * data area. */
             pRequest->status = RT_N2H_U32(aResBHS[0]) & 0x000000ff;
-            uint32_t cbData = RT_N2H_U32(aResBHS[1]) & 0x00ffffff;
+            cbData = RT_N2H_U32(aResBHS[1]) & 0x00ffffff;
             if (cbData >= 2)
             {
                 uint32_t cbStat = RT_N2H_U32(((uint32_t *)aISCSIRes[1].pvSeg)[0]) >> 16;
-                if (cbStat + 2 > cbData || cbStat > pRequest->cbSense)
+                if (cbStat + 2 > cbData)
                 {
                     rc = VERR_BUFFER_OVERFLOW;
                     break;
                 }
-                pRequest->cbSense = cbStat;
-                memcpy(pRequest->pvSense, ((const uint8_t *)aISCSIRes[1].pvSeg) + 2, aISCSIRes[1].cbSeg - 2);
-                if (cnISCSIRes > 2 && aISCSIRes[2].cbSeg && (ssize_t)cbStat - aISCSIRes[1].cbSeg - 2 > 0)
-                    memcpy((char *)pRequest->pvSense + aISCSIRes[1].cbSeg, aISCSIRes[2].pvSeg, cbStat - aISCSIRes[1].cbSeg - 2);
+                /* Truncate sense data if it doesn't fit into the buffer. */
+                pRequest->cbSense = RT_MIN(cbStat, pRequest->cbSense);
+                memcpy(pRequest->pvSense,
+                       ((const char *)aISCSIRes[1].pvSeg) + 2,
+                       RT_MIN(aISCSIRes[1].cbSeg - 2, pRequest->cbSense));
+                if (   cnISCSIRes > 2 && aISCSIRes[2].cbSeg
+                    && (ssize_t)pRequest->cbSense - aISCSIRes[1].cbSeg + 2 > 0)
+                {
+                    memcpy((char *)pRequest->pvSense + aISCSIRes[1].cbSeg - 2,
+                           aISCSIRes[2].pvSeg,
+                           pRequest->cbSense - aISCSIRes[1].cbSeg + 2);
+                }
             }
             else if (cbData == 1)
             {
@@ -1569,7 +1606,7 @@ out:
  * Generate a new Initiator Task Tag.
  *
  * @returns Initiator Task Tag.
- * @param   pImage  The iSCSI connection state to be used.
+ * @param   pImage      The iSCSI connection state to be used.
  */
 static uint32_t iscsiNewITT(PISCSIIMAGE pImage)
 {
@@ -1587,14 +1624,13 @@ static uint32_t iscsiNewITT(PISCSIIMAGE pImage)
  * are padded to 4 byte boundaries and concatenated.
  *
  * @returns VBOX status
- * @param   pImage  The iSCSI connection state to be used.
- * @param   paReq      Pointer to array of iSCSI request sections.
- * @param   cnReq      Number of valid iSCSI request sections in the array.
+ * @param   pImage      The iSCSI connection state to be used.
+ * @param   paReq       Pointer to array of iSCSI request sections.
+ * @param   cnReq       Number of valid iSCSI request sections in the array.
  */
 static int iscsiSendPDU(PISCSIIMAGE pImage, PISCSIREQ paReq, uint32_t cnReq)
 {
     int rc = VINF_SUCCESS;
-    uint32_t i;
     /** @todo return VERR_VD_ISCSI_INVALID_STATE in the appropriate situations,
      * needs cleaning up of timeout/disconnect handling a bit, as otherwise
      * too many incorrect errors are signalled. */
@@ -1602,7 +1638,7 @@ static int iscsiSendPDU(PISCSIIMAGE pImage, PISCSIREQ paReq, uint32_t cnReq)
     Assert(cnReq >= 1);
     Assert(paReq[0].cbSeg >= ISCSI_BHS_SIZE);
 
-    for (i = 0; i < pImage->cISCSIRetries; i++)
+    for (uint32_t i = 0; i < pImage->cISCSIRetries; i++)
     {
         rc = iscsiTransportWrite(pImage, paReq, cnReq);
         if (RT_SUCCESS(rc))
@@ -1633,17 +1669,16 @@ static int iscsiSendPDU(PISCSIIMAGE pImage, PISCSIREQ paReq, uint32_t cnReq)
  * sure that all parts are collected and processed appropriately by the caller.
  *
  * @returns VBOX status
- * @param   pImage  The iSCSI connection state to be used.
- * @param   paRes      Pointer to array of iSCSI response sections.
- * @param   cnRes      Number of valid iSCSI response sections in the array.
+ * @param   pImage      The iSCSI connection state to be used.
+ * @param   paRes       Pointer to array of iSCSI response sections.
+ * @param   cnRes       Number of valid iSCSI response sections in the array.
  */
 static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint32_t cnRes)
 {
     int rc = VINF_SUCCESS;
-    uint32_t i;
     ISCSIRES aResBuf;
 
-    for (i = 0; i < pImage->cISCSIRetries; i++)
+    for (uint32_t i = 0; i < pImage->cISCSIRetries; i++)
     {
         aResBuf.pvSeg = pImage->pvRecvPDUBuf;
         aResBuf.cbSeg = pImage->cbRecvPDUBuf;
@@ -1733,24 +1768,24 @@ static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint3
             if (itt == pcvResSeg[4])
             {
                 /* Copy received PDU (one segment) to caller-provided buffers. */
-                uint32_t i;
+                uint32_t j;
                 size_t cbSeg;
                 const uint8_t *pSrc;
 
                 pSrc = (const uint8_t *)aResBuf.pvSeg;
                 cbSeg = aResBuf.cbSeg;
-                for (i = 0; i < cnRes; i++)
+                for (j = 0; j < cnRes; j++)
                 {
-                    if (cbSeg > paRes[i].cbSeg)
+                    if (cbSeg > paRes[j].cbSeg)
                     {
-                        memcpy(paRes[i].pvSeg, pSrc, paRes[i].cbSeg);
-                        pSrc += paRes[i].cbSeg;
-                        cbSeg -= paRes[i].cbSeg;
+                        memcpy(paRes[j].pvSeg, pSrc, paRes[j].cbSeg);
+                        pSrc += paRes[j].cbSeg;
+                        cbSeg -= paRes[j].cbSeg;
                     }
                     else
                     {
-                        memcpy(paRes[i].pvSeg, pSrc, cbSeg);
-                        paRes[i].cbSeg = cbSeg;
+                        memcpy(paRes[j].pvSeg, pSrc, cbSeg);
+                        paRes[j].cbSeg = cbSeg;
                         cbSeg = 0;
                         break;
                     }
@@ -1760,8 +1795,8 @@ static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint3
                     rc = VERR_BUFFER_OVERFLOW;
                     break;
                 }
-                for (i++; i < cnRes; i++)
-                    paRes[i].cbSeg = 0;
+                for (j++; j < cnRes; j++)
+                    paRes[j].cbSeg = 0;
                 break;
             }
             else if (   cmd == ISCSIOP_NOP_IN
@@ -1801,8 +1836,8 @@ static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint3
  * Check the static (not dependent on the connection/session state) validity of an iSCSI response PDU.
  *
  * @returns VBOX status
- * @param   paRes      Pointer to array of iSCSI response sections.
- * @param   cnRes      Number of valid iSCSI response sections in the array.
+ * @param   paRes       Pointer to array of iSCSI response sections.
+ * @param   cnRes       Number of valid iSCSI response sections in the array.
  */
 static int drvISCSIValidatePDU(PISCSIRES paRes, uint32_t cnRes)
 {
@@ -1958,10 +1993,10 @@ static int iscsiTextAddKeyValue(uint8_t *pbBuf, size_t cbBuf, size_t *pcbBufCurr
  * Retrieve the value for a given key from the key=value buffer.
  *
  * @returns VBOX status.
- * @param   pbBuf      Buffer containing key=value pairs.
- * @param   cbBuf      Length of buffer with key=value pairs.
- * @param   pszKey     Pointer to key for which to retrieve the value.
- * @param   ppszValue  Pointer to value string pointer.
+ * @param   pbBuf       Buffer containing key=value pairs.
+ * @param   cbBuf       Length of buffer with key=value pairs.
+ * @param   pszKey      Pointer to key for which to retrieve the value.
+ * @param   ppszValue   Pointer to value string pointer.
  */
 static int iscsiTextGetKeyValue(const uint8_t *pbBuf, size_t cbBuf, const char *pcszKey, const char **ppcszValue)
 {
@@ -2090,9 +2125,9 @@ static int iscsiStrToBinary(const char *pcszValue, uint8_t *pbValue, size_t *pcb
  * Retrieve the relevant parameter values and update the initiator state.
  *
  * @returns VBOX status.
- * @param   pImage     Current iSCSI initiator state.
- * @param   pbBuf      Buffer containing key=value pairs.
- * @param   cbBuf      Length of buffer with key=value pairs.
+ * @param   pImage      Current iSCSI initiator state.
+ * @param   pbBuf       Buffer containing key=value pairs.
+ * @param   cbBuf       Length of buffer with key=value pairs.
  */
 static int iscsiUpdateParameters(PISCSIIMAGE pImage, const uint8_t *pbBuf, size_t cbBuf)
 {
@@ -2196,7 +2231,10 @@ static void iscsiFreeImage(PISCSIIMAGE pImage, bool fDelete)
     }
     if (pImage->pszInitiatorName)
     {
-        RTMemFree(pImage->pszInitiatorName);
+        if (pImage->fAutomaticInitiatorName)
+            RTStrFree(pImage->pszInitiatorName);
+        else
+            RTMemFree(pImage->pszInitiatorName);
         pImage->pszInitiatorName = NULL;
     }
     if (pImage->pszInitiatorUsername)
@@ -2275,7 +2313,8 @@ static int iscsiOpenImage(PISCSIIMAGE pImage, unsigned uOpenFlags)
         goto out;
     }
 
-    pImage->ISID            = 0x800000000000ULL | 0x001234560000ULL | (0x00000000cba0ULL + ASMAtomicIncU32(&s_u32iscsiID));
+    /* This ISID will be adjusted later to make it unique on this host. */
+    pImage->ISID            = 0x800000000000ULL | 0x001234560000ULL;
     pImage->cISCSIRetries   = 10;
     pImage->state           = ISCSISTATE_FREE;
     pImage->pvRecvPDUBuf    = RTMemAlloc(ISCSI_RECV_PDU_BUFFER_SIZE);
@@ -2308,10 +2347,14 @@ static int iscsiOpenImage(PISCSIIMAGE pImage, unsigned uOpenFlags)
         rc = iscsiError(pImage, rc, RT_SRC_POS, N_("iSCSI: configuration error: failed to read TargetName as string"));
         goto out;
     }
-    rc = VDCFGQueryStringAllocDef(pImage->pInterfaceConfigCallbacks,
-                                  pImage->pInterfaceConfig->pvUser,
-                                  "InitiatorName", &pImage->pszInitiatorName,
-                                  s_iscsiConfigDefaultInitiatorName);
+    rc = VDCFGQueryStringAlloc(pImage->pInterfaceConfigCallbacks,
+                               pImage->pInterfaceConfig->pvUser,
+                               "InitiatorName", &pImage->pszInitiatorName);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT)
+    {
+        pImage->fAutomaticInitiatorName = true;
+        rc = VINF_SUCCESS;
+    }
     if (RT_FAILURE(rc))
     {
         rc = iscsiError(pImage, rc, RT_SRC_POS, N_("iSCSI: configuration error: failed to read InitiatorName as string"));
@@ -2457,11 +2500,10 @@ static int iscsiOpenImage(PISCSIIMAGE pImage, unsigned uOpenFlags)
     }
 
     /*
-     * Establish the iSCSI transport connection.
+     * Attach to the iSCSI target. This implicitly establishes the iSCSI
+     * transport connection.
      */
-    rc = iscsiTransportOpen(pImage);
-    if (RT_SUCCESS(rc))
-        rc = iscsiAttach(pImage);
+    rc = iscsiAttach(pImage);
 
     if (RT_FAILURE(rc))
     {
@@ -2471,7 +2513,7 @@ static int iscsiOpenImage(PISCSIIMAGE pImage, unsigned uOpenFlags)
     LogFlowFunc(("target '%s' opened successfully\n", pImage->pszTargetName));
 
     SCSIREQ sr;
-    uint8_t sense[32];
+    uint8_t sense[96];
     uint8_t data8[8];
     uint8_t data12[12];
 
@@ -2531,16 +2573,24 @@ static int iscsiOpenImage(PISCSIIMAGE pImage, unsigned uOpenFlags)
     sr.cbSense = sizeof(sense);
     sr.pvSense = sense;
 
-    rc = iscsiCommand(pImage, &sr);
+    for (unsigned i = 0; i < 10; i++)
+    {
+        rc = iscsiCommand(pImage, &sr);
+        if (    (RT_SUCCESS(rc) && !sr.cbSense)
+            ||  RT_FAILURE(rc))
+            break;
+        rc = VERR_INVALID_STATE;
+    }
     if (RT_SUCCESS(rc))
     {
-        if ((data8[0] & SCSI_DEVTYPE_MASK) != SCSI_DEVTYPE_DISK)
+        uint8_t devType = (sr.cbT2IData > 0) ? data8[0] & SCSI_DEVTYPE_MASK : 255;
+        if (devType != SCSI_DEVTYPE_DISK)
         {
             rc = iscsiError(pImage, VERR_VD_ISCSI_INVALID_TYPE,
                             RT_SRC_POS, N_("iSCSI: target address %s, target name %s, SCSI LUN %lld reports device type=%u"),
                             pImage->pszTargetAddress, pImage->pszTargetName,
-                            pImage->LUN, data8[0]);
-            LogRel(("iSCSI: Unsupported SCSI peripheral device type %d for target %s\n", data8[0] & SCSI_DEVTYPE_MASK, pImage->pszTargetName));
+                            pImage->LUN, devType);
+            LogRel(("iSCSI: Unsupported SCSI peripheral device type %d for target %s\n", devType & SCSI_DEVTYPE_MASK, pImage->pszTargetName));
             goto out;
         }
     }
@@ -2841,7 +2891,7 @@ static int iscsiOpen(const char *pszFilename, unsigned uOpenFlags,
 
     rc = iscsiOpenImage(pImage, uOpenFlags);
     if (RT_SUCCESS(rc))
-    {    
+    {
         LogFlowFunc(("target %s cVolume %d, cbSector %d\n", pImage->pszTargetName, pImage->cVolume, pImage->cbSector));
         LogRel(("iSCSI: target address %s, target name %s, SCSI LUN %lld\n", pImage->pszTargetAddress, pImage->pszTargetName, pImage->LUN));
         *ppBackendData = pImage;
@@ -2935,7 +2985,7 @@ static int iscsiRead(void *pBackendData, uint64_t uOffset, void *pvBuf,
     tls = (uint16_t)(cbToRead / pImage->cbSector);
     SCSIREQ sr;
     uint8_t cdb[10];
-    uint8_t sense[32];
+    uint8_t sense[96];
 
     cdb[0] = SCSI_READ_10;
     cdb[1] = 0;         /* reserved */
@@ -3016,7 +3066,7 @@ static int iscsiWrite(void *pBackendData, uint64_t uOffset, const void *pvBuf,
     tls = (uint16_t)(cbToWrite / pImage->cbSector);
     SCSIREQ sr;
     uint8_t cdb[10];
-    uint8_t sense[32];
+    uint8_t sense[96];
 
     cdb[0] = SCSI_WRITE_10;
     cdb[1] = 0;         /* reserved */
@@ -3072,7 +3122,7 @@ static int iscsiFlush(void *pBackendData)
 
     SCSIREQ sr;
     uint8_t cdb[10];
-    uint8_t sense[32];
+    uint8_t sense[96];
 
     cdb[0] = SCSI_SYNCHRONIZE_CACHE;
     cdb[1] = 0;         /* reserved */
diff --git a/src/VBox/Devices/Storage/VBoxHDD.cpp b/src/VBox/Devices/Storage/VBoxHDD.cpp
index 07a7e1339..d4bbbeb2c 100644
--- a/src/VBox/Devices/Storage/VBoxHDD.cpp
+++ b/src/VBox/Devices/Storage/VBoxHDD.cpp
@@ -299,8 +299,8 @@ static PVDIMAGE vdGetImageByNumber(PVBOXHDD pDisk, unsigned nImage)
  * internal: read the specified amount of data in whatever blocks the backend
  * will give us.
  */
-static int vdReadHelper(PVBOXHDD pDisk, PVDIMAGE pImage, uint64_t uOffset,
-                        void *pvBuf, size_t cbRead)
+static int vdReadHelper(PVBOXHDD pDisk, PVDIMAGE pImage, PVDIMAGE pImageParentOverride,
+                        uint64_t uOffset, void *pvBuf, size_t cbRead)
 {
     int rc;
     size_t cbThisRead;
@@ -312,14 +312,25 @@ static int vdReadHelper(PVBOXHDD pDisk, PVDIMAGE pImage, uint64_t uOffset,
          * than the previous reads marked as valid. Otherwise this would return
          * stale data when different block sizes are used for the images. */
         cbThisRead = cbRead;
-        rc = VERR_VD_BLOCK_FREE;
-        for (PVDIMAGE pCurrImage = pImage;
-             pCurrImage != NULL && rc == VERR_VD_BLOCK_FREE;
-             pCurrImage = pCurrImage->pPrev)
+
+        /*
+         * Try to read from the given image.
+         * If the block is not allocated read from override chain if present.
+         */
+        rc = pImage->Backend->pfnRead(pImage->pvBackendData,
+                                      uOffset, pvBuf, cbThisRead,
+                                      &cbThisRead);
+
+        if (rc == VERR_VD_BLOCK_FREE)
         {
-            rc = pCurrImage->Backend->pfnRead(pCurrImage->pvBackendData,
-                                              uOffset, pvBuf, cbThisRead,
-                                              &cbThisRead);
+            for (PVDIMAGE pCurrImage = pImageParentOverride ? pImageParentOverride : pImage->pPrev;
+                 pCurrImage != NULL && rc == VERR_VD_BLOCK_FREE;
+                 pCurrImage = pCurrImage->pPrev)
+            {
+                rc = pCurrImage->Backend->pfnRead(pCurrImage->pvBackendData,
+                                                  uOffset, pvBuf, cbThisRead,
+                                                  &cbThisRead);
+            }
         }
 
         /* No image in the chain contains the data for the block. */
@@ -344,7 +355,7 @@ static int vdParentRead(void *pvUser, uint64_t uOffset, void *pvBuf,
                         size_t cbRead)
 {
     PVDPARENTSTATEDESC pParentState = (PVDPARENTSTATEDESC)pvUser;
-    return vdReadHelper(pParentState->pDisk, pParentState->pImage, uOffset,
+    return vdReadHelper(pParentState->pDisk, pParentState->pImage, NULL, uOffset,
                         pvBuf, cbRead);
 }
 
@@ -394,6 +405,7 @@ static void vdSetModifiedFlag(PVBOXHDD pDisk)
  * images that are really needed).
  */
 static int vdWriteHelperStandard(PVBOXHDD pDisk, PVDIMAGE pImage,
+                                 PVDIMAGE pImageParentOverride,
                                  uint64_t uOffset, size_t cbWrite,
                                  size_t cbThisWrite, size_t cbPreRead,
                                  size_t cbPostRead, const void *pvBuf,
@@ -404,8 +416,8 @@ static int vdWriteHelperStandard(PVBOXHDD pDisk, PVDIMAGE pImage,
     /* Read the data that goes before the write to fill the block. */
     if (cbPreRead)
     {
-        rc = vdReadHelper(pDisk, pImage, uOffset - cbPreRead, pvTmp,
-                          cbPreRead);
+        rc = vdReadHelper(pDisk, pImage, pImageParentOverride,
+                          uOffset - cbPreRead, pvTmp, cbPreRead);
         if (RT_FAILURE(rc))
             return rc;
     }
@@ -439,7 +451,7 @@ static int vdWriteHelperStandard(PVBOXHDD pDisk, PVDIMAGE pImage,
             memcpy((char *)pvTmp + cbPreRead + cbThisWrite,
                    (char *)pvBuf + cbThisWrite, cbWriteCopy);
         if (cbReadImage)
-            rc = vdReadHelper(pDisk, pImage,
+            rc = vdReadHelper(pDisk, pImage, pImageParentOverride,
                               uOffset + cbThisWrite + cbWriteCopy,
                               (char *)pvTmp + cbPreRead + cbThisWrite + cbWriteCopy,
                               cbReadImage);
@@ -471,6 +483,7 @@ static int vdWriteHelperStandard(PVBOXHDD pDisk, PVDIMAGE pImage,
  * All backends which support differential/growing images support this.
  */
 static int vdWriteHelperOptimized(PVBOXHDD pDisk, PVDIMAGE pImage,
+                                  PVDIMAGE pImageParentOverride,
                                   uint64_t uOffset, size_t cbWrite,
                                   size_t cbThisWrite, size_t cbPreRead,
                                   size_t cbPostRead, const void *pvBuf,
@@ -500,7 +513,7 @@ static int vdWriteHelperOptimized(PVBOXHDD pDisk, PVDIMAGE pImage,
 
     /* Read the entire data of the block so that we can compare whether it will
      * be modified by the write or not. */
-    rc = vdReadHelper(pDisk, pImage, uOffset - cbPreRead, pvTmp,
+    rc = vdReadHelper(pDisk, pImage, pImageParentOverride, uOffset - cbPreRead, pvTmp,
                       cbPreRead + cbThisWrite + cbPostRead - cbFill);
     if (RT_FAILURE(rc))
         return rc;
@@ -547,8 +560,8 @@ static int vdWriteHelperOptimized(PVBOXHDD pDisk, PVDIMAGE pImage,
  * internal: write buffer to the image, taking care of block boundaries and
  * write optimizations.
  */
-static int vdWriteHelper(PVBOXHDD pDisk, PVDIMAGE pImage, uint64_t uOffset,
-                         const void *pvBuf, size_t cbWrite)
+static int vdWriteHelper(PVBOXHDD pDisk, PVDIMAGE pImage, PVDIMAGE pImageParentOverride,
+                         uint64_t uOffset, const void *pvBuf, size_t cbWrite)
 {
     int rc;
     unsigned fWrite;
@@ -579,7 +592,8 @@ static int vdWriteHelper(PVBOXHDD pDisk, PVDIMAGE pImage, uint64_t uOffset,
             {
                 /* Optimized write, suppress writing to a so far unallocated
                  * block if the data is in fact not changed. */
-                rc = vdWriteHelperOptimized(pDisk, pImage, uOffset, cbWrite,
+                rc = vdWriteHelperOptimized(pDisk, pImage, pImageParentOverride,
+                                            uOffset, cbWrite,
                                             cbThisWrite, cbPreRead, cbPostRead,
                                             pvBuf, pvTmp);
             }
@@ -589,7 +603,8 @@ static int vdWriteHelper(PVBOXHDD pDisk, PVDIMAGE pImage, uint64_t uOffset,
                  * be written no matter what. This will usually (unless the
                  * backend has some further optimization enabled) cause the
                  * block to be allocated. */
-                rc = vdWriteHelperStandard(pDisk, pImage, uOffset, cbWrite,
+                rc = vdWriteHelperStandard(pDisk, pImage, pImageParentOverride,
+                                           uOffset, cbWrite,
                                            cbThisWrite, cbPreRead, cbPostRead,
                                            pvBuf, pvTmp);
             }
@@ -1840,6 +1855,7 @@ VBOXDDU_DECL(int) VDCreateDiff(PVBOXHDD pDisk, const char *pszBackend,
     return rc;
 }
 
+
 /**
  * Merges two images (not necessarily with direct parent/child relationship).
  * As a side effect the source image and potentially the other images which
@@ -1944,7 +1960,8 @@ VBOXDDU_DECL(int) VDMerge(PVBOXHDD pDisk, unsigned nImageFrom,
                     {
                         if (RT_FAILURE(rc))
                             break;
-                        rc = vdWriteHelper(pDisk, pImageTo, uOffset, pvBuf,
+                        rc = vdWriteHelper(pDisk, pImageTo, pImageFrom->pPrev,
+                                           uOffset, pvBuf,
                                            cbThisRead);
                         if (RT_FAILURE(rc))
                             break;
@@ -1970,6 +1987,30 @@ VBOXDDU_DECL(int) VDMerge(PVBOXHDD pDisk, unsigned nImageFrom,
         }
         else
         {
+            /*
+             * We may need to update the parent uuid of the child coming after the
+             * last image to be merged. We have to reopen it read/write.
+             *
+             * This is done before we do the actual merge to prevent an incosistent
+             * chain if the mode change fails for some reason.
+             */
+            if (pImageFrom->pNext)
+            {
+                PVDIMAGE pImageChild = pImageFrom->pNext;
+
+                /* We need to open the image in read/write mode. */
+                uOpenFlags = pImageChild->Backend->pfnGetOpenFlags(pImageChild->pvBackendData);
+
+                if (uOpenFlags  & VD_OPEN_FLAGS_READONLY)
+                {
+                    uOpenFlags  &= ~VD_OPEN_FLAGS_READONLY;
+                    rc = pImageChild->Backend->pfnSetOpenFlags(pImageChild->pvBackendData,
+                                                               uOpenFlags);
+                    if (RT_FAILURE(rc))
+                        break;
+                }
+            }
+
             /* Merge child state into parent. This means writing all blocks
              * which are allocated in the image up to the source image to the
              * destination image. */
@@ -1996,7 +2037,7 @@ VBOXDDU_DECL(int) VDMerge(PVBOXHDD pDisk, unsigned nImageFrom,
                 {
                     if (RT_FAILURE(rc))
                         break;
-                    rc = vdWriteHelper(pDisk, pImageTo, uOffset, pvBuf,
+                    rc = vdWriteHelper(pDisk, pImageTo, NULL, uOffset, pvBuf,
                                        cbThisRead);
                     if (RT_FAILURE(rc))
                         break;
@@ -2020,12 +2061,13 @@ VBOXDDU_DECL(int) VDMerge(PVBOXHDD pDisk, unsigned nImageFrom,
 
         /* Update parent UUID so that image chain is consistent. */
         RTUUID Uuid;
+        PVDIMAGE pImageChild = NULL;
         if (nImageFrom < nImageTo)
         {
-            if (pImageTo->pPrev)
+            if (pImageFrom->pPrev)
             {
-                rc = pImageTo->Backend->pfnGetUuid(pImageTo->pPrev->pvBackendData,
-                                                   &Uuid);
+                rc = pImageFrom->pPrev->Backend->pfnGetUuid(pImageFrom->pPrev->pvBackendData,
+                                                            &Uuid);
                 AssertRC(rc);
             }
             else
@@ -2036,26 +2078,19 @@ VBOXDDU_DECL(int) VDMerge(PVBOXHDD pDisk, unsigned nImageFrom,
         }
         else
         {
+            /* Update the parent uuid of the child of the last merged image. */
             if (pImageFrom->pNext)
             {
                 rc = pImageTo->Backend->pfnGetUuid(pImageTo->pvBackendData,
                                                    &Uuid);
                 AssertRC(rc);
-                rc = pImageFrom->Backend->pfnSetParentUuid(pImageFrom->pNext,
+
+                rc = pImageFrom->Backend->pfnSetParentUuid(pImageFrom->pNext->pvBackendData,
                                                            &Uuid);
                 AssertRC(rc);
-            }
-        }
 
-        /* Make sure destination image is back to read only if necessary. */
-        if (pImageTo != pDisk->pLast && pImageFrom != pDisk->pLast)
-        {
-            uOpenFlags = pImageTo->Backend->pfnGetOpenFlags(pImageTo->pvBackendData);
-            uOpenFlags |= VD_OPEN_FLAGS_READONLY;
-            rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pvBackendData,
-                                                    uOpenFlags);
-            if (RT_FAILURE(rc))
-                break;
+                pImageChild = pImageFrom->pNext;
+            }
         }
 
         /* Delete the no longer needed images. */
@@ -2072,6 +2107,34 @@ VBOXDDU_DECL(int) VDMerge(PVBOXHDD pDisk, unsigned nImageFrom,
             RTMemFree(pImg);
             pImg = pTmp;
         }
+
+        /* Make sure destination image is back to read only if necessary. */
+        if (pImageTo != pDisk->pLast)
+        {
+            uOpenFlags = pImageTo->Backend->pfnGetOpenFlags(pImageTo->pvBackendData);
+            uOpenFlags |= VD_OPEN_FLAGS_READONLY;
+            rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pvBackendData,
+                                                    uOpenFlags);
+            if (RT_FAILURE(rc))
+                break;
+        }
+
+        /*
+         * Make sure the child is readonly
+         * for the child -> parent merge direction
+         * if neccessary.
+        */
+        if (   nImageFrom > nImageTo
+            && pImageChild
+            && pImageChild != pDisk->pLast)
+        {
+            uOpenFlags = pImageChild->Backend->pfnGetOpenFlags(pImageChild->pvBackendData);
+            uOpenFlags |= VD_OPEN_FLAGS_READONLY;
+            rc = pImageChild->Backend->pfnSetOpenFlags(pImageChild->pvBackendData,
+                                                       uOpenFlags);
+            if (RT_FAILURE(rc))
+                break;
+        }
     } while (0);
 
     if (pvBuf)
@@ -2308,12 +2371,12 @@ VBOXDDU_DECL(int) VDCopy(PVBOXHDD pDiskFrom, unsigned nImage, PVBOXHDD pDiskTo,
         {
             size_t cbThisRead = RT_MIN(VD_MERGE_BUFFER_SIZE, cbRemaining);
 
-            rc = vdReadHelper(pDiskFrom, pImageFrom, uOffset, pvBuf,
+            rc = vdReadHelper(pDiskFrom, pImageFrom, NULL, uOffset, pvBuf,
                               cbThisRead);
             if (RT_FAILURE(rc))
                 break;
 
-            rc = vdWriteHelper(pDiskTo, pImageTo, uOffset, pvBuf,
+            rc = vdWriteHelper(pDiskTo, pImageTo, NULL, uOffset, pvBuf,
                                cbThisRead);
             if (RT_FAILURE(rc))
                 break;
@@ -2650,7 +2713,7 @@ VBOXDDU_DECL(int) VDRead(PVBOXHDD pDisk, uint64_t uOffset, void *pvBuf,
         PVDIMAGE pImage = pDisk->pLast;
         AssertPtrBreakStmt(pImage, rc = VERR_VD_NOT_OPENED);
 
-        rc = vdReadHelper(pDisk, pImage, uOffset, pvBuf, cbRead);
+        rc = vdReadHelper(pDisk, pImage, NULL, uOffset, pvBuf, cbRead);
     } while (0);
 
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -2697,7 +2760,7 @@ VBOXDDU_DECL(int) VDWrite(PVBOXHDD pDisk, uint64_t uOffset, const void *pvBuf,
         AssertPtrBreakStmt(pImage, rc = VERR_VD_NOT_OPENED);
 
         vdSetModifiedFlag(pDisk);
-        rc = vdWriteHelper(pDisk, pImage, uOffset, pvBuf, cbWrite);
+        rc = vdWriteHelper(pDisk, pImage, NULL, uOffset, pvBuf, cbWrite);
     } while (0);
 
     LogFlowFunc(("returns %Rrc\n", rc));
diff --git a/src/VBox/Devices/Storage/VDIHDDCore.cpp b/src/VBox/Devices/Storage/VDIHDDCore.cpp
index e59204550..045bbd5de 100644
--- a/src/VBox/Devices/Storage/VDIHDDCore.cpp
+++ b/src/VBox/Devices/Storage/VDIHDDCore.cpp
@@ -2247,7 +2247,7 @@ VBOXHDDBACKEND g_VDIBackend =
     sizeof(VBOXHDDBACKEND),
     /* uBackendCaps */
       VD_CAP_UUID | VD_CAP_CREATE_FIXED | VD_CAP_CREATE_DYNAMIC
-    | VD_CAP_CREATE_SPLIT_2G | VD_CAP_DIFF | VD_CAP_FILE,
+    | VD_CAP_DIFF | VD_CAP_FILE,
     /* papszFileExtensions */
     s_apszVdiFileExtensions,
     /* paConfigInfo */
diff --git a/src/VBox/Devices/Storage/VHDHDDCore.cpp b/src/VBox/Devices/Storage/VHDHDDCore.cpp
index 43597538a..567ca4eec 100644
--- a/src/VBox/Devices/Storage/VHDHDDCore.cpp
+++ b/src/VBox/Devices/Storage/VHDHDDCore.cpp
@@ -732,7 +732,11 @@ static int vhdLoadDynamicDisk(PVHDIMAGE pImage, uint64_t uDynamicDiskHeaderOffse
      */
     pImage->cbDataBlockBitmap = pImage->cSectorsPerDataBlock / 8;
     pImage->cDataBlockBitmapSectors = pImage->cbDataBlockBitmap / VHD_SECTOR_SIZE;
+    /* Round up to full sector size */
+    if (pImage->cbDataBlockBitmap % VHD_SECTOR_SIZE > 0)
+        pImage->cDataBlockBitmapSectors++;
     LogFlowFunc(("cbDataBlockBitmap=%u\n", pImage->cbDataBlockBitmap));
+    LogFlowFunc(("cDataBlockBitmapSectors=%u\n", pImage->cDataBlockBitmapSectors));
 
     pImage->pu8Bitmap = vhdBlockBitmapAllocate(pImage);
     if (!pImage->pu8Bitmap)
@@ -1280,7 +1284,7 @@ static int vhdWrite(void *pBackendData, uint64_t uOffset, const void *pvBuf, siz
                 return VERR_VD_BLOCK_FREE;
             }
 
-            size_t  cbNewBlock = (pImage->cbDataBlock + pImage->cbDataBlockBitmap) * sizeof(uint8_t);
+            size_t  cbNewBlock = pImage->cbDataBlock + (pImage->cDataBlockBitmapSectors * VHD_SECTOR_SIZE);
             uint8_t *pNewBlock = (uint8_t *)RTMemAllocZ(cbNewBlock);
 
             if (!pNewBlock)
@@ -1729,6 +1733,9 @@ static int vhdCreateDynamicImage(PVHDIMAGE pImage, uint64_t cbSize)
     pImage->cSectorsPerDataBlock    = pImage->cbDataBlock / VHD_SECTOR_SIZE;
     pImage->cbDataBlockBitmap       = pImage->cSectorsPerDataBlock / 8;
     pImage->cDataBlockBitmapSectors = pImage->cbDataBlockBitmap / VHD_SECTOR_SIZE;
+    /* Align to sector boundary */
+    if (pImage->cbDataBlockBitmap % VHD_SECTOR_SIZE > 0)
+        pImage->cDataBlockBitmapSectors++;
     pImage->pu8Bitmap               = vhdBlockBitmapAllocate(pImage);
     if (!pImage->pu8Bitmap)
         return vhdError(pImage, VERR_NO_MEMORY, RT_SRC_POS, N_("VHD: cannot allocate memory for bitmap storage"));
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 18b82c6b6..2f3e1573c 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -1,10 +1,10 @@
 # $Id: Makefile.kmk $
 ## @file
-# Sub-Makefile for the Devices testcases.
+# Sub-Makefile for the device testcases.
 #
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2010 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -45,47 +45,49 @@ TESTING += \
 	$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
 
 
-#
-# The testcase generator.
-#
-PROGRAMS += tstDeviceStructSizeGC
-tstDeviceStructSizeGC_TEMPLATE  = VBOXGCEXE
-tstDeviceStructSizeGC_DEFS      =
-ifdef VBOX_WITH_USB
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_USB IN_USB_GC
-endif
-ifdef VBOX_WITH_AHCI
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_AHCI
-endif
-ifdef VBOX_WITH_E1000
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_E1000
-endif
-ifdef VBOX_WITH_VIRTIO
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_VIRTIO
-endif
-ifdef VBOX_WITH_BUSLOGIC
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_BUSLOGIC
-endif
-ifdef VBOX_WITH_SCSI
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_SCSI
-endif
-ifdef VBOX_WITH_LSILOGIC
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_LSILOGIC
-endif
-ifdef VBOX_WITH_HPET
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_HPET
-endif
-ifdef VBOX_WITH_HGSMI
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_HGSMI
-endif
-ifdef VBOX_WITH_VIDEOHWACCEL
-tstDeviceStructSizeGC_DEFS     += VBOX_WITH_VIDEOHWACCEL
-endif
-tstDeviceStructSizeGC_SOURCES   = tstDeviceStructSizeGC.cpp
-tstDeviceStructSizeGC_INCS      = \
-	$(VBOX_PATH_DEVICES_SRC) \
-	$(VBOX_PATH_DEVICES_SRC)/Bus \
-	$(VBOX_DEVICES_TEST_OUT_DIR)
+ifdef VBOX_WITH_RAW_MODE
+ #
+ # The testcase generator.
+ #
+ PROGRAMS += tstDeviceStructSizeRC
+ tstDeviceStructSizeRC_TEMPLATE  = VBOXGCEXE
+ tstDeviceStructSizeRC_DEFS      = VBOX_WITH_RAW_MODE
+ ifdef VBOX_WITH_USB
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_USB
+ endif
+ ifdef VBOX_WITH_AHCI
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_AHCI
+ endif
+ ifdef VBOX_WITH_E1000
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_E1000
+ endif
+ ifdef VBOX_WITH_VIRTIO
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_VIRTIO
+ endif
+ ifdef VBOX_WITH_BUSLOGIC
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_BUSLOGIC
+ endif
+ ifdef VBOX_WITH_SCSI
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_SCSI
+ endif
+ ifdef VBOX_WITH_LSILOGIC
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_LSILOGIC
+ endif
+ ifdef VBOX_WITH_HPET
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_HPET
+ endif
+ ifdef VBOX_WITH_HGSMI
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_HGSMI
+ endif
+ ifdef VBOX_WITH_VIDEOHWACCEL
+  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_VIDEOHWACCEL
+ endif
+ tstDeviceStructSizeRC_SOURCES   = tstDeviceStructSizeRC.cpp
+ tstDeviceStructSizeRC_INCS      = \
+ 	$(VBOX_PATH_DEVICES_SRC) \
+ 	$(VBOX_PATH_DEVICES_SRC)/Bus \
+ 	$(VBOX_DEVICES_TEST_OUT_DIR)
+endif # VBOX_WITH_RAW_MODE
 
 #
 # The testcase it self.
@@ -94,37 +96,40 @@ PROGRAMS += tstDeviceStructSize
 tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
 tstDeviceStructSize_DEFS     =
 ifdef VBOX_WITH_USB
-tstDeviceStructSize_DEFS    += VBOX_WITH_USB IN_USB_GC
+ tstDeviceStructSize_DEFS   += VBOX_WITH_USB
 endif
 ifdef VBOX_WITH_AHCI
-tstDeviceStructSize_DEFS     += VBOX_WITH_AHCI
+ tstDeviceStructSize_DEFS   += VBOX_WITH_AHCI
 endif
 ifdef VBOX_WITH_E1000
-tstDeviceStructSize_DEFS     += VBOX_WITH_E1000
+ tstDeviceStructSize_DEFS   += VBOX_WITH_E1000
 endif
 ifdef VBOX_WITH_VIRTIO
-tstDeviceStructSize_DEFS     += VBOX_WITH_VIRTIO
+ tstDeviceStructSize_DEFS   += VBOX_WITH_VIRTIO
 endif
 ifdef VBOX_WITH_BUSLOGIC
-tstDeviceStructSize_DEFS     += VBOX_WITH_BUSLOGIC
+ tstDeviceStructSize_DEFS   += VBOX_WITH_BUSLOGIC
 endif
 ifdef VBOX_WITH_LSILOGIC
-tstDeviceStructSize_DEFS     += VBOX_WITH_LSILOGIC
+ tstDeviceStructSize_DEFS   += VBOX_WITH_LSILOGIC
 endif
 ifdef VBOX_WITH_HPET
-tstDeviceStructSize_DEFS     += VBOX_WITH_HPET
+ tstDeviceStructSize_DEFS   += VBOX_WITH_HPET
 endif
 ifdef VBOX_WITH_SMC
-tstDeviceStructSize_DEFS     += VBOX_WITH_SMC
+ tstDeviceStructSize_DEFS   += VBOX_WITH_SMC
 endif
 ifdef VBOX_WITH_LPC
-tstDeviceStructSize_DEFS     += VBOX_WITH_LPC
+ tstDeviceStructSize_DEFS   += VBOX_WITH_LPC
 endif
 ifdef VBOX_WITH_HGSMI
-tstDeviceStructSize_DEFS     += VBOX_WITH_HGSMI
+ tstDeviceStructSize_DEFS   += VBOX_WITH_HGSMI
 endif
 ifdef VBOX_WITH_VIDEOHWACCEL
-tstDeviceStructSize_DEFS     += VBOX_WITH_VIDEOHWACCEL
+ tstDeviceStructSize_DEFS   += VBOX_WITH_VIDEOHWACCEL
+endif
+ifdef VBOX_WITH_RAW_MODE
+ tstDeviceStructSize_DEFS   += VBOX_WITH_RAW_MODE
 endif
 tstDeviceStructSize_INCS     = \
 	$(VBOX_PATH_DEVICES_SRC) \
@@ -132,9 +137,11 @@ tstDeviceStructSize_INCS     = \
 	$(VBOX_DEVICES_TEST_OUT_DIR)
 tstDeviceStructSize_SOURCES  = tstDeviceStructSize.cpp
 tstDeviceStructSize_CLEAN    = \
-	$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeGC.h \
+	$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h \
 	$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
-tstDeviceStructSize.cpp_DEPS = $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeGC.h
+ifdef VBOX_WITH_RAW_MODE
+ tstDeviceStructSize.cpp_DEPS = $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h
+endif
 
 #
 # Run rule for tstDeviceStructSize.
@@ -144,10 +151,12 @@ tstDeviceStructSize.cpp_DEPS = $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeG
 # 2. Generate a testcase from the dump
 ## future
 
+ifdef VBOX_WITH_RAW_MODE
 # 1&2. Manually dump selected structures and members.
-$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeGC.h: $$(INSTARGET_tstDeviceStructSizeGC) | $$(dir $$@)
+$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSizeRC.h: $$(INSTARGET_tstDeviceStructSizeRC) | $$(dir $$@)
 	$(call MSG_GENERATE,,$@)
 	$(QUIET)$(REDIRECT) -wo $@ -- $^
+endif
 
 # 3. run it.
 $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run: $$(INSTARGET_tstDeviceStructSize) | $$(dir $$@)
diff --git a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp
index 359af6171..c40a44834 100644
--- a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp
+++ b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp
@@ -1,12 +1,12 @@
 /* $Id: tstDeviceStructSize.cpp $ */
 /** @file
  * tstDeviceStructSize - testcase for check structure sizes/alignment
- *                       and to verify that HC and GC uses the same
+ *                       and to verify that HC and RC uses the same
  *                       representation of the structures.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -311,11 +311,13 @@ int main()
     CHECK_MEMBER_ALIGNMENT(VPCISTATE, Queues, 8);
 #endif
 
+#ifdef VBOX_WITH_RAW_MODE
     /*
-     * Compare HC and GC.
+     * Compare HC and RC.
      */
-    printf("tstDeviceStructSize: Comparing HC and GC...\n");
-#include "tstDeviceStructSizeGC.h"
+    printf("tstDeviceStructSize: Comparing HC and RC...\n");
+# include "tstDeviceStructSizeRC.h"
+#endif
 
     /*
      * Report result.
@@ -326,3 +328,4 @@ int main()
         printf("tstDeviceStructSize: SUCCESS\n");
     return rc;
 }
+
diff --git a/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp b/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
index 32c0865a7..cc9573204 100644
--- a/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp
+++ b/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
@@ -1,4 +1,4 @@
-/* $Id: tstDeviceStructSizeGC.cpp $ */
+/* $Id: tstDeviceStructSizeRC.cpp $ */
 /** @file
  * tstDeviceStructSizeGC - Generate structure member and size checks from the GC perspective.
  *
diff --git a/src/VBox/Disassembler/Makefile.kmk b/src/VBox/Disassembler/Makefile.kmk
index d98dd2500..e45bc4079 100644
--- a/src/VBox/Disassembler/Makefile.kmk
+++ b/src/VBox/Disassembler/Makefile.kmk
@@ -49,14 +49,16 @@ DisasmCoreR3_SOURCES    = \
 	DisasmTables.cpp \
 	DisasmTablesX64.cpp
 
-LIBRARIES              += DisasmGC
-DisasmGC_TEMPLATE       = VBOXGC
-DisasmGC_DEFS           = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
-DisasmGC_SOURCES        = \
-	DisasmCore.cpp \
-	DisasmReg.cpp \
-	DisasmTables.cpp \
-	DisasmTablesX64.cpp
+ifdef VBOX_WITH_RAW_MODE
+ LIBRARIES              += DisasmGC
+ DisasmGC_TEMPLATE       = VBOXGC
+ DisasmGC_DEFS           = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
+ DisasmGC_SOURCES        = \
+ 	DisasmCore.cpp \
+ 	DisasmReg.cpp \
+ 	DisasmTables.cpp \
+ 	DisasmTablesX64.cpp
+endif # VBOX_WITH_RAW_MODE
 
 LIBRARIES              += DisasmR0
 DisasmR0_TEMPLATE       = VBOXR0
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp
index b3c20d7e6..43410d474 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp
@@ -1059,9 +1059,12 @@ int handleAddiSCSIDisk(HandlerArg *a)
             password.detachTo (values.appendedRaw());
         }
 
-        /// @todo add --initiator option
-        Bstr ("InitiatorName").detachTo (names.appendedRaw());
-        Bstr ("iqn.2008-04.com.sun.virtualbox.initiator").detachTo (values.appendedRaw());
+        /// @todo add --initiator option - until that happens rely on the
+        // defaults of the iSCSI initiator code. Setting it to a constant
+        // value does more harm than good, as the initiator name is supposed
+        // to identify a particular initiator uniquely.
+//        Bstr ("InitiatorName").detachTo (names.appendedRaw());
+//        Bstr ("iqn.2008-04.com.sun.virtualbox.initiator").detachTo (values.appendedRaw());
 
         /// @todo add --targetName and --targetPassword options
 
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
index d20312bd8..2a04529af 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
@@ -75,7 +75,9 @@ enum
     MODIFYVM_DELALLCPUID,
     MODIFYVM_MONITORCOUNT,
     MODIFYVM_ACCELERATE3D,
+#ifdef VBOX_WITH_VIDEOHWACCEL
     MODIFYVM_ACCELERATE2DVIDEO,
+#endif
     MODIFYVM_BIOSLOGOFADEIN,
     MODIFYVM_BIOSLOGOFADEOUT,
     MODIFYVM_BIOSLOGODISPLAYTIME,
@@ -116,12 +118,14 @@ enum
     MODIFYVM_AUDIOCONTROLLER,
     MODIFYVM_AUDIO,
     MODIFYVM_CLIPBOARD,
+#ifdef VBOX_WITH_VRDP
     MODIFYVM_VRDPPORT,
     MODIFYVM_VRDPADDRESS,
     MODIFYVM_VRDPAUTHTYPE,
     MODIFYVM_VRDPMULTICON,
     MODIFYVM_VRDPREUSECON,
     MODIFYVM_VRDP,
+#endif
     MODIFYVM_USBEHCI,
     MODIFYVM_USB,
     MODIFYVM_SNAPSHOTFOLDER,
@@ -153,7 +157,9 @@ static const RTGETOPTDEF g_aModifyVMOptions[] =
     { "--cpus",                     MODIFYVM_CPUS,                      RTGETOPT_REQ_UINT32 },
     { "--monitorcount",             MODIFYVM_MONITORCOUNT,              RTGETOPT_REQ_UINT32 },
     { "--accelerate3d",             MODIFYVM_ACCELERATE3D,              RTGETOPT_REQ_BOOL_ONOFF },
+#ifdef VBOX_WITH_VIDEOHWACCEL
     { "--accelerate2dvideo",        MODIFYVM_ACCELERATE2DVIDEO,         RTGETOPT_REQ_BOOL_ONOFF },
+#endif
     { "--bioslogofadein",           MODIFYVM_BIOSLOGOFADEIN,            RTGETOPT_REQ_BOOL_ONOFF },
     { "--bioslogofadeout",          MODIFYVM_BIOSLOGOFADEOUT,           RTGETOPT_REQ_BOOL_ONOFF },
     { "--bioslogodisplaytime",      MODIFYVM_BIOSLOGODISPLAYTIME,       RTGETOPT_REQ_UINT64 },
@@ -194,12 +200,14 @@ static const RTGETOPTDEF g_aModifyVMOptions[] =
     { "--audiocontroller",          MODIFYVM_AUDIOCONTROLLER,           RTGETOPT_REQ_STRING },
     { "--audio",                    MODIFYVM_AUDIO,                     RTGETOPT_REQ_STRING },
     { "--clipboard",                MODIFYVM_CLIPBOARD,                 RTGETOPT_REQ_STRING },
+#ifdef VBOX_WITH_VRDP
     { "--vrdpport",                 MODIFYVM_VRDPPORT,                  RTGETOPT_REQ_STRING },
     { "--vrdpaddress",              MODIFYVM_VRDPADDRESS,               RTGETOPT_REQ_STRING },
     { "--vrdpauthtype",             MODIFYVM_VRDPAUTHTYPE,              RTGETOPT_REQ_STRING },
     { "--vrdpmulticon",             MODIFYVM_VRDPMULTICON,              RTGETOPT_REQ_BOOL_ONOFF },
     { "--vrdpreusecon",             MODIFYVM_VRDPREUSECON,              RTGETOPT_REQ_BOOL_ONOFF },
     { "--vrdp",                     MODIFYVM_VRDP,                      RTGETOPT_REQ_BOOL_ONOFF },
+#endif
     { "--usbehci",                  MODIFYVM_USBEHCI,                   RTGETOPT_REQ_BOOL_ONOFF },
     { "--usb",                      MODIFYVM_USB,                       RTGETOPT_REQ_BOOL_ONOFF },
     { "--snapshotfolder",           MODIFYVM_SNAPSHOTFOLDER,            RTGETOPT_REQ_STRING },
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
index 206a00615..4858e0e6b 100644
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -28,11 +28,19 @@ include $(KBUILD_PATH)/subheader.kmk
 VBOX_VIRTUALBOX4_SRC := $(PATH_SUB_CURRENT)
 VBOX_VIRTUALBOX4_OUT_DIR := $(PATH_TARGET)/VirtualBox/misc
 
-VBOX_WITH_REGISTRATION := 1
+# VBOX_WITH_REGISTRATION := 1
 
 # Ask the user to register at Sun. If this setting is disabled the user can
 # still register using the menu if desired.
-VBOX_WITH_REGISTRATION_REQUEST := 1
+# VBOX_WITH_REGISTRATION_REQUEST := 1
+
+# For now this should be disabled in any case
+ifdef VBOX_WITH_REGISTRATION
+ VBOX_WITH_REGISTRATION=
+endif
+ifdef VBOX_WITH_REGISTRATION_REQUEST
+ VBOX_WITH_REGISTRATION_REQUEST=
+endif
 
 # Show the update notifier dialog during startup. If this setting is disabled
 # the user can still update using the menu if desired.
@@ -283,7 +291,6 @@ VirtualBox_QT_MOCHDRS = \
 	src/VBoxConsoleWnd.h \
 	src/VBoxGlobalSettings.h \
 	src/VBoxMediaManagerDlg.h \
-	src/VBoxRegistrationDlg.h \
 	src/VBoxSelectorWnd.h \
 	src/VBoxSnapshotDetailsDlg.h \
 	src/VBoxSnapshotsWgt.h \
@@ -359,6 +366,11 @@ VirtualBox_QT_MOCHDRS = \
 	src/widgets/VBoxSpecialControls.h \
 	src/widgets/VBoxWarningPane.h
 
+ifdef VBOX_WITH_REGISTRATION
+ VirtualBox_QT_MOCHDRS += \
+	src/VBoxRegistrationDlg.h
+endif
+
 # Sources containing local definitions of classes that use the Q_OBJECT macro.
 VirtualBox_QT_MOCSRCS = \
 	src/VBoxSelectorWnd.cpp \
@@ -384,7 +396,6 @@ VirtualBox_SOURCES = \
 	src/VBoxHelpActions.cpp \
 	src/VBoxMediaManagerDlg.cpp \
 	src/VBoxMedium.cpp \
-	src/VBoxRegistrationDlg.cpp \
 	src/VBoxSelectorWnd.cpp \
 	src/VBoxSnapshotDetailsDlg.cpp \
 	src/VBoxSnapshotsWgt.cpp \
@@ -461,6 +472,11 @@ VirtualBox_SOURCES = \
 	src/widgets/VBoxSpecialControls.cpp \
 	src/widgets/VBoxWarningPane.cpp
 
+ifdef VBOX_WITH_REGISTRATION
+ VirtualBox_SOURCES += \
+	src/VBoxRegistrationDlg.cpp
+endif
+
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
  ifndef VBOX_OSE
   VirtualBox_QT_MOCHDRS += \
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts
index 3594542e9..0d4359175 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Berdai Mohammed</translation>
+        <translation type="obsolete">Berdai Mohammed</translation>
     </message>
 </context>
 <context>
@@ -1462,7 +1462,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4391,88 +4391,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxRegistrationDlg</name>
     <message>
-        <source>VirtualBox Registration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Name</source>
         <translation type="obsolete">&amp;إسم</translation>
     </message>
     <message>
-        <source>Enter your full name using Latin characters.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not perform connection handshake.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
-        <translation type="unfinished">إلغاء</translation>
+        <translation type="obsolete">إلغاء</translation>
     </message>
 </context>
 <context>
@@ -6727,7 +6651,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
index b746bae51..f163297c2 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="bg_BG">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS>
+<TS version="2.0" language="bg_BG">
 <context>
     <name>@@@</name>
     <message>
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Stoyan Marinov, Moyat.NET.</translation>
+        <translation type="obsolete">Stoyan Marinov, Moyat.NET.</translation>
     </message>
 </context>
 <context>
@@ -1374,7 +1374,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Преглед в реално време от иконата в панела</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;�втоматично показване на лентата и менюто при ц�л екран</translation>
     </message>
 </context>
@@ -4496,7 +4496,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Реги�трационен диалог на VirtualBox</translation>
+        <translation type="obsolete">Реги�трационен диалог на VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -4504,7 +4504,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Въведете ц�лото �и име, като използвате латин�ки букви.</translation>
+        <translation type="obsolete">Въведете ц�лото �и име, като използвате латин�ки букви.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -4512,7 +4512,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Въведете валиден e-mail адре�.</translation>
+        <translation type="obsolete">Въведете валиден e-mail адре�.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -4520,11 +4520,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Добре дошли в реги�трационната форма на VirtualBox!</translation>
+        <translation type="obsolete">Добре дошли в реги�трационната форма на VirtualBox!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>�е може да �е о�ъще�тви връзка.</translation>
+        <translation type="obsolete">�е може да �е о�ъще�тви връзка.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -4540,63 +4540,63 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Отказ</translation>
+        <translation type="obsolete">Отказ</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Изберете �трана/територи�</translation>
+        <translation type="obsolete">Изберете �трана/територи�</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Мол�, попълнете тази реги�трационна форма, за да ни информирате, че използвате VirtualBox и, евентуално, за да бъдете информирани за новини и обновлени� на VirtualBox.&lt;/p&gt;&lt;p&gt;Мол�, използвайте �амо латин�ки букви в полетата по-долу. Мол�, имайте в предвид, че Sun Microsystems ще използва тази информаци� �амо за изготв�не на �тати�тика за използваемо�тта на продукта и за изпращане на новинар�ки бюлетини за VirtualBox. О�вен за тези цели, Sun Microsystems никога н�ма да �подел� вашите данни � трети �трани. Подробна информаци� отно�но това как използваме вашите лични данни може да бъде намерена в �екци�та &lt;b&gt;Конфиденциална политика&lt;/b&gt; от ръковод�твото на VirtualBox или на �траницата &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Конфиденциална политика&lt;/a&gt; на уеб �траницата на VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Мол�, попълнете тази реги�трационна форма, за да ни информирате, че използвате VirtualBox и, евентуално, за да бъдете информирани за новини и обновлени� на VirtualBox.&lt;/p&gt;&lt;p&gt;Мол�, използвайте �амо латин�ки букви в полетата по-долу. Мол�, имайте в предвид, че Sun Microsystems ще използва тази информаци� �амо за изготв�не на �тати�тика за използваемо�тта на продукта и за изпращане на новинар�ки бюлетини за VirtualBox. О�вен за тези цели, Sun Microsystems никога н�ма да �подел� вашите данни � трети �трани. Подробна информаци� отно�но това как използваме вашите лични данни може да бъде намерена в �екци�та &lt;b&gt;Конфиденциална политика&lt;/b&gt; от ръковод�твото на VirtualBox или на �траницата &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Конфиденциална политика&lt;/a&gt; на уеб �траницата на VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>&amp;Вече имам Sun Online акаунт:</translation>
+        <translation type="obsolete">&amp;Вече имам Sun Online акаунт:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Парола:</translation>
+        <translation type="obsolete">&amp;Парола:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>&amp;И�кам да �е реги�трирам, �ъздавайки нов Sun Online акаунт:</translation>
+        <translation type="obsolete">&amp;И�кам да �е реги�трирам, �ъздавайки нов Sun Online акаунт:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Име:</translation>
+        <translation type="obsolete">&amp;Име:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Фамили�:</translation>
+        <translation type="obsolete">&amp;Фамили�:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Компани�:</translation>
+        <translation type="obsolete">&amp;Компани�:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;Държава:</translation>
+        <translation type="obsolete">&amp;Държава:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>&amp;Парола:</translation>
+        <translation type="obsolete">&amp;Парола:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>П&amp;арола отново:</translation>
+        <translation type="obsolete">П&amp;арола отново:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Реги�траци�</translation>
+        <translation type="obsolete">&amp;Реги�траци�</translation>
     </message>
 </context>
 <context>
@@ -6858,7 +6858,7 @@ p, li { white-space: pre-wrap; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;
         <translation>&amp;Проце�ор(и):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
index 1bd328035..56544f816 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Vicent Fornés, Pau Iranzo &lt;info@somgnu.cat&gt;.</translation>
+        <translation type="obsolete">Vicent Fornés, Pau Iranzo &lt;info@somgnu.cat&gt;.</translation>
     </message>
 </context>
 <context>
@@ -1965,7 +1965,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Mostra la icona a la safata del sistema</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;Mostra el dock automàticament i la barra de menú al mode de pantalla completa</translation>
     </message>
 </context>
@@ -6226,11 +6226,11 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Introduïu el nom complet fent servir caràcters llatins.</translation>
+        <translation type="obsolete">Introduïu el nom complet fent servir caràcters llatins.</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Introduïu una adreça de correu vàlida.</translation>
+        <translation type="obsolete">Introduïu una adreça de correu vàlida.</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -6246,15 +6246,15 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
     </message>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Diàleg de registre del VirtualBox</translation>
+        <translation type="obsolete">Diàleg de registre del VirtualBox</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Benvingut al formulari de registre del VirtualBox!</translation>
+        <translation type="obsolete">Benvingut al formulari de registre del VirtualBox!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>No s&apos;ha pogut dur a terme la conformitat de connexió.</translation>
+        <translation type="obsolete">No s&apos;ha pogut dur a terme la conformitat de connexió.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6270,63 +6270,63 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancel·la</translation>
+        <translation type="obsolete">Cancel·la</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Seleccioneu un país/territori</translation>
+        <translation type="obsolete">Seleccioneu un país/territori</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ompliu aquest formulari de registre per permetre&apos;ns conèixer que feu servir el VirtualBox i, opcionalment, mantenir-vos informat sobre novetats i actualitzacions del VirtualBox.&lt;/p&gt;&lt;p&gt;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 vostres dades amb terceres parts. Més informació detallada sobre l&apos;ús de les vostres dades personals poden trobar-se a la secció de &lt;b&gt;Política de privacitat&lt;/b&gt; al manual de VirtualBox o al&lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; lloc web del VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Ompliu aquest formulari de registre per permetre&apos;ns conèixer que feu servir el VirtualBox i, opcionalment, mantenir-vos informat sobre novetats i actualitzacions del VirtualBox.&lt;/p&gt;&lt;p&gt;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 vostres dades amb terceres parts. Més informació detallada sobre l&apos;ús de les vostres dades personals poden trobar-se a la secció de &lt;b&gt;Política de privacitat&lt;/b&gt; al manual de VirtualBox o al&lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; lloc web del VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Ja tinc un compte a &amp;Sun Online:</translation>
+        <translation type="obsolete">Ja tinc un compte a &amp;Sun Online:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>Corr&amp;eu:</translation>
+        <translation type="obsolete">Corr&amp;eu:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Contrasenya:</translation>
+        <translation type="obsolete">&amp;Contrasenya:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Vull &amp;registrar-me creant un nou compte a Sun Online:</translation>
+        <translation type="obsolete">Vull &amp;registrar-me creant un nou compte a Sun Online:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Nom:</translation>
+        <translation type="obsolete">&amp;Nom:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Cognoms:</translation>
+        <translation type="obsolete">&amp;Cognoms:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>C&amp;ompanyia:</translation>
+        <translation type="obsolete">C&amp;ompanyia:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;País:</translation>
+        <translation type="obsolete">&amp;País:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>Corre&amp;u:</translation>
+        <translation type="obsolete">Corre&amp;u:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>Con&amp;trasenya:</translation>
+        <translation type="obsolete">Con&amp;trasenya:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Confirmeu la contrasen&amp;ya:</translation>
+        <translation type="obsolete">Confirmeu la contrasen&amp;ya:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registra</translation>
+        <translation type="obsolete">&amp;Registra</translation>
     </message>
 </context>
 <context>
@@ -10513,7 +10513,7 @@ al sistema amfitrió.&lt;/qt&gt;</translation>
         <translation>&amp;Processador(s):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Controla el nombre de CPUs virtuals a la màquina virtual.</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 f94c2ff2d..03e018881 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Vicent Fornés, Pau Iranzo &lt;info@somgnu.cat&gt;.</translation>
+        <translation type="obsolete">Vicent Fornés, Pau Iranzo &lt;info@somgnu.cat&gt;.</translation>
     </message>
 </context>
 <context>
@@ -734,7 +734,7 @@ Versió %1</translation>
 &lt;p&gt;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 the virtual machine.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Alça l&apos;estat d&apos;execució actual de la màquina virtual al disc dur físic de l&apos;ordinador d&apos;amfitrió.&lt;/p&gt;
 &lt;p&gt;La propera vegada que s&apos;engegue esta màquina, es restaurarà des de l&apos;estat alçat i continuarà l&apos;execució des del mateix lloc en què l&apos;heu alçat, cosa que vos permetrà continuar immediatament amb el vostre treball.&lt;/p&gt;
-&lt;p&gt;Tingueu en compte que l&apos;operació d'alçar l&apos;estat de la màquina pot prendre molt de temps, depenent del tipus de sistema operatiu client i la quantitat de memòria assignada a la màquina virtual.&lt;/p&gt;</translation>
+&lt;p&gt;Tingueu en compte que l&apos;operació d&apos;alçar l&apos;estat de la màquina pot prendre molt de temps, depenent del tipus de sistema operatiu client i la quantitat de memòria assignada a la màquina virtual.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>S&amp;end the shutdown signal</source>
@@ -745,7 +745,7 @@ Versió %1</translation>
 &lt;p&gt;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.&lt;/p&gt;
 &lt;p&gt;If the machine doesn&apos;t respond to this action then the guest operating system may be misconfigured or doesn&apos;t understand ACPI Power Button events at all. In this case you should select the &lt;b&gt;Power off the machine&lt;/b&gt; action to stop virtual machine execution.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Envia a la màquina virtual l&apos;esdeveniment de prémer el botó ACPI Power.&lt;/p&gt;
-&lt;p&gt;Normalment, el sistema operatiu client que s&apos;està executant a dins de la màquina virtual detectarà este esdeveniment i realitzarà un procediment de tancament net. Esta és una manera recomanada de tancar la màquina virtual perquè totes les aplicacions que s&apos;estan executant en ella tindran la possibilitat d'alçar les seues dades i estat.&lt;/p&gt;
+&lt;p&gt;Normalment, el sistema operatiu client que s&apos;està executant a dins de la màquina virtual detectarà este esdeveniment i realitzarà un procediment de tancament net. Esta és una manera recomanada de tancar la màquina virtual perquè totes les aplicacions que s&apos;estan executant en ella tindran la possibilitat d&apos;alçar les seues dades i estat.&lt;/p&gt;
 &lt;p&gt;Si la màquina no respon a esta acció potser el sistema operatiu client pot estar mal configurat o no entén els events del botó ACPI Power. En este cas, seleccioneu l&apos;acció &lt;b&gt;Atura la màquina&lt;/b&gt; per aturar l&apos;execució de la màquina virtual.&lt;/p&gt;</translation>
     </message>
     <message>
@@ -760,11 +760,11 @@ Versió %1</translation>
     </message>
     <message>
         <source>&lt;p&gt;Saves the current execution state of the virtual machine to the physical hard disk of the host PC.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 the virtual machine.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Alça l&apos;estat d&apos;execució actual de la màquina virtual al disc dur físic de l&apos;ordinador amfitrió.&lt;/p&gt;&lt;p&gt;La propera vegada que s&apos;inici� esta màquina, es restaurarà des de l&apos;estat alçat i continuarà l&apos;execució des del mateix lloc en què l&apos;heu alçat, cosa que permetrà continuar immediatament amb el vostre treball.&lt;/p&gt;&lt;p&gt;Tingueu en compte que l&apos;operació d'alçar l&apos;estat de la màquina pot prendre molt de temps, depenent del tipus de sistema operatiu client i la quantitat de memòria assignada a la màquina virtual.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Alça l&apos;estat d&apos;execució actual de la màquina virtual al disc dur físic de l&apos;ordinador amfitrió.&lt;/p&gt;&lt;p&gt;La propera vegada que s&apos;inici� esta màquina, es restaurarà des de l&apos;estat alçat i continuarà l&apos;execució des del mateix lloc en què l&apos;heu alçat, cosa que permetrà continuar immediatament amb el vostre treball.&lt;/p&gt;&lt;p&gt;Tingueu en compte que l&apos;operació d&apos;alçar l&apos;estat de la màquina pot prendre molt de temps, depenent del tipus de sistema operatiu client i la quantitat de memòria assignada a la màquina virtual.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Sends the ACPI Power Button press event to the virtual machine.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;If the machine doesn&apos;t respond to this action then the guest operating system may be misconfigured or doesn&apos;t understand ACPI Power Button events at all. In this case you should select the &lt;b&gt;Power off the machine&lt;/b&gt; action to stop virtual machine execution.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Envia a la màquina virtual l&apos;esdeveniment de prémer el botó ACPI Power.&lt;/p&gt;&lt;p&gt;Normalment, el sistema operatiu client que s&apos;està executant a dins de la màquina virtual detectarà este esdeveniment i realitzarà un procediment de tancament net. Esta és una manera recomanada de tancar la màquina virtual perquè totes les aplicacions que s&apos;estan executant en ella tindran la possibilitat d'alçar les seues dades i estat.&lt;/p&gt;&lt;p&gt;Si la màquina no respon a esta acció potser el sistema operatiu client pot estar mal configurat o no entén els events del botó ACPI Power. En este cas, seleccioneu l&apos;acció &lt;b&gt;Atura la màquina&lt;/b&gt; per aturar l&apos;execució de la màquina virtual.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Envia a la màquina virtual l&apos;esdeveniment de prémer el botó ACPI Power.&lt;/p&gt;&lt;p&gt;Normalment, el sistema operatiu client que s&apos;està executant a dins de la màquina virtual detectarà este esdeveniment i realitzarà un procediment de tancament net. Esta és una manera recomanada de tancar la màquina virtual perquè totes les aplicacions que s&apos;estan executant en ella tindran la possibilitat d&apos;alçar les seues dades i estat.&lt;/p&gt;&lt;p&gt;Si la màquina no respon a esta acció potser el sistema operatiu client pot estar mal configurat o no entén els events del botó ACPI Power. En este cas, seleccioneu l&apos;acció &lt;b&gt;Atura la màquina&lt;/b&gt; per aturar l&apos;execució de la màquina virtual.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Turns off the virtual machine.&lt;/p&gt;&lt;p&gt;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 &lt;i&gt;data loss&lt;/i&gt; inside the virtual machine. Selecting this action is recommended only if the virtual machine does not respond to the &lt;b&gt;Send the shutdown signal&lt;/b&gt; action.&lt;/p&gt;</source>
@@ -1965,7 +1965,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Mostra la icona a la safata del sistema</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;Mostra el dock automàticament i la barra de menú al mode de pantalla completa</translation>
     </message>
 </context>
@@ -3533,48 +3533,36 @@ p, li { white-space: pre-wrap; }
         <source>%n year(s)</source>
         <translation>
             <numerusform>%n any</numerusform>
-            <numerusform>%n anys</numerusform>
-            <numerusform>%n anys</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
         <translation>
             <numerusform>%n mes</numerusform>
-            <numerusform>%n mesos</numerusform>
-            <numerusform>%n mesos</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation>
             <numerusform>%n dia</numerusform>
-            <numerusform>%n dies</numerusform>
-            <numerusform>%n dies</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation>
             <numerusform>%n hora</numerusform>
-            <numerusform>%n hores</numerusform>
-            <numerusform>%n hores</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation>
             <numerusform>%n minut</numerusform>
-            <numerusform>%n minuts</numerusform>
-            <numerusform>%n minuts</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n second(s)</source>
         <translation>
             <numerusform>%n segon</numerusform>
-            <numerusform>%n segons</numerusform>
-            <numerusform>%n segons</numerusform>
         </translation>
     </message>
     <message>
@@ -5544,7 +5532,7 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source>&lt;p&gt;The following VirtualBox settings files have been automatically converted to the new settings file format version &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;However, the results of the conversion were not saved back to disk yet. Please press:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Save&lt;/b&gt; 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);&lt;/li&gt;&lt;li&gt;&lt;b&gt;Backup&lt;/b&gt; to create backup copies of the settings files in the old format before saving them in the new format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Cancel&lt;/b&gt; to not save the auto-converted settings files now.&lt;li&gt;&lt;/ul&gt;&lt;p&gt;Note that if you select &lt;b&gt;Cancel&lt;/b&gt;, the auto-converted settings files will be implicitly saved in the new format anyway once you change a setting or start a virtual machine, but &lt;b&gt;no&lt;/b&gt; backup copies will be created in this case.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Els següents fitxers de paràmetres del VirtualBox s&apos;han convertit automàticament al nou format &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Tot i així, els resultats de la conversió encara no s&apos;han alçat al disc. Premeu:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Alça&lt;/b&gt; per alçar ara els fitxers auto-convertits (ja no serà possible fer servir estos paràmetres amb una versió anterior del VirtualBox);&lt;/li&gt;&lt;li&gt;&lt;b&gt;Còpia de seguretat&lt;/b&gt; per crear una còpia de seguretat dels fitxers de paràmetres en el format antic abans d'alçar-los en el nou format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Cancel·la&lt;/b&gt; per no alçar ara els fitxers de paràmetres auto-convertits.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Tingueu en compte que si seleccioneu &lt;b&gt;Cancel·la&lt;/b&gt;, els fitxers de paràmetres auto-convertits s'alçaran implícitament en el nou format tot i que una vegada que canvieu algun paràmetre o inicieu una màquina virtual, en canvi en este cas  &lt;b&gt;no&lt;/b&gt; es faran còpies de seguretat.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Els següents fitxers de paràmetres del VirtualBox s&apos;han convertit automàticament al nou format &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Tot i així, els resultats de la conversió encara no s&apos;han alçat al disc. Premeu:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Alça&lt;/b&gt; per alçar ara els fitxers auto-convertits (ja no serà possible fer servir estos paràmetres amb una versió anterior del VirtualBox);&lt;/li&gt;&lt;li&gt;&lt;b&gt;Còpia de seguretat&lt;/b&gt; per crear una còpia de seguretat dels fitxers de paràmetres en el format antic abans d&apos;alçar-los en el nou format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Cancel·la&lt;/b&gt; per no alçar ara els fitxers de paràmetres auto-convertits.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Tingueu en compte que si seleccioneu &lt;b&gt;Cancel·la&lt;/b&gt;, els fitxers de paràmetres auto-convertits s&apos;alçaran implícitament en el nou format tot i que una vegada que canvieu algun paràmetre o inicieu una màquina virtual, en canvi en este cas  &lt;b&gt;no&lt;/b&gt; es faran còpies de seguretat.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Save</source>
@@ -5890,7 +5878,7 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source>&lt;p&gt;The following VirtualBox settings files have been automatically converted to the new settings file format version &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;However, the results of the conversion were not saved back to disk yet. Please press:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Backup&lt;/b&gt; to create backup copies of the settings files in the old format before saving them in the new format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Overwrite&lt;/b&gt; to save all auto-converted files without creating backup copies (it will not be possible to use these settings files with an older version of VirtualBox afterwards);&lt;/li&gt;%2&lt;/ul&gt;&lt;p&gt;It is recommended to always select &lt;b&gt;Backup&lt;/b&gt; because in this case it will be possible to go back to the previous version of VirtualBox (if necessary) without losing your current settings. See the VirtualBox Manual for more information about downgrading.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Els següents fitxers de paràmetres del VirtualBox s&apos;han convertit automàticament al nou format &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Tot i així, els resultats de la conversió encara no s&apos;han alçat al disc. Premeu:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Alça&lt;/b&gt; per alçar ara els fitxers auto-convertits (ja no serà possible fer servir estos paràmetres amb una versió anterior del VirtualBox);&lt;/li&gt;&lt;li&gt;&lt;b&gt;Còpia de seguretat&lt;/b&gt; per crear una còpia de seguretat dels fitxers de paràmetres en el format antic abans d'alçar-los en el nou format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Sobreescriu&lt;/b&gt; per alçar tots els fitxers auto-convertitts sense crear còpies de seguretat;&lt;/li&gt;%2&lt;/ul&gt;&lt;p&gt;Es recomana seleccionar en tot moment &lt;b&gt;Còpia de seguretat&lt;/b&gt; perquè sempre serà possible tornar a l&apos;estat anterior sense perdre els paràmetres de configuració actuals. Mireu el manual del VirtualBox per a més informació sobre desactualització.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Els següents fitxers de paràmetres del VirtualBox s&apos;han convertit automàticament al nou format &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Tot i així, els resultats de la conversió encara no s&apos;han alçat al disc. Premeu:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Alça&lt;/b&gt; per alçar ara els fitxers auto-convertits (ja no serà possible fer servir estos paràmetres amb una versió anterior del VirtualBox);&lt;/li&gt;&lt;li&gt;&lt;b&gt;Còpia de seguretat&lt;/b&gt; per crear una còpia de seguretat dels fitxers de paràmetres en el format antic abans d&apos;alçar-los en el nou format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Sobreescriu&lt;/b&gt; per alçar tots els fitxers auto-convertitts sense crear còpies de seguretat;&lt;/li&gt;%2&lt;/ul&gt;&lt;p&gt;Es recomana seleccionar en tot moment &lt;b&gt;Còpia de seguretat&lt;/b&gt; perquè sempre serà possible tornar a l&apos;estat anterior sense perdre els paràmetres de configuració actuals. Mireu el manual del VirtualBox per a més informació sobre desactualització.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;li&gt;&lt;b&gt;Exit&lt;/b&gt; to terminate VirtualBox without saving the results of the conversion to disk.&lt;/li&gt;</source>
@@ -6226,11 +6214,11 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Introduïu el nom complet fent servir caràcters llatins.</translation>
+        <translation type="obsolete">Introduïu el nom complet fent servir caràcters llatins.</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Introduïu una adreça de correu vàlida.</translation>
+        <translation type="obsolete">Introduïu una adreça de correu vàlida.</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -6246,15 +6234,15 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Diàleg de registre del VirtualBox</translation>
+        <translation type="obsolete">Diàleg de registre del VirtualBox</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Benvingut al formulari de registre del VirtualBox!</translation>
+        <translation type="obsolete">Benvingut al formulari de registre del VirtualBox!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>No s&apos;ha pogut dur a terme la conformitat de connexió.</translation>
+        <translation type="obsolete">No s&apos;ha pogut dur a terme la conformitat de connexió.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6270,63 +6258,63 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancel·la</translation>
+        <translation type="obsolete">Cancel·la</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Seleccioneu un país/territori</translation>
+        <translation type="obsolete">Seleccioneu un país/territori</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ompliu este formulari de registre per permetre&apos;ns conèixer que feu servir el VirtualBox i, opcionalment, mantindre-vos informat sobre novetats i actualitzacions del VirtualBox.&lt;/p&gt;&lt;p&gt;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 dades amb terceres parts. Més informació detallada sobre l&apos;ús de les vostres dades personals poden trobar-se a la secció de &lt;b&gt;Política de privacitat&lt;/b&gt; al manual de VirtualBox o al&lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; lloc web del VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Ompliu este formulari de registre per permetre&apos;ns conèixer que feu servir el VirtualBox i, opcionalment, mantindre-vos informat sobre novetats i actualitzacions del VirtualBox.&lt;/p&gt;&lt;p&gt;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 dades amb terceres parts. Més informació detallada sobre l&apos;ús de les vostres dades personals poden trobar-se a la secció de &lt;b&gt;Política de privacitat&lt;/b&gt; al manual de VirtualBox o al&lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; lloc web del VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Ja tinc un compte a &amp;Sun Online:</translation>
+        <translation type="obsolete">Ja tinc un compte a &amp;Sun Online:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>Corr&amp;eu:</translation>
+        <translation type="obsolete">Corr&amp;eu:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Contrasenya:</translation>
+        <translation type="obsolete">&amp;Contrasenya:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Vull &amp;registrar-me creant un nou compte a Sun Online:</translation>
+        <translation type="obsolete">Vull &amp;registrar-me creant un nou compte a Sun Online:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Nom:</translation>
+        <translation type="obsolete">&amp;Nom:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Cognoms:</translation>
+        <translation type="obsolete">&amp;Cognoms:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>C&amp;ompanyia:</translation>
+        <translation type="obsolete">C&amp;ompanyia:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;País:</translation>
+        <translation type="obsolete">&amp;País:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>Corre&amp;u:</translation>
+        <translation type="obsolete">Corre&amp;u:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>Con&amp;trasenya:</translation>
+        <translation type="obsolete">Con&amp;trasenya:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Confirmeu la contrasen&amp;ya:</translation>
+        <translation type="obsolete">Confirmeu la contrasen&amp;ya:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registra</translation>
+        <translation type="obsolete">&amp;Registra</translation>
     </message>
 </context>
 <context>
@@ -6672,7 +6660,7 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     <name>VBoxSettingsDialog</name>
     <message>
         <source>&lt;i&gt;Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information&lt;/i&gt;.</source>
-        <translation>&lt;i&gt;Seleccioneu una categoria de paràmetres en la llista de l&apos;esquerra i deplaceu el ratolí sobre un element de la dreta per obtindre'n més informació&lt;i&gt;.</translation>
+        <translation>&lt;i&gt;Seleccioneu una categoria de paràmetres en la llista de l&apos;esquerra i deplaceu el ratolí sobre un element de la dreta per obtindre&apos;n més informació&lt;i&gt;.</translation>
     </message>
     <message>
         <source>On the &lt;b&gt;%1&lt;/b&gt; page, %2</source>
@@ -7021,32 +7009,24 @@ per accedir a ella des d&apos;un sistema Linux. Esta característica requereix G
         <source> (%n day(s) ago)</source>
         <translation type="obsolete">
             <numerusform> (fa %n dia)</numerusform>
-            <numerusform> (fa %n dies)</numerusform>
-            <numerusform> (fa %n dies)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source> (%n hour(s) ago)</source>
         <translation type="obsolete">
             <numerusform> (fa %n hora)</numerusform>
-            <numerusform> (fa %n hores)</numerusform>
-            <numerusform> (fa %n hores)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source> (%n minute(s) ago)</source>
         <translation type="obsolete">
             <numerusform> (fa %n minut)</numerusform>
-            <numerusform> (fa %n minuts)</numerusform>
-            <numerusform> (fa %n minuts)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source> (%n second(s) ago)</source>
         <translation type="obsolete">
             <numerusform> (fa %n segon)</numerusform>
-            <numerusform> (fa %n segons)</numerusform>
-            <numerusform> (fa %n segons)</numerusform>
         </translation>
     </message>
     <message>
@@ -7119,8 +7099,6 @@ per accedir a ella des d&apos;un sistema Linux. Esta característica requereix G
         <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>
             <numerusform>Avís: esteu fent una captura d&apos;una màquina que té %n imatge immutable connectada. Mentre treballeu amb esta captura, la imatge immutable no es reiniciarà per evitar la pèrdua de dades.</numerusform>
-            <numerusform>Avís: esteu fent una captura d&apos;una màquina que té %n imatge immutables connectades. Mentre treballeu amb esta captura, les imatges immutables no es reiniciaran per evitar la pèrdua de dades.</numerusform>
-            <numerusform>Avís: esteu fent una captura d&apos;una màquina que té %n imatge immutables connectades. Mentre treballeu amb esta captura, les imatges immutables no es reiniciaran per evitar la pèrdua de dades.</numerusform>
         </translation>
     </message>
 </context>
@@ -8140,7 +8118,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Controls the audio output driver. The &lt;b&gt;Null Audio Driver&lt;/b&gt; makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation>Gestiona el controlador d'eixida de so. El &lt;b&gt;controlador d&apos;àudio Nul&lt;/b&gt; fa que el client veja una tarjeta de so, però l&apos;accés a ella s&apos;ignorarà.</translation>
+        <translation>Gestiona el controlador d&apos;eixida de so. El &lt;b&gt;controlador d&apos;àudio Nul&lt;/b&gt; fa que el client veja una tarjeta de so, però l&apos;accés a ella s&apos;ignorarà.</translation>
     </message>
     <message>
         <source>Audio &amp;Controller:</source>
@@ -8506,7 +8484,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <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">Mostra la ruta on les captures d&apos;esta màquina virtual s'alçaran. Tingueu en compte que les captures poden ocupar prou quantitat d&apos;espai al disc dur.</translation>
+        <translation type="obsolete">Mostra la ruta on les captures d&apos;esta màquina virtual s&apos;alçaran. Tingueu en compte que les captures poden ocupar prou quantitat d&apos;espai al disc dur.</translation>
     </message>
     <message>
         <source>Displays the virtual hard disk to attach to this IDE slot and allows to quickly select a different hard disk.</source>
@@ -8602,7 +8580,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>If checked, any change to mounted CD/DVD or Floppy media performed during machine execution will be saved in the settings file in order to preserve the configuration of mounted media between runs.</source>
-        <translation type="obsolete">Si està marcat, qualsevol canvi al CD/DVD o disquet muntat s'alçarà al fitxer de configuració per tal de preservar la configuració dels suports muntats entre cada execució de la màquina virtual.</translation>
+        <translation type="obsolete">Si està marcat, qualsevol canvi al CD/DVD o disquet muntat s&apos;alçarà al fitxer de configuració per tal de preservar la configuració dels suports muntats entre cada execució de la màquina virtual.</translation>
     </message>
     <message>
         <source>&amp;Image File</source>
@@ -8786,7 +8764,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;qt&gt;Controls the audio output driver. The &lt;b&gt;Null Audio Driver&lt;/b&gt;
 makes the guest see an audio card, however every access to it will be ignored.&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Gestiona el controlador d'eixida de so. El &lt;b&gt;controlador d&apos;àudio Nul&lt;/b&gt;
+        <translation type="obsolete">&lt;qt&gt;Gestiona el controlador d&apos;eixida de so. El &lt;b&gt;controlador d&apos;àudio Nul&lt;/b&gt;
 fa que el client veja una tarjeta de so, però l&apos;accés a ella s&apos;ignorarà.&lt;/qt&gt;</translation>
     </message>
     <message>
@@ -9313,7 +9291,7 @@ al sistema amfitrió.&lt;/qt&gt;</translation>
     </message>
     <message>
         <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>Mostra la ruta on les captures d&apos;esta màquina virtual s'alçaran. Tingueu en compte que les captures poden ocupar prou quantitat d&apos;espai al disc dur.</translation>
+        <translation>Mostra la ruta on les captures d&apos;esta màquina virtual s&apos;alçaran. Tingueu en compte que les captures poden ocupar prou quantitat d&apos;espai al disc dur.</translation>
     </message>
     <message>
         <source>&amp;Basic</source>
@@ -9477,7 +9455,7 @@ al sistema amfitrió.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>If checked, any change to mounted CD/DVD or Floppy media performed during machine execution will be saved in the settings file in order to preserve the configuration of mounted media between runs.</source>
-        <translation>Si està marcat, qualsevol canvi al CD/DVD o disquet muntat s'alçarà al fitxer de configuració per tal de preservar la configuració dels suports muntats entre cada execució de la màquina virtual.</translation>
+        <translation>Si està marcat, qualsevol canvi al CD/DVD o disquet muntat s&apos;alçarà al fitxer de configuració per tal de preservar la configuració dels suports muntats entre cada execució de la màquina virtual.</translation>
     </message>
     <message>
         <source>&amp;Remember Mounted Media</source>
@@ -9529,7 +9507,7 @@ al sistema amfitrió.&lt;/qt&gt;</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>Si està marcat, mostra una barra d&apos;eines petita a la part de dalt de la pantalla en lloc d'a la posició per defecte a la part de sota.</translation>
+        <translation>Si està marcat, mostra una barra d&apos;eines petita a la part de dalt de la pantalla en lloc d&apos;a la posició per defecte a la part de sota.</translation>
     </message>
     <message>
         <source>Show At &amp;Top Of Screen</source>
@@ -9600,7 +9578,7 @@ al sistema amfitrió.&lt;/qt&gt;</translation>
     </message>
     <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>Si està marcat, mostrarà de forma diferenciada els discos durs connectats a les ranures en lloc d'als discos durs base (mostrat en cas d&apos;adjuncions indirectes), a més permetrà connectar altres discos durs explícitament. Marqueu això només si necessiteu una configuració complexa del disc dur.</translation>
+        <translation>Si està marcat, mostrarà de forma diferenciada els discos durs connectats a les ranures en lloc d&apos;als discos durs base (mostrat en cas d&apos;adjuncions indirectes), a més permetrà connectar altres discos durs explícitament. Marqueu això només si necessiteu una configuració complexa del disc dur.</translation>
     </message>
     <message>
         <source>&amp;Show Differencing Hard Disks</source>
@@ -10513,7 +10491,7 @@ al sistema amfitrió.&lt;/qt&gt;</translation>
         <translation>&amp;Processador(s):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Controla el nombre de CPUs virtuals a la màquina virtual.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
index 3ce076e1b..066452431 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Radek Vybiral, Jan Kalab &lt;pitel@nomi.cz&gt;, Jan Lipovsky, Ondrej Karlik</translation>
+        <translation type="obsolete">Radek Vybiral, Jan Kalab &lt;pitel@nomi.cz&gt;, Jan Lipovsky, Ondrej Karlik</translation>
     </message>
 </context>
 <context>
@@ -1994,7 +1994,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zobrazit &amp;ikonu v oznamovací oblasti</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;Automaticky zobrazit ikonu a nástrojovou lištu v celoobrazovkovém režimu</translation>
     </message>
 </context>
@@ -5898,7 +5898,7 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.&lt;/p&g
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Registra�ní dialog VirtualBoxu</translation>
+        <translation type="obsolete">Registra�ní dialog VirtualBoxu</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5910,11 +5910,11 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.&lt;/p&g
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Vložte vaše celé jméno v latinské abecedě.</translation>
+        <translation type="obsolete">Vložte vaše celé jméno v latinské abecedě.</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Vložte vaši platnou e-mailovou adresu.</translation>
+        <translation type="obsolete">Vložte vaši platnou e-mailovou adresu.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -5926,7 +5926,7 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.&lt;/p&g
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Vítejte ve formuláři registrace VirtualBoxu!</translation>
+        <translation type="obsolete">Vítejte ve formuláři registrace VirtualBoxu!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -5942,7 +5942,7 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.&lt;/p&g
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Nelze provést prvotní spojení.</translation>
+        <translation type="obsolete">Nelze provést prvotní spojení.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5958,63 +5958,63 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.&lt;/p&g
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Zrušit</translation>
+        <translation type="obsolete">Zrušit</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Vyberte zemi/teritorium</translation>
+        <translation type="obsolete">Vyberte zemi/teritorium</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Detailní informace o tom, jak používáme vaše osobní data můlžete nalézt v sekci &lt;b&gt;Privacy Policy&lt;/b&gt; manuálu VirtualBoxu, nebo na webové stránce &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; VirtualBoxu.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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. Detailní informace o tom, jak používáme vaše osobní data můlžete nalézt v sekci &lt;b&gt;Privacy Policy&lt;/b&gt; manuálu VirtualBoxu, nebo na webové stránce &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; VirtualBoxu.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Již &amp;mám ú�et na Sun Online:</translation>
+        <translation type="obsolete">Již &amp;mám ú�et na Sun Online:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Heslo:</translation>
+        <translation type="obsolete">&amp;Heslo:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Chci se re&amp;gistrovat a vytvořit nový ú�et na Sun Online:</translation>
+        <translation type="obsolete">Chci se re&amp;gistrovat a vytvořit nový ú�et na Sun Online:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Křestní jméno:</translation>
+        <translation type="obsolete">&amp;Křestní jméno:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>Pří&amp;jmení:</translation>
+        <translation type="obsolete">Pří&amp;jmení:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Firma:</translation>
+        <translation type="obsolete">&amp;Firma:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;ZemÄ›:</translation>
+        <translation type="obsolete">&amp;ZemÄ›:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>H&amp;eslo:</translation>
+        <translation type="obsolete">H&amp;eslo:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Po&amp;tvrdit heslo:</translation>
+        <translation type="obsolete">Po&amp;tvrdit heslo:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registrovat</translation>
+        <translation type="obsolete">&amp;Registrovat</translation>
     </message>
 </context>
 <context>
@@ -9696,7 +9696,7 @@ ukáže hostovanému OS zvukovou kartu, ale každý přístup bude ignorován.&l
         <translation>Pro&amp;cessor(y):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Nastavení po�tu virtuálních CPU pro tento virtuální po�íta�.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
index 6735fa8cf..04770d3c7 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Lars Sarauw Hansen, Jeppe Fihl Toustrup</translation>
+        <translation type="obsolete">Lars Sarauw Hansen, Jeppe Fihl Toustrup</translation>
     </message>
 </context>
 <context>
@@ -1379,7 +1379,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Dock-ikon viser indhold af VM</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;Automatisk visning af Dok &amp;&amp; Menubjælke i fuldskærm</translation>
     </message>
 </context>
@@ -4469,83 +4469,83 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Registrering af VirtualBox</translation>
+        <translation type="obsolete">Registrering af VirtualBox</translation>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Indtast dit navn.</translation>
+        <translation type="obsolete">Indtast dit navn.</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Indtast din email-adresse.</translation>
+        <translation type="obsolete">Indtast din email-adresse.</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Velkommen til Registrering af VirtualBox!</translation>
+        <translation type="obsolete">Velkommen til Registrering af VirtualBox!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Kunne ikke udføre forhandling af forbindelse.</translation>
+        <translation type="obsolete">Kunne ikke udføre forhandling af forbindelse.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annullér</translation>
+        <translation type="obsolete">Annullér</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Vælg land/område</translation>
+        <translation type="obsolete">Vælg land/område</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 tredjepart. Detaljeret information om hvad vi bruger dine personlige data til, kan findes i afsnittet &lt;b&gt;Privacy Policy&lt;/b&gt; i VirtualBox&apos; manual eller under &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; på VirtualBox&apos; hjemmeside.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 tredjepart. Detaljeret information om hvad vi bruger dine personlige data til, kan findes i afsnittet &lt;b&gt;Privacy Policy&lt;/b&gt; i VirtualBox&apos; manual eller under &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; på VirtualBox&apos; hjemmeside.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Jeg &amp;har allerede en Sun Online konto:</translation>
+        <translation type="obsolete">Jeg &amp;har allerede en Sun Online konto:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>Kodeord:</translation>
+        <translation type="obsolete">Kodeord:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Jeg vil gerne oprette en Sun Online konto:</translation>
+        <translation type="obsolete">Jeg vil gerne oprette en Sun Online konto:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Fornavn:</translation>
+        <translation type="obsolete">&amp;Fornavn:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>Efternavn:</translation>
+        <translation type="obsolete">Efternavn:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>Firma:</translation>
+        <translation type="obsolete">Firma:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>Land:</translation>
+        <translation type="obsolete">Land:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>Kodeord:</translation>
+        <translation type="obsolete">Kodeord:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Ge&amp;ntag kodeord:</translation>
+        <translation type="obsolete">Ge&amp;ntag kodeord:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registrér</translation>
+        <translation type="obsolete">&amp;Registrér</translation>
     </message>
 </context>
 <context>
@@ -6655,7 +6655,7 @@ p, li { white-space: pre-wrap; }
         <translation>C&amp;PU&apos;er:</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Angiver antallet af virtuelle CPU&apos;er i den virtuelle maskine.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
index a4a5c337e..59a40ace4 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Sun Microsystems, Inc.</translation>
+        <translation type="obsolete">Sun Microsystems, Inc.</translation>
     </message>
 </context>
 <context>
@@ -1196,8 +1196,8 @@ p, li { white-space: pre-wrap; }
         <translation>Echtzeit-Vorschau im &amp;Dock-Icon</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
-        <translation>&amp;Automatisch zeige Dock &amp;&amp; Menubar im Fullscreen-Modus</translation>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
+        <translation>&amp;Automatische Anzeige von Dock und Menübar im Vollbildmodus</translation>
     </message>
 </context>
 <context>
@@ -2902,7 +2902,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation>Vollbild / seamless-Modus verlassen</translation>
+        <translation>Vollbild-/Seamless-Modus verlassen</translation>
     </message>
     <message>
         <source>Close VM</source>
@@ -4069,83 +4069,83 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBox registrieren</translation>
+        <translation type="obsolete">VirtualBox registrieren</translation>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Geben Sie hier Ihren vollen Namen in lateinischen Buchstaben ein.</translation>
+        <translation type="obsolete">Geben Sie hier Ihren vollen Namen in lateinischen Buchstaben ein.</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Tragen Sie hier eine gültige EMail-Adresse ein.</translation>
+        <translation type="obsolete">Tragen Sie hier eine gültige EMail-Adresse ein.</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>VirtualBox registrieren</translation>
+        <translation type="obsolete">VirtualBox registrieren</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Der Server lieferte nicht die erwarteten Daten als Antwort.</translation>
+        <translation type="obsolete">Der Server lieferte nicht die erwarteten Daten als Antwort.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Bitte füllen Sie dieses Formular aus, damit wir wissen, dass Sie VirtualBox benutzen. Außerdem möchten wir Sie gern über Updates sowie über Neuigkeiten rund um VirtualBox informieren.&lt;p&gt;&lt;p&gt;Bitte benutzen Sie möglichst lateinische Buchstaben. Sun Microsystems wird diese Daten nur benutzen, um Nutzerstatistiken von VirtualBox zu erstellen und um Ihnen optional Informationen zu VirtualBox zu senden. Insbesondere wird Sun Microsystems Ihre persönlichen Daten niemals an Dritte weitergeben. Detaillierte Informationen über die Nutzung Ihrer persönlichen Daten können Sie im Abschnitt &lt;b&gt;Privacy Policy&lt;/b&gt; des Handbuchs oder unter &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; auf der VirtualBox-Webseite nachlesen.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Bitte füllen Sie dieses Formular aus, damit wir wissen, dass Sie VirtualBox benutzen. Außerdem möchten wir Sie gern über Updates sowie über Neuigkeiten rund um VirtualBox informieren.&lt;p&gt;&lt;p&gt;Bitte benutzen Sie möglichst lateinische Buchstaben. Sun Microsystems wird diese Daten nur benutzen, um Nutzerstatistiken von VirtualBox zu erstellen und um Ihnen optional Informationen zu VirtualBox zu senden. Insbesondere wird Sun Microsystems Ihre persönlichen Daten niemals an Dritte weitergeben. Detaillierte Informationen über die Nutzung Ihrer persönlichen Daten können Sie im Abschnitt &lt;b&gt;Privacy Policy&lt;/b&gt; des Handbuchs oder unter &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; auf der VirtualBox-Webseite nachlesen.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Ich &amp;besitze bereits einen Sun-Online-Account:</translation>
+        <translation type="obsolete">Ich &amp;besitze bereits einen Sun-Online-Account:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Passwort:</translation>
+        <translation type="obsolete">&amp;Passwort:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Ich &amp;möchte einen neuen Sun-Account für die Registrierung erzeugen:</translation>
+        <translation type="obsolete">Ich &amp;möchte einen neuen Sun-Account für die Registrierung erzeugen:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Vorname:</translation>
+        <translation type="obsolete">&amp;Vorname:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Nachname:</translation>
+        <translation type="obsolete">&amp;Nachname:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Firma:</translation>
+        <translation type="obsolete">&amp;Firma:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;Land:</translation>
+        <translation type="obsolete">&amp;Land:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>P&amp;asswort:</translation>
+        <translation type="obsolete">P&amp;asswort:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Pa&amp;sswort bestätigen:</translation>
+        <translation type="obsolete">Pa&amp;sswort bestätigen:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registrieren</translation>
+        <translation type="obsolete">&amp;Registrieren</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Wählen Sie das Land/Gebiet</translation>
+        <translation type="obsolete">Wählen Sie das Land/Gebiet</translation>
     </message>
 </context>
 <context>
@@ -5142,7 +5142,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Storage</source>
-        <translation>Plattenspeicher</translation>
+        <translation>Massenspeicher</translation>
     </message>
     <message>
         <source>Hard Disks</source>
@@ -5198,7 +5198,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>you have selected a 64-bit guest OS type for this VM. As such guests require hardware virtualization (VT-x/AMD-V), this feature will be enabled automatically.</source>
-        <translation>haben Sie ein 64-Bit-Gastbestriebssystem ausgewählt. Da solche Gäste Hardwarevirtualisierung benötigen (VT-x/AMD-V), wird diese VM-Einstellung automatisch aktiviert.</translation>
+        <translation>haben Sie ein 64-Bit-Gastbestriebssystem ausgewählt. Da solche Gäste Hardware-Virtualisierung benötigen (VT-x/AMD-V), wird diese VM-Einstellung automatisch aktiviert.</translation>
     </message>
     <message>
         <source>you have selected a 64-bit guest OS type for this VM. VirtualBox does not currently support more than one virtual CPU for 64-bit guests executed on 32-bit hosts.</source>
@@ -5277,7 +5277,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Show In &amp;Fullscreen/Seamless</source>
-        <translation>Zeige im &amp;Fullscreen/Seamless-Modus</translation>
+        <translation>Zeige im &amp;Vollbild-/Seamless-Modus</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>
@@ -5923,8 +5923,8 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Prozessoren:</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
-        <translation>Legt die Anzahld er virtuellen CPUs dieser VM fest.</translation>
+        <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>Legt die Anzahld der virtuellen CPUs dieser VM fest. Der Host muss Hardware-Virtualisierung unterstützen, falls mehr als eine virtuelle CPU emuliert werden soll.</translation>
     </message>
     <message>
         <source>When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine.</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts
index caaecccfb..793cbf5ec 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation type="unfinished">Spiros Vlachos</translation>
+        <translation type="obsolete">Spiros Vlachos</translation>
     </message>
 </context>
 <context>
@@ -1190,7 +1190,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4002,89 +4002,6 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>VBoxRegistrationDlg</name>
-    <message>
-        <source>VirtualBox Registration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your full name using Latin characters.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not perform connection handshake.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>VBoxSFDialog</name>
     <message>
         <source>Shared Folders</source>
@@ -5831,7 +5748,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts
index 72556caac..6ec91d257 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts
@@ -4,7 +4,7 @@
 <context>
     <name>VBoxGlobal</name>
     <message numerus="yes">
-        <location filename="../include/VBoxGlobal.h" line="350"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="362"/>
         <source>%n year(s)</source>
         <translation>
             <numerusform>%n year</numerusform>
@@ -12,7 +12,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../include/VBoxGlobal.h" line="355"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="367"/>
         <source>%n month(s)</source>
         <translation>
             <numerusform>%n month</numerusform>
@@ -20,7 +20,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../include/VBoxGlobal.h" line="360"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="372"/>
         <source>%n day(s)</source>
         <translation>
             <numerusform>%n day</numerusform>
@@ -28,7 +28,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../include/VBoxGlobal.h" line="365"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="377"/>
         <source>%n hour(s)</source>
         <translation>
             <numerusform>%n hour</numerusform>
@@ -36,7 +36,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../include/VBoxGlobal.h" line="375"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="387"/>
         <source>%n second(s)</source>
         <translation>
             <numerusform>%n second</numerusform>
@@ -44,7 +44,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../include/VBoxGlobal.h" line="370"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="382"/>
         <source>%n minute(s)</source>
         <translation>
             <numerusform>%n minute</numerusform>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
index 9ddb05ff3..cc1a6f001 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Joaquin Duo, David González</translation>
+        <translation type="obsolete">Joaquin Duo, David González</translation>
     </message>
 </context>
 <context>
@@ -2150,7 +2150,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Mostrar icono en el área de notificación</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;Automostrar Dock &amp;&amp; Barra de menú a pantalla completa</translation>
     </message>
 </context>
@@ -6364,7 +6364,7 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Diálogo de Registro de VirtualBox</translation>
+        <translation type="obsolete">Diálogo de Registro de VirtualBox</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6376,7 +6376,7 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Ingrese su nombre completo usando caracteres latinos.</translation>
+        <translation type="obsolete">Ingrese su nombre completo usando caracteres latinos.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -6384,7 +6384,7 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Ingrese su dirección de e-mail válida.</translation>
+        <translation type="obsolete">Ingrese su dirección de e-mail válida.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -6396,7 +6396,7 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>¡Bienvenido al Formularion de Registro de VirtualBox!</translation>
+        <translation type="obsolete">¡Bienvenido al Formularion de Registro de VirtualBox!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -6412,7 +6412,7 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>No se pudo llevar a cabo la negociación de conexión.</translation>
+        <translation type="obsolete">No se pudo llevar a cabo la negociación de conexión.</translation>
     </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>
@@ -6420,63 +6420,63 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Seleccionar país/territorio</translation>
+        <translation type="obsolete">Seleccionar país/territorio</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Por favor, rellene este formulario para informarnos que usa VirtualBox. Opcionalmente puede elegir recibir noticias y actualizaciones.&lt;/p&gt;&lt;p&gt; Use caracteres latinos para rellenar los siguientes campos. Sun Microsystems sólo usará esta información para recolectar estadísticas de uso y para enviarle boletines de noticias. En particular, Sun Microsystems nunca proporcionará sus datos a terceros. Puede leer información más detalla de cómo usamos su información en la sección &lt;p&gt;Privacy Policy&lt;/p&gt; del manual de VirtualBox o en la página web &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; del sitio de VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Por favor, rellene este formulario para informarnos que usa VirtualBox. Opcionalmente puede elegir recibir noticias y actualizaciones.&lt;/p&gt;&lt;p&gt; Use caracteres latinos para rellenar los siguientes campos. Sun Microsystems sólo usará esta información para recolectar estadísticas de uso y para enviarle boletines de noticias. En particular, Sun Microsystems nunca proporcionará sus datos a terceros. Puede leer información más detalla de cómo usamos su información en la sección &lt;p&gt;Privacy Policy&lt;/p&gt; del manual de VirtualBox o en la página web &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; del sitio de VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Ya &amp;tengo una cuenta en linea de Sun:</translation>
+        <translation type="obsolete">Ya &amp;tengo una cuenta en linea de Sun:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>Correo-&amp;e:</translation>
+        <translation type="obsolete">Correo-&amp;e:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Contraseña:</translation>
+        <translation type="obsolete">&amp;Contraseña:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>&amp;Registrar creando una cuenta en linea de Sun:</translation>
+        <translation type="obsolete">&amp;Registrar creando una cuenta en linea de Sun:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Nombre:</translation>
+        <translation type="obsolete">&amp;Nombre:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Apellido(s):</translation>
+        <translation type="obsolete">&amp;Apellido(s):</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>Compa&amp;ñía:</translation>
+        <translation type="obsolete">Compa&amp;ñía:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;País:</translation>
+        <translation type="obsolete">&amp;País:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>Correo-&amp;e:</translation>
+        <translation type="obsolete">Correo-&amp;e:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>&amp;Contraseña:</translation>
+        <translation type="obsolete">&amp;Contraseña:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Co&amp;nfirmar contraseña:</translation>
+        <translation type="obsolete">Co&amp;nfirmar contraseña:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registrar</translation>
+        <translation type="obsolete">&amp;Registrar</translation>
     </message>
 </context>
 <context>
@@ -10499,7 +10499,7 @@ makes the guest see an audio card, however every access to it will be ignored.&l
         <translation>&amp;Procesador(es):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Controla el número de procesadores virtuales en la máquina virtual.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
index 271a17cf5..af8dd6a54 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Piarres Beobide</translation>
+        <translation type="obsolete">Piarres Beobide</translation>
     </message>
 </context>
 <context>
@@ -1881,7 +1881,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3132,7 +3132,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;nobr&gt;%4 MB&lt;/nobr&gt; {1 ?}</translation>
     </message>
     <message>
         <source>Processor(s)</source>
@@ -5615,88 +5615,12 @@ gogorrak erantsi ditzakezu.&lt;/p&gt;</translation>
 <context>
     <name>VBoxRegistrationDlg</name>
     <message>
-        <source>VirtualBox Registration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your full name using Latin characters.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connection timed out.</source>
         <translation type="obsolete">Konexioa denboraz kanpo.</translation>
     </message>
     <message>
-        <source>Could not perform connection handshake.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
-        <translation type="unfinished">Utzi</translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Utzi</translation>
     </message>
 </context>
 <context>
@@ -9213,7 +9137,7 @@ bezeroak audio txartela ikustea eragiten du baina sortzen duen edozein irteera b
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
index 043edcd32..c46218eaa 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Jarno Kiuttu, Timo Jyrinki, Ilkka Tuohela</translation>
+        <translation type="obsolete">Jarno Kiuttu, Timo Jyrinki, Ilkka Tuohela</translation>
     </message>
 </context>
 <context>
@@ -1868,7 +1868,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Näytä ilmoitusalueen kuvake</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3187,7 +3187,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;nobr&gt;%4 MB&lt;/nobr&gt; {1 ?}</translation>
     </message>
     <message>
         <source>Processor(s)</source>
@@ -5566,7 +5566,7 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.&lt;/p&g
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBoxin rekisteröinti</translation>
+        <translation type="obsolete">VirtualBoxin rekisteröinti</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -5574,7 +5574,7 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.&lt;/p&g
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Syötä nimesi ASCII-merkkejä käyttäen.</translation>
+        <translation type="obsolete">Syötä nimesi ASCII-merkkejä käyttäen.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -5582,7 +5582,7 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.&lt;/p&g
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Syötä kelvollinen sähköpostiosoite.</translation>
+        <translation type="obsolete">Syötä kelvollinen sähköpostiosoite.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -5590,11 +5590,11 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.&lt;/p&g
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Tervetuloa VirtualBoxin rekisteröintiin!</translation>
+        <translation type="obsolete">Tervetuloa VirtualBoxin rekisteröintiin!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Yhteyden kättely ei onnistunut.</translation>
+        <translation type="obsolete">Yhteyden kättely ei onnistunut.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5610,63 +5610,7 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.&lt;/p&g
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Peru</translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Peru</translation>
     </message>
 </context>
 <context>
@@ -9203,7 +9147,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
index 823997456..5b2f83e61 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Jean-Jacques Sarton, Sun Microsystems, Inc.</translation>
+        <translation type="obsolete">Jean-Jacques Sarton, Sun Microsystems, Inc.</translation>
     </message>
 </context>
 <context>
@@ -1817,8 +1817,8 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Icône Dock aperçu temps réel</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
+        <translation>Démasquer &amp;automatiquement le Dock et la barre des menu en mode plein écran</translation>
     </message>
 </context>
 <context>
@@ -3441,7 +3441,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>(CD/DVD)</source>
-        <translation type="unfinished"></translation>
+        <translation>(périphérique optique)</translation>
     </message>
 </context>
 <context>
@@ -5450,7 +5450,7 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Boîte de dialogue d&apos;inscription VirtualBox</translation>
+        <translation type="obsolete">Boîte de dialogue d&apos;inscription VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -5458,7 +5458,7 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Entrez votre nom complet en utilisant seulement les caractères latins.</translation>
+        <translation type="obsolete">Entrez votre nom complet en utilisant seulement les caractères latins.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -5466,7 +5466,7 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Entrez votre adresse courriel. Prière dEntrez votre adresse courriel.apos;utiliser une adresse valide.</translation>
+        <translation type="obsolete">Entrez votre adresse courriel. Prière dEntrez votre adresse courriel.apos;utiliser une adresse valide.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -5474,7 +5474,7 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Bienvenue sur le formulaire d&apos;inscription VirtualBox !</translation>
+        <translation type="obsolete">Bienvenue sur le formulaire d&apos;inscription VirtualBox !</translation>
     </message>
     <message>
         <source>Connection timed out.</source>
@@ -5486,7 +5486,7 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>La négociation de la connexion a échoué.</translation>
+        <translation type="obsolete">La négociation de la connexion a échoué.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5502,63 +5502,63 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="obsolete">Annuler</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Choisissez votre pays/territoire</translation>
+        <translation type="obsolete">Choisissez votre pays/territoire</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Veuillez remplir ce formulaire d&apos;enregistrement pour nous dire que vous utilisez VirtualBox et, si vous le souhaitez, pour que nous vous gardions au courrent sur les nouveautés et les actualisations de VirtualBox.&lt;/p&gt;&lt;p&gt;Veuillez utiliser seulement les caractères latins pour remplir les champs ci-dessous. Nous soulignons que Sun Microsystems n&apos;utilisera les informations que pour collectioner des statistiques d&apos;utilisation sur le produit et pour vous envoyer les circulaires informatifs sur VirtualBox. En particulier, Sun Microsystems ne transmettra jamais vos données à de tiers partis. Vous trouverez des informations détaillés sur l&apos;usage que nous font de vos données personnels dans le section &lt;b&gt;Politique de confidentialité&lt;/b&gt; du manuel d&apos;utilisation VirtualBox ou sur la page &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; du site toile VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Veuillez remplir ce formulaire d&apos;enregistrement pour nous dire que vous utilisez VirtualBox et, si vous le souhaitez, pour que nous vous gardions au courrent sur les nouveautés et les actualisations de VirtualBox.&lt;/p&gt;&lt;p&gt;Veuillez utiliser seulement les caractères latins pour remplir les champs ci-dessous. Nous soulignons que Sun Microsystems n&apos;utilisera les informations que pour collectioner des statistiques d&apos;utilisation sur le produit et pour vous envoyer les circulaires informatifs sur VirtualBox. En particulier, Sun Microsystems ne transmettra jamais vos données à de tiers partis. Vous trouverez des informations détaillés sur l&apos;usage que nous font de vos données personnels dans le section &lt;b&gt;Politique de confidentialité&lt;/b&gt; du manuel d&apos;utilisation VirtualBox ou sur la page &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; du site toile VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>J&apos;ai &amp;déjà un compte Sun Online :</translation>
+        <translation type="obsolete">J&apos;ai &amp;déjà un compte Sun Online :</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>Courri&amp;el :</translation>
+        <translation type="obsolete">Courri&amp;el :</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>Mot de &amp;passe :</translation>
+        <translation type="obsolete">Mot de &amp;passe :</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>J&apos;aimerais m&apos;en&amp;register et créer un nouveau compte Sun Online :</translation>
+        <translation type="obsolete">J&apos;aimerais m&apos;en&amp;register et créer un nouveau compte Sun Online :</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Prénom :</translation>
+        <translation type="obsolete">&amp;Prénom :</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Nom :</translation>
+        <translation type="obsolete">&amp;Nom :</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Société :</translation>
+        <translation type="obsolete">&amp;Société :</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>Pa&amp;ys :</translation>
+        <translation type="obsolete">Pa&amp;ys :</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>Co&amp;urriel :</translation>
+        <translation type="obsolete">Co&amp;urriel :</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>Mot de p&amp;asse :</translation>
+        <translation type="obsolete">Mot de p&amp;asse :</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Co&amp;nfirmation du mot de passe :</translation>
+        <translation type="obsolete">Co&amp;nfirmation du mot de passe :</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>En&amp;registrer</translation>
+        <translation type="obsolete">En&amp;registrer</translation>
     </message>
 </context>
 <context>
@@ -8244,7 +8244,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Processeur(s):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Détermine le nombre de processeurs virtuels de la machine virtuelle.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
index 8fbf6b1ce..a49123dc4 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Oficina de Software Libre da USC, Enrique Estévez Fernández, Francisco Diéguez Souto, Mancomun, Antón Méixome.</translation>
+        <translation type="obsolete">Oficina de Software Libre da USC, Enrique Estévez Fernández, Francisco Diéguez Souto, Mancomun, Antón Méixome.</translation>
     </message>
 </context>
 <context>
@@ -1372,7 +1372,7 @@ p, li { white-space: pre-wrap; }
         <translation>Previsualización en tempo real &amp;da icona ancorada</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4403,83 +4403,83 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Diálogo de rexistro de VirtualBox</translation>
+        <translation type="obsolete">Diálogo de rexistro de VirtualBox</translation>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Insira o seu nome completo empregando caracteres latinos.</translation>
+        <translation type="obsolete">Insira o seu nome completo empregando caracteres latinos.</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Insira o seu enderezo de correo electrónico válido.</translation>
+        <translation type="obsolete">Insira o seu enderezo de correo electrónico válido.</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Benvida ao formulario de rexistro de VirtualBox!</translation>
+        <translation type="obsolete">Benvida ao formulario de rexistro de VirtualBox!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Non foi posíbel realizar a negociación da conexión.</translation>
+        <translation type="obsolete">Non foi posíbel realizar a negociación da conexión.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Seleccione país/territorio</translation>
+        <translation type="obsolete">Seleccione país/territorio</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Cubra este formulario de rexistro para permitirnos saber que emprega VirtualBox e, opcionalmente, telo informado sobre as novas e actualizacións de VirtualBox.&lt;/p&gt;&lt;p&gt;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 terceiros. Información detallada sobre como empregamos os seus datos persoais encóntrase na sección &lt;b&gt;Política de privacidade&lt;/b&gt; do manual de VirtualBox ou no sitio web de VirtualBox na páxina &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt;.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Cubra este formulario de rexistro para permitirnos saber que emprega VirtualBox e, opcionalmente, telo informado sobre as novas e actualizacións de VirtualBox.&lt;/p&gt;&lt;p&gt;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 terceiros. Información detallada sobre como empregamos os seus datos persoais encóntrase na sección &lt;b&gt;Política de privacidade&lt;/b&gt; do manual de VirtualBox ou no sitio web de VirtualBox na páxina &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Xa teño un&amp;ha conta en liña de Sun:</translation>
+        <translation type="obsolete">Xa teño un&amp;ha conta en liña de Sun:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>Correo &amp;electrónico:</translation>
+        <translation type="obsolete">Correo &amp;electrónico:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Contrasinal:</translation>
+        <translation type="obsolete">&amp;Contrasinal:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>&amp;Gustaríalle rexistrar a creación dunha nova conta de Sun en liña:</translation>
+        <translation type="obsolete">&amp;Gustaríalle rexistrar a creación dunha nova conta de Sun en liña:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>No&amp;me:</translation>
+        <translation type="obsolete">No&amp;me:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>Ape&amp;lido:</translation>
+        <translation type="obsolete">Ape&amp;lido:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Compañía:</translation>
+        <translation type="obsolete">&amp;Compañía:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>Paí&amp;s:</translation>
+        <translation type="obsolete">Paí&amp;s:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>Correo elec&amp;trónico:</translation>
+        <translation type="obsolete">Correo elec&amp;trónico:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>Contr&amp;asinal:</translation>
+        <translation type="obsolete">Contr&amp;asinal:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Co&amp;nfirmar contrasinal:</translation>
+        <translation type="obsolete">Co&amp;nfirmar contrasinal:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Rexistro</translation>
+        <translation type="obsolete">&amp;Rexistro</translation>
     </message>
 </context>
 <context>
@@ -6557,7 +6557,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Procesador(es):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Controla o número de CPU virtuais na máquina virtual.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
index c811f640a..749b3a709 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>George Hron,Tom Evin</translation>
+        <translation type="obsolete">George Hron,Tom Evin</translation>
     </message>
 </context>
 <context>
@@ -145,7 +145,8 @@
     </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 type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>A kernel driver nem tudott elegendő memóriát foglalni, vagy valamilyen memóriaművelet nem sikerült.</translation>
     </message>
 </context>
 <context>
@@ -371,7 +372,7 @@
     <name>QILabel</name>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished">Má&amp;solás</translation>
+        <translation>Má&amp;solás</translation>
     </message>
 </context>
 <context>
@@ -560,11 +561,11 @@ Verzió %1</translation>
     </message>
     <message>
         <source>Downloading the VirtualBox Guest Additions CD image from &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;...&lt;/nobr&gt;</source>
-        <translation>A VirtualBox Guest Additions CD letöltése innen: &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;...&lt;/nobr&gt;</translation>
+        <translation>A VirtualBox integrációs szolgáltatások CD letöltése innen: &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;...&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>Cancel the VirtualBox Guest Additions CD image download</source>
-        <translation>A VirtualBox Guest Additions CD letöltésének megszakítása</translation>
+        <translation>A VirtualBox integrációs szolgáltatások CD letöltésének megszakítása</translation>
     </message>
     <message>
         <source>&lt;p&gt;Failed to save the downloaded file as &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;&lt;/p&gt;</source>
@@ -780,11 +781,11 @@ Verzió %1</translation>
     </message>
     <message>
         <source>Restore the machine state stored in the current snapshot</source>
-        <translation type="unfinished"></translation>
+        <translation>A gép állapotának visszaállítása az aktuális pillanatképből</translation>
     </message>
     <message>
         <source>&amp;Restore current snapshot &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezen &amp;pillanatkép visszatöltése: &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -832,7 +833,7 @@ Verzió %1</translation>
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized (requires Guest Additions)</source>
-        <translation>Automatikusan átméretezi a vendég gép képernyőjét, ha az ablak mérete változik (Guest Additions szükséges)</translation>
+        <translation>Automatikusan átméretezi a vendég gép képernyőjét, ha az ablak mérete változik (az integrációs szolgáltatások telepítése szükséges)</translation>
     </message>
     <message>
         <source>&amp;Adjust Window Size</source>
@@ -925,7 +926,7 @@ Verzió %1</translation>
     <message>
         <source>Remote Desktop (RDP) Server</source>
         <comment>enable/disable...</comment>
-        <translation type="unfinished">RDP szerver</translation>
+        <translation>RDP szerver</translation>
     </message>
     <message>
         <source>Remote Dis&amp;play</source>
@@ -949,7 +950,7 @@ Verzió %1</translation>
     </message>
     <message>
         <source>&amp;Install Guest Additions...</source>
-        <translation>Guest Add&amp;itions telepítése...</translation>
+        <translation>&amp;Integrációs szolgáltatások telepítése...</translation>
     </message>
     <message>
         <source>Mount the Guest Additions installation image</source>
@@ -1354,91 +1355,91 @@ Verzió %1</translation>
     </message>
     <message>
         <source> EXPERIMENTAL build %1r%2 - %3</source>
-        <translation type="unfinished"></translation>
+        <translation> TESZTELÉS ALATTI verzió %1r%2 - %3</translation>
     </message>
     <message>
         <source>&amp;CD/DVD Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;CD/DVD eszközök</translation>
     </message>
     <message>
         <source>&amp;Floppy Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Floppy</translation>
     </message>
     <message>
         <source>&amp;Network Adapters...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hálózati kártyák...</translation>
     </message>
     <message>
         <source>Change the settings of network adapters</source>
-        <translation type="unfinished"></translation>
+        <translation>A hálózati kártyák beállítása</translation>
     </message>
     <message>
         <source>&amp;Remote Display</source>
-        <translation type="unfinished">Távoli képe&amp;rnyő</translation>
+        <translation>Távoli képe&amp;rnyő</translation>
     </message>
     <message>
         <source>More CD/DVD Images...</source>
-        <translation type="unfinished"></translation>
+        <translation>További CD/DVD képfájlok...</translation>
     </message>
     <message>
         <source>Unmount CD/DVD Device</source>
-        <translation type="unfinished"></translation>
+        <translation>CD/DVD lecsatolása</translation>
     </message>
     <message>
         <source>More Floppy Images...</source>
-        <translation type="unfinished"></translation>
+        <translation>További floppy képfájlok...</translation>
     </message>
     <message>
         <source>Unmount Floppy Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Floppy lecsatolása</translation>
     </message>
     <message>
         <source>No CD/DVD Devices Attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs CD/DVD csatlakoztatva</translation>
     </message>
     <message>
         <source>No Floppy Devices Attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs floppy csatlakoztatva</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the virtual hard disks:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p style=&apos;white-space: pre&apos;&gt;&lt;nobr&gt;Jelzi a merevlemez aktivitását:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the CD/DVD devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>CD/DVD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p style=&apos;white-space: pre&apos;&gt;&lt;nobr&gt;Jelzi a CD/DVD aktivitását:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No CD/DVD devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>CD/DVD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Nincs CD/DVD csatlakoztatva&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the floppy devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>FD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p style=&apos;white-space: pre&apos;&gt;&lt;nobr&gt;Jelzi a floppy aktivitását:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No floppy devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>FD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Nincs floppy csatlakoztatva&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the network interfaces:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>Network adapters tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p style=&apos;white-space: pre&apos;&gt;&lt;nobr&gt;Jelzi a hálózati eszköz aktivitását:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the attached USB devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>USB device tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p style=&apos;white-space: pre&apos;&gt;&lt;nobr&gt;Jelzi a csatlakoztatott USB eszköz aktivitását:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the machine&apos;s shared folders:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>Shared folders tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p style=&apos;white-space: pre&apos;&gt;&lt;nobr&gt;Jelzi az osztott mappa aktivitását:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -1797,7 +1798,7 @@ Verzió %1</translation>
     </message>
     <message>
         <source>Exporting Appliance ...</source>
-        <translation>Gép exportálása...</translation>
+        <translation>Virtuális gép exportálása...</translation>
     </message>
     <message>
         <source>Appliance Export Wizard</source>
@@ -2055,8 +2056,8 @@ p, li { white-space: pre-wrap; }
         <translation>Valós idejű &amp;dock ikon</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
+        <translation>A dock és a menüsor &amp;automatikus megjelenítése teljes képernyőn</translation>
     </message>
 </context>
 <context>
@@ -2397,31 +2398,31 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Check for:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ellenőrizze:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Choose this if you only wish to be notified about stable updates to VirtualBox.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Válaszd ezt, ha csak a stabil VirtualBox frissítésekről szeretnél értesülni&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Stable release versions</source>
-        <translation type="unfinished"></translation>
+        <translation>a &amp;stabil kiadásokat</translation>
     </message>
     <message>
         <source>&lt;p&gt;Choose this if you wish to be notified about all new VirtualBox releases.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Válaszd ezt, ha minden új VirtualBox kiadásról szeretnél értesülni&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;All new releases</source>
-        <translation type="unfinished"></translation>
+        <translation>minden új ki&amp;adást</translation>
     </message>
     <message>
         <source>&lt;p&gt;Choose this to be notified about all new VirtualBox releases and pre-release versions of VirtualBox.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Válaszd ezt, ha minden új VirtualBox kiadásról és előzetes kiadásról szeretnél értesülni&lt;/p&gt;</translation>
     </message>
     <message>
         <source>All new releases and &amp;pre-releases</source>
-        <translation type="unfinished"></translation>
+        <translation>az elő&amp;zetes és a végeges kiadásokat</translation>
     </message>
 </context>
 <context>
@@ -3420,230 +3421,236 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Enabled</source>
         <comment>details report (2D Video Acceleration)</comment>
-        <translation type="unfinished">Engedélyezve</translation>
+        <translation>Engedélyezve</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (2D Video Acceleration)</comment>
-        <translation type="unfinished">Letiltva</translation>
+        <translation>Letiltva</translation>
     </message>
     <message>
         <source>2D Video Acceleration</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>2D grafikus gyorsítás</translation>
     </message>
     <message>
         <source>Not Attached</source>
         <comment>details report (Storage)</comment>
-        <translation type="unfinished">Nincs csatolva</translation>
+        <translation>Nincs csatlakoztatva</translation>
     </message>
     <message>
         <source>Storage</source>
         <comment>details report</comment>
-        <translation type="unfinished">Tároló</translation>
+        <translation>Tároló</translation>
     </message>
     <message>
         <source>Teleported</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>�thelyezve</translation>
     </message>
     <message>
         <source>Guru Meditation</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>Gondolkodik</translation>
     </message>
     <message>
         <source>Teleporting</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>�thelyezés alatt</translation>
     </message>
     <message>
         <source>Taking Live Snapshot</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>Pillanatkép készítése</translation>
     </message>
     <message>
         <source>Teleporting Paused VM</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>Megállított VM áthelyezése</translation>
     </message>
     <message>
         <source>Restoring Snapshot</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pillanatkép helyreállítása</translation>
     </message>
     <message>
         <source>Deleting Snapshot</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pillanatkép törlése</translation>
     </message>
     <message>
         <source>Floppy</source>
         <comment>StorageBus</comment>
-        <translation type="unfinished">Floppy</translation>
+        <translation>Floppy</translation>
     </message>
     <message>
         <source>Device %1</source>
         <comment>StorageBusDevice</comment>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>Eszköz %1</translation>
     </message>
     <message>
         <source>IDE Primary Master</source>
         <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <translation>IDE Primary Master</translation>
     </message>
     <message>
         <source>IDE Primary Slave</source>
         <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <translation>IDE Primary Slave</translation>
     </message>
     <message>
         <source>IDE Secondary Master</source>
         <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <translation>IDE Secondary Master</translation>
     </message>
     <message>
         <source>IDE Secondary Slave</source>
         <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <translation>IDE Secondary Slave</translation>
     </message>
     <message>
         <source>SATA Port %1</source>
         <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <translation>SATA Port %1</translation>
     </message>
     <message>
         <source>SCSI Port %1</source>
         <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <translation>SCSI Port %1</translation>
     </message>
     <message>
         <source>Floppy Device %1</source>
         <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <translation>Floppy eszköz %1</translation>
     </message>
     <message>
         <source>Paravirtualized Network (virtio-net)</source>
         <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Paravirtualizált hálózat (virtio-net)</translation>
     </message>
     <message>
         <source>I82078</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Empty</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ãœres</translation>
     </message>
     <message>
         <source>Host Drive &apos;%1&apos;</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Gazda eszköz &apos;%1&apos;</translation>
     </message>
     <message>
         <source>Host Drive %1 (%2)</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Gazda eszköz %1 (%2)</translation>
     </message>
     <message>
         <source>&lt;p style=white-space:pre&gt;Type (Format):  %1 (%2)&lt;/p&gt;</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p style=white-space:pre&gt;Típus (Formátum):  %1 (%2)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Attached to:  %1&lt;/p&gt;</source>
         <comment>image</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Csatlakoztatva ide: %1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;i&gt;Not Attached&lt;/i&gt;</source>
         <comment>image</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;i&gt;Nincs csatlakoztatva&lt;/i&gt;</translation>
     </message>
     <message>
         <source>&lt;i&gt;Checking accessibility...&lt;/i&gt;</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;i&gt;Elérhetőség tesztelése...&lt;/i&gt;</translation>
     </message>
     <message>
         <source>Failed to check media accessibility.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>A média elérhetőségének ellenőrzése sikertelen.</translation>
     </message>
     <message>
         <source>&lt;b&gt;No medium selected&lt;/b&gt;</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Nincs média kiválasztva&lt;/b&gt;</translation>
     </message>
     <message>
         <source>You can also change this while the machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gép bekapcsolt állapota mellett is változtatható.</translation>
     </message>
     <message>
         <source>&lt;b&gt;No media available&lt;/b&gt;</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Nincs elérhető média&lt;/b&gt;</translation>
     </message>
     <message>
         <source>You can create media images using the virtual media manager.</source>
-        <translation type="unfinished"></translation>
+        <translation>Képfájlokat a virtuális média menedzserrel hozhatsz létre.</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>
+        <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 media in this hard disk chain are inaccessible. Please use the Virtual Media Manager in &lt;b&gt;Show Differencing Hard Disks&lt;/b&gt; mode to inspect these media.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Valamelyik média ebben a merevlemez-láncban elérhetetlen. Kérlek, használd a Virtuális médiakezelőt &lt;b&gt;Különbözeti merevlemezek mutatása&lt;/b&gt; módban a probléma felderítéséhez.</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>Ez az alap merevlemez a következő különbözeti lemezzel lesz csatlakoztatva:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n éve</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n hónapja</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n napja</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n órája</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n perce</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n second(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n másodperce</numerusform>
         </translation>
     </message>
     <message>
         <source>(CD/DVD)</source>
-        <translation type="unfinished"></translation>
+        <translation>(CD/DVD)</translation>
     </message>
 </context>
 <context>
@@ -3998,7 +4005,7 @@ to the system default language.&lt;/qt&gt;
     <name>VBoxHelpButton</name>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished">Sú&amp;gó</translation>
+        <translation>Sú&amp;gó</translation>
     </message>
 </context>
 <context>
@@ -4009,7 +4016,8 @@ to the system default language.&lt;/qt&gt;
     </message>
     <message>
         <source>Reading Appliance ...</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>Virtuális gép olvasása...</translation>
     </message>
 </context>
 <context>
@@ -4262,7 +4270,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&amp;Select</source>
-        <translation>&amp;Válasszon</translation>
+        <translation>&amp;Válassz</translation>
     </message>
     <message>
         <source>All hard disk images (%1)</source>
@@ -4303,7 +4311,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Virtual Media Manager</source>
-        <translation>Virtuális Médiakezelő</translation>
+        <translation>Virtuális média-kezelő</translation>
     </message>
     <message>
         <source>Hard &amp;Disks</source>
@@ -4336,17 +4344,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Attached to</source>
         <comment>VMM: Virtual Disk</comment>
-        <translation type="unfinished">Ide csatlakoztatva</translation>
+        <translation>Ide csatlakoztatva</translation>
     </message>
     <message>
         <source>Attached to</source>
         <comment>VMM: CD/DVD Image</comment>
-        <translation type="unfinished">Ide csatlakoztatva</translation>
+        <translation>Ide csatlakoztatva</translation>
     </message>
     <message>
         <source>Attached to</source>
         <comment>VMM: Floppy Image</comment>
-        <translation type="unfinished">Ide csatlakoztatva</translation>
+        <translation>Ide csatlakoztatva</translation>
     </message>
 </context>
 <context>
@@ -4403,7 +4411,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxNetworkDialog</name>
     <message>
         <source>Network Adapters</source>
-        <translation type="unfinished"></translation>
+        <translation>Hálózati kártyák</translation>
     </message>
 </context>
 <context>
@@ -5272,7 +5280,7 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     <message>
         <source>&lt;p&gt;The host key is currently defined as &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;</source>
         <comment>additional message box paragraph</comment>
-        <translation>&lt;p&gt;A gazda kulcs jelenleg így van megadva: &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;A gazda billentyű jelenleg így van megadva: &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Capture</source>
@@ -5364,7 +5372,7 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </message>
     <message>
         <source>&lt;p&gt;The Virtual Machine reports that the guest OS supports &lt;b&gt;mouse pointer integration&lt;/b&gt;. This means that you do not need to &lt;i&gt;capture&lt;/i&gt; 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&apos;s display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.&lt;/p&gt;&lt;p&gt;The mouse icon on the status bar will look like&amp;nbsp;&lt;img src=:/mouse_seamless_16px.png/&gt;&amp;nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note&lt;/b&gt;: Some applications may behave incorrectly in mouse pointer integration mode. You can always disable it for the current session (and enable it again) by selecting the corresponding action from the menu bar.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;A virtuális gép észlelte, hogy a vendég operációs rendszer támogatja az &lt;b&gt;egér-integrációt&lt;/b&gt;. Ez azt jelenti, hogy nem kell &lt;i&gt;elfognod&lt;/i&gt;az egérmutató, hogy a vendég operációs rendszerben használhasd -- ha az egérmutató a virtuális gép képernyője felett van, minden végrehajtott egérművelet közvetlen a vendég operációs rendszerhez küldődik. Ha az egér el van fogva, automatikusan el lesz engedve.&lt;/p&gt;&lt;p&gt;Az állapotsorban megjelenő&amp;nbsp;&lt;img src=:/mouse_seamless_16px.png/&gt;&amp;nbsp;egér ikon tájékoztat az egér-integráció vendég operációs rendszerbeli támogatásáról és bekapcsolt állapotáról.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés&lt;/b&gt;: Néhány alkalmazás helytelenül működhet egér-integrációs módban. Bármikor kikapcsolhatod az aktuális munkafolyamathoz (majd újra be) a menüből,a megfelelő művelet kiválasztásával.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;A virtuális gép észlelte, hogy a vendég operációs rendszer támogatja az &lt;b&gt;egér-integrációt&lt;/b&gt;. Ez azt jelenti, hogy nem kell &lt;i&gt;elfognod&lt;/i&gt; az egérmutatót, hogy a vendég operációs rendszerben használhasd -- ha az egérmutató a virtuális gép képernyője felett van, minden végrehajtott egérművelet közvetlen a vendég operációs rendszeren hajtódik végre. Ha az egér el van fogva, automatikusan el lesz engedve.&lt;/p&gt;&lt;p&gt;Az állapotsorban megjelenő&amp;nbsp;&lt;img src=:/mouse_seamless_16px.png/&gt;&amp;nbsp;egér ikon tájékoztat az egér-integráció vendég operációs rendszerbeli támogatásáról és bekapcsolt állapotáról.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés&lt;/b&gt;: Néhány alkalmazás helytelenül működhet egér-integrációs módban. Bármikor kikapcsolhatod az aktuális munkafolyamathoz (majd újra be) a menüből,a megfelelő művelet kiválasztásával.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The virtual machine window will be now switched to &lt;b&gt;fullscreen&lt;/b&gt; mode. You can go back to windowed mode at any time by pressing &lt;b&gt;%1&lt;/b&gt;. Note that the &lt;i&gt;Host&lt;/i&gt; key is currently defined as &lt;b&gt;%2&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing &lt;b&gt;Host+Home&lt;/b&gt;.&lt;/p&gt;</source>
@@ -5703,154 +5711,154 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </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 type="unfinished"></translation>
+        <translation>Úgy néz ki, USBFS fájlrendszert használsz a /sys/bus/usb/drivers alá csatolva. Erősen ajánlott ennek megváltoztatása, mert egy hibás beállítás az USB eszközök működésének váratlan zavarát okozhatja.</translation>
     </message>
     <message>
         <source>You are running an EXPERIMENTAL build of VirtualBox. This version is not suitable for production use.</source>
-        <translation type="unfinished"></translation>
+        <translation>A Virtualbox TESZTELÉS ALATTI verzióját futtatod. Ez a verzió nem ajánlott éles környezetbe.</translation>
     </message>
     <message>
         <source>&lt;p&gt;Are you sure you want to restore snapshot &lt;b&gt;%1&lt;/b&gt;? This will cause you to lose your current machine state, which cannot be recovered.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Biztos, hogy vissza akarod tölteni ezt a pillanatképet: &lt;b&gt;%1&lt;/b&gt;? Ez a gép jelenlegi állapotának végleges elvesztését okozhatja.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>Visszatöltés</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;/p&gt;Are you sure you want to delete the selected snapshot &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A pillanatkép törlése azt okozhatja, hogy a mentett állapotinformációk elvesznek, és a VirtualBox által készített lemez-pillanatképek rá lesznek játszva az aktuális lemezre. Ez hosszú ideig is eltarthat, és a pillanatkép-beli információk ezután már nem lesznek helyreállíthatóak.&lt;/p&gt;&lt;p&gt;Biztos törlöd ezt a pillanatképet: &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Törlés</translation>
+        <translation>Törlés</translation>
     </message>
     <message>
         <source>Failed to restore the snapshot &lt;b&gt;%1&lt;/b&gt; of the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>A(z) &lt;b&gt;%2&lt;/b&gt; virtuális gép &lt;b&gt;%1&lt;/b&gt; pillanatképének helyreállítása nem sikerült.</translation>
     </message>
     <message>
         <source>Failed to delete the snapshot &lt;b&gt;%1&lt;/b&gt; of the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>A(z) &lt;b&gt;%2&lt;/b&gt; virtuális gép &lt;b&gt;%1&lt;/b&gt; pillanatképének törlése nem sikerült.</translation>
     </message>
     <message>
         <source>&lt;p&gt;There are no unused media available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Create&lt;/b&gt; button to start the &lt;i&gt;New Virtual Disk&lt;/i&gt; wizard and create a new medium, or press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Media Manager&lt;/i&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nem érhető el felhasználható média az újonnan létrehozott perifériához.&lt;/p&gt;&lt;p&gt;Nyomd meg az &lt;b&gt;Új&lt;/b&gt; gombot az &lt;i&gt;Új virtuális lemez&lt;/i&gt; varázsló elindításához, és készíts egy új médiumot, vagy nyomd meg a &lt;b&gt;Kiválasztás&lt;/b&gt; gombot a &lt;i&gt;Virtuális média-kezelő&lt;/&gt; elinditásához.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Create</source>
         <comment>medium</comment>
-        <translation type="unfinished">Ú&amp;j</translation>
+        <translation>Ú&amp;j</translation>
     </message>
     <message>
         <source>&amp;Select</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kiválasztá&amp;s</translation>
     </message>
     <message>
         <source>&lt;p&gt;There are no unused media available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Media Manager&lt;/i&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nem érhető el felhasználható média az újonnan létrehozott perifériához.&lt;/p&gt;&lt;p&gt;Nyomd meg a &lt;b&gt;Kiválasztás&lt;/b&gt; gombot a &lt;i&gt;Virtuális média-kezelő&lt;/&gt; elinditásához.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Failed to attach the %1 to slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>A(z) %1 csatlakoztatása a(z) &lt;b&gt;%3&lt;/b&gt; virtuális gép &lt;i&gt;%2&lt;/i&gt; csatlakozójába nem sikerült.</translation>
     </message>
     <message>
         <source>Failed to detach the %1 from slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>A(z) %1 leválasztása a(z) &lt;b&gt;%3&lt;/b&gt; virtuális gép &lt;i&gt;%2&lt;/i&gt; csatlakozójáról nem sikerült.</translation>
     </message>
     <message>
         <source>Unable to mount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; on the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nem sikerült felcsatolni a(z) %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; a(z) &lt;b&gt;%3&lt;/b&gt; gépre.</translation>
     </message>
     <message>
         <source> Would you like to force mounting of this medium?</source>
-        <translation type="unfinished"></translation>
+        <translation>Biztosan erőszakkal akarod felcsatolni ezt a médiumot?</translation>
     </message>
     <message>
         <source>Unable to unmount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; from the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nem sikerült lecsatolni a(z) %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; a(z) &lt;b&gt;%3&lt;/b&gt; gépről.</translation>
     </message>
     <message>
         <source> Would you like to force unmounting of this medium?</source>
-        <translation type="unfinished"></translation>
+        <translation>Biztosan erőszakkal akarod leválasztani ezt a médiumot?</translation>
     </message>
     <message>
         <source>Force Unmount</source>
-        <translation type="unfinished"></translation>
+        <translation>Erőszakos leválasztás</translation>
     </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="unfinished"></translation>
+        <translation>Nem sikerült kidobni a lemezt a virtuális eszközből. Az eszközt valószínűleg zárolta a vendég rendszer. Ellenőrizd ezt, és próbáld újra.</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not insert the VirtualBox Guest Additions installer CD image into the virtual machine &lt;b&gt;%1&lt;/b&gt;, as the machine has no CD/DVD-ROM drives. Please add a drive using the storage page of the virtual machine settings dialog.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nem lehet a VirtualBox integrációs szolgáltatások telepítőlemezét felcsatolni a(z) &lt;b&gt;%1&lt;/b&gt; virtuálus gépre, mert a gép nem rendelkezik CD/DVD meghajtóval. Adj egyet a hozzá a virtuális gép beállításainál a Tároló fülön.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <comment>warnAboutSettingsAutoConversion message box</comment>
-        <translation type="unfinished">Ki&amp;lépés</translation>
+        <translation>Ki&amp;lépés</translation>
     </message>
     <message>
         <source>&lt;p&gt;The following VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; to start VirtualBox now or press &lt;b&gt;Exit&lt;/b&gt; if you want to terminate the VirtualBox application without any further actions.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A következő VirtualBox beállításfájlok automatikusan konvertálva lesznek a régi formátumról az újra.&lt;/p&gt;&lt;p&gt;Nyomd meg az &lt;b&gt;OK&lt;/b&gt; gombot a VirtualBox indításához, vagy a &lt;b&gt;Kilépés&lt;/b&gt;-t a VirtualBox-ból való azonnali kilépéshez&lt;/p&gt;</translation>
     </message>
     <message>
         <source>hard disk</source>
         <comment>failed to mount ...</comment>
-        <translation type="unfinished">merevlemez</translation>
+        <translation>merevlemezt</translation>
     </message>
     <message>
         <source>CD/DVD</source>
         <comment>failed to mount ... host-drive</comment>
-        <translation type="unfinished"></translation>
+        <translation>CD/DVD-t</translation>
     </message>
     <message>
         <source>CD/DVD image</source>
         <comment>failed to mount ...</comment>
-        <translation type="unfinished">CD/DVD kép</translation>
+        <translation>CD/DVD képet</translation>
     </message>
     <message>
         <source>floppy</source>
         <comment>failed to mount ... host-drive</comment>
-        <translation type="unfinished"></translation>
+        <translation>floppy-t</translation>
     </message>
     <message>
         <source>floppy image</source>
         <comment>failed to mount ...</comment>
-        <translation type="unfinished">floppy kép</translation>
+        <translation>floppy képet</translation>
     </message>
     <message>
         <source>hard disk</source>
         <comment>failed to attach ...</comment>
-        <translation type="unfinished">merevlemez</translation>
+        <translation>merevlemezt</translation>
     </message>
     <message>
         <source>CD/DVD device</source>
         <comment>failed to attach ...</comment>
-        <translation type="unfinished"></translation>
+        <translation>CD/DVD eszközt</translation>
     </message>
     <message>
         <source>floppy device</source>
         <comment>failed to close ...</comment>
-        <translation type="unfinished"></translation>
+        <translation>floppyt</translation>
     </message>
     <message>
         <source>&lt;p&gt;Are you sure you want to delete the CD/DVD-ROM device?&lt;/p&gt;&lt;p&gt;You will not be able to mount any CDs or ISO images or install the Guest Additions without it!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Biztos, hogy törlöd ezt a CD/DVD eszközt?&lt;/p&gt;&lt;p&gt;Enélkül nem leszel képes CD-t vagy ISO képmást csatolni, illetve az integrációs szolgáltatásokat telepíteni!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tö&amp;röl</translation>
     </message>
 </context>
 <context>
     <name>VBoxProgressDialog</name>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Mégsem</translation>
+        <translation>&amp;Mégsem</translation>
     </message>
     <message>
         <source>Time remaining: %1</source>
@@ -5858,32 +5866,32 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </message>
     <message>
         <source>A few seconds remaining</source>
-        <translation type="unfinished"></translation>
+        <translation>Még néhány másodperc</translation>
     </message>
     <message>
         <source>Canceling...</source>
-        <translation type="unfinished"></translation>
+        <translation>Megszakítás...</translation>
     </message>
     <message>
         <source>Cancel the current operation</source>
-        <translation type="unfinished"></translation>
+        <translation>A futó művelet megszakítása</translation>
     </message>
     <message>
         <source>%1, %2 remaining</source>
         <comment>You may wish to translate this more like &quot;Time remaining: %1, %2&quot;</comment>
-        <translation type="unfinished"></translation>
+        <translation>%2 van hátra a(z) %1 -ből</translation>
     </message>
     <message>
         <source>%1 remaining</source>
         <comment>You may wish to translate this more like &quot;Time remaining: %1&quot;</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 van hátra</translation>
     </message>
 </context>
 <context>
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBox regisztrálása</translation>
+        <translation type="obsolete">VirtualBox regisztrálása</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5895,7 +5903,7 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>�rd be a teljes neved speciális karakterek nélkül.</translation>
+        <translation type="obsolete">�rd be a teljes neved speciális karakterek nélkül.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -5903,7 +5911,7 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>�rd be a használt e-mail címedet.</translation>
+        <translation type="obsolete">�rd be a használt e-mail címedet.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -5915,7 +5923,7 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>A VirtualBox regisztrációs űrlap üdvözöl!</translation>
+        <translation type="obsolete">A VirtualBox regisztrációs űrlap üdvözöl!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -5931,7 +5939,7 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>A kapcsolódási próbálkozás sikertelen volt.</translation>
+        <translation type="obsolete">A kapcsolódási próbálkozás sikertelen volt.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5947,63 +5955,63 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Mégsem</translation>
+        <translation type="obsolete">Mégsem</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Válassz országot/területet</translation>
+        <translation type="obsolete">Válassz országot/területet</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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ésének részleteiről a kézikönyv &lt;b&gt;Adatvédemi nyilatkozat&lt;/b&gt; részéből vagy a VirtualBox weboldalának &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Adatvédemi nyilatkozat&lt;/a&gt; oldalán tájékozódhatsz.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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ésének részleteiről a kézikönyv &lt;b&gt;Adatvédemi nyilatkozat&lt;/b&gt; részéből vagy a VirtualBox weboldalának &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Adatvédemi nyilatkozat&lt;/a&gt; oldalán tájékozódhatsz.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>A meglevő Sun Online fiókomat &amp;használom:</translation>
+        <translation type="obsolete">A meglevő Sun Online fiókomat &amp;használom:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Jelszó:</translation>
+        <translation type="obsolete">&amp;Jelszó:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Szeretnék egy új Sun &amp;Online fiókot regisztrálni:</translation>
+        <translation type="obsolete">Szeretnék egy új Sun &amp;Online fiókot regisztrálni:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Keresztnév:</translation>
+        <translation type="obsolete">&amp;Keresztnév:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Vezetéknév:</translation>
+        <translation type="obsolete">&amp;Vezetéknév:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Cég:</translation>
+        <translation type="obsolete">&amp;Cég:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>Orszá&amp;g:</translation>
+        <translation type="obsolete">Orszá&amp;g:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>J&amp;elszó:</translation>
+        <translation type="obsolete">J&amp;elszó:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Jelszó &amp;megerősítése:</translation>
+        <translation type="obsolete">Jelszó &amp;megerősítése:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Regisztráció</translation>
+        <translation type="obsolete">&amp;Regisztráció</translation>
     </message>
 </context>
 <context>
@@ -6033,15 +6041,15 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     <name>VBoxScreenshotViewer</name>
     <message>
         <source>Screenshot of %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Képernyőkép: %1 (%2)</translation>
     </message>
     <message>
         <source>Click to view non-scaled screenshot.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kattintásra átvált teljes méretű képre.</translation>
     </message>
     <message>
         <source>Click to view scaled screenshot.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kattintásra átvált normál méretű képre.</translation>
     </message>
 </context>
 <context>
@@ -6301,7 +6309,7 @@ esetleg a &lt;b&gt;Létező&lt;/b&gt; gombbal a Virtuális lemezkezelőből.&lt;
     </message>
     <message>
         <source>&amp;Virtual Media Manager...</source>
-        <translation>&amp;Virtuális Médiakezelő...</translation>
+        <translation>&amp;Virtuális média-kezelő...</translation>
     </message>
     <message>
         <source>Display the Virtual Media Manager dialog</source>
@@ -6518,23 +6526,23 @@ parancsot Linux-alapú OS-ekből. Guest Additions szükséges hozzá.&lt;/qt&gt;
     </message>
     <message>
         <source>Click to enlarge the screenshot.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kattints ide a kép nagyításához.</translation>
     </message>
     <message>
         <source>&amp;Name:</source>
-        <translation type="unfinished">&amp;Név:</translation>
+        <translation>&amp;Név:</translation>
     </message>
     <message>
         <source>Taken:</source>
-        <translation type="unfinished"></translation>
+        <translation>Készült:</translation>
     </message>
     <message>
         <source>&amp;Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Leírás:</translation>
     </message>
     <message>
         <source>D&amp;etails:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Részletek:</translation>
     </message>
 </context>
 <context>
@@ -6717,27 +6725,27 @@ parancsot Linux-alapú OS-ekből. Guest Additions szükséges hozzá.&lt;/qt&gt;
     </message>
     <message>
         <source> (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>&amp;Restore Snapshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Pillanatkép hely&amp;reállítása</translation>
     </message>
     <message>
         <source>&amp;Delete Snapshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Pillanatkép &amp;törlése</translation>
     </message>
     <message>
         <source>Restore the selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>A kiválasztott pillanatkép helyreállítása a virtuális gépre</translation>
     </message>
     <message>
         <source>Delete the selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Törli a kiválasztott pillanatképet</translation>
     </message>
     <message>
         <source> (%1 ago)</source>
-        <translation type="unfinished"></translation>
+        <translation> (%1)</translation>
     </message>
 </context>
 <context>
@@ -6791,8 +6799,8 @@ parancsot Linux-alapú OS-ekből. Guest Additions szükséges hozzá.&lt;/qt&gt;
     </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>
+            <numerusform>Vigyázz: Pillanatképet készülsz készíteni egy olyan gépről, melyhez %n nem-módosíthato képfájl van csatlakoztatva. Amíg ebből a pillanatképből dolgozol, a nem-módosítható képfájl nem lesz helyreállitva az adatvesztés elkerülése érdekében.</numerusform>
         </translation>
     </message>
 </context>
@@ -7301,7 +7309,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Guest Additions</source>
-        <translation>Guest Additions</translation>
+        <translation>Integrációs szolgáltatások</translation>
     </message>
     <message>
         <source>Guest OS Type</source>
@@ -7340,19 +7348,19 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Not Available</source>
         <comment>details report (VRDP server port)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nem érhető el</translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>Tároló statisztika</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincsenek tárolóeszközök</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>Hálózati statisztika</translation>
     </message>
 </context>
 <context>
@@ -7855,19 +7863,20 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>you have assigned less than &lt;b&gt;%1&lt;/b&gt; of video memory which is the minimum amount required for HD Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>kevesebb mint &lt;b&gt;%1&lt;/b&gt; videómemóriát rendeltél a géphez, pedig ez a minimum, ami a nagyfelbontású videók lejátszásához kell.</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>
+        <translation>Ha engedélyezed, a virtuális gép hozzáférést kap a gazdagép videógyorsítási képességeihez.</translation>
     </message>
     <message>
         <source>Enable &amp;2D Video Acceleration</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;2D gyorsítás engedélyezése</translation>
     </message>
     <message>
         <source>The VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>A VRDP szerver portja. Adj meg &lt;tt&gt;0&lt;/tt&gt;-t (nulla) a standard RDP port (3389) kiválasztásához.</translation>
     </message>
 </context>
 <context>
@@ -8697,7 +8706,7 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>you have 2D Video Acceleration enabled. As 2D Video Acceleration is supported for Windows guests only, this feature will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>engedélyezted a 2D gyorsítást. Mivel ez a lehetőség jelenleg csak Windows-os vendéggépeken érhető el, ezért most letiltásra kerül.</translation>
     </message>
 </context>
 <context>
@@ -8871,7 +8880,7 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </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>A vágólap megosztásának módját állíthatod itt be a gazda és a vendég rendszer közt. Ez a virtuális gépen a Guest Additions telepítését igénlyi.</translation>
+        <translation>A vágólap megosztásának módját állíthatod itt be a gazda és a vendég rendszer közt. Ez a virtuális gépen az integrációs szolgáltatások telepítését igénlyi.</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>
@@ -8964,11 +8973,11 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </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="unfinished"></translation>
+        <translation>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 &amp;Top Of Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Legyen a képernyő &amp;tetején</translation>
     </message>
 </context>
 <context>
@@ -9043,131 +9052,131 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Bus:&amp;nbsp;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Type:&amp;nbsp;&amp;nbsp;%3&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Busz:&amp;nbsp;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Típus:&amp;nbsp;&amp;nbsp;%3&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Expand/Collapse&amp;nbsp;Item&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Elem&amp;nbsp;összecsukása/kibontása&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Add&amp;nbsp;Hard&amp;nbsp;Disk&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nob&gt;Merevlemez&amp;nbsp;hozzáadása&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Add&amp;nbsp;CD/DVD&amp;nbsp;Device&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nob&gt;CD/DVD&amp;nbsp;hozzáadása&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Add&amp;nbsp;Floppy&amp;nbsp;Device&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nob&gt;Floppy&amp;nbsp;hozzáadása&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>No hard disk is selected for &lt;i&gt;%1&lt;/i&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs merevlemez kiválasztva a(z) &lt;i&gt;%1&lt;/i&gt; géphez.</translation>
     </message>
     <message>
         <source>&lt;i&gt;%1&lt;/i&gt; uses a medium that is already attached to &lt;i&gt;%2&lt;/i&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;i&gt;%1&lt;/i&gt; ugyanazt a médiumot használja, mint &lt;i&gt;%2&lt;/i&gt;.</translation>
     </message>
     <message>
         <source>Add Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Vezérlő hozzáadása</translation>
     </message>
     <message>
         <source>Add IDE Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>IDE vezérlő hozzáadása</translation>
     </message>
     <message>
         <source>Add SATA Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>SATA vezérlő hozzáadása</translation>
     </message>
     <message>
         <source>Add SCSI Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>SCSI vezérlő hozzáadása</translation>
     </message>
     <message>
         <source>Add Floppy Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Floppy vezérlő hozzáadása</translation>
     </message>
     <message>
         <source>Remove Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Vezérlő eltávolítása</translation>
     </message>
     <message>
         <source>Add Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Új csatolás</translation>
     </message>
     <message>
         <source>Add Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Merevlemez hozzáadása</translation>
     </message>
     <message>
         <source>Add CD/DVD Device</source>
-        <translation type="unfinished"></translation>
+        <translation>CD/DVD hozzáadása</translation>
     </message>
     <message>
         <source>Add Floppy Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Floppy hozzáadása</translation>
     </message>
     <message>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Csatolás törlése</translation>
     </message>
     <message>
         <source>Adds a new controller to the end of the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Az új vezérlőt a tároló-fa végéhez adja hozzá.</translation>
     </message>
     <message>
         <source>Removes the controller highlighted in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eltávolítja a kijelölt vezérlőt a tároló-fából.</translation>
     </message>
     <message>
         <source>Adds a new attachment to the Storage Tree using currently selected controller as parent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Új eszköz hozzáadása a tárolófához és csatlakoztatása a jelenleg kiválasztott vezérlőhöz.</translation>
     </message>
     <message>
         <source>Removes the attachment highlighted in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eltávolítja a kijelölt eszközt a tárolófából.</translation>
     </message>
     <message>
         <source>IDE Controller</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IDE vezérlő</translation>
     </message>
     <message>
         <source>SATA Controller</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">SATA vezérlő</translation>
     </message>
     <message>
         <source>SCSI Controller</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">SCSI vezérlő</translation>
     </message>
     <message>
         <source>Floppy Controller</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Floppy vezérlő</translation>
     </message>
     <message>
         <source>Hard &amp;Disk:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Merevlemez:</translation>
     </message>
     <message>
         <source>&amp;CD/DVD Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;CD/DVD eszköz:</translation>
     </message>
     <message>
         <source>&amp;Floppy Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Floppy eszköz:</translation>
     </message>
     <message>
         <source>&amp;Storage Tree</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tárolófa</translation>
     </message>
     <message>
         <source>Contains all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translation>A virtuális gép minden tárolási vezérlőjét, illetve a géphez csatolt összes lemezképét, és gazdaeszközét tartalmazza.</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Információ</translation>
     </message>
     <message>
         <source>The Storage Tree can contain several controllers of different types. This machine currently has no controllers.</source>
@@ -9175,31 +9184,33 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>Attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Paraméterek</translation>
     </message>
     <message>
         <source>&amp;Name:</source>
-        <translation type="unfinished">&amp;Név:</translation>
+        <translation>&amp;Név:</translation>
     </message>
     <message>
         <source>Changes the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>�tnevezi a tárolófában kijelölt vezérlőt.</translation>
     </message>
     <message>
         <source>&amp;Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Típus:</translation>
     </message>
     <message>
         <source>Selects the sub-type of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>A kijelölt vezérlő altípusát választhatod ki.</translation>
     </message>
     <message>
         <source>S&amp;lot:</source>
-        <translation type="unfinished"></translation>
+        <translation>Csat&amp;lakozó:</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 type="unfinished"></translation>
+        <translatorcomment>CHECKIT</translatorcomment>
+        <translation>Az eszköz csatlakozóját adhatod meg. Az elérhető csatlakozók száma függ a vezérlő típusától, és a többi eszköztől is.</translation>
     </message>
     <message>
         <source>Selects the virtual disk image or the host drive used by this attachment.</source>
@@ -9207,15 +9218,15 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>Opens the Virtual Media Manager to select a virtual image for this attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Megjeleníti a Virtuális média-kezelőt a csatolandó lemezkép kiválasztásához.</translation>
     </message>
     <message>
         <source>Open Virtual Media Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuális média-kezelő megnyitása</translation>
     </message>
     <message>
         <source>D&amp;ifferencing Disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Különbözeti lemezek</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>
@@ -9227,27 +9238,27 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>Virtual Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuális méret:</translation>
     </message>
     <message>
         <source>Actual Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Jelenlegi méret:</translation>
     </message>
     <message>
         <source>Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Méret:</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hely:</translation>
     </message>
     <message>
         <source>Type (Format):</source>
-        <translation type="unfinished"></translation>
+        <translation>Típus (formátum):</translation>
     </message>
     <message>
         <source>Attached To:</source>
-        <translation type="unfinished"></translation>
+        <translation>Csatlakoztatva:</translation>
     </message>
 </context>
 <context>
@@ -9298,11 +9309,11 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <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="unfinished">Az adapter MAC címe. Ez pontosan 12 karakteres lehet, és csak a (0-9,A-F) betűkből állhat. A második karakternek páratlan számjegynek kell lenni.</translation>
+        <translation>Az adapter MAC címe. Ez pontosan 12 karakteres lehet, és csak a (0-9,A-F) betűkből állhat. A második karakternek páratlan számjegynek kell lenni.</translation>
     </message>
     <message>
         <source>Generates a new random MAC address.</source>
-        <translation type="unfinished">Véletlen MAC cím generálása.</translation>
+        <translation>Véletlen MAC cím generálása.</translation>
     </message>
     <message>
         <source>&amp;Generate</source>
@@ -9310,7 +9321,7 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
-        <translation type="unfinished">Jelzi, hogy a virtuális hálózati kábel be lesz-e dugva a gépbe induláskor vagy sem.</translation>
+        <translation>Jelzi, hogy a virtuális hálózati kábel be lesz-e dugva a gépbe induláskor vagy sem.</translation>
     </message>
     <message>
         <source>Ca&amp;ble Connected</source>
@@ -9397,19 +9408,19 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>A&amp;dvanced</source>
-        <translation type="unfinished"></translation>
+        <translation>H&amp;aladó</translation>
     </message>
     <message>
         <source>Shows or hides additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Megjeleníti vagy elrejti a további hálókártya opciókat.</translation>
     </message>
     <message>
         <source>&amp;Mac Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;MAC cím:</translation>
     </message>
     <message>
         <source>&amp;Cable connected</source>
-        <translation type="unfinished">&amp;Kábel bedugva</translation>
+        <translation>&amp;Kábel bedugva</translation>
     </message>
 </context>
 <context>
@@ -9503,11 +9514,11 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>Displays the IRQ number of this parallel port. This should be a whole number between &lt;tt&gt;0&lt;/tt&gt; and &lt;tt&gt;255&lt;/tt&gt;. Values greater than &lt;tt&gt;15&lt;/tt&gt; may only be used if the &lt;b&gt;IO APIC&lt;/b&gt; setting is enabled for this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>A párhuzamos port megszakításának száma. Bármely szám lehet &lt;tt&gt;0&lt;/tt&gt; és &lt;tt&gt;255&lt;/tt&gt; között. Ha az &lt;b&gt;IO APIC&lt;/b&gt; engedélyezve van, a &lt;tt&gt;15&lt;/tt&gt; feletti megszakítások foglaltak.</translation>
     </message>
     <message>
         <source>Displays the base I/O port address of this parallel port. Valid values are integer numbers in range from &lt;tt&gt;0&lt;/tt&gt; to &lt;tt&gt;0xFFFF&lt;/tt&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>A párhuzamos port I/O báziscíme. Bármely cím érvényes &lt;tt&gt;0&lt;/tt&gt; és &lt;tt&gt;0xFFFF&lt;/tt&gt; között.</translation>
     </message>
 </context>
 <context>
@@ -9569,7 +9580,7 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>Lists all shared folders accessible to this machine. Use &apos;net use x: \\vboxsvr\share&apos; to access a shared folder named &lt;i&gt;share&lt;/i&gt; from a DOS-like OS, or &apos;mount -t vboxsf share mount_point&apos; to access it from a Linux OS. This feature requires Guest Additions.</source>
-        <translation>Minden a gép számára elérhető osztott mappa listázása. A &apos;net use x: \\vboxsvr\share&apos; parancs segítségével használható a &lt;i&gt;share&lt;/i&gt; nevű megosztás a DOS-szerű OS-ekból, a &apos;mount -t vboxsf share mount_point&apos; paranccsal pedig Linux-alapú OS-ekből. Guest Additions szükséges hozzá.</translation>
+        <translation>Minden a gép számára elérhető osztott mappa listázása. A &apos;net use x: \\vboxsvr\share&apos; parancs segítségével használható a &lt;i&gt;share&lt;/i&gt; nevű megosztás a DOS-szerű OS-ekból, a &apos;mount -t vboxsf share mount_point&apos; paranccsal pedig Linux-alapú OS-ekből. Az integrációs szolgáltatások telepítése szükséges hozzá.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -9585,23 +9596,23 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source> Global Folders</source>
-        <translation type="unfinished"></translation>
+        <translation>Globális mappák</translation>
     </message>
     <message>
         <source>&amp;Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Osztott mappa hozzá&amp;adása</translation>
     </message>
     <message>
         <source>&amp;Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Osztott mappa sz&amp;erkesztése</translation>
     </message>
     <message>
         <source>&amp;Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Osztott mappa tö&amp;rlése</translation>
     </message>
     <message>
         <source>&amp;Folders List</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Mappalista</translation>
     </message>
 </context>
 <context>
@@ -9712,11 +9723,11 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     </message>
     <message>
         <source>Displays the IRQ number of this serial port. This should be a whole number between &lt;tt&gt;0&lt;/tt&gt; and &lt;tt&gt;255&lt;/tt&gt;. Values greater than &lt;tt&gt;15&lt;/tt&gt; may only be used if the &lt;b&gt;IO APIC&lt;/b&gt; setting is enabled for this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>A soros port megszakításának száma. Bármely szám lehet &lt;tt&gt;0&lt;/tt&gt; és &lt;tt&gt;255&lt;/tt&gt; között. Ha az &lt;b&gt;IO APIC&lt;/b&gt; engedélyezve van, a &lt;tt&gt;15&lt;/tt&gt; feletti megszakítások foglaltak.</translation>
     </message>
     <message>
         <source>Displays the base I/O port address of this serial port. Valid values are integer numbers in range from &lt;tt&gt;0&lt;/tt&gt; to &lt;tt&gt;0xFFFF&lt;/tt&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>A soros port I/O báziscíme. Bármely cím érvényes &lt;tt&gt;0&lt;/tt&gt; és &lt;tt&gt;0xFFFF&lt;/tt&gt; között.</translation>
     </message>
 </context>
 <context>
@@ -9843,7 +9854,7 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
         <translation>&amp;Processzor(ok):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>A virtuális gép virtuális processzorainak számának vezérlései.</translation>
     </message>
     <message>
@@ -9881,15 +9892,15 @@ hatására a virtuális gép látni fogja a hangkártyát, de nem szólal meg a
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished">&lt;qt&gt;%1&amp;nbsp;processzor&lt;/qt&gt;</translation>
+        <translation>&lt;qt&gt;%1&amp;nbsp;processzor&lt;/qt&gt;</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>
+        <translation>Ha engedélyezed, a gép támogatni fogja az Extended Firmware Interface-t (EFI), ami szükséges néhány operációs rendszer elindításához. A nem EFI-képes rendszerek nem lesznek képesek elindulni, ha ez az opció aktív.</translation>
     </message>
     <message>
         <source>Enable &amp;EFI (special OSes only)</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;EFI engedélyezése (különleges OS-eknek)</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
index 53e0acd5b..5e6fece36 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>David Yacobus &lt;david_yacobus@yahoo.com&gt;</translation>
+        <translation type="obsolete">David Yacobus &lt;david_yacobus@yahoo.com&gt;</translation>
     </message>
 </context>
 <context>
@@ -1908,7 +1908,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3179,7 +3179,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;nobr&gt;%4 MB&lt;/nobr&gt; {1 ?}</translation>
     </message>
     <message>
         <source>Processor(s)</source>
@@ -5936,7 +5936,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Dialog Registrasi VirtualBox</translation>
+        <translation type="obsolete">Dialog Registrasi VirtualBox</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5948,7 +5948,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Masukkan nama lengkap anda menggunakan huruf latin.</translation>
+        <translation type="obsolete">Masukkan nama lengkap anda menggunakan huruf latin.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -5956,7 +5956,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Masukkan e-mail addres anda yang masih valid.</translation>
+        <translation type="obsolete">Masukkan e-mail addres anda yang masih valid.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -5968,7 +5968,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Selamat datang di Form Registrasi VirtualBox!</translation>
+        <translation type="obsolete">Selamat datang di Form Registrasi VirtualBox!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -5984,7 +5984,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Tidak dapat melakukan handshake koneksi.</translation>
+        <translation type="obsolete">Tidak dapat melakukan handshake koneksi.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5996,63 +5996,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Batal</translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Batal</translation>
     </message>
 </context>
 <context>
@@ -9847,7 +9791,7 @@ membuat guest dapat melihat sebuah kartu suara, namuan semua akses kepadanya aka
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
index 0e38389ea..b5bd65ed2 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Vincenzo Reale, Ciro Mattia Gonano</translation>
+        <translation type="obsolete">Vincenzo Reale, Ciro Mattia Gonano</translation>
     </message>
 </context>
 <context>
@@ -2060,7 +2060,7 @@ p, li { white-space: pre-wrap; }
         <translation>Anteprima in tempo reale &amp;dell&apos;icona del pannello</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>Mostr&amp;a automaticamente il pannello e la barra dei menu a schermo intero</translation>
     </message>
 </context>
@@ -6318,7 +6318,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.&lt;
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Finestra di registrazione VirtualBox</translation>
+        <translation type="obsolete">Finestra di registrazione VirtualBox</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6330,7 +6330,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.&lt;
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Inserite il vostro nome completo con caratteri Latin.</translation>
+        <translation type="obsolete">Inserite il vostro nome completo con caratteri Latin.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -6338,7 +6338,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.&lt;
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Inserite un indirizzo mail valido.</translation>
+        <translation type="obsolete">Inserite un indirizzo mail valido.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -6350,7 +6350,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.&lt;
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Benvenuti al modulo di registrazione di VirtualBox!</translation>
+        <translation type="obsolete">Benvenuti al modulo di registrazione di VirtualBox!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -6366,7 +6366,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.&lt;
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Impossibile completare l&apos;handshake della connessione.</translation>
+        <translation type="obsolete">Impossibile completare l&apos;handshake della connessione.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6382,63 +6382,63 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.&lt;
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annulla</translation>
+        <translation type="obsolete">Annulla</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Seleziona Stato/Territorio</translation>
+        <translation type="obsolete">Seleziona Stato/Territorio</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Compila il modulo di registrazione per farci sapere che usi VirtualBox e, a scelta, per tenerti informato sulle novità e sugli aggiornamenti di VirtualBox.&lt;/p&gt;&lt;p&gt;Ti preghiamo di utilizzare caratteri Latin per la compilazione dei campi seguenti. Nota che Sun Microsystems utilizzerà queste informazioni solamente per raccogliere statistiche di utilizzo del prodotto e per inviare le newsletter di VirtualBox. In particolare, Sun Microsystems non fornirà mai i tuoi dati a terze parti. Informazioni dettagliate sull&apos;utilzzo da parte nostra dei tuoi dati personali sono disponibili nella sezione &lt;b&gt;Privacy Policy&lt;/b&gt; del manuale di VirtualBox o nella pagina &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; del sito web di VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Compila il modulo di registrazione per farci sapere che usi VirtualBox e, a scelta, per tenerti informato sulle novità e sugli aggiornamenti di VirtualBox.&lt;/p&gt;&lt;p&gt;Ti preghiamo di utilizzare caratteri Latin per la compilazione dei campi seguenti. Nota che Sun Microsystems utilizzerà queste informazioni solamente per raccogliere statistiche di utilizzo del prodotto e per inviare le newsletter di VirtualBox. In particolare, Sun Microsystems non fornirà mai i tuoi dati a terze parti. Informazioni dettagliate sull&apos;utilzzo da parte nostra dei tuoi dati personali sono disponibili nella sezione &lt;b&gt;Privacy Policy&lt;/b&gt; del manuale di VirtualBox o nella pagina &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; del sito web di VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>&amp;Ho già un account Sun Online:</translation>
+        <translation type="obsolete">&amp;Ho già un account Sun Online:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;Email:</translation>
+        <translation type="obsolete">&amp;Email:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Password:</translation>
+        <translation type="obsolete">&amp;Password:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Vorrei re&amp;gistrarmi creando un nuovo account Sun Online:</translation>
+        <translation type="obsolete">Vorrei re&amp;gistrarmi creando un nuovo account Sun Online:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>N&amp;ome:</translation>
+        <translation type="obsolete">N&amp;ome:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Cognome:</translation>
+        <translation type="obsolete">&amp;Cognome:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Società:</translation>
+        <translation type="obsolete">&amp;Società:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>Sta&amp;to:</translation>
+        <translation type="obsolete">Sta&amp;to:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E&amp;mail:</translation>
+        <translation type="obsolete">E&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>P&amp;assword:</translation>
+        <translation type="obsolete">P&amp;assword:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Co&amp;nferma password:</translation>
+        <translation type="obsolete">Co&amp;nferma password:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registra</translation>
+        <translation type="obsolete">&amp;Registra</translation>
     </message>
 </context>
 <context>
@@ -10827,7 +10827,7 @@ fa vedere al sistema Guest una scheda sonora, ignorando qualsiasi accesso ad ess
         <translation>&amp;Processore(i):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Controlla il numero di CPU virtuali di questa macchina virtuale.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
index 789a36692..2d03a166c 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
@@ -1,53 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="ja">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS>
+<TS version="2.0" language="ja">
 <context>
     <name>@@@</name>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2608"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2622"/>
         <source>English</source>
         <comment>Native language name</comment>
         <translation>日本語</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2619"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2633"/>
         <source>--</source>
         <comment>Native language country name (empty if this language is for all countries)</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2632"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2646"/>
         <source>English</source>
         <comment>Language name, in English</comment>
         <translation>Japanese</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2643"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2657"/>
         <source>--</source>
         <comment>Language country name, in English (empty if native country name is empty)</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Toshimitsu Tanaka</translation>
+        <translation type="obsolete">Toshimitsu Tanaka</translation>
     </message>
 </context>
 <context>
     <name>AttachmentsModel</name>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Double-click to add a new attachment</source>
         <translation type="obsolete">ダブルクリック�新��割り当�を追加</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Hard Disk</source>
         <translation type="obsolete">�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Slot</source>
         <translation type="obsolete">スロット</translation>
     </message>
@@ -55,22 +51,18 @@
 <context>
     <name>BootItemsList</name>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Move Up (Ctrl-Up)</source>
         <translation type="obsolete">上�移動(Ctrl-Up)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Move Down (Ctrl-Down)</source>
         <translation type="obsolete">下�移動(Ctrl-Down)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Moves the selected boot device up.</source>
         <translation type="obsolete">�択��起動デ�イスを上�移動���。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Moves the selected boot device down.</source>
         <translation type="obsolete">�択��起動デ�イスを下�移動���。</translation>
     </message>
@@ -78,7 +70,6 @@
 <context>
     <name>BootItemsTable</name>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <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">起動デ�イス�優先順�を指定���。�ェックボックスを使��デ�イスを有効���無効�����。項目を上���下�移動��デ�イス�順�を変更������。</translation>
     </message>
@@ -86,17 +77,14 @@
 <context>
     <name>HDItemsModel</name>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Double-click to add a new attachment</source>
         <translation type="obsolete">ダブルクリック�新��割り当�を追加</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Hard Disk</source>
         <translation type="obsolete">�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2656"/>
         <source>Slot</source>
         <translation type="obsolete">スロット</translation>
     </message>
@@ -104,77 +92,76 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../src/main.cpp" line="444"/>
+        <location filename="../src/main.cpp" line="445"/>
         <source>Executable &lt;b&gt;%1&lt;/b&gt; requires Qt %2.x, found Qt %3.</source>
         <translation>実行ファイル &lt;b&gt;%1&lt;/b&gt; �Qt %2.x �必���。Qt %3 �見��り���。</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="449"/>
+        <location filename="../src/main.cpp" line="450"/>
         <source>Incompatible Qt Library Error</source>
         <translation>互�性���Qtライブラリエラー</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="674"/>
+        <location filename="../src/main.cpp" line="675"/>
         <source>VirtualBox - Error In %1</source>
         <translation>VirtualBox - %1 �エラー</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="679"/>
+        <location filename="../src/main.cpp" line="680"/>
         <source>&lt;html&gt;&lt;b&gt;%1 (rc=%2)&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;</source>
         <translation>&lt;html&gt;&lt;b&gt;%1 (rc=%2)&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="105"/>
+        <location filename="../src/main.cpp" line="106"/>
         <source>Please try reinstalling VirtualBox.</source>
         <translation>VirtualBoxを�インストール������。</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="105"/>
         <source>This error means that the kernel driver was either not able to allocate enough memory or that some mapping operation failed.&lt;br/&gt;&lt;br/&gt;There are known problems with Linux 2.6.29. If you are running such a kernel, please edit /usr/src/vboxdrv-*/Makefile and enable &lt;i&gt;VBOX_USE_INSERT_PAGE = 1&lt;/i&gt;. After that, re-compile the kernel module by executing&lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;as root.</source>
         <translation type="obsolete">��エラー��カー�ル ドライ���分�メモリを割り当����������マッピング�作�失敗����を�味���。&lt;br/&gt;&lt;br/&gt;�れ�Linux 2.6.29�既知��題��。���ージョン�カー�ルを使用�る�ら��/usr/src/vboxdrv-*/Makefileを編集��&lt;i&gt;VBOX_USE_INSERT_PAGE = 1&lt;/i&gt;を有効�������。��後�root権��&lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;を実行��カー�ル モジュールを�コンパイル������。</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="74"/>
+        <location filename="../src/main.cpp" line="75"/>
         <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&lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;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>
         <translation>VirtualBox�Linuxカー�ル ドライ�(vboxdrv)�ロード�れ��ん。���/dev/vboxdrv�パーミッション��題��り��。root権��&lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;を実行��カー�ル モジュールを�セットアップ������。Ubuntu�Fedora���Mandrivaユーザー�最��DKMSパッケージをインストール������。��パッケージ�Linuxカー�ル�変更を把���必��ら�vboxdrvカー�ル モジュールを�コンパイル���。</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="100"/>
+        <location filename="../src/main.cpp" line="101"/>
         <source>Make sure the kernel module has been loaded successfully.</source>
         <translation>カー�ル モジュール�正��ロード�れ���を確�������。</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="601"/>
+        <location filename="../src/main.cpp" line="602"/>
         <source>VirtualBox - Runtime Error</source>
         <translation>VirtualBox - ランタイムエラー</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="607"/>
+        <location filename="../src/main.cpp" line="608"/>
         <source>&lt;b&gt;Cannot access the kernel driver!&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;</source>
         <translation>&lt;b&gt;カー�ルドライ��アクセス����ん�&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="631"/>
+        <location filename="../src/main.cpp" line="632"/>
         <source>Unknown error %2 during initialization of the Runtime</source>
         <translation>ランタイム��期化中�予期���エラー(%2)</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="621"/>
+        <location filename="../src/main.cpp" line="622"/>
         <source>Kernel driver not accessible</source>
         <translation>カー�ルドライ��アクセス����</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="84"/>
+        <location filename="../src/main.cpp" line="85"/>
         <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を完全�アンインストール後��インストール�る���解決�る�も�れ��ん。</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="91"/>
+        <location filename="../src/main.cpp" line="92"/>
         <source>The VirtualBox kernel modules do not match this version of VirtualBox. The installation of VirtualBox was apparently not successful. Executing&lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;may correct this. Make sure that you do not mix the OSE version and the PUEL version of VirtualBox.</source>
         <translation>カー�ルモジュール��ージョン������ん。VirtualBox�インストール��功���ん���。&lt;/br&gt;&lt;/br&gt;&lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;を実行�る�����題�修正�れる��ょ�。VirtualBox�OSE�ージョン�PUEL�ージョンを混在��使用��������。</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="69"/>
+        <location filename="../src/main.cpp" line="70"/>
         <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>
     </message>
@@ -200,6 +187,7 @@
         <translation>ディレクトリを�択</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIFileDialog.cpp" line="450"/>
         <location filename="../src/extensions/QIFileDialog.cpp" line="689"/>
         <source>Select a file</source>
         <translation>ファイルを�択</translation>
@@ -208,7 +196,6 @@
 <context>
     <name>QIHelpButton</name>
     <message>
-        <location filename="../src/extensions/QIFileDialog.cpp" line="689"/>
         <source>&amp;Help</source>
         <translation type="obsolete">ヘルプ(&amp;H)</translation>
     </message>
@@ -226,46 +213,55 @@
         <translation>�</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="306"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="360"/>
         <source>Left Shift</source>
         <translation>å·¦ Shift</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="307"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="361"/>
         <source>Right Shift</source>
         <translation>� Shift</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="308"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="362"/>
         <source>Left Ctrl</source>
         <translation>å·¦ Ctrl</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="309"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="363"/>
         <source>Right Ctrl</source>
         <translation>� Ctrl</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="310"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="364"/>
         <source>Left Alt</source>
         <translation>å·¦ Alt</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="311"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="365"/>
         <source>Right Alt</source>
         <translation>� Alt</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="312"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="366"/>
         <source>Left WinKey</source>
         <translation>左 Windowsキー</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="313"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="367"/>
         <source>Right WinKey</source>
         <translation>� Windowsキー</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="314"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="368"/>
         <source>Menu key</source>
         <translation>メニューキー</translation>
@@ -276,16 +272,22 @@
         <translation>Alt Gr</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="315"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="370"/>
         <source>Caps Lock</source>
         <translation>Caps Lock</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="316"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="371"/>
         <source>Scroll Lock</source>
         <translation>Scroll Lock</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="422"/>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="430"/>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="443"/>
+        <location filename="../src/extensions/QIHotKeyEdit.cpp" line="485"/>
         <location filename="../src/extensions/QIHotKeyEdit.cpp" line="602"/>
         <source>&lt;key_%1&gt;</source>
         <translation>&lt;キー %1&gt;</translation>
@@ -460,7 +462,6 @@
 <context>
     <name>QILabelPrivate</name>
     <message>
-        <location filename="../src/extensions/QILabel.cpp" line="204"/>
         <source>&amp;Copy</source>
         <translation type="obsolete">コピー(&amp;C)</translation>
     </message>
@@ -506,7 +507,6 @@
 <context>
     <name>QIRichLabel</name>
     <message>
-        <location filename="../src/extensions/QIMessageBox.cpp" line="393"/>
         <source>Copy to clipboard</source>
         <translation type="obsolete">クリップボード�コピー</translation>
     </message>
@@ -539,28 +539,26 @@
 <context>
     <name>VBoxAboutDlg</name>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="64"/>
+        <location filename="../src/VBoxAboutDlg.cpp" line="65"/>
         <source>VirtualBox - About</source>
         <translation>VirtualBox ����</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="64"/>
         <source>&lt;qt&gt;VirtualBox Graphical User Interface Version %1&lt;br&gt;
 %2&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;VirtualBox グラフィカルユーザーインターフェース �ージョン %1&lt;br&gt;%2&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="64"/>
         <source>&lt;qt&gt;VirtualBox Graphical User Interface Version %1&lt;br&gt;%2&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;VirtualBox グラフィカルユーザーインターフェース �ージョン %1&lt;br&gt;%2&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="65"/>
+        <location filename="../src/VBoxAboutDlg.cpp" line="66"/>
         <source>VirtualBox Graphical User Interface</source>
         <translation>VirtualBox グラフィカルユーザーインターフェース</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
+        <location filename="../src/VBoxAboutDlg.cpp" line="70"/>
         <source>Version %1</source>
         <translation>�ージョン %1</translation>
     </message>
@@ -568,12 +566,10 @@
 <context>
     <name>VBoxAboutNonOSEDlg</name>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>VirtualBox - About</source>
         <translation type="obsolete">VirtualBox ����</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>VirtualBox Graphical User Interface
 Version %1</source>
         <translation type="obsolete">VirtualBox グラフィカルユーザーインターフェース �ージョン %1</translation>
@@ -582,27 +578,22 @@ Version %1</source>
 <context>
     <name>VBoxAddNIDialog</name>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Add Host Interface</source>
         <translation type="obsolete">ホスト インターフェース�追加</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Interface Name</source>
         <translation type="obsolete">インターフェース�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Descriptive name of the new network interface</source>
         <translation type="obsolete">新��ットワーク インターフェース�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
@@ -610,67 +601,54 @@ Version %1</source>
 <context>
     <name>VBoxAddSFDialog</name>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Add Share</source>
         <translation type="obsolete">共有フォルダ�追加</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Edit Share</source>
         <translation type="obsolete">設定�編集</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Select a folder to share</source>
         <translation type="obsolete">�択��フォルダを共有</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Folder Path</source>
         <translation type="obsolete">フォルダ�パス</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Folder Name</source>
         <translation type="obsolete">フォルダ�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Displays the path to an existing folder on the host PC.</source>
         <translation type="obsolete">ホストPC上�既存�フォルダ�パスを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Displays the name of the shared folder (as it will be seen by the guest OS).</source>
         <translation type="obsolete">ゲストOS�使用�れる共有フォルダ�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Opens the dialog to select a folder.</source>
         <translation type="obsolete">フォルダ�択ダイアログを開���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>&amp;Make Permanent</source>
         <translation type="obsolete">永続化�る(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>&amp;Read-only</source>
         <translation type="obsolete">読�込�専用(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxAboutDlg.cpp" line="69"/>
         <source>When checked, the guest OS will not be able to write to the specified shared folder.</source>
         <translation type="obsolete">ゲストOS�ら指定�れ�共有フォルダ��書�込�を�止���。</translation>
     </message>
@@ -741,6 +719,7 @@ Version %1</source>
         <translation>�ージョン</translation>
     </message>
     <message>
+        <location filename="../src/widgets/VBoxApplianceEditorWgt.cpp" line="186"/>
         <location filename="../src/widgets/VBoxApplianceEditorWgt.cpp" line="791"/>
         <source>Description</source>
         <translation>説明</translation>
@@ -816,6 +795,7 @@ Version %1</source>
         <translation>�明��ードウェア項目</translation>
     </message>
     <message>
+        <location filename="../src/widgets/VBoxApplianceEditorWgt.cpp" line="221"/>
         <location filename="../src/widgets/VBoxApplianceEditorWgt.cpp" line="400"/>
         <source>MB</source>
         <translation>MB</translation>
@@ -859,37 +839,30 @@ Version %1</source>
         <translation>仮想マシン�電�オフ(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="159"/>
         <source>&amp;Revert to the current snapshot</source>
         <translation type="obsolete">最新�スナップショット�状態�戻�(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="159"/>
         <source>Revert the machine state to the state stored in the current snapshot</source>
         <translation type="obsolete">仮想マシン�状態を最新�スナップショット��存�れ��る状態�戻�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="159"/>
         <source>Help</source>
         <translation type="obsolete">ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="159"/>
         <source>F1</source>
         <translation type="obsolete">F1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="159"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="159"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="159"/>
         <source>&lt;p&gt;Saves the current execution state of the virtual machine to the physical hard disk of the host PC.&lt;/p&gt;
 &lt;p&gt;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.&lt;/p&gt;
 &lt;p&gt;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 the virtual machine.&lt;/p&gt;</source>
@@ -904,7 +877,6 @@ Version %1</source>
         <translation>シャットダウン シグナル�信(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="133"/>
         <source>&lt;p&gt;Sends the ACPI Power Button press event to the virtual machine.&lt;/p&gt;
 &lt;p&gt;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.&lt;/p&gt;
 &lt;p&gt;If the machine doesn&apos;t respond to this action then the guest operating system may be misconfigured or doesn&apos;t understand ACPI Power Button events at all. In this case you should select the &lt;b&gt;Power off the machine&lt;/b&gt; action to stop virtual machine execution.&lt;/p&gt;</source>
@@ -913,7 +885,6 @@ Version %1</source>
 &lt;p&gt;仮想マシン���動作��応����ら��ゲストOS�構��誤り��る��電�ボタン オフ�ACPIイベント�対応�����ん。��場��仮想マシン�実行を�止�る��&lt;b&gt;[仮想マシン�電�オフ]&lt;/b&gt;を�択���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxCloseVMDlg.ui" line="133"/>
         <source>&lt;p&gt;Turns off the virtual machine.&lt;/p&gt;
 &lt;p&gt;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 &lt;i&gt;data loss&lt;/i&gt; inside the virtual machine. Selecting this action is recommended only if the virtual machine does not respond to the &lt;b&gt;Send the shutdown signal&lt;/b&gt; action.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想マシン�電�を切り��。&lt;/p&gt;
@@ -953,692 +924,649 @@ Version %1</source>
 <context>
     <name>VBoxConsoleWnd</name>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1613"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1631"/>
         <source>VirtualBox OSE</source>
         <translation>VirtualBox OSE</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1643"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1661"/>
         <source>&amp;Fullscreen Mode</source>
         <translation>フルスクリーンモード(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1644"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1662"/>
         <source>Switch to fullscreen mode</source>
         <translation>フルスクリーンモード�切り替�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1638"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1656"/>
         <source>Mouse Integration</source>
         <comment>enable/disable...</comment>
         <translation>マウス統�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1640"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1658"/>
         <source>Auto-resize Guest Display</source>
         <comment>enable/disable...</comment>
         <translation>ゲストOS�画�を自動的�リサイズ�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1649"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>Auto-resize &amp;Guest Display</source>
         <translation>ゲストOS�画�を自動リサイズ(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1650"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1668"/>
         <source>Automatically resize the guest display when the window is resized (requires Guest Additions)</source>
         <translation>ウィンドウをリサイズ�����ゲストOS�画�を自動的�リサイズ�る(Guest Additions �インストール�必�)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1653"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1671"/>
         <source>&amp;Adjust Window Size</source>
         <translation>ウィンドウ�サイズを調整(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1654"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1672"/>
         <source>Adjust window size and position to best fit the guest display</source>
         <translation>ゲストOS�画������ウィンドウ�サイズ��置を調整�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1658"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1676"/>
         <source>&amp;Insert Ctrl-Alt-Del</source>
         <translation>Ctrl-Alt-Delを�信(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1659"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1677"/>
         <source>Send the Ctrl-Alt-Del sequence to the virtual machine</source>
         <translation>仮想マシン�Ctrl-Alt-Delシーケンスを�信�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1662"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1680"/>
         <source>&amp;Insert Ctrl-Alt-Backspace</source>
         <translation>Ctrl-Alt-Backspaceを�信(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1663"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1681"/>
         <source>Send the Ctrl-Alt-Backspace sequence to the virtual machine</source>
         <translation>仮想マシン�Ctrl-Alt-Backspaceシーケンスを�信�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1672"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1690"/>
         <source>&amp;Reset</source>
         <translation>リセット(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1673"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1691"/>
         <source>Reset the virtual machine</source>
         <translation>仮想マシンをリセット�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1681"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1697"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1699"/>
         <source>ACPI S&amp;hutdown</source>
         <translation>ACPI シャットダウン(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1683"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1701"/>
         <source>Send the ACPI Power Button press event to the virtual machine</source>
         <translation>仮想マシン�電�ボタン オフ�ACPIイベントを�信�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1685"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1703"/>
         <source>&amp;Close...</source>
         <translation>閉�る(&amp;C)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1686"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1704"/>
         <source>Close the virtual machine</source>
         <translation>仮想マシンを閉�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1666"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1684"/>
         <source>Take &amp;Snapshot...</source>
         <translation>スナップショット作�(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1685"/>
         <source>Take a snapshot of the virtual machine</source>
         <translation>仮想マシン�スナップショットを作��る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>&amp;Floppy Image...</source>
         <translation type="obsolete">フロッピーイメージ(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>Mount a floppy image file</source>
         <translation type="obsolete">フロッピーイメージファイルをマウント�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>Unmount F&amp;loppy</source>
         <translation type="obsolete">フロッピー�マウント解除(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>Unmount the currently mounted floppy media</source>
         <translation type="obsolete">マウント中�フロッピーメディアをマウント解除�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>&amp;CD/DVD-ROM Image...</source>
         <translation type="obsolete">CD/DVD-ROMイメージ(&amp;C)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>Mount a CD/DVD-ROM image file</source>
         <translation type="obsolete">CD/DVD-ROMイメージファイルをマウント�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>Unmount C&amp;D/DVD-ROM</source>
         <translation type="obsolete">CD/DVD-ROM�マウント解除(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/>
         <source>Unmount the currently mounted CD/DVD-ROM media</source>
         <translation type="obsolete">マウント中�CD/DVDメディアをマウント解除�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1702"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1720"/>
         <source>Remote Desktop (RDP) Server</source>
         <comment>enable/disable...</comment>
         <translation>リモートデスクトップ(RDP)サー�ー</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1702"/>
         <source>Remote Dis&amp;play</source>
         <translation type="obsolete">リモートディスプレイ(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1700"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1718"/>
         <source>Enable or disable remote desktop (RDP) connections to this machine</source>
         <translation>��仮想マシン��リモートデスクトップ(RDP)接続を有効化���無効化</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1696"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1714"/>
         <source>&amp;Shared Folders...</source>
         <translation>共有フォルダ(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1697"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1715"/>
         <source>Create or modify shared folders</source>
         <translation>共有フォルダ設定ダイアログを開�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1705"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1723"/>
         <source>&amp;Install Guest Additions...</source>
         <translation>Guest Additions �インストール(&amp;I)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1724"/>
         <source>Mount the Guest Additions installation image</source>
         <translation>Guest Additions インストールイメージをマウント�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
         <source>&amp;VirtualBox Web Site...</source>
         <translation type="obsolete">VirtualBox Webサイト(&amp;V)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
         <source>Open the browser and go to the VirtualBox product web site</source>
         <translation type="obsolete">Webブラウザ�VirtualBox製��Webサイトを開�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
         <source>&amp;About VirtualBox...</source>
         <translation type="obsolete">VirtualBox ����(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
         <source>Show a dialog with product information</source>
         <translation type="obsolete">製�情報ダイアログを表示�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
         <source>&amp;Reset All Warnings</source>
         <translation type="obsolete">����警告をリセット(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
         <source>Go back to showing all suppressed warnings and messages</source>
         <translation type="obsolete">����抑止�れ�警告�メッセージを�度表示��る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
         <source>Mount &amp;Floppy</source>
         <translation type="obsolete">フロッピー�マウント(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1706"/>
         <source>Mount &amp;CD/DVD-ROM</source>
         <translation type="obsolete">CD/DVD-ROM�マウント(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1708"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1726"/>
         <source>&amp;USB Devices</source>
         <translation>USB デ�イス(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1729"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1747"/>
         <source>&amp;Devices</source>
         <translation>デ�イス(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1734"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1752"/>
         <source>De&amp;bug</source>
         <translation>デ�ッグ(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1736"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1754"/>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1736"/>
         <source>Indicates whether the guest display auto-resize function is On (&lt;img src=auto_resize_on_16px.png/&gt;) or Off (&lt;img src=auto_resize_off_16px.png/&gt;). Note that this function requires Guest Additions to be installed in the guest OS.</source>
         <translation type="obsolete">ゲストOS�画��自動リサイズ機能�有効���(&lt;img src=auto_resize_on_16px.png/&gt;)を�無効���(&lt;img src=auto_resize_off_16px.png/&gt;)を表示���。注：本機能�利用��ゲストOS� Guest Additions �インストール�必���。
 </translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1736"/>
         <source>Indicates whether the host mouse pointer is captured by the guest OS:&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_disabled_16px.png/&gt;&amp;nbsp;&amp;nbsp;pointer is not captured&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_16px.png/&gt;&amp;nbsp;&amp;nbsp;pointer is captured&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_seamless_16px.png/&gt;&amp;nbsp;&amp;nbsp;mouse integration (MI) is On&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_can_seamless_16px.png/&gt;&amp;nbsp;&amp;nbsp;MI is Off, pointer is captured&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_can_seamless_uncaptured_16px.png/&gt;&amp;nbsp;&amp;nbsp;MI is Off, pointer is not captured&lt;/nobr&gt;&lt;br&gt;Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="obsolete">ホスト マウス�インタ�キャプ�ャ状態を表示:&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_disabled_16px.png/&gt;&amp;nbsp;&amp;nbsp;キャプ�ャ�れ����ん&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_16px.png/&gt;&amp;nbsp;&amp;nbsp;キャプ�ャ�れ����&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_seamless_16px.png/&gt;&amp;nbsp;&amp;nbsp;マウス統��有効��&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_can_seamless_16px.png/&gt;&amp;nbsp;&amp;nbsp;マウス統��無効�キャプ�ャ�れ����&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=mouse_can_seamless_uncaptured_16px.png/&gt;&amp;nbsp;&amp;nbsp;マウス統��無効�キャプ�ャ�れ����ん&lt;/nobr&gt;&lt;br&gt; 注：マウス統�機能�利用��ゲストOS� Guest Additions �インストール�必���。
 </translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1736"/>
         <source>Shows the currently assigned Host key.&lt;br&gt;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">�在割り当�られ��るホストキーを表示���。&lt;br&gt;ホストキーを�独�押���キーボート�マウス�制御�切り替�り��。���他�キー�����キーボード ショートカット��作�使用�る�������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3104"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3138"/>
         <source>&lt;hr&gt;The VRDP Server is listening on port %1</source>
         <translation>&lt;hr&gt;VRDPサー�ー��ート %1 を待��������</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3185"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3219"/>
         <source>&amp;Pause</source>
         <translation>一時�止(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3186"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3220"/>
         <source>Suspend the execution of the virtual machine</source>
         <translation>仮想マシン�実行を一時�止�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3190"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3224"/>
         <source>R&amp;esume</source>
         <translation>�開(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3191"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3225"/>
         <source>Resume the execution of the virtual machine</source>
         <translation>仮想マシン�実行を�開�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3199"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3233"/>
         <source>Disable &amp;Mouse Integration</source>
         <translation>マウス統�を無効化(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3200"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3234"/>
         <source>Temporarily disable host mouse pointer integration</source>
         <translation>一時的�ホスト マウス�インタ�統�機能を無効化</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3204"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3238"/>
         <source>Enable &amp;Mouse Integration</source>
         <translation>マウス統�を有効化(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3205"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3239"/>
         <source>Enable temporarily disabled host mouse pointer integration</source>
         <translation>一時的�無効化��ホスト マウス�インタ�統�機能を有効化</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2037"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2055"/>
         <source>Snapshot %1</source>
         <translation>スナップショット %1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2037"/>
         <source>Host Drive </source>
         <translation type="obsolete">ホスト ドライブ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1727"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1742"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1745"/>
         <source>&amp;Machine</source>
         <translation>仮想マシン(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1727"/>
         <source>&amp;Network Adapters</source>
         <translation type="obsolete">�ットワーク アダプタ(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1727"/>
         <source>Adapter %1</source>
         <comment>network</comment>
         <translation type="obsolete">アダプタ %1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1727"/>
         <source>Mount the selected physical drive of the host PC</source>
         <comment>Floppy tip</comment>
         <translation type="obsolete">�択�れ�ホストPC�物�ドライブをマウント�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1727"/>
         <source>Mount the selected physical drive of the host PC</source>
         <comment>CD/DVD tip</comment>
         <translation type="obsolete">�択�れ�ホストPC�物�ドライブをマウント�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1727"/>
         <source>Disconnect the cable from the selected virtual network adapter</source>
         <translation type="obsolete">�択�れ�仮想�ットワーク アダプタ�らケーブルを切断�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1727"/>
         <source>Connect the cable to the selected virtual network adapter</source>
         <translation type="obsolete">�択�れ�仮想�ットワーク アダプタ�ケーブルを接続�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1646"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1664"/>
         <source>Seam&amp;less Mode</source>
         <translation>シームレスモード(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1665"/>
         <source>Switch to seamless desktop integration mode</source>
         <translation>シームレスモード�切り替�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>Indicates whether the keyboard is captured by the guest OS (&lt;img src=hostkey_captured_16px.png/&gt;) or not (&lt;img src=hostkey_16px.png/&gt;).</source>
         <translation type="obsolete">キーボード�ゲストOS�キャプ�ャ�れ��る��(&lt;img src=hostkey_captured_16px.png/&gt;)を�無効���(&lt;img src=hostkey_16px.png/&gt;)を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the floppy media:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
         <comment>Floppy tooltip</comment>
         <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;フロッピーメディア�状態を表示:&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Host Drive&lt;/b&gt;: %1&lt;/nobr&gt;</source>
         <comment>Floppy tooltip</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;ホスト ドライブ&lt;/b&gt;: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Image&lt;/b&gt;: %1&lt;/nobr&gt;</source>
         <comment>Floppy tooltip</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;イメージ&lt;/b&gt;: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No media mounted&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>Floppy tooltip</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;メディア�マウント�れ����&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the CD/DVD-ROM media:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
         <comment>DVD-ROM tooltip</comment>
         <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;CD/DVD-ROMメディア�状態を表示:&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Host Drive&lt;/b&gt;: %1&lt;/nobr&gt;</source>
         <comment>DVD-ROM tooltip</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;ホスト ドライブ&lt;/b&gt;: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Image&lt;/b&gt;: %1&lt;/nobr&gt;</source>
         <comment>DVD-ROM tooltip</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;イメージ&lt;/b&gt;: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No media mounted&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>DVD-ROM tooltip</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;メディア�マウント�れ����&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1647"/>
         <source>&lt;qt&gt;&lt;nobr&gt;Indicates activity on the the virtual hard disks:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
         <comment>HDD tooltip</comment>
         <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;仮想�ードディスク�状態を表示:&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2952"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2986"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No hard disks attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>HDD tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;�ードディスク�割り当�られ����&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2952"/>
         <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the network interfaces:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
         <comment>Network adapters tooltip</comment>
         <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;�ットワーク インターフェース�状態を表示:&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3045"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3079"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Adapter %1 (%2)&lt;/b&gt;: cable %3&lt;/nobr&gt;</source>
         <comment>Network adapters tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;アダプタ %1 (%2)&lt;/b&gt;:ケーブル %3&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3049"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3083"/>
         <source>connected</source>
         <comment>Network adapters tooltip</comment>
         <translation>接続</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3050"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3084"/>
         <source>disconnected</source>
         <comment>Network adapters tooltip</comment>
         <translation>切断</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3054"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3088"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;All network adapters are disabled&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>Network adapters tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;�����ットワーク アダプタ�無効&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3054"/>
         <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the attached USB devices:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
         <comment>USB device tooltip</comment>
         <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;USB デ�イス�状態を表示:&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3078"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3112"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No USB devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>USB device tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;USB デ�イス�割り当�られ����&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3083"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3117"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;USB Controller is disabled&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>USB device tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;USB コントローラ�無効&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3083"/>
         <source>Indicates whether the Remote Display (VRDP Server) is enabled (&lt;img src=vrdp_16px.png/&gt;) or not (&lt;img src=vrdp_disabled_16px.png/&gt;).</source>
         <translation type="obsolete">リモートディスプレイ(VRDPサー�)機能�有効���(&lt;img src=vrdp_16px.png/&gt;) を�無効��� (&lt;img src=vrdp_disabled_16px.png/&gt;)を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3083"/>
         <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the machineof the machine&apos;sapos;s shared folders: shared folders:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
         <comment>Shared folders tooltip</comment>
         <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;共有フォルダ�状態を表示:&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3149"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3183"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No shared folders&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>Shared folders tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;共有フォルダ��&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3149"/>
         <source>&amp;Contents...</source>
         <translation type="obsolete">ヘルプを表示(&amp;C)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3149"/>
         <source>Show the online help contents</source>
         <translation type="obsolete">オンラインヘルプを表示</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3149"/>
         <source>R&amp;egister VirtualBox...</source>
         <translation type="obsolete">VirtualBox を登録(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3149"/>
         <source>Open VirtualBox registration form</source>
         <translation type="obsolete">VirtualBox 登録フォームを開�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1669"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1687"/>
         <source>Session I&amp;nformation Dialog</source>
         <translation>セッション情報ダイアログ(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1670"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1688"/>
         <source>Show Session Information Dialog</source>
         <translation>セッション情報ダイアログを表示</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1713"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1731"/>
         <source>&amp;Statistics...</source>
         <comment>debug action</comment>
         <translation>統計(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1715"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1733"/>
         <source>&amp;Command Line...</source>
         <comment>debug action</comment>
         <translation>コマンドライン(&amp;C)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1717"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1735"/>
         <source>&amp;Logging...</source>
         <comment>debug action</comment>
         <translation>ログ�得(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1760"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1778"/>
         <source>Indicates whether the guest display auto-resize function is On (&lt;img src=:/auto_resize_on_16px.png/&gt;) or Off (&lt;img src=:/auto_resize_off_16px.png/&gt;). Note that this function requires Guest Additions to be installed in the guest OS.</source>
         <translation>ゲストOS�画��自動リサイズ機能�有効���(&lt;img src=:/auto_resize_on_16px.png/&gt;)を�無効���(&lt;img src=:/auto_resize_off_16px.png/&gt;)を表示���。注：本機能�利用��ゲストOS� Guest Additions �インストール�必���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1741"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1759"/>
         <source>Indicates whether the host mouse pointer is captured by the guest OS:&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_disabled_16px.png/&gt;&amp;nbsp;&amp;nbsp;pointer is not captured&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_16px.png/&gt;&amp;nbsp;&amp;nbsp;pointer is captured&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_seamless_16px.png/&gt;&amp;nbsp;&amp;nbsp;mouse integration (MI) is On&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_can_seamless_16px.png/&gt;&amp;nbsp;&amp;nbsp;MI is Off, pointer is captured&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_can_seamless_uncaptured_16px.png/&gt;&amp;nbsp;&amp;nbsp;MI is Off, pointer is not captured&lt;/nobr&gt;&lt;br&gt;Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source>
         <translation>ホスト マウス�インタ�キャプ�ャ状態を表示:&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_disabled_16px.png/&gt;&amp;nbsp;&amp;nbsp;キャプ�ャ�れ����ん&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_16px.png/&gt;&amp;nbsp;&amp;nbsp;キャプ�ャ�れ����&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;&lt;img src=:/mouse_seamless_16px.png/&gt;&amp;nbsp;&amp;nbsp;マウス統��有効��&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_can_seamless_16px.png/&gt;&amp;nbsp;&amp;nbsp;マウス統��無効�キャプ�ャ�れ����&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;img src=:/mouse_can_seamless_uncaptured_16px.png/&gt;&amp;nbsp;&amp;nbsp;マウス統��無効�キャプ�ャ�れ����ん&lt;/nobr&gt;&lt;br&gt; 注：マウス統�機能�利用��ゲストOS� Guest Additions �インストール�必���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1749"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1767"/>
         <source>Indicates whether the keyboard is captured by the guest OS (&lt;img src=:/hostkey_captured_16px.png/&gt;) or not (&lt;img src=:/hostkey_16px.png/&gt;).</source>
         <translation>キーボード�ゲストOS�キャプ�ャ�れ��る��(&lt;img src=:/hostkey_captured_16px.png/&gt;を�無効���(&lt;img src=:/hostkey_16px.png/&gt;)を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3100"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3134"/>
         <source>Indicates whether the Remote Display (VRDP Server) is enabled (&lt;img src=:/vrdp_16px.png/&gt;) or not (&lt;img src=:/vrdp_disabled_16px.png/&gt;).</source>
         <translation>リモートディスプレイ(VRDPサー�ー)機能�有効���(&lt;img src=:/vrdp_16px.png/&gt;) を�無効��� (&lt;img src=:/vrdp_disabled_16px.png/&gt;)を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1752"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1770"/>
         <source>Shows the currently assigned Host key.&lt;br&gt;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>�在割り当�られ��るホストキーを表示���。&lt;br&gt;ホストキーを�独�押���キーボート�マウス�制御�切り替�り��。���他�キー�����キーボード ショートカット��作�使用�る�������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1615"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1633"/>
         <source>Sun VirtualBox</source>
         <translation>Sun VirtualBox</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3165"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3199"/>
         <source>Indicates the status of the hardware virtualization features used by this virtual machine:&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%3:&lt;/b&gt;&amp;nbsp;%4&lt;/nobr&gt;</source>
         <comment>Virtualization Stuff LED</comment>
         <translation>仮想マシン�使用�れる仮想化支�機能�状態を表示:&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%3:&lt;/b&gt;&amp;nbsp;%4&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3175"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3209"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;</source>
         <comment>Virtualization Stuff LED</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1619"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1637"/>
         <source> EXPERIMENTAL build %1r%2 - %3</source>
         <translation>試験的ビルド %1r%2 - %3</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1690"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1708"/>
         <source>&amp;CD/DVD Devices</source>
         <translation>CD/DVD デ�イス(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1691"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1709"/>
         <source>&amp;Floppy Devices</source>
         <translation>フロッピー デ�イス(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1693"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1711"/>
         <source>&amp;Network Adapters...</source>
         <translation>�ットワーク アダプタ(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1694"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1712"/>
         <source>Change the settings of network adapters</source>
         <translation>�ットワーク アダプタ�設定変更</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="1699"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="1717"/>
         <source>&amp;Remote Display</source>
         <translation>リモートディスプレイ(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2316"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2334"/>
         <source>More CD/DVD Images...</source>
         <translation>CD/DVD イメージ�追加...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2317"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2335"/>
         <source>Unmount CD/DVD Device</source>
         <translation>CD/DVD デ�イス�マウント解除</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2322"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2340"/>
         <source>More Floppy Images...</source>
         <translation>フロッピー イメージ�追加...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2323"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2341"/>
         <source>Unmount Floppy Device</source>
         <translation>フロッピー デ�イス�マウント解除</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2342"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2360"/>
         <source>No CD/DVD Devices Attached</source>
         <translation>CD/DVD デ�イス 未割り当�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2345"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2363"/>
         <source>No Floppy Devices Attached</source>
         <translation>フロッピー デ�イス 未割り当�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2928"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2962"/>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the virtual hard disks:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>HDD tooltip</comment>
         <translation>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;アクティブ�仮想�ードディスクを表示:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2959"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="2993"/>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the CD/DVD devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>CD/DVD tooltip</comment>
         <translation>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;アクティブ�CD/DVD デ�イスを表示:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2985"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3019"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No CD/DVD devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>CD/DVD tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;CD/DVD デ�イス�割り当�られ����&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="2993"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3027"/>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the floppy devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>FD tooltip</comment>
         <translation>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;アクティブ�フロッピー デ�イスを表示:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3019"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3053"/>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No floppy devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>FD tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;フロッピー デ�イス�割り当�られ����&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3037"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3071"/>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the network interfaces:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>Network adapters tooltip</comment>
         <translation>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;アクティブ��ットワーク デ�イスを表示:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3062"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3096"/>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the attached USB devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>USB device tooltip</comment>
         <translation>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;アクティブ�USB デ�イスを表示:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3145"/>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the machine&apos;s shared folders:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>Shared folders tooltip</comment>
         <translation>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;アクティブ�共有フォルダを表示:&lt;/nobr&gt;%1&lt;/p&gt;</translation>
@@ -1647,358 +1575,289 @@ Version %1</source>
 <context>
     <name>VBoxDiskImageManagerDlg</name>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Name</source>
         <translation type="obsolete">��</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Virtual Size</source>
         <translation type="obsolete">仮想的�サイズ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Actual Size</source>
         <translation type="obsolete">実際�サイズ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Size</source>
         <translation type="obsolete">サイズ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Virtual Disk Manager</source>
         <translation type="obsolete">仮想ディスクマ�ージャ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&amp;Hard Disks</source>
         <translation type="obsolete">�ードディスク(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&amp;CD/DVD Images</source>
         <translation type="obsolete">CD/DVDイメージ(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&amp;Floppy Images</source>
         <translation type="obsolete">フロッピーイメージ(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Help</source>
         <translation type="obsolete">ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>F1</source>
         <translation type="obsolete">F1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Invoke dialog&apos;s help</source>
         <translation type="obsolete">ダイアログ�ヘルプを表示</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Accept dialog</source>
         <translation type="obsolete">ダイアログ���</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Cancel dialog</source>
         <translation type="obsolete">ダイアログをキャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>--</source>
         <comment>no info</comment>
         <translation type="obsolete">--</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&amp;New...</source>
         <translation type="obsolete">新�(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&amp;Add...</source>
         <translation type="obsolete">追加(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>R&amp;emove</source>
         <translation type="obsolete">除去(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Re&amp;lease</source>
         <translation type="obsolete">解放(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Re&amp;fresh</source>
         <translation type="obsolete">最新�情報�更新(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>New</source>
         <translation type="obsolete">新�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Add</source>
         <translation type="obsolete">追加</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Remove</source>
         <translation type="obsolete">除去</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Release</source>
         <translation type="obsolete">解放</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Refresh</source>
         <translation type="obsolete">最新�情報�更新</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Ctrl+N</source>
         <translation type="obsolete">Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Ctrl+A</source>
         <translation type="obsolete">Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Ctrl+D</source>
         <translation type="obsolete">Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Ctrl+L</source>
         <translation type="obsolete">Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Ctrl+R</source>
         <translation type="obsolete">Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&amp;Actions</source>
         <translation type="obsolete">動作</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Location</source>
         <translation type="obsolete">場所</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Disk Type</source>
         <translation type="obsolete">ディスク タイプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Storage Type</source>
         <translation type="obsolete">ストレージ タイプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Attached to</source>
         <translation type="obsolete">割り当�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Snapshot</source>
         <translation type="obsolete">スナップショット</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Checking accessibility</source>
         <translation type="obsolete">アクセス��を確�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;Checking accessibility...</source>
         <comment>HDD</comment>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;アクセス��を確�中...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Disk type:&amp;nbsp;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Storage type:&amp;nbsp;&amp;nbsp;%3&lt;/nobr&gt;</source>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;ディスク タイプ:&amp;nbsp;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;ストレージ タイプ:&amp;nbsp;&amp;nbsp;%3&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;br&gt;&lt;nobr&gt;Attached to:&amp;nbsp;&amp;nbsp;%1&lt;/nobr&gt;</source>
         <comment>HDD</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;割り当�:&amp;nbsp;&amp;nbsp;%1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;br&gt;&lt;nobr&gt;Snapshot:&amp;nbsp;&amp;nbsp;%5&lt;/nobr&gt;</source>
         <comment>HDD</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;スナップショット:&amp;nbsp;&amp;nbsp;%5&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;Error checking media accessibility</source>
         <comment>HDD</comment>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;メディア�アクセス��確��エラー</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;%2</source>
         <comment>HDD</comment>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;%2</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;Checking accessibility...</source>
         <comment>CD/DVD/Floppy</comment>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;アクセス��を確�中...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>CD/DVD/Floppy</comment>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;br&gt;&lt;nobr&gt;Attached to:&amp;nbsp;&amp;nbsp;%1&lt;/nobr&gt;</source>
         <comment>CD/DVD/Floppy</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;割り当�:&amp;nbsp;&amp;nbsp;%1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;Error checking media accessibility</source>
         <comment>CD/DVD/Floppy</comment>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;メディア�アクセス��確��エラー</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;%2</source>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;%2</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>The image file is not accessible</source>
         <comment>CD/DVD/Floppy</comment>
         <translation type="obsolete">イメージファイル�アクセス����</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&amp;Select</source>
         <translation type="obsolete">�択(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>All hard disk images (*.vdi; *.vmdk);;Virtual Disk images (*.vdi);;VMDK images (*.vmdk);;All files (*)</source>
         <translation type="obsolete">�����ードディスクイメージファイル(*.vdi; *.vmdk);;仮想ディスクイメージ(*.vdi);;VMDKイメージ(*.vmdk);;����ファイル (*)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Select a hard disk image file</source>
         <translation type="obsolete">�ードディスクイメージファイルを�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Select a CD/DVD-ROM disk image file</source>
         <translation type="obsolete">CD/DVD-ROMディスクイメージファイルを�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Select a floppy disk image file</source>
         <translation type="obsolete">フロッピーディスクイメージファイルを�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Create a new virtual hard disk</source>
         <translation type="obsolete">新�仮想�ードディスク�作�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Add (register) an existing image file</source>
         <translation type="obsolete">既存�メディア ファイルを追加(登録)�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Remove (unregister) the selected media</source>
         <translation type="obsolete">�択��メディアを�り除�(登録解除)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Release the selected media by detaching it from the machine</source>
         <translation type="obsolete">�択��メディアを仮想マシン�ら割り当�解除��解放�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Refresh the media list</source>
         <translation type="obsolete">メディアリストを最新�情報�更新</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>CD/DVD-ROM images (*.iso);;All files (*)</source>
         <translation type="obsolete">CD/DVD-ROMイメージ(*.iso);;����ファイル(*)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Floppy images (*.img);;All files (*)</source>
         <translation type="obsolete">フロッピーイメージ(*.img);;����ファイル(*)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>All hard disk images (*.vdi *.vmdk *.vhd);;Virtual Disk images (*.vdi);;VMDK images (*.vmdk);;VHD images (*.vhd);;All files (*)</source>
         <translation type="obsolete">�����ードディスクイメージファイル(*.vdi *.vmdk *.vhd);;仮想ディスクイメージ(*.vdi);;VMDKイメージ(*.vmdk);;VHDイメージ(*.vhd);;����ファイル (*)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Hard &amp;Disks</source>
         <translation type="obsolete">�ードディスク(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;Location:&lt;/nobr&gt;</source>
         <translation type="obsolete">&lt;nobr&gt;場所:&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;Disk Type:&lt;/nobr&gt;</source>
         <translation type="obsolete">&lt;nobr&gt;ディスク タイプ:&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&amp;nbsp;&amp;nbsp;Storage Type:&lt;/nobr&gt;</source>
         <translation type="obsolete">&lt;nobr&gt;&amp;nbsp;&amp;nbsp;ストレージ タイプ:&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;Attached to:&lt;/nobr&gt;</source>
         <translation type="obsolete">&lt;nobr&gt;割り当�先:&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;nobr&gt;&amp;nbsp;&amp;nbsp;Snapshot:&lt;/nobr&gt;</source>
         <translation type="obsolete">&lt;nobr&gt;&amp;nbsp;&amp;nbsp;スナップショット:&lt;/nobr&gt;</translation>
     </message>
@@ -2006,37 +1865,30 @@ Version %1</source>
 <context>
     <name>VBoxDownloaderWgt</name>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Downloading the VirtualBox Guest Additions CD image from &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;...&lt;/nobr&gt;</source>
         <translation type="obsolete">VirtualBox Guest Additions CDイメージを&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;�らダウンロード...&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Cancel the VirtualBox Guest Additions CD image download</source>
         <translation type="obsolete">VirtualBox Guest Additions CDイメージ�ダウンロードをキャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Could not locate the file on the server (response: %1).</source>
         <translation type="obsolete">サー�ー上�ファイル�見��り��ん���(応答: %1)。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>&lt;p&gt;Failed to save the downloaded file as &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;ダウンロード��ファイル(&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;)��存�失敗����。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Select folder to save Guest Additions image to</source>
         <translation type="obsolete">Guest Additionsイメージを�存�るフォルダを�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3111"/>
         <source>Connection timed out.</source>
         <translation type="obsolete">接続�タイムアウト��り���。</translation>
     </message>
@@ -2098,21 +1950,31 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body&gt;&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;��ウィザード��仮想アプライアンスをエクス�ート�る手順を案内���。&lt;/p&gt;&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ウィザード�次�ページ�進む��&lt;span style=&quot; font-weight:600;&quot;&gt;[次�]&lt;/span&gt;ボタンを���ページ�戻る��&lt;span style=&quot; font-weight:600;&quot;&gt;[戻る]&lt;/span&gt;ボタンを使用������。&lt;/p&gt;&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;エクス�ート�る仮想マシンを�択������。 1�以上�仮想マシンを�択����。 エクス�ート�る����れら�仮想マシンをオフ����れ��り��ん。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="151"/>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="318"/>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="494"/>
         <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="722"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; 戻る(&amp;B)</translation>
     </message>
     <message>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="158"/>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="325"/>
         <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="501"/>
         <source>&amp;Next &gt;</source>
         <translation>次�(&amp;N) &gt;</translation>
     </message>
     <message>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="181"/>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="348"/>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="524"/>
         <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="752"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="202"/>
+        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="369"/>
         <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="545"/>
         <source>Appliance Export Settings</source>
         <translation>仮想アプライアンス�エクス�ート設定</translation>
@@ -2128,7 +1990,6 @@ p, li { white-space: pre-wrap; }
         <translation>デフォルト値�戻�</translation>
     </message>
     <message>
-        <location filename="../src/wizards/exportappliance/VBoxExportApplianceWzd.ui" line="298"/>
         <source>Please specify a filename into which the appliance information will be written. Currently VirtualBox supports the Open Virtualization Format (OVF).</source>
         <translation type="obsolete">仮想アプライアンス情報�書�れ�ファイル�を指定������。 VirtualBox�Open Virtualization Format(OVF)をサ�ート���。</translation>
     </message>
@@ -2327,7 +2188,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxGLSettingsGeneral</name>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="180"/>
         <source>Displays 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">デフォルト�VDIフォルダ�パスを表示���。新�仮想�ードディスク�作�時��存先を明示的�指定���場����フォルダ�使用�れ��。</translation>
     </message>
@@ -2383,7 +2243,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/settings/global/VBoxGLSettingsGeneral.ui" line="159"/>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>フルスクリーンモード時�ドック�メニュー�ーを自動的�表示(&amp;A)</translation>
     </message>
 </context>
@@ -2414,30 +2274,31 @@ p, li { white-space: pre-wrap; }
     <name>VBoxGLSettingsLanguage</name>
     <message>
         <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="91"/>
+        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="92"/>
         <source> (built-in)</source>
         <comment>Language</comment>
         <translation>(内蔵)</translation>
     </message>
     <message>
-        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="117"/>
+        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="118"/>
         <source>&lt;unavailable&gt;</source>
         <comment>Language</comment>
         <translation>&lt;利用��&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="118"/>
+        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="119"/>
         <source>&lt;unknown&gt;</source>
         <comment>Author(s)</comment>
         <translation>&lt;�明&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="131"/>
+        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="132"/>
         <source>Default</source>
         <comment>Language</comment>
         <translation>デフォルト</translation>
     </message>
     <message>
-        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="322"/>
+        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="323"/>
         <source>Language:</source>
         <translation>言語:</translation>
     </message>
@@ -2472,7 +2333,7 @@ p, li { white-space: pre-wrap; }
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="324"/>
+        <location filename="../src/settings/global/VBoxGLSettingsLanguage.cpp" line="325"/>
         <source>Author(s):</source>
         <translation>作者:</translation>
     </message>
@@ -2543,6 +2404,8 @@ p, li { white-space: pre-wrap; }
         <translation>IPv4 アドレス</translation>
     </message>
     <message>
+        <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="202"/>
+        <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="212"/>
         <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="231"/>
         <source>Not set</source>
         <comment>address</comment>
@@ -2554,6 +2417,7 @@ p, li { white-space: pre-wrap; }
         <translation>IPv4 �ットワーク マスク</translation>
     </message>
     <message>
+        <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="205"/>
         <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="234"/>
         <source>Not set</source>
         <comment>mask</comment>
@@ -2608,6 +2472,7 @@ p, li { white-space: pre-wrap; }
         <translation>下�</translation>
     </message>
     <message>
+        <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="237"/>
         <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="240"/>
         <source>Not set</source>
         <comment>bound</comment>
@@ -2634,6 +2499,7 @@ p, li { white-space: pre-wrap; }
         <translation>ホストオンリー �ットワークを編集(&amp;E)</translation>
     </message>
     <message>
+        <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="403"/>
         <location filename="../src/settings/global/VBoxGLSettingsNetwork.cpp" line="448"/>
         <source>Performing</source>
         <comment>creating/removing host-only network</comment>
@@ -2839,904 +2705,876 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxGlobal</name>
     <message>
-        <location filename="../src/settings/global/VBoxGLSettingsUpdate.ui" line="188"/>
         <source>Differencing</source>
         <comment>hard disk</comment>
         <translation type="obsolete">差分</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1464"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1467"/>
         <source>Unknown device %1:%2</source>
         <comment>USB device details</comment>
         <translation>�明�デ�イス %1:%2</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1488"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1491"/>
         <source>&lt;nobr&gt;Vendor ID: %1&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Product ID: %2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Revision: %3&lt;/nobr&gt;</source>
         <comment>USB device tooltip</comment>
         <translation>&lt;nobr&gt;ベンダID: %1&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;プロダクトID: %2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;リビジョン: %3&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1497"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1500"/>
         <source>&lt;br&gt;&lt;nobr&gt;Serial No. %1&lt;/nobr&gt;</source>
         <comment>USB device tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;シリアルNo. %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1504"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1507"/>
         <source>&lt;br&gt;&lt;nobr&gt;State: %1&lt;/nobr&gt;</source>
         <comment>USB device tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;状態: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1599"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1602"/>
         <source>Name</source>
         <comment>details report</comment>
         <translation>��</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1601"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1604"/>
         <source>OS Type</source>
         <comment>details report</comment>
         <translation>OSタイプ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1658"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1674"/>
         <source>Base Memory</source>
         <comment>details report</comment>
         <translation>メインメモリ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1658"/>
         <source>&lt;nobr&gt;%3 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
         <translation type="obsolete">&lt;nobr&gt;%3 MB&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1608"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1611"/>
         <source>General</source>
         <comment>details report</comment>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1697"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1711"/>
         <source>Video Memory</source>
         <comment>details report</comment>
         <translation>ビデオメモリ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1697"/>
         <source>&lt;nobr&gt;%4 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
         <translation type="obsolete">&lt;nobr&gt;%4 MB&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1664"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1680"/>
         <source>Boot Order</source>
         <comment>details report</comment>
         <translation>起動順�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1666"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1682"/>
         <source>ACPI</source>
         <comment>details report</comment>
         <translation>ACPI</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1667"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1683"/>
         <source>IO APIC</source>
         <comment>details report</comment>
         <translation>IO APIC</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1667"/>
         <source>Not Attached</source>
         <comment>details report (HDDs)</comment>
         <translation type="obsolete">割り当�られ����ん</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1667"/>
         <source>Hard Disks</source>
         <comment>details report</comment>
         <translation type="obsolete">�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1634"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1642"/>
         <source>Enabled</source>
         <comment>details report (ACPI)</comment>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1635"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1643"/>
         <source>Disabled</source>
         <comment>details report (ACPI)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1639"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1647"/>
         <source>Enabled</source>
         <comment>details report (IO APIC)</comment>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1648"/>
         <source>Disabled</source>
         <comment>details report (IO APIC)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
         <source>Not mounted</source>
         <comment>details report (floppy)</comment>
         <translation type="obsolete">マウント�れ����ん</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
         <source>Image</source>
         <comment>details report (floppy)</comment>
         <translation type="obsolete">イメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
         <source>Host Drive</source>
         <comment>details report (floppy)</comment>
         <translation type="obsolete">ホスト ドライブ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
         <source>Floppy</source>
         <comment>details report</comment>
         <translation type="obsolete">フロッピー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
         <source>Not mounted</source>
         <comment>details report (DVD)</comment>
         <translation type="obsolete">マウント�れ����ん</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
         <source>Image</source>
         <comment>details report (DVD)</comment>
         <translation type="obsolete">イメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
         <source>Host Drive</source>
         <comment>details report (DVD)</comment>
         <translation type="obsolete">ホスト ドライブ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/>
         <source>CD/DVD-ROM</source>
         <comment>details report</comment>
         <translation type="obsolete">CD/DVD-ROM</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1802"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1816"/>
         <source>Disabled</source>
         <comment>details report (audio)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1808"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1822"/>
         <source>Audio</source>
         <comment>details report</comment>
         <translation>オーディオ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1842"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="644"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1856"/>
         <source>Adapter %1</source>
         <comment>details report (network)</comment>
         <translation>アダプタ %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1851"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1865"/>
         <source>Disabled</source>
         <comment>details report (network)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1859"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1873"/>
         <source>Network</source>
         <comment>details report</comment>
         <translation>�ットワーク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1965"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1979"/>
         <source>Device Filters</source>
         <comment>details report (USB)</comment>
         <translation>デ�イス フィルタ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1966"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1980"/>
         <source>%1 (%2 active)</source>
         <comment>details report (USB)</comment>
         <translation>%1 (%2 アクティブ)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1971"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1985"/>
         <source>Disabled</source>
         <comment>details report (USB)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1971"/>
         <source>VRDP Server Port</source>
         <comment>details report (VRDP)</comment>
         <translation type="obsolete">VRDPサー�ー �ート</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1971"/>
         <source>%1</source>
         <comment>details report (VRDP)</comment>
         <translation type="obsolete">%1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1971"/>
         <source>Disabled</source>
         <comment>details report (VRDP)</comment>
         <translation type="obsolete">無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1971"/>
         <source>Remote Display</source>
         <comment>details report</comment>
         <translation type="obsolete">リモートディスプレイ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1971"/>
         <source>Opening URLs is not implemented yet.</source>
         <translation type="obsolete">&quot;URLを開�&quot;���実装�れ����ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2666"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2680"/>
         <source>Powered Off</source>
         <comment>MachineState</comment>
         <translation>電�オフ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2667"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2681"/>
         <source>Saved</source>
         <comment>MachineState</comment>
         <translation>�存</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2669"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2683"/>
         <source>Aborted</source>
         <comment>MachineState</comment>
         <translation>中断</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2670"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2684"/>
         <source>Running</source>
         <comment>MachineState</comment>
         <translation>実行中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2671"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2685"/>
         <source>Paused</source>
         <comment>MachineState</comment>
         <translation>一時�止</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2675"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2689"/>
         <source>Starting</source>
         <comment>MachineState</comment>
         <translation>起動中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2676"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2690"/>
         <source>Stopping</source>
         <comment>MachineState</comment>
         <translation>�止中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2677"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2691"/>
         <source>Saving</source>
         <comment>MachineState</comment>
         <translation>�存中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2678"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2692"/>
         <source>Restoring</source>
         <comment>MachineState</comment>
         <translation>復元中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2678"/>
         <source>Discarding</source>
         <comment>MachineState</comment>
         <translation type="obsolete">破棄中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2685"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2699"/>
         <source>Closed</source>
         <comment>SessionState</comment>
         <translation>クローズド</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2686"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2700"/>
         <source>Open</source>
         <comment>SessionState</comment>
         <translation>オープン</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2687"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2701"/>
         <source>Spawning</source>
         <comment>SessionState</comment>
         <translation>生�中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2688"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2702"/>
         <source>Closing</source>
         <comment>SessionState</comment>
         <translation>閉鎖中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2690"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2704"/>
         <source>None</source>
         <comment>DeviceType</comment>
         <translation>��</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2691"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2705"/>
         <source>Floppy</source>
         <comment>DeviceType</comment>
         <translation>フロッピー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2692"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2706"/>
         <source>CD/DVD-ROM</source>
         <comment>DeviceType</comment>
         <translation>CD/DVD-ROM</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2693"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2707"/>
         <source>Hard Disk</source>
         <comment>DeviceType</comment>
         <translation>�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2694"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2708"/>
         <source>Network</source>
         <comment>DeviceType</comment>
         <translation>�ットワーク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2719"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2733"/>
         <source>Normal</source>
         <comment>DiskType</comment>
         <translation>標準</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2720"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2734"/>
         <source>Immutable</source>
         <comment>DiskType</comment>
         <translation>変更��</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2721"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2735"/>
         <source>Writethrough</source>
         <comment>DiskType</comment>
         <translation>ライトスルー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2721"/>
         <source>Virtual Disk Image</source>
         <comment>DiskStorageType</comment>
         <translation type="obsolete">仮想ディスクイメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2721"/>
         <source>iSCSI</source>
         <comment>DiskStorageType</comment>
         <translation type="obsolete">iSCSI</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2721"/>
         <source>VMDK Image</source>
         <comment>DiskStorageType</comment>
         <translation type="obsolete">VMDKイメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2724"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2738"/>
         <source>Null</source>
         <comment>VRDPAuthType</comment>
         <translation>Null</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2725"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2739"/>
         <source>External</source>
         <comment>VRDPAuthType</comment>
         <translation>外部</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2726"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2740"/>
         <source>Guest</source>
         <comment>VRDPAuthType</comment>
         <translation>ゲスト</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2734"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2748"/>
         <source>Ignore</source>
         <comment>USBFilterActionType</comment>
         <translation>無視</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2736"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2750"/>
         <source>Hold</source>
         <comment>USBFilterActionType</comment>
         <translation>��</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2739"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2753"/>
         <source>Null Audio Driver</source>
         <comment>AudioDriverType</comment>
         <translation>Null Audio Driver</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2741"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2755"/>
         <source>Windows Multimedia</source>
         <comment>AudioDriverType</comment>
         <translation>Windows マル�メディア</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2745"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2759"/>
         <source>OSS Audio Driver</source>
         <comment>AudioDriverType</comment>
         <translation>OSS オーディオ ドライ�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2747"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2761"/>
         <source>ALSA Audio Driver</source>
         <comment>AudioDriverType</comment>
         <translation>ALSA オーディオ ドライ�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2749"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2763"/>
         <source>Windows DirectSound</source>
         <comment>AudioDriverType</comment>
         <translation>Windows DirectSound</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2751"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2765"/>
         <source>CoreAudio</source>
         <comment>AudioDriverType</comment>
         <translation>CoreAudio</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2776"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2790"/>
         <source>Not attached</source>
         <comment>NetworkAttachmentType</comment>
         <translation>未割り当�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2778"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2792"/>
         <source>NAT</source>
         <comment>NetworkAttachmentType</comment>
         <translation>NAT</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2778"/>
         <source>Host Interface</source>
         <comment>NetworkAttachmentType</comment>
         <translation type="obsolete">ホスト インターフェース</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2782"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2796"/>
         <source>Internal Network</source>
         <comment>NetworkAttachmentType</comment>
         <translation>内部�ットワーク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2811"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2825"/>
         <source>Not supported</source>
         <comment>USBDeviceState</comment>
         <translation>未サ�ート</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2813"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2827"/>
         <source>Unavailable</source>
         <comment>USBDeviceState</comment>
         <translation>利用��</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2815"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2829"/>
         <source>Busy</source>
         <comment>USBDeviceState</comment>
         <translation>ビジー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2817"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2831"/>
         <source>Available</source>
         <comment>USBDeviceState</comment>
         <translation>利用�能</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2819"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2833"/>
         <source>Held</source>
         <comment>USBDeviceState</comment>
         <translation>��</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2821"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2835"/>
         <source>Captured</source>
         <comment>USBDeviceState</comment>
         <translation>キャプ�ャ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2821"/>
         <source>&lt;i&gt;Checking...&lt;/i&gt;</source>
         <comment>hard disk</comment>
         <translation type="obsolete">&lt;i&gt;確�中...&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2821"/>
         <source>&lt;i&gt;Inaccessible&lt;/i&gt;</source>
         <comment>hard disk</comment>
         <translation type="obsolete">&lt;i&gt;アクセス��&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2787"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2801"/>
         <source>Disabled</source>
         <comment>ClipboardType</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2789"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2803"/>
         <source>Host To Guest</source>
         <comment>ClipboardType</comment>
         <translation>ホストOS�らゲストOS�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2791"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2805"/>
         <source>Guest To Host</source>
         <comment>ClipboardType</comment>
         <translation>ゲストOS�らホストOS�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2793"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2807"/>
         <source>Bidirectional</source>
         <comment>ClipboardType</comment>
         <translation>�方�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2793"/>
         <source>Select a directory</source>
         <translation type="obsolete">ディレクトリを�択</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2793"/>
         <source>Select a file</source>
         <translation type="obsolete">ファイルを�択</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1887"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1901"/>
         <source>Port %1</source>
         <comment>details report (serial ports)</comment>
         <translation>�ート %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1896"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1910"/>
         <source>Disabled</source>
         <comment>details report (serial ports)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1904"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1918"/>
         <source>Serial Ports</source>
         <comment>details report</comment>
         <translation>シリアル�ート</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1977"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1991"/>
         <source>USB</source>
         <comment>details report</comment>
         <translation>USB</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1990"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2004"/>
         <source>Shared Folders</source>
         <comment>details report (shared folders)</comment>
         <translation>共有フォルダ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1990"/>
         <source>%1</source>
         <comment>details report (shadef folders)</comment>
         <translation type="obsolete">%1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1995"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2009"/>
         <source>None</source>
         <comment>details report (shared folders)</comment>
         <translation>��</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2001"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2015"/>
         <source>Shared Folders</source>
         <comment>details report</comment>
         <translation>共有フォルダ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2001"/>
         <source>Stuck</source>
         <comment>MachineState</comment>
         <translation type="obsolete">スタック</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2728"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2742"/>
         <source>Disconnected</source>
         <comment>PortMode</comment>
         <translation>切断</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2729"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2743"/>
         <source>Host Pipe</source>
         <comment>PortMode</comment>
         <translation>ホスト�パイプ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2730"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2744"/>
         <source>Host Device</source>
         <comment>PortMode</comment>
         <translation>ホスト デ�イス</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2823"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2837"/>
         <source>User-defined</source>
         <comment>serial port</comment>
         <translation>ユーザー定義</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2823"/>
         <source>Custom Hard Disk</source>
         <comment>DiskStorageType</comment>
         <translation type="obsolete">カスタム �ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1670"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3204"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="483"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1689"/>
         <source>VT-x/AMD-V</source>
         <comment>details report</comment>
         <translation>VT-x/AMD-V</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1668"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1684"/>
         <source>PAE/NX</source>
         <comment>details report</comment>
         <translation>PAE/NX</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1650"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3191"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="452"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1660"/>
         <source>Enabled</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1651"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3192"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="453"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1661"/>
         <source>Disabled</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1644"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1652"/>
         <source>Enabled</source>
         <comment>details report (PAE/NX)</comment>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1645"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1653"/>
         <source>Disabled</source>
         <comment>details report (PAE/NX)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1795"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1809"/>
         <source>Host Driver</source>
         <comment>details report (audio)</comment>
         <translation>ホスト ドライ�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1798"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1812"/>
         <source>Controller</source>
         <comment>details report (audio)</comment>
         <translation>コントローラ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1925"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1939"/>
         <source>Port %1</source>
         <comment>details report (parallel ports)</comment>
         <translation>�ート %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1934"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1948"/>
         <source>Disabled</source>
         <comment>details report (parallel ports)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1943"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1957"/>
         <source>Parallel Ports</source>
         <comment>details report</comment>
         <translation>パラレル�ート</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2695"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2709"/>
         <source>USB</source>
         <comment>DeviceType</comment>
         <translation>USB</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2696"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2710"/>
         <source>Shared Folder</source>
         <comment>DeviceType</comment>
         <translation>共有フォルダ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2698"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2712"/>
         <source>IDE</source>
         <comment>StorageBus</comment>
         <translation>IDE</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2699"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2713"/>
         <source>SATA</source>
         <comment>StorageBus</comment>
         <translation>SATA</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2703"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2717"/>
         <source>Primary</source>
         <comment>StorageBusChannel</comment>
         <translation>プライマリ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2704"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2718"/>
         <source>Secondary</source>
         <comment>StorageBusChannel</comment>
         <translation>セカンダリ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2707"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2721"/>
         <source>Master</source>
         <comment>StorageBusDevice</comment>
         <translation>マスター</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2708"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2722"/>
         <source>Slave</source>
         <comment>StorageBusDevice</comment>
         <translation>スレーブ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2705"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2719"/>
         <source>Port %1</source>
         <comment>StorageBusChannel</comment>
         <translation>�ート %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2705"/>
         <source>VHD Image</source>
         <comment>DiskStorageType</comment>
         <translation type="obsolete">VHDイメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2743"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2757"/>
         <source>Solaris Audio</source>
         <comment>AudioDriverType</comment>
         <translation>Solaris オーディオ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2753"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2767"/>
         <source>PulseAudio</source>
         <comment>AudioDriverType</comment>
         <translation>PulseAudio</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2756"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2770"/>
         <source>ICH AC97</source>
         <comment>AudioControllerType</comment>
         <translation>ICH AC97</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2758"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2772"/>
         <source>SoundBlaster 16</source>
         <comment>AudioControllerType</comment>
         <translation>SoundBlaster 16</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2761"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2775"/>
         <source>PCnet-PCI II (Am79C970A)</source>
         <comment>NetworkAdapterType</comment>
         <translation>PCnet-PCI II (Am79C970A)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2763"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2777"/>
         <source>PCnet-FAST III (Am79C973)</source>
         <comment>NetworkAdapterType</comment>
         <translation>PCnet-FAST III (Am79C973)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2765"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2779"/>
         <source>Intel PRO/1000 MT Desktop (82540EM)</source>
         <comment>NetworkAdapterType</comment>
         <translation>Intel PRO/1000 MT Desktop (82540EM)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2765"/>
         <source>PIIX3</source>
         <comment>IDEControllerType</comment>
         <translation type="obsolete">PIIX3</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2765"/>
         <source>PIIX4</source>
         <comment>IDEControllerType</comment>
         <translation type="obsolete">PIIX4</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2767"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2781"/>
         <source>Intel PRO/1000 T Server (82543GC)</source>
         <comment>NetworkAdapterType</comment>
         <translation>Intel PRO/1000 T Server (82543GC)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1520"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1523"/>
         <source>&lt;nobr&gt;Vendor ID: %1&lt;/nobr&gt;</source>
         <comment>USB filter tooltip</comment>
         <translation>&lt;nobr&gt;ベンダID: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1525"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1528"/>
         <source>&lt;nobr&gt;Product ID: %2&lt;/nobr&gt;</source>
         <comment>USB filter tooltip</comment>
         <translation>&lt;nobr&gt;プロダクトID: %2&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1530"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1533"/>
         <source>&lt;nobr&gt;Revision: %3&lt;/nobr&gt;</source>
         <comment>USB filter tooltip</comment>
         <translation>&lt;nobr&gt;リビジョン: %3&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1535"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1538"/>
         <source>&lt;nobr&gt;Product: %4&lt;/nobr&gt;</source>
         <comment>USB filter tooltip</comment>
         <translation>&lt;nobr&gt;製�: %4&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1540"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1543"/>
         <source>&lt;nobr&gt;Manufacturer: %5&lt;/nobr&gt;</source>
         <comment>USB filter tooltip</comment>
         <translation>&lt;nobr&gt;メーカー: %5&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1545"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1548"/>
         <source>&lt;nobr&gt;Serial No.: %1&lt;/nobr&gt;</source>
         <comment>USB filter tooltip</comment>
         <translation>&lt;nobr&gt;シリアルNo.: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1550"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1553"/>
         <source>&lt;nobr&gt;Port: %1&lt;/nobr&gt;</source>
         <comment>USB filter tooltip</comment>
         <translation>&lt;nobr&gt;�ート: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1557"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1560"/>
         <source>&lt;nobr&gt;State: %1&lt;/nobr&gt;</source>
         <comment>USB filter tooltip</comment>
         <translation>&lt;nobr&gt;状態: %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1557"/>
         <source>host interface, %1</source>
         <comment>details report (network)</comment>
         <translation type="obsolete">ホスト インターフェース, %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1557"/>
         <source>internal network, &apos;%1&apos;</source>
         <comment>details report (network)</comment>
         <translation type="obsolete">内部�ットワーク, &apos;%1&apos;</translation>
@@ -3748,37 +3586,31 @@ p, li { white-space: pre-wrap; }
         <translation>アダプタ %1</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="231"/>
         <source>&lt;br&gt;&lt;nobr&gt;Type&amp;nbsp;(Format):&amp;nbsp;&amp;nbsp;%2&amp;nbsp;(%3)&lt;/nobr&gt;</source>
         <comment>hard disk</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;タイプ&amp;nbsp;(形�):&amp;nbsp;&amp;nbsp;%2&amp;nbsp;(%3)&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="231"/>
         <source>&lt;br&gt;&lt;nobr&gt;Attached to:&amp;nbsp;&amp;nbsp;%1&lt;/nobr&gt;</source>
         <comment>medium</comment>
         <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;割り当�:&amp;nbsp;&amp;nbsp;%1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="231"/>
         <source>&lt;i&gt;Not&amp;nbsp;Attached&lt;/i&gt;</source>
         <comment>medium</comment>
         <translation type="obsolete">&lt;i&gt;未割り当�&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="231"/>
         <source>&lt;br&gt;&lt;i&gt;Checking accessibility...&lt;/i&gt;</source>
         <comment>medium</comment>
         <translation type="obsolete">&lt;br&gt;&lt;i&gt;アクセス��を確�中...&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="231"/>
         <source>&lt;hr&gt;Failed to check media accessibility.&lt;br&gt;%1.</source>
         <comment>medium</comment>
         <translation type="obsolete">&lt;hr&gt;メディア�アクセス���確��失敗����。&lt;br&gt;%1.</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="231"/>
         <source>&lt;hr&gt;&lt;img src=%1/&gt;&amp;nbsp;Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
         <translation type="obsolete">&lt;hr&gt;&lt;img src=%1/&gt;&amp;nbsp;���ードディスク�割り当���新�作��れ�差分�ードディスク�使用�より�間接的�実行�れ��。</translation>
@@ -3796,358 +3628,359 @@ p, li { white-space: pre-wrap; }
         <translation>アクセス����ん</translation>
     </message>
     <message>
-        <location filename="../src/VBoxMedium.cpp" line="446"/>
         <source>&lt;hr&gt;Some of the media in this hard disk chain are inaccessible. Please use the Virtual Media Manager in &lt;b&gt;Show Differencing Hard Disks&lt;/b&gt; mode to inspect these media.</source>
         <translation type="obsolete">&lt;hr&gt;�ードディスク �ェーン中������メディア�アクセス����ん。仮想メディアマ�ージャ�&lt;b&gt;[別��ードディスクを表示�る]&lt;/b&gt;を使用����れら�メディアを確�������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxMedium.cpp" line="446"/>
         <source>%1&lt;hr&gt;This base hard disk is indirectly attached using the following differencing hard disk:&lt;br&gt;%2%3</source>
         <translation type="obsolete">%1&lt;hr&gt;��ベース �ードディスク�以下�差分�ードディスクを使用��間接的�割り当�られ��:&lt;br&gt;%2%3</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1701"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1715"/>
         <source>3D Acceleration</source>
         <comment>details report</comment>
         <translation>3Dアクセラレーション</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1693"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1707"/>
         <source>Enabled</source>
         <comment>details report (3D Acceleration)</comment>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1694"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1708"/>
         <source>Disabled</source>
         <comment>details report (3D Acceleration)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2683"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2697"/>
         <source>Setting Up</source>
         <comment>MachineState</comment>
         <translation>セットアップ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2722"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2736"/>
         <source>Differencing</source>
         <comment>DiskType</comment>
         <translation>差分</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1671"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="484"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1690"/>
         <source>Nested Paging</source>
         <comment>details report</comment>
         <translation>�ステッドページング</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1655"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="455"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1665"/>
         <source>Enabled</source>
         <comment>details report (Nested Paging)</comment>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1656"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="456"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1666"/>
         <source>Disabled</source>
         <comment>details report (Nested Paging)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1656"/>
         <source>Bridged network, %1</source>
         <comment>details report (network)</comment>
         <translation type="obsolete">ブリッジ �ットワーク, &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1833"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1847"/>
         <source>Internal network, &apos;%1&apos;</source>
         <comment>details report (network)</comment>
         <translation>内部�ットワーク, &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1833"/>
         <source>Host-only network, &apos;%1&apos;</source>
         <comment>details report (network)</comment>
         <translation type="obsolete">ホストオンリー �ットワーク, &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2700"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2714"/>
         <source>SCSI</source>
         <comment>StorageBus</comment>
         <translation>SCSI</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2700"/>
         <source>Bridged Network</source>
         <comment>NetworkAttachmentType</comment>
         <translation type="obsolete">ブリッジ �ットワーク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2700"/>
         <source>Host-only Network</source>
         <comment>NetworkAttachmentType</comment>
         <translation type="obsolete">ホストオンリー �ットワーク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2796"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2810"/>
         <source>PIIX3</source>
         <comment>StorageControllerType</comment>
         <translation>PIIX3</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2798"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2812"/>
         <source>PIIX4</source>
         <comment>StorageControllerType</comment>
         <translation>PIIX4</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2800"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2814"/>
         <source>ICH6</source>
         <comment>StorageControllerType</comment>
         <translation>ICH6</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2802"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2816"/>
         <source>AHCI</source>
         <comment>StorageControllerType</comment>
         <translation>AHCI</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2804"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2818"/>
         <source>Lsilogic</source>
         <comment>StorageControllerType</comment>
         <translation>Lsilogic</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2806"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2820"/>
         <source>BusLogic</source>
         <comment>StorageControllerType</comment>
         <translation>BusLogic</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1830"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1844"/>
         <source>Bridged adapter, %1</source>
         <comment>details report (network)</comment>
         <translation>ブリッジ アダプタ, &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1836"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1850"/>
         <source>Host-only adapter, &apos;%1&apos;</source>
         <comment>details report (network)</comment>
         <translation>ホストオンリー アダプタ, &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2769"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2783"/>
         <source>Intel PRO/1000 MT Server (82545EM)</source>
         <comment>NetworkAdapterType</comment>
         <translation>Intel PRO/1000 MT Server (82545EM)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2780"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2794"/>
         <source>Bridged Adapter</source>
         <comment>NetworkAttachmentType</comment>
         <translation>ブリッジ アダプタ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2784"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2798"/>
         <source>Host-only Adapter</source>
         <comment>NetworkAttachmentType</comment>
         <translation>ホストオンリー アダプタ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1698"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1675"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1712"/>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
         <translation>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1661"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3210"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1677"/>
         <source>Processor(s)</source>
         <comment>details report</comment>
         <translation>プロセッサ数</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1662"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1678"/>
         <source>&lt;nobr&gt;%1&lt;/nobr&gt;</source>
         <comment>details report</comment>
         <translation>&lt;nobr&gt;%1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1682"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1696"/>
         <source>System</source>
         <comment>details report</comment>
         <translation>システム</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1721"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="487"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1735"/>
         <source>Remote Display Server Port</source>
         <comment>details report (VRDP Server)</comment>
         <translation>リモートディスプレイ サー�ー �ート</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1725"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1739"/>
         <source>Remote Display Server</source>
         <comment>details report (VRDP Server)</comment>
         <translation>リモートディスプレイ サー�ー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1726"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1740"/>
         <source>Disabled</source>
         <comment>details report (VRDP Server)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1734"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1748"/>
         <source>Display</source>
         <comment>details report</comment>
         <translation>ディスプレイ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2731"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2745"/>
         <source>Raw File</source>
         <comment>PortMode</comment>
         <translation>Rawファイル</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1707"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1721"/>
         <source>Enabled</source>
         <comment>details report (2D Video Acceleration)</comment>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1708"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1722"/>
         <source>Disabled</source>
         <comment>details report (2D Video Acceleration)</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1711"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1725"/>
         <source>2D Video Acceleration</source>
         <comment>details report</comment>
         <translation>2Dビデオ アクセラレーション</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1758"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1772"/>
         <source>(CD/DVD)</source>
         <translation>(CD/DVD)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1775"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1789"/>
         <source>Not Attached</source>
         <comment>details report (Storage)</comment>
         <translation>未割り当�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="1783"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="1797"/>
         <source>Storage</source>
         <comment>details report</comment>
         <translation>ストレージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2668"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2682"/>
         <source>Teleported</source>
         <comment>MachineState</comment>
         <translation>テレ�ーテーション</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2672"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2686"/>
         <source>Guru Meditation</source>
         <comment>MachineState</comment>
         <translation>瞑想中(システムエラー)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2680"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2687"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2694"/>
         <source>Teleporting</source>
         <comment>MachineState</comment>
         <translation>テレ�ーテーション中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2674"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2688"/>
         <source>Taking Live Snapshot</source>
         <comment>MachineState</comment>
         <translation>スナップショット�作�中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2679"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2693"/>
         <source>Teleporting Paused VM</source>
         <comment>MachineState</comment>
         <translation>仮想マシン�テレ�ーテーションを中断</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2681"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2695"/>
         <source>Restoring Snapshot</source>
         <comment>MachineState</comment>
         <translation>スナップショット�復元中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2682"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2696"/>
         <source>Deleting Snapshot</source>
         <comment>MachineState</comment>
         <translation>スナップショットを削除中</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2701"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2715"/>
         <source>Floppy</source>
         <comment>StorageBus</comment>
         <translation>フロッピー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2709"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2723"/>
         <source>Device %1</source>
         <comment>StorageBusDevice</comment>
         <translation>デ�イス %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2711"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2725"/>
         <source>IDE Primary Master</source>
         <comment>New Storage UI : Slot Name</comment>
         <translation>IDE プライマリ マスター</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2712"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2726"/>
         <source>IDE Primary Slave</source>
         <comment>New Storage UI : Slot Name</comment>
         <translation>IDE プライマリ スレーブ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2713"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2727"/>
         <source>IDE Secondary Master</source>
         <comment>New Storage UI : Slot Name</comment>
         <translation>IDE セカンダリ マスター</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2714"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2728"/>
         <source>IDE Secondary Slave</source>
         <comment>New Storage UI : Slot Name</comment>
         <translation>IDE セカンダリ スレーブ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2715"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2729"/>
         <source>SATA Port %1</source>
         <comment>New Storage UI : Slot Name</comment>
         <translation>SATA �ート %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2716"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2730"/>
         <source>SCSI Port %1</source>
         <comment>New Storage UI : Slot Name</comment>
         <translation>SCSI �ート %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2717"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2731"/>
         <source>Floppy Device %1</source>
         <comment>New Storage UI : Slot Name</comment>
         <translation>フロッピー デ�イス %1</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2772"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2786"/>
         <source>Paravirtualized Network (virtio-net)</source>
         <comment>NetworkAdapterType</comment>
         <translation>準仮想化�ットワーク (virtio-net)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="2808"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="2822"/>
         <source>I82078</source>
         <comment>StorageControllerType</comment>
         <translation>I82078</translation>
@@ -4241,42 +4074,42 @@ p, li { white-space: pre-wrap; }
         <translation>��ベース �ードディスク�以下�差分�ードディスクを使用��間接的�割り当�られ��:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/globals/VBoxGlobal.h" line="361"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="362"/>
         <source>%n year(s)</source>
         <translation>
             <numerusform>%n å¹´</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/globals/VBoxGlobal.h" line="366"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="367"/>
         <source>%n month(s)</source>
         <translation>
             <numerusform>%n 月</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/globals/VBoxGlobal.h" line="371"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="372"/>
         <source>%n day(s)</source>
         <translation>
             <numerusform>%n æ—¥</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/globals/VBoxGlobal.h" line="376"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="377"/>
         <source>%n hour(s)</source>
         <translation>
             <numerusform>%n 時間</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/globals/VBoxGlobal.h" line="381"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="382"/>
         <source>%n minute(s)</source>
         <translation>
             <numerusform>%n 分</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/globals/VBoxGlobal.h" line="386"/>
+        <location filename="../src/globals/VBoxGlobal.h" line="387"/>
         <source>%n second(s)</source>
         <translation>
             <numerusform>%n 秒</numerusform>
@@ -4304,231 +4137,186 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxGlobalSettingsDlg</name>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Category</source>
         <translation type="obsolete">カテゴリ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>[id]</source>
         <translation type="obsolete">[id]</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>[link]</source>
         <translation type="obsolete">[link]</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>[name]</source>
         <translation type="obsolete">[name]</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&lt;i&gt;Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information&lt;i&gt;.</source>
         <translation type="obsolete">&lt;i&gt;左��リスト�ら設定�カテゴリを�択��設定項目をマウスオー�ー��詳細�情報を�照������&lt;i&gt;。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source> General </source>
         <translation type="obsolete">一般</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>0</source>
         <translation type="obsolete">0</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source> Input </source>
         <translation type="obsolete">入力</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>1</source>
         <translation type="obsolete">1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source> USB </source>
         <translation type="obsolete"> USB </translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>2</source>
         <translation type="obsolete">2</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Default &amp;Folders</source>
         <translation type="obsolete">デフォルト フォルダ(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Machines</source>
         <translation type="obsolete">仮想マシン</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>VDI files</source>
         <translation type="obsolete">VDIファイル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Select</source>
         <translation type="obsolete">�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Keyboard</source>
         <translation type="obsolete">キーボード(&amp;K)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Host Key</source>
         <translation type="obsolete">ホストキー(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Auto capture keyboard</source>
         <translation type="obsolete">キーボード�自動キャプ�ャ(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;USB Device Filters</source>
         <translation type="obsolete">USB デ�イス フィルタ(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Ins</source>
         <translation type="obsolete">Ins</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Alt+Ins</source>
         <translation type="obsolete">Alt+Ins</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Del</source>
         <translation type="obsolete">Del</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Ctrl+Up</source>
         <translation type="obsolete">Ctrl+Up</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Ctrl+Down</source>
         <translation type="obsolete">Ctrl+Down</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Help</source>
         <translation type="obsolete">ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>F1</source>
         <translation type="obsolete">F1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Displays the dialog help.</source>
         <translation type="obsolete">ダイアログ�ヘルプを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Invalid settings detected</source>
         <translation type="obsolete">無効�設定�見��り���</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Accepts (saves) changes and closes the dialog.</source>
         <translation type="obsolete">変更を�存��ダイアログを閉���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Cancels changes and closes the dialog.</source>
         <translation type="obsolete">変更を破棄��ダイアログを閉���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>VirtualBox Preferences</source>
         <translation type="obsolete">VirtualBox 環境設定</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <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">仮想マシン�ウィンドウ�ホストキー���使用�るキーを表示���。変更�る��入力フィールドをアクティブ���新��ホストキーを押������。注：英数字�カーソルキー�編集キー�ホストキー���使用����ん。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>New Filter %1</source>
         <comment>usb</comment>
         <translation type="obsolete">新�フィルタ %1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Language</source>
         <translation type="obsolete">言語</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source> Language </source>
         <translation type="obsolete">言語</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>3</source>
         <translation type="obsolete">3</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Interface Language</source>
         <translation type="obsolete">インターフェース言語(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Author(s):</source>
         <translation type="obsolete">作者:</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Language:</source>
         <translation type="obsolete">言語:</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source> (built-in)</source>
         <comment>Language</comment>
         <translation type="obsolete">(内蔵)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&lt;unavailable&gt;</source>
         <comment>Language</comment>
         <translation type="obsolete">&lt;利用��&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&lt;unknown&gt;</source>
         <comment>Author(s)</comment>
         <translation type="obsolete">&lt;�明&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
 &lt;qt&gt;Lists all available user interface languages. The effective language is
 written in &lt;b&gt;bold&lt;/b&gt;. Select &lt;i&gt;Default&lt;/i&gt; to reset
@@ -4538,83 +4326,67 @@ to the system default language.&lt;/qt&gt;
 システム�デフォルト言語�戻���&lt;i&gt;デフォルト&lt;/i&gt;を�択������。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Default</source>
         <comment>Language</comment>
         <translation type="obsolete">デフォルト</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Displays 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">デフォルト�VDIフォルダ�パスを表示���。新�仮想�ードディスク�作�時��存先を明示的�指定���場����フォルダ�使用�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <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">仮想マシン フォルダ�パスをデフォルト値�戻���。変更後��度��ダイアログを開��デフォルト�パス�表示�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <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フォルダ�パスをデフォルト値�戻���。変更後��度��ダイアログを開��デフォルト パス�表示�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <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">デフォルト�仮想マシン フォルダ�パスを表示���。新�仮想マシン�作�時��存先を明示的�指定���場����フォルダ�使用�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Opens a dialog to select the default VDI folder.</source>
         <translation type="obsolete">ダイアログを開��デフォルト�VDIフォルダを�択���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Opens a dialog to select the default virtual machine folder.</source>
         <translation type="obsolete">ダイアログを開��デフォルト�仮想マシン フォルダを�択���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <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">仮想マシン�ウィンドウ�アクティブ����キーボードを自動的�キャプ�ャ���。キーボード�キャプ�ャ�れる������キーストローク(Alt-Tab��を�む)�仮想マシン��られ��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>V&amp;RDP Authentication Library</source>
         <translation type="obsolete">VRDP�証ライブラリ(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Displays the path to the library that provides authentication for Remote Display (VRDP) clients.</source>
         <translation type="obsolete">リモートディスプレイ(VRDP)クライアント��証を�供�るライブラリ�パスを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Opens a dialog to select the VRDP authentication library file.</source>
         <translation type="obsolete">VRDP�証ライブラリ ファイル��択ダイアログを開���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <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">�証ライブラリ ファイル�値をデフォルト値�リセット���。変更を�用���度��ダイアログを開���在��証ライブラリ ファイル�表示�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Extended Features</source>
         <translation type="obsolete">拡張機能(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Enable &amp;VT-x/AMD-V</source>
         <translation type="obsolete">VT-x/AMD-Vを有効化(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Defines whether virtual machines should try to make use of the host CPU&apos;s hardware virtualization extensions such as Intel VT-x and AMD-V by default or not.</source>
         <translation type="obsolete">仮想マシン�ホストCPU�Intel VT-xやAMD-V���仮想化支�機能をデフォルト�使用�る����を指定���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
                                               &lt;qt&gt;Lists all global USB
                                               filters. The checkbox to the left
@@ -4629,17 +4401,14 @@ to the system default language.&lt;/qt&gt;
 USBフィルタを追加���除去�る��コンテキストメニュー����ボタンを使用������。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Add Empty Filter</source>
         <translation type="obsolete">空�フィルタを追加</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Add Empty Filter</source>
         <translation type="obsolete">空�フィルタを追加(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
               &lt;qt&gt;Adds a new USB filter with all fields initially set to
               empty strings. Note that such a filter will match any attached USB
@@ -4648,17 +4417,14 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation type="obsolete">&lt;qt&gt;����フィールド�空�新�USBフィルタを追加���。注：��フィルタ�����接続�れ�USB デ�イス������。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Add Filter From Device</source>
         <translation type="obsolete">デ�イス�らフィルタを追加</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>A&amp;dd Filter From Device</source>
         <translation type="obsolete">デ�イス�らフィルタを追加�る(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&lt;qt&gt;Adds a new USB filter with all fields set to the
               values of the selected USB device attached to the host
               PC.&lt;/qt&gt;
@@ -4666,51 +4432,42 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation type="obsolete">&lt;qt&gt;�択��ホストPC�USB デ�イス�値を����フィールド�設定��新�USBフィルタを追加���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Remove Filter</source>
         <translation type="obsolete">フィルタを除去</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Remove Filter</source>
         <translation type="obsolete">フィルタを除去�る(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
               &lt;qt&gt;Removes the highlighted USB filter.&lt;/qt&gt;
             </source>
         <translation type="obsolete">&lt;qt&gt;�イライト表示�れ�フィルタを除去���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Move Filter Up</source>
         <translation type="obsolete">フィルタを上�移動</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Move Filter Up</source>
         <translation type="obsolete">フィルタを上�移動�る(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
               &lt;qt&gt;Moves the highlighted USB filter up.&lt;/qt&gt;
             </source>
         <translation type="obsolete">&lt;qt&gt;�イライト表示�れ�フィルタを上�移動���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Move Filter Down</source>
         <translation type="obsolete">フィルタを下�移動</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>M&amp;ove Filter Down</source>
         <translation type="obsolete">フィルタを下�移動(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
               &lt;qt&gt;Moves the highlighted USB filter down.&lt;/qt&gt;
             </source>
@@ -4720,32 +4477,26 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxHardDiskSettings</name>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Slot</source>
         <translation type="obsolete">スロット</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Hard Disk</source>
         <translation type="obsolete">�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>VBoxHardDiskSettings</source>
         <translation type="obsolete">VBoxHardDiskSettings</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Hard Disks</source>
         <translation type="obsolete">�ードディスク(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Enable SATA Controller</source>
         <translation type="obsolete">SATA コントローラを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
                           &lt;qt&gt;When checked, enables the virtual SATA
                           controller of this machine. Note that you cannot
@@ -4755,12 +4506,10 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation type="obsolete">&lt;qt&gt;��仮想マシン�仮想SATA コントローラを有効����。注：仮想コントローラ�無効�����ードディスクをSATA�ート��り付�る�������ん。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Hard Disks &amp;Attachments</source>
         <translation type="obsolete">�ードディスク�割り当�(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
                                   &lt;qt&gt;Lists all hard disks attached to
                                   this machine. Use a mouse double-click or the
@@ -4777,66 +4526,54 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 </translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Add Attachment</source>
         <translation type="obsolete">割り当��追加</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Add Attachment</source>
         <translation type="obsolete">割り当�を追加�る(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Ins</source>
         <translation type="obsolete">Ins</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
               &lt;qt&gt;Adds a new hard disk attachment.&lt;/qt&gt;
             </source>
         <translation type="obsolete">&lt;qt&gt;新��ードディスク�割り当�を追加���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Remove Attachment</source>
         <translation type="obsolete">割り当�を除去</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Remove Attachment</source>
         <translation type="obsolete">割り当�を除去�る(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Delete</source>
         <translation type="obsolete">削除</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
               &lt;qt&gt;Removes the highlighted hard disk attachment.&lt;/qt&gt;
             </source>
         <translation type="obsolete">&lt;qt&gt;�イライト表示�れ��ードディスク�割り当�を除去���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Select Hard Disk</source>
         <translation type="obsolete">�ードディスクを�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&amp;Select Hard Disk</source>
         <translation type="obsolete">�ードディスクを�択�る(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Ctrl+Space</source>
         <translation type="obsolete">Ctrl+スペース</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>
               &lt;qt&gt;Invokes the Virtual Disk Manager to select a hard disk
               to attach to the currently highlighted slot.&lt;/qt&gt;
@@ -4844,17 +4581,14 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation type="obsolete">&lt;qt&gt;仮想ディスクマ�ージャを起動���ードディスクを�在�イライト表示�れ�スロット�割り当���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>&lt;i&gt;%1&lt;/i&gt; uses the hard disk that is already attached to &lt;i&gt;%2&lt;/i&gt;</source>
         <translation type="obsolete">&lt;i&gt;%1&lt;/i&gt;����&lt;i&gt;%2&lt;/i&gt;�割り当�られ��る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>Double-click to add a new attachment</source>
         <translation type="obsolete">ダブルクリック�新��割り当�を追加</translation>
     </message>
     <message>
-        <location filename="../src/VBoxGlobalSettings.cpp" line="256"/>
         <source>No hard disk is selected for &lt;i&gt;%1&lt;/i&gt;</source>
         <translation type="obsolete"> &lt;i&gt;%1&lt;/i&gt;�����ードディスク��択�れ����</translation>
     </message>
@@ -4914,6 +4648,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body&gt;&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;��ウィザード��仮想アプライアンスをイン�ート�る手順を案内���。 &lt;/p&gt;&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ウィザード�次�ページ�進む��&lt;span style=&quot; font-weight:600;&quot;&gt;[次�]&lt;/span&gt;ボタンを���ページ�戻る��&lt;span style=&quot; font-weight:600;&quot;&gt;[戻る]&lt;/span&gt;ボタンを使用������。&lt;/p&gt;&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;イン�ート�る���最��仮想アプライアンス情報�書�れ�ファイルを�択���れ��り��ん。 VirtualBox�Open Virtualization Format(OVF)をサ�ート���。続���以下�らイン�ート�るファイルを�択������:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
+        <location filename="../src/wizards/importappliance/VBoxImportApplianceWzd.ui" line="164"/>
         <location filename="../src/wizards/importappliance/VBoxImportApplianceWzd.ui" line="331"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; 戻る(&amp;B)</translation>
@@ -4924,6 +4659,7 @@ p, li { white-space: pre-wrap; }
         <translation>次�(&amp;N) &gt;</translation>
     </message>
     <message>
+        <location filename="../src/wizards/importappliance/VBoxImportApplianceWzd.ui" line="194"/>
         <location filename="../src/wizards/importappliance/VBoxImportApplianceWzd.ui" line="361"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
@@ -5074,22 +4810,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxMediaComboBox</name>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="436"/>
         <source>&lt;no hard disk&gt;</source>
         <translation type="obsolete">&lt;�ードディスク��&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="436"/>
         <source>No hard disk</source>
         <translation type="obsolete">�ードディスク��</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="436"/>
         <source>No media available. Use the Virtual Media Manager to add media of the corresponding type.</source>
         <translation type="obsolete">利用�能�メディア��り��ん。 仮想メディアマ�ージャを使用���対応�るタイプ�メディアを追加������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="436"/>
         <source>&lt;no media&gt;</source>
         <translation type="obsolete">&lt;メディア��&gt;</translation>
     </message>
@@ -5152,16 +4884,24 @@ p, li { white-space: pre-wrap; }
         <translation>メディアリストを最新�情報�更新</translation>
     </message>
     <message>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="105"/>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="210"/>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="301"/>
+        <location filename="../src/VBoxMediaManagerDlg.cpp" line="593"/>
+        <location filename="../src/VBoxMediaManagerDlg.cpp" line="597"/>
         <location filename="../src/VBoxMediaManagerDlg.cpp" line="600"/>
         <source>Location</source>
         <translation>場所</translation>
     </message>
     <message>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="122"/>
         <location filename="../src/VBoxMediaManagerDlg.cpp" line="594"/>
         <source>Type (Format)</source>
         <translation>タイプ(形�)</translation>
     </message>
     <message>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="139"/>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="227"/>
         <location filename="../src/VBoxMediaManagerDlg.ui" line="318"/>
         <source>Attached to</source>
         <translation>割り当�</translation>
@@ -5233,6 +4973,8 @@ p, li { white-space: pre-wrap; }
         <translation>�ードディスク(&amp;D)</translation>
     </message>
     <message>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="72"/>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="182"/>
         <location filename="../src/VBoxMediaManagerDlg.ui" line="270"/>
         <source>Name</source>
         <translation>��</translation>
@@ -5253,6 +4995,7 @@ p, li { white-space: pre-wrap; }
         <translation>CD/DVDイメージ(&amp;C)</translation>
     </message>
     <message>
+        <location filename="../src/VBoxMediaManagerDlg.ui" line="187"/>
         <location filename="../src/VBoxMediaManagerDlg.ui" line="275"/>
         <source>Size</source>
         <translation>サイズ</translation>
@@ -5302,42 +5045,34 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxNIList</name>
     <message>
-        <location filename="../src/widgets/VBoxMiniToolBar.cpp" line="102"/>
         <source>VirtualBox Host Interface %1</source>
         <translation type="obsolete">VirtualBox ホスト インターフェース %1</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxMiniToolBar.cpp" line="102"/>
         <source>&lt;p&gt;Do you want to remove the selected host network interface &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 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.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;�択��ホスト インターフェース ;&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;を除去����？&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;注：&lt;/b&gt; ��インターフェース�複数�仮想マシン�1�以上��ットワーク アタプタ�使用中�も�れ��ん。除去�る��他�インターフェース�を����別�割り当�方法を正��設定�る���れら�アダプタ�動作���ん。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxMiniToolBar.cpp" line="102"/>
         <source>Host &amp;Interfaces</source>
         <translation type="obsolete">ホスト インターフェース(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxMiniToolBar.cpp" line="102"/>
         <source>Lists all available host interfaces.</source>
         <translation type="obsolete">利用�能�ホスト インターフェースをリスト表示���。</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxMiniToolBar.cpp" line="102"/>
         <source>A&amp;dd New Host Interface</source>
         <translation type="obsolete">新�ホスト インターフェース�追加(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxMiniToolBar.cpp" line="102"/>
         <source>&amp;Remove Selected Host Interface</source>
         <translation type="obsolete">�択��ホスト インターフェース�除去(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxMiniToolBar.cpp" line="102"/>
         <source>Adds a new host interface.</source>
         <translation type="obsolete">新�ホスト インターフェースを追加���。</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxMiniToolBar.cpp" line="102"/>
         <source>Removes the selected host interface.</source>
         <translation type="obsolete">�択��ホスト インターフェースを除去���。</translation>
     </message>
@@ -5345,7 +5080,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxNetworkDialog</name>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3756"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3791"/>
         <source>Network Adapters</source>
         <translation>�ットワーク アダプタ</translation>
     </message>
@@ -5358,7 +5093,6 @@ p, li { white-space: pre-wrap; }
         <translation>新�仮想ディスク�作�</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="30"/>
         <source>&lt;p&gt;This wizard will help you to create a new virtual hard disk image for your virtual machine.&lt;/p&gt;
 &lt;p&gt;Use the &lt;b&gt;Next&lt;/b&gt; button to go to the next page of the wizard
 and the &lt;b&gt;Back&lt;/b&gt; button to return to the previous page.&lt;/p&gt;</source>
@@ -5371,50 +5105,41 @@ and the &lt;b&gt;Back&lt;/b&gt; button to return to the previous page.&lt;/p&gt;
         <translation>よ���新�仮想ディスク作�ウィザード��</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>Image Type</source>
         <translation type="obsolete">イメージ�タイプ</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>&amp;Dynamically expanding image</source>
         <translation type="obsolete">�変サイズ�イメージ(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>&amp;Fixed-size image</source>
         <translation type="obsolete">固定サイズ�イメージ(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>Virtual Disk Image Type</source>
         <translation type="obsolete">仮想ディスクイメージ�タイプ</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>&lt;p&gt;Press the &lt;b&gt;Select&lt;/b&gt; 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.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;[�択]&lt;/b&gt;ボタンをクリック��ファイル�場所���を�択��仮想�ードディスクイメージを�存�る��入力フィールド�ファイル�を入力������ 。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>&amp;Image File Name</source>
         <translation type="obsolete">イメージファイル�(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>Select</source>
         <translation type="obsolete">�択</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想�ードディスク�サイズを�択������。
 ��サイズ�仮想�ードディスク�サイズ���ゲストOS�報告�れ��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="63"/>
         <source>Image &amp;Size</source>
         <translation type="obsolete">イメージ�サイズ(&amp;S)</translation>
     </message>
@@ -5424,12 +5149,10 @@ as the size of the virtual hard disk.&lt;/p&gt;</source>
         <translation>仮想ディスク�場所�サイズ</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="435"/>
         <source>You are going to create a new virtual hard disk image with the following parameters:</source>
         <translation type="obsolete">新�仮想�ードディスクイメージ�以下�設定�作��れ��:</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="435"/>
         <source>If the above settings are correct, press the &lt;b&gt;Finish&lt;/b&gt; button.
                             Once you press it, a new hard disk image will be created.
                             </source>
@@ -5446,7 +5169,6 @@ as the size of the virtual hard disk.&lt;/p&gt;</source>
         <translation>&lt;nobr&gt;%1 �イト&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.cpp" line="364"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;Type:&lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Location:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Size:&lt;/td&gt;&lt;td&gt;%3&amp;nbsp;(%4&amp;nbsp;Bytes)&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="obsolete">&lt;table&gt;&lt;tr&gt;&lt;td&gt;タイプ:&lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;場所:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;サイズ:&lt;/td&gt;&lt;td&gt;%3&amp;nbsp;(%4&amp;nbsp;�イト)&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</translation>
     </message>
@@ -5461,7 +5183,6 @@ as the size of the virtual hard disk.&lt;/p&gt;</source>
         <translation>新��ードディスク�ファイルを�択������</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.cpp" line="272"/>
         <source>&lt;p&gt;Select the type of virtual hard disk image you want to create.&lt;/p&gt;
 &lt;p&gt;A &lt;b&gt;dynamically expanding image&lt;/b&gt; initially occupies a very small amount
 of space on your physical hard disk. It will grow dynamically (up to
@@ -5476,37 +5197,37 @@ time depending on the image size and the write performance of your harddisk.&lt;
 固定サイズ�イメージ�作���イメージ�サイズ��ードディスク�書�込�性能��存��長�時間���る�も�れ��ん。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.cpp" line="272"/>
         <source>&lt;p&gt;This wizard will help you to create a new virtual hard disk image for your virtual machine.&lt;/p&gt;&lt;p&gt;Use the &lt;b&gt;Next&lt;/b&gt; button to go to the next page of the wizard and the &lt;b&gt;Back&lt;/b&gt; button to return to the previous page.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;��ウィザード�仮想マシン用�新�仮想�ードディスクイメージ作�を手助����。&lt;/p&gt;&lt;p&gt;ウィザード�次�ページ�進む��&lt;b&gt;[次�]&lt;/b&gt;ボタンを���ページ�戻る��&lt;b&gt;[戻る]&lt;/b&gt;ボタンを使用������。&lt;/p&gt;</translation>
     </message>
     <message>
+        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="176"/>
+        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="384"/>
+        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="684"/>
         <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="898"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; 戻る(&amp;B)</translation>
     </message>
     <message>
+        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="183"/>
+        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="391"/>
         <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="691"/>
         <source>&amp;Next &gt;</source>
         <translation>次�(&amp;N) &gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="691"/>
         <source>&lt;p&gt;Select the type of virtual hard disk image you want to create.&lt;/p&gt;&lt;p&gt;A &lt;b&gt;dynamically expanding image&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;A &lt;b&gt;fixed-size image&lt;/b&gt; does not grow. It is stored in a file of approximately the same size as the size of the virtual hard disk. The creation of a fixed-size image may take a long time depending on the image size and the write performance of your harddisk.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;作��る仮想�ードディスクイメージ�タイプを�択������。&lt;/p&gt;&lt;p&gt;&lt;b&gt;�変サイズ�イメージ&lt;/b&gt;��最��物�的��ードディスク上������容���使用���ん。ゲストOS��求�るディスク容��応��サイズ�動的�増加(指定�れ�サイズ��)���。&lt;/p&gt;&lt;p&gt;&lt;b&gt;固定サイズ�イメージ&lt;/b&gt;�容��増加���ん。仮想�ードディスク�サイズ�����サイズ�ファイル��存�れ��。固定サイズ�イメージ�作���イメージ�サイズ��ードディスク�書�込�性能��存��長�時間���る�も�れ��ん。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="691"/>
         <source>&lt;p&gt;Press the &lt;b&gt;Select&lt;/b&gt; 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.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;[�択]&lt;/b&gt;ボタンをクリック��ファイル�場所���を�択��仮想�ードディスクイメージを�存�る��入力フィールド�ファイル�を入力������ 。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="691"/>
         <source>&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想�ードディスク�サイズを�択������。��サイズ�仮想�ードディスク�サイズ���ゲストOS�報告�れ��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="691"/>
         <source>If the above settings are correct, press the &lt;b&gt;Finish&lt;/b&gt; button. Once you press it, a new hard disk image will be created.</source>
         <translation type="obsolete">上記�設定�正��れ��&lt;b&gt;[完了]&lt;/b&gt;ボタンをクリック������。 新��ードディスクイメージ�作��れ��。</translation>
     </message>
@@ -5540,6 +5261,9 @@ time depending on the image size and the write performance of your harddisk.&lt;
         <translation>�イト</translation>
     </message>
     <message>
+        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="206"/>
+        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="414"/>
+        <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="714"/>
         <location filename="../src/wizards/newhd/VBoxNewHDWzd.ui" line="928"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
@@ -5613,7 +5337,6 @@ time depending on the image size and the write performance of your harddisk.&lt;
         <translation>新�仮想マシン�作�</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="31"/>
         <source>&lt;p&gt;This wizard will guide you through the steps that are necessary to create
 a new virtual machine for VirtualBox.&lt;/p&gt;
 &lt;p&gt;Use the &lt;b&gt;Next&lt;/b&gt; button to go the next page of the wizard
@@ -5627,7 +5350,6 @@ and the &lt;b&gt;Back&lt;/b&gt; button to return to the previous page.&lt;/p&gt;
         <translation>よ���新�仮想マシン作�ウィザード��</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="55"/>
         <source>&lt;p&gt;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.&lt;/p&gt;
 &lt;p&gt;The name of the virtual machine usually indicates its software and hardware configuration.
@@ -5661,17 +5383,14 @@ It will be used by all VirtualBox components to identify your virtual machine.&l
         <translation>メインメモリ�サイズ(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="524"/>
         <source>&lt;</source>
         <translation type="obsolete">&lt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="524"/>
         <source>=</source>
         <translation type="obsolete">=</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="524"/>
         <source>&gt;</source>
         <translation type="obsolete">&gt;</translation>
     </message>
@@ -5686,7 +5405,6 @@ It will be used by all VirtualBox components to identify your virtual machine.&l
         <translation>メモリ</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="428"/>
         <source>&lt;p&gt;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 &lt;b&gt;New&lt;/b&gt; button or select an existing hard disk
@@ -5700,17 +5418,14 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
 &lt;p&gt;より高度��ードディスク設定�必���れ����ステップをスキップ��後�仮想マシン設定ダイアログを使用���ードディスクを割り当�る��も����。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="428"/>
         <source>B&amp;oot Hard Disk (Primary Master)</source>
         <translation type="obsolete">起動ディスク (プライマリ マスター) (&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="428"/>
         <source>N&amp;ew...</source>
         <translation type="obsolete">新�(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="428"/>
         <source>E&amp;xisting...</source>
         <translation type="obsolete">�択(&amp;X)...</translation>
     </message>
@@ -5720,7 +5435,6 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>仮想�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="716"/>
         <source>
                             &lt;p&gt;
                             You are going to create a new virtual machine
@@ -5730,7 +5444,6 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation type="obsolete"> &lt;p&gt;新�仮想マシン�以下�設定�作��れ��: &lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="716"/>
         <source>
                             &lt;p&gt;
                             If the above is correct press the &lt;b&gt;Finish&lt;/b&gt; button.
@@ -5751,17 +5464,14 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>概�</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="948"/>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="948"/>
         <source>&lt;tr&gt;&lt;td&gt;Name:&lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;OS Type:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Base Memory:&lt;/td&gt;&lt;td&gt;%3&amp;nbsp;MB&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="obsolete">&lt;tr&gt;&lt;td&gt;��:&lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;OSタイプ:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;メインメモリ:&lt;/td&gt;&lt;td&gt;%3&amp;nbsp;MB&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="948"/>
         <source>&lt;tr&gt;&lt;td&gt;Boot Hard Disk:&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="obsolete">&lt;tr&gt;&lt;td&gt;起動ディスク:&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
@@ -5781,11 +5491,18 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>&lt;p&gt;��ウィザード�VirtualBox用�新�仮想マシンを作��る���必��ステップを案内���。&lt;/p&gt;&lt;p&gt;ウィザード�次�ページ�進む��&lt;b&gt;[次�]&lt;/b&gt;ボタンを���ページ�戻る��&lt;b&gt;[戻る]&lt;/b&gt;ボタンを使用������。&lt;/p&gt;</translation>
     </message>
     <message>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="165"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="377"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="665"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="897"/>
         <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="1105"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; 戻る(&amp;B)</translation>
     </message>
     <message>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="172"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="384"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="672"/>
         <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="904"/>
         <source>&amp;Next &gt;</source>
         <translation>次�(&amp;N) &gt;</translation>
@@ -5796,7 +5513,6 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>&lt;p&gt;新�仮想マシン���を入力��仮想マシン�インストール���ゲストOS�タイプを�択������。&lt;/p&gt;&lt;p&gt;通常�仮想マシン����ソフトウェア��ードウェア構�を示���。VirtualBox�作��れ�仮想マシンを特定�る�������を使用���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="274"/>
         <source>&lt;p&gt;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 &lt;b&gt;New&lt;/b&gt; button or select an existing hard disk image from the drop-down list or by pressing the &lt;b&gt;Existing&lt;/b&gt; button (to invoke the Virtual Disk Manager dialog).&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想マシン�起動ディスク���使用�る�ードディスクイメージを�択���。&lt;b&gt;[新�]&lt;/b&gt;ボタンをクリック��新��ードディスクを作��る��ドロップダウンリスト���&lt;b&gt;[�択]&lt;/b&gt;ボタンをクリック(仮想ディスクマ�ージャを起動���)��既存��ードディスクイメージを�択���。&lt;/p&gt;&lt;p&gt;より高度��ードディスク設定�必���れ����ステップをスキップ��後�仮想マシン設定ダイアログを使用���ードディスクを割り当�る��も����。&lt;/p&gt;</translation>
     </message>
@@ -5816,6 +5532,8 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>完了(&amp;F)</translation>
     </message>
     <message>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.cpp" line="134"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.cpp" line="136"/>
         <location filename="../src/wizards/newvm/VBoxNewVMWzd.cpp" line="150"/>
         <source>MB</source>
         <comment>megabytes</comment>
@@ -5846,6 +5564,10 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>起動 �ードディスク</translation>
     </message>
     <message>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="195"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="407"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="695"/>
+        <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="927"/>
         <location filename="../src/wizards/newvm/VBoxNewVMWzd.ui" line="1135"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
@@ -5884,7 +5606,6 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>仮想マシン�インストール�るOS�種類を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxOSTypeSelectorWidget.cpp" line="126"/>
         <source>V&amp;ersion:</source>
         <translation type="obsolete">�ージョン(&amp;E):</translation>
     </message>
@@ -5902,599 +5623,576 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
 <context>
     <name>VBoxProblemReporter</name>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="160"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="159"/>
         <source>VirtualBox - Information</source>
         <comment>msg box title</comment>
         <translation>VirtualBox - 情報</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="164"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="163"/>
         <source>VirtualBox - Question</source>
         <comment>msg box title</comment>
         <translation>VirtualBox - 質�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="168"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="167"/>
         <source>VirtualBox - Warning</source>
         <comment>msg box title</comment>
         <translation>VirtualBox - 警告</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="172"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="171"/>
         <source>VirtualBox - Error</source>
         <comment>msg box title</comment>
         <translation>VirtualBox - エラー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="176"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="175"/>
         <source>VirtualBox - Critical Error</source>
         <comment>msg box title</comment>
         <translation>VirtualBox - �大�エラー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="200"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="199"/>
         <source>Do not show this message again</source>
         <comment>msg box flag</comment>
         <translation>次回�ら��メッセージを表示���</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="415"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="414"/>
         <source>Failed to open &lt;tt&gt;%1&lt;/tt&gt;. Make sure your desktop environment can properly handle URLs of this type.</source>
         <translation>&lt;tt&gt;%1&lt;/tt&gt;を開���ん���。デスクトップ環境��切�URLを扱�る��を確�������。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="465"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="464"/>
         <source>&lt;p&gt;Failed to initialize COM or to find the VirtualBox COM server. Most likely, the VirtualBox server is not running or failed to start.&lt;/p&gt;&lt;p&gt;The application will now terminate.&lt;/p&gt;</source>
         <translation>&lt;p&gt;COM��期化�失敗�������VirtualBox COMサー�ー�見��り��ん���。VirtualBoxサー��起動����������起動�失敗�����。&lt;/p&gt;&lt;p&gt;アプリケーションを終了���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="475"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="474"/>
         <source>&lt;p&gt;Failed to create the VirtualBox COM object.&lt;/p&gt;&lt;p&gt;The application will now terminate.&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox COMオブジェクト�作��失敗����。&lt;/p&gt;&lt;p&gt;アプリケーションを終了���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="524"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="523"/>
         <source>Failed to set global VirtualBox properties.</source>
         <translation>グロー�ル�VirtualBox�プロパティ�設定�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="554"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="553"/>
         <source>Failed to access the USB subsystem.</source>
         <translation>USBサブシステム�アクセス�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="565"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="564"/>
         <source>Failed to create a new virtual machine.</source>
         <translation>新�仮想マシン�作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="577"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="576"/>
         <source>Failed to create a new virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>新�仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="589"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="588"/>
         <source>Failed to apply the settings to the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�設定��用�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="650"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="635"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="649"/>
         <source>Failed to start the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�起動�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="662"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="661"/>
         <source>Failed to pause the execution of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�一時�止�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="673"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="672"/>
         <source>Failed to resume the execution of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;��開�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="710"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="695"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="709"/>
         <source>Failed to save the state of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�状態��存�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="736"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="721"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="735"/>
         <source>Failed to create a snapshot of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�スナップショット作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="760"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="747"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="759"/>
         <source>Failed to stop the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;��止�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="772"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="771"/>
         <source>Failed to remove the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�除去�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="783"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="782"/>
         <source>Failed to discard the saved state of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;��存�れ�状態�破棄�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="783"/>
         <source>Failed to discard the snapshot &lt;b&gt;%1&lt;/b&gt; of the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation type="obsolete">仮想マシン&lt;b&gt;&quot;%2&quot;&lt;/b&gt;�スナップショット &lt;b&gt;%1&lt;/b&gt; �破棄�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="783"/>
         <source>Failed to discard the current state of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation type="obsolete">仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�最新�状態�破棄�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="783"/>
         <source>Failed to discard the current snapshot and the current state of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation type="obsolete">仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�最新�スナップショット�状態�破棄�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="906"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="905"/>
         <source>There is no virtual machine named &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;��り��ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="952"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="951"/>
         <source>&lt;p&gt;Are you sure you want to permanently delete the virtual machine &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;&lt;p&gt;This operation cannot be undone.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;を削除����？&lt;/p&gt;&lt;p&gt;���作�元�戻���ん。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="964"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="963"/>
         <source>&lt;p&gt;Are you sure you want to unregister the inaccessible virtual machine &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;&lt;p&gt;You will not be able to register it again from GUI.&lt;/p&gt;</source>
         <translation>&lt;p&gt;アクセス����仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�登録を解除����？&lt;/p&gt;&lt;p&gt;GUI�ら�れを登録�直��������ん。&lt;/p&gt;
 </translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="978"/>
         <source>&lt;p&gt;Are you sure you want to discard the saved state of the virtual machine &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;&lt;p&gt;This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;��存�れ�状態を破棄����？&lt;/p&gt;&lt;p&gt;���作�ゲストOSを�切�シャットダウン���リセット���電�をオフ��る����等��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>&lt;p&gt;Releasing this media image will detach it from the following virtual machine(s): &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Continue?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;��メディアイメージを解放�る��以下�仮想マシン��割り当��解除�れ��:&lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;続行����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>&lt;p&gt;The image file &lt;b&gt;%1&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;Please specify a different image file name.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;イメージファイル&lt;b&gt;&quot;%1&quot;&lt;/b&gt;����存在���。他�仮想�ードディスク������使用�れ��る���新�仮想�ードディスクを作�����ん。&lt;/p&gt;&lt;p&gt;別�イメージファイル�を指定������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>Failed to delete the virtual hard disk image &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation type="obsolete">仮想�ードディスクイメージ&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�削除�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>&lt;p&gt;Do you want to remove (unregister) the virtual hard disk &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想�ードディスク&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;を除去(登録解除)����？&lt;/nobr&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>Failed to create the virtual hard disk image &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;</source>
         <translation type="obsolete">仮想�ードディスクイメージ&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�作��失敗����。&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>hard disk</source>
         <translation type="obsolete">�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>CD/DVD image</source>
         <translation type="obsolete">CD/DVDイメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>floppy image</source>
         <translation type="obsolete">フロッピーイメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>Failed to register the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;.</source>
         <translation type="obsolete">%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;�登録�失敗����。
 </translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="979"/>
         <source>Failed to unregister the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;.</source>
         <translation type="obsolete">%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;�登録解除�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1278"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1277"/>
         <source>Failed to create a new session.</source>
         <translation>新�セッション�作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1296"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1295"/>
         <source>Failed to open a session for the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�セッションを開���ん���。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1296"/>
         <source>Failed to determine the accessibility state of the media &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;. Some of the registered media may become inaccessible.</source>
         <translation type="obsolete">メディア&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;&lt;/nobr&gt;�アクセス��状態を�得����ん���。登録�れ�メディア������アクセス�����も�れ��ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1296"/>
         <source>Failed to create the host network interface &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation type="obsolete">ホスト �ットワーク インターフェース&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1358"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1348"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1357"/>
         <source>Failed to remove the host network interface &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>ホスト �ットワーク インターフェース&lt;b&gt;&quot;%1&quot;&lt;/b&gt;を�り除���ん���。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1382"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1369"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1381"/>
         <source>Failed to attach the USB device &lt;b&gt;%1&lt;/b&gt; to the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>USB デ�イス&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�仮想マシン&lt;b&gt;&quot;%2&quot;&lt;/b&gt;��割り当��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1408"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1395"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1407"/>
         <source>Failed to detach the USB device &lt;b&gt;%1&lt;/b&gt; from the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>USB デ�イス&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�仮想マシン&lt;b&gt;&quot;%2&quot;&lt;/b&gt;�ら�割り当�解除�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1460"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1423"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1459"/>
         <source>Failed to create the shared folder &lt;b&gt;%1&lt;/b&gt; (pointing to &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;) for the virtual machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�共有フォルダ&lt;b&gt;&quot;%1&quot;&lt;/b&gt;(�照先 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;)�作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1442"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1441"/>
         <source>Failed to remove the shared folder &lt;b&gt;%1&lt;/b&gt; (pointing to &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;) from the virtual machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�共有フォルダ&lt;b&gt;&quot;%1&quot;&lt;/b&gt;(�照先 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;)�除去�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1442"/>
         <source>&lt;p&gt;You have &lt;b&gt;clicked the mouse&lt;/b&gt; inside the Virtual Machine display or pressed the &lt;b&gt;host key&lt;/b&gt;. This will cause the Virtual Machine to &lt;b&gt;capture&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;You can press the &lt;b&gt;host key&lt;/b&gt; at any time to &lt;b&gt;uncapture&lt;/b&gt; the keyboard and mouse (if it is captured) and return them to normal operation. The currently assigned host key is shown on the status bar at the bottom of the Virtual Machine window, next to the&amp;nbsp;&lt;img src=hostkey_16px.png/&gt;&amp;nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想マシン�画�を&lt;b&gt;マウスクリック&lt;/b&gt;�る�����&lt;b&gt;ホストキー&lt;/b&gt;を押���仮想マシン�マウス�インタ(マウス統�機能�ゲストOS�サ�ート�れ��������)�キーボードを&lt;b&gt;キャプ�ャ&lt;/b&gt;���。仮想マシン�キーボード�マウス�キャプ�ャ�れる�ホストPC�動作�る他�アプリケーション�利用����ん。&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;ホストキー&lt;/b&gt;を押���キーボード�マウス(キャプ�ャ�れ��る��)�&lt;b&gt;キャプ�ャ解除&lt;/b&gt;�れ�通常��作�戻る�������。�在割り当�られ��るホストキー�仮想マシン�ウィンドウ下部�ステータス�ー�&amp;nbsp;&lt;img src=hostkey_16px.png/&gt;&amp;nbsp;アイコン�表示�れ��。��アイコン�マウスアイコン�共��在�キーボ−ド�マウス�キャプ�ャ状態を表示���。.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1442"/>
         <source>&lt;p&gt;You have the &lt;b&gt;Auto capture keyboard&lt;/b&gt; option turned on. This will cause the Virtual Machine to automatically &lt;b&gt;capture&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;You can press the &lt;b&gt;host key&lt;/b&gt; at any time to &lt;b&gt;uncapture&lt;/b&gt; the keyboard and mouse (if it is captured) and return them to normal operation. The currently assigned host key is shown on the status bar at the bottom of the Virtual Machine window, next to the&amp;nbsp;&lt;img src=hostkey_16px.png/&gt;&amp;nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;キーボード�自動キャプ�ャ&lt;/b&gt;機能�有効��。仮想マシン�ウィンドウ�アクティブ����仮想マシン�キーボードを自動的�&lt;b&gt;キャプ�ャ&lt;/b&gt;���。キーボード�キャプ�ャ�れる������キーストローク(Alt-Tab��を�む)�仮想マシン��られる���ホストPC�動作�る他�アプリケーション�利用����ん。&lt;/p&gt;&lt;p&gt;&lt;b&gt;ホストキー&lt;/b&gt;を押���キーボード�マウス(キャプ�ャ�れ��る��)�&lt;b&gt;キャプ�ャ解除&lt;/b&gt;�れ�通常��作�戻る�������。�在割り当�られ��るホストキー�仮想マシン�ウィンドウ下部�ステータス�ー�&amp;nbsp;&lt;img src=hostkey_16px.png/&gt;&amp;nbsp;アイコン�表示�れ��。��アイコン�マウスアイコン�共��在�キーボ−ド�マウス�キャプ�ャ状態を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1442"/>
         <source>&lt;p&gt;The Virtual Machine reports that the guest OS supports &lt;b&gt;mouse pointer integration&lt;/b&gt;. This means that you do not need to &lt;i&gt;capture&lt;/i&gt; 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&apos;s display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.&lt;/p&gt;&lt;p&gt;The mouse icon on the status bar will look like&amp;nbsp;&lt;img src=mouse_seamless_16px.png/&gt;&amp;nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note&lt;/b&gt;: Some applications may behave incorrectly in mouse pointer integration mode. You can always disable it for the current session (and enable it again) by selecting the corresponding action from the menu bar.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;ゲストOS�&lt;b&gt;マウス統�&lt;/b&gt;機能�サ�ート�れ����。ゲストOS�マウス�インタを&lt;i&gt;キャプ�ャ&lt;/i&gt;�る����使用����。仮想マシン�画�上�マウス�インタ��る�������マウス�動作�直接ゲストOS��られ��。�在マウス�キャプ�ャ�れ��る����自動的�キャプ�ャ解除�れ��。ステータス�ー�マウスアイコン��マウス統�機能�ゲストOS�サ�ート�れ��在有効��る��を示���&amp;nbsp;&lt;img src=mouse_seamless_16px.png/&gt;&amp;nbsp;�よ��表示�れ��。 &lt;/p&gt;&lt;p&gt;&lt;b&gt;注&lt;/b&gt;: マウス統�機能�有効���������アプリケーション�動作��正��る�も�れ��ん。メニュー�ー�ら対応�る動作を�択���在�セッション�マウス統�機能を無効化(���有効化)�る�������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1772"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1771"/>
         <source>&lt;p&gt;The Virtual Machine reports that the guest OS does not support &lt;b&gt;mouse pointer integration&lt;/b&gt; 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.&lt;/p&gt;</source>
         <translation>&lt;p&gt;�在�ビデオモード��ゲストOS�&lt;b&gt;マウス統�&lt;/b&gt;機能�サ�ート�れ��ん。ゲストOS�マウスを使用�る����マウスをキャプ�ャ(仮想マシン�画�をクリック�る�����ホストキーを押�)�る必���り��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1790"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1789"/>
         <source>&lt;p&gt;The Virtual Machine is currently in the &lt;b&gt;Paused&lt;/b&gt; 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.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン��在&lt;b&gt;&quot;一時�止&quot;&lt;/b&gt;状態����キーボード�マウス�作を��付���ん。仮想マシン��作業を続���場���メニュー�ー�ら対応�る動作を�択���仮想マシンを�開�る必���り��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2017"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2016"/>
         <source>&lt;p&gt;Cannot run VirtualBox in &lt;i&gt;VM Selector&lt;/i&gt; mode due to local restrictions.&lt;/p&gt;&lt;p&gt;The application will now terminate.&lt;/p&gt;</source>
         <translation>&lt;p&gt;ローカル�制����� &lt;i&gt;VM Selector&lt;/i&gt;モード�VirtualBoxを実行����ん。&lt;/p&gt;&lt;p&gt;アプリケーションを終了���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2151"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2150"/>
         <source>&lt;nobr&gt;Fatal Error&lt;/nobr&gt;</source>
         <comment>runtime error info</comment>
         <translation>&lt;nobr&gt;致命的�エラー&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2157"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2156"/>
         <source>&lt;nobr&gt;Non-Fatal Error&lt;/nobr&gt;</source>
         <comment>runtime error info</comment>
         <translation>&lt;nobr&gt;致命的���エラー&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2163"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2162"/>
         <source>&lt;nobr&gt;Warning&lt;/nobr&gt;</source>
         <comment>runtime error info</comment>
         <translation>&lt;nobr&gt;警告&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2180"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2179"/>
         <source>&lt;nobr&gt;Error ID: &lt;/nobr&gt;</source>
         <comment>runtime error info</comment>
         <translation>&lt;nobr&gt;エラーID: &lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2182"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2181"/>
         <source>Severity: </source>
         <comment>runtime error info</comment>
         <translation>��度:</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2193"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2192"/>
         <source>&lt;p&gt;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:&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン�実行中�致命的�エラー�発生�����仮想マシン�電�をオフ����。調査����以下�エラーメッセージをクリップボード�コピー��使用������:&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2205"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2204"/>
         <source>&lt;p&gt;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.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン�実行中�エラー�発生�����エラー�詳細を以下�示���。説明�れ�エラーを修正��仮想マシン��実行�る�������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2214"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2213"/>
         <source>&lt;p&gt;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.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン�実行中�以下�説明�れるエラー�発生�る�も�れ��ん。��メッセージ�無視������動作を確実��る����説明�れ�誤りを対策�る���推奨�れ��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2351"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2350"/>
         <source>Result&amp;nbsp;Code: </source>
         <comment>error info</comment>
         <translation>終了コード&amp;nbsp;: </translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2357"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2356"/>
         <source>Component: </source>
         <comment>error info</comment>
         <translation>コン�ー�ント: </translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2365"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2364"/>
         <source>Interface: </source>
         <comment>error info</comment>
         <translation>インターフェース: </translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2374"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2373"/>
         <source>Callee: </source>
         <comment>error info</comment>
         <translation>呼�出�先: </translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2382"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2381"/>
         <source>Callee&amp;nbsp;RC: </source>
         <comment>error info</comment>
         <translation>呼�出�先&amp;nbsp;RC: </translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="440"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="439"/>
         <source>&lt;p&gt;Could not find a language file for the language &lt;b&gt;%1&lt;/b&gt; in the directory &lt;b&gt;&lt;nobr&gt;%2&lt;/nobr&gt;&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;The language will be temporarily reset to the system default language. Please go to the &lt;b&gt;Preferences&lt;/b&gt; dialog which you can open from the &lt;b&gt;File&lt;/b&gt; menu of the main VirtualBox window, and select one of the existing languages on the &lt;b&gt;Language&lt;/b&gt; page.&lt;/p&gt;</source>
         <translation>&lt;p&gt;言語ファイル&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�&lt;b&gt;&lt;nobr&gt;%2&lt;/nobr&gt;&lt;/b&gt;ディレクトリ中�見��り��ん。&lt;/p&gt;&lt;p&gt;言語�一時的�システム�デフォルト言語�設定�れ��。VirtualBoxメインウィンドウ�&lt;b&gt;[ファイル]&lt;/b&gt;メニュー�ら&lt;b&gt;[環境設定]&lt;/b&gt;ダイアログを開��&lt;b&gt;[言語]&lt;/b&gt;ページ�表示�れ��る言語を�択������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="453"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="452"/>
         <source>&lt;p&gt;Could not load the language file &lt;b&gt;&lt;nobr&gt;%1&lt;/nobr&gt;&lt;/b&gt;. &lt;p&gt;The language will be temporarily reset to English (built-in). Please go to the &lt;b&gt;Preferences&lt;/b&gt; dialog which you can open from the &lt;b&gt;File&lt;/b&gt; menu of the main VirtualBox window, and select one of the existing languages on the &lt;b&gt;Language&lt;/b&gt; page.&lt;/p&gt;</source>
         <translation>&lt;p&gt;言語ファイル&lt;b&gt;&lt;nobr&gt;&quot;%1&quot;&lt;/nobr&gt;&lt;/b&gt;�読�込���ん。&lt;/p&gt;&lt;p&gt;言語�一時的�English(内蔵)�設定�れ��。VirtualBoxメインウィンドウ�&lt;b&gt;[ファイル]&lt;/b&gt;メニュー�ら&lt;b&gt;[環境設定]&lt;/b&gt;ダイアログを開��&lt;b&gt;[言語]&lt;/b&gt;ページ�表示�れ��る言語を�択������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1554"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1553"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Please update the Guest Additions to the current version by choosing &lt;b&gt;Install Guest Additions&lt;/b&gt; from the &lt;b&gt;Devices&lt;/b&gt; menu.&lt;/p&gt;</source>
         <translation>&lt;p&gt;ゲストOS�インストール�れ�VirtualBox Guest Additions����ージョン��:インストール�れ��ージョン�%1��。期待�れる�ージョン�%2��。Guest Additionsを必���る�����機能(マウス統��画��リサイズ)�動作����も�れ��ん。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[デ�イス]&lt;/b&gt;メニュー�ら&lt;b&gt;[Guest Additions �インストール]&lt;/b&gt;を�択��Guest Additionsを最新版�アップデート�る��を推奨���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1571"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1570"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;It is recommended to update the Guest Additions to the current version  by choosing &lt;b&gt;Install Guest Additions&lt;/b&gt; from the &lt;b&gt;Devices&lt;/b&gt; menu.&lt;/p&gt;</source>
         <translation>&lt;p&gt;ゲストOS�インストール�れ�VirtualBox Guest Additions����ージョン��:インストール�れ��ージョン�%1��。期待�れる�ージョン�%2��。Guest Additionsを必���る�����機能(マウス統��画��リサイズ)�動作����も�れ��ん。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[デ�イス]&lt;/b&gt;メニュー�ら&lt;b&gt;[Guest Additions �インストール]&lt;/b&gt;を�択��Guest Additionsを最新版�アップデート�る��を推奨���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1587"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1586"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 &lt;b&gt;Install Guest Additions&lt;/b&gt; from the &lt;b&gt;Devices&lt;/b&gt; menu.&lt;/p&gt;</source>
         <translation>&lt;p&gt;ゲストOS�インストール�れ�VirtualBox Guest Additions����ージョン�VirtualBoxより新���ージョン��:インストール�れ��ージョン�%1��。期待�れる�ージョン�%2��。&lt;/p&gt;&lt;p&gt;新���ージョン�Guest Additions����ージョン�VirtualBox��使用�サ�ート�れ��ん。&lt;p&gt;&lt;b&gt;[デ�イス]&lt;/b&gt;メニュー�ら&lt;b&gt;[Guest Additions �インストール]&lt;/b&gt;を�択���在��ージョン�Guest Additionsをインストール������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="826"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="825"/>
         <source>Failed to change the snapshot folder path of the virtual machine &lt;b&gt;%1&lt;b&gt; to &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;.</source>
         <translation>仮想マシン&lt;b&gt;%1&lt;b&gt;�スナップショット�存フォルダ�パスを&lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;�変更����ん���。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1478"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1477"/>
         <source>&lt;p&gt;Failed to remove the shared folder &lt;b&gt;%1&lt;/b&gt; (pointing to &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;) from the virtual machine &lt;b&gt;%3&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Please close all programs in the guest OS that may be using this shared folder and try again.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン&lt;b&gt;%3&lt;/b&gt;�共有フォルダ&lt;b&gt;%1&lt;/b&gt;(�照先:&lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;)�削除�失敗����。&lt;/p&gt;&lt;p&gt;��共有フォルダを使用���るゲストOS�����プログラムを終了���実行������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1493"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1492"/>
         <source>&lt;p&gt;Could not find the VirtualBox Guest Additions CD image file &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; or &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;.&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;Do you wish to download this CD image from the Internet?&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox Guest Additions CDイメージファイル&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;���&lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;�見��り��ん。&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;インター�ット�らCDイメージをダウンロード����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1507"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1506"/>
         <source>&lt;p&gt;Failed to download the VirtualBox Guest Additions CD image from &lt;nobr&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;.&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;%3&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;nobr&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;�らVirtualBox Guest Additions CDイメージをダウンロード����ん。&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;%3&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1526"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1525"/>
         <source>&lt;p&gt;Are you sure you want to download the VirtualBox Guest Additions CD image from &lt;nobr&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;/nobr&gt; (size %3 bytes)?&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox Guest Additions CDイメージを&lt;nobr&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;/nobr&gt; (サイズ %3�イト)�らダウンロード����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1538"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1537"/>
         <source>&lt;p&gt;The VirtualBox Guest Additions CD image has been successfully downloaded from &lt;nobr&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;/nobr&gt; and saved locally as &lt;nobr&gt;&lt;b&gt;%3&lt;/b&gt;.&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;Do you wish to register this CD image and mount it on the virtual CD/DVD drive?&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox Guest Additions CDイメージを&lt;nobr&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;/nobr&gt;�らダウンロード��&lt;nobr&gt;&lt;b&gt;%3&lt;/b&gt;��存����。&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;CDイメージを登録��仮想CD/DVDドライブ�マウント����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1538"/>
         <source>&lt;p&gt;The virtual machine window will be now switched to &lt;b&gt;fullscreen&lt;/b&gt; mode. You can go back to windowed mode at any time by pressing &lt;b&gt;%1&lt;/b&gt;. Note that the &lt;i&gt;Host&lt;/i&gt; key is currently defined as &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing &lt;b&gt;Host+Home&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想マシン�ウィンドウを&quot;フルスクリーン&quot;モード�切り替���。&lt;b&gt;%1&lt;/b&gt;キーを押�����もウィンドウモード�戻る�������。注：ホストキー��在&lt;b&gt;%2&lt;/b&gt;�割り当�られ����。&lt;/p&gt;&lt;p&gt;
 注：フルスクリーンモード��メインメニュー�ー�表示�れ��ん。メニュー�ー�アクセス�る�� &lt;b&gt;Host+Home&lt;/b&gt;キーを押������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1538"/>
         <source>&lt;p&gt;The virtual machine window will be now switched to &lt;b&gt;Seamless&lt;/b&gt; mode. You can go back to windowed mode at any time by pressing &lt;b&gt;%1&lt;/b&gt;. Note that the &lt;i&gt;Host&lt;/i&gt; key is currently defined as &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Note that the main menu bar is hidden in seamless mode. You can access it by pressing &lt;b&gt;Host+Home&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想マシン�ウィンドウを&quot;シームレス&quot;モード�切り替���。&lt;b&gt;%1&lt;/b&gt;キーを押�����もウィンドウ表示�戻る�������。注：ホストキー��在&lt;b&gt;%2&lt;/b&gt;�割り当�られ����。&lt;/p&gt;&lt;p&gt;注：シームレスモード��メインメニュー�ー�表示�れ��ん。メニュー�ー�アクセス�る�� &lt;b&gt;Host+Home&lt;/b&gt;キーを押������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1928"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1927"/>
         <source>&lt;p&gt;The virtual machine window is optimized to work in &lt;b&gt;%1&amp;nbsp;bit&lt;/b&gt; color mode but the virtual display is currently set to &lt;b&gt;%2&amp;nbsp;bit&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Please open the display properties dialog of the guest OS and select a &lt;b&gt;%3&amp;nbsp;bit&lt;/b&gt; color mode, if it is available, for best possible performance of the virtual video subsystem.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note&lt;/b&gt;. Some operating systems, like OS/2, may actually work in 32&amp;nbsp;bit mode but report it as 24&amp;nbsp;bit (16 million colors). You may try to select a different color mode to see if this message disappears or you can simply disable the message now if you are sure the required color mode (%4&amp;nbsp;bit) is not available in the guest OS.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシンウィンドウ�&lt;b&gt;%1&amp;nbsp;ビット&lt;/b&gt;カラーモード�最�化�れ�����在仮想ディスプレイ�&lt;b&gt;%2&amp;nbsp;ビット&lt;/b&gt;�設定�れ����。&lt;/p&gt;&lt;p&gt;最良�仮想ビデオサブシステム性能を得る���利用�能��る�ら�ゲストOS�画�設定ダイアログを開��&lt;b&gt;%3&amp;nbsp;ビット&lt;/b&gt;カラーモードを�択������。&lt;/p&gt;&lt;p&gt;&lt;b&gt;注：OS/2��������オペレーティングシステム�32&amp;nbsp;ビットモード�動作を24&amp;nbsp;ビット(約1600万色)���報告���。 ��メッセージ�消�る�����ゲストOS�必��色深度(%4&amp;nbsp;ビット) �利用�������分����る�ら����メッセージを無効���る�確��る���異���色深度を�択�る�������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1928"/>
         <source>&lt;p&gt;A critical error has occurred while running the virtual machine and the machine execution has been stopped.&lt;/p&gt;&lt;p&gt;For help, please see the Community section on &lt;a href=http://www.virtualbox.org&gt;http://www.virtualbox.org&lt;/a&gt; or your support contract. Please provide the contents of the log file &lt;tt&gt;VBox.log&lt;/tt&gt; and the image file &lt;tt&gt;VBox.png&lt;/tt&gt;, which you can find in the &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; directory, as well as a description of what you were doing when this error happened. Note that you can also access the above files by selecting &lt;b&gt;Show Log&lt;/b&gt; from the &lt;b&gt;Machine&lt;/b&gt; menu of the main VirualBox window.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; if you want to power off the machine or press &lt;b&gt;Ignore&lt;/b&gt; if you want to leave it as is for debugging. Please note that debugging requires special knowledge and tools, so it is recommended to press &lt;b&gt;OK&lt;/b&gt; now.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;仮想マシン実行中��大�エラー�発生�����仮想マシン��止����。&lt;/p&gt;&lt;p&gt;�題�解決����&lt;a href=http://www.virtualbox.org&gt;http://www.virtualbox.org&lt;/a&gt;�Communityセクションを�照�る��サ�ート契約を締�������。����エラー発生時�行���作�共��&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;ディレクトリ�格��れ��るログファイル(&lt;tt&gt;VBox.log&lt;/tt&gt;)�イメージファイル(&lt;tt&gt;VBox.png&lt;/tt&gt;)を�供������。注：VirualBoxメインウィンドウ�&lt;b&gt;[仮想マシン]&lt;/b&gt;メニュー�ら[ログを�照]を�択���上記ファイル�アクセス�る�������。&lt;/p&gt;&lt;p&gt;仮想マシンを電�オフ�る��&lt;b&gt;[OK]&lt;/b&gt;ボタンをクリック������。����デ�ッグを行���&lt;b&gt;[無視]&lt;/b&gt;ボタンをクリック������。デ�ッグ��特別�知識�ツールを必���る���&lt;b&gt;[OK]&lt;/b&gt;ボタンをクリック�る��を推奨���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2001"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2000"/>
         <source>&lt;p&gt;You didn&apos;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 dialog or the First Run Wizard.&lt;/p&gt;&lt;p&gt;Do you wish to continue?&lt;/p&gt;</source>
         <translation>&lt;p&gt;新�仮想マシン��ードディスク�割り当�られ����ん。仮想マシン設定ダイアログ��回起動ウィザードを使用��ゲストOSをインストール���ードディスク���他�起動�能�メディアを割り当����仮想マシン�起動���ん。&lt;/p&gt;&lt;p&gt;続行����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="395"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="394"/>
         <source>Failed to find license files in &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;.</source>
         <translation>&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;&lt;/nobr&gt;�ライセンスファイル�見��り��ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="405"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="404"/>
         <source>Failed to open the license file &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;. Check file permissions.</source>
         <translation>ライセンスファイル&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;&lt;/nobr&gt;�開���ん。ファイル�パーミッションを確�������。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="684"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="683"/>
         <source>Failed to send the ACPI Power Button press event to the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;��電�ボタン オフ�ACPIイベント�信�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="684"/>
         <source>&lt;p&gt;Failed to connect to the VirtualBox online registration service.&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;VirtualBox オンライン登録サービス��接続�失敗����。&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1619"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1618"/>
         <source>&lt;p&gt;Congratulations! You have been successfully registered as a user of VirtualBox.&lt;/p&gt;&lt;p&gt;Thank you for finding time to fill out the registration form!&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox �ユーザー登録�完了����。&lt;/p&gt;&lt;p&gt;登録フォーム�書�込む時間を割�����り��り����������&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1619"/>
         <source>&lt;p&gt;Failed to register the VirtualBox product&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;VirtualBox �製�登録�失敗����&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="487"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="486"/>
         <source>&lt;p&gt;Failed to save the global VirtualBox settings to &lt;b&gt;&lt;nobr&gt;%1&lt;/nobr&gt;&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;グロー�ル�VirtualBox設定�&lt;b&gt;&lt;nobr&gt;&quot;%1&quot;&lt;/nobr&gt;&lt;/b&gt;���存�失敗����。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="500"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="499"/>
         <source>&lt;p&gt;Failed to load the global GUI configuration from &lt;b&gt;&lt;nobr&gt;%1&lt;/nobr&gt;&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;The application will now terminate.&lt;/p&gt;</source>
         <translation>&lt;p&gt;グロー�ル�GUI構��&lt;b&gt;&lt;nobr&gt;&quot;%1&quot;&lt;/nobr&gt;&lt;/b&gt;�ら�読�込��失敗����。&lt;/p&gt;
 &lt;p&gt;アプリケーションを終了���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="514"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="513"/>
         <source>&lt;p&gt;Failed to save the global GUI configuration to &lt;b&gt;&lt;nobr&gt;%1&lt;/nobr&gt;&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;The application will now terminate.&lt;/p&gt;</source>
         <translation>&lt;p&gt;グロー�ル�GUI構��&lt;b&gt;&lt;nobr&gt;&quot;%1&quot;&lt;/nobr&gt;&lt;/b&gt;���存�失敗����。&lt;/p&gt;
 &lt;p&gt;アプリケーションを終了���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="602"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="601"/>
         <source>Failed to save the settings of the virtual machine &lt;b&gt;%1&lt;/b&gt; to &lt;b&gt;&lt;nobr&gt;%2&lt;/nobr&gt;&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�設定�&lt;b&gt;&lt;nobr&gt;&quot;%2&quot;&lt;/nobr&gt;&lt;/b&gt;���存�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="624"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="623"/>
         <source>Failed to load the settings of the virtual machine &lt;b&gt;%1&lt;/b&gt; from &lt;b&gt;&lt;nobr&gt;%2&lt;/nobr&gt;&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�設定�&lt;b&gt;&lt;nobr&gt;&quot;%2�&lt;/nobr&gt;&lt;/b&gt;�ら�読�込��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="956"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="955"/>
         <source>Delete</source>
         <comment>machine</comment>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="969"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="968"/>
         <source>Unregister</source>
         <comment>machine</comment>
         <translation>登録解除</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="986"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="985"/>
         <source>Discard</source>
         <comment>saved state</comment>
         <translation>破棄</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="986"/>
         <source>Continue</source>
         <comment>detach image</comment>
         <translation type="obsolete">続�る</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="986"/>
         <source>&lt;p&gt;Do you want to delete this hard disk&apos;s image file &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;If you select &lt;b&gt;Delete&lt;/b&gt; then the image file will be permanently deleted after unregistering the hard disk. This operation cannot be undone.&lt;/p&gt;&lt;p&gt;If you select &lt;b&gt;Unregister&lt;/b&gt; then the virtual hard disk will be unregistered and removed from the collection, but the image file will be left on your physical disk.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;�ードディスクイメージファイル&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;を削除����？&lt;/nobr&gt;&lt;/p&gt;
 &lt;p&gt;&lt;b&gt;[削除]&lt;/b&gt;を�択�る��イメージファイル�リスト�ら�り除�れ�後�永久�削除�れ��。���作�元�戻���ん。&lt;/p&gt;
 &lt;p&gt;&lt;b&gt;[登録解除]&lt;/b&gt;を�択�る��仮想�ードディスク�リスト�ら�り除�れ����イメージファイル�物�ディスク上�残�れ��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="986"/>
         <source>Delete</source>
         <comment>hard disk</comment>
         <translation type="obsolete">削除</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="986"/>
         <source>Unregister</source>
         <comment>hard disk</comment>
         <translation type="obsolete">登録解除</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="986"/>
         <source>&lt;p&gt;There are hard disks attached to SATA ports of this virtual machine. If you disable the SATA controller, all these hard disks will be automatically detached.&lt;/p&gt;&lt;p&gt;Are you sure that you want to disable the SATA controller?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;��仮想マシン�SATA�ート�割り当�られ��ードディスク��り��。SATA コントローラを無効��る���れら��ードディスク�自動的�割り当�解除�れ��。&lt;/p&gt;
 &lt;p&gt;SATA コントローラを無効�����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1099"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1098"/>
         <source>Disable</source>
         <comment>hard disk</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1099"/>
         <source>Failed to attach a hard disk image with UUID %1 to device slot %2 on channel %3 of the %4 bus of the machine &lt;b&gt;%5&lt;/b&gt;.</source>
         <translation type="obsolete">�ードディスクイメージ(UUID %1)��仮想マシン&lt;b&gt;&quot;%5&quot;&lt;/b&gt;��ス %4 ��ャン�ル %3 �デ�イススロット %2 ��割り当��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1099"/>
         <source>Failed to detach a hard disk image from device slot %1 on channel %2 of the %3 bus of the machine &lt;b&gt;%4&lt;/b&gt;.</source>
         <translation type="obsolete">�ードディスクイメージ��仮想マシン&lt;b&gt;&quot;%4&quot;&lt;/b&gt;��ス %3 ��ャン�ル %2 �デ�イススロット %1 �ら�割り当�解除�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1531"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1530"/>
         <source>Download</source>
         <comment>additions</comment>
         <translation>ダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1546"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1545"/>
         <source>Mount</source>
         <comment>additions</comment>
         <translation>マウント</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1721"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1687"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1720"/>
         <source>&lt;p&gt;The host key is currently defined as &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;</source>
         <comment>additional message box paragraph</comment>
         <translation>&lt;p&gt;�在ホストキー�&lt;b&gt;%1&lt;/b&gt;�割り当�られ����。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1695"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1694"/>
         <source>Capture</source>
         <comment>do input capture</comment>
         <translation>キャプ�ャ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1695"/>
         <source>&lt;p&gt;One or more of the registered virtual hard disks, CD/DVD or floppy media are not currently accessible. As a result, you will not be able to operate virtual machines that use these media until they become accessible later.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;Check&lt;/b&gt; to open the Virtual Disk Manager window and see what media are inaccessible, or press &lt;b&gt;Ignore&lt;/b&gt; to ignore this message.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;登録�れ�一�以上�仮想�ードディスク�CD/DVD���フロッピーメディア���在アクセス����ん。アクセス�能��る���れら�メディアを使用�る仮想マシンを�作����ん。&lt;/p&gt;
 &lt;p&gt;&lt;b&gt;[確�]&lt;/b&gt;ボタンをクリック��仮想ディスクマ�ージャを起動����メディア�アクセス������確�������。���&lt;b&gt;[無視]&lt;/b&gt;ボタンをクリック�����メッセージを無視������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1816"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1815"/>
         <source>Check</source>
         <comment>inaccessible media message box</comment>
         <translation>確�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1816"/>
         <source>&lt;p&gt;The following VirtualBox settings files have been automatically converted to the new settings file format version &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;However, the results of the conversion were not saved back to disk yet. Please press:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Save&lt;/b&gt; 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);&lt;/li&gt;&lt;li&gt;&lt;b&gt;Backup&lt;/b&gt; to create backup copies of the settings files in the old format before saving them in the new format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Cancel&lt;/b&gt; to not save the auto-converted settings files now.&lt;li&gt;&lt;/ul&gt;&lt;p&gt;Note that if you select &lt;b&gt;Cancel&lt;/b&gt;, the auto-converted settings files will be implicitly saved in the new format anyway once you change a setting or start a virtual machine, but &lt;b&gt;no&lt;/b&gt; backup copies will be created in this case.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;次�VirtualBox設定ファイル�自動的��ージョン &lt;b&gt;%1&lt;/b&gt; �新��設定ファイル形��変��れ���。&lt;/p&gt;
 &lt;p&gt;�����ら�変�後�ファイル���ディスク��存�れ����ん。ボタンをクリック������：&lt;/p&gt;
@@ -6504,123 +6202,116 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
 &lt;p&gt;注：&lt;b&gt;[キャンセル]&lt;/b&gt; ��択時�設定を変更�る�仮想マシンを起動�る�自動変��れ�設定ファイル�暗黙的��存�れ������場��ん��ックアップコピーも&lt;b&gt;作��れ��ん&lt;/b&gt;。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1816"/>
         <source>&amp;Save</source>
         <comment>warnAboutAutoConvertedSettings message box</comment>
         <translation type="obsolete">�存(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1816"/>
         <source>&amp;Backup</source>
         <comment>warnAboutAutoConvertedSettings message box</comment>
         <translation type="obsolete">�ックアップ(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1816"/>
         <source>Cancel</source>
         <comment>warnAboutAutoConvertedSettings message box</comment>
         <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1889"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1888"/>
         <source>Switch</source>
         <comment>fullscreen</comment>
         <translation>切り替�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1911"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1910"/>
         <source>Switch</source>
         <comment>seamless</comment>
         <translation>切り替�</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1987"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1986"/>
         <source>&lt;p&gt;Do you really want to reset the virtual machine?&lt;/p&gt;&lt;p&gt;This will cause any unsaved data in applications running inside it to be lost.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシンを本当�リセット����？&lt;/p&gt;&lt;p&gt;仮想マシンをリセット�る����中�稼動中�����アプリケーション��存�れ����データ�失�れ��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1991"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1990"/>
         <source>Reset</source>
         <comment>machine</comment>
         <translation>リセット</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2010"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2009"/>
         <source>Continue</source>
         <comment>no hard disk attached</comment>
         <translation>続�る</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2011"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2010"/>
         <source>Go Back</source>
         <comment>no hard disk attached</comment>
         <translation>戻る</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="431"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="430"/>
         <source>Failed to copy file &lt;b&gt;&lt;nobr&gt;%1&lt;/nobr&gt;&lt;/b&gt; to &lt;b&gt;&lt;nobr&gt;%2&lt;/nobr&gt;&lt;/b&gt; (%3).</source>
         <translation>ファイル&lt;b&gt;&lt;nobr&gt;&quot;%1&quot;&lt;/nobr&gt;&lt;/b&gt;�&lt;b&gt;&lt;nobr&gt;&quot;%2&quot;&lt;/nobr&gt;&lt;/b&gt;��コピー�失敗����(%3)。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="431"/>
         <source>&lt;p&gt;There are no unused hard disks available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Create&lt;/b&gt; button to start the &lt;i&gt;New Virtual Disk&lt;/i&gt; wizard and create a new hard disk, or press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Disk Manager&lt;/i&gt;.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;新��割り当��利用��る未使用��ードディスク��り��ん。&lt;/p&gt;
 &lt;p&gt;&lt;b&gt;[作�]&lt;/b&gt;ボタンをクリック��&lt;i&gt;新�仮想ディスク作�ウィザード&lt;/i&gt;を起動��新��ードディスクイメージを作��る��&lt;b&gt;[�択]&lt;/b&gt;ボタンをクリック���&lt;i&gt;仮想ディスクマ�ージャ&lt;/i&gt;を開��動作を�択������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="431"/>
         <source>&amp;Create</source>
         <comment>hard disk</comment>
         <translation type="obsolete">作�(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="431"/>
         <source>Select</source>
         <comment>hard disk</comment>
         <translation type="obsolete">�択</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="918"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="917"/>
         <source>&lt;p&gt;Could not enter seamless mode due to insufficient guest video memory.&lt;/p&gt;&lt;p&gt;You should configure the virtual machine to have at least &lt;b&gt;%1&lt;/b&gt; of video memory.&lt;/p&gt;</source>
         <translation>&lt;p&gt;ゲストOS�ビデオメモリ�足����シームレスモード�切り替�����ん。&lt;/p&gt;&lt;p&gt;仮想マシン�設定�ビデオメモリを &lt;b&gt;%1&lt;/b&gt;以上�設定������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="931"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="930"/>
         <source>&lt;p&gt;Could not switch the guest display to fullscreen mode due to insufficient guest video memory.&lt;/p&gt;&lt;p&gt;You should configure the virtual machine to have at least &lt;b&gt;%1&lt;/b&gt; of video memory.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;Ignore&lt;/b&gt; to switch to fullscreen mode anyway or press &lt;b&gt;Cancel&lt;/b&gt; to cancel the operation.&lt;/p&gt;</source>
         <translation>&lt;p&gt;ゲストOS�ビデオメモリ�足����ゲスト画�をフルスクリーンモード�切り替�����ん。&lt;/p&gt;&lt;p&gt;仮想マシン�設定�ビデオメモリを &lt;b&gt;%1&lt;/b&gt;以上�設定������。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[無視]&lt;/b&gt;ボタンをクリック��フルスクリーンモード�切り��る��&lt;b&gt;[キャンセル]&lt;/b&gt;ボタンをクリック���作を�り消������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="931"/>
         <source>&lt;p&gt;Unable to obtain the new version information due to the following network error:&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;�ットワークエラー����新���ージョン情報を�得����ん:&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1661"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1660"/>
         <source>You are already running the most recent version of VirtualBox.</source>
         <translation>最新�ージョン�VirtualBox�インストール�れ����。 後��ージョン確�を行������。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1673"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1672"/>
         <source>&lt;p&gt;You have &lt;b&gt;clicked the mouse&lt;/b&gt; inside the Virtual Machine display or pressed the &lt;b&gt;host key&lt;/b&gt;. This will cause the Virtual Machine to &lt;b&gt;capture&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;You can press the &lt;b&gt;host key&lt;/b&gt; at any time to &lt;b&gt;uncapture&lt;/b&gt; the keyboard and mouse (if it is captured) and return them to normal operation. The currently assigned host key is shown on the status bar at the bottom of the Virtual Machine window, next to the&amp;nbsp;&lt;img src=:/hostkey_16px.png/&gt;&amp;nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン�画�を&lt;b&gt;マウスクリック&lt;/b&gt;�る�����&lt;b&gt;ホストキー&lt;/b&gt;を押���仮想マシン�マウス�インタ(マウス統�機能�ゲストOS�サ�ート�れ��������)�キーボードを&lt;b&gt;キャプ�ャ&lt;/b&gt;���。仮想マシン�キーボード�マウス�キャプ�ャ�れる�ホストPC�動作�る他�アプリケーション�利用����ん。&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;ホストキー&lt;/b&gt;を押���キーボード�マウス(キャプ�ャ�れ��る��)�&lt;b&gt;キャプ�ャ解除&lt;/b&gt;�れ�通常��作�戻る�������。�在割り当�られ��るホストキー�仮想マシン�ウィンドウ下部�ステータス�ー�&amp;nbsp;&lt;img src=:/hostkey_16px.png/&gt;&amp;nbsp;アイコン�表示�れ��。��アイコン�マウスアイコン�共��在�キーボ−ド�マウス�キャプ�ャ状態を表示���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1706"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1705"/>
         <source>&lt;p&gt;You have the &lt;b&gt;Auto capture keyboard&lt;/b&gt; option turned on. This will cause the Virtual Machine to automatically &lt;b&gt;capture&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;You can press the &lt;b&gt;host key&lt;/b&gt; at any time to &lt;b&gt;uncapture&lt;/b&gt; the keyboard and mouse (if it is captured) and return them to normal operation. The currently assigned host key is shown on the status bar at the bottom of the Virtual Machine window, next to the&amp;nbsp;&lt;img src=:/hostkey_16px.png/&gt;&amp;nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;キーボード�自動キャプ�ャ&lt;/b&gt;機能�有効��。仮想マシン�ウィンドウ�アクティブ����仮想マシン�キーボードを自動的�&lt;b&gt;キャプ�ャ&lt;/b&gt;���。キーボード�キャプ�ャ�れる������キーストローク(Alt-Tab��を�む)�仮想マシン��られる���ホストPC�動作�る他�アプリケーション�利用����ん。&lt;/p&gt;&lt;p&gt;&lt;b&gt;ホストキー&lt;/b&gt;を押���キーボード�マウス(キャプ�ャ�れ��る��)�&lt;b&gt;キャプ�ャ解除&lt;/b&gt;�れ�通常��作�戻る�������。�在割り当�られ��るホストキー�仮想マシン�ウィンドウ下部�ステータス�ー�&amp;nbsp;&lt;img src=:/hostkey_16px.png/&gt;&amp;nbsp;アイコン�表示�れ��。��アイコン�マウスアイコン�共��在�キーボ−ド�マウス�キャプ�ャ状態を表示���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1748"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1747"/>
         <source>&lt;p&gt;The Virtual Machine reports that the guest OS supports &lt;b&gt;mouse pointer integration&lt;/b&gt;. This means that you do not need to &lt;i&gt;capture&lt;/i&gt; 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&apos;s display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.&lt;/p&gt;&lt;p&gt;The mouse icon on the status bar will look like&amp;nbsp;&lt;img src=:/mouse_seamless_16px.png/&gt;&amp;nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note&lt;/b&gt;: Some applications may behave incorrectly in mouse pointer integration mode. You can always disable it for the current session (and enable it again) by selecting the corresponding action from the menu bar.&lt;/p&gt;</source>
         <translation>&lt;p&gt;ゲストOS�&lt;b&gt;マウス統�&lt;/b&gt;機能�サ�ート�れ����。ゲストOS�マウス�インタを&lt;i&gt;キャプ�ャ&lt;/i&gt;�る����使用����。仮想マシン�画�上�マウス�インタ��る�������マウス�動作�直接ゲストOS��られ��。�在マウス�キャプ�ャ�れ��る����自動的�キャプ�ャ解除�れ��。ステータス�ー�マウスアイコン��マウス統�機能�ゲストOS�サ�ート�れ��在有効��る��を示���&amp;nbsp;&lt;img src=:/mouse_seamless_16px.png/&gt;&amp;nbsp;�よ��表示�れ��。 &lt;/p&gt;&lt;p&gt;&lt;b&gt;注&lt;/b&gt;: マウス統�機能�有効���������アプリケーション�動作��正��る�も�れ��ん。メニュー�ー�ら対応�る動作を�択���在�セッション�マウス統�機能を無効化(���有効化)�る�������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1879"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1878"/>
         <source>&lt;p&gt;The virtual machine window will be now switched to &lt;b&gt;fullscreen&lt;/b&gt; mode. You can go back to windowed mode at any time by pressing &lt;b&gt;%1&lt;/b&gt;. Note that the &lt;i&gt;Host&lt;/i&gt; key is currently defined as &lt;b&gt;%2&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing &lt;b&gt;Host+Home&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン�ウィンドウを&quot;フルスクリーン&quot;モード�切り替���。&lt;b&gt;%1&lt;/b&gt;キーを押�����もウィンドウモード�戻る�������。注：ホストキー��在&lt;b&gt;%2&lt;/b&gt;�割り当�られ����。&lt;/p&gt;&lt;p&gt;注：フルスクリーンモード��メインメニュー�ー�表示�れ��ん。メニュー�ー�アクセス�る�� &lt;b&gt;Host+Home&lt;/b&gt;キーを押������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1901"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1900"/>
         <source>&lt;p&gt;The virtual machine window will be now switched to &lt;b&gt;Seamless&lt;/b&gt; mode. You can go back to windowed mode at any time by pressing &lt;b&gt;%1&lt;/b&gt;. Note that the &lt;i&gt;Host&lt;/i&gt; key is currently defined as &lt;b&gt;%2&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Note that the main menu bar is hidden in seamless mode. You can access it by pressing &lt;b&gt;Host+Home&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン�ウィンドウを&quot;シームレス&quot;モード�切り替���。&lt;b&gt;%1&lt;/b&gt;キーを押�����もウィンドウ表示�戻る�������。注：ホストキー��在&lt;b&gt;%2&lt;/b&gt;�割り当�られ����。&lt;/p&gt;&lt;p&gt;注：シームレスモード��メインメニュー�ー�表示�れ��ん。メニュー�ー�アクセス�る�� &lt;b&gt;Host+Home&lt;/b&gt;キーを押������。&lt;/p&gt;</translation>
     </message>
@@ -6685,524 +6376,515 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>製�情報ダイアログを表示</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1643"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1642"/>
         <source>&lt;p&gt;A new version of VirtualBox has been released! Version &lt;b&gt;%1&lt;/b&gt; is available at &lt;a href=&quot;http://www.virtualbox.org/&quot;&gt;virtualbox.org&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;You can download this version using the link:&lt;/p&gt;&lt;p&gt;&lt;a href=%2&gt;%3&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox�新���ージョン�リリース�れ���� �ージョン &lt;b&gt;%1&lt;/b&gt;�&lt;a href=&quot;http://www.virtualbox.org/&quot;&gt;virtualbox.org&lt;/a&gt;�ら入手����。&lt;/p&gt;&lt;p&gt;��リンク�ら最新�ージョンをダウンロード����。: &lt;/p&gt;&lt;p&gt;&lt;a href=%2&gt;%3&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="996"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="995"/>
         <source>&lt;p&gt;Are you sure you want to release the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;?&lt;/p&gt;&lt;p&gt;This will detach it from the following virtual machine(s): &lt;b&gt;%3&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&quot;%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;&quot;を解放����？&lt;/p&gt;&lt;p&gt;以下�仮想マシン�ら解放�れ��: &lt;b&gt;%3&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1004"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1003"/>
         <source>Release</source>
         <comment>detach medium</comment>
         <translation>解放</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1013"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1012"/>
         <source>&lt;p&gt;Are you sure you want to remove the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; from the list of known media?&lt;/p&gt;</source>
         <translation>&lt;p&gt;メディア�リスト�ら&quot;%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;&quot;を除去����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1022"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1021"/>
         <source>Note that as this hard disk is inaccessible its storage unit cannot be deleted right now.</source>
         <translation>注：���ードディスク�アクセス��������在ストレージ 装置を削除����ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1026"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1025"/>
         <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>次�ダイアログ�����ードディスク�ストレージ装置を削除�る��後�使用�る�����る�を�択����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1032"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1031"/>
         <source>&lt;p&gt;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.&lt;/p&gt;</source>
         <translation>&lt;p&gt;注：��メディア�ストレージ装置�削除�れ��ん。後�リスト��度追加�る����能��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1038"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1037"/>
         <source>Remove</source>
         <comment>medium</comment>
         <translation>除去</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1045"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1044"/>
         <source>&lt;p&gt;The hard disk storage unit at location &lt;b&gt;%1&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;Please specify a different location.&lt;/p&gt;</source>
         <translation>&lt;p&gt;�ードディスク ストレージ装置�場所 &lt;b&gt;&quot;%1&quot;&lt;/b&gt;����存在���。別�仮想�ードディスク�使用���る�����場所�新�仮想�ードディスクを作�����ん。&lt;/p&gt;&lt;p&gt;別�場所を指定������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1057"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1056"/>
         <source>&lt;p&gt;Do you want to delete the storage unit of the hard disk &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;?&lt;/p&gt;&lt;p&gt;If you select &lt;b&gt;Delete&lt;/b&gt; then the specified storage unit will be permanently deleted. This operation &lt;b&gt;cannot be undone&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;If you select &lt;b&gt;Keep&lt;/b&gt; 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 possible to add this hard disk to the list later again.&lt;/p&gt;</source>
         <translation>&lt;p&gt;�ードディスク&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;&lt;/nobr&gt;�ストレージ装置を削除����？&lt;/p&gt;&lt;p&gt;&lt;b&gt;[削除]&lt;/b&gt;を�択�る��指定�れ�ストレージ装置�永久�削除�れ��。���作�&lt;b&gt;元�戻���ん&lt;/b&gt;。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[��]&lt;/b&gt;を�択�る���ードディスク�リスト�ら�り除�れ����ストレージ装置�後�リスト��度追加��るよ�������置�れ��。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1071"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1070"/>
         <source>Delete</source>
         <comment>hard disk storage</comment>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1072"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1071"/>
         <source>Keep</source>
         <comment>hard disk storage</comment>
         <translation>��</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1083"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1082"/>
         <source>Failed to delete the storage unit of the hard disk &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>�ードディスク ストレージ装置&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�削除�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1083"/>
         <source>&lt;p&gt;There are no unused hard disks available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Create&lt;/b&gt; button to start the &lt;i&gt;New Virtual Disk&lt;/i&gt; wizard and create a new hard disk, or press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Media Manager&lt;/i&gt;.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;新��割り当��利用��る未使用��ードディスク��り��ん。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[作�]&lt;/b&gt;ボタンをクリック��&lt;i&gt;新�仮想ディスク作�ウィザード&lt;/i&gt;を起動��新��ードディスクイメージを作��る��&lt;b&gt;[�択]&lt;/b&gt;ボタンをクリック���&lt;i&gt;仮想メディアマ�ージャ&lt;/i&gt;を開��動作を�択������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1162"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1161"/>
         <source>Failed to create the hard disk storage &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;</source>
         <translation>�ードディスク ストレージ&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�作��失敗����。&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1162"/>
         <source>Failed to attach the hard disk &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; to slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation type="obsolete">�ードディスク&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;&lt;/nobr&gt;��仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�スロット&lt;i&gt;&quot;%2&quot;&lt;/i&gt; ��割り当��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1162"/>
         <source>Failed to detach the hard disk &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; from slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation type="obsolete">�ードディスク&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;&lt;/nobr&gt;��仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�スロット&lt;i&gt;&quot;%2&quot;&lt;/i&gt; ��割り当�解除�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1162"/>
         <source>Failed to mount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; on the machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation type="obsolete">&quot;%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;&quot;��仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;��マウント�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1162"/>
         <source>Failed to unmount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; from the machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation type="obsolete">&quot;%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;&quot;��仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�ら�マウント解除�失敗�����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1245"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1244"/>
         <source>Failed to open the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;.</source>
         <translation>&quot;%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;&quot;�オープン�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1257"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1256"/>
         <source>Failed to close the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;.</source>
         <translation>&quot;%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;&quot;�クローズ�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1306"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1305"/>
         <source>Failed to determine the accessibility state of the medium &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;.</source>
         <translation>メディア&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;&lt;/nobr&gt;�アクセス��状態��得�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1607"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1606"/>
         <source>&lt;p&gt;Failed to connect to the VirtualBox online registration service due to the following error:&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox�オンライン登録サービス�接続����ん。エラー:&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1653"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1652"/>
         <source>&lt;p&gt;Unable to obtain the new version information due to the following error:&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;新���ージョン�情報を�得����ん。エラー:&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1805"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1804"/>
         <source>&lt;p&gt;One or more virtual hard disks, CD/DVD or floppy media are not currently accessible. As a result, you will not be able to operate virtual machines that use these media until they become accessible later.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;Check&lt;/b&gt; to open the Virtual Media Manager window and see what media are inaccessible, or press &lt;b&gt;Ignore&lt;/b&gt; to ignore this message.&lt;/p&gt;</source>
         <translation>&lt;p&gt;一�以上�仮想�ードディスク�CD/DVD���フロッピーメディア���在アクセス����ん。アクセス�能��る���れら�メディアを使用�る仮想マシンを�作����ん。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[確�]&lt;/b&gt;ボタンをクリック��仮想メディアマ�ージャを起動����メディア�アクセス������確�������。���&lt;b&gt;[無視]&lt;/b&gt;ボタンをクリック�����メッセージを無視������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1805"/>
         <source>&lt;p&gt;Your existing VirtualBox settings files were automatically converted from the old format to a new format required by the new version of VirtualBox.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; to start VirtualBox now or press &lt;b&gt;More&lt;/b&gt; if you want to get more information about what files were converted and access additional actions.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;Exit&lt;/b&gt; to terminate the VirtualBox application without saving the results of the conversion to disk.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;既存�VirtualBox設定ファイル���形��らVirtualBox�新�ージョン�必��形��自動変��れ���。&lt;/p&gt;&lt;p&gt;���VirtualBoxを起動�る��&lt;b&gt;[OK]&lt;/b&gt;ボタンをクリック������。変��れ�設定ファイル�����詳��情報を得��場��&lt;b&gt;[詳細]&lt;/b&gt;ボタンをクリック������。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[終了]&lt;/b&gt;ボタンをクリック�る��変��果をディスク��存�る�����VirtualBoxアプリケーションを終了���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1805"/>
         <source>&amp;More</source>
         <comment>warnAboutAutoConvertedSettings message box</comment>
         <translation type="obsolete">詳細(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1805"/>
         <source>E&amp;xit</source>
         <comment>warnAboutAutoConvertedSettings message box</comment>
         <translation type="obsolete">終了(&amp;X)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1805"/>
         <source>&lt;p&gt;The following VirtualBox settings files have been automatically converted to the new settings file format version &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;However, the results of the conversion were not saved back to disk yet. Please press:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Backup&lt;/b&gt; to create backup copies of the settings files in the old format before saving them in the new format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Overwrite&lt;/b&gt; to save all auto-converted files without creating backup copies (it will not be possible to use these settings files with an older version of VirtualBox afterwards);&lt;/li&gt;%2&lt;/ul&gt;&lt;p&gt;It is recommended to always select &lt;b&gt;Backup&lt;/b&gt; because in this case it will be possible to go back to the previous version of VirtualBox (if necessary) without losing your current settings. See the VirtualBox Manual for more information about downgrading.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;次�VirtualBox設定ファイル�自動的��ージョン &lt;b&gt;&quot;%1&quot;&lt;/b&gt; �新��設定ファイル形��変��れ���。&lt;/p&gt;&lt;p&gt;�����ら�変�後�ファイル���ディスク��存�れ����ん。ボタンをクリック������：&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;[�ックアップ]&lt;/b&gt;： 新��形��設定ファイルを�存�る�����形��設定ファイル��ックアップコピーを作����。&lt;/li&gt;&lt;li&gt;&lt;b&gt;[上書�]&lt;/b&gt;：�ックアップコピーを作���������変�済�ファイルを�存���。(旧�ージョン�VirtualBox��れら�設定ファイル�使用����ん)&lt;/li&gt;%2&lt;/ul&gt;&lt;p&gt;(必��ら�) 旧�ージョン�VirtualBox��在�設定を失�����戻る�����る���&lt;b&gt;[�ックアップ]&lt;/b&gt; を�択�る��を推奨���。ダウングレード�関�る詳細�VirtualBoxマニュアルを�照������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1805"/>
         <source>&lt;li&gt;&lt;b&gt;Exit&lt;/b&gt; to terminate VirtualBox without saving the results of the conversion to disk.&lt;/li&gt;</source>
         <translation type="obsolete">&lt;li&gt;&lt;b&gt;[終了]&lt;/b&gt;：変��果をディスク��存���VirtualBoxを終了���。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1805"/>
         <source>O&amp;verwrite</source>
         <comment>warnAboutAutoConvertedSettings message box</comment>
         <translation type="obsolete">上書�(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1954"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1953"/>
         <source>&lt;p&gt;A critical error has occurred while running the virtual machine and the machine execution has been stopped.&lt;/p&gt;&lt;p&gt;For help, please see the Community section on &lt;a href=http://www.virtualbox.org&gt;http://www.virtualbox.org&lt;/a&gt; or your support contract. Please provide the contents of the log file &lt;tt&gt;VBox.log&lt;/tt&gt; and the image file &lt;tt&gt;VBox.png&lt;/tt&gt;, which you can find in the &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; directory, as well as a description of what you were doing when this error happened. Note that you can also access the above files by selecting &lt;b&gt;Show Log&lt;/b&gt; from the &lt;b&gt;Machine&lt;/b&gt; menu of the main VirtualBox window.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; if you want to power off the machine or press &lt;b&gt;Ignore&lt;/b&gt; if you want to leave it as is for debugging. Please note that debugging requires special knowledge and tools, so it is recommended to press &lt;b&gt;OK&lt;/b&gt; now.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン実行中��大�エラー�発生�����仮想マシン��止����。&lt;/p&gt;&lt;p&gt;�題�解決����&lt;a href=http://www.virtualbox.org&gt;http://www.virtualbox.org&lt;/a&gt;�Communityセクションを�照�る��サ�ート�連絡������。����エラー発生時�行���作�共��&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;ディレクトリ�格��れ��るログファイル(&lt;tt&gt;VBox.log&lt;/tt&gt;)�イメージファイル(&lt;tt&gt;VBox.png&lt;/tt&gt;)を�供������。注：VirualBoxメインウィンドウ�&lt;b&gt;[仮想マシン]&lt;/b&gt;メニュー�ら[ログを�照]を�択���上記ファイル�アクセス�る�������。&lt;/p&gt;&lt;p&gt;仮想マシンを電�オフ�る��&lt;b&gt;[OK]&lt;/b&gt;ボタンをクリック������。����デ�ッグを行���&lt;b&gt;[無視]&lt;/b&gt;ボタンをクリック������。デ�ッグ��特別�知識�ツールを必���る���&lt;b&gt;[OK]&lt;/b&gt;ボタンをクリック�る��を推奨���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1954"/>
         <source>hard disk</source>
         <comment>failed to close ...</comment>
         <translation type="obsolete">�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1954"/>
         <source>CD/DVD image</source>
         <comment>failed to close ...</comment>
         <translation type="obsolete">CD/DVDイメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1954"/>
         <source>floppy image</source>
         <comment>failed to close ...</comment>
         <translation type="obsolete">フロッピーイメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1954"/>
         <source>A file named &lt;b&gt;%1&lt;/b&gt; already exists. Are you sure you want to replace it?&lt;br /&gt;&lt;br /&gt;The file already exists in &quot;%2&quot;. Replacing it will overwrite its contents.</source>
         <translation type="obsolete">ファイル�&lt;b&gt;&quot;%1&quot;&lt;/b&gt;����使�れ����。ファイルを置������？&lt;br /&gt;&lt;br /&gt;ファイル�&quot;%2&quot;�存在���。ファイル�内容�上書��れ��。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="306"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="305"/>
         <source>The following files already exist:&lt;br /&gt;&lt;br /&gt;%1&lt;br /&gt;&lt;br /&gt;Are you sure you want to replace them? Replacing them will overwrite their contents.</source>
         <translation>以下�ファイル����存在�����:&lt;br /&gt;&lt;br /&gt;%1&lt;br /&gt;&lt;br /&gt;ファイルを置������？ファイル�内容�上書��れ��。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="341"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="340"/>
         <source>Failed to remove the file &lt;b&gt;%1&lt;/b&gt;.&lt;br /&gt;&lt;br /&gt;Please try to remove the file yourself and try again.</source>
         <translation>&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�除去�失敗����。&lt;br /&gt;&lt;br /&gt;手作業�ファイルを�り除���実行������。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="378"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="377"/>
         <source>You are running a prerelease version of VirtualBox. This version is not suitable for production use.</source>
         <translation>�れ�VirtualBox�プレリリース�ージョン��。���ージョン�実務作業��������ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="543"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="542"/>
         <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>USBファイルシステム(usbfs)もDBus�halサービスも利用�������ホストシステム�USB�アクセス����ん���。 ゲストOS�ホストUSB デ�イスを使用�る����れを修正��VirtualBoxを�起動������。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="791"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="790"/>
         <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イベント�ゲストOSをシャットダウン�よ�������。ゲストOS�ACPIサブシステムを使用�����シャットダウン����ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="799"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="798"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想化支�機能(VT-x/AMD-V)を有効化����ん。64ビット ゲストOS�64ビットCPUを検出����起動����ん。&lt;/p&gt;&lt;p&gt;ホストマシン�BIOS設定�VT-x/AMD-Vを有効化������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="817"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="804"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="816"/>
         <source>Close VM</source>
         <translation>仮想マシンを閉�る</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="817"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="804"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="816"/>
         <source>Continue</source>
         <translation>続�る</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="817"/>
         <source>&lt;p&gt;Are you sure you wish to delete the selected snapshot and saved state?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;�択�れ�スナップショット��存�れ�状態を削除����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="817"/>
         <source>Discard</source>
         <translation type="obsolete">破棄</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="853"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="840"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="852"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1093"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1092"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Are you sure you want to disable the additional controller?&lt;/p&gt;</source>
         <translation>&lt;p&gt;追加�コントローラ��ート�割り当�られ��ードディスク��り��。追加�コントローラを無効��る���れら��ードディスク�自動的�割り当�解除�れ��。&lt;/p&gt;&lt;p&gt;追加�コントローラを無効�����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1105"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1104"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Are you sure you want to change the additional controller?&lt;/p&gt;</source>
         <translation>&lt;p&gt;追加�コントローラ��ート�割り当�られ��ードディスク��り��。追加�コントローラを変更�る���れら��ードディスク�自動的�割り当�解除�れ��。&lt;/p&gt;&lt;p&gt;追加�コントローラを変更����？&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1111"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1110"/>
         <source>Change</source>
         <comment>hard disk</comment>
         <translation>変更</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1111"/>
         <source>&lt;p&gt;Do you want to remove the selected host network interface &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 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.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;�択��ホスト �ットワーク インターフェース ;&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;を除去����？&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;注：&lt;/b&gt; ��インターフェース�複数�仮想マシン�1�以上��ットワーク アタプタ�使用中�も�れ��ん。除去�る��他�インターフェース�を����別�割り当�方法を正��設定�る���れら�アダプタ�動作���ん。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1341"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1332"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1340"/>
         <source>Failed to create the host-only network interface.</source>
         <translation>ホストオンリー �ットワーク インターフェース�作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1837"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1836"/>
         <source>&lt;p&gt;Your existing VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; to start VirtualBox now or press &lt;b&gt;Exit&lt;/b&gt; if you want to terminate the VirtualBox application without any further actions.&lt;/p&gt;</source>
         <translation>&lt;p&gt;既存�VirtualBox設定ファイル���形��らVirtualBox�新�ージョン�必��形��自動変��れ��。&lt;/p&gt;&lt;p&gt;���VirtualBoxを起動�る��&lt;b&gt;[OK]&lt;/b&gt;ボタンをクリック������。変��果を�存���VirtualBoxアプリケーションを終了�る��&lt;b&gt;[終了]&lt;/b&gt;ボタンをクリック������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2028"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2027"/>
         <source>Failed to open appliance.</source>
         <translation>仮想アプライアンス�オープン�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2044"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2043"/>
         <source>Failed to open/interpret appliance &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想アプライアンス&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�オープン���解��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2056"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2055"/>
         <source>Failed to import appliance &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想アプライアンス&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�イン�ート�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2086"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2085"/>
         <source>Failed to create appliance.</source>
         <translation>仮想アプライアンス�作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2111"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2093"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2110"/>
         <source>Failed to prepare the export of the appliance &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想アプライアンス&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�エクス�ート��処��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2106"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2105"/>
         <source>Failed to create an appliance.</source>
         <translation>仮想アプライアンス�作��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2122"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2121"/>
         <source>Failed to export appliance &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>仮想アプライアンス&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�エクス�ート�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1316"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1315"/>
         <source>&lt;p&gt;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 &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 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 interface name or a different adapter attachment type.&lt;/p&gt;</source>
         <translation>&lt;p&gt;��インタフェースを削除�る����インターフェース�基����るホストオンリー �ットワーク インタフェース�削除�れ��。ホストオンリー �ットワーク インタフェース&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;を削除����？&lt;/p&gt;&lt;p&gt;&lt;b&gt;注：&lt;/b&gt;��インタフェース�他�仮想�ットワーク アダプタ�使用���る�も�れ��ん。削除��場���れら�アダプタ��他�インタフェース�を����別�アダプタ タイプを�ん�設定を変更�る��使用����ん。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="297"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="296"/>
         <source>A file named &lt;b&gt;%1&lt;/b&gt; already exists. Are you sure you want to replace it?&lt;br /&gt;&lt;br /&gt;Replacing it will overwrite its contents.</source>
         <translation>ファイル�&lt;b&gt;&quot;%1&quot;&lt;/b&gt;����使�れ����。ファイルを置������？&lt;br /&gt;&lt;br /&gt;ファイル�内容�上書��れ��。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="811"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="810"/>
         <source>&lt;p&gt;VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Certain guests (e.g. OS/2 and QNX) require this feature.&lt;/p&gt;&lt;p&gt;Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想化支�機能(VT-x/AMD-V)�有効化�れ����使用����ん。�����ゲストOS(OS/2やQNX��))�本機能を必�����。&lt;/p&gt;&lt;p&gt;ホストマシン�BIOS設定�VT-x/AMD-Vを有効化������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1630"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1629"/>
         <source>&lt;p&gt;Invalid e-mail address or password specified.&lt;/p&gt;</source>
         <translation>&lt;p&gt;無効�メールアドレス���パスワード�指定�れ���。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1633"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1632"/>
         <source>&lt;p&gt;Failed to register the VirtualBox product.&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox�登録�失敗����。&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2066"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2065"/>
         <source>Failed to check files.</source>
         <translation>ファイル�確��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2076"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2075"/>
         <source>Failed to remove file.</source>
         <translation>ファイル�除去中�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="363"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="362"/>
         <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>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="386"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="385"/>
         <source>You are running an EXPERIMENTAL build of VirtualBox. This version is not suitable for production use.</source>
         <translation>�れ�VirtualBox�試験的ビルド��。���ージョン�実務作業��������ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="836"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="835"/>
         <source>&lt;p&gt;Are you sure you want to restore snapshot &lt;b&gt;%1&lt;/b&gt;? This will cause you to lose your current machine state, which cannot be recovered.&lt;/p&gt;</source>
         <translation>&lt;p&gt;スナップショット&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�復元����？�在�仮想マシン�状態�失�れ��れを回復�る�������ん。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="841"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="840"/>
         <source>Restore</source>
         <translation>復元</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="847"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="846"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;/p&gt;Are you sure you want to delete the selected snapshot &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;スナップショットを削除�る��スナップショット�格��れ��る情報�失�れ�VirtualBox�スナップショット�共�作���複数�ディスク データ�����ファイル�マージ�れ��。�れ��長�時間���る�も�れ��ん。���スナップショット�情報を回復�る�������ん。&lt;/p&gt;&lt;p&gt;スナップショット&lt;b&gt;&quot;%1&quot;&lt;/b&gt;を削除����？。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="853"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="852"/>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="872"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="859"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="871"/>
         <source>Failed to restore the snapshot &lt;b&gt;%1&lt;/b&gt; of the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%2&quot;&lt;/b&gt;�スナップショット&lt;b&gt;&quot;%1&quot;&lt;/b&gt;��復元�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="894"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="881"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="893"/>
         <source>Failed to delete the snapshot &lt;b&gt;%1&lt;/b&gt; of the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
         <translation>仮想マシン&lt;b&gt;&quot;%2&quot;&lt;/b&gt;�スナップショット&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�削除�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1120"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1119"/>
         <source>&lt;p&gt;There are no unused media available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Create&lt;/b&gt; button to start the &lt;i&gt;New Virtual Disk&lt;/i&gt; wizard and create a new medium, or press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Media Manager&lt;/i&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;新��割り当��利用��る未使用�メディア��り��ん。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[作�]&lt;/b&gt;ボタンをクリック��&lt;i&gt;新�仮想ディスク作�ウィザード&lt;/i&gt;を起動��新��ードディスクイメージを作��る��&lt;b&gt;[�択]&lt;/b&gt;ボタンをクリック���&lt;i&gt;仮想メディアマ�ージャ&lt;/i&gt;を開������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1130"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1129"/>
         <source>&amp;Create</source>
         <comment>medium</comment>
         <translation>作�(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1142"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1130"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1141"/>
         <source>&amp;Select</source>
         <comment>medium</comment>
         <translation>�択(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1134"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1133"/>
         <source>&lt;p&gt;There are no unused media available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Media Manager&lt;/i&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;新��割り当��利用��る未使用�メディア��り��ん。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[�択]&lt;/b&gt;ボタンをクリック���&lt;i&gt;仮想メディアマ�ージャ&lt;/i&gt;を開������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1150"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1149"/>
         <source>&lt;p&gt;Are you sure you want to delete the CD/DVD-ROM device?&lt;/p&gt;&lt;p&gt;You will not be able to mount any CDs or ISO images or install the Guest Additions without it!&lt;/p&gt;</source>
         <translation>&lt;p&gt;CD/DVD-ROM デ�イスを削除����？&lt;/p&gt;&lt;p&gt;デ�イス���場��CD/DVDメディアやISOイメージファイル�マウント�よ�Guest Additions �インストール�����ん�&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1154"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1153"/>
         <source>&amp;Remove</source>
         <comment>medium</comment>
         <translation>除去(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1179"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1178"/>
         <source>Failed to attach the %1 to slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation>&quot;%1&quot;�仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�スロット&lt;i&gt;&quot;%2&quot;&lt;/i&gt;��割り当��失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1195"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1194"/>
         <source>Failed to detach the %1 from slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation>&quot;%1&quot;�仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�スロット&lt;i&gt;&quot;%2&quot;&lt;/i&gt;��割り当�解除�失敗����。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1210"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1209"/>
         <source>Unable to mount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; on the machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation>%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;を仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�マウント����ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1211"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1210"/>
         <source> Would you like to force mounting of this medium?</source>
         <translation>メディアを強制マウント����？</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1215"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1214"/>
         <source>Unable to unmount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; from the machine &lt;b&gt;%3&lt;/b&gt;.</source>
         <translation>%1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;を仮想マシン&lt;b&gt;&quot;%3&quot;&lt;/b&gt;�らマウント解除����ん。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1216"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1215"/>
         <source> Would you like to force unmounting of this medium?</source>
         <translation>メディアを強制マウント解除����？</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1226"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1225"/>
         <source>Force Unmount</source>
         <translation>強制マウント解除</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1266"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1265"/>
         <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>仮想ドライブ�ディスク��り出��失敗����。��ドライブ�ゲストOS�よ��ロック�れ����。確�後��実行������。</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1515"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1514"/>
         <source>&lt;p&gt;Could not insert the VirtualBox Guest Additions installer CD image into the virtual machine &lt;b&gt;%1&lt;/b&gt;, as the machine has no CD/DVD-ROM drives. Please add a drive using the storage page of the virtual machine settings dialog.&lt;/p&gt;</source>
         <translation>&lt;p&gt;仮想マシン&lt;b&gt;&quot;%1&quot;&lt;/b&gt;�CD/DVD-ROMドライブを�������VirtualBox Guest Additions�インストールCDイメージを仮想マシン�インサート����ん。 仮想マシン設定ダイアログ�[ストレージ]ページ�ドライブを追加������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1866"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1847"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1865"/>
         <source>E&amp;xit</source>
         <comment>warnAboutSettingsAutoConversion message box</comment>
         <translation>終了(&amp;X)</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1854"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="1853"/>
         <source>&lt;p&gt;The following VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; to start VirtualBox now or press &lt;b&gt;Exit&lt;/b&gt; if you want to terminate the VirtualBox application without any further actions.&lt;/p&gt;</source>
         <translation>&lt;p&gt;次�VirtualBox設定ファイル���形��ら新�ージョン�VirtualBoxBox�必���る新��形��自動的�変更�れ��。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[OK]&lt;/b&gt;ボタンをクリック��VirtualBoxを起動�る��設定ファイル�変更を行���VirtualBoxアプリケーションを終了�����ら&lt;b&gt;[終了]&lt;/b&gt;ボタンをクリック������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2230"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2229"/>
         <source>hard disk</source>
         <comment>failed to mount ...</comment>
         <translation>�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2232"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2231"/>
         <source>CD/DVD</source>
         <comment>failed to mount ... host-drive</comment>
         <translation>CD/DVD</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2234"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2233"/>
         <source>CD/DVD image</source>
         <comment>failed to mount ...</comment>
         <translation>CD/DVD イメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2236"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2235"/>
         <source>floppy</source>
         <comment>failed to mount ... host-drive</comment>
         <translation>フロッピー</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2238"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2237"/>
         <source>floppy image</source>
         <comment>failed to mount ...</comment>
         <translation>フロッピー イメージ</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2250"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2249"/>
         <source>hard disk</source>
         <comment>failed to attach ...</comment>
         <translation>�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2252"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2251"/>
         <source>CD/DVD device</source>
         <comment>failed to attach ...</comment>
         <translation>CD/DVD デ�イス</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2254"/>
+        <location filename="../src/globals/VBoxProblemReporter.cpp" line="2253"/>
         <source>floppy device</source>
         <comment>failed to close ...</comment>
         <translation>フロッピー デ�イス</translation>
@@ -7216,72 +6898,58 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>キャンセル(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>Time remaining: %1</source>
         <translation type="obsolete">残り時間: %1</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>%1 days, %2 hours remaining</source>
         <translation type="obsolete">残り時間 %1日� %2時間</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>%1 days, %2 minutes remaining</source>
         <translation type="obsolete">残り時間 %1日� %2分</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>%1 days remaining</source>
         <translation type="obsolete">残り時間 %1日</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>1 day, %1 hours remaining</source>
         <translation type="obsolete">残り時間 1日� %1時間</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>1 day, %1 minutes remaining</source>
         <translation type="obsolete">残り時間 1日� %1分</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>1 day remaining</source>
         <translation type="obsolete">残り時間 1日</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>%1 hours, %2 minutes remaining</source>
         <translation type="obsolete">残り時間 %1時間� %2分</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>1 hour, %1 minutes remaining</source>
         <translation type="obsolete">残り時間 1時間� %1分</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>1 hour remaining</source>
         <translation type="obsolete">残り時間 1時間</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>%1 minutes remaining</source>
         <translation type="obsolete">残り時間 %1分</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>1 minute, %2 seconds remaining</source>
         <translation type="obsolete">残り時間 1分� %2秒</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>1 minute remaining</source>
         <translation type="obsolete">残り時間 1分</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxProgressDialog.cpp" line="118"/>
         <source>%1 seconds remaining</source>
         <translation type="obsolete">残り時間 %1秒</translation>
     </message>
@@ -7316,170 +6984,138 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
 <context>
     <name>VBoxRegistrationDlg</name>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="30"/>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBox 登録ダイアログ</translation>
+        <translation type="obsolete">VirtualBox 登録ダイアログ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="30"/>
         <source>&amp;Name</source>
         <translation type="obsolete">��(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="376"/>
         <source>Enter your full name using Latin characters.</source>
-        <translation>フル�ームを英字�入力������。</translation>
+        <translation type="obsolete">フル�ームを英字�入力������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="376"/>
         <source>&amp;E-mail</source>
         <translation type="obsolete">メールアドレス(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="184"/>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>メールアドレスを入力������。</translation>
+        <translation type="obsolete">メールアドレスを入力������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="184"/>
         <source>&amp;Please do not use this information to contact me</source>
         <translation type="obsolete">情報メール��(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="63"/>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>よ��� VirtualBox 登録フォーム��</translation>
+        <translation type="obsolete">よ��� VirtualBox 登録フォーム��</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="63"/>
         <source>&amp;Confirm</source>
         <translation type="obsolete">確�(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="63"/>
         <source>Connection timed out.</source>
         <translation type="obsolete">接続�タイムアウト��り���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="63"/>
         <source>Could not locate the registration form on the server (response: %1).</source>
         <translation type="obsolete">サー�ー上�登録フォーム�見��り��ん���(応答: %1)。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.cpp" line="416"/>
         <source>Could not perform connection handshake.</source>
-        <translation>接続を確立����ん���。</translation>
+        <translation type="obsolete">接続を確立����ん���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.cpp" line="416"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;登録フォーム�入力������ VirtualBox を使用���る��を我々�知ら������。VirtualBox �ニュース�更新情報を�知ら����(任�)。&lt;/p&gt;&lt;p&gt;フル�ーム(英字)�メールアドレスを下�フィールド�入力������。注：Sun Microsystems ����情報を製�使用�統計を�集��VirtualBox ニュースレターを�信�る�����使用���。Sun Microsystems �個人情報を第三者�渡�����り��ん。個人情報�扱��関�る詳細情報��VirtualBox マニュアル�&quot;&lt;b&gt;Privacy Policy&lt;/b&gt;&quot; セクション��� VirtualBox webサイト�&quot;&lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt;&quot;ページを�照������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.cpp" line="416"/>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
         <translation type="obsolete">Sun Microsystems �ら�情報メールを���り����場���ェックボックスをオン�������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.cpp" line="416"/>
         <source>C&amp;onfirm</source>
         <translation type="obsolete">確�(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="434"/>
         <source>Cancel</source>
-        <translation>キャンセル</translation>
+        <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.cpp" line="308"/>
         <source>Select Country/Territory</source>
-        <translation>国/地域を�択</translation>
+        <translation type="obsolete">国/地域を�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="108"/>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;登録フォーム�入力������ VirtualBox を使用���る��を我々�知ら������。VirtualBox �ニュース�更新情報を�知ら����(任�)。&lt;/p&gt;&lt;p&gt;フル�ーム(英字)�メールアドレスを下�フィールド�入力������。注：Sun Microsystems ����情報を製�使用�統計を�集��VirtualBox ニュースレターを�信�る�����使用���。Sun Microsystems �個人情報を第三者�渡�����り��ん。個人情報�扱��関�る詳細情報��VirtualBox マニュアル�&quot;&lt;b&gt;Privacy Policy&lt;/b&gt;&quot; セクション��� VirtualBox webサイト�&quot;&lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt;&quot;ページを�照������。&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;登録フォーム�入力������ VirtualBox を使用���る��を我々�知ら������。VirtualBox �ニュース�更新情報を�知ら����(任�)。&lt;/p&gt;&lt;p&gt;フル�ーム(英字)�メールアドレスを下�フィールド�入力������。注：Sun Microsystems ����情報を製�使用�統計を�集��VirtualBox ニュースレターを�信�る�����使用���。Sun Microsystems �個人情報を第三者�渡�����り��ん。個人情報�扱��関�る詳細情報��VirtualBox マニュアル�&quot;&lt;b&gt;Privacy Policy&lt;/b&gt;&quot; セクション��� VirtualBox webサイト�&quot;&lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt;&quot;ページを�照������。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="125"/>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Sun オンライン アカウント�登録済���(&amp;H):</translation>
+        <translation type="obsolete">Sun オンライン アカウント�登録済���(&amp;H):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="151"/>
         <source>&amp;E-mail:</source>
-        <translation>メールアドレス:</translation>
+        <translation type="obsolete">メールアドレス:</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="171"/>
         <source>&amp;Password:</source>
-        <translation>パスワード:</translation>
+        <translation type="obsolete">パスワード:</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="201"/>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Sun オンライン アカウントを作���登録���(&amp;W):</translation>
+        <translation type="obsolete">Sun オンライン アカウントを作���登録���(&amp;W):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="224"/>
         <source>&amp;First Name:</source>
-        <translation>��(&amp;F):</translation>
+        <translation type="obsolete">��(&amp;F):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="244"/>
         <source>&amp;Last Name:</source>
-        <translation>姓(&amp;L):</translation>
+        <translation type="obsolete">姓(&amp;L):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="264"/>
         <source>&amp;Company:</source>
-        <translation>会社(&amp;C):</translation>
+        <translation type="obsolete">会社(&amp;C):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="284"/>
         <source>Co&amp;untry:</source>
-        <translation>国/地域(&amp;U):</translation>
+        <translation type="obsolete">国/地域(&amp;U):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="320"/>
         <source>E-&amp;mail:</source>
-        <translation>メールアドレス(&amp;M):</translation>
+        <translation type="obsolete">メールアドレス(&amp;M):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="340"/>
         <source>P&amp;assword:</source>
-        <translation>パスワード(&amp;A):</translation>
+        <translation type="obsolete">パスワード(&amp;A):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="363"/>
         <source>Co&amp;nfirm Password:</source>
-        <translation>パスワード確�(&amp;N):</translation>
+        <translation type="obsolete">パスワード確�(&amp;N):</translation>
     </message>
     <message>
-        <location filename="../src/VBoxRegistrationDlg.ui" line="408"/>
         <source>&amp;Register</source>
-        <translation>登録(R)</translation>
+        <translation type="obsolete">登録(R)</translation>
     </message>
 </context>
 <context>
     <name>VBoxSFDialog</name>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3812"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3847"/>
         <source>Shared Folders</source>
         <translation>共有フォルダ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3812"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3812"/>
         <source>Help</source>
         <translation type="obsolete">ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3812"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
@@ -7515,28 +7151,25 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>詳細(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1309"/>
         <source>Virtual &amp;Disk Manager...</source>
         <translation type="obsolete">仮想ディスクマ�ージャ(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1309"/>
         <source>Ctrl+D</source>
         <translation type="obsolete">Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1309"/>
         <source>Display the Virtual Disk Manager dialog</source>
         <translation type="obsolete">仮想ディスクマ�ージャ ダイアログを表示</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1339"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1346"/>
         <source>&amp;Preferences...</source>
         <comment>global settings</comment>
         <translation>環境設定(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1346"/>
         <source>Ctrl+G</source>
         <translation type="obsolete">Ctrl+G</translation>
     </message>
@@ -7551,7 +7184,6 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>終了(&amp;X)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1351"/>
         <source>Ctrl+Q</source>
         <translation type="obsolete">Ctrl+Q</translation>
     </message>
@@ -7566,12 +7198,10 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>新�(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1355"/>
         <source>New</source>
         <translation type="obsolete">新�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1355"/>
         <source>Ctrl+N</source>
         <translation type="obsolete">Ctrl+N</translation>
     </message>
@@ -7586,12 +7216,10 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>設定(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1361"/>
         <source>Settings</source>
         <translation type="obsolete">設定</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1361"/>
         <source>Ctrl+S</source>
         <translation type="obsolete">Ctrl+S</translation>
     </message>
@@ -7606,7 +7234,6 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>削除(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1367"/>
         <source>Delete</source>
         <translation type="obsolete">削除</translation>
     </message>
@@ -7621,7 +7248,6 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>破棄(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1373"/>
         <source>Discard</source>
         <translation type="obsolete">破棄</translation>
     </message>
@@ -7631,17 +7257,14 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>�択��仮想マシンを破棄</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1375"/>
         <source>&amp;Refresh</source>
         <translation type="obsolete">最新�情報�更新(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1375"/>
         <source>Refresh</source>
         <translation type="obsolete">最新�情報�更新</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1375"/>
         <source>Ctrl+R</source>
         <translation type="obsolete">Ctrl+R</translation>
     </message>
@@ -7651,47 +7274,38 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>�択��仮想マシン�アクセス��状態を最新�情報�更新�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>&amp;Contents...</source>
         <translation type="obsolete">ヘルプを表示(&amp;C)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>F1</source>
         <translation type="obsolete">F1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>Show the online help contents</source>
         <translation type="obsolete">オンラインヘルプを表示</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>&amp;VirtualBox Web Site...</source>
         <translation type="obsolete">VirtualBox Webサイト(&amp;V)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>Open the browser and go to the VirtualBox product web site</source>
         <translation type="obsolete">Webブラウザ�VirtualBox製��Webサイトを開�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>&amp;About VirtualBox...</source>
         <translation type="obsolete">VirtualBox ����(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>Show a dialog with product information</source>
         <translation type="obsolete">製�情報ダイアログを表示</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>&amp;Reset All Warnings</source>
         <translation type="obsolete">����警告をリセット(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1383"/>
         <source>Go back to showing all suppressed warnings and messages</source>
         <translation type="obsolete">����抑止�れ�警告�メッセージを�度表示��る</translation>
     </message>
@@ -7706,11 +7320,13 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1443"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1578"/>
         <source>&amp;Snapshots</source>
         <translation>スナップショット(&amp;S)</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1457"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1582"/>
         <source>D&amp;escription</source>
         <translation>説明(&amp;E)</translation>
@@ -7726,7 +7342,6 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>表示(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1497"/>
         <source>Show</source>
         <translation type="obsolete">表示</translation>
     </message>
@@ -7736,22 +7351,22 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>�択��仮想マシン�ウィンドウ�切り替�</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1483"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1592"/>
         <source>S&amp;tart</source>
         <translation>èµ·å‹•(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1592"/>
         <source>Start</source>
         <translation type="obsolete">èµ·å‹•</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1491"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1594"/>
         <source>Start the selected virtual machine</source>
         <translation>�択��仮想マシンを起動</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1594"/>
         <source>&lt;h3&gt;Welcome to VirtualBox!&lt;/h3&gt;&lt;p&gt;The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven&apos;t created any virtual machines yet.&lt;img src=welcome.png align=right/&gt;&lt;/p&gt;&lt;p&gt;In order to create a new virtual machine, press the &lt;b&gt;New&lt;/b&gt; button in the main tool bar located at the top of the window.&lt;/p&gt;&lt;p&gt;You can press the &lt;b&gt;%1&lt;/b&gt; key to get instant help, or visit &lt;a href=http://www.virtualbox.org&gt;www.virtualbox.org&lt;/a&gt; for the latest information and news.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;h3&gt;よ���VirtualBox��&lt;/h3&gt;&lt;p&gt;��ウィンドウ�左��コンピュータ上�����仮想マシン�リスト表示�れ��。��仮想マシン�作��れ�������リスト�空��。&lt;img src=welcome.png align=right/&gt;&lt;/p&gt;&lt;p&gt;新�仮想マシンを作��る��ウィンドウ上部��るメインツール�ー�&lt;b&gt;[新�]&lt;/b&gt;ボタンをクリック������。&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;キー�ヘルプを表示����。���最新�情報�ニュースを�得�る�� &lt;a href=http://www.virtualbox.org&gt;www.virtualbox.org&lt;/a&gt; を訪�������。&lt;/p&gt;</translation>
     </message>
@@ -7766,12 +7381,10 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>ログを�照(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1385"/>
         <source>Show Log...</source>
         <translation type="obsolete">ログを�照...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1385"/>
         <source>Ctrl+L</source>
         <translation type="obsolete">Ctrl+L</translation>
     </message>
@@ -7781,12 +7394,10 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>�択��仮想マシン�ログファイルを�照�る</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1389"/>
         <source>R&amp;egister VirtualBox...</source>
         <translation type="obsolete">VirtualBox を登録(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1389"/>
         <source>Open VirtualBox registration form</source>
         <translation type="obsolete">VirtualBox 登録フォームを開�</translation>
     </message>
@@ -7796,12 +7407,10 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>�開(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1515"/>
         <source>Resume</source>
         <translation type="obsolete">�開</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1515"/>
         <source>Ctrl+P</source>
         <translation type="obsolete">Ctrl+P</translation>
     </message>
@@ -7811,16 +7420,17 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
         <translation>仮想マシン�実行を�開�る</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1377"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1525"/>
         <source>&amp;Pause</source>
         <translation>一時�止(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="1525"/>
         <source>Pause</source>
         <translation type="obsolete">一時�止</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1379"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1528"/>
         <source>Suspend the execution of the virtual machine</source>
         <translation>仮想マシン�実行を一時�止�る</translation>
@@ -7908,22 +7518,18 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
 <context>
     <name>VBoxSharedFoldersSettings</name>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Name</source>
         <translation type="obsolete">��</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Path</source>
         <translation type="obsolete">パス</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Shared &amp;Folders</source>
         <translation type="obsolete">共有フォルダ(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>&lt;qt&gt;Lists all shared folders accessible to this machine.
 Use
 &lt;tt&gt;net use x: \\vboxsvr\share&lt;/tt&gt;
@@ -7936,78 +7542,63 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
 本機能を使用�る�� Guest Additions �インストール�必���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Adds a new shared folder definition.</source>
         <translation type="obsolete">新�共有フォルダを追加���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Removes the selected shared folder definition.</source>
         <translation type="obsolete">�択��共有フォルダ�設定を削除���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source> Machine Folders</source>
         <translation type="obsolete">共有フォルダ</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source> Transient Folders</source>
         <translation type="obsolete">一時的�共有フォルダ</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Edits the selected shared folder definition.</source>
         <translation type="obsolete">�択��共有フォルダ�設定を編集���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>VBoxSharedFoldersSettings</source>
         <comment>don&apos;t translate</comment>
         <translation type="obsolete">VBoxSharedFoldersSettings</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Ins</source>
         <translation type="obsolete">Ins</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Add a new shared folder (Ins)</source>
         <translation type="obsolete">新�共有フォルダを追加(Ins)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Del</source>
         <translation type="obsolete">Del</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Remove the selected shared folder (Del)</source>
         <translation type="obsolete">�択��共有フォルダを削除(Del)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Access</source>
         <translation type="obsolete">アクセス権</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Ctrl+Space</source>
         <translation type="obsolete">Ctrl+スペース</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Edit the selected shared folder (Ctrl+Space)</source>
         <translation type="obsolete">�択��共有フォルダ�設定を編集(Ctrl+スペース)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Full</source>
         <translation type="obsolete">完全</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Read-only</source>
         <translation type="obsolete">読�込�専用</translation>
     </message>
@@ -8015,47 +7606,38 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
 <context>
     <name>VBoxSnapshotDetailsDlg</name>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>VBoxSnapshotDetailsDlg</source>
         <translation type="obsolete">VBoxSnapshotDetailsDlg</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source> Snapshot Details </source>
         <translation type="obsolete">スナップショット詳細</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>&amp;Name</source>
         <translation type="obsolete">��(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>&amp;Description</source>
         <translation type="obsolete">説明(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>&amp;Machine Details</source>
         <translation type="obsolete">仮想マシン詳細(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Help</source>
         <translation type="obsolete">ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>F1</source>
         <translation type="obsolete">F1</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialog.cpp" line="143"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
@@ -8065,7 +7647,6 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation>%1 (%2)�詳細</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotDetailsDlg.cpp" line="121"/>
         <source>Snapshot Details</source>
         <translation type="obsolete">スナップショット詳細</translation>
     </message>
@@ -8098,7 +7679,6 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
 <context>
     <name>VBoxSnapshotsWgt</name>
     <message>
-        <location filename="../src/VBoxSnapshotDetailsDlg.ui" line="124"/>
         <source>[snapshot]</source>
         <translation type="obsolete">[snapshot]</translation>
     </message>
@@ -8108,32 +7688,26 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation>VBoxSnapshotsWgt</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.ui" line="30"/>
         <source>snapshotActionGroup</source>
         <translation type="obsolete">snapshotActionGroup</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.ui" line="30"/>
         <source>Discard Snapshot</source>
         <translation type="obsolete">スナップショットを破棄</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.ui" line="30"/>
         <source>&amp;Discard Snapshot</source>
         <translation type="obsolete">スナップショットを破棄(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.ui" line="30"/>
         <source>Ctrl+Shift+D</source>
         <translation type="obsolete">Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.ui" line="30"/>
         <source>curStateActionGroup</source>
         <translation type="obsolete">curStateActionGroup</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.ui" line="30"/>
         <source>Take Snapshot</source>
         <translation type="obsolete">スナップショット作�</translation>
     </message>
@@ -8143,17 +7717,14 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation>スナップショット作�(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="696"/>
         <source>Discard Current Snapshot and State</source>
         <translation type="obsolete">最新�スナップショット�状態を破棄</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="696"/>
         <source>D&amp;iscard Current Snapshot and State</source>
         <translation type="obsolete">最新�スナップショット�状態を破棄(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="696"/>
         <source>Show Details</source>
         <translation type="obsolete">詳細を表示</translation>
     </message>
@@ -8185,6 +7756,9 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation>最新�状態�最新�スナップショット��存�れ��る状態�����</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSnapshotsWgt.cpp" line="189"/>
+        <location filename="../src/VBoxSnapshotsWgt.cpp" line="194"/>
+        <location filename="../src/VBoxSnapshotsWgt.cpp" line="199"/>
         <location filename="../src/VBoxSnapshotsWgt.cpp" line="204"/>
         <source> (%1 ago)</source>
         <translation>(%1�)</translation>
@@ -8231,12 +7805,10 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation>スナップショット %1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="585"/>
         <source>Discard the selected snapshot of the virtual machine</source>
         <translation type="obsolete">�択��仮想マシン�スナップショットを破棄</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="585"/>
         <source>Ctrl+Shift+S</source>
         <translation type="obsolete">Ctrl+Shift+S</translation>
     </message>
@@ -8246,32 +7818,26 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation>�在�仮想マシン�状態�スナップショットを作�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="701"/>
         <source>Revert to Current Snapshot</source>
         <translation type="obsolete">最新�スナップショット�状態�戻�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="701"/>
         <source>&amp;Revert to Current Snapshot</source>
         <translation type="obsolete">最新�スナップショット�状態�戻�(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="701"/>
         <source>Ctrl+Shift+R</source>
         <translation type="obsolete">Ctrl+Shift+R</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="701"/>
         <source>Restore the virtual machine state from the state stored in the current snapshot</source>
         <translation type="obsolete">仮想マシン�状態を最新�スナップショット��存�れ�状態�復元</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="701"/>
         <source>Ctrl+Shift+B</source>
         <translation type="obsolete">Ctrl+Shift+B</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="701"/>
         <source>Discard the current snapshot and revert the machine to the state it had before the snapshot was taken</source>
         <translation type="obsolete">最新�スナップショットを破棄��スナップショットを作��る��状態�戻�</translation>
     </message>
@@ -8281,7 +7847,6 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation>�択��スナップショット�詳細を表示</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="700"/>
         <source>Ctrl+Space</source>
         <translation type="obsolete">Ctrl+スペース</translation>
     </message>
@@ -8291,28 +7856,24 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation> (%1)</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="184"/>
         <source> (%n day(s) ago)</source>
         <translation type="obsolete">
             <numerusform> (%n 日�)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="184"/>
         <source> (%n hour(s) ago)</source>
         <translation type="obsolete">
             <numerusform> (%n 時間�)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="184"/>
         <source> (%n minute(s) ago)</source>
         <translation type="obsolete">
             <numerusform> (%n 分�)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="184"/>
         <source> (%n second(s) ago)</source>
         <translation type="obsolete">
             <numerusform> (%n 秒�)</numerusform>
@@ -8342,17 +7903,16 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
 <context>
     <name>VBoxSwitchMenu</name>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="5110"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="5130"/>
         <source>Disable</source>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="5110"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="5130"/>
         <source>Enable</source>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="5110"/>
         <source>%1 %2</source>
         <translation type="obsolete">%1 %2</translation>
     </message>
@@ -8375,22 +7935,18 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
         <translation>スナップショット�説明(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxTakeSnapshotDlg.ui" line="88"/>
         <source>Help</source>
         <translation type="obsolete">ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxTakeSnapshotDlg.ui" line="88"/>
         <source>F1</source>
         <translation type="obsolete">F1</translation>
     </message>
     <message>
-        <location filename="../src/VBoxTakeSnapshotDlg.ui" line="88"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxTakeSnapshotDlg.ui" line="88"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
@@ -8462,86 +8018,70 @@ DOS系ゲストOS�らアクセス�る場�� &lt;tt&gt;net use x:¥¥vboxs
 <context>
     <name>VBoxUSBFilterSettings</name>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>VBoxUSBFilterSettings</source>
         <comment>don&apos;t translate</comment>
         <translation type="obsolete">VBoxUSBFilterSettings</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&amp;Name</source>
         <translation type="obsolete">��(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>Displays the filter name.</source>
         <translation type="obsolete">フィルタ�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&amp;Manufacturer</source>
         <translation type="obsolete">メーカー(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>Pro&amp;duct</source>
         <translation type="obsolete">製��(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&amp;Serial No.</source>
         <translation type="obsolete">シリアル No.(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>R&amp;emote</source>
         <translation type="obsolete">リモート(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&amp;Action</source>
         <translation type="obsolete">動作(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&amp;Vendor ID</source>
         <translation type="obsolete">ベンダーID(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&amp;Product ID</source>
         <translation type="obsolete">プロダクトID(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&amp;Revision</source>
         <translation type="obsolete">リビジョン(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>Por&amp;t</source>
         <translation type="obsolete">�ート(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>Any</source>
         <comment>remote</comment>
         <translation type="obsolete">任�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>Yes</source>
         <comment>remote</comment>
         <translation type="obsolete">��</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>No</source>
         <comment>remote</comment>
         <translation type="obsolete">���</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines the manufacturer filter as an
 &lt;i&gt;exact match&lt;/i&gt; string. An empty string will match any
 value.&lt;/qt&gt;</source>
@@ -8549,7 +8089,6 @@ value.&lt;/qt&gt;</source>
 空�文字列�����値�一致���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines the product name filter as an
 &lt;i&gt;exact match&lt;/i&gt; string. An empty string will match any
 value.&lt;/qt&gt;</source>
@@ -8557,7 +8096,6 @@ value.&lt;/qt&gt;</source>
 空�文字列�����値�一致���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines the serial number filter as an
 &lt;i&gt;exact match&lt;/i&gt; string. An empty string will match any
 value.&lt;/qt&gt;</source>
@@ -8565,7 +8103,6 @@ value.&lt;/qt&gt;</source>
 空�文字列�����値�一致���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines whether this filter applies
 to USB devices attached locally to the host computer (&lt;i&gt;No&lt;/i&gt;),
 to a VRDP client&apos;s computer (&lt;i&gt;Yes&lt;/i&gt;),
@@ -8575,7 +8112,6 @@ or both (&lt;i&gt;Any&lt;/i&gt;).&lt;/qt&gt;</source>
 両方((&lt;i&gt;任�&lt;/i&gt;))。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines an action performed by the host
 computer when a matching device is attached: give it up to the host OS
 (&lt;i&gt;Ignore&lt;/i&gt;) or grab it for later usage by virtual machines
@@ -8584,7 +8120,6 @@ computer when a matching device is attached: give it up to the host OS
 ホストOS�譲る(&lt;i&gt;無視&lt;/i&gt;) �仮想マシン�使用�る�����(&lt;i&gt;��&lt;/i&gt;)。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines the vendor ID filter. The
 &lt;i&gt;exact match&lt;/i&gt; string format is &lt;tt&gt;XXXX&lt;/tt&gt; where
 &lt;tt&gt;X&lt;/tt&gt; is a hexadecimal digit. An empty string will match any
@@ -8594,7 +8129,6 @@ value.&lt;/qt&gt;</source>
 空�文字列�����値�一致���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines the product ID filter. The
 &lt;i&gt;exact match&lt;/i&gt; string format is &lt;tt&gt;XXXX&lt;/tt&gt; where
 &lt;tt&gt;X&lt;/tt&gt; is a hexadecimal digit. An empty string will match any
@@ -8604,7 +8138,6 @@ value.&lt;/qt&gt;</source>
 空�文字列�����値�一致���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines the revision number filter. The
 &lt;i&gt;exact match&lt;/i&gt; string format is &lt;tt&gt;IIFF&lt;/tt&gt; where
 &lt;tt&gt;I&lt;/tt&gt; is a decimal digit of the integer part and &lt;tt&gt;F&lt;/tt&gt;
@@ -8616,7 +8149,6 @@ value.&lt;/qt&gt;</source>
 空�文字列�����値�一致���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="2038"/>
         <source>&lt;qt&gt;Defines the host USB port filter as an
 &lt;i&gt;exact match&lt;/i&gt; string. An empty string will match any
 value.&lt;/qt&gt;</source>
@@ -8627,13 +8159,13 @@ value.&lt;/qt&gt;</source>
 <context>
     <name>VBoxUSBMenu</name>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="5040"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="5060"/>
         <source>&lt;no devices available&gt;</source>
         <comment>USB devices</comment>
         <translation>&lt;利用��るデ�イス��り��ん&gt;</translation>
     </message>
     <message>
-        <location filename="../src/globals/VBoxGlobal.cpp" line="5042"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="5062"/>
         <source>No supported devices connected to the host PC</source>
         <comment>USB device tooltip</comment>
         <translation>ホストPC�接続�れ�デ�イス�サ�ート�れ����ん</translation>
@@ -8642,124 +8174,121 @@ value.&lt;/qt&gt;</source>
 <context>
     <name>VBoxUpdateDlg</name>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="191"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="81"/>
         <source>1 day</source>
         <translation>1æ—¥</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="192"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="82"/>
         <source>2 days</source>
         <translation>2æ—¥</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="193"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="83"/>
         <source>3 days</source>
         <translation>3æ—¥</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="194"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="84"/>
         <source>4 days</source>
         <translation>4æ—¥</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="195"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="85"/>
         <source>5 days</source>
         <translation>5æ—¥</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="196"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="86"/>
         <source>6 days</source>
         <translation>6æ—¥</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="199"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="89"/>
         <source>1 week</source>
         <translation>1週間</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="200"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="90"/>
         <source>2 weeks</source>
         <translation>2週間</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="201"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="91"/>
         <source>3 weeks</source>
         <translation>3週間</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="204"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="94"/>
         <source>1 month</source>
         <translation>1月</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="253"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="143"/>
         <source>Never</source>
         <translation>確����</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="253"/>
         <source>Connection timed out.</source>
         <translation type="obsolete">接続�タイムアウト��り���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="253"/>
         <source>Could not locate the latest version list on the server (response: %1).</source>
         <translation type="obsolete">サー�ー上�最新�ージョン�見��り��ん���(応答: %1)。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="410"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="300"/>
         <source>Chec&amp;k</source>
         <translation>確�(&amp;K)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="414"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="304"/>
         <source>&amp;Close</source>
         <translation>閉�る(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="407"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="297"/>
         <source>VirtualBox Update Wizard</source>
         <translation>VirtualBox アップデート ウィザード</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="409"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="299"/>
         <source>Check for Updates</source>
         <translation>アップデートを確�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="409"/>
         <source>&lt;p&gt;This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.&lt;/p&gt;
 &lt;p&gt;Use the &lt;b&gt;Check&lt;/b&gt; button to check for a new version now or the &lt;b&gt;Cancel&lt;/b&gt; button if you do not want to perform this check.&lt;/p&gt;
 &lt;p&gt;You can run this wizard at any time by choosing &lt;b&gt;Check for Updates...&lt;/b&gt; from the &lt;b&gt;Help&lt;/b&gt; menu.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;��ウィザード��VirtualBox Webサイト�接続���VirtualBox�新���ージョン�利用�能����確����。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[確�]&lt;/b&gt;ボタンをクリック��新���ージョンを今��確�������。確����場��&lt;b&gt;[キャンセル]&lt;/b&gt;ボタンをクリック������。&lt;/p&gt;&lt;p&gt;��ウィザード�&lt;b&gt;[ヘルプ]&lt;/b&gt;メニュー�ら&lt;b&gt;[アップデートを確�...]&lt;/b&gt;を���������も実行����。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="411"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="301"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="413"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="303"/>
         <source>Summary</source>
         <translation>概�</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="425"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="315"/>
         <source>&lt;p&gt;A new version of VirtualBox has been released! Version &lt;b&gt;%1&lt;/b&gt; is available at &lt;a href=&quot;http://www.virtualbox.org/&quot;&gt;virtualbox.org&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;You can download this version using the link:&lt;/p&gt;&lt;p&gt;&lt;a href=%2&gt;%3&lt;/a&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;VirtualBox�新���ージョン�リリース�れ�����ージョン &lt;b&gt;%1&lt;/b&gt;�&lt;a href=&quot;http://www.virtualbox.org/&quot;&gt;virtualbox.org&lt;/a&gt;�ら入手����。&lt;/p&gt;&lt;p&gt;��リンク�ら最新�ージョンをダウンロード����。: &lt;/p&gt;&lt;p&gt;&lt;a href=%2&gt;%3&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="431"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="321"/>
         <source>&lt;p&gt;Unable to obtain the new version information due to the following network error:&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;�ットワークエラー����新���ージョン情報を�得����ん:&lt;/p&gt;&lt;p&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="434"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="324"/>
         <source>You are already running the most recent version of VirtualBox.</source>
         <translation>最新�ージョン�VirtualBox�インストール�れ����。 後��ージョン確�を行������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxUpdateDlg.cpp" line="416"/>
+        <location filename="../src/VBoxUpdateDlg.cpp" line="306"/>
         <source>&lt;p&gt;This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.&lt;/p&gt;&lt;p&gt;Use the &lt;b&gt;Check&lt;/b&gt; button to check for a new version now or the &lt;b&gt;Cancel&lt;/b&gt; button if you do not want to perform this check.&lt;/p&gt;&lt;p&gt;You can run this wizard at any time by choosing &lt;b&gt;Check for Updates...&lt;/b&gt; from the &lt;b&gt;Help&lt;/b&gt; menu.&lt;/p&gt;</source>
         <translation>&lt;p&gt;��ウィザード��VirtualBox Webサイト�接続���VirtualBox�新���ージョン�利用�能����確����。&lt;/p&gt;&lt;p&gt;&lt;b&gt;[確�]&lt;/b&gt;ボタンをクリック��新���ージョンを今��確�������。確����場��&lt;b&gt;[キャンセル]&lt;/b&gt;ボタンをクリック������。&lt;/p&gt;&lt;p&gt;��ウィザード�&lt;b&gt;[ヘルプ]&lt;/b&gt;メニュー�ら&lt;b&gt;[アップデートを確�...]&lt;/b&gt;を���������も実行����。&lt;/p&gt;</translation>
     </message>
@@ -8782,7 +8311,6 @@ value.&lt;/qt&gt;</source>
         <translation>編集(Ctrl+E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxSelectorWnd.cpp" line="331"/>
         <source>Ctrl+E</source>
         <translation type="obsolete">Ctrl+E</translation>
     </message>
@@ -8843,17 +8371,14 @@ value.&lt;/qt&gt;</source>
         <translation>メディア ソース</translation>
     </message>
     <message>
-        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="439"/>
         <source>&amp;Host Drive</source>
         <translation type="obsolete">ホスト デ�イス(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="439"/>
         <source>&amp;Image File</source>
         <translation type="obsolete">イメージファイル(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="439"/>
         <source>VDM</source>
         <translation type="obsolete">VDM</translation>
     </message>
@@ -8888,12 +8413,10 @@ value.&lt;/qt&gt;</source>
         <translation>フロッピー デ�イス</translation>
     </message>
     <message>
-        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.cpp" line="86"/>
         <source>Host Drive %1</source>
         <translation type="obsolete">ホスト ドライブ %1</translation>
     </message>
     <message>
-        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.cpp" line="86"/>
         <source>&lt;table&gt;&lt;tr&gt;&lt;td&gt;Type:&lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Source:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="obsolete">&lt;table&gt;&lt;tr&gt;&lt;td&gt;タイプ:&lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ソース:&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
 </translation>
@@ -8924,17 +8447,19 @@ value.&lt;/qt&gt;</source>
         <translation>&lt;p&gt;上記�正���ら�&lt;b&gt;[完了]&lt;/b&gt;ボタンをクリック������。 �択�れ�メディア�仮想マシン��り付�られ�仮想マシン�実行を開始���。&lt;/p&gt;</translation>
     </message>
     <message>
+        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="198"/>
+        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="500"/>
         <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="758"/>
         <source>&lt; &amp;Back</source>
         <translation>&lt; 戻る(&amp;B)</translation>
     </message>
     <message>
+        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="205"/>
         <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="507"/>
         <source>&amp;Next &gt;</source>
         <translation>次�(&amp;N) &gt;</translation>
     </message>
     <message>
-        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="507"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -8961,6 +8486,8 @@ p, li { white-space: pre-wrap; }
         <translation>ソース</translation>
     </message>
     <message>
+        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="228"/>
+        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="530"/>
         <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="788"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
@@ -8969,12 +8496,10 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxVMInformationDlg</name>
     <message>
-        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="788"/>
         <source>Session Information Dialog</source>
         <translation type="obsolete">セッション情報ダイアログ</translation>
     </message>
     <message>
-        <location filename="../src/wizards/firstrun/VBoxVMFirstRunWzd.ui" line="788"/>
         <source>&amp;Close</source>
         <translation type="obsolete">閉�る(&amp;C)</translation>
     </message>
@@ -8984,16 +8509,19 @@ p, li { white-space: pre-wrap; }
         <translation>%1 - セッション情報</translation>
     </message>
     <message>
+        <location filename="../src/VBoxVMInformationDlg.ui" line="41"/>
         <location filename="../src/VBoxVMInformationDlg.cpp" line="154"/>
         <source>&amp;Details</source>
         <translation>詳細(&amp;D)</translation>
     </message>
     <message>
+        <location filename="../src/VBoxVMInformationDlg.ui" line="76"/>
         <location filename="../src/VBoxVMInformationDlg.cpp" line="155"/>
         <source>&amp;Runtime</source>
         <translation>ランタイム(&amp;R)</translation>
     </message>
     <message>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="178"/>
         <location filename="../src/VBoxVMInformationDlg.cpp" line="215"/>
         <source>DMA Transfers</source>
         <translation>DMA 転�</translation>
@@ -9004,11 +8532,15 @@ p, li { white-space: pre-wrap; }
         <translation>PIO 転�</translation>
     </message>
     <message>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="182"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="217"/>
         <location filename="../src/VBoxVMInformationDlg.cpp" line="244"/>
         <source>Data Read</source>
         <translation>データ読�込�</translation>
     </message>
     <message>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="184"/>
+        <location filename="../src/VBoxVMInformationDlg.cpp" line="219"/>
         <location filename="../src/VBoxVMInformationDlg.cpp" line="246"/>
         <source>Data Written</source>
         <translation>データ書�込�</translation>
@@ -9034,12 +8566,10 @@ p, li { white-space: pre-wrap; }
         <translation>画�解�度</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMInformationDlg.cpp" line="482"/>
         <source>CD/DVD-ROM Statistics</source>
         <translation type="obsolete">CD/DVD-ROM 統計</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMInformationDlg.cpp" line="482"/>
         <source>Network Adapter Statistics</source>
         <translation type="obsolete">�ットワーク アダプタ統計</translation>
     </message>
@@ -9072,12 +8602,10 @@ p, li { white-space: pre-wrap; }
         <translation>ゲストOS�タイプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMInformationDlg.cpp" line="486"/>
         <source>Hard Disk Statistics</source>
         <translation type="obsolete">�ードディスク統計</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMInformationDlg.cpp" line="486"/>
         <source>No Hard Disks</source>
         <translation type="obsolete">�ードディスク��</translation>
     </message>
@@ -9087,29 +8615,27 @@ p, li { white-space: pre-wrap; }
         <translation>�ットワーク アダプタ��</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3162"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3196"/>
         <source>Enabled</source>
         <comment>nested paging</comment>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3163"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3197"/>
         <source>Disabled</source>
         <comment>nested paging</comment>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3171"/>
+        <location filename="../src/VBoxConsoleWnd.cpp" line="3205"/>
         <source>Nested Paging</source>
         <translation>�ステッドページング</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3171"/>
         <source>Enabled</source>
         <translation type="obsolete">有効</translation>
     </message>
     <message>
-        <location filename="../src/VBoxConsoleWnd.cpp" line="3171"/>
         <source>Disabled</source>
         <translation type="obsolete">無効</translation>
     </message>
@@ -9143,19 +8669,16 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxVMListBox</name>
     <message>
-        <location filename="../src/VBoxVMInformationDlg.cpp" line="577"/>
         <source>&lt;nobr&gt;%1&lt;br&gt;&lt;/nobr&gt;&lt;nobr&gt;%2 since %3&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Session %4&lt;/nobr&gt;</source>
         <comment>VM tooltip (name, last state change, session state)</comment>
         <translation type="obsolete">&lt;nobr&gt;%1&lt;br&gt;&lt;/nobr&gt;&lt;nobr&gt;%3�ら�状態 %2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;セッション %4&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMInformationDlg.cpp" line="577"/>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;/nobr&gt;&lt;nobr&gt;Inaccessible since %2&lt;/nobr&gt;</source>
         <comment>Inaccessible VM tooltip (name, last state change)</comment>
         <translation type="obsolete">&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;/nobr&gt;&lt;nobr&gt;%2�ら�状態 アクセス����ん&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMInformationDlg.cpp" line="577"/>
         <source>Inaccessible</source>
         <translation type="obsolete">アクセス����ん</translation>
     </message>
@@ -9190,11 +8713,13 @@ p, li { white-space: pre-wrap; }
         <translation>�択��仮想マシン�ウィンドウ�切り替�</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1907"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1975"/>
         <source>S&amp;tart</source>
         <translation>èµ·å‹•(&amp;T)</translation>
     </message>
     <message>
+        <location filename="../src/VBoxSelectorWnd.cpp" line="1909"/>
         <location filename="../src/VBoxSelectorWnd.cpp" line="1977"/>
         <source>Start the selected virtual machine</source>
         <translation>�択��仮想マシンを起動</translation>
@@ -9253,12 +8778,10 @@ p, li { white-space: pre-wrap; }
         <translation>��を���VirtualBox ログを�存</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="227"/>
         <source>Help</source>
         <translation type="obsolete">ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="227"/>
         <source>F1</source>
         <translation type="obsolete">F1</translation>
     </message>
@@ -9276,147 +8799,118 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxVMNetworkSettings</name>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>VBoxVMNetworkSettings</source>
         <translation type="obsolete">VBoxVMNetworkSettings</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Enable Network Adapter</source>
         <translation type="obsolete">�ットワーク アダプタを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Attached to</source>
         <translation type="obsolete">割り当�(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;MAC Address</source>
         <translation type="obsolete">MACアドレス(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Generate</source>
         <translation type="obsolete">生�(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Generates a new random MAC address.</source>
         <translation type="obsolete">MACアドレスをランダム�生����。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Ca&amp;ble Connected</source>
         <translation type="obsolete">接続(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Host Interface Settings</source>
         <translation type="obsolete">ホスト インターフェース�設定</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Interface Name</source>
         <translation type="obsolete">インターフェース�(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;File Descriptor</source>
         <translation type="obsolete">ファイル識別�(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Setup Application</source>
         <translation type="obsolete">設定アプリケーション(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Select</source>
         <translation type="obsolete">�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Terminate Application</source>
         <translation type="obsolete">終了アプリケーション(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Select TAP setup application</source>
         <translation type="obsolete">TAP設定アプリケーションを�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Select TAP terminate application</source>
         <translation type="obsolete">TAP終了アプリケーションを�択</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>When checked, plugs this virtual network adapter into the virtual machine.</source>
         <translation type="obsolete">仮想�ットワーク アダプタを仮想マシン�接続���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Controls how this virtual adapter is attached to the real network of the Host OS.</source>
         <translation type="obsolete">仮想アダプタをホストOS�実際��ットワーク�割り当�る方�を指定���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
         <translation type="obsolete">仮想マシン�起動時�仮想�ットワークケーブル�接続�れる����を示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the name of the host interface selected for this adapter.</source>
         <translation type="obsolete">��アダプタ用��択��ホスト インターフェース�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the TAP interface name.</source>
         <translation type="obsolete">TAPインターフェース�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the command executed to set up the TAP interface.</source>
         <translation type="obsolete">TAPインターフェース設定時�実行�るコマンドを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Selects the setup application.</source>
         <translation type="obsolete">設定アプリケーションを�択���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the command executed to terminate the TAP interface.</source>
         <translation type="obsolete">TAPインターフェース終了時�実行�るコマンドを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Selects the terminate application.</source>
         <translation type="obsolete">終了アプリケーションを�択���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <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">��アダプタ�MACアドレスを表示���。MACアドレス�{0-9,A-F}�ら�択�れ�12文字�構��れ��。注：2番目�文字��数���れ��り��ん。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Network Name</source>
         <translation type="obsolete">�ットワーク�(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Adapter &amp;Type</source>
         <translation type="obsolete">アダプタ タイプ(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <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="obsolete">仮想�ットワークアダプタ�タイプを�択���。 ��値�より�VirtualBox�異����ットワーク �ードウェアを仮想マシン��供���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the name of the internal network selected for this adapter.</source>
         <translation type="obsolete">��アダプタ用��択��内部�ットワーク�を表示���。</translation>
     </message>
@@ -9424,57 +8918,46 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxVMParallelPortSettings</name>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>VBoxVMParallelPortSettings</source>
         <translation type="obsolete">VBoxVMParallelPortSettings</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Enable Parallel Port</source>
         <translation type="obsolete">パラレル�ートを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>When checked, enables the given parallel port of the virtual machine.</source>
         <translation type="obsolete">仮想マシン�パラレル�ートを有効����。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Port &amp;Number</source>
         <translation type="obsolete">�ート番�(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the parallel port number. You can choose one of the standard parallel ports or select &lt;b&gt;User-defined&lt;/b&gt; and specify port parameters manually.</source>
         <translation type="obsolete">パラレル�ート番�を表示���。 標準�パラレル�ート�&lt;b&gt;[ユーザー定義]&lt;/b&gt;を�択��手動��ートパラメタを指定�る�������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;IRQ</source>
         <translation type="obsolete">IRQ(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the IRQ number of this parallel port. Valid values are integer numbers in range from &lt;tt&gt;0&lt;/tt&gt; to &lt;tt&gt;255&lt;/tt&gt;. Values greater than &lt;tt&gt;15&lt;/tt&gt; may only be used if the &lt;b&gt;IO APIC&lt;/b&gt; is enabled for this virtual machine.</source>
         <translation type="obsolete">��パラレル�ート�IRQ番�を表示���。有効値�&lt;tt&gt;0&lt;/tt&gt;�ら&lt;tt&gt;255&lt;/tt&gt;���範囲�整数��。&lt;tt&gt;15&lt;/tt&gt;以上�値���仮想マシン�&lt;b&gt;IO APIC&lt;/b&gt;�有効���使用�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>I/O Po&amp;rt</source>
         <translation type="obsolete">I/O�ート(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the base I/O port address of this parallel port. This should be a whole number between &lt;tt&gt;0&lt;/tt&gt; and &lt;tt&gt;0xFFFF&lt;/tt&gt;.</source>
         <translation type="obsolete">��パラレル�ート�ベースI/O�ートアドレスを表示���。 有効値�&lt;tt&gt;0&lt;/tt&gt;�ら&lt;tt&gt;0xFFFF&lt;/tt&gt;�範囲�整数��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Port &amp;Path</source>
         <translation type="obsolete">�ート パス(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the host parallel device name.</source>
         <translation type="obsolete">ホスト�パラレル デ�イス�を表示���。</translation>
     </message>
@@ -9482,77 +8965,62 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxVMSerialPortSettings</name>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>VBoxVMSerialPortSettings</source>
         <translation type="obsolete">VBoxVMSerialPortSettings</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Enable Serial Port</source>
         <translation type="obsolete">シリアル�ートを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>When checked, enables the given serial port of the virtual machine.</source>
         <translation type="obsolete">仮想マシン�シリアル�ートを有効����。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Port &amp;Number</source>
         <translation type="obsolete">�ート番�(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the serial port number. You can choose one of the standard serial ports or select &lt;b&gt;User-defined&lt;/b&gt; and specify port parameters manually.</source>
         <translation type="obsolete">シリアル�ート番�を表示���。 標準�シリアル�ート�&lt;b&gt;[ユーザー定義]&lt;/b&gt;を�択��手動��ートパラメタを指定�る�������。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;IRQ</source>
         <translation type="obsolete">IRQ(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the IRQ number of this serial port. Valid values are integer numbers in range from &lt;tt&gt;0&lt;/tt&gt; to &lt;tt&gt;255&lt;/tt&gt;. Values greater than &lt;tt&gt;15&lt;/tt&gt; may only be used if the &lt;b&gt;IO APIC&lt;/b&gt; is enabled for this virtual machine.</source>
         <translation type="obsolete">��シリアル�ート�IRQ番�を表示���。有効値�&lt;tt&gt;0&lt;/tt&gt;�ら&lt;tt&gt;255&lt;/tt&gt;���範囲�整数��。&lt;tt&gt;15&lt;/tt&gt;以上�値���仮想マシン�&lt;b&gt;IO APIC&lt;/b&gt;�有効���使用�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>I/O Po&amp;rt</source>
         <translation type="obsolete">I/O�ート(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the base I/O port address of this serial port. This should be a whole number between &lt;tt&gt;0&lt;/tt&gt; and &lt;tt&gt;0xFFFF&lt;/tt&gt;.</source>
         <translation type="obsolete">��シリアル�ート�ベースI/O�ートアドレスを表示���。 有効値�&lt;tt&gt;0&lt;/tt&gt;�ら&lt;tt&gt;0xFFFF&lt;/tt&gt;�範囲�整数��。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Port &amp;Mode</source>
         <translation type="obsolete">�ート モード(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Controls the working mode of this serial port. If you select &lt;b&gt;Disconnected&lt;/b&gt;, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="obsolete">��シリアル�ート�動作モードを指定���。 &lt;b&gt;[切断]&lt;/b&gt;を�択�る��ゲストOS�シリアル�ートを検出������れを�作�る�������ん。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>&amp;Create Pipe</source>
         <translation type="obsolete">パイプ作�(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>If checked, the pipe specified in the &lt;b&gt;Port Path&lt;/b&gt; 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">オン�場��仮想マシン�起動時� &lt;b&gt;[�ート パス]&lt;/b&gt;フィールド�指定�れ�パイプ�作��れ��。�����れ�仮想マシン�既存�パイプを使用���。</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Port &amp;Path</source>
         <translation type="obsolete">�ート パス(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/VBoxVMLogViewer.cpp" line="268"/>
         <source>Displays the path to the serial port&apos;s pipe on the host when the port is working in &lt;b&gt;Host Pipe&lt;/b&gt; mode, or the host serial device name when the port is working in &lt;b&gt;Host Device&lt;/b&gt; mode.</source>
         <translation type="obsolete">�ート�&lt;b&gt;[ホスト パイプ]&lt;/b&gt;モード�動作���る���シリアル�ート�パイプ�パスを表示���。�ート�&lt;b&gt;[ホスト デ�イス]&lt;/b&gt;モード�動作���る���ホスト シリアル デ�イス�を表示���。</translation>
     </message>
@@ -9593,72 +9061,58 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxVMSettingsCD</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Host CD/DVD drive is not selected</source>
         <translation type="obsolete">ホスト CD/DVDドライブ��択�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>CD/DVD image file is not selected</source>
         <translation type="obsolete">CD/DVDイメージファイル��択�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <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">指定��メディアを仮想マシン�CD/DVDドライブ�マウント���。注：CD/DVDドライブ�常�仮想マシン�セカンダリIDE コントローラ�マスタースロット�割り当�られ��。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>&amp;Mount CD/DVD Drive</source>
         <translation type="obsolete">CD/DVD ドライブ�マウント(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Mounts the specified CD/DVD drive to the virtual CD/DVD drive.</source>
         <translation type="obsolete">指定��CD/DVDドライブを仮想CD/DVDドライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Host CD/DVD &amp;Drive</source>
         <translation type="obsolete">ホスト CD/DVDドライブ(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Lists host CD/DVD drives available to mount to the virtual machine.</source>
         <translation type="obsolete">仮想マシン�マウント�る���利用�能�ホスト�CD/DVDドライブをリスト表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <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">ホスト�接続�れ�CD/DVDライターを使用�能��る���ゲストOS�ATAPIコマンドを直接ホスト ドライブ��り��。注：仮想マシン�ら音楽CD��書�込��サ�ート�れ����ん。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Enable &amp;Passthrough</source>
         <translation type="obsolete">パススルーを有効化(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Mounts the specified CD/DVD image to the virtual CD/DVD drive.</source>
         <translation type="obsolete">指定��CD/DVDイメージを仮想CD/DVDドライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>&amp;ISO Image File</source>
         <translation type="obsolete">ISO イメージファイル(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Displays 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ドライブ�マウント�れ�イメージファイルを表示���。���他�イメージを素早��択����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Invokes the Virtual Disk Manager to select a CD/DVD image to mount.</source>
         <translation type="obsolete">仮想ディスクマ�ージャを起動���択��CD/DVDイメージをマウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsAudio.ui" line="110"/>
         <source>Invokes the Virtual Media Manager to select a CD/DVD image to mount.</source>
         <translation type="obsolete">仮想メディアマ�ージャを起動���択��CD/DVDイメージをマウント���。</translation>
     </message>
@@ -9671,6 +9125,7 @@ p, li { white-space: pre-wrap; }
         <translation>仮想マシンをフルスクリーン���シームレスモード�切り��る���必��値(%1)より少��ビデオメモリ�仮想マシン�割り当�られ���。</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.cpp" line="242"/>
         <location filename="../src/settings/vm/VBoxVMSettingsDisplay.cpp" line="243"/>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</translation>
@@ -9686,6 +9141,7 @@ p, li { white-space: pre-wrap; }
         <translation>ビデオメモリ(&amp;M):</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="74"/>
         <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="134"/>
         <source>Controls the amount of video memory provided to the virtual machine.</source>
         <translation>仮想マシン�割り当�るビデオメモリ�サイズを指定���。</translation>
@@ -9731,7 +9187,6 @@ p, li { white-space: pre-wrap; }
         <translation>サー�ー��ート番�(&amp;P):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="277"/>
         <source>Displays the VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero) to reset the port to the default value.</source>
         <translation type="obsolete">VRDPサー�ー��ート番�を表示���。�ートをデフォルト値�リセット�る��&lt;tt&gt;0&lt;/tt&gt;(ゼロ)を指定���。</translation>
     </message>
@@ -9779,701 +9234,563 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxVMSettingsDlg</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Category</source>
         <translation type="obsolete">カテゴリ</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>[id]</source>
         <translation type="obsolete">[id]</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>[link]</source>
         <translation type="obsolete">[link]</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>[name]</source>
         <translation type="obsolete">[name]</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>VBoxVMSettingsDlg</source>
         <translation type="obsolete">VBoxVMSettingsDlg</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;i&gt;Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information&lt;i&gt;.</source>
         <translation type="obsolete">&lt;i&gt;左��リスト�ら設定�カテゴリを�択��設定項目をマウスオー�ー��詳細�情報を�照������&lt;i&gt;。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> General </source>
         <translation type="obsolete">一般</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> Hard Disks </source>
         <translation type="obsolete">�ードディスク</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> Floppy </source>
         <translation type="obsolete">フロッピー</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> CD/DVD-ROM </source>
         <translation type="obsolete">CD/DVD-ROM</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> Audio </source>
         <translation type="obsolete">オーディオ</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> Network </source>
         <translation type="obsolete">�ットワーク</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> USB </source>
         <translation type="obsolete"> USB </translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> Remote Display </source>
         <translation type="obsolete">リモートディスプレイ</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> Shared Folders </source>
         <translation type="obsolete">共有フォルダ</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Identification</source>
         <translation type="obsolete">ID(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Name</source>
         <translation type="obsolete">��(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Displays the name of the virtual machine.</source>
         <translation type="obsolete">仮想マシン���を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>OS &amp;Type</source>
         <translation type="obsolete">OSタイプ(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Base &amp;Memory Size</source>
         <translation type="obsolete">メインメモリ�サイズ(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">仮想マシン�割り当�るメインメモリ�サイズを指定���。割り当���多��る�仮想マシン�起動����も�れ��ん。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;</source>
         <translation type="obsolete">&lt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>=</source>
         <translation type="obsolete">=</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&gt;</source>
         <translation type="obsolete">&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>MB</source>
         <translation type="obsolete">MB</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Video Memory Size</source>
         <translation type="obsolete">ビデオメモリ�サイズ(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Controls the amount of video memory provided to the virtual machine.</source>
         <translation type="obsolete">仮想マシン�割り当�るビデオメモリ�サイズを指定���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Basic</source>
         <translation type="obsolete">基本(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Select</source>
         <translation type="obsolete">�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Selects the snapshot folder path.</source>
         <translation type="obsolete">スナップショット��存先フォルダ�パスを�択���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Reset</source>
         <translation type="obsolete">リセット</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Extended Features</source>
         <translation type="obsolete">拡張機能</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Enable A&amp;CPI</source>
         <translation type="obsolete">ACPIを有効化(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Enable IO A&amp;PIC</source>
         <translation type="obsolete">IO APICを有効化(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Boo&amp;t Order</source>
         <translation type="obsolete">起動順�(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Advanced</source>
         <translation type="obsolete">高度(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Description</source>
         <translation type="obsolete">コメント(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Mount Floppy Drive</source>
         <translation type="obsolete">フロッピードライブ�マウント(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Host Floppy &amp;Drive</source>
         <translation type="obsolete">ホスト フロッピードライブ(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Mounts the specified host Floppy drive to the virtual Floppy drive.</source>
         <translation type="obsolete">指定��ホスト フロッピードライブを仮想フロッピードライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Image File</source>
         <translation type="obsolete">イメージファイル(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Mounts the specified Floppy image to the virtual Floppy drive.</source>
         <translation type="obsolete">指定��フロッピーイメージを仮想フロッピードライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Mount CD/DVD Drive</source>
         <translation type="obsolete">CD/DVD ドライブ�マウント(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Host CD/DVD &amp;Drive</source>
         <translation type="obsolete">ホスト CD/DVDドライブ(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Mounts the specified CD/DVD drive to the virtual CD/DVD drive.</source>
         <translation type="obsolete">指定��CD/DVDドライブを仮想CD/DVDドライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;ISO Image File</source>
         <translation type="obsolete">ISO イメージファイル(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Mounts the specified CD/DVD image to the virtual CD/DVD drive.</source>
         <translation type="obsolete">指定��CD/DVDイメージを仮想CD/DVDドライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Enable Audio</source>
         <translation type="obsolete">オーディオを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Host Audio &amp;Driver</source>
         <translation type="obsolete">ホスト オーディオ ドライ�(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Enable &amp;USB Controller</source>
         <translation type="obsolete">USB コントローラを有効化(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>USB Device &amp;Filters</source>
         <translation type="obsolete">USB デ�イス フィルタ(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Ins</source>
         <translation type="obsolete">Ins</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Alt+Ins</source>
         <translation type="obsolete">Alt+Ins</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Del</source>
         <translation type="obsolete">Del</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Ctrl+Up</source>
         <translation type="obsolete">Ctrl+Up</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Ctrl+Down</source>
         <translation type="obsolete">Ctrl+Down</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Enable VRDP Server</source>
         <translation type="obsolete">VRDPサー�を有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Defines the VRDP authentication method.</source>
         <translation type="obsolete">VRDP��証方�を指定���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Specifies the timeout for guest authentication, in milliseconds.</source>
         <translation type="obsolete">ゲスト�証�タイムアウト値をミリ秒���指定���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Help</source>
         <translation type="obsolete">ヘルプ</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>F1</source>
         <translation type="obsolete">F1</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Displays the dialog help.</source>
         <translation type="obsolete">ダイアログ�ヘルプを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Invalid settings detected</source>
         <translation type="obsolete">無効�設定�見��り���</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;OK</source>
         <translation type="obsolete">OK(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Accepts (saves) changes and closes the dialog.</source>
         <translation type="obsolete">変更を�存��ダイアログを閉���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Cancel</source>
         <translation type="obsolete">キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Cancels changes and closes the dialog.</source>
         <translation type="obsolete">変更を破棄��ダイアログを閉���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">指定��メディアを仮想マシン�CD/DVDドライブ�マウント���。注：CD/DVDドライブ�常�仮想マシン�セカンダリIDE コントローラ�マスタースロット�割り当�られ��。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Displays 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ドライブ�マウント�れ�イメージファイルを表示���。���他�イメージを素早��択����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>When checked, mounts the specified media to the Floppy drive of the virtual machine.</source>
         <translation type="obsolete">指定��メディアを仮想マシン�フロッピードライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Displays the image file to mount to the virtual Floppy drive and allows to quickly select a different image.</source>
         <translation type="obsolete">仮想フロッピードライブ�マウント�れ�イメージファイルを表示���。���他�イメージを素早��択����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">指定�れ�ドライ�を使用��ホスト�オーディオカード�通信�る仮想PCIオーディオカードを仮想マシン�接続���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">仮想マシン�リモートデスクトッププロトコル(RDP)サー�機能を有効����。リモートクライアント�標準的�RDPクライアントを使用��実行中�仮想マシン�接続���作�る��を�能����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;not attached&gt;</source>
         <comment>hard disk</comment>
         <translation type="obsolete">&lt;割り当�られ����ん&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> - Settings</source>
         <translation type="obsolete">- 設定</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>New Filter %1</source>
         <comment>usb</comment>
         <translation type="obsolete">新�フィルタ %1</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Shared Clipboard</source>
         <translation type="obsolete">クリップボード�共有(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>S&amp;napshot Folder</source>
         <translation type="obsolete">スナップショット��存先(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
         <translation type="obsolete">仮想マシン�実行�るOS(ゲストOS�呼���)�タイプを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;qt&gt;When checked, the virtual machine will support
 the Advanced Configuration and Power Management Interface (ACPI). &lt;b&gt;Note:&lt;/b&gt; don&apos;t disable
 this feature after having installed a Windows guest operating system!&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;仮想マシン�ACPI(Advanced Configuration and Power Management Interface)サ�ートを有効����。&lt;b&gt;注：&lt;/b&gt; Windows ゲストOSをインストール��後�本機能を無効����������&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;qt&gt;When checked, the virtual machine will support
 the Input Output APIC (IO APIC), which may slightly decrease performance. &lt;b&gt;Note:&lt;/b&gt; don&apos;t disable
 this feature after having installed a Windows guest operating system!&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;仮想マシン�IO APIC(Input Output APIC)サ�ートを有効����。�れ�仮想マシン�性能を����低下��る�も�れ��ん。&lt;b&gt;注：&lt;/b&gt;Windows ゲストOSをインストール��後�本機能を無効����������&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">ゲストOS�ホストOS�間�クリップボードを共有�るモードを定義���。注：本機能�利用��ゲストOS� Guest Additions �インストール�必���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">��仮想マシン�スナップショット��存先パスを表示���。注：スナップショット�多��ディスク容�を消費���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">スナップショット��存先フォルダ�パスをデフォルト値�戻���。変更後��度��ダイアログを開��デフォルト�パス�表示�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">仮想マシン�コメントを表示���。コメント�インストール�れ�ゲストOS�詳細�構��関�る注釈���役立���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Lists host Floppy drives available to mount to the virtual machine.</source>
         <translation type="obsolete">仮想マシン�マウント�る���利用�能�ホスト フロッピードライブをリスト表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Invokes the Virtual Disk Manager to select a Floppy image to mount.</source>
         <translation type="obsolete">仮想ディスクマ�ージャを起動���択��フロッピーイメージをマウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Lists host CD/DVD drives available to mount to the virtual machine.</source>
         <translation type="obsolete">仮想マシン�マウント�る���利用�能�ホスト�CD/DVDドライブをリスト表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Invokes the Virtual Disk Manager to select a CD/DVD image to mount.</source>
         <translation type="obsolete">仮想ディスクマ�ージャを起動���択��CD/DVDイメージをマウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;qt&gt;Controls the audio output driver. The &lt;b&gt;Null Audio Driver&lt;/b&gt;
 makes the guest see an audio card, however every access to it will be ignored.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;オーディオ出力ドライ�を�択���。&lt;b&gt;Null Audio Driver&lt;/b&gt;�ゲストOS�らオーディオカード����識�れ����デ�イス������アクセス�無視�れ��。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>When checked, enables the virtual USB controller of this machine.</source>
         <translation type="obsolete">��仮想マシン�仮想USB コントローラを有効����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Adapter %1</source>
         <comment>network</comment>
         <translation type="obsolete">アダプタ %1</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Host &amp;Interfaces</source>
         <translation type="obsolete">ホスト インターフェース(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Lists all available host interfaces.</source>
         <translation type="obsolete">利用�能�ホスト インターフェースをリスト表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Adds a new host interface.</source>
         <translation type="obsolete">新�ホスト インターフェースを追加���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Removes the selected host interface.</source>
         <translation type="obsolete">�択��ホスト インターフェースを除去���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;No suitable interfaces&gt;</source>
         <translation type="obsolete">&lt;�切�インターフェース��り��ん&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Add</source>
         <translation type="obsolete">追加</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Remove</source>
         <translation type="obsolete">除去</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>VirtualBox Host Interface %1</source>
         <translation type="obsolete">VirtualBox ホスト インターフェース %1</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;p&gt;Do you want to remove the selected host network interface &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 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.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;�択��ホスト インターフェース&lt;nobr&gt;&lt;b&gt;&quot;%1&quot;&lt;/b&gt;を除去����？&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;注：&lt;/b&gt; ��インターフェース�複数�仮想マシン�1�以上��ットワーク アタプタ�使用中�も�れ��ん。除去�る��他�インターフェース�を����別�割り当�方法を正��設定�る���れら�アダプタ�動作���ん。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> Serial Ports </source>
         <translation type="obsolete">シリアル�ート</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>#serialPorts</source>
         <translation type="obsolete">#serialPorts</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Enable &amp;VT-x/AMD-V</source>
         <translation type="obsolete">VT-x/AMD-Vを有効化(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>When checked, the virtual machine will try to make use of the host CPU&apos;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">仮想マシン�Intel VT-x/AMD-V�よ��ホストCPU�仮想化支�機能を使用���。�ェックボックス�グレイ����グロー�ル設定�指定値�使用�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Other &amp;Settings</source>
         <translation type="obsolete">��他�設定(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Remember Media Mounted at Runtime</source>
         <translation type="obsolete">実行中�マウント��メディアを記録(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>If checked, any change to mounted CD/DVD or Floppy media performed during machine execution will be saved in the settings file in order to preserve the configuration of mounted media between runs.</source>
         <translation type="obsolete">仮想マシン実行中�変更��CD/DVD���フロッピーメディア�構�を設定ファイル��存���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>O&amp;ther</source>
         <translation type="obsolete">��他(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Enable Passthrough</source>
         <translation type="obsolete">パススルーを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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">ホスト�接続�れ�CD/DVDライターを使用�能��る���ゲストOS�ATAPIコマンドを直接ホスト ドライブ��り��。注：仮想マシン�ら音楽CD��書�込��サ�ート�れ����ん。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Server Port </source>
         <translation type="obsolete">サー�ー��ート番�</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Authentication &amp;Method </source>
         <translation type="obsolete">�証方法(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Authentication &amp;Timeout </source>
         <translation type="obsolete">�証タイムアウト値(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;qt&gt;Displays the VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero) to reset the port to the default value.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;VRDPサー� �ート番�を表示���。�ートをデフォルト値�リセット�る��&lt;tt&gt;0&lt;/tt&gt;(ゼロ)を指定���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>CD/DVD image file is not selected</source>
         <translation type="obsolete">CD/DVDイメージファイル��択�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Floppy image file is not selected</source>
         <translation type="obsolete">フロッピーイメージファイル��択�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Incorrect host network interface is selected</source>
         <translation type="obsolete">�択��ホスト �ットワーク インターフェース��正</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Duplicate port number selected </source>
         <translation type="obsolete">�択���ート番�����使用�れ��る</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Duplicate port path entered </source>
         <translation type="obsolete">指定���ート パス����使用�れ��る</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>%1 on the &lt;b&gt;%2&lt;/b&gt; page.</source>
         <translation type="obsolete">&lt;b&gt;%2&lt;/b&gt;ページ�%1。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Port %1</source>
         <comment>serial ports</comment>
         <translation type="obsolete">�ート %1</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>00</source>
         <translation type="obsolete">00</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>01</source>
         <translation type="obsolete">01</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>02</source>
         <translation type="obsolete">02</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>03</source>
         <translation type="obsolete">03</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>04</source>
         <translation type="obsolete">04</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>05</source>
         <translation type="obsolete">05</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>08</source>
         <translation type="obsolete">08</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>10</source>
         <translation type="obsolete">10</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>09</source>
         <translation type="obsolete">09</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>06</source>
         <translation type="obsolete">06</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source> Parallel Ports </source>
         <translation type="obsolete">パラレル�ート</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>07</source>
         <translation type="obsolete">07</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>#parallelPorts</source>
         <translation type="obsolete">#parallelPorts</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Enable PA&amp;E/NX</source>
         <translation type="obsolete">PAE/NXを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;qt&gt;When
                                                           checked, the Physical
                                                           Address Extension
@@ -10485,37 +9802,30 @@ makes the guest see an audio card, however every access to it will be ignored.&l
         <translation type="obsolete">&lt;qt&gt;ホストCPU�物�アドレス拡張機能(PAE)を仮想マシン�有効����。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;IDE Controller Type</source>
         <translation type="obsolete">IDE コントローラ タイプ(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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>
         <translation type="obsolete">仮想IDE コントローラ�タイプを定義���。��値�より�VirtualBox�異���仮想IDE�ードウェア デ�イスをゲストOS��供���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Audio &amp;Controller</source>
         <translation type="obsolete">オーディオ コントローラ(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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="obsolete">仮想サウンドカード�タイプを�択���。 ��値�より�VirtualBox�異���オーディオ �ードウェアを仮想マシン��供���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Enable USB &amp;2.0 Controller</source>
         <translation type="obsolete">USB 2.0 コントローラを有効化(&amp;2)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <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>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>
                                               &lt;qt&gt;Lists all USB filters of
                                               this machine. The checkbox to the
@@ -10530,17 +9840,14 @@ makes the guest see an audio card, however every access to it will be ignored.&l
 USBフィルタを追加���除去�る��コンテキストメニュー����ボタンを使用������。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Add Empty Filter</source>
         <translation type="obsolete">空�フィルタを追加</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Add Empty Filter</source>
         <translation type="obsolete">空�フィルタを追加�る(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>
               &lt;qt&gt;Adds a new USB filter with all fields initially set to
               empty strings. Note that such a filter will match any attached USB
@@ -10549,17 +9856,14 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation type="obsolete">&lt;qt&gt;����フィールド�空�新�USBフィルタを追加���。注：��フィルタ�����接続�れ�USB デ�イス������。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Add Filter From Device</source>
         <translation type="obsolete">デ�イス�らフィルタを追加</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>A&amp;dd Filter From Device</source>
         <translation type="obsolete">デ�イス�らフィルタを追加�る(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&lt;qt&gt;Adds a new USB filter with all fields set to the
               values of the selected USB device attached to the host
               PC.&lt;/qt&gt;
@@ -10567,74 +9871,61 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation type="obsolete">&lt;qt&gt;�択��ホストPC�USB デ�イス�値を����フィールド�設定��新�USBフィルタを追加���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Remove Filter</source>
         <translation type="obsolete">フィルタを除去</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Remove Filter</source>
         <translation type="obsolete">フィルタを除去�る(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>
               &lt;qt&gt;Removes the highlighted USB filter.&lt;/qt&gt;
             </source>
         <translation type="obsolete">&lt;qt&gt;�イライト表示�れ�USBフィルタを除去���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Move Filter Up</source>
         <translation type="obsolete">フィルタを上�移動</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>&amp;Move Filter Up</source>
         <translation type="obsolete">フィルタを上�移動�る(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>
               &lt;qt&gt;Moves the highlighted USB filter up.&lt;/qt&gt;
             </source>
         <translation type="obsolete">&lt;qt&gt;�イライト表示�れ�USBフィルタを上�移動���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Move Filter Down</source>
         <translation type="obsolete">フィルタを下�移動</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>M&amp;ove Filter Down</source>
         <translation type="obsolete">フィルタを下�移動(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>
               &lt;qt&gt;Moves the highlighted USB filter down.&lt;/qt&gt;
             </source>
         <translation type="obsolete">&lt;qt&gt;�イライト表示�れ�USBフィルタを下�移動���。&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Internal network name is not set</source>
         <translation type="obsolete">内部�ットワーク��設定�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Port path not specified </source>
         <translation type="obsolete">�ート パス�指定�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>Port %1</source>
         <comment>parallel ports</comment>
         <translation type="obsolete">�ート %1</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsDisplay.ui" line="290"/>
         <source>USBActionGroup</source>
         <translation type="obsolete">USBActionGroup</translation>
     </message>
@@ -10699,7 +9990,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>共有フォルダ</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="481"/>
         <source>Remote Display</source>
         <translation type="obsolete">リモートディスプレイ</translation>
     </message>
@@ -10709,7 +9999,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="499"/>
         <source>On the &lt;b&gt;%1&lt;/b&gt; page, %2</source>
         <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;ページ�%2</translation>
     </message>
@@ -10742,62 +10031,50 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsFD</name>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Host floppy drive is not selected</source>
         <translation type="obsolete">ホスト フロッピードライブ��択�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Floppy image file is not selected</source>
         <translation type="obsolete">フロッピーイメージファイル��択�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>When checked, mounts the specified media to the Floppy drive of the virtual machine.</source>
         <translation type="obsolete">指定��メディアを仮想マシン�フロッピードライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>&amp;Mount Floppy Drive</source>
         <translation type="obsolete">フロッピードライブ�マウント(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Mounts the specified host Floppy drive to the virtual Floppy drive.</source>
         <translation type="obsolete">指定��ホスト フロッピードライブを仮想フロッピードライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Host Floppy &amp;Drive</source>
         <translation type="obsolete">ホスト フロッピードライブ(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Lists host Floppy drives available to mount to the virtual machine.</source>
         <translation type="obsolete">仮想マシン�マウント�る���利用�能�ホスト フロッピードライブをリスト表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Mounts the specified Floppy image to the virtual Floppy drive.</source>
         <translation type="obsolete">指定��フロッピーイメージを仮想フロッピードライブ�マウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>&amp;Image File</source>
         <translation type="obsolete">イメージファイル(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Displays the image file to mount to the virtual Floppy drive and allows to quickly select a different image.</source>
         <translation type="obsolete">仮想フロッピードライブ�マウント�れ�イメージファイルを表示���。���他�イメージを素早��択����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Invokes the Virtual Disk Manager to select a Floppy image to mount.</source>
         <translation type="obsolete">仮想ディスクマ�ージャを起動���択��フロッピーイメージをマウント���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>Invokes the Virtual Media Manager to select a Floppy image to mount.</source>
         <translation type="obsolete">仮想メディアマ�ージャを起動���択��フロッピーイメージをマウント���。</translation>
     </message>
@@ -10805,7 +10082,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsGeneral</name>
     <message>
-        <location filename="../src/settings/VBoxSettingsDialogSpecific.cpp" line="553"/>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</translation>
     </message>
@@ -10820,7 +10096,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>基本(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="37"/>
         <source>Identification</source>
         <translation type="obsolete">詳細</translation>
     </message>
@@ -10835,47 +10110,38 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>仮想マシン���を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <source>OS &amp;Type:</source>
         <translation type="obsolete">OSタイプ(&amp;T):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
         <translation type="obsolete">仮想マシン�実行�るOS(ゲストOS�呼���)�タイプを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <source>Base &amp;Memory Size</source>
         <translation type="obsolete">メインメモリ�サイズ(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <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">仮想マシン�割り当�るメインメモリ�サイズを指定���。割り当���多��る�仮想マシン�起動����も�れ��ん。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <source>&lt;</source>
         <translation type="obsolete">&lt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <source>&gt;</source>
         <translation type="obsolete">&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <source>MB</source>
         <translation type="obsolete">MB</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <source>&amp;Video Memory Size</source>
         <translation type="obsolete">ビデオメモリ�サイズ(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="65"/>
         <source>Controls the amount of video memory provided to the virtual machine.</source>
         <translation type="obsolete">仮想マシン�割り当�るビデオメモリ�サイズを指定���。</translation>
     </message>
@@ -10885,82 +10151,66 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>高度(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Boo&amp;t Order:</source>
         <translation type="obsolete">起動順�(&amp;T):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <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">起動デ�イス�優先順�を指定���。�ェックボックスを使��デ�イスを有効���無効�����。項目を上���下�移動��デ�イス�順�を変更������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>[device]</source>
         <translation type="obsolete">[デ�イス]</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Move Up (Ctrl-Up)</source>
         <translation type="obsolete">上�移動(Ctrl-Up)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Moves the selected boot device up.</source>
         <translation type="obsolete">�択��起動デ�イスを上�移動���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Move Down (Ctrl-Down)</source>
         <translation type="obsolete">下�移動(Ctrl-Down)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Moves the selected boot device down.</source>
         <translation type="obsolete">�択��起動デ�イスを下�移動���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Extended Features:</source>
         <translation type="obsolete">拡張機能:</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>When checked, the virtual machine will support the Advanced Configuration and Power Management Interface (ACPI). &lt;b&gt;Note:&lt;/b&gt; don&apos;t disable this feature after having installed a Windows guest operating system!</source>
         <translation type="obsolete">仮想マシン�ACPI(Advanced Configuration and Power Management Interface)サ�ートを有効����。&lt;b&gt;注：&lt;/b&gt; Windows ゲストOSをインストール��後�本機能を無効����������</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Enable A&amp;CPI</source>
         <translation type="obsolete">ACPIを有効化(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>When checked, the virtual machine will support the Input Output APIC (IO APIC), which may slightly decrease performance. &lt;b&gt;Note:&lt;/b&gt; don&apos;t disable this feature after having installed a Windows guest operating system!</source>
         <translation type="obsolete">仮想マシン�IO APIC(Input Output APIC)サ�ートを有効����。�れ�仮想マシン�性能を����低下��る�も�れ��ん。&lt;b&gt;注：&lt;/b&gt;Windows ゲストOSをインストール��後�本機能を無効����������</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Enable IO A&amp;PIC</source>
         <translation type="obsolete">IO APICを有効化(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>When checked, the virtual machine will try to make use of the host CPU&apos;s hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
         <translation type="obsolete">仮想マシン�ホストCPU�仮想化支�機能(Intel VT-x���AMD-V)を有効����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Enable &amp;VT-x/AMD-V</source>
         <translation type="obsolete">VT-x/AMD-Vを有効化(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine.</source>
         <translation type="obsolete">仮想マシン�ホストCPU�PAE(物�アドレス拡張機能)を有効����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="92"/>
         <source>Enable PA&amp;E/NX</source>
         <translation type="obsolete">PAE/NXを有効化(&amp;E)</translation>
     </message>
@@ -10975,12 +10225,10 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>ゲストOS�ホストOS�間�クリップボードを共有�るモードを定義���。注：本機能�利用��ゲストOS� Guest Additions �インストール�必���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="149"/>
         <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>
         <translation type="obsolete">仮想IDE コントローラ�タイプを定義���。��値�より�VirtualBox�異���仮想IDE�ードウェア デ�イスをゲストOS��供���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="149"/>
         <source>&amp;IDE Controller Type:</source>
         <translation type="obsolete">IDE コントローラ タイプ(&amp;I):</translation>
     </message>
@@ -11000,7 +10248,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>仮想マシン�説明を表示���。�れインストール�れ�ゲストOS�詳細�構��関�る注釈���役立���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="272"/>
         <source>&amp;Other</source>
         <translation type="obsolete">��他(&amp;O)</translation>
     </message>
@@ -11010,62 +10257,50 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>仮想マシン実行中�変更��CD/DVD���フロッピーメディア�構�を設定ファイル��存���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>&amp;Remember Mounted Media</source>
         <translation type="obsolete">マウント��メディアを記録(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>Runtime:</source>
         <translation type="obsolete">実行時:</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>you have assigned more than &lt;b&gt;75%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%1&lt;/b&gt;) to the virtual machine. Not enough memory is left for your host operating system. Please select a smaller amount.</source>
         <translation type="obsolete">実メモリ(&lt;b&gt;%1&lt;/b)�&lt;b&gt;75%&lt;/b&gt;を超�るメモリ�仮想マシン�割り当�られ���。 ホストOS��分�メモリを使用����ん。割り当�メモリを減ら������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>you have assigned more than &lt;b&gt;50%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%1&lt;/b&gt;) 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">実メモリ(&lt;b&gt;%1&lt;/b)�&lt;b&gt;50%&lt;/b&gt;を超�るメモリ�仮想マシン�割り当�られ���。 ホストOS��分�メモリを使用����ん。割り当�メモリを減ら������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>you have assigned less than &lt;b&gt;%1&lt;/b&gt; of video memory which is the minimum amount required to switch the virtual machine to fullscreen or seamless mode.</source>
         <translation type="obsolete">仮想マシンをフルスクリーン���シームレスモード�切り��る���必��値(%1)より少��ビデオメモリ�仮想マシン�割り当�られ���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>When checked, the virtual machine will be given access to the 3D graphics capabilities available on the host.</source>
         <translation type="obsolete">仮想マシン�ホストマシン�3Dグラフィックス機能を利用���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>Enable &amp;3D Acceleration</source>
         <translation type="obsolete">3Dアクセラレーションを有効化(&amp;3)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>you have assigned more than &lt;b&gt;%1%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%2&lt;/b&gt;) to the virtual machine. Not enough memory is left for your host operating system. Please select a smaller amount.</source>
         <translation type="obsolete">実メモリ(&lt;b&gt;%2&lt;/b)�&lt;b&gt;%1%&lt;/b&gt;を超�るメモリ�仮想マシン�割り当�られ���。 ホストOS��分�メモリを使用����ん。割り当�メモリを減ら������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>you have assigned more than &lt;b&gt;%1%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%2&lt;/b&gt;) 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">実メモリ(&lt;b&gt;%2&lt;/b)�&lt;b&gt;%1%&lt;/b&gt;を超�るメモリ�仮想マシン�割り当�られ���。 ホストOS��分�メモリ�残�れ����ん。自己�責任�続行������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>there is a 64 bits guest OS type assigned for this VM, which requires virtualization feature (VT-x/AMD-V) to be enabled too, else your guest will fail to detect a 64 bits CPU and will not be able to boot, so this feature will be enabled automatically when you&apos;ll accept VM Settings by pressing OK button.</source>
         <translation type="obsolete">64ビット ゲストOSタイプを指定��仮想マシン��仮想化支�機能(VT-x/AMD-V)を有効化�る必���り��。�����れ�ゲストOS�64ビットCPUを検出����起動����ん。����[OK]ボタンを押��仮想マシン設定を�存�る���仮想化支�機能を自動的�有効化���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <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="obsolete">仮想マシン�ホストCPU��ステッドページング(Intel VT-x���AMD-V)を有効����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="185"/>
         <source>Enable Nested Pa&amp;ging</source>
         <translation type="obsolete">�ステッドページングを有効化(&amp;G)</translation>
     </message>
@@ -11108,67 +10343,54 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsHD</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>No hard disk is selected for &lt;i&gt;%1&lt;/i&gt;</source>
         <translation type="obsolete"> &lt;i&gt;%1&lt;/i&gt;�����ードディスク��択�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>&lt;i&gt;%1&lt;/i&gt; uses the hard disk that is already attached to &lt;i&gt;%2&lt;/i&gt;</source>
         <translation type="obsolete">&lt;i&gt;%1&lt;/i&gt;����&lt;i&gt;%2&lt;/i&gt;�割り当�られ��る</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>&amp;Add Attachment</source>
         <translation type="obsolete">割り当�を追加�る(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>&amp;Remove Attachment</source>
         <translation type="obsolete">割り当�を除去�る(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>&amp;Select Hard Disk</source>
         <translation type="obsolete">�ードディスクを�択�る(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>Adds a new hard disk attachment.</source>
         <translation type="obsolete">新��ードディスク�割り当�を追加���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>Removes the highlighted hard disk attachment.</source>
         <translation type="obsolete">�イライト表示�れ��ードディスク�割り当�を除去���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>Invokes the Virtual Disk Manager to select a hard disk to attach to the currently highlighted slot.</source>
         <translation type="obsolete">仮想ディスクマ�ージャを起動���ードディスクを�在�イライト表示�れ�スロット�割り当���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>When checked, enables the virtual SATA controller of this machine. Note that you cannot attach hard disks to SATA ports when the virtual SATA controller is disabled.</source>
         <translation type="obsolete">仮想SATA コントローラを有効����。注：仮想SATA コントローラ�無効�場��SATA�ート��ードディスクを割り当�����ん。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>&amp;Enable SATA Controller</source>
         <translation type="obsolete">SATA コントローラを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>&amp;Attachments</source>
         <translation type="obsolete">割り当�(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>Lists all hard disks attached to this machine. Use a mouse click or the &lt;tt&gt;Space&lt;/tt&gt; key on the highlighted item to activate the drop-down list and choose the desired value. Use the context menu or buttons to the right to add or remove hard disk attachments.</source>
         <translation type="obsolete">��仮想マシン�割り当�られ������ードディスクをリスト表示���。�イライト表示�れ�項目をマウスクリック�る��&lt;tt&gt;[スペース]&lt;/tt&gt;キーを使用���ドロップダウンリスト�ら使用�る�ードディスクを�択������。コンテキストメニュー���ボタンを使����ードディスク�割り当��追加���除去�行���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsGeneral.ui" line="236"/>
         <source>Invokes the Virtual Media Manager to select a hard disk to attach to the currently highlighted slot.</source>
         <translation type="obsolete">仮想メディアマ�ージャを起動���ードディスクを�在�イライト表示�れ�スロット�割り当���。</translation>
     </message>
@@ -11178,27 +10400,22 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>実際�ベース�ードディスク�代�り�スロット�割り当�られ�差分�ードディスクを表示���(間接的�割り当�時)。 高度��ードディスク設定�必��場����オン�������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="325"/>
         <source>&amp;Show Differencing Hard Disks</source>
         <translation type="obsolete">差分�ードディスクを表示(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="325"/>
         <source>When checked, enables an additional virtual controller (either SATA or SCSI) of this machine.</source>
         <translation type="obsolete">��仮想マシン�追加�仮想コントローラ(SATA���SCSI)を有効����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="325"/>
         <source>&amp;Enable Additional Controller</source>
         <translation type="obsolete">追加�コントローラを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="325"/>
         <source>IDE &amp;Controller Type</source>
         <translation type="obsolete">IDE コントローラ タイプ(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="325"/>
         <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>
         <translation type="obsolete">仮想IDE コントローラ�タイプを定義���。��値�より�VirtualBox�異���仮想IDE�ードウェア デ�イスをゲストOS��供���。</translation>
     </message>
@@ -11313,6 +10530,7 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>�イライト表示�れ�ストレージ ツリー�割り当�を除去���。</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsHD.cpp" line="1901"/>
         <location filename="../src/wizards/newvm/VBoxNewVMWzd.cpp" line="357"/>
         <source>IDE Controller</source>
         <translation>IDE コントローラ</translation>
@@ -11328,6 +10546,7 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>SCSI コントローラ</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsHD.cpp" line="1916"/>
         <location filename="../src/wizards/newvm/VBoxNewVMWzd.cpp" line="358"/>
         <source>Floppy Controller</source>
         <translation>フロッピー コントローラ</translation>
@@ -11358,6 +10577,7 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>��仮想マシン�����ストレージ コントローラ�仮想イメージ�割り当�られ�ホスト デ�イスを����。</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="119"/>
         <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="351"/>
         <source>Information</source>
         <translation>情報</translation>
@@ -11368,6 +10588,7 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>ストレージ ツリー�異���種類�複数�コントローラを�む�������。��仮想マシン��コントローラ��り��ん。</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="165"/>
         <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="247"/>
         <source>Attributes</source>
         <translation>属性</translation>
@@ -11466,12 +10687,10 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsNetwork</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="458"/>
         <source>Select TAP setup application</source>
         <translation type="obsolete">TAP設定アプリケーションを�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsHD.ui" line="458"/>
         <source>Select TAP terminate application</source>
         <translation type="obsolete">TAP終了アプリケーションを�択</translation>
     </message>
@@ -11486,7 +10705,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>�ットワーク アダプタを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="36"/>
         <source>A&amp;dapter Type:</source>
         <translation type="obsolete">アダプタ タイプ(&amp;D):</translation>
     </message>
@@ -11506,17 +10724,14 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>仮想アダプタをホストOS�実際��ットワーク�割り当�る方�を指定���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="87"/>
         <source>&amp;Network Name:</source>
         <translation type="obsolete">�ットワーク�(&amp;N):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="87"/>
         <source>Displays the name of the internal network selected for this adapter.</source>
         <translation type="obsolete">��アダプタ用��択��内部�ットワーク�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="87"/>
         <source>&amp;MAC Address:</source>
         <translation type="obsolete">MACアドレス(&amp;M):</translation>
     </message>
@@ -11531,7 +10746,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>MACアドレスをランダム�生����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="202"/>
         <source>&amp;Generate</source>
         <translation type="obsolete">生�(&amp;G)</translation>
     </message>
@@ -11541,103 +10755,84 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>仮想マシン�起動時�仮想�ットワークケーブル�接続�れる����を示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Ca&amp;ble Connected</source>
         <translation type="obsolete">接続(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>&amp;Interface Name:</source>
         <translation type="obsolete">インターフェース�(&amp;I):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Displays the TAP interface name.</source>
         <translation type="obsolete">TAPインターフェース�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>&amp;Setup Application:</source>
         <translation type="obsolete">設定アプリケーション(&amp;S):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Displays the command executed to set up the TAP interface.</source>
         <translation type="obsolete">TAPインターフェース設定時�実行�るコマンドを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Selects the setup application.</source>
         <translation type="obsolete">設定アプリケーションを�択���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>&amp;Terminate Application:</source>
         <translation type="obsolete">終了アプリケーション(&amp;T):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Displays the command executed to terminate the TAP interface.</source>
         <translation type="obsolete">TAPインターフェース終了時�実行�るコマンドを表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Selects the terminate application.</source>
         <translation type="obsolete">終了アプリケーションを�択���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Host Interface Settings</source>
         <translation type="obsolete">ホスト インターフェース�設定</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Adapter</source>
         <comment>network</comment>
         <translation type="obsolete">アダプタ</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Not selected</source>
         <comment>adapter</comment>
         <translation type="obsolete">未�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Network</source>
         <comment>internal</comment>
         <translation type="obsolete">�ットワーク</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Not selected</source>
         <comment>network</comment>
         <translation type="obsolete">未�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>MAC Address</source>
         <translation type="obsolete">MACアドレス</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Not selected</source>
         <comment>address</comment>
         <translation type="obsolete">未�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Cable</source>
         <translation type="obsolete">ケーブル</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Connected</source>
         <comment>cable</comment>
         <translation type="obsolete">接続</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="216"/>
         <source>Not connected</source>
         <comment>cable</comment>
         <translation type="obsolete">未接続</translation>
@@ -11648,7 +10843,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>アダプタ タイプ(&amp;T):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="150"/>
         <source>Open extended settings dialog for current attachment type.</source>
         <translation type="obsolete">�在�割り当�タイプ����拡張設定ダイアログを開���。</translation>
     </message>
@@ -11668,13 +10862,13 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>ホストオンリー �ットワーク アダプタ�未�択</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="349"/>
         <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="351"/>
         <source>Not selected</source>
         <comment>network adapter name</comment>
         <translation>未�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.cpp" line="351"/>
         <source>Open additional options dialog for current attachment type.</source>
         <translation type="obsolete">�在�割り当�タイプ����追加オプションダイアログを開���。</translation>
     </message>
@@ -11712,112 +10906,90 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsNetworkDetails</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>no bridged network adapter is selected</source>
         <translation type="obsolete">ブリッジ �ットワーク アダプタ�未�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>no internal network name is specified</source>
         <translation type="obsolete">内部�ットワーク��未指定</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>no host-only adapter is selected</source>
         <translation type="obsolete">ホストオンリー アダプタ�未�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Basic Details</source>
         <translation type="obsolete">詳細情報</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Bridged Network Details</source>
         <translation type="obsolete">ブリッジ �ットワーク詳細</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Internal Network Details</source>
         <translation type="obsolete">内部�ットワーク詳細</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Host-only Network Details</source>
         <translation type="obsolete">ホストオンリー �ットワーク詳細</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Not selected</source>
         <translation type="obsolete">未�択</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Host Settings</source>
         <translation type="obsolete">ホスト設定</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>&amp;Bridged Network Adapter:</source>
         <translation type="obsolete">ブリッジ �ットワーク アダプタ(&amp;B):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Displays the name of the host network adapter selected for bridged networking.</source>
         <translation type="obsolete">ブリッジ �ットワーク用��択��ホスト �ットワークアダプタ�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Internal &amp;Network:</source>
         <translation type="obsolete">内部�ットワーク(&amp;N):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Displays the name of the internal network selected for this adapter.</source>
         <translation type="obsolete">��アダプタ用��択��内部�ットワーク�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Host-only &amp;Network Adapter:</source>
         <translation type="obsolete">ホストオンリー �ットワークアダプタ(&amp;N):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Displays the name of the VirtualBox network adapter selected for host-only networking.</source>
         <translation type="obsolete">ホストオンリー �ットワーク用��択��VirtualBox �ットワークアダプタ�を表示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Guest Settings</source>
         <translation type="obsolete">ゲスト設定</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Guest &amp;MAC Address:</source>
         <translation type="obsolete">ゲストMACアドレス:</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <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">��アダプタ�MACアドレスを表示���。MACアドレス�{0-9,A-F}�ら�択�れ�12文字�構��れ��。注：2番目�文字��数���れ��り��ん。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Generates a new random MAC address.</source>
         <translation type="obsolete">MACアドレスをランダム�生����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>&amp;Cable connected</source>
         <translation type="obsolete">ケーブル接続(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
         <translation type="obsolete">仮想マシン�起動時�仮想�ットワークケーブルを接続�る����を示���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Additional Options</source>
         <translation type="obsolete">追加オプション</translation>
     </message>
@@ -11825,12 +10997,10 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsNetworkPage</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>No host network interface is selected</source>
         <translation type="obsolete">ホスト インターフェース��択�れ����</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsNetwork.ui" line="219"/>
         <source>Internal network name is not set</source>
         <translation type="obsolete">内部�ットワーク��設定�れ����</translation>
     </message>
@@ -11869,7 +11039,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>IRQ(&amp;I):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsParallel.ui" line="97"/>
         <source>Displays the IRQ number of this parallel port. Valid values are integer numbers in range from &lt;tt&gt;0&lt;/tt&gt; to &lt;tt&gt;255&lt;/tt&gt;. Values greater than &lt;tt&gt;15&lt;/tt&gt; may only be used if the &lt;b&gt;IO APIC&lt;/b&gt; is enabled for this virtual machine.</source>
         <translation type="obsolete">��パラレル�ート�IRQ番�を表示���。有効値�&lt;tt&gt;0&lt;/tt&gt;�ら&lt;tt&gt;255&lt;/tt&gt;���範囲�整数��。&lt;tt&gt;15&lt;/tt&gt;以上�値���仮想マシン�&lt;b&gt;IO APIC&lt;/b&gt;�有効���使用�れ��。</translation>
     </message>
@@ -11879,7 +11048,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>I/O�ート(&amp;R):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsParallel.ui" line="120"/>
         <source>Displays the base I/O port address of this parallel port. This should be a whole number between &lt;tt&gt;0&lt;/tt&gt; and &lt;tt&gt;0xFFFF&lt;/tt&gt;.</source>
         <translation type="obsolete">��パラレル�ート�ベースI/O�ートアドレスを表示���。 有効値�&lt;tt&gt;0&lt;/tt&gt;�ら&lt;tt&gt;0xFFFF&lt;/tt&gt;�範囲�整数��。</translation>
     </message>
@@ -11925,17 +11093,14 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsSF</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsParallel.cpp" line="240"/>
         <source>&amp;Add New Shared Folder</source>
         <translation type="obsolete">新�共有フォルダを追加(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsParallel.cpp" line="240"/>
         <source>&amp;Edit Selected Shared Folder</source>
         <translation type="obsolete">�択��共有フォルダを編集(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsParallel.cpp" line="240"/>
         <source>&amp;Remove Selected Shared Folder</source>
         <translation type="obsolete">�択��共有フォルダを除去(&amp;R)</translation>
     </message>
@@ -12102,7 +11267,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>IRQ(&amp;I):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSerial.ui" line="97"/>
         <source>Displays the IRQ number of this serial port. Valid values are integer numbers in range from &lt;tt&gt;0&lt;/tt&gt; to &lt;tt&gt;255&lt;/tt&gt;. Values greater than &lt;tt&gt;15&lt;/tt&gt; may only be used if the &lt;b&gt;IO APIC&lt;/b&gt; is enabled for this virtual machine.</source>
         <translation type="obsolete">��シリアル�ート�IRQ番�を表示���。有効値�&lt;tt&gt;0&lt;/tt&gt;�ら&lt;tt&gt;255&lt;/tt&gt;���範囲�整数��。&lt;tt&gt;15&lt;/tt&gt;以上�値���仮想マシン�&lt;b&gt;IO APIC&lt;/b&gt;�有効���使用�れ��。</translation>
     </message>
@@ -12112,7 +11276,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>I/O�ート(&amp;R):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSerial.ui" line="120"/>
         <source>Displays the base I/O port address of this serial port. This should be a whole number between &lt;tt&gt;0&lt;/tt&gt; and &lt;tt&gt;0xFFFF&lt;/tt&gt;.</source>
         <translation type="obsolete">��シリアル�ート�ベースI/O�ートアドレスを表示���。 有効値�&lt;tt&gt;0&lt;/tt&gt;�ら&lt;tt&gt;0xFFFF&lt;/tt&gt;�範囲�整数��。</translation>
     </message>
@@ -12137,7 +11300,6 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>パイプ作�(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSerial.ui" line="179"/>
         <source>Port &amp;Path:</source>
         <translation type="obsolete">�ート パス(&amp;P):</translation>
     </message>
@@ -12183,48 +11345,48 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsSystem</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="262"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="266"/>
         <source>you have assigned more than &lt;b&gt;%1%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%2&lt;/b&gt;) to the virtual machine. Not enough memory is left for your host operating system. Please select a smaller amount.</source>
         <translation>実メモリ(&lt;b&gt;%2&lt;/b)�&lt;b&gt;%1％&lt;/b&gt;を超�るメモリ�仮想マシン�割り当�られ���。 ホストOS��分�メモリを使用����ん。割り当�メモリを減ら������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="272"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="276"/>
         <source>you have assigned more than &lt;b&gt;%1%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%2&lt;/b&gt;) to the virtual machine. There might not be enough memory left for your host operating system. Continue at your own risk.</source>
         <translation>実メモリ(&lt;b&gt;%2&lt;/b)�&lt;b&gt;%1％&lt;/b&gt;を超�るメモリ�仮想マシン�割り当�られ���。 ホストOS��分�メモリ�残�れ����ん。自己�責任�続行������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="285"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="289"/>
         <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 (&lt;b&gt;%1&lt;/b&gt;). Please reduce the number of virtual CPUs.</source>
         <translation>性能上��由�ら�仮想マシン�割り当�るCPU数�ホストマシン�物�CPU数(&lt;b&gt;%1&lt;/b&gt;)�2�を超����り��ん。仮想CPU�数を減ら������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="294"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="298"/>
         <source>you have assigned more virtual CPUs to the virtual machine than the number of physical CPUs on your host system (&lt;b&gt;%1&lt;/b&gt;). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
         <translation>ホストマシン�物�CPU数 (&lt;b&gt;%1&lt;/b&gt;)より多�CPU�仮想マシン�割り当�られ���。�れ�仮想マシン�性能を低下����。仮想CPU�数を減ら������。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="306"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="310"/>
         <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>2個以上�CPU�仮想マシン�割り当�られ���。IO APIC�無効�場���れ�動作���ん。[OK]ボタンを押��自動的�IO APIC�有効化�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="317"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="321"/>
         <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>2個以上�CPU�仮想マシン�割り当�られ���。仮想化支�機能(VT-x/AMD-V)�無効�場���れ�動作���ん。[OK]ボタンを押��自動的�仮想化支�機能�有効化�れ��。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="372"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="375"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="376"/>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="375"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="379"/>
         <source>&lt;qt&gt;%1&amp;nbsp;CPU&lt;/qt&gt;</source>
         <comment>%1 is 1 for now</comment>
         <translation>&lt;qt&gt;%1&amp;nbsp;CPU&lt;/qt&gt;</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="375"/>
         <source>&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</source>
         <comment>%1 is 32 for now</comment>
         <translation type="obsolete">&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</translation>
@@ -12240,6 +11402,7 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>メインメモリ(&amp;M):</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.ui" line="68"/>
         <location filename="../src/settings/vm/VBoxVMSettingsSystem.ui" line="134"/>
         <source>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</source>
         <translation>仮想マシン�割り当�るメインメモリ�サイズを指定���。割り当���多��る�仮想マシン�起動����も�れ��ん。</translation>
@@ -12280,17 +11443,16 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>�択��起動デ�イスを上�移動���。</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.ui" line="306"/>
         <location filename="../src/settings/vm/VBoxVMSettingsSystem.ui" line="472"/>
         <source>Extended Features:</source>
         <translation>拡張機能:</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.ui" line="472"/>
         <source>When checked, the virtual machine will support the Advanced Configuration and Power Management Interface (ACPI). &lt;b&gt;Note:&lt;/b&gt; don&apos;t disable this feature after having installed a Windows guest operating system!</source>
         <translation type="obsolete">仮想マシン�ACPI(Advanced Configuration and Power Management Interface)サ�ートを有効����。&lt;b&gt;注：&lt;/b&gt; Windows ゲストOSをインストール��後�本機能を無効����������</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.ui" line="472"/>
         <source>Enable &amp;ACPI</source>
         <translation type="obsolete">ACPIを有効化(&amp;A)</translation>
     </message>
@@ -12315,8 +11477,9 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>プロセッサ数(&amp;P):</translation>
     </message>
     <message>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.ui" line="392"/>
         <location filename="../src/settings/vm/VBoxVMSettingsSystem.ui" line="465"/>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>仮想マシン�割り当�るCPU�数を指定���。</translation>
     </message>
     <message>
@@ -12360,7 +11523,7 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
         <translation>�ステッドページングを有効化(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="376"/>
+        <location filename="../src/settings/vm/VBoxVMSettingsSystem.cpp" line="380"/>
         <source>&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</source>
         <comment>%1 is host cpu count * 2 for now</comment>
         <translation>&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</translation>
@@ -12609,42 +11772,34 @@ USBフィルタを追加ã�¾ã�Ÿã�¯é™¤åŽ»ã�™ã‚‹ã�«ã�¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ
 <context>
     <name>VBoxVMSettingsVRDP</name>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui" line="36"/>
         <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">仮想マシン�リモートデスクトッププロトコル(RDP)サー�ー機能を有効����。リモートクライアント�標準的�RDPクライアントを使用��実行中�仮想マシン�接続���作�る��を�能����。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui" line="36"/>
         <source>&amp;Enable VRDP Server</source>
         <translation type="obsolete">VRDPサー�ーを有効化(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui" line="36"/>
         <source>Server &amp;Port:</source>
         <translation type="obsolete">サー�ー��ート番�(&amp;P):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui" line="36"/>
         <source>Displays the VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero) to reset the port to the default value.</source>
         <translation type="obsolete">VRDPサー�ー��ート番�を表示���。�ートをデフォルト値�リセット�る��&lt;tt&gt;0&lt;/tt&gt;(ゼロ)を指定���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui" line="36"/>
         <source>Authentication &amp;Method:</source>
         <translation type="obsolete">�証方�(&amp;M):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui" line="36"/>
         <source>Defines the VRDP authentication method.</source>
         <translation type="obsolete">VRDP��証方�を指定���。</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui" line="36"/>
         <source>Authentication &amp;Timeout:</source>
         <translation type="obsolete">�証タイムアウト値(&amp;T):</translation>
     </message>
     <message>
-        <location filename="../src/settings/vm/VBoxVMSettingsUSBFilterDetails.ui" line="36"/>
         <source>Specifies the timeout for guest authentication, in milliseconds.</source>
         <translation type="obsolete">ゲスト�証�タイムアウト値をミリ秒���指定���。</translation>
     </message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
index 9c8c5a5b8..3a144c5e2 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
@@ -26,22 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Sun Microsystems, Inc.</translation>
-    </message>
-</context>
-<context>
-    <name>AttachmentsModel</name>
-    <message>
-        <source>Double-click to add a new attachment</source>
-        <translation type="obsolete">ចុច​ទ្វ�ដង​ដើម្បី​បន្�ែម​​ឯកសារ​ភ្ជាប់​�្មី</translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="obsolete">�ាសរឹង</translation>
-    </message>
-    <message>
-        <source>Slot</source>
-        <translation type="obsolete">រន្ធ</translation>
+        <translation type="obsolete">Sun Microsystems, Inc.</translation>
     </message>
 </context>
 <context>
@@ -68,68 +53,61 @@
     </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 type="unfinished"></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&lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;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>
-        <translation type="unfinished"></translation>
+        <translation>កម្ម​វិធី​�ឺ​ណែល​លីនុច​ VirtualBox (vboxdrv) មិន�្រូវ​បាន​ផ្ទុក​ ឬ​មាន​បញ្ហា​សិទ្ធិ​ជាមួយ​ /dev/vboxdrv ។ សូម​ដំឡើង​ឡើង​វិញ​ម៉ូ​​ឌុល​�ឺ​ណែល​​​ដោយ​ការ​ប្រ�ិប�្�ិ​​ &lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv ដំឡើ​ង&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;​ដូច Root ។ អ្នក​ប្រើ​យូប៊ុន​ទូ​ Fedora ឬ​ Mandriva គួរ​�ែដំឡើង​កញ្ចប់​ដំបូង​របស់​ DKMS ។ កញ្ចប់​ន�ះ​​�ាម​ដាន​​រក្សា​ទុក​​នៃ​ការ​ផ្លាស់​ប្�ូរ​�ឺ​ណែល​លីនុច​ និងចង​​ក្រង​ឡើងវិញ​នៃ​​ម៉ូឌុល​�ឺណែល​របស់​ vboxdrv ប្រសិន​បើ​ចាំ​បាច់ ។</translation>
     </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 type="unfinished"></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&lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;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 មិន​ផ្គូផ្គង​កំណែ​របស់​ VirtualBox ន�ះទ� ។ ជាក់​ស្�ែង​ការ​ដំឡើង​របស់​ VirtualBox មិន​ទទួល​បាន​ជោគជ�យ​នោះ​ទ� ។ ការ​ប្រ�ិប�្�ិ​&lt;br/&gt;&lt;br/&gt;  &lt;font color=blue&gt;&apos;/etc/init.d/vboxdrv setup&apos;&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;ន�ះ​អាច​�្រឹម�្រូវ​ ។ សូម​ប្រាកដ​�ា​ អ្នក​មិនបញ្ចូល​កំណែ​ OSE និង​​កំណែ​ PUEL របស់​ VirtualBox ចូល​គ្នា​ឡើយ ។</translation>
     </message>
     <message>
         <source>Make sure the kernel module has been loaded successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រាកដ​�ា ​ម៉ូឌុល​�ឺណែល​�្រូវ​បាន​ផ្ទុក​ដោយ​​ជោគ​ជ�យ​ ។</translation>
     </message>
     <message>
         <source>VirtualBox - Runtime Error</source>
-        <translation type="unfinished"></translation>
+        <translation>VirtualBox - កំហុស Runtime</translation>
     </message>
     <message>
         <source>&lt;b&gt;Cannot access the kernel driver!&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;មិន​អាច​ដំណើរ​ការ​កម្មវិធី​បញ្ជា​�ឺ​​ណែល​​​បាន​ទ� !&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
         <source>Kernel driver not accessible</source>
-        <translation type="unfinished"></translation>
+        <translation>កម្ម​វិធី​បញ្ជា​�ឺ​ណែល​​មិន​អាច​ដំណើរ​ការបាន​​ឡើ​យ​</translation>
     </message>
     <message>
         <source>Unknown error %2 during initialization of the Runtime</source>
-        <translation type="unfinished"></translation>
+        <translation>មិន​ស្គាល់​កំហុស​ %2 អំឡុង​ព�ល​ដែលការ​ចាប់​ផ្�ើមព�លវ�លា​រ�់​</translation>
     </message>
 </context>
 <context>
     <name>QIArrowSplitter</name>
     <message>
         <source>&amp;Back</source>
-        <translation type="unfinished"></translation>
+        <translation>�យ​ក្រោយ​</translation>
     </message>
     <message>
         <source>&amp;Next</source>
-        <translation type="unfinished">បន្ទាប់</translation>
+        <translation>បន្ទាប់​</translation>
     </message>
 </context>
 <context>
     <name>QIFileDialog</name>
     <message>
         <source>Select a directory</source>
-        <translation type="unfinished">ជ្រើស​��</translation>
+        <translation>ជ្រើស​��</translation>
     </message>
     <message>
         <source>Select a file</source>
-        <translation type="unfinished">ជ្រើស​ឯកសារ</translation>
-    </message>
-</context>
-<context>
-    <name>QIHelpButton</name>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="obsolete">ជំនួយ</translation>
+        <translation>ជ្រើស​ឯកសារ</translation>
     </message>
 </context>
 <context>
@@ -326,14 +304,7 @@
     <name>QILabel</name>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished">ចម្លង</translation>
-    </message>
-</context>
-<context>
-    <name>QILabelPrivate</name>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="obsolete">ចម្លង</translation>
+        <translation>ចម្លង</translation>
     </message>
 </context>
 <context>
@@ -360,11 +331,11 @@
     </message>
     <message>
         <source>&amp;Details</source>
-        <translation type="unfinished">ស�ចក្ដី​លម្អិ�</translation>
+        <translation>ស�ចក្ដី​លម្អិ�</translation>
     </message>
     <message>
         <source>&amp;Details (%1 of %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>ស�ច​ក្�ី​លម្អិ�​ (%1 នៃ %2)</translation>
     </message>
 </context>
 <context>
@@ -404,29 +375,6 @@
     </message>
 </context>
 <context>
-    <name>VBoxAddNIDialog</name>
-    <message>
-        <source>Add Host Interface</source>
-        <translation type="obsolete">បន្�ែម​ចំណុច​ប្រទាក់​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
-        <source>Interface Name</source>
-        <translation type="obsolete">ឈ្មោះ​ចំណុច​ប្រទាក់</translation>
-    </message>
-    <message>
-        <source>Descriptive name of the new network interface</source>
-        <translation type="obsolete">ឈ្មោះ​ស�ចក្ដី​ពិពណ៌នា​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ​�្មី</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">យល់ព្រម</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">បោះពុម្ព</translation>
-    </message>
-</context>
-<context>
     <name>VBoxAdditionsDownloader</name>
     <message>
         <source>Cancel</source>
@@ -453,107 +401,107 @@
     <name>VBoxApplianceEditorWgt</name>
     <message>
         <source>Virtual System %1</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រ​ព�ន្ធ​​និម្មិ�​ %1</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">ឈ្មោះ</translation>
+        <translation>ឈ្មោះ</translation>
     </message>
     <message>
         <source>Product</source>
-        <translation type="unfinished"></translation>
+        <translation>ផលិ�​ផល​</translation>
     </message>
     <message>
         <source>Product-URL</source>
-        <translation type="unfinished"></translation>
+        <translation>ផលិ�ផល​-URL</translation>
     </message>
     <message>
         <source>Vendor</source>
-        <translation type="unfinished"></translation>
+        <translation>ក្រុម​ហ៊ុន​លក់​</translation>
     </message>
     <message>
         <source>Vendor-URL</source>
-        <translation type="unfinished"></translation>
+        <translation>ក្រុម​ហ៊ុន​លក់​​-URL</translation>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>កំណែ​</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>ស�ច​ក្�ី​ពិណណ៌នា​</translation>
     </message>
     <message>
         <source>License</source>
-        <translation type="unfinished"></translation>
+        <translation>អជ្ញាបណ្ណ</translation>
     </message>
     <message>
         <source>Guest OS Type</source>
-        <translation type="unfinished">ប្រភ�ទ​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ</translation>
+        <translation>ប្រភ�ទ​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation type="unfinished"></translation>
+        <translation>ស៊ី​ភី​យូ</translation>
     </message>
     <message>
         <source>RAM</source>
-        <translation type="unfinished"></translation>
+        <translation>ស�ិ</translation>
     </message>
     <message>
         <source>Hard Disk Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�បញ្ជា​​�ាស​រឹង (IDE)</translation>
     </message>
     <message>
         <source>Hard Disk Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�បញ្ជា​​�ាស​រឹង (SATA)</translation>
     </message>
     <message>
         <source>Hard Disk Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​បញ្ជា​�ាស​រឹង (SCSI)</translation>
     </message>
     <message>
         <source>DVD</source>
-        <translation type="unfinished"></translation>
+        <translation>ឌីវីឌី​</translation>
     </message>
     <message>
         <source>Floppy</source>
-        <translation type="unfinished">�ាសទន់</translation>
+        <translation>�ាសទន់</translation>
     </message>
     <message>
         <source>Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>អាដាប់​ទ�រ​បណ្�ាញ​</translation>
     </message>
     <message>
         <source>USB Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​បញ្ជា​ USB</translation>
     </message>
     <message>
         <source>Sound Card</source>
-        <translation type="unfinished"></translation>
+        <translation>កា�​សំឡ�ង​</translation>
     </message>
     <message>
         <source>Virtual Disk Image</source>
-        <translation type="unfinished"></translation>
+        <translation>រូបភាព​�ាស​និម្មិ�​</translation>
     </message>
     <message>
         <source>Unknown Hardware Item</source>
-        <translation type="unfinished"></translation>
+        <translation>មិនស្គាល់​ធា�ុ​ផ្នែក​រឹង​</translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished">ម�កាបៃ</translation>
+        <translation>ម�កាបៃ</translation>
     </message>
     <message>
         <source>&lt;b&gt;Original Value:&lt;/b&gt; %1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;�ម្លៃ​​ដើម​ ៖&lt;/b&gt; %1</translation>
     </message>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>ការ​កំណ�់​រចនា​សម្ព�ន្ធ</translation>
     </message>
     <message>
         <source>Warnings:</source>
-        <translation type="unfinished"></translation>
+        <translation>ការ​ព្រមាន​ ៖</translation>
     </message>
 </context>
 <context>
@@ -575,14 +523,6 @@
         <translation>បិទ​ម៉ាស៊ីន</translation>
     </message>
     <message>
-        <source>&amp;Revert to the current snapshot</source>
-        <translation type="obsolete">ដាក់​បញ្ច្រាស​រូប��​បច្ចុប្បន្ន</translation>
-    </message>
-    <message>
-        <source>Revert the machine state to the state stored in the current snapshot</source>
-        <translation type="obsolete">ដាក់​បញ្ច្រាស​ស្�ានភាព​ម៉ាស៊ីន​ទៅ​ស្�ានភាព​ដែលបានទុក​នៅ​ក្នុង​រូប��​បច្ចុប្បន្ន</translation>
-    </message>
-    <message>
         <source>S&amp;end the shutdown signal</source>
         <translation>ផ្ញើ​សញ្ញា​បិទ</translation>
     </message>
@@ -604,11 +544,11 @@
     </message>
     <message>
         <source>Restore the machine state stored in the current snapshot</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ារ​​ស្�ាន​ភាព​ម៉ាស៊ីន​ដែល​បាន​រក្សា​ទុក​ក្នុង​រូប​��​បច្ចុប្បន្ន</translation>
     </message>
     <message>
         <source>&amp;Restore current snapshot &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ារ​រូប​��​បច្ចុប្បន្ន​ &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -700,42 +640,6 @@
         <translation>យក​រូប��​របស់​ម៉ាស៊ីន​និម្មិ�</translation>
     </message>
     <message>
-        <source>&amp;Floppy Image...</source>
-        <translation type="obsolete">រូបភាព​�ាស​ទន់...</translation>
-    </message>
-    <message>
-        <source>Mount a floppy image file</source>
-        <translation type="obsolete">ម៉ោន​ឯកសារ​រូបភាព​�ាស​ទន់</translation>
-    </message>
-    <message>
-        <source>Unmount F&amp;loppy</source>
-        <translation type="obsolete">អាន់ម៉ោន​�ាស​ទន់</translation>
-    </message>
-    <message>
-        <source>Unmount the currently mounted floppy media</source>
-        <translation type="obsolete">អាន់ម៉ោន​ម�ឌៀ​�ាស​ទាន់​ដែល​បាន​ម៉ោន​បច្ចុប្បន្ន</translation>
-    </message>
-    <message>
-        <source>&amp;CD/DVD-ROM Image...</source>
-        <translation type="obsolete">រូបភាព​ស៊ីឌី/ឌីវីឌី​រ៉ូម...</translation>
-    </message>
-    <message>
-        <source>Mount a CD/DVD-ROM image file</source>
-        <translation type="obsolete">ម៉ោន​ឯកសារ​រូបភាព​ស៊ីឌី/ឌីវីឌី​រ៉ូម</translation>
-    </message>
-    <message>
-        <source>Unmount C&amp;D/DVD-ROM</source>
-        <translation type="obsolete">អាន់ម៉ោន​ស៊ីឌី/ឌីវីឌីរ៉ូម</translation>
-    </message>
-    <message>
-        <source>Unmount the currently mounted CD/DVD-ROM media</source>
-        <translation type="obsolete">អាន់ម៉ោន​ម�ឌៀ​ស៊ីឌី/ឌីវីឌីរ៉ូម​ដែល​បាន​ម៉ោន​បច្ចុប្បន្ន</translation>
-    </message>
-    <message>
-        <source>Remote Dis&amp;play</source>
-        <translation type="obsolete">កា​រ​បង្ហាញ​ពី​ចម្ងាយ</translation>
-    </message>
-    <message>
         <source>Enable or disable remote desktop (RDP) connections to this machine</source>
         <translation>បើក ឬ​បិទ​ការ​�ភ្ជាប់​ផ្ទៃ�ុ​ពី​ចម្ងាយ (RDP) ទៅ​កាន់​ម៉ាស៊ីន​ន�ះ</translation>
     </message>
@@ -756,14 +660,6 @@
         <translation>ម៉ោន​រូបភាព​ដំឡើង​បន្�ែម​ភ្ញៀវ</translation>
     </message>
     <message>
-        <source>Mount &amp;Floppy</source>
-        <translation type="obsolete">ម៉ោន​�ាស​ទន់</translation>
-    </message>
-    <message>
-        <source>Mount &amp;CD/DVD-ROM</source>
-        <translation type="obsolete">ម៉ោន​ស៊ីឌី/ឌីវីឌី​រ៉ូម</translation>
-    </message>
-    <message>
         <source>&amp;USB Devices</source>
         <translation>ឧបករណ�​ USB</translation>
     </message>
@@ -820,41 +716,10 @@
         <translation>រូប�� %1</translation>
     </message>
     <message>
-        <source>Host Drive </source>
-        <translation type="obsolete">ដ្រាយ​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
         <source>&amp;Machine</source>
         <translation>ម៉ាស៊ីន</translation>
     </message>
     <message>
-        <source>&amp;Network Adapters</source>
-        <translation type="obsolete">អាដាប់ទ�រ​បណ្ដាញ</translation>
-    </message>
-    <message>
-        <source>Adapter %1</source>
-        <comment>network</comment>
-        <translation type="obsolete">អាដាប់ទ�រ %1</translation>
-    </message>
-    <message>
-        <source>Mount the selected physical drive of the host PC</source>
-        <comment>Floppy tip</comment>
-        <translation type="obsolete">ម៉ោន​ដ្រាយ​ហ្វីស៊ី�ល​ដែល​ជ្រើស​របស់​ម៉ាស៊ីន​</translation>
-    </message>
-    <message>
-        <source>Mount the selected physical drive of the host PC</source>
-        <comment>CD/DVD tip</comment>
-        <translation type="obsolete">ម៉ោន​ដ្រាយ​ហ្វីស៊ី�ល​ដែល​បាន​ជ្រើស​របស់ម៉ាស៊ីន</translation>
-    </message>
-    <message>
-        <source>Disconnect the cable from the selected virtual network adapter</source>
-        <translation type="obsolete">ផ្ដាច់​�្សែ​ពី​អាដាប់ទ�រ​បណ្ដាញ​និម្មិ�​ដែល​បាន​ជ្រើស</translation>
-    </message>
-    <message>
-        <source>Connect the cable to the selected virtual network adapter</source>
-        <translation type="obsolete">�ភ្ជាប់​�្សែ​ទៅកាន់​អាដាប់ទ�រ​បណ្ដាញ​និម្មិ�​ដែល​បានជ្រើស</translation>
-    </message>
-    <message>
         <source>Seam&amp;less Mode</source>
         <translation>របៀប​គ្មាន​�្ន�រ</translation>
     </message>
@@ -863,61 +728,11 @@
         <translation>ប្ដូរ​ទៅ​របៀប​បញ្ចូល​ផ្ទៃ�ុ​គ្មាន​�្ន�រ</translation>
     </message>
     <message>
-        <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the floppy media:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
-        <comment>Floppy tooltip</comment>
-        <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ម�ឌៀ​�ាស​ទន់ ៖&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Host Drive&lt;/b&gt;: %1&lt;/nobr&gt;</source>
-        <comment>Floppy tooltip</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;ដ្រាយ​ម៉ាស៊ីន&lt;/b&gt; ៖ %1&lt;/nobr&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Image&lt;/b&gt;: %1&lt;/nobr&gt;</source>
-        <comment>Floppy tooltip</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;រូបភាព&lt;/b&gt; ៖ %1&lt;/nobr&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No media mounted&lt;/b&gt;&lt;/nobr&gt;</source>
-        <comment>Floppy tooltip</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​ម�ឌៀ​បានម៉ោន​ទ�&lt;/b&gt;&lt;/nobr&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the CD/DVD-ROM media:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
-        <comment>DVD-ROM tooltip</comment>
-        <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ម�ឌៀ​ស៊ីឌី/ឌីវីឌីរ៉ូម ៖&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Host Drive&lt;/b&gt;: %1&lt;/nobr&gt;</source>
-        <comment>DVD-ROM tooltip</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;ដ្រាយ​ម៉ាស៊ីន&lt;/b&gt; ៖ %1&lt;/nobr&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Image&lt;/b&gt;: %1&lt;/nobr&gt;</source>
-        <comment>DVD-ROM tooltip</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;រូបភាព&lt;/b&gt; ៖ %1&lt;/nobr&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No media mounted&lt;/b&gt;&lt;/nobr&gt;</source>
-        <comment>DVD-ROM tooltip</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​ម�ឌៀ​បានម៉ោន​ទ�&lt;/b&gt;&lt;/nobr&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;&lt;nobr&gt;Indicates activity on the the virtual hard disks:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
-        <comment>HDD tooltip</comment>
-        <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​�ាសរឹង​និម្មិ� ៖&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
-    </message>
-    <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No hard disks attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>HDD tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​�ាស​រឹង​បាន​ភ្ជាប់​ទ�&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the network interfaces:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
-        <comment>Network adapters tooltip</comment>
-        <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
-    </message>
-    <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;Adapter %1 (%2)&lt;/b&gt;: cable %3&lt;/nobr&gt;</source>
         <comment>Network adapters tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;អាដាប់ទ�រ %1 (%2)&lt;/b&gt; ៖ �្សែ %3&lt;/nobr&gt;</translation>
@@ -938,11 +753,6 @@
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;អាដាប់ទ�រ​បណ្ដាញ​ទាំង​អស់​�្រូវ​បានបិទ&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the attached USB devices:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
-        <comment>USB device tooltip</comment>
-        <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ឧបករណ� USB ដែល​បានផ្ដាច់ ៖&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
-    </message>
-    <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No USB devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>USB device tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​ឧបករណ� USB បាន​ផ្ដាច់&lt;/b&gt;&lt;/nobr&gt;</translation>
@@ -953,20 +763,11 @@
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;វ�្�ុ​បញ្ជា USB �្រូវ​បាន​បិទ&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <source>&lt;qt&gt;&lt;nobr&gt;Indicates the activity of the machineof the machine&apos;sapos;s shared folders: shared folders:&lt;/nobr&gt;%1&lt;/qt&gt;</source>
-        <comment>Shared folders tooltip</comment>
-        <translation type="obsolete">&lt;qt&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​��​ដែល​បានចែករំលែក ៖&lt;/nobr&gt;%1&lt;/qt&gt;</translation>
-    </message>
-    <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No shared folders&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>Shared folders tooltip</comment>
         <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​��​បាន​ចែករំលែក​ទ�&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <source>Sun xVM VirtualBox</source>
-        <translation type="obsolete">Sun xVM VirtualBox</translation>
-    </message>
-    <message>
         <source>Session I&amp;nformation Dialog</source>
         <translation>ប្រអប់​ព��៌មាន​សម�យ</translation>
     </message>
@@ -1011,110 +812,181 @@
     </message>
     <message>
         <source>Sun VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <translation>Sun VirtualBox</translation>
     </message>
     <message>
         <source> EXPERIMENTAL build %1r%2 - %3</source>
-        <translation type="unfinished"></translation>
+        <translation> ស្�ាបនា​ពិសោធ %1r%2 - %3</translation>
     </message>
     <message>
         <source>&amp;CD/DVD Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​ស៊ី​ឌី​/ឌីវីឌី</translation>
     </message>
     <message>
         <source>&amp;Floppy Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​�ាសទន់​</translation>
     </message>
     <message>
         <source>&amp;Network Adapters...</source>
-        <translation type="unfinished"></translation>
+        <translation>អាដាប់ទ�រ​​​បណ្�ាញ​...</translation>
     </message>
     <message>
         <source>Change the settings of network adapters</source>
-        <translation type="unfinished"></translation>
+        <translation>ផ្លាស់​ប្�ូរ​ការ​កំណ�់​របស់​​អាដាប់ទ�រ​​បណ្�ាញ</translation>
     </message>
     <message>
         <source>&amp;Remote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>ការ​បង្ហាញ​ពី​ចម្ងាយ</translation>
     </message>
     <message>
         <source>Remote Desktop (RDP) Server</source>
-        <comment>enable/disable...</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+enable/disable...</comment>
+        <translation type="obsolete">ម៉ាស៊ីន​បម្រើ​ផ្ទៃ�ុ​ពី​ចម្ងាយ (RDP)​</translation>
     </message>
     <message>
         <source>More CD/DVD Images...</source>
-        <translation type="unfinished"></translation>
+        <translation>រូបភាព​ស៊ីឌី/ឌីវីឌី​ផ្ស�ង​ទៀ�...</translation>
     </message>
     <message>
         <source>Unmount CD/DVD Device</source>
-        <translation type="unfinished"></translation>
+        <translation>អាន់ម៉ោន​ឧបករណ�​ស៊ីឌី/ឌីវីឌី</translation>
     </message>
     <message>
         <source>More Floppy Images...</source>
-        <translation type="unfinished"></translation>
+        <translation>រូបភាព​�ាសទន់​ផ្ស�ង​ទៀ�...</translation>
     </message>
     <message>
         <source>Unmount Floppy Device</source>
-        <translation type="unfinished"></translation>
+        <translation>អាន់ម៉ោន​ឧបករណ�​�ាស​ទន់​</translation>
     </message>
     <message>
         <source>No CD/DVD Devices Attached</source>
-        <translation type="unfinished"></translation>
+        <translation>គ្មាន​ឧបករណ�​ស៊ីឌី/ឌីវីឌី​បាន​ភ្ជាប់​ទ�</translation>
     </message>
     <message>
         <source>No Floppy Devices Attached</source>
-        <translation type="unfinished"></translation>
+        <translation>គ្មាន​ឧបករណ�​�ាស​ទន់​បាន​ភ្ជាប់​ទ�</translation>
+    </message>
+    <message>
+        <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the virtual hard disks:&lt;/nobr&gt;%1&lt;/p&gt;</source>
+        <comment>
+HDD tooltip</comment>
+        <translation type="obsolete">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​�ាសរឹង​និម្មិ� ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the CD/DVD devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
+        <comment>
+CD/DVD tooltip</comment>
+        <translation type="obsolete">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​​សកម្ម​ភាព​​​របស់​ឧបករណ�​​ស៊ី​ឌី​​/ឌីវីឌី ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No CD/DVD devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
+        <comment>
+CD/DVD tooltip</comment>
+        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​ឧបករណ�​ស៊ីឌី/ឌីវីឌី​បានភ្ជាប់​ទ�&lt;/b&gt;&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the floppy devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
+        <comment>
+FD tooltip</comment>
+        <translation type="obsolete">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ឧបករណ�​�ាស​ទន់ ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No floppy devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
+        <comment>
+FD tooltip</comment>
+        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​ឧបករណ�​�ាស​ទន់​បានភ្ជាប់​ទ�&lt;/b&gt;&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the network interfaces:&lt;/nobr&gt;%1&lt;/p&gt;</source>
+        <comment>
+Network adapters tooltip</comment>
+        <translation type="obsolete">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the attached USB devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
+        <comment>
+USB device tooltip</comment>
+        <translation type="obsolete">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ឧបករណ� USB ដែល​បាន​ភ្ជាប់ ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the machine&apos;s shared folders:&lt;/nobr&gt;%1&lt;/p&gt;</source>
+        <comment>
+Shared folders tooltip</comment>
+        <translation type="obsolete">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​��​ដែល​បានចែករំលែក​របស់​ម៉ាស៊ីន ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Indicates the status of the hardware virtualization features used by this virtual machine:&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%3:&lt;/b&gt;&amp;nbsp;%4&lt;/nobr&gt;</source>
+        <comment>
+
+
+
+
+
+Virtualization Stuff LED</comment>
+        <translation type="obsolete">បង្ហាញ�ា ​ស្�ាន​ភាព​របស់​លក្�ណៈពិស�ស​និម្មិ�​ផ្នែក​រឹង​�្រូ​វបាន​ប្រើ​ដោយ​ម៉ាស៊ីន​និម្មិ�​ន�ះ ៖​&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%3:&lt;/b&gt;&amp;nbsp;%4&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;</source>
+        <comment>
+Virtualization Stuff LED</comment>
+        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>Remote Desktop (RDP) Server</source>
+        <comment>enable/disable...</comment>
+        <translation type="unfinished">ម៉ាស៊ីន​បម្រើ​ផ្ទៃ�ុ​ពី​ចម្ងាយ (RDP)​</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the virtual hard disks:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​�ាសរឹង​និម្មិ� ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the CD/DVD devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>CD/DVD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​​សកម្ម​ភាព​​​របស់​ឧបករណ�​​ស៊ី​ឌី​​/ឌីវីឌី ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No CD/DVD devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>CD/DVD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​ឧបករណ�​ស៊ីឌី/ឌីវីឌី​បានភ្ជាប់​ទ�&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the floppy devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>FD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ឧបករណ�​�ាស​ទន់ ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;No floppy devices attached&lt;/b&gt;&lt;/nobr&gt;</source>
         <comment>FD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;គ្មាន​ឧបករណ�​�ាស​ទន់​បានភ្ជាប់​ទ�&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the network interfaces:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>Network adapters tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the attached USB devices:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>USB device tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​ឧបករណ� USB ដែល​បាន​ភ្ជាប់ ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;Indicates the activity of the machine&apos;s shared folders:&lt;/nobr&gt;%1&lt;/p&gt;</source>
         <comment>Shared folders tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p style=&apos;white-space:pre&apos;&gt;&lt;nobr&gt;បង្ហាញ​សកម្មភាព​របស់​��​ដែល​បានចែករំលែក​របស់​ម៉ាស៊ីន ៖&lt;/nobr&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Indicates the status of the hardware virtualization features used by this virtual machine:&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%3:&lt;/b&gt;&amp;nbsp;%4&lt;/nobr&gt;</source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">បង្ហាញ�ា ​ស្�ាន​ភាព​របស់​លក្�ណៈពិស�ស​និម្មិ�​ផ្នែក​រឹង​�្រូ​វបាន​ប្រើ​ដោយ​ម៉ាស៊ីន​និម្មិ�​ន�ះ ៖​&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%3:&lt;/b&gt;&amp;nbsp;%4&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;</source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;</translation>
     </message>
 </context>
 <context>
@@ -1128,54 +1000,54 @@
     <name>VBoxEmptyFileSelector</name>
     <message>
         <source>&amp;Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>ជ្រើស​រើស... </translation>
     </message>
 </context>
 <context>
     <name>VBoxExportApplianceWzd</name>
     <message>
         <source>Select a file to export into</source>
-        <translation type="unfinished"></translation>
+        <translation>ជ្រើស​ឯកសា�​�្រូវ​នាំច�ញ</translation>
     </message>
     <message>
         <source>Open Virtualization Format (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Open Virtualization Format (%1)</translation>
     </message>
     <message>
         <source>Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​</translation>
     </message>
     <message>
         <source>Please choose a filename to export the OVF to.</source>
-        <translation type="unfinished"></translation>
+        <translation>សូម​ជ្រើស​ឈ្មោះ​ឯកសារ​​ ដើម្បី​នាំ​ចូល​ 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>
-        <translation type="unfinished"></translation>
+        <translation>សូម​បំព�ញ​​វាល​​ដែល​បន្�ែម ​ដូចជា​​ឈ្មោះ​អ្នក​ប្រើ​ ពាក្យ​សម្ងា�់​ និងសញ្ញា​សម្គាល់​​ ហើយ​​​ផ្�ល់​ឈ្មោះ​​ឯកសារ​សម្រាប់​គោលដៅ ​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"></translation>
+        <translation>សូម​បំព�ញ​វាល​ដែល​បន្�ែម ​ដូចជា​​ឈ្មោះ​អ្នក​ប្រើ​ ពាក្យ​សម្ងា�់​ ឈ្មោះ​ម៉ាស៊ីន​ និង​សញ្ញា​សម្គាល់​ ហើយ​​​ផ្�ល់​ឈ្មោះ​ឯកសារ​សម្រាប់​គោល​ដៅ​ OVF ។</translation>
     </message>
     <message>
         <source>Checking files ...</source>
-        <translation type="unfinished"></translation>
+        <translation>កំពុង​ពិនិ�្យ​មើល​​ឯកសារ​...</translation>
     </message>
     <message>
         <source>Removing files ...</source>
-        <translation type="unfinished"></translation>
+        <translation>កំពុង​​យក​ឯកសារ​ច�ញ​...</translation>
     </message>
     <message>
         <source>Exporting Appliance ...</source>
-        <translation type="unfinished"></translation>
+        <translation>កំពុង​នាំច�ញ​ឧបករណ�...</translation>
     </message>
     <message>
         <source>Appliance Export Wizard</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នក​ជំនួយការ​នាំច�ញ​ឧបករណ�</translation>
     </message>
     <message>
         <source>Welcome to the Appliance Export Wizard!</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្វា​គមន�​មក​​កាន់​អ្នក​​ជំនួយ​ការ​នាំ​ច�ញ​ឧបករណ�​ !</translation>
     </message>
     <message>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -1185,79 +1057,85 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This wizard will guide you through the process of exporting an appliance. &lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Use the &lt;span style=&quot; font-weight:600;&quot;&gt;Next&lt;/span&gt; button to go the next page of the wizard and the &lt;span style=&quot; font-weight:600;&quot;&gt;Back&lt;/span&gt; button to return to the previous page.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Please select the virtual machines that you wish to the appliance. You can select more than one. Please note that these machines have to be turned off before they can be exported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;អ្នក​ជំនួយ​កា​រន�ះ​នឹង​នាំអ្នក​�ាមរយៈ​ដំណើរការ​នាំច�ញ​ឧបករណ� ។&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ប្រើ​ប៊ូ�ុង &lt;span style=&quot; font-weight:600;&quot;&gt;បន្ទាប់&lt;/span&gt; ដើម្បី​ទៅ​កាន់​ទំព�រ​បន្ទាប់​របស់​អ្នក​ជំនួយ​ការ​ ហើយ​ប៊ូ�ុង &lt;span style=&quot; font-weight:600;&quot;&gt;�យក្រោយ&lt;/span&gt; ដើម្បី​�្រឡប់​ទៅ​ទំព�រ​មុន ។&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;សូម​ជ្រើស​ម៉ាស៊ីន​និម្មិ� ដែល​អ្នក​ចង់បាន​ឧបករណ� ។ អ្នក​អាចជ្រើស​ច្រើនជាង​មួយ​បាន ។ សូម​ចំណាំ�ា ម៉ាស៊ីន​ទាំង​ន�ះ​�្រូវ​�ែ​បិទ មុន​នឹង​ពួកវា​អាច​�្រូវ​បាន​នាំច�ញ ។&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>&lt; &amp;Back</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;�យ​ក្រោយ​</translation>
     </message>
     <message>
         <source>&amp;Next &gt;</source>
-        <translation type="unfinished">បន្ទាប់ &gt;</translation>
+        <translation>បន្ទាប់&gt;</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>បោះបង់​</translation>
     </message>
     <message>
         <source>Appliance Export Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>​កំណ�់​ការ​នាំ​ច�ញ​ឧបករណ�​</translation>
     </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="unfinished"></translation>
+        <translation>នៅ​ទី​ន�ះ អ្នក​​អាច​ប្�ូរ​�ម្លៃ​​​កំណ�់​រចនា​សម្ព�ន្ធ​​​បន្�ែម​របស់​​ម៉ាស៊ីន​និម្មិ�​​​ដែល​​បាន​ជ្រើស​ ។ អ្នក​អាច​កែប្រែ​លក្�ណសម្ប�្�ិ​ភាគច្រើន ដែលបាន​បង្ហាញ​ដោយ​ចុច​ទ្វ�រដង​លើ​ធា�ុ ។ ។</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ារ​​លំនាំ​ដើម</translation>
     </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="unfinished"></translation>
+        <translation>សូម​បញ្ជាក់​គោល​ដៅ​សម្រាប់​នាំ​ច�ញ​​ OVF ។ អ្នក​អាច​ជ្រើស​​រវាង​​ការ​នាំ​ច�ញ​ប្រព�ន្ធ​ឯកសារ​មូល​ដ្ឋាន​​ ការ​ផ្ទុក​ OVF ឡើង​ទៅ​​កាន់​ Sun អាច​ជា​​ស�វា​ ឬម៉ា​ស៊ីន​បម្រើ​ផ្ទុក S3 ។</translation>
     </message>
     <message>
         <source>&amp;Local Filesystem </source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រព�ន្ធ​ឯកសារ​មូលដ្ឋាន ​</translation>
     </message>
     <message>
         <source>Sun &amp;Cloud</source>
-        <translation type="unfinished"></translation>
+        <translation>ពពក​របស់ Sun</translation>
     </message>
     <message>
         <source>&amp;Simple Storage System (S3)</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រព�ន្ធ​ផ្ទុក​ធម្ម�ា (S3)</translation>
     </message>
     <message>
         <source>&amp;Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>ឈ្មោះ​អ្នក​ប្រើ​ ៖</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>ពាក្យ​សម្ងា�់​ ៖</translation>
     </message>
     <message>
         <source>&amp;File:</source>
-        <translation type="unfinished"></translation>
+        <translation>ឯកសារ​ ៖</translation>
     </message>
     <message>
         <source>&amp;Bucket:</source>
-        <translation type="unfinished"></translation>
+        <translation>ធុង​ ៖</translation>
     </message>
     <message>
         <source>&amp;Hostname:</source>
-        <translation type="unfinished"></translation>
+        <translation>ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
     </message>
     <message>
         <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source>
-        <translation type="unfinished"></translation>
+        <translation>សរ​ស�រ​ក្នុង​​ទ្រង់​ទ្រាយ​ OVF 0.9 ​ចាស់ៗ​ សម្រាប់​ភាព​ឆប​គ្នា​ជាមួយផលិ�​ផលនិម្មិ�​ផ្ស�ង​ទៀ�​ ។</translation>
     </message>
     <message>
         <source>&amp;Write legacy OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>ស�រ​ស�រ​ OVF 0.9 ចាស់ៗ</translation>
     </message>
     <message>
         <source>&amp;Export &gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>នាំ​ច�ញ&gt;</translation>
     </message>
 </context>
 <context>
@@ -1343,7 +1221,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Network</source>
-        <translation type="unfinished">បណ្ដាញ</translation>
+        <translation>បណ្ដាញ</translation>
     </message>
 </context>
 <context>
@@ -1382,15 +1260,15 @@ 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="unfinished"></translation>
+        <translation>នៅព�លបានគូស​ធីក រូប​�ំណាង​ចូលផែ​នឹង​ជះឥទ្ធិពល​លើ​មា�ិកា​បង្អួច​ VM នៅ​ក្នុង realtime ។</translation>
     </message>
     <message>
         <source>&amp;Dock Icon Realtime Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>មើល​រូប�ំណាង​ចូលផែ Realtime ជា​មុន</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
+        <translation>បង្ហាញ​ច�​ដោយ​ស្វ�យ​ប្រវ�្�ិ​ និងរបារ​ម៉ឺនុយ​​អ�ក្រង់​ព�ញ​</translation>
     </message>
 </context>
 <context>
@@ -1460,251 +1338,340 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Author</source>
-        <translation>អ្នកបកប្រែ</translation>
+        <translation>អ្នកនិពន្ធ</translation>
     </message>
     <message>
         <source>Author(s):</source>
-        <translation>យុ�្កា ៖</translation>
+        <translation>អ្នកនិពន្ធ ៖</translation>
     </message>
 </context>
 <context>
     <name>VBoxGLSettingsNetwork</name>
     <message>
         <source>%1 network</source>
-        <comment>&lt;adapter name&gt; network</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+&lt;adapter name&gt; network</comment>
+        <translation type="obsolete">%1 បណ្ដាញ</translation>
     </message>
     <message>
         <source>host IPv4 address of &lt;b&gt;%1&lt;/b&gt; is wrong</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយដ្ឋាន IPv4 ម៉ាស៊ីន​របស់ &lt;b&gt;%1&lt;/b&gt; មិន​�្រឹម�្រូវ</translation>
     </message>
     <message>
         <source>host IPv4 network mask of &lt;b&gt;%1&lt;/b&gt; is wrong</source>
-        <translation type="unfinished"></translation>
+        <translation>របាំង​បណ្ដាញ​ម៉ាស៊ីន IPv4 របស់ &lt;b&gt;%1&lt;/b&gt; មិន​�្រឹម�្រូវទ�</translation>
     </message>
     <message>
         <source>host IPv6 address of &lt;b&gt;%1&lt;/b&gt; is wrong</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយដ្ឋាន​ម៉ាស៊ីន IPv6 របស់ &lt;b&gt;%1&lt;/b&gt; មិន​�្រឹម�្រូវ​ទ�</translation>
     </message>
     <message>
         <source>DHCP server address of &lt;b&gt;%1&lt;/b&gt; is wrong</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ DHCP របស់&lt;b&gt;%1&lt;/b&gt; មិន​�្រឹម�្រូវ​ទ�</translation>
     </message>
     <message>
         <source>DHCP server network mask of &lt;b&gt;%1&lt;/b&gt; is wrong</source>
-        <translation type="unfinished"></translation>
+        <translation>របាំង​បណ្ដាញ​ម៉ាស៊ីន​បម្រើ DHCP​ របស់&lt;b&gt;%1&lt;/b&gt; មិន​�្រឹម�្រូវទ�</translation>
     </message>
     <message>
         <source>DHCP lower address bound of &lt;b&gt;%1&lt;/b&gt; is wrong</source>
-        <translation type="unfinished"></translation>
+        <translation>ដែន​អាសយដ្ឋាន​ទាប​របស់ DHCP នៃ&lt;b&gt;%1&lt;/b&gt; មិន​�្រឹម�្រូវ​ទ�</translation>
     </message>
     <message>
         <source>DHCP upper address bound of &lt;b&gt;%1&lt;/b&gt; is wrong</source>
-        <translation type="unfinished"></translation>
+        <translation>ដែន​អាសយដ្ឋាន​�្ពស់​របស់ DHCP នៃ&lt;b&gt;%1&lt;/b&gt; មិន​�្រឹម�្រូវ​ទ�</translation>
     </message>
     <message>
         <source>Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>អាដាប់​ទ�រ</translation>
     </message>
     <message>
         <source>Automatically configured</source>
-        <comment>interface</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+interface</comment>
+        <translation type="obsolete">បាន​កំណ�់​រចនាសម្ព�ន្ធ​ដោយ​ស្វ�យ​ប្រវ�្�ិ</translation>
     </message>
     <message>
         <source>Manually configured</source>
-        <comment>interface</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+interface</comment>
+        <translation type="obsolete">បាន​កំណ�់​រចនា​សម្ព�ន្ធ​​ដោយ​ដៃ​</translation>
     </message>
     <message>
         <source>IPv4 Address</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយ​ដ្ឋាន IPv4​</translation>
     </message>
     <message>
         <source>Not set</source>
-        <comment>address</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+address</comment>
+        <translation type="obsolete">មិន​បាន​​កំណ�់​</translation>
     </message>
     <message>
         <source>IPv4 Network Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>របាំង​បណ្�ាញ​ IPv4</translation>
     </message>
     <message>
         <source>Not set</source>
-        <comment>mask</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+mask</comment>
+        <translation type="obsolete">មិនបាន​​កំណ�់​</translation>
     </message>
     <message>
         <source>IPv6 Address</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយ​ដ្ឋាន​ IPv6</translation>
     </message>
     <message>
         <source>IPv6 Network Mask Length</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រវែង​របាំង​បណ្�ាញ​ IPv6</translation>
     </message>
     <message>
         <source>Not set</source>
-        <comment>length</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+length</comment>
+        <translation type="obsolete">មិន​បាន​​កំណ�់​</translation>
     </message>
     <message>
         <source>DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation>ម៉ាស៊ីន​បម្រើ​ DHCP</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>server</comment>
-        <translation type="unfinished">បានបើក</translation>
+        <comment>
+
+
+
+server</comment>
+        <translation type="obsolete">បាន​បើក</translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>server</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+server</comment>
+        <translation type="obsolete">​បាន​បើក</translation>
     </message>
     <message>
         <source>Address</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយដ្ឋាន​</translation>
     </message>
     <message>
         <source>Network Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>របាំង​បណ្�ាញ​</translation>
     </message>
     <message>
         <source>Lower Bound</source>
-        <translation type="unfinished"></translation>
+        <translation>ព្រំ​ដែន​ទាប​​</translation>
     </message>
     <message>
         <source>Not set</source>
-        <comment>bound</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+bound</comment>
+        <translation type="obsolete">មិន​បាន​កំណ�់​</translation>
     </message>
     <message>
         <source>Upper Bound</source>
-        <translation type="unfinished"></translation>
+        <translation>ព្រំ​ដែន​�្ពស់​</translation>
     </message>
     <message>
         <source>&amp;Add host-only network</source>
-        <translation type="unfinished"></translation>
+        <translation>សម្រាប់​�ែ​បណ្ដាញ​ម៉ាស៊ីនប៉ុណ្ណោះ</translation>
     </message>
     <message>
         <source>&amp;Remove host-only network</source>
-        <translation type="unfinished"></translation>
+        <translation>យក​បណ្ដាញ​ម៉ាស៊ីន​ច�ញ​ប៉ុណ្ណោះ</translation>
     </message>
     <message>
         <source>&amp;Edit host-only network</source>
-        <translation type="unfinished"></translation>
+        <translation>កែសម្រួល​បណ្ដាញម៉ាស៊ីន​ប៉ុណ្ណោះ​</translation>
     </message>
     <message>
         <source>Performing</source>
-        <comment>creating/removing host-only network</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+creating/removing host-only network</comment>
+        <translation type="obsolete">ការ​អនុវ�្�​</translation>
     </message>
     <message>
         <source>&amp;Host-only Networks:</source>
-        <translation type="unfinished"></translation>
+        <translation>បណ្ដាញ​ម៉ាស៊ីន​ប៉ុណ្ណោះ ៖</translation>
     </message>
     <message>
         <source>Lists all available host-only networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>រាយ​បណ្ដាញ​ម៉ាស៊ីន​ដែលអាច​ប្រើបាន ។</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">ឈ្មោះ</translation>
+        <translation>ឈ្មោះ</translation>
+    </message>
+    <message>
+        <source>%1 network</source>
+        <comment>&lt;adapter name&gt; network</comment>
+        <translation type="unfinished">%1 បណ្ដាញ</translation>
+    </message>
+    <message>
+        <source>Automatically configured</source>
+        <comment>interface</comment>
+        <translation type="unfinished">បាន​កំណ�់​រចនាសម្ព�ន្ធ​ដោយ​ស្វ�យ​ប្រវ�្�ិ</translation>
+    </message>
+    <message>
+        <source>Manually configured</source>
+        <comment>interface</comment>
+        <translation type="unfinished">បាន​កំណ�់​រចនា​សម្ព�ន្ធ​​ដោយ​ដៃ​</translation>
+    </message>
+    <message>
+        <source>Not set</source>
+        <comment>address</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not set</source>
+        <comment>mask</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not set</source>
+        <comment>length</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>server</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>server</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not set</source>
+        <comment>bound</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Performing</source>
+        <comment>creating/removing host-only network</comment>
+        <translation type="unfinished">ការ​អនុវ�្�​</translation>
     </message>
 </context>
 <context>
     <name>VBoxGLSettingsNetworkDetails</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>ស�ច​ក្�ី​លម្អិ�​បណ្�ាញ​​ម៉ាស៊ីន​</translation>
     </message>
     <message>
         <source>&amp;Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>អាដាប់ទ�រ</translation>
     </message>
     <message>
         <source>Manual &amp;Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>ការ​កំណ�់​រចនា​សម្ព�ន្ធ​ដោយ​ដៃ​</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រើ​ការ​កំណ�់​រចនា​សម្ព�ន្ធ​​ដោយ​ដៃ ​សម្រាប់​​​អាដាប់​ទ�រ​​បណ្�ាញ​ម៉ាស៊ីន​​-�ែ​​មួយ​ន�ះ​ ។</translation>
     </message>
     <message>
         <source>&amp;IPv4 Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>អា​សយ​ដ្ឋាន​ IPv4 ៖</translation>
     </message>
     <message>
         <source>Displays the host IPv4 address for this adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​អា​សយ​ដ្ឋាន​​ម៉ាស៊ីន​ IPv4 សម្រាប់​​អាដាប់​ទ�រ​​ន�ះ​ ។</translation>
     </message>
     <message>
         <source>IPv4 Network &amp;Mask:</source>
-        <translation type="unfinished"></translation>
+        <translation>របាំង​បណ្�ាញ​ IPv4 ៖</translation>
     </message>
     <message>
         <source>Displays the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​របាំង​បណ្�ាញ​ម៉ាស៊ីន​ IPv4 សម្រាប់​អាដាប់​ទ�រ​ន�ះ​ ។</translation>
     </message>
     <message>
         <source>I&amp;Pv6 Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយដ្ឋាន​ IPv6 ៖</translation>
     </message>
     <message>
         <source>Displays the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​​អា​សយដ្ឋាន​ម៉ាស៊ីន​ IPv6 សម្រាប់​​អាដាប់​ទ�រ​​ន�ះ ​ប្រ​សិន​បើ​​ IPv6 �្រូវ​បាន​គាំ​ទ្រ ។</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &amp;Length:</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រ​វែង​របាំង​បណ្�ាញ​ IPv6 ៖</translation>
     </message>
     <message>
         <source>Displays the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​ប្រ​វែង​​បុព្វបទ​របាំង​បណ្�ាញ​ម៉ាស៊ីន​ IPv6​ សម្រាប់​​អាដាប់​ទ�រ​​ន�ះ ​ប្រ​សិន​បើ​ IPv6 �្រូវ​បាន​គាំ​ទ្រ​ ។</translation>
     </message>
     <message>
         <source>&amp;DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation>ម៉ាស៊ីន​បម្រើ​ DHCP</translation>
     </message>
     <message>
         <source>&amp;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>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​​�ា​�ើ​ម៉ា​ស៊ីន​បម្រើ​​ DHCP �្រូវ​បាន​បើក​នៅព�ល​ចាប់ផ្ដើម​ដែរ​ឬទ� ។</translation>
     </message>
     <message>
         <source>Server Add&amp;ress:</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ​ ៖</translation>
     </message>
     <message>
         <source>Displays the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​អាសយដ្ឋាន​បម្រើ​ម៉ាស៊ីន​​របស់​ DHCP ដែល​ភ្ជាប់​​បណ្�ាញ​ជាមួយ​កម្ម​វិធី​សម្រួល​​ម៉ាស៊ីន​​-�ែ​មួយន�ះ​​ ។</translation>
     </message>
     <message>
         <source>Server &amp;Mask:</source>
-        <translation type="unfinished"></translation>
+        <translation>របាំង​ម៉ា​ស៊ីនបម្រើ​ ៖</translation>
     </message>
     <message>
         <source>Displays the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​របាំង​បណ្�ាញ​​ស�វា​​បម្រើ​ម៉ា​ស៊ីន​របស់​ DHCP ដែល​ភ្ជាប់​​​ជា​មួយ​កម្ម​វិធី​សម្រួល​ម៉ា​ស៊ីន​​-​�ែ​មួយ​ន�ះ​ ។</translation>
     </message>
     <message>
         <source>&amp;Lower Address Bound:</source>
-        <translation type="unfinished"></translation>
+        <translation>ព្រំ​ដែន​អា​សយ​ដ្ឋាន​ទាប​ ៖</translation>
     </message>
     <message>
         <source>Displays the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​ព្រំដែន​អាសយដ្ឋានទាប​ដែល​បានផ្ដល់ដោយ​ស�វា​ម៉ាស៊ីន​បម្រើ DHCP ដែល​បានភ្ជាប់​ជា​មួយនឹងកម្មវិធី​សម្រួល​ម៉ាស៊ីន​ ។</translation>
     </message>
     <message>
         <source>&amp;Upper Address Bound:</source>
-        <translation type="unfinished"></translation>
+        <translation>ព្រំដែន​អា​សយដ្ឋាន�្ពស់​ ៖</translation>
     </message>
     <message>
         <source>Displays the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​ព្រំដែន​អាសយដ្ឋាន​�្ពស់​ដែលបានផ្ដល់​ដោយ​ម៉ាស៊ីន​បម្រើ DHCP ដោយ​ផ្ដល់​ស�វា​បណ្ដាញ​ភ្ជាប់​ជា​មួយ​នឹង​អាដាប់ទ�រ​ម៉ាស៊ីន​ ។</translation>
     </message>
 </context>
 <context>
@@ -1731,31 +1698,31 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Check for:</source>
-        <translation type="unfinished"></translation>
+        <translation>ពិនិ�្យ​មើល ៖</translation>
     </message>
     <message>
         <source>&lt;p&gt;Choose this if you only wish to be notified about stable updates to VirtualBox.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ជ្រើសវា​ ប្រសិនបើ​អ្នក​ចង់​ឲ្យ​ជូន​ដំណឹង​អំពី​ភាព​ទាន់សម�យ​ស្�ិ�ស្��រ​ដល់ VirtualBox ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Stable release versions</source>
-        <translation type="unfinished"></translation>
+        <translation>កំណែ​ច�ញ​ផ្សាយ​ស្�ិ�ស្��រ​</translation>
     </message>
     <message>
         <source>&lt;p&gt;Choose this if you wish to be notified about all new VirtualBox releases.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ជ្រើសវា​ ប្រសិន​បើ​អ្នក​ចង់​ឲ្យ​ជូន​ដំណឹង​អំពី​ការ​ច�ញផ្សាយ​ VirtualBox �្មី ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;All new releases</source>
-        <translation type="unfinished"></translation>
+        <translation>ការ​ច�ញផ្សាយ​�្មី​ទាំងអស់​</translation>
     </message>
     <message>
         <source>&lt;p&gt;Choose this to be notified about all new VirtualBox releases and pre-release versions of VirtualBox.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ជ្រើស​វាដើម្បី​ឲ្យ​ជូន​ដំណឹង​អំពី​​កំណែ​​ច�ញផ្សាយ​​​របស់ VirtualBox និង​និងច�ញ​ផ្សាយ​មុន​របស់ VirtualBox ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>All new releases and &amp;pre-releases</source>
-        <translation type="unfinished"></translation>
+        <translation>ការ​ច�ញ​ផ្សាយ​�្មី និង​ច�ញ​ផ្សាយ​មុន​ទាំងអស់</translation>
     </message>
 </context>
 <context>
@@ -1796,11 +1763,6 @@ p, li { white-space: pre-wrap; }
         <translation>ស�ិ​មូលដ្ឋាន</translation>
     </message>
     <message>
-        <source>&lt;nobr&gt;%3 MB&lt;/nobr&gt;</source>
-        <comment>details report</comment>
-        <translation type="obsolete">&lt;nobr&gt;%3 ម�កាបៃ&lt;/nobr&gt;</translation>
-    </message>
-    <message>
         <source>General</source>
         <comment>details report</comment>
         <translation>ទូទៅ</translation>
@@ -1811,11 +1773,6 @@ p, li { white-space: pre-wrap; }
         <translation>ស�ិ​វីដ�អូ</translation>
     </message>
     <message>
-        <source>&lt;nobr&gt;%4 MB&lt;/nobr&gt;</source>
-        <comment>details report</comment>
-        <translation type="obsolete">&lt;nobr&gt;%4 ម�កាបៃ&lt;/nobr&gt;</translation>
-    </message>
-    <message>
         <source>Boot Order</source>
         <comment>details report</comment>
         <translation>លំដាប់​ចាប់ផ្ដើម</translation>
@@ -1831,16 +1788,6 @@ p, li { white-space: pre-wrap; }
         <translation>IO APIC</translation>
     </message>
     <message>
-        <source>Not Attached</source>
-        <comment>details report (HDDs)</comment>
-        <translation type="obsolete">មិន​បានភ្ជាប់</translation>
-    </message>
-    <message>
-        <source>Hard Disks</source>
-        <comment>details report</comment>
-        <translation type="obsolete">�ាសរឹង</translation>
-    </message>
-    <message>
         <source>Enabled</source>
         <comment>details report (ACPI)</comment>
         <translation>បានបើក</translation>
@@ -1861,46 +1808,6 @@ p, li { white-space: pre-wrap; }
         <translation>បាន​បិទ</translation>
     </message>
     <message>
-        <source>Not mounted</source>
-        <comment>details report (floppy)</comment>
-        <translation type="obsolete">មិនបានម៉ោនទ�</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <comment>details report (floppy)</comment>
-        <translation type="obsolete">រូបភាព</translation>
-    </message>
-    <message>
-        <source>Host Drive</source>
-        <comment>details report (floppy)</comment>
-        <translation type="obsolete">ដ្រាយ​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
-        <source>Floppy</source>
-        <comment>details report</comment>
-        <translation type="obsolete">�ាសទន់</translation>
-    </message>
-    <message>
-        <source>Not mounted</source>
-        <comment>details report (DVD)</comment>
-        <translation type="obsolete">មិនបានម៉ោនទ�</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <comment>details report (DVD)</comment>
-        <translation type="obsolete">រូបភាព</translation>
-    </message>
-    <message>
-        <source>Host Drive</source>
-        <comment>details report (DVD)</comment>
-        <translation type="obsolete">ដ្រាយ​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
-        <source>CD/DVD-ROM</source>
-        <comment>details report</comment>
-        <translation type="obsolete">ស៊ីឌី/ឌីវីឌីរ៉ូម</translation>
-    </message>
-    <message>
         <source>Disabled</source>
         <comment>details report (audio)</comment>
         <translation>បានបិទ</translation>
@@ -1941,30 +1848,6 @@ p, li { white-space: pre-wrap; }
         <translation>បានបិទ</translation>
     </message>
     <message>
-        <source>VRDP Server Port</source>
-        <comment>details report (VRDP)</comment>
-        <translation type="obsolete">ច្រក​ម៉ាស៊ីនបម្រើ VRDP</translation>
-    </message>
-    <message>
-        <source>%1</source>
-        <comment>details report (VRDP)</comment>
-        <translation type="obsolete">%1</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (VRDP)</comment>
-        <translation type="obsolete">បានបិទ</translation>
-    </message>
-    <message>
-        <source>Remote Display</source>
-        <comment>details report</comment>
-        <translation type="obsolete">បង្ហាញ​ពី​ចម្ងាយ</translation>
-    </message>
-    <message>
-        <source>Opening URLs is not implemented yet.</source>
-        <translation type="obsolete">បើក​ URLs ដែល​មិន�្រូវ​បាន​អនុវ�្�​នៅ​ឡើយ​ទ� ។</translation>
-    </message>
-    <message>
         <source>Powered Off</source>
         <comment>MachineState</comment>
         <translation>បិទ</translation>
@@ -2010,11 +1893,6 @@ p, li { white-space: pre-wrap; }
         <translation>ស្ដារឡើងវិញ</translation>
     </message>
     <message>
-        <source>Discarding</source>
-        <comment>MachineState</comment>
-        <translation type="obsolete">បដិស�ធ</translation>
-    </message>
-    <message>
         <source>Closed</source>
         <comment>SessionState</comment>
         <translation>បានបិទ</translation>
@@ -2140,11 +2018,6 @@ p, li { white-space: pre-wrap; }
         <translation>NAT</translation>
     </message>
     <message>
-        <source>Host Interface</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="obsolete">ចំណុច​ប្រទាក់​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
         <source>Internal Network</source>
         <comment>NetworkAttachmentType</comment>
         <translation>បណ្ដាញ​អ៊ីនធឺណិ�</translation>
@@ -2200,14 +2073,6 @@ p, li { white-space: pre-wrap; }
         <translation>ទ្វ�ទិស</translation>
     </message>
     <message>
-        <source>Select a directory</source>
-        <translation type="obsolete">ជ្រើស​��</translation>
-    </message>
-    <message>
-        <source>Select a file</source>
-        <translation type="obsolete">ជ្រើស​ឯកសារ</translation>
-    </message>
-    <message>
         <source>Port %1</source>
         <comment>details report (serial ports)</comment>
         <translation>ច្រក %1</translation>
@@ -2233,11 +2098,6 @@ p, li { white-space: pre-wrap; }
         <translation>��​ដែល​បានចែករំលែក</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>គ្មាន</translation>
@@ -2248,11 +2108,6 @@ p, li { white-space: pre-wrap; }
         <translation>��​ដែលបានចែករំលែក</translation>
     </message>
     <message>
-        <source>Stuck</source>
-        <comment>MachineState</comment>
-        <translation type="obsolete">គាំង</translation>
-    </message>
-    <message>
         <source>Disconnected</source>
         <comment>PortMode</comment>
         <translation>បានផ្ដាច់</translation>
@@ -2408,16 +2263,6 @@ p, li { white-space: pre-wrap; }
         <translation>Intel PRO/1000 MT Desktop (82540EM)</translation>
     </message>
     <message>
-        <source>PIIX3</source>
-        <comment>IDEControllerType</comment>
-        <translation type="obsolete">PIIX3</translation>
-    </message>
-    <message>
-        <source>PIIX4</source>
-        <comment>IDEControllerType</comment>
-        <translation type="obsolete">PIIX4</translation>
-    </message>
-    <message>
         <source>Intel PRO/1000 T Server (82543GC)</source>
         <comment>NetworkAdapterType</comment>
         <translation>Intel PRO/1000 T Server (82543GC)</translation>
@@ -2463,51 +2308,11 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;nobr&gt;ស្�ានភាព ៖ %1&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <source>host interface, %1</source>
-        <comment>details report (network)</comment>
-        <translation type="obsolete">ចំណុច​ប្រទាក់​ម៉ាស៊ីន %1</translation>
-    </message>
-    <message>
-        <source>internal network, &apos;%1&apos;</source>
-        <comment>details report (network)</comment>
-        <translation type="obsolete">បណ្ដាញ​�ាង​ក្នុង &apos;%1&apos;</translation>
-    </message>
-    <message>
         <source>Adapter %1</source>
         <comment>network</comment>
         <translation>អាដាប់ទ�រ %1</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;nobr&gt;Type&amp;nbsp;(Format):&amp;nbsp;&amp;nbsp;%2&amp;nbsp;(%3)&lt;/nobr&gt;</source>
-        <comment>hard disk</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;ប្រភ�ទ&amp;nbsp;(ទ្រង់ទ្រាយ) ៖&amp;nbsp;&amp;nbsp;%2&amp;nbsp;(%3)&lt;/nobr&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;nobr&gt;Attached to:&amp;nbsp;&amp;nbsp;%1&lt;/nobr&gt;</source>
-        <comment>medium</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;nobr&gt;បាន​ភ្ជាប់​ទៅ​កាន់ ៖&amp;nbsp;&amp;nbsp;%1&lt;/nobr&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;i&gt;Not&amp;nbsp;Attached&lt;/i&gt;</source>
-        <comment>medium</comment>
-        <translation type="obsolete">&lt;i&gt;មិនបាន​ភ្ជាប់​ទ�&lt;/i&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;i&gt;Checking accessibility...&lt;/i&gt;</source>
-        <comment>medium</comment>
-        <translation type="obsolete">&lt;br&gt;&lt;i&gt;កំពុង​ពិនិ�្យ​មើលភាព​ចូលដំណើរការ​បាន...&lt;/i&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;hr&gt;Failed to check media accessibility.&lt;br&gt;%1.</source>
-        <comment>medium</comment>
-        <translation type="obsolete">&lt;hr&gt;បាន​បរាជ�យ​ក្នុងការ​ពិនិ�្យ​មើល​ភាព​អាច​ចូលដំណើរការ​បាន ។&lt;br&gt;%1 ។</translation>
-    </message>
-    <message>
-        <source>&lt;hr&gt;&lt;img src=%1/&gt;&amp;nbsp;Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
-        <comment>medium</comment>
-        <translation type="obsolete">&lt;hr&gt;&lt;img src=%1/&gt;&amp;nbsp;ការ​ភ្ជាប់​�ាសរឹង​ន�ះ​នឹង​�្រូ​វបាន​អនុវ�្�​ដោយ​ប្រយោល​ដោយ​ប្រើ​�ាសរឹង​ផ្ស�ង​ដែលបាន​បង្កើ� ។</translation>
-    </message>
-    <message>
         <source>Checking...</source>
         <comment>medium</comment>
         <translation>កំពុង​ពិនិ�្យ​មើល...</translation>
@@ -2518,14 +2323,6 @@ p, li { white-space: pre-wrap; }
         <translation>មិនអាច​ចូលដំណើរការ​បាន</translation>
     </message>
     <message>
-        <source>&lt;hr&gt;Some of the media in this hard disk chain are inaccessible. Please use the Virtual Media Manager in &lt;b&gt;Show Differencing Hard Disks&lt;/b&gt; mode to inspect these media.</source>
-        <translation type="obsolete">&lt;hr&gt;ម�ឌៀ​មួយ​ចំនួន​នៅ​ក្នុង​�ាស​រឹង​​មិនអាច​ដំណើរកា​របានទ� ។ សូម​ប្រើ​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ�​នៅ​ក្នុង​របៀប &lt;b&gt;បង្ហាញ​�ាស​រឹង​ផ្ស�ងៗ&lt;/b&gt; ដើម្បី​ពិនិ�្យ​មើល​ម�ឌៀ​ទាំង​នោះ ។</translation>
-    </message>
-    <message>
-        <source>%1&lt;hr&gt;This base hard disk is indirectly attached using the following differencing hard disk:&lt;br&gt;%2%3</source>
-        <translation type="obsolete">%1&lt;hr&gt;�ាសរឹង​មូលដ្ឋាន​ន�ះ​�្រូវ​បានភ្ជាប់​ដោយ​ប្រយោល ដោយ​ប្រើ​�ាសរឹង​ផ្ស�ងៗ​ដូច​�ាងក្រោម ៖&lt;br&gt;%2%3</translation>
-    </message>
-    <message>
         <source>3D Acceleration</source>
         <comment>details report</comment>
         <translation>បង្កើន​ល្បឿន​�្រីមា�្រ</translation>
@@ -2552,357 +2349,910 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished">បានបើក</translation>
+        <comment>
+
+
+
+details report (Nested Paging)</comment>
+        <translation type="obsolete">បានបើក</translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report (Nested Paging)</comment>
+        <translation type="obsolete">​បាន​បើក​</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report</comment>
+        <translation type="obsolete">&lt;nobr&gt;%1 ម�កាបៃ​&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>Processor(s)</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report</comment>
+        <translation type="obsolete">ប្រព�ន្ធ​ដំណើរ​ការ​</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;%1&lt;/nobr&gt;</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report</comment>
+        <translation type="obsolete">&lt;nobr&gt;%1&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="unfinished">ភ�យីង​�ាង​ក្នុង</translation>
+        <comment>
+
+
+
+details report</comment>
+        <translation type="obsolete">Paging �ាង​ក្នុង</translation>
     </message>
     <message>
         <source>System</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report</comment>
+        <translation type="obsolete">ប្រព�ន្ធ</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details report (2D Video Acceleration)</comment>
-        <translation type="unfinished">បានបើក</translation>
+        <comment>
+
+
+
+details report (2D Video Acceleration)</comment>
+        <translation type="obsolete">បានបើក</translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details report (2D Video Acceleration)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report (2D Video Acceleration)</comment>
+        <translation type="obsolete">បាន​បិទ​</translation>
     </message>
     <message>
         <source>2D Video Acceleration</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report</comment>
+        <translation type="obsolete">ការ​បង្កើន​ល្បឿន​វីដ�អូ​​ទ្វ�​មា�្រ</translation>
     </message>
     <message>
         <source>Remote Display Server Port</source>
-        <comment>details report (VRDP Server)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report (VRDP Server)</comment>
+        <translation type="obsolete">ច្រក​ម៉ាស៊ីនបម្រើ​បង្ហាញ​ពី​ចម្ងាយ</translation>
     </message>
     <message>
         <source>Remote Display Server</source>
-        <comment>details report (VRDP Server)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report (VRDP Server)</comment>
+        <translation type="obsolete">ម៉ា​ស៊ីន​បម្រើ​បង្ហាញ​ពី​ចម្ងាយ​</translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details report (VRDP Server)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report (VRDP Server)</comment>
+        <translation type="obsolete">បាន​បិទ</translation>
     </message>
     <message>
         <source>Display</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report</comment>
+        <translation type="obsolete">បង្ហាញ​</translation>
     </message>
     <message>
         <source>Not Attached</source>
-        <comment>details report (Storage)</comment>
-        <translation type="unfinished">មិន​បានភ្ជាប់</translation>
+        <comment>
+
+
+
+details report (Storage)</comment>
+        <translation type="obsolete">មិន​បានភ្ជាប់</translation>
     </message>
     <message>
         <source>Storage</source>
-        <comment>details report</comment>
-        <translation type="unfinished">កា​រផ្ទុក</translation>
+        <comment>
+
+
+
+details report</comment>
+        <translation type="obsolete">ផ្ទុក</translation>
     </message>
     <message>
         <source>Bridged adapter, %1</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report (network)</comment>
+        <translation type="obsolete">​អាដាប់​ទ�រប្រ៊ីដ្យ​​ %1</translation>
     </message>
     <message>
         <source>Internal network, &apos;%1&apos;</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report (network)</comment>
+        <translation type="obsolete">បណ្�ាញ​�ាង​ក្នុង &apos;%1&apos;</translation>
     </message>
     <message>
         <source>Host-only adapter, &apos;%1&apos;</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+details report (network)</comment>
+        <translation type="obsolete">​អាដាប់​ទ�រ​​ ម៉ាស៊ីន​​-​�ែ​មួយ &apos;%1&apos;​</translation>
     </message>
     <message>
         <source>Teleported</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+MachineState</comment>
+        <translation type="obsolete">បញ្ជួន​</translation>
     </message>
     <message>
         <source>Guru Meditation</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+MachineState</comment>
+        <translation type="obsolete">ការ​វិភាគ​រក​ Guru</translation>
     </message>
     <message>
         <source>Teleporting</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+MachineState</comment>
+        <translation type="obsolete">ការ​បញ្ជួន​</translation>
     </message>
     <message>
         <source>Taking Live Snapshot</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+MachineState</comment>
+        <translation type="obsolete">​��រូប​​ផ្ទាល់​</translation>
     </message>
     <message>
         <source>Teleporting Paused VM</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+MachineState</comment>
+        <translation type="obsolete">ការ​បញ្ជូនបានផ្អាក VM</translation>
     </message>
     <message>
         <source>Restoring Snapshot</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+MachineState</comment>
+        <translation type="obsolete">ការ​ស្�ារ​រូប​��​</translation>
     </message>
     <message>
         <source>Deleting Snapshot</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+MachineState</comment>
+        <translation type="obsolete">ការ​លុប​រូប​��​</translation>
     </message>
     <message>
         <source>SCSI</source>
-        <comment>StorageBus</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+StorageBus</comment>
+        <translation type="obsolete">SCSI</translation>
     </message>
     <message>
         <source>Floppy</source>
-        <comment>StorageBus</comment>
-        <translation type="unfinished">�ាសទន់</translation>
+        <comment>
+
+
+
+StorageBus</comment>
+        <translation type="obsolete">�ាទន់</translation>
     </message>
     <message>
         <source>Device %1</source>
-        <comment>StorageBusDevice</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+StorageBusDevice</comment>
+        <translation type="obsolete">ឧបករណ�​​​​ %1</translation>
     </message>
     <message>
         <source>IDE Primary Master</source>
-        <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+New Storage UI : Slot Name</comment>
+        <translation type="obsolete">ម�​ចម្បង​ IDE</translation>
     </message>
     <message>
         <source>IDE Primary Slave</source>
-        <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+New Storage UI : Slot Name</comment>
+        <translation type="obsolete">កូន​ចៅ​ចម្បង​ IDE</translation>
     </message>
     <message>
         <source>IDE Secondary Master</source>
-        <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+New Storage UI : Slot Name</comment>
+        <translation type="obsolete">ម�​រង IDE​</translation>
     </message>
     <message>
         <source>IDE Secondary Slave</source>
-        <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+New Storage UI : Slot Name</comment>
+        <translation type="obsolete">កូន​ចៅ​រង​ IDE</translation>
     </message>
     <message>
         <source>SATA Port %1</source>
-        <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+New Storage UI : Slot Name</comment>
+        <translation type="obsolete">ច្រក SATA​ %1</translation>
     </message>
     <message>
         <source>SCSI Port %1</source>
-        <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+New Storage UI : Slot Name</comment>
+        <translation type="obsolete">ច្រក​ SCSI​ %1</translation>
     </message>
     <message>
         <source>Floppy Device %1</source>
-        <comment>New Storage UI : Slot Name</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+New Storage UI : Slot Name</comment>
+        <translation type="obsolete">ឧបករណ��ា​​ទន់​​ %1</translation>
     </message>
     <message>
         <source>Raw File</source>
-        <comment>PortMode</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+PortMode</comment>
+        <translation type="obsolete">ឯកសារ​ដើម​</translation>
     </message>
     <message>
         <source>Intel PRO/1000 MT Server (82545EM)</source>
-        <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+NetworkAdapterType</comment>
+        <translation type="obsolete">ម៉ាស៊ីន​បម្រើ​ Intel PRO/1000 MT ​(82545EM)</translation>
     </message>
     <message>
         <source>Paravirtualized Network (virtio-net)</source>
-        <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+NetworkAdapterType</comment>
+        <translation type="obsolete">បណ្�ាញ​ Paravirtualized  (virtio-net)</translation>
     </message>
     <message>
         <source>Bridged Adapter</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+NetworkAttachmentType</comment>
+        <translation type="obsolete">អាដាប់​​ទ�រ​​ប្រ៊ីដ្យ​​</translation>
     </message>
     <message>
         <source>Host-only Adapter</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+NetworkAttachmentType</comment>
+        <translation type="obsolete">អាដាប់​ទ�រ​​ម៉ាស៊ីន​​-​�ែ​មួយ​</translation>
     </message>
     <message>
         <source>PIIX3</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished">PIIX3</translation>
+        <comment>
+
+
+
+StorageControllerType</comment>
+        <translation type="obsolete">PIIX3</translation>
     </message>
     <message>
         <source>PIIX4</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished">PIIX4</translation>
+        <comment>
+
+
+
+StorageControllerType</comment>
+        <translation type="obsolete">PIIX4</translation>
     </message>
     <message>
         <source>ICH6</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+StorageControllerType</comment>
+        <translation type="obsolete">ICH6</translation>
     </message>
     <message>
         <source>AHCI</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+StorageControllerType</comment>
+        <translation type="obsolete">AHCI</translation>
     </message>
     <message>
         <source>Lsilogic</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+StorageControllerType</comment>
+        <translation type="obsolete">Lsilogic</translation>
     </message>
     <message>
         <source>BusLogic</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+StorageControllerType</comment>
+        <translation type="obsolete">BusLogic</translation>
     </message>
     <message>
         <source>I82078</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+StorageControllerType</comment>
+        <translation type="obsolete">I82078</translation>
     </message>
     <message>
         <source>Empty</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">ទទ�</translation>
     </message>
     <message>
         <source>Host Drive &apos;%1&apos;</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">ដ្រាយ​ម៉ាស៊ីន​​ &apos;%1&apos;</translation>
     </message>
     <message>
         <source>Host Drive %1 (%2)</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">ដ្រាយ​ម៉ាស៊ីន​​ %1 (%2)</translation>
     </message>
     <message>
         <source>&lt;p style=white-space:pre&gt;Type (Format):  %1 (%2)&lt;/p&gt;</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">&lt;p style=white-space:pre&gt;ប្រភ�ទ​(​ទ្រង់​ទ្រាយ​) ៖ %1 (%2)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Attached to:  %1&lt;/p&gt;</source>
-        <comment>image</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+image</comment>
+        <translation type="obsolete">&lt;p&gt;បាន​​ភ្ជាប់​ទៅ​កាន់ ៖ %1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;i&gt;Not Attached&lt;/i&gt;</source>
-        <comment>image</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+image</comment>
+        <translation type="obsolete">&lt;i&gt;មិន​បានភ្ជាប់&lt;/i&gt;</translation>
     </message>
     <message>
         <source>&lt;i&gt;Checking accessibility...&lt;/i&gt;</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">&lt;i&gt;កំពុង​ពិនិ�្យមើល​​​មធ្យោបាយ​ងាយ​ស្រួល​​...&lt;/i&gt;</translation>
     </message>
     <message>
         <source>Failed to check media accessibility.</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">បានបរាជ�យ​ក្នុងកា​រ​ពិនិ�្យ​មើល​មធ្យោ​បាយ​ងាយ​ស្រួល​​របស់​ម�ឌៀ ។​</translation>
     </message>
     <message>
         <source>&lt;b&gt;No medium selected&lt;/b&gt;</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">&lt;b&gt;គ្មាន​ឧបករណ�​�្រូវ​បាន​ជ្រើស​ទ�&lt;/b&gt;</translation>
     </message>
     <message>
         <source>You can also change this while the machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នក​ក�អាច​ផ្លាស់ប្ដូរ​វា �ណៈព�ល​ដែល​ម៉ាស៊ីន​កំពុង​រ�់ ។</translation>
     </message>
     <message>
         <source>&lt;b&gt;No media available&lt;/b&gt;</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">&lt;b&gt;មិនមាន​ម�ឌៀ​ទ�&lt;/b&gt;</translation>
     </message>
     <message>
         <source>You can create media images using the virtual media manager.</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នក​អាច​បង្កើ�​រូបភាព​ម�ឌៀ ដោយ​ប្រើ​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ� ។</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>
+        <comment>
+
+
+
+
+medium</comment>
+        <translation type="obsolete">ការ​ភ្ជាប់​ជា​មួយ​នឹង​�ាស​រឹង​ន�ះ នឹង​�្រូវ​បាន​អនុវ�្�​ដោយ​ប្រយោល​ ដោយ​ប្រើ​�ាសរឹង​ផ្ស�ង​ដែលបានបង្កើ�​�្មីៗ ។</translation>
     </message>
     <message>
         <source>Some of the media in this hard disk chain are inaccessible. Please use the Virtual Media Manager in &lt;b&gt;Show Differencing Hard Disks&lt;/b&gt; mode to inspect these media.</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+
+
+medium</comment>
+        <translation type="obsolete">ម�ឌៀ​មួយ​ចំនួន​នៅ​ក្នុង​ស្រឡាយ​ផ្នែក​រឹង​ន�ះ​មិនអាច​ចូល​ដំណើរការ​បាន​ទ� ។ សូម​ប្រើ​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ�​នៅ​ក្នុង​របៀប &lt;b&gt;បង្ហាញ​�ាសរឹង​ផ្ស�ងៗ​គ្នា&lt;/b&gt; ដើម្បី​ពិនិ�្យមើល​ម�ឌៀ​ទាំង​ន�ះ ។</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>
+        <comment>
+
+
+
+
+medium</comment>
+        <translation type="obsolete">�ាសរឹង​មូលដ្ឋាន​ន�ះ​�្រូវ​បាន​ភ្ជាប់​ដោយ​ប្រយោល​ ដោយ​ប្រើ​�ាសរឹង​ផ្ស�ង ៖</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>%n ឆ្នាំ</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>%n �ែ</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>%n �្ងៃ</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>%n ម៉ោង</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>%n នាទី​</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n second(s)</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>%n វិនាទី</numerusform>
         </translation>
     </message>
     <message>
         <source>(CD/DVD)</source>
+        <translation>(ស៊ីឌី​/​ឌី​វីឌី​)</translation>
+    </message>
+    <message>
+        <source>Processor(s)</source>
+        <comment>details report</comment>
+        <translation type="unfinished">ប្រព�ន្ធ​ដំណើរ​ការ​</translation>
+    </message>
+    <message>
+        <source>Empty</source>
+        <comment>medium</comment>
+        <translation type="unfinished">ទទ�</translation>
+    </message>
+    <message>
+        <source>Host Drive &apos;%1&apos;</source>
+        <comment>medium</comment>
+        <translation type="unfinished">ដ្រាយ​ម៉ាស៊ីន​​ &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Host Drive %1 (%2)</source>
+        <comment>medium</comment>
+        <translation type="unfinished">ដ្រាយ​ម៉ាស៊ីន​​ %1 (%2)</translation>
+    </message>
+    <message>
+        <source>&lt;p style=white-space:pre&gt;Type (Format):  %1 (%2)&lt;/p&gt;</source>
+        <comment>medium</comment>
+        <translation type="unfinished">&lt;p style=white-space:pre&gt;ប្រភ�ទ​(​ទ្រង់​ទ្រាយ​) ៖ %1 (%2)&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Attached to:  %1&lt;/p&gt;</source>
+        <comment>image</comment>
+        <translation type="unfinished">&lt;p&gt;បាន​​ភ្ជាប់​ទៅ​កាន់ ៖ %1&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;i&gt;Not Attached&lt;/i&gt;</source>
+        <comment>image</comment>
+        <translation type="unfinished">&lt;i&gt;មិន​បានភ្ជាប់&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;i&gt;Checking accessibility...&lt;/i&gt;</source>
+        <comment>medium</comment>
+        <translation type="unfinished">&lt;i&gt;កំពុង​ពិនិ�្យមើល​​​មធ្យោបាយ​ងាយ​ស្រួល​​...&lt;/i&gt;</translation>
+    </message>
+    <message>
+        <source>Failed to check media accessibility.</source>
+        <comment>medium</comment>
+        <translation type="unfinished">បានបរាជ�យ​ក្នុងកា​រ​ពិនិ�្យ​មើល​មធ្យោ​បាយ​ងាយ​ស្រួល​​របស់​ម�ឌៀ ។​</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;No medium selected&lt;/b&gt;</source>
+        <comment>medium</comment>
+        <translation type="unfinished">&lt;b&gt;គ្មាន​ឧបករណ�​�្រូវ​បាន​ជ្រើស​ទ�&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;No media available&lt;/b&gt;</source>
+        <comment>medium</comment>
+        <translation type="unfinished">&lt;b&gt;មិនមាន​ម�ឌៀ​ទ�&lt;/b&gt;</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 media in this hard disk chain are inaccessible. Please use the Virtual Media Manager in &lt;b&gt;Show Differencing Hard Disks&lt;/b&gt; mode to inspect these media.</source>
+        <comment>medium</comment>
+        <translation type="unfinished">ម�ឌៀ​មួយ​ចំនួន​នៅ​ក្នុង​ស្រឡាយ​ផ្នែក​រឹង​ន�ះ​មិនអាច​ចូល​ដំណើរការ​បាន​ទ� ។ សូម​ប្រើ​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ�​នៅ​ក្នុង​របៀប &lt;b&gt;បង្ហាញ​�ាសរឹង​ផ្ស�ងៗ​គ្នា&lt;/b&gt; ដើម្បី​ពិនិ�្យមើល​ម�ឌៀ​ទាំង​ន�ះ ។</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>Enabled</source>
+        <comment>details report (Nested Paging)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (Nested Paging)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display Server Port</source>
+        <comment>details report (VRDP Server)</comment>
+        <translation type="unfinished">ច្រក​ម៉ាស៊ីនបម្រើ​បង្ហាញ​ពី​ចម្ងាយ</translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
+        <comment>details report</comment>
+        <translation type="unfinished">&lt;nobr&gt;%1 ម�កាបៃ​&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;%1&lt;/nobr&gt;</source>
+        <comment>details report</comment>
+        <translation type="unfinished">&lt;nobr&gt;%1&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>System</source>
+        <comment>details report</comment>
+        <translation type="unfinished">ប្រព�ន្ធ</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>details report (2D Video Acceleration)</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (2D Video Acceleration)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2D Video Acceleration</source>
+        <comment>details report</comment>
+        <translation type="unfinished">ការ​បង្កើន​ល្បឿន​វីដ�អូ​​ទ្វ�​មា�្រ</translation>
+    </message>
+    <message>
+        <source>Remote Display Server</source>
+        <comment>details report (VRDP Server)</comment>
+        <translation type="unfinished">ម៉ា​ស៊ីន​បម្រើ​បង្ហាញ​ពី​ចម្ងាយ​</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (VRDP Server)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <comment>details report</comment>
+        <translation type="unfinished">បង្ហាញ​</translation>
+    </message>
+    <message>
+        <source>Not Attached</source>
+        <comment>details report (Storage)</comment>
+        <translation type="unfinished">មិន​បានភ្ជាប់</translation>
+    </message>
+    <message>
+        <source>Storage</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bridged adapter, %1</source>
+        <comment>details report (network)</comment>
+        <translation type="unfinished">​អាដាប់​ទ�រប្រ៊ីដ្យ​​ %1</translation>
+    </message>
+    <message>
+        <source>Internal network, &apos;%1&apos;</source>
+        <comment>details report (network)</comment>
+        <translation type="unfinished">បណ្�ាញ​�ាង​ក្នុង &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Host-only adapter, &apos;%1&apos;</source>
+        <comment>details report (network)</comment>
+        <translation type="unfinished">​អាដាប់​ទ�រ​​ ម៉ាស៊ីន​​-​�ែ​មួយ &apos;%1&apos;​</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">ការ​វិភាគ​រក​ Guru</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">ការ​បញ្ជូនបានផ្អាក VM</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>SCSI</source>
+        <comment>StorageBus</comment>
+        <translation type="unfinished">SCSI</translation>
+    </message>
+    <message>
+        <source>Floppy</source>
+        <comment>StorageBus</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device %1</source>
+        <comment>StorageBusDevice</comment>
+        <translation type="unfinished">ឧបករណ�​​​​ %1</translation>
+    </message>
+    <message>
+        <source>IDE Primary Master</source>
+        <comment>New Storage UI : Slot Name</comment>
+        <translation type="unfinished">ម�​ចម្បង​ IDE</translation>
+    </message>
+    <message>
+        <source>IDE Primary Slave</source>
+        <comment>New Storage UI : Slot Name</comment>
+        <translation type="unfinished">កូន​ចៅ​ចម្បង​ IDE</translation>
+    </message>
+    <message>
+        <source>IDE Secondary Master</source>
+        <comment>New Storage UI : Slot Name</comment>
+        <translation type="unfinished">ម�​រង IDE​</translation>
+    </message>
+    <message>
+        <source>IDE Secondary Slave</source>
+        <comment>New Storage UI : Slot Name</comment>
+        <translation type="unfinished">កូន​ចៅ​រង​ IDE</translation>
+    </message>
+    <message>
+        <source>SATA Port %1</source>
+        <comment>New Storage UI : Slot Name</comment>
+        <translation type="unfinished">ច្រក SATA​ %1</translation>
+    </message>
+    <message>
+        <source>SCSI Port %1</source>
+        <comment>New Storage UI : Slot Name</comment>
+        <translation type="unfinished">ច្រក​ SCSI​ %1</translation>
+    </message>
+    <message>
+        <source>Floppy Device %1</source>
+        <comment>New Storage UI : Slot Name</comment>
+        <translation type="unfinished">ឧបករណ��ា​​ទន់​​ %1</translation>
+    </message>
+    <message>
+        <source>Raw File</source>
+        <comment>PortMode</comment>
+        <translation type="unfinished">ឯកសារ​ដើម​</translation>
+    </message>
+    <message>
+        <source>Intel PRO/1000 MT Server (82545EM)</source>
+        <comment>NetworkAdapterType</comment>
+        <translation type="unfinished">ម៉ាស៊ីន​បម្រើ​ Intel PRO/1000 MT ​(82545EM)</translation>
+    </message>
+    <message>
+        <source>Paravirtualized Network (virtio-net)</source>
+        <comment>NetworkAdapterType</comment>
+        <translation type="unfinished">បណ្�ាញ​ Paravirtualized  (virtio-net)</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>PIIX3</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">PIIX3</translation>
+    </message>
+    <message>
+        <source>PIIX4</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">PIIX4</translation>
+    </message>
+    <message>
+        <source>ICH6</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">ICH6</translation>
+    </message>
+    <message>
+        <source>AHCI</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">AHCI</translation>
+    </message>
+    <message>
+        <source>Lsilogic</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">Lsilogic</translation>
+    </message>
+    <message>
+        <source>BusLogic</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">BusLogic</translation>
+    </message>
+    <message>
+        <source>I82078</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">I82078</translation>
+    </message>
 </context>
 <context>
     <name>VBoxGlobalSettings</name>
@@ -2923,37 +3273,37 @@ p, li { white-space: pre-wrap; }
     <name>VBoxHelpButton</name>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished">ជំនួយ</translation>
+        <translation>ជំនួយ</translation>
     </message>
 </context>
 <context>
     <name>VBoxImportApplianceWgt</name>
     <message>
         <source>Reading Appliance ...</source>
-        <translation type="unfinished"></translation>
+        <translation>កំពុង​អាន​ឧបករណ�​...</translation>
     </message>
     <message>
         <source>Importing Appliance ...</source>
-        <translation type="unfinished"></translation>
+        <translation>កំពុង​នាំ​ចូល​ឧបករណ�​...</translation>
     </message>
 </context>
 <context>
     <name>VBoxImportApplianceWzd</name>
     <message>
         <source>Select an appliance to import</source>
-        <translation type="unfinished"></translation>
+        <translation>ជ្រើស​ឧបករណ�​​ដើម្បី​នាំ​ចូល​</translation>
     </message>
     <message>
         <source>Open Virtualization Format (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Open Virtualization Format (%1)</translation>
     </message>
     <message>
         <source>Appliance Import Wizard</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នក​ជំនួយ​ការ​នាំ​ចូល​ឧបករណ�​</translation>
     </message>
     <message>
         <source>Welcome to the Appliance Import Wizard!</source>
-        <translation type="unfinished"></translation>
+        <translation>សូម​ស្វាគមន�​មក​កាន់​អ្នក​ជំនួយកា​រនាំចូល​ឧបករណ� !</translation>
     </message>
     <message>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -2963,70 +3313,76 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This wizard will guide you through importing an appliance. &lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Use the &lt;span style=&quot; font-weight:600;&quot;&gt;Next&lt;/span&gt; button to go the next page of the wizard and the &lt;span style=&quot; font-weight:600;&quot;&gt;Back&lt;/span&gt; button to return to the previous page.&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;VirtualBox currently supports importing appliances saved in the Open Virtualization Format (OVF). To continue, select the file to import below:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;អ្នក​ជំនួយ​ការ​ន�ះ​នឹង​នាំយក​​�ាម​រយៈ​ការ​នាំចូល​ឧបករណ� ។&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ប្រើ​ប៊ូ�ុង &lt;span style=&quot; font-weight:600;&quot;&gt;បន្ទាប់&lt;/span&gt; ទៅ​ទំព�រ​បន្ទាប់​របស់​អ្នក​ជំនួយ​ការ និងប៊ូ�ុង​ &lt;span style=&quot; font-weight:600;&quot;&gt;�យក្រោយ&lt;/span&gt; ដើម្បី​�្រឡប់​ទៅ​ទំព�រ​មុន ។&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;បច្ចុប្បន្ន VirtualBox គាំទ្រ​ការ​នាំចូល​ឧបករណ� ដែលបាន​រក្សាទុក​នៅ​ក្នុង​ទ្រង់ទ្រាយ Open Virtualization Format (OVF) ។ ដើម្បី​បន្� ជ្រើស​ឯកសារ​​�្រូវ​នាំ​ចូល​�ាង​ក្រោម ៖&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>&lt; &amp;Back</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;�យ​ក្រោយ​</translation>
     </message>
     <message>
         <source>&amp;Next &gt;</source>
-        <translation type="unfinished">បន្ទាប់ &gt;</translation>
+        <translation>បន្ទាប់&gt;</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>បោះបង់​</translation>
     </message>
     <message>
         <source>Appliance Import Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>​កំណ�់​ការ​​នាំ​ចូល​ឧបករណ�​</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>មាន​ម៉ាស៊ីន​និម្មិ�​ដែល​មាន​នៅ​ក្នុង​ឧបករណ�​ និង​ការ​កំណ�់​ដែលបាន​ស្នើ​របស់ម៉ាស៊ីន VirtualBox ដែល​បាននាំចូល ។ អ្នក​អាច​ផ្លាស់ប្ដូរ​លក្�ណសម្ប�្�ិ​ដែលបានបង្ហាញ​ដោយ​ចុច​ទ្វ�ដង​លើ​ធា�ុ និងបិទ​​លក្�ណសម្ប�្�ិ​ផ្ស�ងៗ​ទៀ� ដោយ​ប្រើ​ប្រ​អប់ធីក​�ាង​ក្រោម ។</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ារ​លំនាំដើម</translation>
     </message>
     <message>
         <source>&amp;Import &gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>នាំ​ចូល​​&gt;</translation>
     </message>
 </context>
 <context>
     <name>VBoxImportLicenseViewer</name>
     <message>
         <source>&lt;b&gt;The virtual system &quot;%1&quot; requires that you agree to the terms and conditions of the software license agreement shown below.&lt;/b&gt;&lt;br /&gt;&lt;br /&gt;Click &lt;b&gt;Agree&lt;/b&gt; to continue or click &lt;b&gt;Disagree&lt;/b&gt; to cancel the import.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;ប្រ​ព�ន្ធ​ជាក់​ស្�ែង​របស់​​ &quot;%1&quot; �ម្រូវ​ការ​ដែល​អ្នក​យល់​ព្រមទៅ​កាន់ព�ល​កំណ�់​ និ​ងលក្�​��ណ្នៃអាជ្ញាបណ្ណ​​ផ្នែកទន់​កិច្ច​ព្រម​ព្រៀង​​បង្ហាញ​�ាង​ក្រោម​ ។&lt;/b&gt;&lt;br /&gt;&lt;br /&gt;ចុច​​ &lt;b&gt;យល់​ព្រម​​&lt;/b&gt; ទៅ​បន្�​ ឬ​&lt;b&gt;មិន​យល់​ព្រម​​&lt;/b&gt; ទៅ​​បោះ​បង់​កា​រនាំចូល​ ។</translation>
     </message>
     <message>
         <source>Software License Agreement</source>
-        <translation type="unfinished"></translation>
+        <translation>កិច្ច​ព្រមព្រៀង​អាជ្ញាបណ្ណ​​កម្មវិធី​</translation>
     </message>
     <message>
         <source>&amp;Disagree</source>
-        <translation type="unfinished"></translation>
+        <translation>មិន​យល់ព្រម​</translation>
     </message>
     <message>
         <source>&amp;Agree</source>
-        <translation type="unfinished"></translation>
+        <translation>យល់ព្រម​</translation>
     </message>
     <message>
         <source>&amp;Print...</source>
-        <translation type="unfinished"></translation>
+        <translation>បោះពុម្ព...</translation>
     </message>
     <message>
         <source>&amp;Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>រក្សាទុក...</translation>
     </message>
     <message>
         <source>Text (*.txt)</source>
-        <translation type="unfinished"></translation>
+        <translation>អ�្�បទ​​ (*.txt)</translation>
     </message>
     <message>
         <source>Save license to file...</source>
-        <translation type="unfinished"></translation>
+        <translation>រក្សាទុក​អាជ្ញា​បណ្ណទៅ​ឯកសារ...</translation>
     </message>
 </context>
 <context>
@@ -3048,7 +3404,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxLineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>កែសម្រួល​</translation>
     </message>
 </context>
 <context>
@@ -3095,17 +3451,6 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>VBoxMediaComboBox</name>
-    <message>
-        <source>No media available. Use the Virtual Media Manager to add media of the corresponding type.</source>
-        <translation type="obsolete">រក​មិនឃើញ​ម�ឌៀ ។ ប្រើ​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ� ដើម្បី​បន្�ែម​ម�ឌៀ​ប្រភ�ទ​ដែល​ទាក់ទង ។</translation>
-    </message>
-    <message>
-        <source>&lt;no media&gt;</source>
-        <translation type="obsolete">&lt;គ្មាន​ម�ឌៀ&gt;</translation>
-    </message>
-</context>
-<context>
     <name>VBoxMediaManagerDlg</name>
     <message>
         <source>&amp;Actions</source>
@@ -3242,75 +3587,67 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Attached to</source>
-        <comment>VMM: Virtual Disk</comment>
-        <translation type="unfinished">បាន​ភ្ជាប់​ទៅកាន់</translation>
+        <comment>
+
+
+
+VMM: Virtual Disk</comment>
+        <translation type="obsolete">បាន​ភ្ជាប់​ទៅកាន់</translation>
     </message>
     <message>
         <source>Attached to</source>
-        <comment>VMM: CD/DVD Image</comment>
-        <translation type="unfinished">បាន​ភ្ជាប់​ទៅកាន់</translation>
+        <comment>
+
+
+
+VMM: CD/DVD Image</comment>
+        <translation type="obsolete">បានភ្ជាប់​ទៅ​កាន់</translation>
     </message>
     <message>
         <source>Attached to</source>
-        <comment>VMM: Floppy Image</comment>
-        <translation type="unfinished">បាន​ភ្ជាប់​ទៅកាន់</translation>
+        <comment>
+
+
+
+VMM: Floppy Image</comment>
+        <translation type="obsolete">បាន​ភ្ជាប់​ទៅកាន់</translation>
     </message>
-</context>
-<context>
-    <name>VBoxMiniToolBar</name>
     <message>
-        <source>Always show the toolbar</source>
+        <source>Attached to</source>
+        <comment>VMM: Virtual Disk</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exit Full Screen or Seamless Mode</source>
+        <source>Attached to</source>
+        <comment>VMM: CD/DVD Image</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close VM</source>
+        <source>Attached to</source>
+        <comment>VMM: Floppy Image</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VBoxNIList</name>
-    <message>
-        <source>VirtualBox Host Interface %1</source>
-        <translation type="obsolete">ចំណុច​ប្រទាក់​ម៉ាស៊ីន VirtualBox %1</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Do you want to remove the selected host network interface &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 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.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;�ើ​អ្នកចង់​យក​ចំណុច​ប្រទាក់​បណ្ដាញ​ម៉ាស៊ីន​ដែល​បាន​ជ្រើស​ច�ញ​ពី &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;ឬ?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;ចំណាំ ៖&lt;/b&gt; ចំណុច​ប្រទាក់​ន�ះ​អាច​កំពុង​ប្រើ​ដោយ​អាដាប់ទ�រ​បណ្ដាញ​មួយ ឬ​ច្រើន​ VM ន�ះ ឬ​ផ្ស�ង​ទៀ� ។ បន្ទាប់​ពី​បាន​យកច�ញហើយ អាដាប់ទ�រ​ទាំង​ន�ះ​នឹង​មិន​ដំណើរការ​ទៀ�ទ�​រហូ�​ដល់​អ្នក​កែ​ការ​កំណ�់​របស់​ពួកវា​ដោយ​ជ្រើស​ឈ្មោះ​ចំណុច​ប្រទាក់​ផ្ស�ង ឬ​ប្រភ�ទ​ភ្ជាប់​អាដាប់ទ�រ​ផ្ស�ង ។&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Host &amp;Interfaces</source>
-        <translation type="obsolete">ចំណុច​ប្រទាក់​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
-        <source>Lists all available host interfaces.</source>
-        <translation type="obsolete">រាយ​ចំណុច​ប្រទាក់​ម៉ាស៊ីន​ដែលអាច​ប្រើបានទាំង​អស់ ។</translation>
-    </message>
-    <message>
-        <source>A&amp;dd New Host Interface</source>
-        <translation type="obsolete">បន្�ែម​ចំណុច​ប្រទាក់​ម៉ាស៊ីន​�្មី</translation>
-    </message>
+    <name>VBoxMiniToolBar</name>
     <message>
-        <source>&amp;Remove Selected Host Interface</source>
-        <translation type="obsolete">យក​ចំណុច​ប្រទាក់​ម៉ាស៊ីន​ដែល​បានជ្រើស</translation>
+        <source>Always show the toolbar</source>
+        <translation>​បង្ហាញ​របារ​ឧបករណ�​ជានិច្ច​</translation>
     </message>
     <message>
-        <source>Adds a new host interface.</source>
-        <translation type="obsolete">បន្�ែម​ចំណុច​ប្រទាក់​ម៉ាស៊ីន​�្មី ។</translation>
+        <source>Exit Full Screen or Seamless Mode</source>
+        <translation>ច�ញពី​របៀប​ព�ញ​​អ�​ក្រង់​​ ឬពង្រីក​</translation>
     </message>
     <message>
-        <source>Removes the selected host interface.</source>
-        <translation type="obsolete">យក​ចំណុច​ប្រទាក់​ម៉ាស៊ីន​ដែល​បានជ្រើស ។</translation>
+        <source>Close VM</source>
+        <translation>បិទ VM</translation>
     </message>
 </context>
 <context>
     <name>VBoxNetworkDialog</name>
     <message>
         <source>Network Adapters</source>
-        <translation type="unfinished"></translation>
+        <translation>អាដាប់​ទ�រ​បណ្�ាញ</translation>
     </message>
 </context>
 <context>
@@ -3467,14 +3804,6 @@ p, li { white-space: pre-wrap; }
         <translation>ស�ិ</translation>
     </message>
     <message>
-        <source>N&amp;ew...</source>
-        <translation type="obsolete">�្មី...</translation>
-    </message>
-    <message>
-        <source>E&amp;xisting...</source>
-        <translation type="obsolete">មាន​ស្រាប់...</translation>
-    </message>
-    <message>
         <source>Virtual Hard Disk</source>
         <translation>�ាសរឹង​និម្មិ�</translation>
     </message>
@@ -3557,11 +3886,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&amp;Create new hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្កើ�​�ាស​រឹង​�្មី</translation>
     </message>
     <message>
         <source>&amp;Use existing hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រើ​�ាស​រឹង​ដែល​មាន​ស្រាប់​</translation>
     </message>
 </context>
 <context>
@@ -3575,16 +3904,12 @@ p, li { white-space: pre-wrap; }
         <translation>បង្ហាញ​ក្រុមគ្រួសារ​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ដែល​អ្នក​មានគម្រោង​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិ�​ន�ះ ។</translation>
     </message>
     <message>
-        <source>V&amp;ersion:</source>
-        <translation type="obsolete">កំណែ ៖</translation>
-    </message>
-    <message>
         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
         <translation>បង្ហាញ​ប្រភ�ទ​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិ�​ន�ះ (បាន​ហៅ​ប្រព�ន្ធ​ប្រ�ិប�្�ិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
     </message>
     <message>
         <source>&amp;Version:</source>
-        <translation type="unfinished"></translation>
+        <translation>កំណែ ៖</translation>
     </message>
 </context>
 <context>
@@ -3684,18 +4009,6 @@ p, li { white-space: pre-wrap; }
         <translation>បាន​បរាជ�យ​ក្នុងការ​បោះបង់​ស្�ានភាព​របស់​ម៉ាស៊ីន​និម្មិ�​ដែលបាន​រក្សាទុក &lt;b&gt;%1&lt;/b&gt; ។</translation>
     </message>
     <message>
-        <source>Failed to discard the snapshot &lt;b&gt;%1&lt;/b&gt; of the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
-        <translation type="obsolete">បាន​បរាជ�យ​ក្នុងកា​រ​បោះបង់​រូប�� &lt;b&gt;%1&lt;/b&gt; របស់​ម៉ាស៊ីន​និម្មិ� &lt;b&gt;%2&lt;/b&gt; ។</translation>
-    </message>
-    <message>
-        <source>Failed to discard the current state of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation type="obsolete">បាន​បរាជ�យ​ក្នុងកា​របោះបង់​ស្�ានភាព​បច្ចុប្បន្ន​របស់​ម៉ាស៊ីន​និម្មិ� &lt;b&gt;%1&lt;/b&gt; ។</translation>
-    </message>
-    <message>
-        <source>Failed to discard the current snapshot and the current state of the virtual machine &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation type="obsolete">បានបរាជ�យ​ក្នុងការ​បោះបង់​រូប��​អ�ក្រង់ និង​ស្�ានភាព​បច្ចុប្បន្ន​របស់​ម៉ាស៊ីន​និម្មិ� &lt;b&gt;%1&lt;/b&gt; ។</translation>
-    </message>
-    <message>
         <source>There is no virtual machine named &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>គ្មាន​ម៉ាស៊ីន​និម្មិ�​ដែល​មាន​ឈ្មោះ &lt;b&gt;%1&lt;/b&gt; នោះ​ទ� ។</translation>
     </message>
@@ -3720,10 +4033,6 @@ p, li { white-space: pre-wrap; }
         <translation>បានបរាជ�យ​ក្នុងកា​របើក​សម�យ​សម្រាប់​ម៉ាស៊ីន​និម្មិ� &lt;b&gt;%1&lt;/b&gt; ។</translation>
     </message>
     <message>
-        <source>Failed to create the host network interface &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation type="obsolete">បាន​បរាជ�យ​ក្នុងការ​បង្កើ�​ចំណុច​ប្រទាក់​បណ្ដាញ &lt;b&gt;%1&lt;/b&gt; ។</translation>
-    </message>
-    <message>
         <source>Failed to remove the host network interface &lt;b&gt;%1&lt;/b&gt;.</source>
         <translation>បាន​បរាជ�យ​ក្នុងការ​យក​ចំណុច​ប្រទាក់​បណ្ដាញ​ម៉ាស៊ីន​ &lt;b&gt;%1&lt;/b&gt; ច�ញ ។</translation>
     </message>
@@ -3886,10 +4195,6 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;p&gt;សូមអបអរសាទរ ! អ្នក​បានចុះឈ្មោះ​ជា​អ្នក​ប្រើ VirtualBox ដោយ​ជោគជ�យ​ហើយ ។ &lt;/p&gt;&lt;p&gt;សូម​អរគុណ​ចំពោះ​ការ​ចំណាយ​ព�លវ�លា​បំព�ញ​សំណុំបែបបទ​ចុះឈ្មោះ !&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Failed to register the VirtualBox product&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;បាន​បរាជ�យ​ក្នុងការ​ចុះឈ្មោះ​ផលិ�ផល VirtualBox​&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Failed to save the global VirtualBox settings to &lt;b&gt;&lt;nobr&gt;%1&lt;/nobr&gt;&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;បានបរាជ�យ​ក្នុងកា​ររក្សាទុក​ការ​កំណ�់ VirtualBox សកល​ទៅ​កាន់ &lt;b&gt;&lt;nobr&gt;%1&lt;/nobr&gt;&lt;/b&gt; ។&lt;/p&gt;</translation>
     </message>
@@ -3925,10 +4230,6 @@ p, li { white-space: pre-wrap; }
         <translation>បោះបង់</translation>
     </message>
     <message>
-        <source>&lt;p&gt;There are hard disks attached to SATA ports of this virtual machine. If you disable the SATA controller, all these hard disks will be automatically detached.&lt;/p&gt;&lt;p&gt;Are you sure that you want to disable the SATA controller?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;មាន​�ាសរឹង​បាន​�ភ្ជាប់​ទៅ​ច្រក SATA របស់ម៉ាស៊ីន​និម្មិ�​ន�ះ ។ ប្រសិន​បើ​អ្នក​បិទ​វ�្�ុ​បញ្ជា SATA �ាសរឹង​ទាំង​ន�ះ​នឹង​�្រូវ​បាន​ផ្ដាច់​ដោយ​ស្វ�យ​ប្រវ�្�ិ ។&lt;/p&gt;&lt;p&gt;�ើ​អ្នក​ប្រាកដ​ជា​ចង់​បិទ​វ�្�ុ​បញ្ជា SATA ដែរឬទ� ?&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Disable</source>
         <comment>hard disk</comment>
         <translation>បានបិទ</translation>
@@ -3959,11 +4260,6 @@ p, li { white-space: pre-wrap; }
         <translation>ពិនិ�្យ​មើល</translation>
     </message>
     <message>
-        <source>&amp;Backup</source>
-        <comment>warnAboutAutoConvertedSettings message box</comment>
-        <translation type="obsolete">បម្រុងទុក</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <comment>fullscreen</comment>
         <translation>ប្ដូរ</translation>
@@ -3997,16 +4293,6 @@ p, li { white-space: pre-wrap; }
         <translation>បានបរាជ�យ​ក្នុងកា​រចម្លង​ឯកសារ &lt;b&gt;&lt;nobr&gt;%1&lt;/nobr&gt;&lt;/b&gt; ទៅ &lt;b&gt;&lt;nobr&gt;%2&lt;/nobr&gt;&lt;/b&gt; (%3) ។</translation>
     </message>
     <message>
-        <source>&amp;Create</source>
-        <comment>hard disk</comment>
-        <translation type="obsolete">បង្កើ�</translation>
-    </message>
-    <message>
-        <source>Select</source>
-        <comment>hard disk</comment>
-        <translation type="obsolete">ជ្រើស</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Could not enter seamless mode due to insufficient guest video memory.&lt;/p&gt;&lt;p&gt;You should configure the virtual machine to have at least &lt;b&gt;%1&lt;/b&gt; of video memory.&lt;/p&gt;</source>
         <translation>&lt;p&gt;មិនអាច​ចូល​របៀប​គ្មាន​��រ ដោយសារ​�ែ​ស�ិ​វីដ�អូ​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គ្រប់គ្រាន់ ។&lt;/p&gt;&lt;p&gt;អ្នក​គួរ​កំណ�់​រចនាសម្ព�ន្ធ​ម៉ាស៊ីន​និម្មិ�​យ៉ាង​ហោចណាស់​មានស�ិ​វីដ�អូ &lt;b&gt;%1&lt;/b&gt; ។&lt;/p&gt;</translation>
     </message>
@@ -4143,30 +4429,10 @@ p, li { white-space: pre-wrap; }
         <translation>បាន​បរាជ�យ​ក្នុងការ​លុប​ការ​ផ្ទុក​របស់​�ាសរឹង &lt;b&gt;%1&lt;/b&gt; ។</translation>
     </message>
     <message>
-        <source>&lt;p&gt;There are no unused hard disks available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Create&lt;/b&gt; button to start the &lt;i&gt;New Virtual Disk&lt;/i&gt; wizard and create a new hard disk, or press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Media Manager&lt;/i&gt;.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;មិនមាន​�ាសរឹង​ដែល​មិនបានប្រើទ�​ សម្រាប់​ការ​ភ្ជាប់​ដែល​បាន​បង្កើ�​�្មីៗ ។&lt;/p&gt;&lt;p&gt;ចុច​ប៊ូ�ុង &lt;b&gt;បង្កើ�&lt;/b&gt; ដើម្បី​ចាប់ផ្ដើម​អ្នក​ជំនួយការ &lt;i&gt;�ាស​និម្មិ�​�្មី&lt;/i&gt; ហើយ​បង្កើ�​�ាសរឹង​�្មី ឬ​ចុច​ប៊ូ�ុង &lt;b&gt;ជ្រើស&lt;/b&gt; ដើម្បី​បើក​ &lt;i&gt;កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ�&lt;/i&gt; ហើយ​ជ្រើស​អ្វី​�្រូវ​ធ្វើ ។&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Failed to create the hard disk storage &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;</source>
         <translation>បានបរាជ�យ​ក្នុង​​ការ​បង្កើ�​ការ​ផ្ទុក​�ាសរឹង &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt; ។&lt;/nobr&gt;</translation>
     </message>
     <message>
-        <source>Failed to attach the hard disk &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; to slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="obsolete">បានបរាជ�យក្នុងកា​រភ្ជាប់ &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; ទៅ​រន្ធ &lt;i&gt;%2&lt;/i&gt; របស់​ម៉ាស៊ីន &lt;b&gt;%3&lt;/b&gt; ។</translation>
-    </message>
-    <message>
-        <source>Failed to detach the hard disk &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; from slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="obsolete">បាន​បរាជ�យ​ក្នុងកា​រផ្ដាច់​�ាសរឹង &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; ពី​រន្ធ &lt;i&gt;%2&lt;/i&gt; របស់​ម៉ាស៊ីន &lt;b&gt;%3&lt;/b&gt; ។</translation>
-    </message>
-    <message>
-        <source>Failed to mount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; on the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="obsolete">បាន​បរាជ�យ​ក្នុងកា​រម៉ោន​ %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; ទៅ​ម៉ាស៊ីន &lt;b&gt;%3&lt;/b&gt; ។</translation>
-    </message>
-    <message>
-        <source>Failed to unmount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; from the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="obsolete">បានបរាជ�យ​ក្នុងការ​អាន់ម៉ោន​ %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; ពី​ម៉ាស៊ីន &lt;b&gt;%3&lt;/b&gt; ។</translation>
-    </message>
-    <message>
         <source>Failed to open the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;.</source>
         <translation>បាន​បរាជ�យ​ក្នុងការ​បើក %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; ។</translation>
     </message>
@@ -4191,258 +4457,352 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;p&gt;�ាសរឹង​និម្មិ�​មួយ ឬ​ច្រើន ស៊ីឌី/ឌីវីឌី ឬ​ម�ឌៀ​�ាសទន់​បច្ចុប្បន្ន​មិនអាច​ចូលដំណើរការ​បានទ� ។ ជា​លទ្ធផល អ្នកនឹង​មិនអាច​ប្រ�ិប�្�ិ​ម៉ាស៊ីន​និម្មិ�​ ដែល​ប្រើ​ម�ឌៀ​ន�ះ​បាន​ទ� រហូ�​ដល់​ពួកវា​អាច​ចូលដំណើរការ​បាននៅព�ល​ក្រោយ ។&lt;/p&gt;&lt;p&gt;ចុច &lt;b&gt;ពិនិ�្យ​មើល&lt;/b&gt; ដើម្បី​ប្រើ​បង្អួច​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ� ហើយ​មើល​អ្វី​ដែល​ម�ឌៀ​មិនអាច​ចូលដំណើរការ​បាន ឬ​ចុច &lt;b&gt;មិនអើពើ&lt;/b&gt; ដើម្បី​មិនអើពើ​នឹង​សារ​ន�ះ ។&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Your existing VirtualBox settings files were automatically converted from the old format to a new format required by the new version of VirtualBox.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; to start VirtualBox now or press &lt;b&gt;More&lt;/b&gt; if you want to get more information about what files were converted and access additional actions.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;Exit&lt;/b&gt; to terminate the VirtualBox application without saving the results of the conversion to disk.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;ឯកសារ​កំណ�់​របស់​ VirtualBox ដែល​មានស្រាប់​របស់​អ្នក​�្រូវ​បាន​បម្លែង​ដោយ​ស្វ�យ​ប្រវ�្�ិ​ពី​ទ្រង់ទ្រាយ​ចាស់​ទៅ​ទ្រង់ទ្រាយ​�្មី​ដែល​ចាំបាច់​សម្រាប់​កំណែ​�្មី​របស់ VirtualBox ។&lt;/p&gt;&lt;p&gt;ចុច &lt;b&gt;យល់ព្រម&lt;/b&gt; ដើម្បី​ចាប់ផ្ដើម​ VirtualBox ឥឡូវ ឬ​ចុច​ &lt;b&gt;ផ្ស�ង​ទៀ�&lt;/b&gt; ប្រសិន​បើ​អ្នក​ចង់​យក​ព��៌មាន​បន្�ែម​ទៀ�​ពី​ឯកសារ​ដែល​�្រូវ​បានបម្លែង​ និង​ចូលដំណើរការ​សកម្មភាព​បន្�ែម ។&lt;/p&gt;&lt;p&gt;ចុច &lt;b&gt;ច�ញ&lt;/b&gt; ដើម្បី​ច�ញ​ពី​កម្មវិធី VirtualBox ដោយ​មិន​រក្សាទុក​លទ្ធផល​នៃ​ការ​បម្លែង​ទៅ​កាន់​�ាសរឹង ។&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;More</source>
-        <comment>warnAboutAutoConvertedSettings message box</comment>
-        <translation type="obsolete">ផ្ស�ងៗ​ទៀ�</translation>
-    </message>
-    <message>
-        <source>E&amp;xit</source>
-        <comment>warnAboutAutoConvertedSettings message box</comment>
-        <translation type="obsolete">ច�ញ</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The following VirtualBox settings files have been automatically converted to the new settings file format version &lt;b&gt;%1&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;However, the results of the conversion were not saved back to disk yet. Please press:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;Backup&lt;/b&gt; to create backup copies of the settings files in the old format before saving them in the new format;&lt;/li&gt;&lt;li&gt;&lt;b&gt;Overwrite&lt;/b&gt; to save all auto-converted files without creating backup copies (it will not be possible to use these settings files with an older version of VirtualBox afterwards);&lt;/li&gt;%2&lt;/ul&gt;&lt;p&gt;It is recommended to always select &lt;b&gt;Backup&lt;/b&gt; because in this case it will be possible to go back to the previous version of VirtualBox (if necessary) without losing your current settings. See the VirtualBox Manual for more information about downgrading.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;ឯកសារ​កំណ�់​ VirtualBox ដូច​�ាងក្រោម​�្រូ​វបានបម្លែង​ទៅ​​ទ្រង់ទ្រាយ​ឯកសារ​�្មី​​កំណែ​  &lt;b&gt;%1&lt;/b&gt; ដោយ​ស្វ�យ​ប្រវ�្�ិ ។.&lt;/p&gt;&lt;p&gt;ទោះ​ជា​យ៉ាង​ណា​ក�​ដោយ លទ្ធផល​នៃការ​បម្លែង​មិន​�្រូវ​បានរក្សាទុក​ទៅ​�ាស​វិញទ� ។ សូម​ចុច ៖&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;b&gt;បម្រុង​ទុក&lt;/b&gt; ដើម្បីបង្កើ�​ច្បាប់ចម្លង​បម្រុង​​នៃ​ឯកសារ​ការ​កំណ�់​នៅ​ក្នុង​ទ្រង់ទ្រាយ​ចាស់ៗ​មុននឹង​រក្សាទុក​វា​នៅ​ក្នុង​ទ្រង់ទ្រាយ​�្មី&lt;/li&gt;&lt;li&gt;&lt;b&gt;បដិស�ធ&lt;/b&gt; ដើម្បី​រក្សាទុក​ឯកសារ​ដែល​បាន​បម្លែង​ដោយ​ស្វ�យ​ប្រវ�្�ិ​ដោយ​មិនបង្កើ�​ច្បាប់​ចម្លង​បម្រុង​ទុក​ទ� (វា​នឹង​មិនអាច​ប្រើ​ឯកសា​រកំណ�់​ទាំង​ន�ះ​ជា​មួយ​នឹង​កំណែ​ចាស់ៗ​របស់ VirtualBox បាន​ទ�)&lt;/li&gt;%2&lt;/ul&gt;&lt;p&gt;វា​�្រូវ​បាន​ផ្ដល់​អនុសាសន�​ឲ្យ​ជ្រើស &lt;b&gt;បម្រុង​ទុក&lt;/b&gt; ជា​និច្ច ពីព្រោះ​ក្នុងករណី​ន�ះ​​វា​នឹង​មិនអាច​�្រឡប់ក្រោយ​ទៅ​កំណែ​មុន​របស់ VirtualBox (ប្រសិនបើ​ចាំចាប់) ដោយ​មិនបា�់បង់​ការ​កំណ�់​បច្ចុប្បន្ន​របស់​អ្នក​ទ� ។ សូមមើល​សៀវដៅ VirtualBox សម្រាប់​ស�ចក្ដី​លម្អិ�​អំពី​ការ​ធ្វើ​ឲ្យ​ប្រសើ​រឡើង ។&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;li&gt;&lt;b&gt;Exit&lt;/b&gt; to terminate VirtualBox without saving the results of the conversion to disk.&lt;/li&gt;</source>
-        <translation type="obsolete">&lt;li&gt;&lt;b&gt;ច�ញ&lt;/b&gt; ដើម្បី​បញ្ចប់​ VirtualBox ដោយ​មិន​រក្សាទុក​លទ្ធផល​នៃ​ការ​បម្លែង​�ាស ។&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <source>O&amp;verwrite</source>
-        <comment>warnAboutAutoConvertedSettings message box</comment>
-        <translation type="obsolete">បដិស�ធ</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;A critical error has occurred while running the virtual machine and the machine execution has been stopped.&lt;/p&gt;&lt;p&gt;For help, please see the Community section on &lt;a href=http://www.virtualbox.org&gt;http://www.virtualbox.org&lt;/a&gt; or your support contract. Please provide the contents of the log file &lt;tt&gt;VBox.log&lt;/tt&gt; and the image file &lt;tt&gt;VBox.png&lt;/tt&gt;, which you can find in the &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; directory, as well as a description of what you were doing when this error happened. Note that you can also access the above files by selecting &lt;b&gt;Show Log&lt;/b&gt; from the &lt;b&gt;Machine&lt;/b&gt; menu of the main VirtualBox window.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; if you want to power off the machine or press &lt;b&gt;Ignore&lt;/b&gt; if you want to leave it as is for debugging. Please note that debugging requires special knowledge and tools, so it is recommended to press &lt;b&gt;OK&lt;/b&gt; now.&lt;/p&gt;</source>
         <translation>&lt;p&gt;កំហុស​ធ្ងន់ធ្ងរ​បាន​កើ�​ឡើង​�ណៈព�ល​កំពុង​រ�់​ម៉ាស៊ីននិម្មិ� ហើយ​ការ​ប្រ�ិប�្�ិ​ម៉ាស៊ីន​�្រូ​វបានបញ្ឈប់ ។&lt;/p&gt;&lt;p&gt;ចំពោះ​ជំនួយ សូមមើល​ផ្នែក​សហគមន�​នៅ​លើ &lt;a href=http://www.virtualbox.org&gt;http://www.virtualbox.org&lt;/a&gt; ឬ​កិច្ចសន្យា​គាំទ្រ​របស់​អ្នក ។ សូម​ផ្ដល់​នូវ​�្លឹមសារ​របស់​ឯកសារ​កំណ�់ហ��ុ &lt;tt&gt;VBox.log&lt;/tt&gt; ហើយ​នឹង​ឯកសារ​រូបភាព &lt;tt&gt;VBox.png&lt;/tt&gt; ដែល​អ្នក​អាច​រក​បាន​នៅ​ក្នុង​�� &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt; ព្រមទាំង​ស�ចក្ដីពិពណ៌នា​នូវ​អ្វីដែល​អ្នក​កំពុង​ធ្វើ នៅព�ល​កំហុស​កើ�​ឡើង ។ ចំណាំ​�ា អ្នក​ក�អាច​ចូលដំណើរការ​ឯកសារ​�ាង​លើ ដោយ​ជ្រើស &lt;b&gt;បង្ហាញ​កំណ�់​ហ��ុ&lt;/b&gt; ពី​ម៉ឺនុយ &lt;b&gt;ម៉ាស៊ីន&lt;/b&gt; របស់​បង្អួច VirtualBox ម� ។&lt;/p&gt;&lt;p&gt;ចុច &lt;b&gt;យល់ព្រម&lt;/b&gt; ប្រសិនបើ​​អ្នក​ចង់​បិទ​ម៉ាស៊ីន ឬ​ចុច &lt;b&gt;មិនអើពើ&lt;/b&gt; ប្រសិន​បើ​អ្នក​ទុក​វា​សម្រាប់បំបា�់​កំហុស ។ សូម​ចំណាំ�ា​កា​របំបា�់​កំហុស​ទាមទារចំណ�ះដឹង និង​កម្មវិធី​ពិស�ស ដូច្ន�ះ​�្រូវ​បានផ្ដល់​អនុសាសន�​ឲ្យ​ចុច &lt;b&gt;យល់ព្រម&lt;/b&gt; ឥឡូវ ។&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>hard disk</source>
-        <comment>failed to close ...</comment>
-        <translation type="obsolete">�ាសរឹង</translation>
-    </message>
-    <message>
-        <source>CD/DVD image</source>
-        <comment>failed to close ...</comment>
-        <translation type="obsolete">រូបភាព​ស៊ីឌី/ឌីវីឌី</translation>
-    </message>
-    <message>
-        <source>floppy image</source>
-        <comment>failed to close ...</comment>
-        <translation type="obsolete">រូបភាព​�ាស​ទន់</translation>
-    </message>
-    <message>
         <source>A file named &lt;b&gt;%1&lt;/b&gt; already exists. Are you sure you want to replace it?&lt;br /&gt;&lt;br /&gt;Replacing it will overwrite its contents.</source>
-        <translation type="unfinished"></translation>
+        <translation>​មាន​ឈ្មោះ​ឯកសាររបស់​&lt;b&gt;%1&lt;/b&gt;រួច​ហើយ​ ។ �ើ​អ្នក​ពិ�​ជាចង់​ជំនួស​វា​​ឬ ?&lt;br /&gt;&lt;br /&gt;​ការ​ជំនួស​វា​នឹង​សរស�រ​ជាន់​លើ​
+មា�ិកា​​របស់​វា​ ។</translation>
     </message>
     <message>
         <source>The following files already exist:&lt;br /&gt;&lt;br /&gt;%1&lt;br /&gt;&lt;br /&gt;Are you sure you want to replace them? Replacing them will overwrite their contents.</source>
-        <translation type="unfinished"></translation>
+        <translation>មាន​ឯកសារ​​ជាបន្�​បន្ទាប់​រួច​ហើយ​ ៖&lt;br /&gt;&lt;br /&gt;%1&lt;br /&gt;&lt;br /&gt;�ើ​​អ្នក​ពិ�​ជាចង់​ជំនួស​​​ពួកវា​ឬ ? ការ​ជំនួស​វា​នឹង​សរស�រ​ជាប់​លើ​មា�ិកា​របស់វា ។</translation>
     </message>
     <message>
         <source>Failed to remove the file &lt;b&gt;%1&lt;/b&gt;.&lt;br /&gt;&lt;br /&gt;Please try to remove the file yourself and try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ក្នុងកា​រយក​ឯកសារ &lt;b&gt;%1&lt;/b&gt;ច�ញ ។&lt;br /&gt;&lt;br /&gt;សូម​ព្យាយាម​យក​ឯកសារ​ច�ញ​ដោយ​�្លួន​ឯង ហើយ​ព្យាយាម​ម្ដង​ទៀ� ។</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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="unfinished"></translation>
+        <translation>មិនអាច​ដំណើរការ​ 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 type="unfinished"></translation>
+        <translation>អ្នក​កំពុង​ព្យាយាប​បិទ​ម៉ាស៊ីន​ដោយ​ប្រើប៊ូ�ុង​�ាមពល ACPI  ហើយ ។ បច្ចុប្បន្ន​ន�ះ​មិនអាច​ប្រើបាន​ទ� ពីព្រោះ​ម៉ាស៊ីន​​មិន​គាំទ្រ​​កម្មវិធី​បិទ​​ទ� ។</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង VT-x/AMD-V �្រូវ​បានបើក ប៉ុន្�ែ​មិន​ដំណើរការ​ទ� ។ ម៉ាស៊ីន​ ៦៤ ប៊ី�​របស់​អ្នក​នឹង​បរាជ�យ​ក្នុង​រក​ស៊ីភីយូ ៦៤ ប៊ី� ហើយ​មិន​អាច​ចាប់ផ្ដើម​បាន​ទ� ។&lt;/p&gt;&lt;p&gt;សូម​ប្រាកដ​�ា អ្នក​បានបើក VT-x/AMD-V យ៉ាង​�្រាម�្រូវ​នៅ​ក្នុង BIOS នៃ​កុំព្យូទ�រ​របស់​អ្នក ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished"></translation>
+        <translation>បិទ VM</translation>
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished">បន្�</translation>
+        <translation>បន្�</translation>
     </message>
     <message>
         <source>&lt;p&gt;VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Certain guests (e.g. OS/2 and QNX) require this feature.&lt;/p&gt;&lt;p&gt;Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង VT-x/AMD-V �្រូវ​បានបើក ប៉ុន្�ែ​មិន​អាច​ដំណើរការ​បាន​ទ� ។ ម៉ាស៊ីន​ជាក់លាក់ (ឧ. OS/2 និង QNX) ទាមទារ​លក្�ណៈពិស�ស​ន�ះ ។&lt;/p&gt;&lt;p&gt;សូម​ប្រាកដ​�ា អ្នក​បានបើក​ VT-x/AMD-V យ៉ាង​�្រឹម�្រូវ​នៅ​ក្នុង BIOS នៃ​​កុំព្យូទ�រ​របស់​អ្នក ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Are you sure you want to restore snapshot &lt;b&gt;%1&lt;/b&gt;? This will cause you to lose your current machine state, which cannot be recovered.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;�ើ​អ្នក​ប្រាក​ដ​ជា​ចង់​ស្ដារ​រូប��​ &lt;b&gt;%1&lt;/b&gt;ឬ ? វា​នឹង​ធ្វើ​ឲ្យ​អ្នក​បា�់បង់​ស្�ានភាព​ម៉ាស៊ីន​បច្ចុប្បន្ន​របស់​អ្នក ដែល​មិនអាច​សង្គ្រោះ​បាន​ទ� ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ារ​</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>បោះបង់​</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;/p&gt;Are you sure you want to delete the selected snapshot &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ការ​លុប​រូប​��​នឹង​បណ្�ាល​ឲ្យព��៌​មានច�ញ​​ដែល​បាន​រ​ក្សា​ទុក​�្រូវ​បាន​បា�់​បង់​ និងការ​ផ្សាយ​​ទិន្នន�យ​�ាស​​​លើ​ឯកសារ​រូប​ភាពបី​បួន​​ដែល​ VirtualBox �្រូវ​បានបង្កើ�​ជាមួយ​គ្នា ​រូប​��​នឹង​�្រូវ​បានបញ្ចូល​ចូល​​គ្នា​​ទៅ​ក្នុង​ឯកសារ​�ែ​មួយ​ ។​ វាអាច​ដំណើរ​ការ​យូរ​ និង​ព��៌​មាន​ក្នុង​រូប​��​មិន​អាច​�្រូវ​បានយកបាន​​ឡើយ ។&lt;/p&gt;&lt;/p&gt;�ើ​អ្នក​ប្រាកដ​ជា​ចង់​លុប​រូប​��​ដែលបាន​​ជ្រើស​&lt;b&gt;%1&lt;/b&gt; ឬ ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">លុប</translation>
+        <translation>លុប</translation>
     </message>
     <message>
         <source>Failed to restore the snapshot &lt;b&gt;%1&lt;/b&gt; of the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យក្នុងការ​​​ស្�ារ​រូប��​​ &lt;b&gt;%1&lt;/b&gt; របស់​ម៉ាស៊ីននិម្មិ​�&lt;b&gt;%2&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>Failed to delete the snapshot &lt;b&gt;%1&lt;/b&gt; of the virtual machine &lt;b&gt;%2&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>បានបរាជ�យក្នុងការ​​​លុប​រូប��​​&lt;b&gt;%1&lt;/b&gt; របស់​​ម៉ាស៊ីន​​និម្មិ�​​&lt;b&gt;%2&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Are you sure you want to disable the additional controller?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;មាន�ាស​រឹង​​ដែ​ល​ភ្ជាប់​ជា​មួយច្រក​របស់​ឧបករណ�​បញ្ជា​បន្�ែម​ ។ ប្រ​សិន​បើ​អ្នកបិទ​​ឧបករណ�​បញ្ជា​បន្�ែម​ គ្រប់​�ាស​រឹង​ទាំង​ន�ះ​នឹង​�្រូវ​បាន​ផ្�ាច់​ដោយ​ស្វ�យ​ប្រ​វ�្�ិ​ ។&lt;/p&gt;&lt;p&gt;​�ើ​​អ្នក​ប្រាកដ​​ជា​​ចង់បិទ​​ឧបករណ�​បញ្ជា​បន្�ែម​ ឬ ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Are you sure you want to change the additional controller?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;មាន​�ាសរឹង​ដែល​ភ្ជាប់​ជាមួយ​ច្រក​របស់​ឧបករណ�​បញ្ជា​បន្�ែម​ ។ ប្រ​សិន​បើ​អ្នក​​ផ្លាស់​ប្�ូរ​ឧបរណ�​បញ្ញា​បន្�ែម​​ គ្រប់​�ាស​រឹង​ទាំង​ន�ះ​នឹង​�្រូវ​បាន​ផ្�ាច់​ដោយ​ស្វ�យ​ប្រវ�្�ិ​ ។​&lt;/p&gt;&lt;p&gt;​�ើ​អ្នក​ប្រាកដជា​​ចង់​ផ្លាស់​ប្�ូរ​​ឧបករណ�​បញ្ជា​បន្�ែម​ឬ ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Change</source>
-        <comment>hard disk</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+
+hard disk</comment>
+        <translation type="obsolete">ផ្លាស់ប្�ូរ​</translation>
     </message>
     <message>
         <source>&lt;p&gt;There are no unused media available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Create&lt;/b&gt; button to start the &lt;i&gt;New Virtual Disk&lt;/i&gt; wizard and create a new medium, or press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Media Manager&lt;/i&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;មិនមាន​ម�ឌៀ​ដែល​មិនបានប្រើ​​សម្រាប់​​​ឯក​សារ​ភ្ជាប់​ដែល​បង្កើ��្មី​ ។​&lt;/p&gt;&lt;p&gt;ចុច​ &lt;b&gt;បង្កើ�​​&lt;/b&gt; ប៊ូ�ុង​ទៅ​ចាប់​ផ្�ើម &lt;i&gt;​�ាស​និម្មិ�​�្មី&lt;/i&gt; អ្នក​ជំនួយ​ការ​ និង​បង្កើ�ឧបករណ�​ផ្ទុក�្មី​ ឬ​ចុច​​ &lt;b&gt;ជ្រើស​​&lt;/b&gt; ប្រ​សិន​បើ​​អ្នក​មាន​បំណង​ទៅ​បើក​ &lt;i&gt;កម្ម​វិធី​គ្រប់​គ្រង​ម�ឌៀ​និម្មិ�​​&lt;/i&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Create</source>
-        <comment>medium</comment>
-        <translation type="unfinished">បង្កើ�</translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">បង្កើ�</translation>
     </message>
     <message>
         <source>&amp;Select</source>
-        <comment>medium</comment>
-        <translation type="unfinished">ជ្រើស</translation>
+        <comment>
+
+
+
+medium</comment>
+        <translation type="obsolete">ជ្រើស</translation>
     </message>
     <message>
         <source>&lt;p&gt;There are no unused media available for the newly created attachment.&lt;/p&gt;&lt;p&gt;Press the &lt;b&gt;Select&lt;/b&gt; if you wish to open the &lt;i&gt;Virtual Media Manager&lt;/i&gt;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;មិនមាន​ម�ឌៀ​មិន​បាន​ប្រើទ� សម្រាប់​ឯកសារ​ភ្ជាប់​ដែលបានបង្កើ�​�្មី ។&lt;/p&gt;&lt;p&gt;ចុច &lt;b&gt;ជ្រើស&lt;/b&gt; ប្រសិន​បើ​អ្នក​ចង់​បើក &lt;i&gt;កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ�&lt;/i&gt; ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Failed to attach the %1 to slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ក្នុងការ​ភ្ជាប់ %1 ទៅ​រន្ធ &lt;i&gt;%2&lt;/i&gt; របស់​ម៉ាស៊ីន&lt;b&gt;%3&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>Failed to detach the %1 from slot &lt;i&gt;%2&lt;/i&gt; of the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ក្នុង​ការ​ផ្ដាច់​ %1 ពី​រន្ធ &lt;i&gt;%2&lt;/i&gt; របស់​ម៉ាស៊ីន&lt;b&gt;%3&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>Unable to mount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; on the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>មិនអាច​ម៉ោន %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; នៅ​លើ​ម៉ាស៊ីន &lt;b&gt;%3&lt;/b&gt;បាន​ទ� ។</translation>
     </message>
     <message>
         <source> Would you like to force mounting of this medium?</source>
-        <translation type="unfinished"></translation>
+        <translation> �ើ​អ្នក​ចង់​បង្�ំ​ម៉ោន​ឧបករណ�​ផ្ទុក​ន�ះ​ដែរឬទ� ?</translation>
     </message>
     <message>
         <source>Unable to unmount the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; from the machine &lt;b&gt;%3&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>មិនអាច​អាន់ម៉ោន​ %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt; ពី​ម៉ាស៊ីន &lt;b&gt;%3&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source> Would you like to force unmounting of this medium?</source>
-        <translation type="unfinished"></translation>
+        <translation> �ើ​អ្នក​ចង់​បង្�ំ​អាន់ម៉ោន​ឧបករណ�​ផ្ទុក​ន�ះ​ដែរឬទ� ?</translation>
     </message>
     <message>
         <source>Force Unmount</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្�ំ​អាន់ម៉ោន​</translation>
     </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="unfinished"></translation>
+        <translation>បានបរាជ�យ​​ក្នុង​កា​រច្រាន​�ាស​ច�ញ​ពី​ដ្រាយ​និម្មិ� ។ ដ្រាយ​អាច​�្រូវ​បានចាក់​សោ​ដោយ​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន​ភ្ញៀវ ។ សូម​ពិនិ�្យ​មើល​វា ហើយ​ព្យាយាម​ម្ដង​ទៀ� ។</translation>
     </message>
     <message>
         <source>&lt;p&gt;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 &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 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 interface name or a different adapter attachment type.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ការ​លុប​បណ្�ាញ​ ម៉ា​ស៊ីន​​-�ែ​មួយ​​ ន�ះ​នឹង​យក​ច�ញ​ សំអាង​ទៅ​លើ​បណ្�ាញ​ចំនុច​ប្រទាក់​ ម៉ាស៊ីន​​-�ែ​មួយ​ ន�ះ ។ ​�ើ​អ្នកពិ�​ជា​ចង់​យក​ច�ញ​​ (បណ្�ាញ ម៉ាស៊ីន​​-​�ែ​មួយ​​) ចំណុច​ប្រទាក់​​&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;?&lt;/nobr&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;សម្គាល់​ ៖&lt;/b&gt; ចំណុច​ប្រ​ទាក់​ន�ះ​អាចប្រើ​​មួយ​ ឬ​​ច្រើន​​អាដាប់​ទ�រ​បណ្�ាញនិម្មិ�​​​ជាកម្ម​សិទ្ធ​មួយ​នៃ​​​ VMs របស់​អ្នក​ ។ ក្រោយ​ព�ល​វា​�្រូវ​បាន​យក​ច�ញ​ អាដាប់​ទ�រ​ទាំង​ន�ះ​នឹង​មិន​អាច​ប្រើ​បាន​យូរ​ឡើយ​​ រហូ�​ដល់​អ្នក​​កែ​ការ​កំណ�់​​របស់​វា​មួយ​ណា​ក�មាន​​​ឈ្មោះ​�ុស​គ្នា​​ចំណុច​ប្រទាក់​ ឬ​ប្រ​ភ�ទ​�ុស​គ្នា​នៃ​​​ឯកសារ​​ភ្ជាប់​អាដាប់​ទ�រ​ ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Failed to create the host-only network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ក្នុងការ​​​បង្កើ�​ចំណុច​ប្រ​ទាក់​បណ្�ាញ​ម៉ាស៊ីន​​-�ែ​មួយ​</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not insert the VirtualBox Guest Additions installer CD image into the virtual machine &lt;b&gt;%1&lt;/b&gt;, as the machine has no CD/DVD-ROM drives. Please add a drive using the storage page of the virtual machine settings dialog.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;មិនអាច​បញ្ចូល​រូបភាព​ស៊ីឌី​កម្មវិធី​ដំឡើង​បន្�ែម​របស់​ម៉ាស៊ីន VirtualBox ​ទៅ​ក្នុង​ម៉ាស៊ីន​និម្មិ�​&lt;b&gt;%1&lt;/b&gt;បាន​ទ� ព្រោះ​�ា​ម៉ាស៊ីន​មាន​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​រ៉ូម ។ សូម​បន្�ែម​ដ្រាយ ដោយ​ប្រើ​ទំព�រ​ផ្ទុក​នៃ​ប្រអប់​កំណ�់​ម៉ាស៊ីន​និម្មិ� ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Invalid e-mail address or password specified.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;អាសយដ្ឋាន​អ៊ីមែល ឬ​ពាក្យ​សម្ងា�់​ដែលបាន​បញ្ជាក់មិន​�្រឹម�្រូវ ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Failed to register the VirtualBox product.&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;បាន​បរាជ�យ​ក្នុងកា​រចុះឈ្មោះផលិ�ផល VirtualBox ។&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Your existing VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; to start VirtualBox now or press &lt;b&gt;Exit&lt;/b&gt; if you want to terminate the VirtualBox application without any further actions.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ឯកសារ​កំណ�់​ VirtualBox មាន​ស្រាប់​​របស់​អ្នក នឹង​�្រូវ​បានបម្លែង​ដោយ​ស្វ�យ​ប្រវ�្�ិ​ពី​ទ្រង់ទ្រាយ​ចាស់ ទៅ​ទ្រង់ទ្រាយ​�្មី​ដែលបានទាមទារ​ដោយ​កំណែ​�្មី​របស់ VirtualBox ​។&lt;/p&gt;&lt;p&gt;ចុច &lt;b&gt;យល់&lt;/b&gt; ដើម្បី​ចាប់ផ្ដើម VirtualBox ឥឡូវ ឬ​ចុច &lt;b&gt;ចាកច�ញ&lt;/b&gt; ប្រសិនបើ​អ្នក​ចង់​បញ្ចប់​កម្មវិធី​របស់ VirtualBox ដោយ​គ្មាន​សកម្មភាព​បន្�ែម​ផ្ស�ង​ទៀ� ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <comment>warnAboutSettingsAutoConversion message box</comment>
-        <translation type="unfinished">ច�ញ</translation>
+        <comment>
+
+
+
+warnAboutSettingsAutoConversion message box</comment>
+        <translation type="obsolete">ច�ញ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The following VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.&lt;/p&gt;&lt;p&gt;Press &lt;b&gt;OK&lt;/b&gt; to start VirtualBox now or press &lt;b&gt;Exit&lt;/b&gt; if you want to terminate the VirtualBox application without any further actions.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;ឯកសារ​កំណ�់ VirtualBox ដូច​�ាងក្រោម​នឹង​�្រូវ​បានបម្លែង​ដោយ​ស្វ�យ​ប្រវ�្�ិ​ពី​ទ្រង់ទ្រាយ​ចាស់​ទៅ​ទ្រង់ទ្រាយ​�្មី​របស់ VirtualBox ។&lt;/p&gt;&lt;p&gt;ចុច &lt;b&gt;យល់&lt;/b&gt; ដើម្បី​ចាប់ផ្ដើម VirtualBox ឥឡូវ ឬ​ចុច &lt;b&gt;ចាកច�ញ&lt;/b&gt; ប្រសិនបើ​អ្នក​ចង់​បញ្ចប់​កម្មវិធី VirtualBox ដោយ​គ្មាន​សកម្មភាព​បន្�ែម​ទៀ� ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Failed to open appliance.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ក្នុងកា​របើក​ឧបករណ� ។</translation>
     </message>
     <message>
         <source>Failed to open/interpret appliance &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ក្នុងកា​របើក/បកប្រែ​ឧបករណ�&lt;b&gt;%1&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>Failed to import appliance &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ក្នុងកា​រនាំចូល​ឧបករណ�&lt;b&gt;%1&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>Failed to check files.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ទៅ​ពិនិ�្យ​មើល​ឯកសារ​ ។</translation>
     </message>
     <message>
         <source>Failed to remove file.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ក្នុងកា​រយក​ឯកសារ​ច�ញ ។</translation>
     </message>
     <message>
         <source>Failed to create appliance.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ទៅ​បង្កើ�ឧបករណ� ។</translation>
     </message>
     <message>
         <source>Failed to prepare the export of the appliance &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ទៅ​រៀប​ចំ​នាំ​ចូលឧបករណ�​ &lt;b&gt;%1&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>Failed to create an appliance.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ទៅ​បង្កើ�ឧបករណ�​ ។</translation>
     </message>
     <message>
         <source>Failed to export appliance &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​បរាជ�យ​ទៅ​នាំ​ច�ញឧបករណ�​​ &lt;b&gt;%1&lt;/b&gt; ។</translation>
+    </message>
+    <message>
+        <source>hard disk</source>
+        <comment>
+
+
+
+
+failed to mount ...</comment>
+        <translation type="obsolete">�ាសរឹង</translation>
+    </message>
+    <message>
+        <source>CD/DVD</source>
+        <comment>
+
+
+
+
+failed to mount ... host-drive</comment>
+        <translation type="obsolete">ស៊ីឌី​​​/​ឌីវីឌី​​</translation>
+    </message>
+    <message>
+        <source>CD/DVD image</source>
+        <comment>
+
+
+
+
+failed to mount ...</comment>
+        <translation type="obsolete">រូបភាព​ស៊ីឌី/ឌីវីឌី</translation>
+    </message>
+    <message>
+        <source>floppy</source>
+        <comment>
+
+
+
+
+failed to mount ... host-drive</comment>
+        <translation type="obsolete">�ាសទន់​</translation>
+    </message>
+    <message>
+        <source>floppy image</source>
+        <comment>
+
+
+
+
+failed to mount ...</comment>
+        <translation type="obsolete">រូបភាព​�ាសទន់</translation>
+    </message>
+    <message>
+        <source>hard disk</source>
+        <comment>
+
+
+
+
+failed to attach ...</comment>
+        <translation type="obsolete">�ាសរឹង</translation>
+    </message>
+    <message>
+        <source>CD/DVD device</source>
+        <comment>
+
+
+
+
+failed to attach ...</comment>
+        <translation type="obsolete">ឧបករណ�​ស៊ីឌី​​/​ឌីវីឌី​</translation>
+    </message>
+    <message>
+        <source>floppy device</source>
+        <comment>
+
+
+
+
+failed to close ...</comment>
+        <translation type="obsolete">ឧបករណ�​�ាសទន់​</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Are you sure you want to delete the CD/DVD-ROM device?&lt;/p&gt;&lt;p&gt;You will not be able to mount any CDs or ISO images or install the Guest Additions without it!&lt;/p&gt;</source>
+        <translation>&lt;p&gt;�ើ​​​អ្នក​ប្រាកដ​ជា​ចង់​លុប​ឧបករណ�​​ស៊ី​ឌី​​/​ឌី​វីឌី​-រ៉ូម​ឬ​​?&lt;/p&gt;&lt;p&gt;អ្នក​នឹង​​មិន​អាច​ម៉ោន​ស៊ី​ឌី​ ឬ​រូប​ភាព ISO ឬ​ដំឡើង​​ការ​បន្�ែម​ម៉ាស៊ីន​ភ្ញៀវ​​ដោយ​គ្មាន​វា​បាន​​ទ� ​​!&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <comment>
+
+
+
+
+medium</comment>
+        <translation type="obsolete">យកច�ញ​</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <comment>hard disk</comment>
+        <translation type="unfinished">ផ្លាស់ប្�ូរ​</translation>
+    </message>
+    <message>
+        <source>&amp;Create</source>
+        <comment>medium</comment>
+        <translation type="unfinished">បង្កើ�</translation>
+    </message>
+    <message>
+        <source>&amp;Select</source>
+        <comment>medium</comment>
+        <translation type="unfinished">ជ្រើស</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <comment>medium</comment>
+        <translation type="unfinished">យកច�ញ​</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <comment>warnAboutSettingsAutoConversion message box</comment>
+        <translation type="unfinished">ច�ញ</translation>
     </message>
     <message>
         <source>hard disk</source>
@@ -4452,7 +4812,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>CD/DVD</source>
         <comment>failed to mount ... host-drive</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ស៊ីឌី​​​/​ឌីវីឌី​​</translation>
     </message>
     <message>
         <source>CD/DVD image</source>
@@ -4462,12 +4822,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>floppy</source>
         <comment>failed to mount ... host-drive</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">�ាសទន់​</translation>
     </message>
     <message>
         <source>floppy image</source>
         <comment>failed to mount ...</comment>
-        <translation type="unfinished">រូបភាព​�ាស​ទន់</translation>
+        <translation type="unfinished">រូបភាព​�ាសទន់</translation>
     </message>
     <message>
         <source>hard disk</source>
@@ -4477,179 +4837,166 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>CD/DVD device</source>
         <comment>failed to attach ...</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ឧបករណ�​ស៊ីឌី​​/​ឌីវីឌី​</translation>
     </message>
     <message>
         <source>floppy device</source>
         <comment>failed to close ...</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Are you sure you want to delete the CD/DVD-ROM device?&lt;/p&gt;&lt;p&gt;You will not be able to mount any CDs or ISO images or install the Guest Additions without it!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ឧបករណ�​�ាសទន់​</translation>
     </message>
 </context>
 <context>
     <name>VBoxProgressDialog</name>
     <message>
         <source>A few seconds remaining</source>
-        <translation type="unfinished"></translation>
+        <translation>នៅ​សល់​ពីរ​ ​បី​​វិនាទី​</translation>
     </message>
     <message>
         <source>Canceling...</source>
-        <translation type="unfinished"></translation>
+        <translation>កំពុង​បោះបង់...</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>បោះបង់​</translation>
     </message>
     <message>
         <source>Cancel the current operation</source>
-        <translation type="unfinished"></translation>
+        <translation>បោះ​បង់​ប្រ​�ិប�្�ិការ​បច្ចុប្បន្ន</translation>
+    </message>
+    <message>
+        <source>%1, %2 remaining</source>
+        <comment>
+
+
+
+
+You may wish to translate this more like &quot;Time remaining: %1, %2&quot;</comment>
+        <translation type="obsolete">នៅ​សល់​ %1, %2</translation>
+    </message>
+    <message>
+        <source>%1 remaining</source>
+        <comment>
+
+
+
+
+You may wish to translate this more like &quot;Time remaining: %1&quot;</comment>
+        <translation type="obsolete">នៅ​សល់​ %1</translation>
     </message>
     <message>
         <source>%1, %2 remaining</source>
         <comment>You may wish to translate this more like &quot;Time remaining: %1, %2&quot;</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">នៅ​សល់​ %1, %2</translation>
     </message>
     <message>
         <source>%1 remaining</source>
         <comment>You may wish to translate this more like &quot;Time remaining: %1&quot;</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">នៅ​សល់​ %1</translation>
     </message>
 </context>
 <context>
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>ប្រអប់​ចុះឈ្មោះ VirtualBox</translation>
-    </message>
-    <message>
-        <source>&amp;Name</source>
-        <translation type="obsolete">ឈ្មោះ</translation>
+        <translation type="obsolete">ប្រអប់​ចុះឈ្មោះ VirtualBox</translation>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>បញ្ចូល​ឈ្មោះ​ព�ញ​ ដោយ​ប្រើ​�ួអក្សរ​ឡា�ាំង ។</translation>
-    </message>
-    <message>
-        <source>&amp;E-mail</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>បញ្ចូល​អាសយដ្ឋាន​អ៊ីមែល​ដែល​�្រឹម�្រូវ​របស់អ្នក ។</translation>
-    </message>
-    <message>
-        <source>&amp;Please do not use this information to contact me</source>
-        <translation type="obsolete">សូម​កុំ​ប្រើ​ព��៌មាន​ន�ះ​ដើម្បីទាក់ទង​�្ញុំ</translation>
+        <translation type="obsolete">បញ្ចូល​អាសយដ្ឋាន​អ៊ីមែល​ដែល​�្រឹម�្រូវ​របស់អ្នក ។</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>សូម​ស្វាគមន�​មក​កាន់​សំណុំ​បែបបទ​ចុះឈ្មោះ​របស់ VirtualBox !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន�​មក​កាន់​សំណុំ​បែបបទ​ចុះឈ្មោះ​របស់ VirtualBox !</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>មិនអាច​អនុវ�្�​ការ​�ភ្ជាប់​ចាប់ដៃ​បានទ� ។</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;សូមបំព�ញ​សំណុំ​បែបបទ​ចុះឈ្មោះន�ះ ដើម្បីអនុញ្ញា�​ឲ្យ​យើង​ដឹង​�ា​ អ្នកប្រើ VirtualBox និង​ជា​ជម្រើស​�្រូវ​ជូនដំណឹង​អ្នក​អំពី​ព��៌មាន និង​ភាព​ទាន់សម�យ​របស់ VirtualBox ។&lt;/p&gt;&lt;p&gt;បញ្ចូល​ឈ្មោះ​ព�ញល�ញ​របស់​អ្នកដោយ​ប្រើ​�ួអក្សរ​ឡា�ាំង ហើយអាសយដ្ឋាន​អ៊ីមែល​របស់អ្នកក្នុង​វាល​�ាង​ក្រោម ។ សូម​ចំណាំ​�ា Sun Microsystems នឹង​ប្រើ​ព��៌មានន�ះដើម្បី​ប្រមូល​�ែ​​ស្�ិ�ិ​ប្រើ​ផលិ�ផល ហើយ​ផ្ញើ​ព្រឹ�្�ិប�្រ​ VirtualBox ឲ្យ​អ្នក ។ ជា​ទូទៅ Sun Microsystems នឹង​មិន​ចម្លង​ទិន្នន�យ​របស់​អ្នក​ទៅ​ភាគីទីបី​បានទ� ។ ព��៌មាន​លម្អិ�​អំពី​​វិធី​ដែល​យើង​ប្រើ​ទិន្នន�យ​ផ្ទាល់�្លួន​របស់​អ្នក អាច​រក​បាននៅ​ក្នុង​ផ្នែក &lt;b&gt;គោលនយោបាយ​ឯកជន&lt;/b&gt; របស់​សៀវភៅ​ដៃ VirtualBox ឬ​នៅ​លើ​ទំព�រ &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;គោលនយោបាយ​ឯកជន&lt;/a&gt; របស់​�ំបន់បណ្ដាញ VirtualBox ។&lt;/p&gt;</translation>
-    </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>
-        <translation type="obsolete">គូស​ធីក​ប្រអប់​ន�ះ ប្រសិនបើ​អ្នក​មិន​ចង់​ទទួល​សំបុ�្រ​ពី​ Sun Microsystems �ាម​អាសយដ្ឋាន​អ៊ីមែល​ដែល​បាន​បញ្ជាក់​�ាង​លើ ។</translation>
-    </message>
-    <message>
-        <source>C&amp;onfirm</source>
-        <translation type="obsolete">អះអាង</translation>
+        <translation type="obsolete">មិនអាច​អនុវ�្�​ការ​�ភ្ជាប់​ចាប់ដៃ​បានទ� ។</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>បោះបង់</translation>
+        <translation type="obsolete">បោះបង់</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">ជ្រើស​​​ដែន​ដី​​/​ប្រ​ទ�ស​</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&lt;p&gt;សូម​បំ​ព�ញ​សំណុំ​​បែប​បទ​ការ​ចុះ​ឈ្មោះ​ន�ះ​​ដើម្បី​អនុ​ញ្ញា�​ពួក​យើង​ដឹង​�ា​អ្នក​ប្រើ​ VirtualBox និង ដោយ​ជម្រើស​ ​ដើម្បី​រក្សា​ទុកដែល​អ្នក​បាន​អង្ក��​អំពី​​ព��៌​មាន និងភាព​ទាន់​សម�យ​របស់​​​ VirtualBox ។&lt;/p&gt;&lt;p&gt;សូម​ប្រើ​�ូ​អក្សរ​ឡា�ាំង​�ែ​មួយ​​ដើម្បី​បំ​ព�ញ​ក្នុង​វាល​�ាង​ក្រោម​ ។ ប្រ​ព�ន្ធ​ម៉ៃ​​​ក្រូ​ Sun នឹង​ប្រើ​ព��៌​មានស្�ិ�ិ​​ប្រើ​ផលិ�ផល​ជាមួយ​គ្នា​ និង​​​ផ្ញើ​​សំបុ�្រ​ព��៌​មានឲ្យ​អ្នក​​របស់​​ VirtualBox ។ ពិស�ស​​ ប្រព�ន្ធ​ម៉ៃ​ក្រូ​ Sun ​នឹង​មិន​ហុច​ទិន្ន​ន�យ​ភាគី​ទី​បី​ ។ បាន​រៀប​រាប់​ព��៌​មាន​អំពី​ យើង​ប្រើ​យ៉ាង​ដូចម្��ច​នៃ​ទិន្ន​ន�យ​ផ្ទាល់​ដែល​�្រូវ​បាន​ស្វែង​រក​ក្នុង​ &lt;b&gt;នយោ​បាយ​ផ្ទាស់​�្លួន​​&lt;/b&gt; ភាគ​របស់​ VirtualBox សៀវ​ភៅ​ដៃ​ ឬ​លើ​​ &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;នយោ​បាយ​ឯក​ជន​​&lt;/a&gt; ទំព�រ​​ បណ្�ាញ​-​�ំបន់​បណ្�ាញ​របស់​ VirtualBox ។&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">�្ញុំ​មាន​គណនី​លើបណ្�ាញ​របស់​​ Sun រួច​ហើយ ៖</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">អ៊ី​មែល​ ៖</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">​ពាក្យ​សម្ងា�់​ ៖</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">�្ញុំ​ចង់​បង្កើ�​​គណនី​លើ​បណ្�ាញ​របស់​ Sun �្មី ៖</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">នាម​�្លួន​ ៖</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">នាម​�្រ​កូល​ ៖</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">ក្រុម​ហ៊ុន​​ ៖</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">ប្រ​ទ�ស​ ៖</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">អ៊ី​មែល​ ៖</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">ពាក្យសម្ងា�់​ ៖</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">បញ្ជាក់​ពាក្យ​សម្ងា�់ ៖</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">ចុះ​ឈ្មោះ​</translation>
     </message>
 </context>
 <context>
     <name>VBoxSFDialog</name>
     <message>
         <source>Shared Folders</source>
-        <translation>��​ដែលបានចែករំលែក</translation>
+        <translation>��​ដែល​បាន​ចែករំលែក</translation>
     </message>
 </context>
 <context>
     <name>VBoxScreenshotViewer</name>
     <message>
         <source>Screenshot of %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>រូប​��​អ�​ក្រង់​របស់​ %1 (%2)</translation>
     </message>
     <message>
         <source>Click to view non-scaled screenshot.</source>
-        <translation type="unfinished"></translation>
+        <translation>ចុច​ ដើម្បី​មើល​រូប��​អ�ក្រង់​គ្មានមា�្រដ្ឋាន ។</translation>
     </message>
     <message>
         <source>Click to view scaled screenshot.</source>
-        <translation type="unfinished"></translation>
+        <translation>ចុច ដើម្បី​​មើល​រូប​��​អ�ក្រង់​ដែល​មានមា�្រ​ដ្ឋាន​ ។</translation>
     </message>
 </context>
 <context>
@@ -4712,10 +5059,6 @@ p, li { white-space: pre-wrap; }
         <translation>បោះបង់​ស្�ានភាព​របស់​ម៉ាស៊ីន​និម្មិ�​ដែល​ជ្រើស​ដែលបាន​រក្សាទុក</translation>
     </message>
     <message>
-        <source>&amp;Refresh</source>
-        <translation type="obsolete">ធ្វើ​ឲ្យ​ស្រស់</translation>
-    </message>
-    <message>
         <source>Refresh the accessibility state of the selected virtual machine</source>
         <translation>ធ្វើ​ឲ្យ​ស្�ានភាព​ចូលដំណើរការ​ស្រស់​របស់​ម៉ាស៊ីន​និម្មិ�​ដែលបានជ្រើស</translation>
     </message>
@@ -4768,10 +5111,6 @@ p, li { white-space: pre-wrap; }
         <translation>បង្ហាញ​​ឯកសារ​កំណ�់ហ��ុ​របស់​ម៉ាស៊ីន​និម្មិ�​ដែល​បានជ្រើស</translation>
     </message>
     <message>
-        <source>Sun xVM VirtualBox</source>
-        <translation type="obsolete">Sun xVM VirtualBox</translation>
-    </message>
-    <message>
         <source>R&amp;esume</source>
         <translation>បន្�</translation>
     </message>
@@ -4788,10 +5127,6 @@ p, li { white-space: pre-wrap; }
         <translation>ផ្អាក​ប្រ�ិប�្�ិការ​របស់​ម៉ាស៊ីននិម្មិ�</translation>
     </message>
     <message>
-        <source>&lt;h3&gt;Welcome to VirtualBox!&lt;/h3&gt;&lt;p&gt;The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven&apos;t created any virtual machines yet.&lt;img src=:/welcome.png align=right/&gt;&lt;/p&gt;&lt;p&gt;In order to create a new virtual machine, press the &lt;b&gt;New&lt;/b&gt; button in the main tool bar located at the top of the window.&lt;/p&gt;&lt;p&gt;You can press the &lt;b&gt;F1&lt;/b&gt; key to get instant help, or visit &lt;a href=http://www.virtualbox.org&gt;www.virtualbox.org&lt;/a&gt; for the latest information and news.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;h3&gt;សូម​ស្វាគមន�​មក​កាន់​ VirtualBox!&lt;/h3&gt;&lt;p&gt;ផ្នែក​ដែល​នៅ​សល់​របស់​បង្អួច​ន�ះ​​មានបំណង​បង្ហាញ​បញ្ជី​ម៉ាស៊ីន​និម្មិ�​នៅ​លើ​កុំព្យូទ�រ​របស់​អ្នក ។ បញ្ជី​ទទ�​ឥឡូវ​ ពីព្រោះ​អ្នក​មិន​បានបង្កើ�​ម៉ាស៊ីន​និម្មិ�​ណាមួយ​នៅ​ឡើយ​ទ� ។&lt;img src=:/welcome.png align=right/&gt;&lt;/p&gt;&lt;p&gt;ដើម្បី​បង្កើ�​ម៉ាស៊ីន​និម្មិ�​�្មី ចុច​ប៊ុ�ុង &lt;b&gt;�្មី&lt;/b&gt; នៅ​ក្នុង​របារ​ឧបករណ�​ម�​ ដែល​មាន​ទី�ាំង​នៅ​ផ្នែក​�ាង​លើ​របស់​បង្អួច ។&lt;/p&gt;&lt;p&gt;អ្នក​អាច​ចុច​គ្រាប់ចុច &lt;b&gt;F1&lt;/b&gt; ដើម្បី​រកជំនួយ ឬ​ទស្សនា�ំប់​បណ្ដាញ &lt;a href=http://www.virtualbox.org&gt;www.virtualbox.org&lt;/a&gt; សម្រាប់​រក​ព��៌មាន​ដែល​�្មីៗ​បំផុ� ។&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>&amp;Virtual Media Manager...</source>
         <translation>កម្មវិធី​គ្រប់គ្រង​ម៉ាស៊ីន​និម្មិ�...</translation>
     </message>
@@ -4806,31 +5141,31 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Sun VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <translation>Sun VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Import Appliance...</source>
-        <translation type="unfinished"></translation>
+        <translation>នាំ​ចូល​ឧបករណ�​...</translation>
     </message>
     <message>
         <source>Import an appliance into VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <translation>នាំ​ចូលឧបករណ�​ទៅ​ក្នុង​ VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Export Appliance...</source>
-        <translation type="unfinished"></translation>
+        <translation>នាំច�ញឧបករណ�...</translation>
     </message>
     <message>
         <source>Export one or more VirtualBox virtual machines as an appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>នាំ​ច�ញ​​ម៉ាស៊ីន​និម្មិ�​មួយ​ ឬ​ច្រើន​របស់​ VirtualBox ជាឧបករណ�​</translation>
     </message>
     <message>
         <source>Re&amp;fresh</source>
-        <translation type="unfinished">ធ្វើ​ឲ្យ​ស្រស់</translation>
+        <translation>ធ្វើ​ឲ្យ​ស្រស់</translation>
     </message>
     <message>
         <source>&lt;h3&gt;Welcome to VirtualBox!&lt;/h3&gt;&lt;p&gt;The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven&apos;t created any virtual machines yet.&lt;img src=:/welcome.png align=right/&gt;&lt;/p&gt;&lt;p&gt;In order to create a new virtual machine, press the &lt;b&gt;New&lt;/b&gt; button in the main tool bar located at the top of the window.&lt;/p&gt;&lt;p&gt;You can press the &lt;b&gt;%1&lt;/b&gt; key to get instant help, or visit &lt;a href=http://www.virtualbox.org&gt;www.virtualbox.org&lt;/a&gt; for the latest information and news.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h3&gt;សូមស្វាគមន�​​មក​កាន់ VirtualBox !&lt;/h3&gt;&lt;p&gt;ផ្នែកដែល​នៅ​សល់​របស់​បង្អួច​ន�ះ គឺជា​បញ្ជី​ម៉ាស៊ីន​និម្មិ�​នៅ​ក្នុង​កុំព្យូទ�រ​របស់​អ្នក ។ បញ្ជី​ទទ�​ឥឡូវ​ន�ះ ពីព្រោះ​អ្នកមិនបានបង្កើ�​ម៉ាស៊ីននិម្មិ�​នៅ​ឡើយ​ទ� ។&lt;img src=:/welcome.png align=right/&gt;&lt;/p&gt;&lt;p&gt;ដើម្បី​បង្កើ�​ម៉ាស៊ីន​និម្មិ� ចុច​ប៊ូ�ុង &lt;b&gt;�្មី&lt;/b&gt; ក្នុង​របារ​ឧបករណ�​ដែល​មាននៅ​​ផ្នែក​�ាង​លើ​នៃ​បង្អួច ។&lt;/p&gt;&lt;p&gt;អ្នក​អាច​ចុច​គ្រាប់ចុច &lt;b&gt;%1&lt;/b&gt; ដើម្បីទទួល​បាន​ជំនួយ​ភ្លាមៗ ឬ​ចំពោះ​ព��៌មាន​បន្�ែម ​សូម​មើល &lt;a href=http://www.virtualbox.org&gt;www.virtualbox.org&lt;/a&gt; ។&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -4853,63 +5188,39 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>On the &lt;b&gt;%1&lt;/b&gt; page, %2</source>
-        <translation type="unfinished">នៅ​លើ​ទំព�រ &lt;b&gt;%1&lt;/b&gt; %2</translation>
+        <translation>នៅ​លើទំព�រ &lt;b&gt;%1&lt;/b&gt; %2</translation>
     </message>
 </context>
 <context>
     <name>VBoxSnapshotDetailsDlg</name>
     <message>
-        <source>VBoxSnapshotDetailsDlg</source>
-        <translation type="obsolete">VBoxSnapshotDetailsDlg</translation>
-    </message>
-    <message>
-        <source>&amp;Name</source>
-        <translation type="obsolete">ឈ្មោះ</translation>
-    </message>
-    <message>
-        <source>&amp;Description</source>
-        <translation type="obsolete">ស�ចក្ដី​ពិពណ៌នា</translation>
-    </message>
-    <message>
-        <source>&amp;Machine Details</source>
-        <translation type="obsolete">ស�ចក្ដី​លម្អិ�​របស់​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
         <source>Details of %1 (%2)</source>
         <translation>ស�ចក្ដី​លម្អិ�​របស់ %1 (%2)</translation>
     </message>
     <message>
-        <source>Snapshot Details</source>
-        <translation type="obsolete">ស�ចក្ដីលម្អិ�​របស់​​រូប��</translation>
-    </message>
-    <message>
         <source>Click to enlarge the screenshot.</source>
-        <translation type="unfinished"></translation>
+        <translation>ចុច ដើម្បី​ពង្រីក​រូប​��​អ�​ក្រង់​ ។</translation>
     </message>
     <message>
         <source>&amp;Name:</source>
-        <translation type="unfinished">ឈ្មោះ ៖</translation>
+        <translation>ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Taken:</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​�� ៖</translation>
     </message>
     <message>
         <source>&amp;Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>ស�ចក្�ី​ពិពណ៌នា​ ៖</translation>
     </message>
     <message>
         <source>D&amp;etails:</source>
-        <translation type="unfinished"></translation>
+        <translation>ស�ច​ក្�ី​លម្អិ�​ ៖</translation>
     </message>
 </context>
 <context>
     <name>VBoxSnapshotsWgt</name>
     <message>
-        <source>[snapshot]</source>
-        <translation type="obsolete">[រូប��]</translation>
-    </message>
-    <message>
         <source>VBoxSnapshotsWgt</source>
         <translation>VBoxSnapshotsWgt</translation>
     </message>
@@ -4966,68 +5277,44 @@ p, li { white-space: pre-wrap; }
         <translation>រូប�� %1</translation>
     </message>
     <message>
-        <source>&amp;Discard Snapshot</source>
-        <translation type="obsolete">បោះបង់​រូប��</translation>
-    </message>
-    <message>
         <source>Take &amp;Snapshot</source>
         <translation>យក​រូប��</translation>
     </message>
     <message>
-        <source>&amp;Revert to Current Snapshot</source>
-        <translation type="obsolete">�្រឡប់​ទៅ​រូប��​បច្ចុប្បន្ន</translation>
-    </message>
-    <message>
-        <source>D&amp;iscard Current Snapshot and State</source>
-        <translation type="obsolete">បោះបង់​ស្�ានភាព និង​រូប��​បច្ចុប្បន្ន</translation>
-    </message>
-    <message>
         <source>S&amp;how Details</source>
         <translation>បង្ហាញ​ស�ចក្ដី​លម្អិ�</translation>
     </message>
     <message>
-        <source>Discard the selected snapshot of the virtual machine</source>
-        <translation type="obsolete">បោះបង់​រូប��​ដែល​បានជ្រើស​របស់ម៉ាស៊ីន​និម្មិ�</translation>
-    </message>
-    <message>
         <source>Take a snapshot of the current virtual machine state</source>
         <translation>យក​រូប��​របស់​ស្�ានភាព​ម៉ាស៊ីន​និម្មិ�​បច្ចុប្បន្ន</translation>
     </message>
     <message>
-        <source>Restore the virtual machine state from the state stored in the current snapshot</source>
-        <translation type="obsolete">ស្ដារ​ស្�ានភាព​​ម៉ាស៊ីន​និម្មិ�​ពី​ស្�ានភាព​ដែលបាន​ទុក​នៅ​ក្នុង​រូប��​បច្ចុប្បន្ន</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">បោះបង់​រូប��​បច្ចុប្បន្ន​ និង​�្រឡប់​ម៉ាស៊ីន​ទៅ​ស្�ានភាព​ដែល​វា​មុន​នឹង​��​រូប</translation>
-    </message>
-    <message>
         <source>Show the details of the selected snapshot</source>
         <translation>បង្ហាញ​ស�ចក្ដី​លម្អិ�​របស់​រូប��​ដែល​បានជ្រើស</translation>
     </message>
     <message>
         <source> (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation> (%1)</translation>
     </message>
     <message>
         <source>&amp;Restore Snapshot</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ារ​រូប​��​</translation>
     </message>
     <message>
         <source>&amp;Delete Snapshot</source>
-        <translation type="unfinished"></translation>
+        <translation>លុប​រូប��​</translation>
     </message>
     <message>
         <source>Restore the selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ារ​រូប​��​ដែល​បាន​ជ្រើស​របស់​​ម៉ាស៊ីន​និម្មិ�​</translation>
     </message>
     <message>
         <source>Delete the selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>លុប​រូប​��​ដែល​បាន​ជ្រើស​របស់​​ម៉ាស៊ីន​និម្មិ�​</translation>
     </message>
     <message>
         <source> (%1 ago)</source>
-        <translation type="unfinished"></translation>
+        <translation> (%1 កន្លង​ទៅ)</translation>
     </message>
 </context>
 <context>
@@ -5058,7 +5345,7 @@ p, li { white-space: pre-wrap; }
     <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>
+            <numerusform>ការ​ព្រមាន ៖ អ្នកកំពុង​��​រូប​របស់​ម៉ាស៊ីន​ដែល​កំពុង​រ�់ ដែលមាន​រូបភាព​មិនប្រែប្រួល %n បានភ្ជាប់​ទៅកាន់​វា ។ ដ�រាប​ណា​អ្នកកំពុង​ធ្វើការ​​ពី​រូបភាព​ដែល​មិនប្រែប្រួល​ន�ះ នឹង​មិន​�្រូ​វបានកំណ�់​ឡើងវិញ​ ដើម្បី​ចៀសវាង​ពី​ការ​បា�់បង់​ទិន្នន�យ​ទ� ។</numerusform>
         </translation>
     </message>
 </context>
@@ -5066,23 +5353,23 @@ p, li { white-space: pre-wrap; }
     <name>VBoxTextEditor</name>
     <message>
         <source>Edit text</source>
-        <translation type="unfinished"></translation>
+        <translation>កែសម្រួល​អ�្�បទ​</translation>
     </message>
     <message>
         <source>&amp;Replace...</source>
-        <translation type="unfinished"></translation>
+        <translation>ជំនួស​...</translation>
     </message>
     <message>
         <source>Replaces the current text with the content of a file.</source>
-        <translation type="unfinished"></translation>
+        <translation>ជំនួស​អ�្�បទ​បច្ចុប្បន្ន​ដោយ​មា�ិកា​របស់​ឯកសារ​មួយ ។</translation>
     </message>
     <message>
         <source>Text (*.txt);;All (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>អ�្�បទ (*.txt);;All (*.*)</translation>
     </message>
     <message>
         <source>Select a file to open...</source>
-        <translation type="unfinished"></translation>
+        <translation>ជ្រើស​ឯកសារ�្រូវ​បើក...</translation>
     </message>
 </context>
 <context>
@@ -5270,14 +5557,6 @@ p, li { white-space: pre-wrap; }
         <translation>ប្រភព​ម�ឌៀ</translation>
     </message>
     <message>
-        <source>&amp;Host Drive</source>
-        <translation type="obsolete">ដ្រាយ​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
-        <source>&amp;Image File</source>
-        <translation type="obsolete">ឯកសារ​រូបភាព</translation>
-    </message>
-    <message>
         <source>Select Installation Media</source>
         <translation>ជ្រើស​ម�ឌៀ​ដំឡើង</translation>
     </message>
@@ -5298,10 +5577,6 @@ p, li { white-space: pre-wrap; }
         <translation>ឧបករណ�​�ាស​ទន់</translation>
     </message>
     <message>
-        <source>Host Drive %1</source>
-        <translation type="obsolete">ដ្រាយ​ម៉ាស៊ីន %1</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 &lt;b&gt;Settings&lt;/b&gt; from the &lt;b&gt;Machine&lt;/b&gt; menu of the main VirtualBox window to access the settings dialog of this machine and change the hard disk configuration.&lt;/p&gt;&lt;p&gt;Use the &lt;b&gt;Next&lt;/b&gt; button to go to the next page of the wizard and the &lt;b&gt;Back&lt;/b&gt; button to return to the previous page. You can also press &lt;b&gt;Cancel&lt;/b&gt; if you want to cancel the execution of this wizard.&lt;/p&gt;</source>
         <translation>&lt;p&gt;អ្នក​បាន​ចាប់ផ្ដើម​ម៉ាស៊ីន​និម្មិ�​ដែល​ទើប​បានបង្កើ�​�្មី​ជា​លើក​ដំបូង ។ អ្នក​ជំនួយ​ការ​ន�ះ​នឹង​ជួយ​អ្នក​ក្នុងការ​អនុវ�្�​ជំហាន​ដែល​ចាំបាច់​សម្រាប់​ចាប់ផ្ដើម​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ជា​ជម្រើស​របស់​អ្នក​នៅ​លើ​ម៉ាស៊ីន​និម្មិ� ។&lt;/p&gt;&lt;p&gt;ចំណាំ​�ា អ្នក​នឹង​មិន​អាច​ដំឡើង​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ក្នុង​ម៉ាស៊ីន​និម្មិ�​ឥឡូវ​បានទ� ពីព្រោះ​អ្នក​មិន​បាន​ភ្ជាប់​�ាសរឹង​ ។ ប្រសិន​បើ​ន�ះ​មិនមែន​ជា​អ្វី​ដែល​អ្នក​ចង់​បានទ� អ្នក​អាច​បោះបង់​ប្រ�ិប�្�ិការ​នៃ​អ្នក​ជំនួយ​ការ​ន�ះ​បាន ដោយ​ជ្រើស &lt;b&gt;ការ​កំណ�់&lt;/b&gt; ពី​ម៉ឺនុយ​ &lt;b&gt;ម៉ាស៊ីន&lt;/b&gt; របស់​បង្អួច​ VirtualBox ម� ដើម្បី​ចូលដំណើរការ​ប្រអប់​កំណ�់​របស់​ម៉ាស៊ីន​ន�ះ ហើយ​ផ្លាស់ប្ដូរ​កា​រកំណ�់​រចនាសម្ព�ន្ធ​�ាសរឹង ។&lt;/p&gt;&lt;p&gt;ប្រើ​ប៊ូ�ុង &lt;b&gt;បន្ទាប់&lt;/b&gt; ដើម្បី​ទៅ​ទំព�រ​បន្ទាប់​របស់​អ្នក​ជំនួយការ ហើយ​ប៊ូ�ុង &lt;b&gt;�យក្រោយ&lt;/b&gt; ដើម្បី�្រឡប់​ទៅ​ទំព�រ​មុន ។ អ្នក​ក�អា​ច​ចុច &lt;b&gt;បោះបង់&lt;/b&gt; ប្រសិន​បើ​អ្នក​បោះបង់​ប្រ�្�ិការ​អ្នក​ជំនួយការ​ន�ះ ។&lt;/p&gt;</translation>
     </message>
@@ -5330,20 +5605,6 @@ p, li { white-space: pre-wrap; }
         <translation>បន្ទាប់ &gt;</translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If the above is correct, press the &lt;span style=&quot; font-weight:600;&quot;&gt;Finish&lt;/span&gt; button. Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Depending on the type of the setup program, you may need to manually unmount (eject) the media after the setup program reboots the virtual machine, to prevent the installation process from starting again. You can do this by selecting the corresponding &lt;span style=&quot; font-weight:600;&quot;&gt;Unmount...&lt;/span&gt; action in the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; menu&lt;span style=&quot; font-weight:600;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ប្រសិន​បើ​អ្វី​នៅ​�ាង​លើ​�្រឹម�្រូវ ចុចប៊ូ�ុង &lt;span style=&quot; font-weight:600;&quot;&gt;បញ្ចប់&lt;/span&gt; ។ នៅព�ល​អ្នក​ចុច​វា ម�ឌៀ​ដែល​បានជ្រើស​នឹង​�្រូវ​បានម៉ោន​នៅ​លើ​ម៉ាស៊ីន​និម្មិ�​ជា​បណ្ដោះអាសន្ន ហើយ​ម៉ាស៊ីននឹង​ចាប់ផ្ដើម​ប្រ�ិប�្�ិ ។&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;សូម​ចំណាំ​�ា នៅព�ល​អ្នក​បិទ​ម៉ាស៊ីន​និម្មិ� ម�ឌៀ​ដែល​បាន​បញ្ជាក់​នឹង​�្រូវ​បានអាន់ម៉ោន​ដោយ​ស្វ�យ​ប្រវ�្�ិ ហើយ​ឧបករណ�​ចាប់ផ្ដើម​នឹង​កំណ�់​�យ​ទៅ​�ាសរឹង​ដំបូង​វិញ ។&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ដោយ​អាស្រ�យ​លើ​ប្រភ�ទ​កម្មវិធី អ្នក​�្រូវ​អាន់ម៉ោន​ (ច្រានច�ញ) ម�ឌៀ​ដោយ​ដៃ បន្ទាប់​ពី​កម្មវិធី​រៀបចំ​ចាប់ផ្ដើម​ម៉ាស៊ីន​និម្មិ�​ឡើង​វិញ ដើម្បីការពារ​ដំណើរការ​ដំឡើង​ពី​​ការ​ចាប់ផ្ដើម​ម្ដងទៀ� ។ អ្នក​អាច​ធ្វើ​វា​ដោយ​ជ្រើស​សកម្មភាព &lt;span style=&quot; font-weight:600;&quot;&gt;អាន់ម៉ោន...&lt;/span&gt; ដែល​ទាក់ទង​​នៅម៉ឺនុយ &lt;span style=&quot; font-weight:600;&quot;&gt;ឧករណ�&lt;/span&gt; &lt;span style=&quot; font-weight:600;&quot;&gt; ។&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <source>&amp;Finish</source>
         <translation>បញ្ចប់</translation>
     </message>
@@ -5363,7 +5624,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;If the above is correct, press the &lt;b&gt;Finish&lt;/b&gt; button. Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Depending on the type of the setup program, you may need to manually unmount (eject) the media after the setup program reboots the virtual machine, to prevent the installation process from starting again. You can do this by selecting the corresponding &lt;b&gt;Unmount...&lt;/b&gt; action in the &lt;b&gt;Devices&lt;/b&gt; menu.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;​​ចុច​ ប្រ​សិន​បើ​�ាងលើ​​�្រឹម​�្រូវ​ &lt;b&gt;​បញ្ចប់​​&lt;/b&gt; ប៊ូ�ុង​ ។​ លើ​ទី​មួយ​ដែល​អ្នក​ចុច​វា​Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Depending on the type of the setup program, you may need to manually unmount (eject) the media after the setup program reboots the virtual machine, to prevent the installation process from starting again. You can do this by selecting the corresponding &lt;b&gt;Unmount...&lt;/b&gt; action in the &lt;b&gt;Devices&lt;/b&gt; menu.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -5413,14 +5674,6 @@ p, li { white-space: pre-wrap; }
         <translation>គុណភាព​បង្ហាញ​របស់​អ�ក្រង់</translation>
     </message>
     <message>
-        <source>CD/DVD-ROM Statistics</source>
-        <translation type="obsolete">ស្�ិ�ិ​ស៊ីឌី/ឌីវីឌីរ៉ូម</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">ស្�ិ�ិ​អាដាប់ទ�រ​បណ្ដាញ</translation>
-    </message>
-    <message>
         <source>Version %1.%2</source>
         <comment>guest additions</comment>
         <translation>កំណែ %1.%2</translation>
@@ -5444,14 +5697,6 @@ p, li { white-space: pre-wrap; }
         <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>
@@ -5475,27 +5720,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+
+details report (VRDP server port)</comment>
+        <translation type="obsolete">មិនអាច​ប្រើបាន​</translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ិ�ិ​ផ្ទុក​</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>គ្មាន​ឧបករណ�​ផ្ទុក​ទ�​</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>ស្�ិ�ិ​បណ្ដាញ</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="unfinished">មិនអាច​ប្រើបាន​</translation>
     </message>
 </context>
 <context>
     <name>VBoxVMListView</name>
     <message>
         <source>Inaccessible</source>
-        <translation>មិនអាច​ចូលដំណើរការបាន</translation>
+        <translation>មិនអាច​ចូលដំណើរការ​បាន</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;%1&lt;br&gt;&lt;/nobr&gt;&lt;nobr&gt;%2 since %3&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Session %4&lt;/nobr&gt;</source>
@@ -5603,145 +5856,90 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>VBoxVMSettingsCD</name>
-    <message>
-        <source>Host CD/DVD drive is not selected</source>
-        <translation type="obsolete">ដ្រាយ​ស៊ីឌី/ឌីវីឌី​របស់ម៉ាស៊ីន​មិន​�្រូវ​បានជ្រើស​ទ�</translation>
-    </message>
-    <message>
-        <source>CD/DVD image file is not selected</source>
-        <translation type="obsolete">ឯកសារ​រូបភាព​ស៊ីឌី/ឌីវីឌី​មិន​�្រូវ​បានជ្រើស​ទ�</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">នៅព�ល​បាន​គូស​ធីក ចំនួន​ម�ឌៀ​ដែល​បាន​បញ្ជាក់​ទៅ​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​របស់ម៉ាស៊ីន​និម្មិ� ។ ចំណាំ�ា ដ្រាយ​ស៊ីឌី/ឌីវីឌី​�្រូវ​បាន​�ភ្ជាប់​ជា​និច្ច​ទៅកាន់​​ឧបករណ�​បញ្ជា​ IDE ម�​ទីពីរ​របស់​ម៉ាស៊ីន ។</translation>
-    </message>
-    <message>
-        <source>&amp;Mount CD/DVD Drive</source>
-        <translation type="obsolete">ម៉ោន​ដ្រាយ​ស៊ីឌី/ឌីវីឌី</translation>
-    </message>
-    <message>
-        <source>Mounts the specified CD/DVD drive to the virtual CD/DVD drive.</source>
-        <translation type="obsolete">ម៉ោន​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​ដែល​បាន​បញ្ជាក់​ទៅ​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​និម្មិ� ។</translation>
-    </message>
-    <message>
-        <source>Host CD/DVD &amp;Drive</source>
-        <translation type="obsolete">ដ្រាយ​ស៊ីឌី/ឌីវីឌី​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
-        <source>Lists host CD/DVD drives available to mount to the virtual machine.</source>
-        <translation type="obsolete">រាយ​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​ម៉ាស៊ីន​ដែលមាន​ដើម្បីម៉ោន​ទៅកាន់​ម៉ាស៊ីន​និម្មិ� ។</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">នៅព�ល​បាន​គូស​ធីក អនុញ្ញា�​ឲ្យ​ម៉ាស៊ីន​ភ្ញៀវ​ផ្ញើ​ពាក្យ​បញ្ជា ATAPI ទៅ​ដ្រាយ​ម៉ាស៊ីន​ដែល​ធ្វើ​ឲ្យ​វា​អាច​ប្រើ​កម្មវិធីសរស�រស៊ីឌី/ឌីវីឌី​ទៅ​�ាង​ក្នុង​ម៉ាស៊ីន​ VM ។ ចំណាំ​�ា ការ​សរស�រ​ស៊ីឌី​អូឌីយ៉ូ​�ា​ងក្នុង VM មិន​�្រូវ​បានគាំទ្រ​នៅ​ឡើយ​ទ� ។</translation>
-    </message>
-    <message>
-        <source>Enable &amp;Passthrough</source>
-        <translation type="obsolete">បើក​ការ​ពិនិ�្យ​ឆ្លង</translation>
-    </message>
-    <message>
-        <source>Mounts the specified CD/DVD image to the virtual CD/DVD drive.</source>
-        <translation type="obsolete">ម៉ោន​រូបភាព​ស៊ីឌី/ឌីវីឌី​ដែល​បានបញ្ជាក់​ទៅដ្រាយ​ស៊ីឌី/ឌីវីឌី​​និម្មិ� ។</translation>
-    </message>
-    <message>
-        <source>&amp;ISO Image File</source>
-        <translation type="obsolete">ឯកសារ​រូបភាព​​អាយអ�សអូ</translation>
-    </message>
-    <message>
-        <source>Displays the image file to mount to the virtual CD/DVD drive and allows to quickly select a different image.</source>
-        <translation type="obsolete">បង្ហាញ​ឯកសារ​រូបភាព​ដើម្បី​ម៉ោន​ទៅ​ដ្រាយ​ស៊ីឌី/ឌីវិឌី​និម្មិ� ហើយ​អនុញ្ញា�​ឲ្យ​អ្នក​ជ្រើស​រូបភាព​ផ្ស�ង​យ៉ាង​លឿន ។</translation>
-    </message>
-    <message>
-        <source>Invokes the Virtual Media Manager to select a CD/DVD image to mount.</source>
-        <translation type="obsolete">ដកហូ�​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ�​ដើម្បី​ជ្រើស​រូបភាព​ស៊ីឌី/ឌីវីឌី​ដើម្បី​ម៉ោន ។</translation>
-    </message>
-</context>
-<context>
     <name>VBoxVMSettingsDisplay</name>
     <message>
         <source>you have assigned less than &lt;b&gt;%1&lt;/b&gt; of video memory which is the minimum amount required to switch the virtual machine to fullscreen or seamless mode.</source>
-        <translation type="unfinished">អ្នក​បាន​ផ្ដល់​ស�ិ​វីដ�អូ​�ិចជាង &lt;b&gt;%1&lt;/b&gt; សម្រាប់​ស�ិ​វីដ�អូ​ដែល​ជា​ចំនួន​អប្បបរមា​ដែល​បានទាមទារ​ឲ្យ​ប្ដូរ​ម៉ាស៊ីន​និម្មិ�​ទៅ​​របៀប​ព�ញអ�ក្រង់ ឬ​គ្មាន​�្ន�រ ។</translation>
+        <translation>អ្នកបានផ្ដល់​ស�ិវីដ�អូ�ិច​ជាង &lt;b&gt;%1&lt;/b&gt; ដែល​ជា​ចំនួន​អប្បបរមាដែលបានទាមទារ​ដើម្បី​ប្ដូរ​ម៉ាស៊ីន​និម្មិ�​ទៅរបៀប​​ព�ញអ�ក្រង់ ឬ​ពង្រីក ។</translation>
     </message>
     <message>
         <source>you have assigned less than &lt;b&gt;%1&lt;/b&gt; of video memory which is the minimum amount required for HD Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នក​បានផ្ដល់​ស�ិ​វីដ�អូ�ិច​ជាង &lt;b&gt;%1&lt;/b&gt; ដែលជា​ចំនួន​អប្បបរមា​សម្រាប់​វីដ�អូ HD ដើម្បីចាក់​ឲ្យ​មាន​ប្រសិទ្ធភាព ។</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
-        <translation type="unfinished">&lt;qt&gt;%1&amp;nbsp;ម�កាបៃ&lt;/qt&gt;</translation>
+        <translation>&lt;qt&gt;%1&amp;nbsp;ម�កាបៃ&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&amp;Video</source>
-        <translation type="unfinished"></translation>
+        <translation>វីដ�អូ​</translation>
     </message>
     <message>
         <source>Video &amp;Memory:</source>
-        <translation type="unfinished"></translation>
+        <translation>ស�ិ​វីដ�អូ​ ៖</translation>
     </message>
     <message>
         <source>Controls the amount of video memory provided to the virtual machine.</source>
-        <translation type="unfinished">�្រួ�ពិនិ�្យ​ចំនួន​ស�ិ​វីឌីអូ​សរុប​ដែល​បានផ្ដល់​ឲ្យ​ម៉ាស៊ីន​និម្មិ� ។</translation>
+        <translation>�្រួ�ពិនិ�្យ​ចំនួន​ស�ិ​វីដ�​អូ​​ដែល​បានផ្ដល់​ឲ្យ​​ម៉ាស៊ីន​និម្មិ� ។</translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished">ម�កាបៃ</translation>
+        <translation>ម�កាបៃ</translation>
     </message>
     <message>
         <source>Extended Features:</source>
-        <translation type="unfinished">លក្�ណៈសម្ប�្�ិ​ដែល​បានពង្រីក ៖</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 type="unfinished">នៅព�ល​បាន​គូស​ធីគ ម៉ាស៊ីន​និម្មិ�​នឹង​ចូលដំណើរការ​សម�្�ភាព​ក្រាហ្វិក​�្រីមា�្រ​ដែល​មាន​នៅ​លើ​ម៉ាស៊ីន ។</translation>
+        <translation>នៅព�ល​បាន​គូស​ធីក ម៉ាស៊ីន​និម្មិ�​នឹង​ចូលដំណើរការ​សម�្�ភាព​ក្រាហ្វិក​�្រីមា�្រ​ដែល​​អាច​រក​បាន​​នៅ​លើ​ម៉ាស៊ីន ។</translation>
     </message>
     <message>
         <source>Enable &amp;3D Acceleration</source>
-        <translation type="unfinished">បើក​ការបង្កើន​ល្បឿន​�្រីមា�្រ​</translation>
+        <translation>បើក​ការបង្កើន​ល្បឿន​�្រីមា�្រ​</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>
+        <translation>នៅ​ព�ល​ដែល​បាន​គូស​ធីក​ ម៉ាស៊ីន​​និម្មិ�​​នឹង​ចូល​ដំណើរ​ការ​សម�្�​ភាព​​បង្កើនល្បឿន​វីដ�អូ​ដែល​អាច​ប្រើ​​បាន​​លើម៉ាស៊ីន​ ។</translation>
     </message>
     <message>
         <source>Enable &amp;2D Video Acceleration</source>
-        <translation type="unfinished"></translation>
+        <translation>បើក​ការ​បង្កើន​ល្បឿន​ទ្វ�មា�្រ</translation>
     </message>
     <message>
         <source>&amp;Remote Display</source>
-        <translation type="unfinished"></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 type="unfinished">នៅព�ល​បាន​គូស​ធីក VM នឹង​ដើរ�ួ​ជា​ម៉ាស៊ីន​បម្រើ​ពិធីការ​ផ្ទៃ�ុ​ពី​ចម្ងាយ (RDP) ដោយ​អនុញ្ញា�​ឲ្យ​ម៉ាស៊ីនភ្ញៀវ​ពី​ចម្ងាយ​�ភ្ជាប់​ ហើយ​ប្រ�ិប�្�ិ​ VM (នៅ​ព�ល​កំពុង​រ�់) ដោយ​ប្រើ​ម៉ាស៊ីន​ភ្ញៀវ RDP ស្�ង់ដារ ។</translation>
+        <translation>នៅព�ល​បាន​គូស​ធីក VM នឹង​ដើរ�ួ​ជា​ម៉ាស៊ីន​បម្រើ​ពិធីការ​ផ្ទៃ�ុ​ពី​ចម្ងាយ (RDP) ដោយ​អនុញ្ញា�​ឲ្យ​ម៉ាស៊ីនភ្ញៀវ​ពី​ចម្ងាយ​�ភ្ជាប់​ និង​ប្រ�ិប�្�ិ​ VM (នៅ​ព�ល​កំពុង​រ�់) ដោយ​ប្រើ​ម៉ាស៊ីន​ភ្ញៀវ RDP ស្�ង់ដារ ។</translation>
     </message>
     <message>
         <source>&amp;Enable Server</source>
-        <translation type="unfinished"></translation>
+        <translation>បើក​ម៉ាស៊ីនបម្រើ​</translation>
     </message>
     <message>
         <source>Server &amp;Port:</source>
-        <translation type="unfinished">ច្រក​ម៉ាស៊ីន​បម្រើ ៖</translation>
+        <translation>ច្រក​ម៉ាស៊ីនបម្រើ ៖</translation>
     </message>
     <message>
         <source>The VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>ល��​​ច្រក​ម៉ាស៊ីន​​បម្រើ​ VRDP ។ អ្នក​អាច​បញ្ជាក់​​ &lt;tt&gt;0&lt;/tt&gt; (សូន្យ​) ដើម្បី​ជ្រើស​ច្រក​ ៣៣៨៩ ច្រក​ស្�ង់​ដារ​សម្រាប់​ RDP ។</translation>
     </message>
     <message>
         <source>Authentication &amp;Method:</source>
-        <translation type="unfinished">វិធីសាស្�្រ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ ៖</translation>
+        <translation>វិធីសាស្�្រ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ ៖</translation>
     </message>
     <message>
         <source>Defines the VRDP authentication method.</source>
-        <translation type="unfinished">កំណ�់​វិធីសាស្�្រ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​របស់ VRDP ។</translation>
+        <translation>កំណ�់​វិធីសាស្�្រ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​របស់ VRDP ។</translation>
     </message>
     <message>
         <source>Authentication &amp;Timeout:</source>
-        <translation type="unfinished">អស់ព�ល​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ ៖</translation>
+        <translation>អស់ព�ល​ក្នុងការ​​​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ ៖</translation>
     </message>
     <message>
         <source>Specifies the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished">បញ្ជាក់​ការ​អស់ព�លវ�លា​សម្រាប់​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ គិ�​​ជា​មិល្លី​វិនាទី ។</translation>
+        <translation>បញ្ជាក់​ការ​អស់ព�ល ​សម្រាប់​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ គិ�​​ជា​មិល្លី​វិនាទី ។</translation>
     </message>
 </context>
 <context>
@@ -5795,92 +5993,33 @@ p, li { white-space: pre-wrap; }
         <translation>��​ដែល​បានចែករំលែក</translation>
     </message>
     <message>
-        <source>Remote Display</source>
-        <translation type="obsolete">ការ​បង្ហាញ​ពី​ចម្ងាយ</translation>
-    </message>
-    <message>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <source>On the &lt;b&gt;%1&lt;/b&gt; page, %2</source>
-        <translation type="obsolete">នៅ​លើ​ទំព�រ &lt;b&gt;%1&lt;/b&gt; %2</translation>
-    </message>
-    <message>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រព�ន្ធ</translation>
     </message>
     <message>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​</translation>
     </message>
     <message>
         <source>you have selected a 64-bit guest OS type for this VM. As such guests require hardware virtualization (VT-x/AMD-V), this feature will be enabled automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នក​បាន​​ជ្រើស​ប្រ​ភ�ទ​ប្រ​ព�ន្ធ​ប្រ​�ិប�្�ិ​​ការ​ម៉ាស៊ីន​ភ្ញៀវ​ ៦៤​-​ប៊ី�​ សម្រាប់​​ VM ន�ះ​ ។ ជាក់​ស្�ែង​ ដូច​ម៉ាស៊ីន​ភ្ញៀវ​ទាមទារ​�ាសរឹង​ (VT-x/AMD-V) លក្�ណៈ​ពិស�ស​ន�ះ​នឹង​�្រូវ​បាន​បើក​ដោយ​ស្វ�យ​ប្រ​វ�្�ិ​ ។</translation>
     </message>
     <message>
         <source>you have selected a 64-bit guest OS type for this VM. VirtualBox does not currently support more than one virtual CPU for 64-bit guests executed on 32-bit hosts.</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នក​​បាន​ជ្រើស​​ប្រ​ភ�ទ​ប្រ​ព�ន្ធ​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន​ភ្ញៀវ​ ៦៤​-​ប៊ី�​ សម្រាប់​​ VM ន�ះ​ ។ បច្ចុប្បន្ន​ VirtualBox មិន​គាំ​ទ្រ​​ស៊ី​ភី​យូ​និម្មិ�​ច្រើន​ជាង​មួយសម្រាប់​​ម៉ាស៊ីន​ភ្ញៀវ​ ៦៤​-​ប៊ី�​​ដែល​បាន​ប្រ�ិប�្�ិ​ការ​លើ​ម៉ាស៊ីន​​ ៣២​-​ប៊ី�​ ។</translation>
     </message>
     <message>
         <source>you have 2D Video Acceleration enabled. As 2D Video Acceleration is supported for Windows guests only, this feature will be disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VBoxVMSettingsFD</name>
-    <message>
-        <source>Host floppy drive is not selected</source>
-        <translation type="obsolete">ដ្រាយ​�ាស​ទន់​របស់ម៉ាស៊ីន​មិន​�្រូវ​បាន​ជ្រើស​ទ�</translation>
-    </message>
-    <message>
-        <source>Floppy image file is not selected</source>
-        <translation type="obsolete">ឯកសារ​រូបភាព​�ាសទន់​មិន​�្រូវ​បាន​ជ្រើស​ទ�</translation>
-    </message>
-    <message>
-        <source>When checked, mounts the specified media to the Floppy drive of the virtual machine.</source>
-        <translation type="obsolete">នៅព�លបានគូសធីក ម៉ោន​ម�ឌៀ​ដែលបានបញ្ជាក់​ទៅ​ដ្រាយ​�ាស​ទន់​របស់​ម៉ាស៊ីន​និម្មិ� ។</translation>
-    </message>
-    <message>
-        <source>&amp;Mount Floppy Drive</source>
-        <translation type="obsolete">ម៉ោន​ដ្រាយ​�ាស​ទន់</translation>
-    </message>
-    <message>
-        <source>Mounts the specified host Floppy drive to the virtual Floppy drive.</source>
-        <translation type="obsolete">ម៉ោន​ដ្រាយ​�ាសទន់​របស់ម៉ាស៊ីន​ដែល​បាន​បញ្ជាក់​ទៅដ្រាយ​�ាសទន់​និម្មិ� ។</translation>
-    </message>
-    <message>
-        <source>Host Floppy &amp;Drive</source>
-        <translation type="obsolete">ដ្រាយ​�ាសទន់​របស់​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
-        <source>Lists host Floppy drives available to mount to the virtual machine.</source>
-        <translation type="obsolete">រាយ​ដ្រាយ​�ាសទន់​ម៉ាស៊ីន​ដែល​អាច​ម៉ោន​ទៅ​ម៉ាស៊ីន​និម្មិ�​បាន ។</translation>
-    </message>
-    <message>
-        <source>Mounts the specified Floppy image to the virtual Floppy drive.</source>
-        <translation type="obsolete">ម៉ោន​រូបភាព​�ាសទន់​ដែល​បាន​បញ្ជាក់ទៅដ្រាយ​�ាសទន់​និម្មិ� ។</translation>
-    </message>
-    <message>
-        <source>&amp;Image File</source>
-        <translation type="obsolete">ឯកសារ​រូបភាព</translation>
-    </message>
-    <message>
-        <source>Displays the image file to mount to the virtual Floppy drive and allows to quickly select a different image.</source>
-        <translation type="obsolete">បង្ហាញ​ឯកសារ​រូបភាព​ដើម្បីម៉ោន​ទៅកាន់ដ្រាយ​�ាសទន់​និម្មិ� ហើយ​អនុញ្ញា�​ឲ្យ​ជ្រើស​រូបភាព​ផ្ស�ងៗ​យ៉ាង​លឿន ។</translation>
-    </message>
-    <message>
-        <source>Invokes the Virtual Media Manager to select a Floppy image to mount.</source>
-        <translation type="obsolete">ដកហូ�​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ�​ ដើម្បី​ជ្រើស​រូបភាព​�ាសទន់​ដើម្បី​ម៉ោន ។</translation>
+        <translation>អ្នកបាន​បើក​បង្កើនល្បឿន​​វី​ដ�អូ​​ទ្វ�​​មា�្រ​ ។ បង្កើនល្បឿន​វីដ�អូ​​ទ្វ�​មា�្រ​​�្រូវ​បាន​គាំ​ទ្រ​សម្រាប់​​​ម៉ាស៊ីន​វីនដូ​�ែ​ប៉ុ​ណ្ណោះ​ លក្�ណៈ​ពិស�សន�ះ​​នឹង​​មិន​�្រូវ​បាន​អនុញ្ញា�​ ។​</translation>
     </message>
 </context>
 <context>
     <name>VBoxVMSettingsGeneral</name>
     <message>
-        <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;%1&amp;nbsp;ម�កាបៃ&lt;/qt&gt;</translation>
-    </message>
-    <message>
         <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>បង្ហាញ​ផ្លូវ​ដែល​រូប��​របស់ម៉ាស៊ីន​និម្មិ�​ន�ះ​នឹង​�្រូ​វបានផ្ទុក ។ ចំណាំ​�ា រូប��​អាចចាប់យក​​ទំហំ​�ាស​ជា​ច្រើន​​យ៉ាង​ស្ងៀវស្ងា�់​ ។</translation>
     </message>
@@ -5889,10 +6028,6 @@ p, li { white-space: pre-wrap; }
         <translation>មូលដ្ឋាន</translation>
     </message>
     <message>
-        <source>Identification</source>
-        <translation type="obsolete">ការ​កំណ�់​អ�្�សញ្ញាណ</translation>
-    </message>
-    <message>
         <source>&amp;Name:</source>
         <translation>ឈ្មោះ ៖</translation>
     </message>
@@ -5901,102 +6036,10 @@ p, li { white-space: pre-wrap; }
         <translation>បង្ហាញ​ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិ� ។</translation>
     </message>
     <message>
-        <source>Base &amp;Memory Size</source>
-        <translation type="obsolete">ទំហំ​ស�ិ​មូលដ្ឋាន</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">�្រួ�ពិនិ�្យ​ចំនួន​ស�ិ​ដែលបានផ្ដល់​ទៅ​ម៉ាស៊ីន​និម្មិ� ។ ប្រសិនបើ​អ្នក​ផ្ដល់​ច្រើនព�ក ម៉ាស៊ីន​មិនអាច​ចាប់ផ្ដើម​បានទ� ។</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">ម�កាបៃ</translation>
-    </message>
-    <message>
-        <source>&amp;Video Memory Size</source>
-        <translation type="obsolete">ទំហំ​ស�ិ​វីដ�អូ</translation>
-    </message>
-    <message>
-        <source>Controls the amount of video memory provided to the virtual machine.</source>
-        <translation type="obsolete">�្រួ�ពិនិ�្យ​ចំនួន​ស�ិ​វីឌីអូ​សរុប​ដែល​បានផ្ដល់​ឲ្យ​ម៉ាស៊ីន​និម្មិ� ។</translation>
-    </message>
-    <message>
         <source>&amp;Advanced</source>
         <translation>កម្រិ��្ពស់</translation>
     </message>
     <message>
-        <source>Boo&amp;t Order:</source>
-        <translation type="obsolete">លំដាប់​ចាប់ផ្ដើម ៖</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">កំណ�់​លំដាប់​ឧបករណ�​ចាប់ផ្ដើម ។ ប្រើ​ប្រអប់​គូសធីក​នៅ​�ា​ងឆ្វ�ង​ដើម្បី​បើក ​ឬ​បិទ​ឧបករណ�​ចាប់ផ្ដើម​នីមួយៗ ។ ផ្លាស់ទីធា�ុ​ឡើង​លើ និង​ចុះក្រោម​ដើម្បី​ផ្លាស់ប្ដូរ​លំដាប់​ឧបករណ� ។</translation>
-    </message>
-    <message>
-        <source>[device]</source>
-        <translation type="obsolete">[ឧបករណ�]</translation>
-    </message>
-    <message>
-        <source>Move Up (Ctrl-Up)</source>
-        <translation type="obsolete">ផ្លាស់ទីឡើង​លើ (បញ្ជា(Ctrl)-Up)</translation>
-    </message>
-    <message>
-        <source>Moves the selected boot device up.</source>
-        <translation type="obsolete">ផ្លាស់ទី​ឧបករណ�​ចាប់ផ្ដើម​ដែល​បានជ្រើ​សឡើង​លើ ។</translation>
-    </message>
-    <message>
-        <source>Move Down (Ctrl-Down)</source>
-        <translation type="obsolete">ផ្លាស់ទី​ចុះក្រោម (បញ្ជា(Ctrl)-Down)</translation>
-    </message>
-    <message>
-        <source>Moves the selected boot device down.</source>
-        <translation type="obsolete">ផ្លាស់ទី​ឧបករណ�​ចាប់ផ្ដើម​ដែល​បាន​ជ្រើស​ចុះក្រោម ។</translation>
-    </message>
-    <message>
-        <source>Extended Features:</source>
-        <translation type="obsolete">លក្�ណៈសម្ប�្�ិ​ដែល​បានពង្រីក ៖</translation>
-    </message>
-    <message>
-        <source>When checked, the virtual machine will support the Advanced Configuration and Power Management Interface (ACPI). &lt;b&gt;Note:&lt;/b&gt; don&apos;t disable this feature after having installed a Windows guest operating system!</source>
-        <translation type="obsolete">នៅព�ល​បានគូស​ធីក​ ម៉ាស៊ីន​និម្មិ�​នឹង​គាំទ្រ​ការ​កំណ�់​រចនាសម្ព�ន្ធ​កម្រិ�​�្ពស់ និង​ចំណុច​ប្រទាក់​គ្រប់គ្រង​�ាមពល (ACPI) ។ &lt;b&gt;ចំណាំ ៖&lt;/b&gt; កុំ​បិទ​លក្�ណៈពិស�ស​ន�ះ​ បន្ទាប់​ពី​បានដំឡើង​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​វីនដូ​របស់ម៉ាស៊ីន​ភ្ញៀវ !</translation>
-    </message>
-    <message>
-        <source>Enable A&amp;CPI</source>
-        <translation type="obsolete">បើក ACPI</translation>
-    </message>
-    <message>
-        <source>When checked, the virtual machine will support the Input Output APIC (IO APIC), which may slightly decrease performance. &lt;b&gt;Note:&lt;/b&gt; don&apos;t disable this feature after having installed a Windows guest operating system!</source>
-        <translation type="obsolete">នៅព�ល​បាន​គូស​ធីក ម៉ាស៊ីន​និម្មិ�​នឹង​គាំទ្រ​ Input Output APIC (IO APIC) ដែល​អាច​បន្�យ​ការ​អនុវ�្�​របស់ VM �ិច�ួច ។ &lt;b&gt;ចំណាំ ៖&lt;/b&gt; កុំ​បិទ​លក្�ណៈ​ពិស�ស​ន�ះ​បន្ទាប់ពី​ដំឡើង​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​វីនដូ​របស់ម៉ាស៊ីន​ភ្ញៀវ !</translation>
-    </message>
-    <message>
-        <source>Enable IO A&amp;PIC</source>
-        <translation type="obsolete">បើក IO APIC</translation>
-    </message>
-    <message>
-        <source>When checked, the virtual machine will try to make use of the host CPU&apos;s hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
-        <translation type="obsolete">នៅព�ល​បាន​គូស​ធីគ ម៉ាស៊ីន​និម្មិ�​នឹង​ព្យាយាម​ប្រាកដ​�ា​ផ្នែក​បន្�ែម​និម្មិ�​ផ្នែក​រឹង​របស់​ស៊ីភីយូ​របស់ម៉ាស៊ីន​ដូចជា Intel VT-x និង AMD-V ។</translation>
-    </message>
-    <message>
-        <source>Enable &amp;VT-x/AMD-V</source>
-        <translation type="obsolete">បើក VT-x/AMD-V</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="obsolete">នៅព�ល​បាន​គូស​ធីក លក្�ណៈពិស�ស​របស់ Physical Address Extension (PAE) នៃ​ស៊ីភីយូ​របស់​ម៉ាស៊ីន​នឹង​�្រូវ​បានបង្ហាញ​ដល់​ម៉ាស៊ីន​និម្មិ� ។</translation>
-    </message>
-    <message>
-        <source>Enable PA&amp;E/NX</source>
-        <translation type="obsolete">បើក PAE/NX</translation>
-    </message>
-    <message>
         <source>&amp;Shared Clipboard:</source>
         <translation>ក្ដារ�ម្បៀ��្ទាស់​ដែល​បាន​ចែករំលែក ៖</translation>
     </message>
@@ -6005,14 +6048,6 @@ p, li { white-space: pre-wrap; }
         <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>
-        <translation type="obsolete">កំណ�់ប្រភ�ទ​ឧបករណ�​បញ្ជា IDE និម្មិ� ។ ដោយ​អាស្រ�យ​លើ​�ម្លៃ​ន�ះ VirtualBox នឹង​ផ្ដល់​នូវ​ឧបករណ�​ផ្នែក​រឹង IDE ផ្ស�ងៗ​គ្នា​ដល់​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</translation>
-    </message>
-    <message>
-        <source>&amp;IDE Controller Type:</source>
-        <translation type="obsolete">ប្រភ�ទ​វ�្�ុ​បញ្ជា IDE ៖</translation>
-    </message>
-    <message>
         <source>S&amp;napshot Folder:</source>
         <translation>��​រូប�� ៖</translation>
     </message>
@@ -6025,348 +6060,256 @@ p, li { white-space: pre-wrap; }
         <translation>បង្ហាញ​ស�ចក្ដីពិពណ៌នា​របស់ម៉ាស៊ីន​និម្មិ� ។ វាល​ស�ចក្ដី​ពិពន៌នា​មានប្រយោជន�​សម្រាប់​ផ្ដល់​យោបល់​អំពី​ស�ចក្ដី​លម្អិ�​កំណ�់​រចនាសម្ព�ន្ធ​របស់​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន​ភ្ញៀវ​ដែល​បាន​ដំឡើង ។</translation>
     </message>
     <message>
-        <source>&amp;Other</source>
-        <translation type="obsolete">ផ្ស�ងៗ</translation>
-    </message>
-    <message>
         <source>If checked, any change to mounted CD/DVD or Floppy media performed during machine execution will be saved in the settings file in order to preserve the configuration of mounted media between runs.</source>
         <translation>ប្រសិនបើបាន​គូស​ធីក ការ​ផ្លាស់ប្ដូរ​ទៅ​ម�ឌៀ​�ាសទន់ ឬ​ស៊ីឌី/ឌីវីឌី​ដែល​បានម៉ោន​ បាន អនុវ�្�​កំឡុង​ព�ល​​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន នឹង​�្រូវ​បាន​រក្សាទុក​ក្នុង​ឯកសារ​កំណ�់​ ដើម្បី​បម្រុង​ទុក​នូវ​ការ​កំណ�់​រចនាសម្ព�ន្ធ​របស់​ម�ឌៀ​ដែល​បានម៉ោន​​ចន្លោះ​ព�ល​រ�់ ។</translation>
     </message>
     <message>
-        <source>&amp;Remember Mounted Media</source>
-        <translation type="obsolete">ម�ឌៀ​ដែលបាន​ម៉ោន​សមាជិក</translation>
-    </message>
-    <message>
-        <source>Runtime:</source>
-        <translation type="obsolete">ព�លវ�លា​រ�់៖</translation>
-    </message>
-    <message>
-        <source>you have assigned more than &lt;b&gt;75%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%1&lt;/b&gt;) to the virtual machine. Not enough memory is left for your host operating system. Please select a smaller amount.</source>
-        <translation type="obsolete">អ្នក​បានផ្ដល់​ស�ិ​កុំព្យូទ�រ​ច្រើនជាង &lt;b&gt;75%&lt;/b&gt; នៃកុំព្យូទ�រ​របស់ (&lt;b&gt;%1&lt;/b&gt;) ដល់​ម៉ាស៊ីន​និម្មមិ� ។ គ្មាន​ស�ិ​នៅសល់​គ្រប់គ្រាន់​សម្រាប់ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន​របស់​អ្នក​ទ� ។ សូម​ជ្រើស​ចំនួន​ស�ិ​�ូចជាង​ន�ះ ។</translation>
-    </message>
-    <message>
-        <source>you have assigned more than &lt;b&gt;50%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%1&lt;/b&gt;) 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">អ្នក​បានផ្ដល់​សិ�​កុំព្យូទ�រ​ច្រើនជាង &lt;b&gt;50%&lt;/b&gt; នៃ​ស�ិ​កុំព្យូទ�រ​របស់​អ្នក (&lt;b&gt;%1&lt;/b&gt;) ដល់​ម៉ាស៊ីន​និម្មិ� ។ គ្មាន​ស�ិ​គ្រប់គ្រាន់​នៅ​សល់​សម្រាប់​ប្រព�ន្ធ​ប្រ�ិប�្�ិកា​រម៉ាស៊ីន​របស់​អ្នក​ទ� ។ បន្�​​ទាំង​គ្រោះ�្នាក់ឬ ?</translation>
-    </message>
-    <message>
-        <source>you have assigned less than &lt;b&gt;%1&lt;/b&gt; of video memory which is the minimum amount required to switch the virtual machine to fullscreen or seamless mode.</source>
-        <translation type="obsolete">អ្នក​បាន​ផ្ដល់​ស�ិ​វីដ�អូ​�ិចជាង &lt;b&gt;%1&lt;/b&gt; សម្រាប់​ស�ិ​វីដ�អូ​ដែល​ជា​ចំនួន​អប្បបរមា​ដែល​បានទាមទារ​ឲ្យ​ប្ដូរ​ម៉ាស៊ីន​និម្មិ�​ទៅ​​របៀប​ព�ញអ�ក្រង់ ឬ​គ្មាន​�្ន�រ ។</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="obsolete">នៅព�ល​បាន​គូស​ធីគ ម៉ាស៊ីន​និម្មិ�​នឹង​ចូលដំណើរការ​សម�្�ភាព​ក្រាហ្វិក​�្រីមា�្រ​ដែល​មាន​នៅ​លើ​ម៉ាស៊ីន ។</translation>
-    </message>
-    <message>
-        <source>Enable &amp;3D Acceleration</source>
-        <translation type="obsolete">បើក​ការបង្កើន​ល្បឿន​�្រីមា�្រ​</translation>
-    </message>
-    <message>
         <source>Removable Media:</source>
-        <translation type="unfinished"></translation>
+        <translation>ម�ឌៀ​ចល�� ៖</translation>
     </message>
     <message>
         <source>&amp;Remember Runtime Changes</source>
-        <translation type="unfinished"></translation>
+        <translation>ចង់​ចាំ​ការផ្លាស់​ប្�ូរ​ព�ល​ដំណើរ​ការ​</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារ​ឧបករណ�​�ូច​ក្នុងរបៀប​​អ�​​ក្រង់​ព�ញ​ និង​​​ព​ង្រីក​ ។</translation>
     </message>
     <message>
         <source>Show In &amp;Fullscreen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>​បង្ហាញ​អ�​ក្រង់​ព�ញ​​/​ពង្រីក​</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="unfinished"></translation>
+        <translation>ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារឧបករណ�​�ូច​​នៅ​ផ្នែក�ាង​លើ​​អ�ក្រង់​ ជា​ជាង​ក្នុង​ទី​�ាំង​លំនាំ​ដើម​នៃ​ប៊ូ�ុង​របស់​អ�ក្រង់​ ។</translation>
     </message>
     <message>
         <source>Show At &amp;Top Of Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​កំពូល​​អ�ក្រង់​</translation>
     </message>
 </context>
 <context>
     <name>VBoxVMSettingsHD</name>
     <message>
-        <source>No hard disk is selected for &lt;i&gt;%1&lt;/i&gt;</source>
-        <translation type="obsolete">គ្មាន​�ាសរឹង​�្រូវ​បាន​​ជ្រើស​សម្រាប់ &lt;i&gt;%1&lt;/i&gt; នោះទ�</translation>
-    </message>
-    <message>
-        <source>&lt;i&gt;%1&lt;/i&gt; uses the hard disk that is already attached to &lt;i&gt;%2&lt;/i&gt;</source>
-        <translation type="obsolete">&lt;i&gt;%1&lt;/i&gt; ប្រើ�ាសរឹង​ដែល​�្រូវ​បាន​ភ្ជាប់​ទៅ កាន់ &lt;i&gt;%2&lt;/i&gt; រួច​​ហើយ</translation>
-    </message>
-    <message>
-        <source>&amp;Add Attachment</source>
-        <translation type="obsolete">បន្�ែម​ការ​ភ្ជាប់</translation>
-    </message>
-    <message>
-        <source>&amp;Remove Attachment</source>
-        <translation type="obsolete">យក​កា​រភ្ជាប់​ច�ញ</translation>
-    </message>
-    <message>
-        <source>&amp;Select Hard Disk</source>
-        <translation type="obsolete">ជ្រើស​�ាសរឹង​�្មី</translation>
-    </message>
-    <message>
-        <source>Adds a new hard disk attachment.</source>
-        <translation type="obsolete">បន្�ែម​កា​រភ្ជាប់​�ាសរឹង​�្មី ។</translation>
-    </message>
-    <message>
-        <source>Removes the highlighted hard disk attachment.</source>
-        <translation type="obsolete">យក​កា​រភ្ជាប់​�ាសរឹង​ដែល​បាន​បន្លិច​ច�ញ ។</translation>
-    </message>
-    <message>
-        <source>When checked, enables the virtual SATA controller of this machine. Note that you cannot attach hard disks to SATA ports when the virtual SATA controller is disabled.</source>
-        <translation type="obsolete">នៅព�ល​បានគូស​ធីក បើក​ឧបករណ�​�្រួ�ពិនិ�្យ​ SATA និម្មិ�​របស់​ម៉ាស៊ីន​ន�ះ ។ ចំណាំ​�ា អ្នក​មិនអាច​ភ្ជាប់​�ាសរឹង​ទៅច្រក SATA បាន​ទ� នៅព�ល​ដែល​បិទ​ឧបករណ�​�្រួ�ពិនិ�្យ​ SATA និម្មិ� ។</translation>
-    </message>
-    <message>
-        <source>&amp;Enable SATA Controller</source>
-        <translation type="obsolete">បើក​​ឧបករណ�​�្រួ�ពិនិ�្យ​ SATA</translation>
-    </message>
-    <message>
-        <source>&amp;Attachments</source>
-        <translation type="obsolete">ការ​ភ្ជាប់</translation>
-    </message>
-    <message>
-        <source>Lists all hard disks attached to this machine. Use a mouse click or the &lt;tt&gt;Space&lt;/tt&gt; key on the highlighted item to activate the drop-down list and choose the desired value. Use the context menu or buttons to the right to add or remove hard disk attachments.</source>
-        <translation type="obsolete">រាយ​�ាសរឹង​ទាំង​អស់​ដែលបានភ្ជាប់​ទៅ​ម៉ាស៊ីនន�ះ ។ ប្រើ​ការ​ចុច​កណ្ដុរ​​ឬ​គ្រាប់ចុច​ &lt;tt&gt;ចន្លោះ​មិនឃើញ (Space)&lt;/tt&gt; នៅ​លើ​ធា�ុ​ដែល​បាន​បន្លិច ដើម្បី​ធ្វើ​ឲ្យ​បញ្ជីទម្លាក់ចុះ​សកម្ម ហើយ​ជ្រើស​�ម្លៃ​ដែល​ចង់​បាន ។ ប្រើម៉ឺនុយ​បរិបទ​ ឬ​ប៊ូ�ុង​​នៅ​�ាង​ស្ដាំ​ ដើម្បី​បន្�ែម​ ឬ​យក​ការ​ភ្ជាប់​�ាសរឹង​ច�ញ ។</translation>
-    </message>
-    <message>
-        <source>Invokes the Virtual Media Manager to select a hard disk to attach to the currently highlighted slot.</source>
-        <translation type="obsolete">ដកហូ�​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ� ដើម្បី​ជ្រើស​�ាសរឹង �្រូវ​ភ្ជាប់​ទៅ​រន្ធ​ដែល​បាន​បន្លិច​បច្ចុប្បន្ន ។</translation>
-    </message>
-    <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>ប្រសិនបើ​បានគូសធីគ វា​នឹង​បង្ហាញ​�ាសរឹង​ផ្ស�ងៗ​ដែល​បានភ្ជាប់​ទៅ​រន្ធ​ជំនួស​ឲ្យ​�ាសរឹង​មូលដ្ឋាន​​របស់​ពួកវា (បង្ហាញ�ែ​ក្នុងករណី​ដែល​មានការ​ភ្ជាប់​ដោយ​ប្រយោល​ប៉ុណ្ណោះ) ហើយ​នឹង​អនុញ្ញា�​ឲ្យ​ភ្ជាប់​�ាសរឹង​ផ្ស�ងៗ​ផងដែរ ។ គូស​ធីក​�ែ​ក្នុងករណី​ដែល​អ្នក​�្រូវការ​ការ​រៀបចំ​�ាសរឹង​ស្មុគស្មាញ​ប៉ុណ្ណោះ ។</translation>
     </message>
     <message>
-        <source>&amp;Show Differencing Hard Disks</source>
-        <translation type="obsolete">បង្ហាញ​�ាសរឹង​ផ្ស�ងៗ​គ្នា</translation>
-    </message>
-    <message>
         <source>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Bus:&amp;nbsp;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;Type:&amp;nbsp;&amp;nbsp;%3&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;​�្សែ​បញ្ជួន​ ៖ &amp;nbsp;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;ប្រភ�ទ​ ៖&amp;nbsp;&amp;nbsp;%3&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Expand/Collapse&amp;nbsp;Item&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;ពង្រីក​​/​វ�ញ&amp;nbsp; ធា�ុ​&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Add&amp;nbsp;Hard&amp;nbsp;Disk&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;បន្�ែម&amp;nbsp;�ាសរឹង&amp;nbsp;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Add&amp;nbsp;CD/DVD&amp;nbsp;Device&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;បន្�ែម​ឧបករណ�&amp;nbsp;ស៊ីឌី/ឌីវឌី&amp;nbsp;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Add&amp;nbsp;Floppy&amp;nbsp;Device&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;បន្�ែម​ឧបករណ�&amp;nbsp;�ាសទន់&amp;nbsp;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>No hard disk is selected for &lt;i&gt;%1&lt;/i&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>មិន​មាន​�ាស​រឹង​​�្រូវ​បាន​ជ្រើស​​សម្រាប់&lt;i&gt;%1&lt;/i&gt; នោះ​ទ� ។</translation>
     </message>
     <message>
         <source>&lt;i&gt;%1&lt;/i&gt; uses a medium that is already attached to &lt;i&gt;%2&lt;/i&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;i&gt;%1&lt;/i&gt;ប្រើ�្នា�​​មធ្យម​ដែល​ភ្ជាប់​ទៅ​កាន់&lt;i&gt;%2&lt;/i&gt;រួច​ហើយ​​​ ។</translation>
     </message>
     <message>
         <source>Add Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​ឧបករណ�​បញ្ជា​</translation>
     </message>
     <message>
         <source>Add IDE Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​វ�្�ុ​បញ្ជា IDE</translation>
     </message>
     <message>
         <source>Add SATA Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​វ�្�ុ​បញ្ជា SATA</translation>
     </message>
     <message>
         <source>Add SCSI Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​វ�្�ុ​បញ្ជា​ SCSI</translation>
     </message>
     <message>
         <source>Add Floppy Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​ឧបករណ�​បញ្ជា​�ាសទន់​</translation>
     </message>
     <message>
         <source>Remove Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>យក​វ�្�ុ​បញ្ជា​ច�ញ​</translation>
     </message>
     <message>
         <source>Add Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​ឯកសារ​ភ្ជាប់​</translation>
     </message>
     <message>
         <source>Add Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​�ាស​រឹង​</translation>
     </message>
     <message>
         <source>Add CD/DVD Device</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​ឧបករណ�​ស៊ីឌី/ឌីវីឌី</translation>
     </message>
     <message>
         <source>Add Floppy Device</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​ឧបករណ�​�ាស​ទន់​</translation>
     </message>
     <message>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>យក​ឯកសារ​ភ្ជាប់​ច�ញ​</translation>
     </message>
     <message>
         <source>Adds a new controller to the end of the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​វ�្�ុ​បញ្ជា​�្មី​ទៅ​ចុង​មែកធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>Removes the controller highlighted in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>យក​ឧបករណ�​បញ្ជា​ដែលបានបន្លិច​ច�ញ​នៅ​ក្នុង​មែកធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>Adds a new attachment to the Storage Tree using currently selected controller as parent.</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​ឯកសារ​ភ្ជាប់�្មី​ទៅ​​មែក​ធាង​ផ្ទុក ដោយ​ប្រើ​​កម្មវិធីបញ្ជាដែលបានជ្រើស​ជា​ម�​ ។</translation>
     </message>
     <message>
         <source>Removes the attachment highlighted in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>យក​ឯកសារ​ភ្ជាប់​ដែល​បាន​បន្លិច​ច�ញ​នៅ​ក្នុង​មែកធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>IDE Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​បញ្ជា​ IDE</translation>
     </message>
     <message>
         <source>SATA Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​បញ្ជា​ SATA</translation>
     </message>
     <message>
         <source>SCSI Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​​​បញ្ជា​ SCSI</translation>
     </message>
     <message>
         <source>Floppy Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​បញ្ជា​�ាស​ទន់​</translation>
     </message>
     <message>
         <source>Hard &amp;Disk:</source>
-        <translation type="unfinished"></translation>
+        <translation>�ាស​រឹង​ ៖</translation>
     </message>
     <message>
         <source>&amp;CD/DVD Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ�​​ស៊ី​ឌី​​/ឌីវីឌី ៖</translation>
     </message>
     <message>
         <source>&amp;Floppy Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>ឧបករណ��ាសទន់ ៖</translation>
     </message>
     <message>
         <source>&amp;Storage Tree</source>
-        <translation type="unfinished"></translation>
+        <translation>មែក​ធាង​ផ្ទុក​</translation>
     </message>
     <message>
         <source>Contains 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>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>​ព��៌​មាន​</translation>
     </message>
     <message>
         <source>The Storage Tree can contain several controllers of different types. This machine currently has no controllers.</source>
-        <translation type="unfinished"></translation>
+        <translation>មែក​ធាង​ផ្ទុក​អាច​មាន​ឧបករណ�​បញ្ជា​​​បី​ បួន​​​​ប្រ​ភ�ទ​�ុសៗ​គ្នា​ ។ ម៉ាស៊ីន​បច្ចុប្បន្ន​ន�ះ មិន​មាន​ឧបករណ�​បញ្ជា​ឡើយ​ ។</translation>
     </message>
     <message>
         <source>Attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>គុណ​លក្�ណៈ</translation>
     </message>
     <message>
         <source>&amp;Name:</source>
-        <translation type="unfinished">ឈ្មោះ ៖</translation>
+        <translation>ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Changes the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្�ូរ​ឈ្មោះ​របស់​ឧបករណ�​បញ្ជា​ផ្ទុក ​បច្ចុប្បន្ន​ដែល​បានជ្រើស​ក្នុ​ងមែក​ធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>&amp;Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រភ�ទ ៖</translation>
     </message>
     <message>
         <source>Selects the sub-type of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>​ជ្រើស​ប្រ​ភ�ទ​រង​​របស់​ឧបករណ�​បញ្ជា​ផ្ទុក​បច្ចុប្បន្ន​ដែល​បាន​ជ្រើស​ក្នុ​ង​មែក​ធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>S&amp;lot:</source>
-        <translation type="unfinished"></translation>
+        <translation>រន្ធ ៖</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 type="unfinished"></translation>
+        <translation>ជ្រើស​រន្ធ​លើ​ឧបករណ�​បញ្ជា​ផ្ទុក ​ដែល​បាន​ប្រើ​ដោយ​ឯកសារ​ភ្ជាប់​ន�ះ​ ។​ ​រន្ធ​ដែលអាចរកបានអាស្រ�យ​​លើ​ប្រ​ភ�ទ​របស់​ឧបករណ�បញ្ជា​ និង​ឯកសារ​ភ្ជាប់​​​​លើ​វាផ្ស�ង​ទៀ�​​ ។</translation>
     </message>
     <message>
         <source>Selects the virtual disk image or the host drive used by this attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>ជ្រើស​រូប​ភាព​�ាស​​និម្មិ�​ ឬ​ដ្រាយ​ម៉ាស៊ីន​ដែល​បាន​ប្រើ ​ដោយ​ឯក​សារ​ភ្ជាប់​ន�ះ​ ។</translation>
     </message>
     <message>
         <source>Opens the Virtual Media Manager to select a virtual image for this attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>បើក​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ� ដើម្បី​ជ្រើស​រូបភាព​​និម្មិ�​សម្រាប់​ឯកសារ​ភ្ជាប់​ន�ះ ។</translation>
     </message>
     <message>
         <source>Open Virtual Media Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>បើក​កម្មវិធី​គ្រប់គ្រង​ម�ឌៀ​និម្មិ�​</translation>
     </message>
     <message>
         <source>D&amp;ifferencing Disks</source>
-        <translation type="unfinished"></translation>
+        <translation>�ាសផ្ស�ងៗ​គ្នា​</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="unfinished"></translation>
+        <translation>នៅ​ព�ល​ដែល​បាន​ធីក​ អនុញ្ញា�​ម៉ាស៊ីន​ភ្ញៀវ​ផ្ញើពាក្យ​បញ្ជា​​ ATAPI ដោយ​ផ្ទាល់​​ទៅ​ដ្រាយ​ម៉ាស៊ីន ដែល​​​ធ្វើ​ឲ្យ​វា​អាច​ប្រើ​​ឧបករណ�​​​សរស�រ​ស៊ី​ឌី​​/​ឌី​វី​ឌី​ ​ដែល​បាន​�ភ្ជាប់​ទៅ​ម៉ាស៊ីន​នៅ​​ក្នុង​ VM ។ ចំណាំ�ា ​ការ​សរស�រស៊ីឌីអូឌីយ៉ូ​�ាង​ក្នុង​ VM មិន​�្រូវ​បាន​គាំ​ទ្រ​នៅ​ឡើយ​ទ�​ ។</translation>
     </message>
     <message>
         <source>&amp;Passthrough</source>
-        <translation type="unfinished"></translation>
+        <translation>ហុច�ាម​</translation>
     </message>
     <message>
         <source>Virtual Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>ទំហំនិម្មិ�​ ៖</translation>
     </message>
     <message>
         <source>Actual Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>ទំហំ​ពិ�​ ៖</translation>
     </message>
     <message>
         <source>Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>ទំហំ​ ៖</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>ទី​�ាំង​ ៖</translation>
     </message>
     <message>
         <source>Type (Format):</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រ​ភ�ទ​​ (ទ្រង់​ទ្រាយ​) ៖</translation>
     </message>
     <message>
         <source>Attached To:</source>
-        <translation type="unfinished"></translation>
+        <translation>បាន​​ភ្ជាប់ទៅកាន់ ៖</translation>
     </message>
 </context>
 <context>
     <name>VBoxVMSettingsNetwork</name>
     <message>
-        <source>Select TAP setup application</source>
-        <translation type="obsolete">ជ្រើស​កម្មវិធី​រៀបចំ TAP</translation>
-    </message>
-    <message>
-        <source>Select TAP terminate application</source>
-        <translation type="obsolete">ជ្រើស​កម្មវិធី​បញ្ចប់ TAP</translation>
-    </message>
-    <message>
         <source>When checked, plugs this virtual network adapter into the virtual machine.</source>
         <translation>នៅព�ល​គូស​ធីក ដោ�​អាដាប់ទ�រ​បណ្ដាញ​និម្មិ�​ទៅ​ក្នុងម៉ាស៊ីន​នកម្មិ� ។</translation>
     </message>
@@ -6375,10 +6318,6 @@ p, li { white-space: pre-wrap; }
         <translation>បើក​អាដាប់ទ�រ​បណ្ដាញ</translation>
     </message>
     <message>
-        <source>A&amp;dapter Type:</source>
-        <translation type="obsolete">ប្រភ�ទ​អាដាប់ទ�រ ៖</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>ជ្រើស​ប្រភ�ទ​អាដាប់ទ�រ​បណ្ដាញ​និម្មិ� ។ អាស្រ�យ​លើ​�ម្លៃ​ន�ះ VirtualBox នឹង​ផ្ដល់​នូវ​ផ្នែករឹង​​បណ្ដាញ​ផ្ស�ង​ទៅ​ឲ្យ​ម៉ាស៊ីន​និម្មិ� ។</translation>
     </message>
@@ -6387,22 +6326,6 @@ p, li { white-space: pre-wrap; }
         <translation>បាន​ភ្ជាប់​ទៅ ៖</translation>
     </message>
     <message>
-        <source>Controls the way how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="obsolete">�្រួ�ពិនិ�្យ​វិធី​ដែល​អាដាប់ទ�រ​និម្មិ�​ន�ះ​�្រូវ​បាន​ភ្ជាប់​ទៅ​បណ្ដាញ​ពិ�ប្រាកដ​របស់​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​របស់​ម៉ាស៊ីន ។</translation>
-    </message>
-    <message>
-        <source>&amp;Network Name:</source>
-        <translation type="obsolete">ឈ្មោះ​បណ្ដាញ ៖</translation>
-    </message>
-    <message>
-        <source>Displays the name of the internal network selected for this adapter.</source>
-        <translation type="obsolete">បង្ហាញ​ឈ្មោះ​របស់​បណ្ដាញ​�ាង​ក្នុង​ដែល​បាន​ជ្រើស​សម្រាប់​អាដាប់ទ�រ​ន�ះ ។</translation>
-    </message>
-    <message>
-        <source>&amp;MAC Address:</source>
-        <translation type="obsolete">អាសយដ្ឋាន MAC ៖</translation>
-    </message>
-    <message>
         <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>បង្ហាញ​អាសយដ្ឋាន MAC របស់​អាដាប់ទ�រ​ន�ះ ។ វា​មាន​�ួអក្សរ​យ៉ាង​ជាក់លាក់​ចំនួន​ ១២ ដែល​បាន​ជ្រើស​ពី {0-9,A-F} ។ ចំណាំ​�ា​�ួអក្សរ​ទីពីរ​�្រូវ​�ែ​ជា​​�ួល��​គូ ។</translation>
     </message>
@@ -6411,112 +6334,64 @@ p, li { white-space: pre-wrap; }
         <translation>បង្កើ�​អាសយដ្ឋាន MAC ចៃដន្យ​�្មី ។</translation>
     </message>
     <message>
-        <source>&amp;Generate</source>
-        <translation type="obsolete">បង្កើ�</translation>
-    </message>
-    <message>
         <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
         <translation>បង្ហាញ​�ា�ើ​�្សែ​បណ្ដាញ​និម្មិ�​�្រូ​វបានដោ�​​នៅព�ល​ម៉ាស៊ីន​ចាប់ផ្ដើម​ ឬ​ក�អ�់ ។</translation>
     </message>
     <message>
-        <source>Ca&amp;ble Connected</source>
-        <translation type="obsolete">បាន​�ភ្ជាប់​�្សែ</translation>
-    </message>
-    <message>
-        <source>&amp;Interface Name:</source>
-        <translation type="obsolete">ឈ្មោះ​ចំណុច​ប្រទាក់ ៖</translation>
-    </message>
-    <message>
-        <source>Displays the TAP interface name.</source>
-        <translation type="obsolete">បង្ហាញ​ឈ្មោះ​ចំណុច​ប្រទាក់ TAP ។</translation>
-    </message>
-    <message>
-        <source>&amp;Setup Application:</source>
-        <translation type="obsolete">រៀបចំ​កម្មវិធី ៖</translation>
-    </message>
-    <message>
-        <source>Displays the command executed to set up the TAP interface.</source>
-        <translation type="obsolete">បង្ហាញ​ពាក្យ​បញ្ជា​បានប្រ�ិប�្�ិ​ដើម្បី​រៀបចំ​​ចំណុច​ប្រទាក់ TAP ។</translation>
-    </message>
-    <message>
-        <source>Selects the setup application.</source>
-        <translation type="obsolete">ជ្រើស​ការរៀបចំ​កម្មវិធី ។</translation>
-    </message>
-    <message>
-        <source>&amp;Terminate Application:</source>
-        <translation type="obsolete">បញ្ចប់​កម្មវិធី ៖</translation>
-    </message>
-    <message>
-        <source>Displays the command executed to terminate the TAP interface.</source>
-        <translation type="obsolete">បង្ហាញ​ពាក្យ​បញ្ជា​ដែលបាន​ប្រ�ិប�្�ិ​ដើម្បីបញ្ចប់​ចំណុច​ប្រទាក់ TAP ។</translation>
-    </message>
-    <message>
-        <source>Selects the terminate application.</source>
-        <translation type="obsolete">ជ្រើស​កម្មវិធី​បញ្ចប់ ។</translation>
-    </message>
-    <message>
-        <source>Host Interface Settings</source>
-        <translation type="obsolete">កា​រ​កំណ�់​ចំណុច​ប្រទាក់​ម៉ាស៊ីន</translation>
-    </message>
-    <message>
         <source>no bridged network adapter is selected</source>
-        <translation type="unfinished"></translation>
+        <translation>មិន​​​មាន​អាដាប់​ទ�រ​បណ្�ាញប្រ៊ីដ្យ​�្រូវ​បានជ្រើស​រើស​ទ�​</translation>
     </message>
     <message>
         <source>no internal network name is specified</source>
-        <translation type="unfinished"></translation>
+        <translation>មិនមាន​ឈ្មោះ​បណ្ដាញ​�ាង​ក្នុង​�្រូវ​បានបញ្ជាក់ទ�</translation>
     </message>
     <message>
         <source>no host-only network adapter is selected</source>
-        <translation type="unfinished"></translation>
+        <translation>មិនមាន​អាដាប់ទំព�រ​ម៉ាស៊ីន​�្រូវ​បាន​ជ្រើស​ទ�</translation>
     </message>
     <message>
         <source>Not selected</source>
-        <comment>network adapter name</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+network adapter name</comment>
+        <translation type="obsolete">មិន​​បាន​ជ្រើស​ឡើយ​</translation>
     </message>
     <message>
         <source>Controls how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>�្រួ�ពិនិ�្យ​វិធី​ដែល​អាដាប់ទ�រ​និម្មិ�​ន�ះ​�្រូវ​បាន​ភ្ជាប់​ទៅ​បណ្ដាញ​ពិ�ប្រាកដ​​របស់​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន ។</translation>
     </message>
     <message>
         <source>&amp;Name:</source>
-        <translation type="unfinished">ឈ្មោះ ៖</translation>
+        <translation>ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Selects the name of the network adapter for &lt;b&gt;Bridged Adapter&lt;/b&gt; or &lt;b&gt;Host-only Adapter&lt;/b&gt; attachments and the name of the network &lt;b&gt;Internal Network&lt;/b&gt; attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>ជ្រើស​ឈ្មោះ​អាដាប់ទ�រ​បណ្ដាញ​សម្រាប់ &lt;b&gt;អាដាប់ទ�រ​ប្រ៊ីដ្យ&lt;/b&gt; ឬ &lt;b&gt;អាដាប់ទ�រម៉ាស៊ីន&lt;/b&gt; ការ​ភ្ជាប់ និង​ឈ្មោះ​​របស់​បណ្ដាញ ការ​ភ្ជាប់&lt;b&gt;បណ្ដាញ​�ាង​ក្នុង&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>A&amp;dvanced</source>
-        <translation type="unfinished"></translation>
+        <translation>កម្រិ�​�្ពស់​</translation>
     </message>
     <message>
         <source>Shows or hides additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>បង្ហាញ​ ឬ​លាក់​ជម្រើស​អាដាប់ទ�រ​បណ្ដាញ​បន្�ែម ។</translation>
     </message>
     <message>
         <source>Adapter &amp;Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រភ�ទ​អាដាប់​ទ�រ​ ៖</translation>
     </message>
     <message>
         <source>&amp;Mac Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>អាសយដ្ឋាន Mac ៖</translation>
     </message>
     <message>
         <source>&amp;Cable connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VBoxVMSettingsNetworkPage</name>
-    <message>
-        <source>No host network interface is selected</source>
-        <translation type="obsolete">គ្មាន​ចំណុច​ប្រទាក់​បណ្ដាញ​ម៉ាស៊ីន​បាន​ជ្រើស​ទ�</translation>
+        <translation> បាន​�ភ្ជាប់​�្សែ​</translation>
     </message>
     <message>
-        <source>Internal network name is not set</source>
-        <translation type="obsolete">ឈ្មោះ​បណ្ដាញ​�ា​ងក្នុង​មិន​�្រូវ​បានកំណ�់​�ែ</translation>
+        <source>Not selected</source>
+        <comment>network adapter name</comment>
+        <translation type="unfinished">មិន​​បាន​ជ្រើស​ឡើយ​</translation>
     </message>
 </context>
 <context>
@@ -6585,18 +6460,6 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>VBoxVMSettingsSF</name>
     <message>
-        <source>&amp;Add New Shared Folder</source>
-        <translation type="obsolete">បន្�ែម​��​ដែល​បានចែកចរំលែក​�្មី</translation>
-    </message>
-    <message>
-        <source>&amp;Edit Selected Shared Folder</source>
-        <translation type="obsolete">កែសម្រួល​��​ដែលបានចែករំលែក​ដែល​បានជ្រើស</translation>
-    </message>
-    <message>
-        <source>&amp;Remove Selected Shared Folder</source>
-        <translation type="obsolete">យក​��​ដែលបានចែករំលែក​ដែល​បាន​ជ្រើស</translation>
-    </message>
-    <message>
         <source>Adds a new shared folder definition.</source>
         <translation>បន្�ែម​កា​រកំណ�់​��​ដែលបានចែករំលែក�្មី ។</translation>
     </message>
@@ -6642,23 +6505,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source> Global Folders</source>
-        <translation type="unfinished"></translation>
+        <translation> ��​សកល​</translation>
     </message>
     <message>
         <source>&amp;Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្�ែម​��​ដែល​បាន​ចែករំលែក​</translation>
     </message>
     <message>
         <source>&amp;Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>កែសម្រួល​��​ដែលបានចែករំលែក​</translation>
     </message>
     <message>
         <source>&amp;Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>យក​��​ដែលបានចែករំលែក​ច�ញ​</translation>
     </message>
     <message>
         <source>&amp;Folders List</source>
-        <translation type="unfinished"></translation>
+        <translation>បញ្ជី​��​</translation>
     </message>
 </context>
 <context>
@@ -6756,16 +6619,12 @@ p, li { white-space: pre-wrap; }
         <translation>បង្កើ�​បំពង់</translation>
     </message>
     <message>
-        <source>Port &amp;Path:</source>
-        <translation type="obsolete">ផ្លូវ​ច្រក ៖</translation>
-    </message>
-    <message>
         <source>Displays the path to the serial port&apos;s pipe on the host when the port is working in &lt;b&gt;Host Pipe&lt;/b&gt; mode, or the host serial device name when the port is working in &lt;b&gt;Host Device&lt;/b&gt; mode.</source>
         <translation>បង្ហាញ​ផ្លូវ​ទៅកាន់​ច្រក​ស៊�រៀល​នៅ​លើ​ម៉ាស៊ីន នៅព�ល​ច្រក​ដំណើការ​ក្នុង​របៀប &lt;b&gt;បំពង់​ម៉ាស៊ីន&lt;/b&gt; ឬ​ឈ្មោះ​ឧបករណ�​ស៊�រៀល​នៅព�ល​ច្រក​ដំណើរការ​ក្នុង​របៀប &lt;b&gt;ឧបករណ�​ម៉ាស៊ីន&lt;/b&gt; ។</translation>
     </message>
     <message>
         <source>Port/File &amp;Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>ផ្លូវ​ ច្រក​​/ឯកសារ​ ៖</translation>
     </message>
 </context>
 <context>
@@ -6787,145 +6646,159 @@ p, li { white-space: pre-wrap; }
     <name>VBoxVMSettingsSystem</name>
     <message>
         <source>you have assigned more than &lt;b&gt;%1%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%2&lt;/b&gt;) to the virtual machine. Not enough memory is left for your host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នកបាន​ផ្ដល់ស�ិ​កុំព្យូទ�ររបស់​អ្នក​ច្រើនជាង &lt;b&gt;%1%&lt;/b&gt; (&lt;b&gt;%2&lt;/b&gt;) ដល់​ម៉ាស៊ីន​និម្មិ� ។ មិនមាន​ស�ិ​គ្រប់គ្រាន់​នៅ​សល់​សម្រាប់​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន​របស់​អ្នក​ទ� ។ សូម​ជ្រើស​​ចំនួន​ស�ិ​�ូច​ជាង​​ន�ះ ។</translation>
     </message>
     <message>
         <source>you have assigned more than &lt;b&gt;%1%&lt;/b&gt; of your computer&apos;s memory (&lt;b&gt;%2&lt;/b&gt;) to the virtual machine. There might not be enough memory left for your host operating system. Continue at your own risk.</source>
-        <translation type="unfinished"></translation>
+        <translation>អ្នក​បាន​ផ្ដល់​ស�ិ​កុំព្យូទ�រ​ច្រើន &lt;b&gt;%1%&lt;/b&gt; (&lt;b&gt;%2&lt;/b&gt;) ដល់​ម៉ាស៊ីន​និម្មិ� ។ វា​ប្រហែលជា​មិន​គ្រប់គ្រាន់​​សម្រាប់​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន​របស់​អ្នក​ទ� ។ បន្�​ដោយ​មានគ្រោះ�្នាក់ ។</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 (&lt;b&gt;%1&lt;/b&gt;). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>សម្រាប់​អនុវ�្� ចំនួន​ស៊ីភីយូ​ដែល​បាន​ភ្ជាប់​ទៅ​ម៉ាស៊ីន​មិន​អាច​លើស​ពី​​ចំនួន​ពីរ​នៃ​ស៊ីភីយូ​ហ្វីស៊ី�ល​នៅ​លើ​ម៉ាស៊ីន (&lt;b&gt;%1&lt;/b&gt;) ។ សូម​កា�់​បន្�យ​ចំនួន​ស៊ីភីយូ​និម្មិ� ។</translation>
     </message>
     <message>
         <source>you have assigned more virtual CPUs to the virtual machine than the number of physical CPUs on your host system (&lt;b&gt;%1&lt;/b&gt;). 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>អ្នក​បានផ្ដល់​ស៊ីភីយូ​និម្មិ�​ច្រើន​ដល់​ម៉ាស៊ីន​និម្មិ�​ជាង​ចំនួន​ស៊ីភីយូ​ហ្វីស៊ី�ល​នៅ​ក្នុង​ប្រព�ន្ធ​ម៉ាស៊ីន​របស់​អ្នក (&lt;b&gt;%1&lt;/b&gt;) ។ វា​ទំនង​ជា​បន្�យ​ការ​អនុវ�្�​ម៉ាស៊ីននិម្មិ�​របស់​អ្នក ។ សូម​ពិចារណា​លើការ​កា�់បន្�យ​ចំនួន​ស៊ីភីយូ​និម្មិ� ។</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="unfinished"></translation>
+        <translation>អ្នកបានផ្ដល់​ស៊ីភីយូ​និម្មិ�​ច្រើនជាង​ដល់ 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="unfinished"></translation>
+        <translation>អ្នក​បានផ្ដល់​ស៊ីភីយូ​និម្មិ�​ច្រើនជាង​មួយ​ដល់ VM ។ វា​នឹង​មិនដំណើរការ​ទ� លុះ�្រា​�ែ​ផ្នែក​រឹង​និម្មិ� (VT-x/AMD-V) �្រូវ​បានបើក​ដែរ ។ វា​នឹង​�្រូវ​បានធ្វើ​ដោយ​ស្វ�យ​ប្រវ�្�ិ នៅព�ល​អ្នក​ទទួល​យក​ការ​កំណ�់ VM ដោយ​ចុច​ប៊ូ�ុងយល់ព្រម ។</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
-        <translation type="unfinished">&lt;qt&gt;%1&amp;nbsp;ម�កាបៃ&lt;/qt&gt;</translation>
+        <translation>&lt;qt&gt;%1&amp;nbsp;ម�កាបៃ&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;CPU&lt;/qt&gt;</source>
-        <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+%1 is 1 for now</comment>
+        <translation type="obsolete">&lt;qt&gt;%1&amp;nbsp; ស៊ី​ភី​យូ&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</source>
-        <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <comment>
+
+%1 is host cpu count * 2 for now</comment>
+        <translation type="obsolete">&lt;qt&gt;%1&amp;nbsp; ស៊ី​ភី​យូ​&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&amp;Motherboard</source>
-        <translation type="unfinished"></translation>
+        <translation>បន្ទះ​ម�​</translation>
     </message>
     <message>
         <source>Base &amp;Memory:</source>
-        <translation type="unfinished"></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 type="unfinished">�្រួ�ពិនិ�្យ​ចំនួន​ស�ិ​ដែលបានផ្ដល់​ទៅ​ម៉ាស៊ីន​និម្មិ� ។ ប្រសិនបើ​អ្នក​ផ្ដល់​ច្រើនព�ក ម៉ាស៊ីន​មិនអាច​ចាប់ផ្ដើម​បានទ� ។</translation>
+        <translation>�្រួ�ពិនិ�្យ​ចំនួន​ស�ិ​ដែលបានផ្ដល់​ទៅ​ម៉ាស៊ីន​និម្មិ� ។ ប្រសិនបើ​អ្នក​ផ្ដល់​ច្រើនព�ក ម៉ាស៊ីន​មិនអាច​ចាប់ផ្ដើម​បានទ� ។</translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished">ម�កាបៃ</translation>
+        <translation>ម�កាបៃ</translation>
     </message>
     <message>
         <source>&amp;Boot Order:</source>
-        <translation type="unfinished"></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 type="unfinished">កំណ�់​លំដាប់​ឧបករណ�​ចាប់ផ្ដើម ។ ប្រើ​ប្រអប់​គូសធីក​នៅ​�ា​ងឆ្វ�ង​ដើម្បី​បើក ​ឬ​បិទ​ឧបករណ�​ចាប់ផ្ដើម​នីមួយៗ ។ ផ្លាស់ទីធា�ុ​ឡើង​លើ និង​ចុះក្រោម​ដើម្បី​ផ្លាស់ប្ដូរ​លំដាប់​ឧបករណ� ។</translation>
+        <translation>កំណ�់​លំដាប់​ឧបករណ�​ចាប់ផ្ដើម​ឡើង ។ ប្រើ​ប្រអប់​ធីក​នៅ​�ាង​ឆ្វ�ង ដើម្បី​បើក ឬ​បិទ​ឧបករណ�​ចាប់ផ្ដើមឡើង ។ ផ្លាស់ទី​វា​ឡើង​លើ និង​ចុះក្រោម​ ដើម្បី​ផ្លាស់ប្ដូរ​លំដាប់​ឧបករណ� ។</translation>
     </message>
     <message>
         <source>Move Up (Ctrl-Up)</source>
-        <translation type="unfinished">ផ្លាស់ទីឡើង​លើ (បញ្ជា(Ctrl)-Up)</translation>
+        <translation>ផ្លាស់ទី​ឡើង​លើ (Ctrl-Up)</translation>
     </message>
     <message>
         <source>Moves the selected boot device up.</source>
-        <translation type="unfinished">ផ្លាស់ទី​ឧបករណ�​ចាប់ផ្ដើម​ដែល​បានជ្រើ​សឡើង​លើ ។</translation>
+        <translation>ផ្លាស់ទី​ឧបករណ�​ចាប់ផ្ដើម​ដែលបាន​ជ្រើស​ឡើង​លើ ។</translation>
     </message>
     <message>
         <source>Move Down (Ctrl-Down)</source>
-        <translation type="unfinished">ផ្លាស់ទី​ចុះក្រោម (បញ្ជា(Ctrl)-Down)</translation>
+        <translation>ផ្លាស់ទី​ចុះក្រោម (Ctrl-Down)</translation>
     </message>
     <message>
         <source>Moves the selected boot device down.</source>
-        <translation type="unfinished">ផ្លាស់ទី​ឧបករណ�​ចាប់ផ្ដើម​ដែល​បាន​ជ្រើស​ចុះក្រោម ។</translation>
+        <translation>ផ្លាស់ទី​ឧបករណ�​ចាប់ផ្ដើម​ដែល​បាន​ជ្រើស​ចុះក្រោម</translation>
     </message>
     <message>
         <source>Extended Features:</source>
-        <translation type="unfinished">លក្�ណៈសម្ប�្�ិ​ដែល​បានពង្រីក ៖</translation>
+        <translation>លក្�ណៈ​ពិស�ស​ដែល​បានពង្រីក ៖</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will support the Input Output APIC (IO APIC), which may slightly decrease performance. &lt;b&gt;Note:&lt;/b&gt; don&apos;t disable this feature after having installed a Windows guest operating system!</source>
-        <translation type="unfinished">នៅព�ល​បាន​គូស​ធីក ម៉ាស៊ីន​និម្មិ�​នឹង​គាំទ្រ​ Input Output APIC (IO APIC) ដែល​អាច​បន្�យ​ការ​អនុវ�្�​របស់ VM �ិច�ួច ។ &lt;b&gt;ចំណាំ ៖&lt;/b&gt; កុំ​បិទ​លក្�ណៈ​ពិស�ស​ន�ះ​បន្ទាប់ពី​ដំឡើង​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​វីនដូ​របស់ម៉ាស៊ីន​ភ្ញៀវ !</translation>
+        <translation>នៅ​ព�ល​បានគូស​ធីក ម៉ាស៊ីន​និម្មិ�​នឹង​គាំទ្រ​ Input Output APIC (IO APIC) ដែលអាច​បន្�យ​ការ​អនុវ�្�​បន្�ិចបន្�ួច ។ &lt;b&gt;ចំណាំ ៖&lt;/b&gt; កុំ​បិទ​លក្�ណៈពិស�ស​ន�ះ បន្ទាប់​ពី​ដំឡើង​ប្រព�ន្ធ​ប្រ�ិប�្�ិការ​ម៉ាស៊ីន​ភ្ញៀវ​វីនដូ !</translation>
     </message>
     <message>
         <source>Enable &amp;IO APIC</source>
-        <translation type="unfinished"></translation>
+        <translation>បើក IO APIC</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>
+        <translation>​នៅ​ព�ល​​ដែលបាន​គូស​ធីក​ ម៉ាស៊ីន​ភ្ញៀវ​នឹង​គាំ​ទ្រ Extended Firmware Interface (EFI) ដែល​�្រូវ​បាន​ទាម​ទារ​ដើម្បី​ចាប់ផ្ដើម​ប្រ​ព�ន្ធ​ប្រ�ិប�្�ិ​​ការ​​ម៉ាស៊ីន​ភ្ញៀវពិ�​ប្រាកដ ។​ ប្រ​ព�ន្ធ​ប្រ�ិប�្�ិ​ការ​​ដែល​មិនមែន​ ​EFI ​​នឹង​មិនអាច​ទៅ​ចាប់ផ្�ើម​​បាន​ទ� ​​ប្រ​សិន​បើ​ជម្រើស​�្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​ ។</translation>
     </message>
     <message>
         <source>Enable &amp;EFI (special OSes only)</source>
-        <translation type="unfinished"></translation>
+        <translation>បើក EFI (�ែ OSes ប៉ុណ្ណោះ)</translation>
     </message>
     <message>
         <source>&amp;Processor</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រ​ព�ន្ធ​ដំណើរ​ការ​</translation>
     </message>
     <message>
         <source>&amp;Processor(s):</source>
-        <translation type="unfinished"></translation>
+        <translation>ប្រ​ព�ន្ធ​ដំណើរ​ការ​​ ៖</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <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>
     </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">នៅព�ល​បាន​គូស​ធីក លក្�ណៈពិស�ស​របស់ Physical Address Extension (PAE) នៃ​ស៊ីភីយូ​របស់​ម៉ាស៊ីន​នឹង​�្រូវ​បានបង្ហាញ​ដល់​ម៉ាស៊ីន​និម្មិ� ។</translation>
+        <translation>នៅព�ល​បាន​គូស​ធីក លក្�ណៈពិស�ស Physical Address Extension (PAE) របស់​ស៊ីភីយូ​​ម៉ាស៊ីន​នឹង​�្រូវ​បានបង្ហាញ​​ម៉ាស៊ីន​និម្មិ� ។</translation>
     </message>
     <message>
         <source>Enable PA&amp;E/NX</source>
-        <translation type="unfinished">បើក PAE/NX</translation>
+        <translation>បើក PAE/NX</translation>
     </message>
     <message>
         <source>Acce&amp;leration</source>
-        <translation type="unfinished"></translation>
+        <translation>ការ​បង្កើន​ល្បឿន​</translation>
     </message>
     <message>
         <source>Hardware Virtualization:</source>
-        <translation type="unfinished"></translation>
+        <translation>ការ​ធ្វើ​ផ្នែក​រឹង​និម្មិ� ៖</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will try to make use of the host CPU&apos;s hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
-        <translation type="unfinished">នៅព�ល​បាន​គូស​ធីគ ម៉ាស៊ីន​និម្មិ�​នឹង​ព្យាយាម​ប្រាកដ​�ា​ផ្នែក​បន្�ែម​និម្មិ�​ផ្នែក​រឹង​របស់​ស៊ីភីយូ​របស់ម៉ាស៊ីន​ដូចជា Intel VT-x និង AMD-V ។</translation>
+        <translation>នៅ​ព�លបាន​គូស​ធីក ម៉ាស៊ីននិម្មិ�​នឹង​ព្យាយាម​ប្រាកដ�ា​ ការ​ប្រើ​ប្រាស់​ផ្នែកបន្�ែម​និម្មិ�​ផ្នែក​រឹង​របស់​ស៊ីភីយូ ដូ​ចជា Intel VT-x និង AMD-V ។</translation>
     </message>
     <message>
         <source>Enable &amp;VT-x/AMD-V</source>
-        <translation type="unfinished">បើក VT-x/AMD-V</translation>
+        <translation>បើក 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>
-        <translation type="unfinished"></translation>
+        <translation>នៅព�ល​ដែលបានគូស​ធីក ម៉ាស៊ីន​និម្មិ�​នឹង​ព្យាយាម​ប្រាកដ​�ា​ផ្នែក​បន្�ែម paging �ាង​ក្នុង​របស់ Intel VT-x និង AMD-V ។</translation>
     </message>
     <message>
         <source>Enable Nested Pa&amp;ging</source>
-        <translation type="unfinished"></translation>
+        <translation>បើកការ​ដាក់​ទំព�រ​ក្នុង​</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;%1&amp;nbsp;CPU&lt;/qt&gt;</source>
+        <comment>%1 is 1 for now</comment>
+        <translation type="unfinished">&lt;qt&gt;%1&amp;nbsp; ស៊ី​ភី​យូ&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</source>
+        <comment>%1 is host cpu count * 2 for now</comment>
+        <translation type="unfinished">&lt;qt&gt;%1&amp;nbsp; ស៊ី​ភី​យូ​&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
@@ -7114,39 +6987,4 @@ p, li { white-space: pre-wrap; }
         <translation>ស�ចក្ដី​លម្អិ�​�ម្រង USB</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">នៅព�ល​បាន​គូស​ធីក VM នឹង​ដើរ�ួ​ជា​ម៉ាស៊ីន​បម្រើ​ពិធីការ​ផ្ទៃ�ុ​ពី​ចម្ងាយ (RDP) ដោយ​អនុញ្ញា�​ឲ្យ​ម៉ាស៊ីនភ្ញៀវ​ពី​ចម្ងាយ​�ភ្ជាប់​ ហើយ​ប្រ�ិប�្�ិ​ VM (នៅ​ព�ល​កំពុង​រ�់) ដោយ​ប្រើ​ម៉ាស៊ីន​ភ្ញៀវ RDP ស្�ង់ដារ ។</translation>
-    </message>
-    <message>
-        <source>&amp;Enable VRDP Server</source>
-        <translation type="obsolete">បើក​ម៉ាស៊ីនបម្រើ VRDP</translation>
-    </message>
-    <message>
-        <source>Server &amp;Port:</source>
-        <translation type="obsolete">ច្រក​ម៉ាស៊ីន​បម្រើ ៖</translation>
-    </message>
-    <message>
-        <source>Displays the VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero) to reset the port to the default value.</source>
-        <translation type="obsolete">បង្ហាញ​ល��​ច្រក​ម៉ាស៊ីនបម្រើ VRDP ។ អ្នកអាច​បញ្ជាក់ &lt;tt&gt;0&lt;/tt&gt; (សូន្យ) ដើម្បី​កំណ�់​ច្រក​ទៅ​�ម្លៃ​លំនាំដើម​ឡើង​វិញ ។</translation>
-    </message>
-    <message>
-        <source>Authentication &amp;Method:</source>
-        <translation type="obsolete">វិធីសាស្�្រ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ ៖</translation>
-    </message>
-    <message>
-        <source>Defines the VRDP authentication method.</source>
-        <translation type="obsolete">កំណ�់​វិធីសាស្�្រ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​របស់ VRDP ។</translation>
-    </message>
-    <message>
-        <source>Authentication &amp;Timeout:</source>
-        <translation type="obsolete">អស់ព�ល​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ ៖</translation>
-    </message>
-    <message>
-        <source>Specifies the timeout for guest authentication, in milliseconds.</source>
-        <translation type="obsolete">បញ្ជាក់​ការ​អស់ព�លវ�លា​សម្រាប់​ការ​ផ្ទៀងផ្ទា�់​ភាព​�្រឹម�្រូវ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ គិ�​​ជា​មិល្លី​វិនាទី ។</translation>
-    </message>
-</context>
 </TS>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
index 464a41fa4..69c7dd99d 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Park Shinjo</translation>
+        <translation type="obsolete">Park Shinjo</translation>
     </message>
 </context>
 <context>
@@ -1399,7 +1399,7 @@ p, li { white-space: pre-wrap; }
         <translation>실시간으로 � 아�콘 갱신하기(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4493,7 +4493,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBox 등� 대화��</translation>
+        <translation type="obsolete">VirtualBox 등� 대화��</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -4501,7 +4501,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>�문�를 사용하셔서 전체 �름� 입력하십시오.</translation>
+        <translation type="obsolete">�문�를 사용하셔서 전체 �름� 입력하십시오.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -4509,7 +4509,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>올바른 전� 우편 주소를 입력해 주십시오.</translation>
+        <translation type="obsolete">올바른 전� 우편 주소를 입력해 주십시오.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -4517,11 +4517,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>VirtualBox 등� 양�� 오신 것� 환�합니다!</translation>
+        <translation type="obsolete">VirtualBox 등� 양�� 오신 것� 환�합니다!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>연결 협�� 진행할 수 없습니다.</translation>
+        <translation type="obsolete">연결 협�� 진행할 수 없습니다.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -4537,63 +4537,63 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Cancel</source>
-        <translation>취소</translation>
+        <translation type="obsolete">취소</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>국가 � 지역 선�</translation>
+        <translation type="obsolete">국가 � 지역 선�</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;� 등� 양�� 작성하셔서 VirtualBox를 사용하고 있다는 것� 알려 주십시오. 선��으로 VirtualBox 뉴스와 업��트를 받� 수� 있습니다.&lt;/p&gt;&lt;p&gt;�문�로 전체 �름� 작성하시고 전� 우편 주소를 �어 주십시오. Sun 마��로시스템즈�서는 수집한 개� 정보를 제 3��게 보내지 않으며, � 정보를 사용하여 VirtualBox 사용 통계를 모으고 연�하는 �만 사용할 것입니다. 개� 정보를 어떻게 사용하는가� 대해서 알아보시려면 VirtualBox 설명서� &lt;b&gt;개� 정보 정책&lt;/b&gt; 섹션�나 VirtualBox 웹 사�트� &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;개� 정보 정책&lt;/a&gt;� 참고하십시오.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;� 등� 양�� 작성하셔서 VirtualBox를 사용하고 있다는 것� 알려 주십시오. 선��으로 VirtualBox 뉴스와 업��트를 받� 수� 있습니다.&lt;/p&gt;&lt;p&gt;�문�로 전체 �름� 작성하시고 전� 우편 주소를 �어 주십시오. Sun 마��로시스템즈�서는 수집한 개� 정보를 제 3��게 보내지 않으며, � 정보를 사용하여 VirtualBox 사용 통계를 모으고 연�하는 �만 사용할 것입니다. 개� 정보를 어떻게 사용하는가� 대해서 알아보시려면 VirtualBox 설명서� &lt;b&gt;개� 정보 정책&lt;/b&gt; 섹션�나 VirtualBox 웹 사�트� &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;개� 정보 정책&lt;/a&gt;� 참고하십시오.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Sun 온�� 계정� �미 있습니다(&amp;H):</translation>
+        <translation type="obsolete">Sun 온�� 계정� �미 있습니다(&amp;H):</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>전� 우편 주소(&amp;E):</translation>
+        <translation type="obsolete">전� 우편 주소(&amp;E):</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>암호(&amp;P):</translation>
+        <translation type="obsolete">암호(&amp;P):</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Sun 온�� 계정� 등�하겠습니다(&amp;W):</translation>
+        <translation type="obsolete">Sun 온�� 계정� 등�하겠습니다(&amp;W):</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>�름(&amp;F):</translation>
+        <translation type="obsolete">�름(&amp;F):</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>성(&amp;L):</translation>
+        <translation type="obsolete">성(&amp;L):</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>회사(&amp;C):</translation>
+        <translation type="obsolete">회사(&amp;C):</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>êµ­ê°€(&amp;U):</translation>
+        <translation type="obsolete">êµ­ê°€(&amp;U):</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>전� 우편 주소(&amp;M):</translation>
+        <translation type="obsolete">전� 우편 주소(&amp;M):</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>암호(&amp;A):</translation>
+        <translation type="obsolete">암호(&amp;A):</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>암호 확�(&amp;N):</translation>
+        <translation type="obsolete">암호 확�(&amp;N):</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>등�(&amp;R)</translation>
+        <translation type="obsolete">등�(&amp;R)</translation>
     </message>
 </context>
 <context>
@@ -6941,7 +6941,7 @@ p, li { white-space: pre-wrap; }
         <translation>프로세서 갯수(&amp;P):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>가� 머신� CPU 갯수를 조정합니다.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
index 4ab19ea85..d7c08e704 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Ebel Geertsema, Alexander L. de Goeij</translation>
+        <translation type="obsolete">Ebel Geertsema, Alexander L. de Goeij</translation>
     </message>
 </context>
 <context>
@@ -1377,7 +1377,7 @@ p, li { white-space: pre-wrap; }
         <translation>Actueel voorbeeld &amp;Dock ikoon</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;Automatische Dock laten zien &amp;&amp; Menubarlk bij schermvullend</translation>
     </message>
 </context>
@@ -4468,84 +4468,84 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBox registratie</translation>
+        <translation type="obsolete">VirtualBox registratie</translation>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Geef uw volledige naam op.</translation>
+        <translation type="obsolete">Geef uw volledige naam op.</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Geef een geldig e-mail adres op.</translation>
+        <translation type="obsolete">Geef een geldig e-mail adres op.</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Welkom bij hetVirtualBox registratieformulier!</translation>
+        <translation type="obsolete">Welkom bij hetVirtualBox registratieformulier!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
         <translatorcomment>handshake?</translatorcomment>
-        <translation>Dan de ... verbinding niet uitvoeren.</translation>
+        <translation type="obsolete">Dan de ... verbinding niet uitvoeren.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <translation type="obsolete">Annuleren</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Vul aub het registratieformulier in en laat ons daarmee weten dat u VirtualBox gebruikt. We kunnen u dan, als u dat wenst, op de hoogte houden van nieuws en bijgewerkte versies.&lt;p&gt;&lt;p&gt;Gebruikt aub Latijnse letterschrift voor de onderstaande velden. Let op: Sun Microsystems gebruikt deze informatie alleen voor statistische doeleinden over dit product en stuurt u VirtualBox nieuwsbrieven. In geen geval zal Sun Microsystems uw gegeven doorgeven aan derde partijen. Nadere informatie over hoe we uw persoonlijke gegeven gebruiken is te vinden in de &lt;b&gt;Privacy Policy&lt;/b&gt; sectie van het VirtualBox handboek of bijr &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; pagina van de VirtualBox website.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Vul aub het registratieformulier in en laat ons daarmee weten dat u VirtualBox gebruikt. We kunnen u dan, als u dat wenst, op de hoogte houden van nieuws en bijgewerkte versies.&lt;p&gt;&lt;p&gt;Gebruikt aub Latijnse letterschrift voor de onderstaande velden. Let op: Sun Microsystems gebruikt deze informatie alleen voor statistische doeleinden over dit product en stuurt u VirtualBox nieuwsbrieven. In geen geval zal Sun Microsystems uw gegeven doorgeven aan derde partijen. Nadere informatie over hoe we uw persoonlijke gegeven gebruiken is te vinden in de &lt;b&gt;Privacy Policy&lt;/b&gt; sectie van het VirtualBox handboek of bijr &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; pagina van de VirtualBox website.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Ik &amp;heb al een online Sun account:</translation>
+        <translation type="obsolete">Ik &amp;heb al een online Sun account:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Wachtwoord:</translation>
+        <translation type="obsolete">&amp;Wachtwoord:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Ik &amp;wil me graag registreren en een nieuw online Sun account aanmaken:</translation>
+        <translation type="obsolete">Ik &amp;wil me graag registreren en een nieuw online Sun account aanmaken:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Voornaam:</translation>
+        <translation type="obsolete">&amp;Voornaam:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Achternaam:</translation>
+        <translation type="obsolete">&amp;Achternaam:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Bedrijf:</translation>
+        <translation type="obsolete">&amp;Bedrijf:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;Land:</translation>
+        <translation type="obsolete">&amp;Land:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>W&amp;achtwoord:</translation>
+        <translation type="obsolete">W&amp;achtwoord:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Wa&amp;chtwoord bevestigen:</translation>
+        <translation type="obsolete">Wa&amp;chtwoord bevestigen:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registreren</translation>
+        <translation type="obsolete">&amp;Registreren</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Kies het land/gebied</translation>
+        <translation type="obsolete">Kies het land/gebied</translation>
     </message>
 </context>
 <context>
@@ -6661,7 +6661,7 @@ p, li {white-space: pre-wrap; }
         <translation>&amp;Processor(en):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Controleert het aantal virtuele CPU in de virtuele machine.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
index 375bef0f6..ee080386b 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Dawid Wrobel, Adrian Lubik, Wiktor Wandachowicz</translation>
+        <translation type="obsolete">Dawid Wrobel, Adrian Lubik, Wiktor Wandachowicz</translation>
     </message>
 </context>
 <context>
@@ -2050,7 +2050,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Podgląd na żywo wewnątrz ikony w obszarze Dock</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;Automatycznie pokazuj Dock oraz pasek menu w trybie pełnoekranowym</translation>
     </message>
 </context>
@@ -6186,7 +6186,7 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Okno rejestracji programu VirtualBox</translation>
+        <translation type="obsolete">Okno rejestracji programu VirtualBox</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6198,7 +6198,7 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Wprowadź swoje pełne imię i nazwisko używając znaków alfabetu łacińskiego.</translation>
+        <translation type="obsolete">Wprowadź swoje pełne imię i nazwisko używając znaków alfabetu łacińskiego.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -6206,7 +6206,7 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Wprowadź swój adres e-mail. Wymagany jest poprawny, działający adres.</translation>
+        <translation type="obsolete">Wprowadź swój adres e-mail. Wymagany jest poprawny, działający adres.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -6218,7 +6218,7 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Formularz rejestracyjny programu VirtualBox</translation>
+        <translation type="obsolete">Formularz rejestracyjny programu VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -6234,7 +6234,7 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Nie udało się ustanowić połączenia.</translation>
+        <translation type="obsolete">Nie udało się ustanowić połączenia.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6250,63 +6250,63 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Anuluj</translation>
+        <translation type="obsolete">Anuluj</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Wybierz kraj/region</translation>
+        <translation type="obsolete">Wybierz kraj/region</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Wypełnij ten formularz w celu poinformowania nas, że korzystasz z programu VirtualBox oraz, opcjonalnie, aby być informowanym o jego uaktualnieniach i nowościach.&lt;/p&gt;&lt;p&gt;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 nie przekaże Twoich danych osobowych podmiotom trzecim. Szczegółowe informacje na temat tego jak korzystamy z Twoich danych osobowych można znaleźć w sekcji &lt;b&gt;Privacy Policy&lt;/b&gt; instrukcji obsługi programu VirtualBox, lub na stronie &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; strony internetowej programu VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Wypełnij ten formularz w celu poinformowania nas, że korzystasz z programu VirtualBox oraz, opcjonalnie, aby być informowanym o jego uaktualnieniach i nowościach.&lt;/p&gt;&lt;p&gt;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 nie przekaże Twoich danych osobowych podmiotom trzecim. Szczegółowe informacje na temat tego jak korzystamy z Twoich danych osobowych można znaleźć w sekcji &lt;b&gt;Privacy Policy&lt;/b&gt; instrukcji obsługi programu VirtualBox, lub na stronie &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; strony internetowej programu VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>&amp;Posiadam już konto Sun Online:</translation>
+        <translation type="obsolete">&amp;Posiadam już konto Sun Online:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Hasło:</translation>
+        <translation type="obsolete">&amp;Hasło:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>&amp;Chcę założyć nowe konto Sun Online:</translation>
+        <translation type="obsolete">&amp;Chcę założyć nowe konto Sun Online:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;ImiÄ™:</translation>
+        <translation type="obsolete">&amp;ImiÄ™:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Nazwisko:</translation>
+        <translation type="obsolete">&amp;Nazwisko:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Firma:</translation>
+        <translation type="obsolete">&amp;Firma:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;Kraj:</translation>
+        <translation type="obsolete">&amp;Kraj:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>H&amp;asło:</translation>
+        <translation type="obsolete">H&amp;asło:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>P&amp;otwierdź hasło:</translation>
+        <translation type="obsolete">P&amp;otwierdź hasło:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Rejestruj</translation>
+        <translation type="obsolete">&amp;Rejestruj</translation>
     </message>
 </context>
 <context>
@@ -10372,7 +10372,7 @@ makes the guest see an audio card, however every access to it will be ignored.&l
         <translation>P&amp;rocesor(y):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Kontroluje ilość wirtualnych CPU dla maszyny wirtualnej.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
index d77485b1f..e0c39cd07 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>José Melo &lt;mmodem00@gmail.com&gt;, Marcelo Coelho &lt;marcelocoelho@gmail.com&gt;</translation>
+        <translation type="obsolete">José Melo &lt;mmodem00@gmail.com&gt;, Marcelo Coelho &lt;marcelocoelho@gmail.com&gt;</translation>
     </message>
 </context>
 <context>
@@ -2037,7 +2037,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3343,7 +3343,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;nobr&gt;%4 MB&lt;/nobr&gt; {1 ?}</translation>
     </message>
     <message>
         <source>Processor(s)</source>
@@ -6134,7 +6134,7 @@ diálogo de Configurações da MV.&lt;/p&gt;</translation>
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Diálogo de Registo Virtualbox</translation>
+        <translation type="obsolete">Diálogo de Registo Virtualbox</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6146,7 +6146,7 @@ diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Indique o seu nome completo usando caracteres latinos.</translation>
+        <translation type="obsolete">Indique o seu nome completo usando caracteres latinos.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -6154,7 +6154,7 @@ diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Indique o seu endereço electrónico válido.</translation>
+        <translation type="obsolete">Indique o seu endereço electrónico válido.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -6166,7 +6166,7 @@ diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Bem-vindo ao Formulário de Registo VirtualBox!</translation>
+        <translation type="obsolete">Bem-vindo ao Formulário de Registo VirtualBox!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -6182,7 +6182,7 @@ diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Não foi possível estabelecer uma ligação.</translation>
+        <translation type="obsolete">Não foi possível estabelecer uma ligação.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6198,63 +6198,7 @@ diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
 </context>
 <context>
@@ -10400,7 +10344,7 @@ USB seleccionado ligado à máquina.&lt;/qt&gt;
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </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 c1349f399..0aa8277cf 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
@@ -27,7 +27,7 @@
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
         <translatorcomment>O ponto final não faz sentido...</translatorcomment>
-        <translation>Érico Mendonça &lt;erico.mendonca@gmail.com&gt;</translation>
+        <translation type="obsolete">Érico Mendonça &lt;erico.mendonca@gmail.com&gt;</translation>
     </message>
 </context>
 <context>
@@ -2110,7 +2110,7 @@ p, li { white-space: pre-wrap; }
         <translation>Atualização em Tempo Real do �cone da Barra (&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translatorcomment>Mostrar Dock e Barra de Menus &amp;automaticamente em tela cheia</translatorcomment>
         <translation></translation>
     </message>
@@ -6398,7 +6398,7 @@ utilizando o diálogo de Configurações da MV.&lt;/p&gt;</translation>
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Diálogo de Registro do VirtualBox</translation>
+        <translation type="obsolete">Diálogo de Registro do VirtualBox</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6410,7 +6410,7 @@ utilizando o diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Entre com o seu nome completo em caracteres Latinos (sem acentos ou símbolos).</translation>
+        <translation type="obsolete">Entre com o seu nome completo em caracteres Latinos (sem acentos ou símbolos).</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -6418,7 +6418,7 @@ utilizando o diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Entre com o seu endereço de e-mail válido.</translation>
+        <translation type="obsolete">Entre com o seu endereço de e-mail válido.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -6430,7 +6430,7 @@ utilizando o diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Bem-vindo ao Formulário de Registro do VirtualBox!</translation>
+        <translation type="obsolete">Bem-vindo ao Formulário de Registro do VirtualBox!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -6446,7 +6446,7 @@ utilizando o diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Não foi possível estabelecer negociação da conexão.</translation>
+        <translation type="obsolete">Não foi possível estabelecer negociação da conexão.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6462,63 +6462,63 @@ utilizando o diálogo de Configurações da MV.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Selecione o País/Território</translation>
+        <translation type="obsolete">Selecione o País/Território</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Por favor preencha este formulário de registro para que nós possamos ser informados que você utiliza o VirtualBox, e opcionalmente podermos mantê-lo informado sobre eventuais novidades e atualizações do VirtualBox.&lt;/p&gt;&lt;p&gt;Por favor use caracteres acentuados nos campos abaixo. A Sun Microsystems garante que irá utilizar esta informação apenas para obter estatísticas de uso do produto e para enviar newsletters do VirtualBox para você. A Sun Microsystems nunca irá repassar seus dados para terceiros. Informações detalhadas sobre como utilizamos os seus dados pessoais podem ser encontradas na seção &lt;b&gt;Política de Privacidade&lt;/b&gt; do Manual do VirtualBox, ou na &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;página de Política de Privacidade&lt;/a&gt; no site do VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Por favor preencha este formulário de registro para que nós possamos ser informados que você utiliza o VirtualBox, e opcionalmente podermos mantê-lo informado sobre eventuais novidades e atualizações do VirtualBox.&lt;/p&gt;&lt;p&gt;Por favor use caracteres acentuados nos campos abaixo. A Sun Microsystems garante que irá utilizar esta informação apenas para obter estatísticas de uso do produto e para enviar newsletters do VirtualBox para você. A Sun Microsystems nunca irá repassar seus dados para terceiros. Informações detalhadas sobre como utilizamos os seus dados pessoais podem ser encontradas na seção &lt;b&gt;Política de Privacidade&lt;/b&gt; do Manual do VirtualBox, ou na &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;página de Política de Privacidade&lt;/a&gt; no site do VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Eu já possuo uma conta Sun Online (&amp;H):</translation>
+        <translation type="obsolete">Eu já possuo uma conta Sun Online (&amp;H):</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>Senha (&amp;P):</translation>
+        <translation type="obsolete">Senha (&amp;P):</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Eu gostaria de me registrar criando uma nova conta no Sun Online (&amp;W):</translation>
+        <translation type="obsolete">Eu gostaria de me registrar criando uma nova conta no Sun Online (&amp;W):</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>Primeiro Nome (&amp;F):</translation>
+        <translation type="obsolete">Primeiro Nome (&amp;F):</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>Sobrenome (&amp;L):</translation>
+        <translation type="obsolete">Sobrenome (&amp;L):</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>Empresa (&amp;C):</translation>
+        <translation type="obsolete">Empresa (&amp;C):</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>País (&amp;U):</translation>
+        <translation type="obsolete">País (&amp;U):</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>Senh&amp;a:</translation>
+        <translation type="obsolete">Senh&amp;a:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Co&amp;nfirme a Senha:</translation>
+        <translation type="obsolete">Co&amp;nfirme a Senha:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registrar</translation>
+        <translation type="obsolete">&amp;Registrar</translation>
     </message>
 </context>
 <context>
@@ -10954,7 +10954,7 @@ faz com que o convidado veja uma placa de som, mas todos os acessos a ela serão
         <translation>&amp;Processador(es):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Controla a quantidade de CPUs virtuais que serão disponibilizadas na máquina virtual.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
index 2867365bd..3b62d26d0 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Alex Eftimie</translation>
+        <translation type="obsolete">Alex Eftimie</translation>
     </message>
 </context>
 <context>
@@ -2171,7 +2171,7 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci cÃ
         <translation>Previzualizare în timp re&amp;al</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6393,7 +6393,7 @@ din listă apăsând butonul &lt;b&gt;Existent&lt;/b&gt; (pentru a invoca dialog
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Dialog înregistrare VirtualBox</translation>
+        <translation type="obsolete">Dialog înregistrare VirtualBox</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6405,7 +6405,7 @@ din listă apăsând butonul &lt;b&gt;Existent&lt;/b&gt; (pentru a invoca dialog
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Introduceți numele dvs complet utilizând caractere latine.</translation>
+        <translation type="obsolete">Introduceți numele dvs complet utilizând caractere latine.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -6413,7 +6413,7 @@ din listă apăsând butonul &lt;b&gt;Existent&lt;/b&gt; (pentru a invoca dialog
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Introduceți adresa dvs de e-mail validă.</translation>
+        <translation type="obsolete">Introduceți adresa dvs de e-mail validă.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -6425,7 +6425,7 @@ din listă apăsând butonul &lt;b&gt;Existent&lt;/b&gt; (pentru a invoca dialog
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Bine ați venit la Formularul de înregistrare al VirtualBox!</translation>
+        <translation type="obsolete">Bine ați venit la Formularul de înregistrare al VirtualBox!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -6441,7 +6441,7 @@ din listă apăsând butonul &lt;b&gt;Existent&lt;/b&gt; (pentru a invoca dialog
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Nu am putut efectua strângerea de mâini necesară conexiunii.</translation>
+        <translation type="obsolete">Nu am putut efectua strângerea de mâini necesară conexiunii.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6461,63 +6461,51 @@ din listă apăsând butonul &lt;b&gt;Existent&lt;/b&gt; (pentru a invoca dialog
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Renunță</translation>
+        <translation type="obsolete">Renunță</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Alegeți Țara/Zona</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Alegeți Țara/Zona</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Parolă:</translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Parolă:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Prenume:</translation>
+        <translation type="obsolete">&amp;Prenume:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Nume:</translation>
+        <translation type="obsolete">&amp;Nume:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Companie:</translation>
+        <translation type="obsolete">&amp;Companie:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>Èš&amp;ara:</translation>
+        <translation type="obsolete">Èš&amp;ara:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>Pa&amp;rolă:</translation>
+        <translation type="obsolete">Pa&amp;rolă:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>&amp;Confirmare parolă:</translation>
+        <translation type="obsolete">&amp;Confirmare parolă:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;ÃŽnregistrare</translation>
+        <translation type="obsolete">&amp;ÃŽnregistrare</translation>
     </message>
 </context>
 <context>
@@ -11063,7 +11051,7 @@ makes the guest see an audio card, however every access to it will be ignored.&l
         <translation>&amp;Procesoare:</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
index a51399a5f..0f6ba5306 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Sun Microsystems, Inc., Igor Gorbounov, Egor Morozov</translation>
+        <translation type="obsolete">Sun Microsystems, Inc., Igor Gorbounov, Egor Morozov</translation>
     </message>
 </context>
 <context>
@@ -1403,7 +1403,7 @@ p, li { white-space: pre-wrap; }
         <translation>Обновл�ть иконку &amp;дока</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>&amp;Показывать Док и Менюбар в режиме полного �крана</translation>
     </message>
 </context>
@@ -4641,7 +4641,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Диалог реги�трации VirtualBox</translation>
+        <translation type="obsolete">Диалог реги�трации VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -4649,7 +4649,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Впишите Ваше полное им�, и�пользу� �имволы латиницы.</translation>
+        <translation type="obsolete">Впишите Ваше полное им�, и�пользу� �имволы латиницы.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -4657,7 +4657,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Впишите дей�твительный адре� Вашей �лектронной почты.</translation>
+        <translation type="obsolete">Впишите дей�твительный адре� Вашей �лектронной почты.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -4665,11 +4665,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Реги�трационна� форма VirtualBox</translation>
+        <translation type="obsolete">Реги�трационна� форма VirtualBox</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>�е удало�ь у�тановить �оединение.</translation>
+        <translation type="obsolete">�е удало�ь у�тановить �оединение.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -4685,63 +4685,63 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="obsolete">Отмена</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Укажите Страну/Территорию</translation>
+        <translation type="obsolete">Укажите Страну/Территорию</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Пожалуй�та, заполните предлагаемую реги�трационную форму. Тем �амым, Вы изве�тите на� о том, что пользуете�ь нашим продуктом, а также получите возможно�ть быть в кур�е ново�тей и обновлений VirtualBox (по желанию).&lt;/p&gt;&lt;p&gt;Впишите Ваше полное им�, и�пользу� дл� �того �имволы латиницы, а также адре� �лектронной почты в ра�положенные ниже пол�. Пожалуй�та, примите к �ведению, что �та информаци� будет и�пользована только дл� �бора �тати�тики о количе�тве пользователей и дл� ра��ылки ново�тей VirtualBox. Иными �ловами, Sun Microsystems никогда не переда�т данные о Ва� какой-либо третьей �тороне. Более подробные �ведени� о том, как мы будем и�пользовать Ваши личные данные, можно найти в разделе &lt;b&gt;Политика конфиденциально�ти&lt;/b&gt; (Privacy Policy) Руковод�тва пользовател� VirtualBox или на �транице &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; веб-�айта VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Пожалуй�та, заполните предлагаемую реги�трационную форму. Тем �амым, Вы изве�тите на� о том, что пользуете�ь нашим продуктом, а также получите возможно�ть быть в кур�е ново�тей и обновлений VirtualBox (по желанию).&lt;/p&gt;&lt;p&gt;Впишите Ваше полное им�, и�пользу� дл� �того �имволы латиницы, а также адре� �лектронной почты в ра�положенные ниже пол�. Пожалуй�та, примите к �ведению, что �та информаци� будет и�пользована только дл� �бора �тати�тики о количе�тве пользователей и дл� ра��ылки ново�тей VirtualBox. Иными �ловами, Sun Microsystems никогда не переда�т данные о Ва� какой-либо третьей �тороне. Более подробные �ведени� о том, как мы будем и�пользовать Ваши личные данные, можно найти в разделе &lt;b&gt;Политика конфиденциально�ти&lt;/b&gt; (Privacy Policy) Руковод�тва пользовател� VirtualBox или на �транице &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; веб-�айта VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>&amp;У мен� уже имеет�� учётна� запи�ь Sun Online:</translation>
+        <translation type="obsolete">&amp;У мен� уже имеет�� учётна� запи�ь Sun Online:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>�дре� &amp;�лектронной почты:</translation>
+        <translation type="obsolete">�дре� &amp;�лектронной почты:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Пароль:</translation>
+        <translation type="obsolete">&amp;Пароль:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>&amp;Я бы хотел зареги�трировать��, �оздав новую учётную запи�ь Sun Online:</translation>
+        <translation type="obsolete">&amp;Я бы хотел зареги�трировать��, �оздав новую учётную запи�ь Sun Online:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Им�:</translation>
+        <translation type="obsolete">&amp;Им�:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Фамили�:</translation>
+        <translation type="obsolete">&amp;Фамили�:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Компани�:</translation>
+        <translation type="obsolete">&amp;Компани�:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;Страна:</translation>
+        <translation type="obsolete">&amp;Страна:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>�дре� �&amp;лектронной почты:</translation>
+        <translation type="obsolete">�дре� �&amp;лектронной почты:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>П&amp;ароль:</translation>
+        <translation type="obsolete">П&amp;ароль:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>П&amp;одтвердить пароль:</translation>
+        <translation type="obsolete">П&amp;одтвердить пароль:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Реги�траци�</translation>
+        <translation type="obsolete">&amp;Реги�траци�</translation>
     </message>
 </context>
 <context>
@@ -7209,7 +7209,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Проце��ор(ы):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
index 043d7e718..31e59ad3d 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Ivan Masár &lt;helix84@centrum.sk&gt;, Jozef Říha &lt;jose1711@gmail.com&gt;</translation>
+        <translation type="obsolete">Ivan Masár &lt;helix84@centrum.sk&gt;, Jozef Říha &lt;jose1711@gmail.com&gt;</translation>
     </message>
 </context>
 <context>
@@ -1929,7 +1929,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Náhľad v systémovej oblasti</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5804,7 +5804,7 @@ presko�iť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Registra�ný formulár pre VirtualBox</translation>
+        <translation type="obsolete">Registra�ný formulár pre VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -5812,83 +5812,75 @@ presko�iť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Zadajte vaše celé meno bez diakritiky.</translation>
+        <translation type="obsolete">Zadajte vaše celé meno bez diakritiky.</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Zadajte vašu platnú e-mailovú adresu.</translation>
+        <translation type="obsolete">Zadajte vašu platnú e-mailovú adresu.</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Vitajte vo formulári na registráciu VirtualBoxu!</translation>
+        <translation type="obsolete">Vitajte vo formulári na registráciu VirtualBoxu!</translation>
     </message>
     <message>
         <source>Connection timed out.</source>
         <translation type="obsolete">Čas spojenia vypršal.</translation>
     </message>
     <message>
-        <source>Could not perform connection handshake.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
-        <translation>Zrušiť</translation>
+        <translation type="obsolete">Zrušiť</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Vyberte krajinu/teritórium</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Vyberte krajinu/teritórium</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Už &amp;som vlastníkom ú�tu Sun Online:</translation>
+        <translation type="obsolete">Už &amp;som vlastníkom ú�tu Sun Online:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-mail:</translation>
+        <translation type="obsolete">&amp;E-mail:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Heslo:</translation>
+        <translation type="obsolete">&amp;Heslo:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Rá&amp;d by som si vytvoril nový ú�et u Sun Online:</translation>
+        <translation type="obsolete">Rá&amp;d by som si vytvoril nový ú�et u Sun Online:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Krstné meno:</translation>
+        <translation type="obsolete">&amp;Krstné meno:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Priezvisko:</translation>
+        <translation type="obsolete">&amp;Priezvisko:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Spolo�nosť:</translation>
+        <translation type="obsolete">&amp;Spolo�nosť:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>Kr&amp;ajina:</translation>
+        <translation type="obsolete">Kr&amp;ajina:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;mail:</translation>
+        <translation type="obsolete">E-&amp;mail:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>&amp;Heslo:</translation>
+        <translation type="obsolete">&amp;Heslo:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>&amp;Potvrdiť heslo:</translation>
+        <translation type="obsolete">&amp;Potvrdiť heslo:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registrovať sa</translation>
+        <translation type="obsolete">&amp;Registrovať sa</translation>
     </message>
 </context>
 <context>
@@ -6648,6 +6640,8 @@ presko�iť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
         <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>
+            <numerusform></numerusform>
         </translation>
     </message>
 </context>
@@ -8950,7 +8944,7 @@ presko�iť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
     </message>
     <message>
         <source>Port &amp;Number:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Čí&amp;slo portu:</translation>
     </message>
     <message>
         <source>Displays the parallel port number. You can choose one of the standard parallel ports or select &lt;b&gt;User-defined&lt;/b&gt; and specify port parameters manually.</source>
@@ -8958,11 +8952,11 @@ presko�iť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
     </message>
     <message>
         <source>&amp;IRQ:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;IRQ:</translation>
     </message>
     <message>
         <source>I/O Po&amp;rt:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">I/O Po&amp;rt:</translation>
     </message>
     <message>
         <source>Port &amp;Path:</source>
@@ -9281,7 +9275,7 @@ presko�iť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
         <translation>P&amp;rocesor(y):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Ovláda po�et virtuálnych CPU vo virtuálnom stroji.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
index 4260a2d5c..ec7817db1 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="sr_YU">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS>
+<TS version="2.0" language="sr_YU">
 <context>
     <name>@@@</name>
     <message>
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Оzzii.translate@gmail.com</translation>
+        <translation type="obsolete">Оzzii.translate@gmail.com</translation>
     </message>
 </context>
 <context>
@@ -1397,7 +1397,7 @@ p, li { white-space: pre-wrap; }
         <translation>Dock икона реални преглед</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>�уто покажи Dock траку у пуном-екрану</translation>
     </message>
 </context>
@@ -4631,7 +4631,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Реги�тровање VirtualBox-а</translation>
+        <translation type="obsolete">Реги�тровање VirtualBox-а</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -4639,7 +4639,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Унети ваше име кори�тећи латин�ка �лова.</translation>
+        <translation type="obsolete">Унети ваше име кори�тећи латин�ка �лова.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -4647,7 +4647,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Унети ваш имејл. Унети важечу адре�у.</translation>
+        <translation type="obsolete">Унети ваш имејл. Унети важечу адре�у.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -4655,11 +4655,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Добродошли у формулар реги�тровања VirtualBox -а!</translation>
+        <translation type="obsolete">Добродошли у формулар реги�тровања VirtualBox -а!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>�еу�пешно пријављивање везе.</translation>
+        <translation type="obsolete">�еу�пешно пријављивање везе.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -4675,63 +4675,63 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Поништи</translation>
+        <translation type="obsolete">Поништи</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Одабрати земљу/територију</translation>
+        <translation type="obsolete">Одабрати земљу/територију</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Молимо ва� да попунити овај формулар да би знали да кори�тите VirtualBox и, необавезно, да будете информи�ани о ажурирања VirtualBox-а.&lt;/p&gt;&lt;p&gt;Унети �амо латин�ке карактере. Sun Microsystems кори�ти ове информације �амо за �тати�тике и да вам пошаље VirtualBox ново�ти. Sun Microsystems неће никада попу�тити Ваше податке другима. Детаљи о употреби личних информацијама може �е наћи у &lt;b&gt;Политика приватно�ти&lt;/b&gt; руковника или на &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Политика приватно�ти&lt;/a&gt; �ајта.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Молимо ва� да попунити овај формулар да би знали да кори�тите VirtualBox и, необавезно, да будете информи�ани о ажурирања VirtualBox-а.&lt;/p&gt;&lt;p&gt;Унети �амо латин�ке карактере. Sun Microsystems кори�ти ове информације �амо за �тати�тике и да вам пошаље VirtualBox ново�ти. Sun Microsystems неће никада попу�тити Ваше податке другима. Детаљи о употреби личних информацијама може �е наћи у &lt;b&gt;Политика приватно�ти&lt;/b&gt; руковника или на &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Политика приватно�ти&lt;/a&gt; �ајта.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Већ имам Sun Online рачун:</translation>
+        <translation type="obsolete">Већ имам Sun Online рачун:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>Имејл</translation>
+        <translation type="obsolete">Имејл</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>Лозинка:</translation>
+        <translation type="obsolete">Лозинка:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Желим да креирам нов Sun Online рачун:</translation>
+        <translation type="obsolete">Желим да креирам нов Sun Online рачун:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>Име:</translation>
+        <translation type="obsolete">Име:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>Презиме:</translation>
+        <translation type="obsolete">Презиме:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>Фирма:</translation>
+        <translation type="obsolete">Фирма:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>Земља:</translation>
+        <translation type="obsolete">Земља:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>Имејл:</translation>
+        <translation type="obsolete">Имејл:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>Лозинка:</translation>
+        <translation type="obsolete">Лозинка:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Потврда лозинке:</translation>
+        <translation type="obsolete">Потврда лозинке:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>Реги�труј</translation>
+        <translation type="obsolete">Реги�труј</translation>
     </message>
 </context>
 <context>
@@ -7078,7 +7078,7 @@ p, li { white-space: pre-wrap; }
         <translation>Проце�ор(и):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
index cef400796..609d62124 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Daniel Nylander.</translation>
+        <translation type="obsolete">Daniel Nylander.</translation>
     </message>
 </context>
 <context>
@@ -1665,7 +1665,7 @@ p, li { white-space: pre-wrap; }
         <translation>Realtidsvisning för &amp;dockningsikon</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>V&amp;isa automatiskt docka och menyrad i helskärm</translation>
     </message>
 </context>
@@ -5116,7 +5116,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Registreringsdialog för VirtualBox</translation>
+        <translation type="obsolete">Registreringsdialog för VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -5124,7 +5124,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Ange ditt fullständiga namn med latinska bokstäver.</translation>
+        <translation type="obsolete">Ange ditt fullständiga namn med latinska bokstäver.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -5132,7 +5132,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Ange din giltiga e-postadress.</translation>
+        <translation type="obsolete">Ange din giltiga e-postadress.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -5140,7 +5140,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Välkommen till registreringsformuläret för VirtualBox!</translation>
+        <translation type="obsolete">Välkommen till registreringsformuläret för VirtualBox!</translation>
     </message>
     <message>
         <source>Connection timed out.</source>
@@ -5152,7 +5152,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Kunde inte genomföra anslutningshandskakning.</translation>
+        <translation type="obsolete">Kunde inte genomföra anslutningshandskakning.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5168,63 +5168,63 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Avbryt</translation>
+        <translation type="obsolete">Avbryt</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Välj land/region</translation>
+        <translation type="obsolete">Välj land/region</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information till tredje part. Detaljerad information om hur vi använder din personliga information kan hittas i &lt;b&gt;Privacy Policy&lt;/b&gt;-avsnittet i VirtualBox-handboken eller på sidan &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; på VirtualBox webbplats.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information till tredje part. Detaljerad information om hur vi använder din personliga information kan hittas i &lt;b&gt;Privacy Policy&lt;/b&gt;-avsnittet i VirtualBox-handboken eller på sidan &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; på VirtualBox webbplats.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>Jag &amp;har ett Sun Online-konto redan:</translation>
+        <translation type="obsolete">Jag &amp;har ett Sun Online-konto redan:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;E-post:</translation>
+        <translation type="obsolete">&amp;E-post:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Lösenord:</translation>
+        <translation type="obsolete">&amp;Lösenord:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Jag &amp;vill registrera och skapa ett nytt Sun Online-konto:</translation>
+        <translation type="obsolete">Jag &amp;vill registrera och skapa ett nytt Sun Online-konto:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Förnamn:</translation>
+        <translation type="obsolete">&amp;Förnamn:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Efternamn:</translation>
+        <translation type="obsolete">&amp;Efternamn:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>F&amp;öretag:</translation>
+        <translation type="obsolete">F&amp;öretag:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>La&amp;nd:</translation>
+        <translation type="obsolete">La&amp;nd:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>E-&amp;post:</translation>
+        <translation type="obsolete">E-&amp;post:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>&amp;Lösenord:</translation>
+        <translation type="obsolete">&amp;Lösenord:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>&amp;Bekräfta lösenordet:</translation>
+        <translation type="obsolete">&amp;Bekräfta lösenordet:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Registrera</translation>
+        <translation type="obsolete">&amp;Registrera</translation>
     </message>
 </context>
 <context>
@@ -7772,7 +7772,7 @@ serial ports</comment>
         <translation>&amp;Processor(er):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>Kontrollerar antalet virtuella processorer i den virtuella maskinen.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
index a54b0464c..77184a8d9 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Serdar SOYTETÄ°R &lt;tulliana@gmail.com&gt; .</translation>
+        <translation type="obsolete">Serdar SOYTETÄ°R &lt;tulliana@gmail.com&gt; .</translation>
     </message>
 </context>
 <context>
@@ -1914,7 +1914,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3215,7 +3215,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;nobr&gt;%4 MB&lt;/nobr&gt; {1 ?}</translation>
     </message>
     <message>
         <source>Processor(s)</source>
@@ -5882,7 +5882,7 @@ Bu Sanal Makinenin fare işaretçinizi ve klavyenizi &lt;b&gt;yakalamasına&lt;/
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBox Kayıt Formu</translation>
+        <translation type="obsolete">VirtualBox Kayıt Formu</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5894,7 +5894,7 @@ Bu Sanal Makinenin fare işaretçinizi ve klavyenizi &lt;b&gt;yakalamasına&lt;/
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Latin harflerini kullanarak tam adınızı girin.</translation>
+        <translation type="obsolete">Latin harflerini kullanarak tam adınızı girin.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -5902,7 +5902,7 @@ Bu Sanal Makinenin fare işaretçinizi ve klavyenizi &lt;b&gt;yakalamasına&lt;/
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Geçerli e-posta adresinizi girin.</translation>
+        <translation type="obsolete">Geçerli e-posta adresinizi girin.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -5914,7 +5914,7 @@ Bu Sanal Makinenin fare işaretçinizi ve klavyenizi &lt;b&gt;yakalamasına&lt;/
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>VirtualBox Kayıt Formununa Hoşgeldiniz!</translation>
+        <translation type="obsolete">VirtualBox Kayıt Formununa Hoşgeldiniz!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -5930,7 +5930,7 @@ Bu Sanal Makinenin fare işaretçinizi ve klavyenizi &lt;b&gt;yakalamasına&lt;/
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Bağlantı anlaşması yapılamadı.</translation>
+        <translation type="obsolete">Bağlantı anlaşması yapılamadı.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -5946,63 +5946,7 @@ Bu Sanal Makinenin fare işaretçinizi ve klavyenizi &lt;b&gt;yakalamasına&lt;/
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Ä°ptal</translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ä°ptal</translation>
     </message>
 </context>
 <context>
@@ -9677,7 +9621,7 @@ makes the guest see an audio card, however every access to it will be ignored.&l
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
index 3a07e0e7a..00e800e04 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Daniel Korostil.</translation>
+        <translation type="obsolete">Daniel Korostil.</translation>
     </message>
 </context>
 <context>
@@ -1398,6 +1398,10 @@ p, li { white-space: pre-wrap; }
         <source>&amp;Dock Icon Realtime Preview</source>
         <translation>&amp;Попередній перегл�д піктограми реального ча�у</translation>
     </message>
+    <message>
+        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VBoxGLSettingsInput</name>
@@ -2869,6 +2873,58 @@ p, li { white-space: pre-wrap; }
         <comment>medium</comment>
         <translation>Цей базовий жор�ткий ди�к не напр�му під&apos;єднано, викори�товуючи такі обчи�ленн� жор�ткого ди�ка:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>(CD/DVD)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VBoxGlobalSettings</name>
@@ -4347,7 +4403,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;By deleting a snapshot, the state information stored in the snapshot will be thrown away, 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.&lt;/p&gt;&lt;/p&gt;Are you sure you want to delete the selected snapshot &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Вилучивши зріз, інформаці� про �тан, �кий збережено в зрізі, буде відкинуто, і дані ди�ка розподілено декілька файлів зображенн�, �кі VirtualBox �творив разом зі зрізом, буде об&apos;єднано в один файл. Це може бути тривалим проце�ом, та інформацію в зрізі неможливо відновити.&lt;/p&gt;&lt;/p&gt;Ви впевнені, що бажаєте вилучити вибраний зріз &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Вилучивши зріз, інформаці� про �тан, �кий збережено в зрізі, буде відкинуто, і дані ди�ка розподілено декілька файлів зображенн�, �кі VirtualBox �творив разом зі зрізом, буде об&apos;єднано в один файл. Це може бути тривалим проце�ом, та інформацію в зрізі неможливо відновити.&lt;/p&gt;&lt;/p&gt;Ви впевнені, що бажаєте вилучити вибраний зріз &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -4464,6 +4520,19 @@ p, li { white-space: pre-wrap; }
         <comment>failed to close ...</comment>
         <translation>при�трій ди�кети</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;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.&lt;/p&gt;&lt;/p&gt;Are you sure you want to delete the selected snapshot &lt;b&gt;%1&lt;/b&gt;?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Are you sure you want to delete the CD/DVD-ROM device?&lt;/p&gt;&lt;p&gt;You will not be able to mount any CDs or ISO images or install the Guest Additions without it!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VBoxProgressDialog</name>
@@ -4473,55 +4542,55 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>%1 days, %2 hours remaining</source>
-        <translation>залишило�ь %1 днів, %2 годин</translation>
+        <translation type="obsolete">залишило�ь %1 днів, %2 годин</translation>
     </message>
     <message>
         <source>%1 days, %2 minutes remaining</source>
-        <translation>залишило�ь %1 днів, %2 хвилин</translation>
+        <translation type="obsolete">залишило�ь %1 днів, %2 хвилин</translation>
     </message>
     <message>
         <source>%1 days remaining</source>
-        <translation>залишило�ь %1 днів</translation>
+        <translation type="obsolete">залишило�ь %1 днів</translation>
     </message>
     <message>
         <source>1 day, %1 hours remaining</source>
-        <translation>залишив�� 1 день, %1 годин</translation>
+        <translation type="obsolete">залишив�� 1 день, %1 годин</translation>
     </message>
     <message>
         <source>1 day, %1 minutes remaining</source>
-        <translation>залишив�� 1 день, %1 хвилин</translation>
+        <translation type="obsolete">залишив�� 1 день, %1 хвилин</translation>
     </message>
     <message>
         <source>1 day remaining</source>
-        <translation>залишив�� 1 день</translation>
+        <translation type="obsolete">залишив�� 1 день</translation>
     </message>
     <message>
         <source>%1 hours, %2 minutes remaining</source>
-        <translation>залишило�ь %1 годин, %2 хвилин</translation>
+        <translation type="obsolete">залишило�ь %1 годин, %2 хвилин</translation>
     </message>
     <message>
         <source>1 hour, %1 minutes remaining</source>
-        <translation>залишила�ь 1 година, %1 хвилин</translation>
+        <translation type="obsolete">залишила�ь 1 година, %1 хвилин</translation>
     </message>
     <message>
         <source>1 hour remaining</source>
-        <translation>залишила�ь 1 година</translation>
+        <translation type="obsolete">залишила�ь 1 година</translation>
     </message>
     <message>
         <source>%1 minutes remaining</source>
-        <translation>залишило�ь %1 хвилин</translation>
+        <translation type="obsolete">залишило�ь %1 хвилин</translation>
     </message>
     <message>
         <source>1 minute, %2 seconds remaining</source>
-        <translation>залишила�ь 1 хвилина, %2 �екунд</translation>
+        <translation type="obsolete">залишила�ь 1 хвилина, %2 �екунд</translation>
     </message>
     <message>
         <source>1 minute remaining</source>
-        <translation>залишила�ь 1 хвилина</translation>
+        <translation type="obsolete">залишила�ь 1 хвилина</translation>
     </message>
     <message>
         <source>%1 seconds remaining</source>
-        <translation>залишило�ь %1 �екунд</translation>
+        <translation type="obsolete">залишило�ь %1 �екунд</translation>
     </message>
     <message>
         <source>A few seconds remaining</source>
@@ -4539,12 +4608,22 @@ p, li { white-space: pre-wrap; }
         <source>Cancel the current operation</source>
         <translation>Ска�увати поточну операцію</translation>
     </message>
+    <message>
+        <source>%1, %2 remaining</source>
+        <comment>You may wish to translate this more like &quot;Time remaining: %1, %2&quot;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 remaining</source>
+        <comment>You may wish to translate this more like &quot;Time remaining: %1&quot;</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>Діалог реє�трації VirtualBox</translation>
+        <translation type="obsolete">Діалог реє�трації VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -4552,7 +4631,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Введіть ваше повне ім&apos;�, викори�товуючи лише латин�ькі �имволи.</translation>
+        <translation type="obsolete">Введіть ваше повне ім&apos;�, викори�товуючи лише латин�ькі �имволи.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -4560,7 +4639,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Введіть дій�ну адре�у вашої електронної пошти.</translation>
+        <translation type="obsolete">Введіть дій�ну адре�у вашої електронної пошти.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -4568,11 +4647,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Ла�каво про�имо до реє�траційної форми VirtualBox!</translation>
+        <translation type="obsolete">Ла�каво про�имо до реє�траційної форми VirtualBox!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>�е вдало�ь здій�нити в�тановленн� зв&apos;�зку.</translation>
+        <translation type="obsolete">�е вдало�ь здій�нити в�тановленн� зв&apos;�зку.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -4588,63 +4667,63 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Ска�увати</translation>
+        <translation type="obsolete">Ска�увати</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>Виберіть країну/територію</translation>
+        <translation type="obsolete">Виберіть країну/територію</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Будь ла�ка, заповніть цю реє�траційну форму, щоб ми знали, що ви викори�туєте VirtualBox, і, за вашим бажанн�м, ми триматимемо ва� у кур�і в�іх новин і оновлень щодо VirtualBox.&lt;/p&gt;&lt;p&gt;Будь ла�ка, викори�товуйте латин�ькі �имволи дл� заповненн� полів нижче. Будь ла�ка, майте на увазі, Sun Microsystems викори�товуватиме цю інформацію лише дл� збору �тати�тичної інформації та роз�илки новин. Вла�не, Sun Microsystems ніколи не нада�ть ваших даних третій о�обі. Детальна інформаці� про викори�танн� ваших о�оби�тих даних можна знайти в довідці VirtualBox у розділі  &lt;b&gt;Privacy Policy&lt;/b&gt; або на &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; �торінці �айта VirtualBox.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Будь ла�ка, заповніть цю реє�траційну форму, щоб ми знали, що ви викори�туєте VirtualBox, і, за вашим бажанн�м, ми триматимемо ва� у кур�і в�іх новин і оновлень щодо VirtualBox.&lt;/p&gt;&lt;p&gt;Будь ла�ка, викори�товуйте латин�ькі �имволи дл� заповненн� полів нижче. Будь ла�ка, майте на увазі, Sun Microsystems викори�товуватиме цю інформацію лише дл� збору �тати�тичної інформації та роз�илки новин. Вла�не, Sun Microsystems ніколи не нада�ть ваших даних третій о�обі. Детальна інформаці� про викори�танн� ваших о�оби�тих даних можна знайти в довідці VirtualBox у розділі  &lt;b&gt;Privacy Policy&lt;/b&gt; або на &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; �торінці �айта VirtualBox.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>&amp;Я вже маю зареє�трований акаунт у Sun:</translation>
+        <translation type="obsolete">&amp;Я вже маю зареє�трований акаунт у Sun:</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>&amp;Електронна пошта:</translation>
+        <translation type="obsolete">&amp;Електронна пошта:</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>&amp;Пароль:</translation>
+        <translation type="obsolete">&amp;Пароль:</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>Я &amp;бажаю зареє�трувати�ь, �творивши акаунт Sun:</translation>
+        <translation type="obsolete">Я &amp;бажаю зареє�трувати�ь, �творивши акаунт Sun:</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>&amp;Ім&apos;�:</translation>
+        <translation type="obsolete">&amp;Ім&apos;�:</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>&amp;Прізвище:</translation>
+        <translation type="obsolete">&amp;Прізвище:</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>&amp;Фірма:</translation>
+        <translation type="obsolete">&amp;Фірма:</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>&amp;Країна:</translation>
+        <translation type="obsolete">&amp;Країна:</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>&amp;Електронна пошта:</translation>
+        <translation type="obsolete">&amp;Електронна пошта:</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>П&amp;ароль:</translation>
+        <translation type="obsolete">П&amp;ароль:</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>Під&amp;твердженн� паролю:</translation>
+        <translation type="obsolete">Під&amp;твердженн� паролю:</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>&amp;Зареє�трувати</translation>
+        <translation type="obsolete">&amp;Зареє�трувати</translation>
     </message>
 </context>
 <context>
@@ -5028,7 +5107,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message numerus="yes">
         <source> (%n day(s) ago)</source>
-        <translation>
+        <translation type="obsolete">
             <numerusform> (%n день тому)</numerusform>
             <numerusform> (%n дні тому)</numerusform>
             <numerusform> (%n днів тому)</numerusform>
@@ -5036,7 +5115,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message numerus="yes">
         <source> (%n hour(s) ago)</source>
-        <translation>
+        <translation type="obsolete">
             <numerusform> (%n година тому)</numerusform>
             <numerusform> (%n години тому)</numerusform>
             <numerusform> (%n годин тому)</numerusform>
@@ -5044,7 +5123,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message numerus="yes">
         <source> (%n minute(s) ago)</source>
-        <translation>
+        <translation type="obsolete">
             <numerusform> (%n хвилина тому)</numerusform>
             <numerusform> (%n хвилини тому)</numerusform>
             <numerusform> (%n хвилин тому)</numerusform>
@@ -5052,7 +5131,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message numerus="yes">
         <source> (%n second(s) ago)</source>
-        <translation>
+        <translation type="obsolete">
             <numerusform> (%n �екунда тому)</numerusform>
             <numerusform> (%n �екунди тому)</numerusform>
             <numerusform> (%n �екунд тому)</numerusform>
@@ -5074,6 +5153,10 @@ p, li { white-space: pre-wrap; }
         <source>Delete the selected snapshot of the virtual machine</source>
         <translation>Вилучити вибраний зріз віртуальної машини</translation>
     </message>
+    <message>
+        <source> (%1 ago)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VBoxSwitchMenu</name>
@@ -5100,6 +5183,14 @@ p, li { white-space: pre-wrap; }
         <source>Snapshot &amp;Description</source>
         <translation>&amp;Опи� зрізу</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>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>VBoxTextEditor</name>
@@ -6993,7 +7084,7 @@ p, li { white-space: pre-wrap; }
         <translation>&amp;Проце�ор(и):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
index 899ce0246..6264c94e0 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
@@ -23,11 +23,6 @@
         <comment>Language country name, in English (empty if native country name is empty)</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sun Microsystems, Inc.</source>
-        <comment>Comma-separated list of translators</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QApplication</name>
@@ -1190,7 +1185,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3996,89 +3991,6 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>VBoxRegistrationDlg</name>
-    <message>
-        <source>VirtualBox Registration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your full name using Latin characters.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not perform connection handshake.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>VBoxSFDialog</name>
     <message>
         <source>Shared Folders</source>
@@ -5824,7 +5736,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
index 7aa44031e..219092975 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Victor Wang</translation>
+        <translation type="obsolete">Victor Wang</translation>
     </message>
 </context>
 <context>
@@ -2115,7 +2115,7 @@ p, li { white-space: pre-wrap; }
         <translation>托盘图标实时预览(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3429,7 +3429,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;nobr&gt;%4 MB&lt;/nobr&gt; {1 ?}</translation>
     </message>
     <message>
         <source>Processor(s)</source>
@@ -6328,7 +6328,7 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBox Registration Dialog</translation>
+        <translation type="obsolete">VirtualBox Registration Dialog</translation>
     </message>
     <message>
         <source>&amp;Name</source>
@@ -6336,7 +6336,7 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>Enter your full name using Latin characters.</translation>
+        <translation type="obsolete">Enter your full name using Latin characters.</translation>
     </message>
     <message>
         <source>&amp;E-mail</source>
@@ -6344,7 +6344,7 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>Enter your e-mail address. Please use a valid address here.</translation>
+        <translation type="obsolete">Enter your e-mail address. Please use a valid address here.</translation>
     </message>
     <message>
         <source>&amp;Please do not use this information to contact me</source>
@@ -6352,7 +6352,7 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>Welcome to the VirtualBox Registration Form!</translation>
+        <translation type="obsolete">Welcome to the VirtualBox Registration Form!</translation>
     </message>
     <message>
         <source>&amp;Confirm</source>
@@ -6368,7 +6368,7 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>Could not perform connection handshake.</translation>
+        <translation type="obsolete">Could not perform connection handshake.</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 information about how we use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
@@ -6384,63 +6384,7 @@ step and attach hard disks later using the VM Settings dialog.&lt;/p&gt;</source
     </message>
     <message>
         <source>Cancel</source>
-        <translation>�消</translation>
-    </message>
-    <message>
-        <source>Select Country/Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;already have a Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;E-mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;First Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Last Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Company:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;untry:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E-&amp;mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>P&amp;assword:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Co&amp;nfirm Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Register</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">�消</translation>
     </message>
 </context>
 <context>
@@ -10938,7 +10882,7 @@ makes the guest see an audio card, however every access to it will be ignored.&l
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
index 9f4b945f3..d0f074d99 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
@@ -26,7 +26,7 @@
     <message>
         <source>Sun Microsystems, Inc.</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>alan@stable</translation>
+        <translation type="obsolete">alan@stable</translation>
     </message>
 </context>
 <context>
@@ -45,7 +45,7 @@
     </message>
     <message>
         <source>&lt;html&gt;&lt;b&gt;%1 (rc=%2)&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;b&gt;%1 (rc=%2)&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
     <message>
         <source>Please try reinstalling VirtualBox.</source>
@@ -158,127 +158,127 @@
     </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>&lt;key_%1&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;key_%1&gt;</translation>
     </message>
     <message>
         <source>Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>Pause</translation>
     </message>
     <message>
         <source>Print Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Print Screen</translation>
     </message>
     <message>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation>F1</translation>
     </message>
     <message>
         <source>F2</source>
-        <translation type="unfinished"></translation>
+        <translation>F2</translation>
     </message>
     <message>
         <source>F3</source>
-        <translation type="unfinished"></translation>
+        <translation>F3</translation>
     </message>
     <message>
         <source>F4</source>
-        <translation type="unfinished"></translation>
+        <translation>F4</translation>
     </message>
     <message>
         <source>F5</source>
-        <translation type="unfinished"></translation>
+        <translation>F5</translation>
     </message>
     <message>
         <source>F6</source>
-        <translation type="unfinished"></translation>
+        <translation>F6</translation>
     </message>
     <message>
         <source>F7</source>
-        <translation type="unfinished"></translation>
+        <translation>F7</translation>
     </message>
     <message>
         <source>F8</source>
-        <translation type="unfinished"></translation>
+        <translation>F8</translation>
     </message>
     <message>
         <source>F9</source>
-        <translation type="unfinished"></translation>
+        <translation>F9</translation>
     </message>
     <message>
         <source>F10</source>
-        <translation type="unfinished"></translation>
+        <translation>F10</translation>
     </message>
     <message>
         <source>F11</source>
-        <translation type="unfinished"></translation>
+        <translation>F11</translation>
     </message>
     <message>
         <source>F12</source>
-        <translation type="unfinished"></translation>
+        <translation>F12</translation>
     </message>
     <message>
         <source>F13</source>
-        <translation type="unfinished"></translation>
+        <translation>F13</translation>
     </message>
     <message>
         <source>F14</source>
-        <translation type="unfinished"></translation>
+        <translation>F14</translation>
     </message>
     <message>
         <source>F15</source>
-        <translation type="unfinished"></translation>
+        <translation>F15</translation>
     </message>
     <message>
         <source>F16</source>
-        <translation type="unfinished"></translation>
+        <translation>F16</translation>
     </message>
     <message>
         <source>F17</source>
-        <translation type="unfinished"></translation>
+        <translation>F17</translation>
     </message>
     <message>
         <source>F18</source>
-        <translation type="unfinished"></translation>
+        <translation>F18</translation>
     </message>
     <message>
         <source>F19</source>
-        <translation type="unfinished"></translation>
+        <translation>F19</translation>
     </message>
     <message>
         <source>F20</source>
-        <translation type="unfinished"></translation>
+        <translation>F20</translation>
     </message>
     <message>
         <source>F21</source>
-        <translation type="unfinished"></translation>
+        <translation>F21</translation>
     </message>
     <message>
         <source>F22</source>
-        <translation type="unfinished"></translation>
+        <translation>F22</translation>
     </message>
     <message>
         <source>F23</source>
-        <translation type="unfinished"></translation>
+        <translation>F23</translation>
     </message>
     <message>
         <source>F24</source>
-        <translation type="unfinished"></translation>
+        <translation>F24</translation>
     </message>
     <message>
         <source>Num Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Num Lock</translation>
     </message>
     <message>
         <source>Forward</source>
@@ -437,15 +437,15 @@
     </message>
     <message>
         <source>Guest OS Type</source>
-        <translation>客體 OS 類型</translation>
+        <translation>客體作業系統類型</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation type="unfinished"></translation>
+        <translation>CPU</translation>
     </message>
     <message>
         <source>RAM</source>
-        <translation type="unfinished"></translation>
+        <translation>RAM</translation>
     </message>
     <message>
         <source>Hard Disk Controller (IDE)</source>
@@ -461,7 +461,7 @@
     </message>
     <message>
         <source>DVD</source>
-        <translation type="unfinished"></translation>
+        <translation>DVD</translation>
     </message>
     <message>
         <source>Floppy</source>
@@ -489,7 +489,7 @@
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation>MB</translation>
     </message>
     <message>
         <source>&lt;b&gt;Original Value:&lt;/b&gt; %1</source>
@@ -812,7 +812,7 @@
     </message>
     <message>
         <source>Sun VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <translation>Sun VirtualBox</translation>
     </message>
     <message>
         <source>Indicates the status of the hardware virtualization features used by this virtual machine:&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%3:&lt;/b&gt;&amp;nbsp;%4&lt;/nobr&gt;</source>
@@ -822,7 +822,7 @@
     <message>
         <source>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;</source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;nobr&gt;&lt;b&gt;%1:&lt;/b&gt;&amp;nbsp;%2&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source> EXPERIMENTAL build %1r%2 - %3</source>
@@ -1040,11 +1040,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Sun &amp;Cloud</source>
-        <translation type="unfinished"></translation>
+        <translation>Sun &amp;Cloud</translation>
     </message>
     <message>
         <source>&amp;Simple Storage System (S3)</source>
-        <translation>簡單儲存系統 (S3)(&amp;S)</translation>
+        <translation>簡單存放系統 (S3)(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Username:</source>
@@ -1142,11 +1142,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>USB</source>
-        <translation type="unfinished"></translation>
+        <translation>USB</translation>
     </message>
     <message>
         <source>VirtualBox - %1</source>
-        <translation type="unfinished"></translation>
+        <translation>VirtualBox - %1</translation>
     </message>
     <message>
         <source>Network</source>
@@ -1196,7 +1196,7 @@ p, li { white-space: pre-wrap; }
         <translation>��圖示�時�覽(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</source>
+        <source>&amp;Auto show Dock and Menubar in fullscreen</source>
         <translation>在全螢幕自動顯示�� &amp;&amp; 功能表列(&amp;A)</translation>
     </message>
 </context>
@@ -1259,7 +1259,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation>Id</translation>
     </message>
     <message>
         <source>Language</source>
@@ -1620,12 +1620,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>ACPI</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>ACPI</translation>
     </message>
     <message>
         <source>IO APIC</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>IO APIC</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -1765,7 +1765,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>CD/DVD-ROM</source>
         <comment>DeviceType</comment>
-        <translation type="unfinished"></translation>
+        <translation>CD/DVD-ROM</translation>
     </message>
     <message>
         <source>Hard Disk</source>
@@ -1840,12 +1840,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Windows DirectSound</source>
         <comment>AudioDriverType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Windows DirectSound</translation>
     </message>
     <message>
         <source>CoreAudio</source>
         <comment>AudioDriverType</comment>
-        <translation type="unfinished"></translation>
+        <translation>CoreAudio</translation>
     </message>
     <message>
         <source>Not attached</source>
@@ -1855,7 +1855,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>NAT</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT</translation>
     </message>
     <message>
         <source>Internal Network</source>
@@ -1930,7 +1930,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>USB</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB</translation>
     </message>
     <message>
         <source>Shared Folders</source>
@@ -1970,12 +1970,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>VT-x/AMD-V</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>VT-x/AMD-V</translation>
     </message>
     <message>
         <source>PAE/NX</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>PAE/NX</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -2025,7 +2025,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>USB</source>
         <comment>DeviceType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB</translation>
     </message>
     <message>
         <source>Shared Folder</source>
@@ -2035,12 +2035,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>IDE</source>
         <comment>StorageBus</comment>
-        <translation type="unfinished"></translation>
+        <translation>IDE</translation>
     </message>
     <message>
         <source>SATA</source>
         <comment>StorageBus</comment>
-        <translation type="unfinished"></translation>
+        <translation>SATA</translation>
     </message>
     <message>
         <source>Primary</source>
@@ -2075,37 +2075,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>PulseAudio</source>
         <comment>AudioDriverType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PulseAudio</translation>
     </message>
     <message>
         <source>ICH AC97</source>
         <comment>AudioControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>ICH AC97</translation>
     </message>
     <message>
         <source>SoundBlaster 16</source>
         <comment>AudioControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>SoundBlaster 16</translation>
     </message>
     <message>
         <source>PCnet-PCI II (Am79C970A)</source>
         <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PCnet-PCI II (Am79C970A)</translation>
     </message>
     <message>
         <source>PCnet-FAST III (Am79C973)</source>
         <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PCnet-FAST III (Am79C973)</translation>
     </message>
     <message>
         <source>Intel PRO/1000 MT Desktop (82540EM)</source>
         <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Intel PRO/1000 MT Desktop (82540EM)</translation>
     </message>
     <message>
         <source>Intel PRO/1000 T Server (82543GC)</source>
         <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Intel PRO/1000 T Server (82543GC)</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Vendor ID: %1&lt;/nobr&gt;</source>
@@ -2210,37 +2210,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>SCSI</source>
         <comment>StorageBus</comment>
-        <translation type="unfinished"></translation>
+        <translation>SCSI</translation>
     </message>
     <message>
         <source>PIIX3</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PIIX3</translation>
     </message>
     <message>
         <source>PIIX4</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PIIX4</translation>
     </message>
     <message>
         <source>ICH6</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>ICH6</translation>
     </message>
     <message>
         <source>AHCI</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>AHCI</translation>
     </message>
     <message>
         <source>Lsilogic</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Lsilogic</translation>
     </message>
     <message>
         <source>BusLogic</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>BusLogic</translation>
     </message>
     <message>
         <source>Bridged adapter, %1</source>
@@ -2255,7 +2255,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Intel PRO/1000 MT Server (82545EM)</source>
         <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Intel PRO/1000 MT Server (82545EM)</translation>
     </message>
     <message>
         <source>Bridged Adapter</source>
@@ -2270,7 +2270,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;%1 MB&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>Processor(s)</source>
@@ -2280,7 +2280,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;nobr&gt;%1&lt;/nobr&gt;</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;%1&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>System</source>
@@ -2335,7 +2335,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Storage</source>
         <comment>details report</comment>
-        <translation>儲存</translation>
+        <translation>存放�置</translation>
     </message>
     <message>
         <source>Teleported</source>
@@ -2345,7 +2345,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Guru Meditation</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translation>Guru Meditation</translation>
     </message>
     <message>
         <source>Teleporting</source>
@@ -2425,7 +2425,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>I82078</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>I82078</translation>
     </message>
     <message>
         <source>Empty</source>
@@ -2450,7 +2450,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;p&gt;Attached to:  %1&lt;/p&gt;</source>
         <comment>image</comment>
-        <translation>&lt;p&gt;附加至:  %1&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;附加到:  %1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;i&gt;Not Attached&lt;/i&gt;</source>
@@ -2502,43 +2502,43 @@ p, li { white-space: pre-wrap; }
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
-        <translation>
-            <numerusform></numerusform>
+        <translation type="unfinished">
+            <numerusform>%n å¹´</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation>
-            <numerusform></numerusform>
+        <translation type="unfinished">
+            <numerusform>%n 月</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
-        <translation>
-            <numerusform></numerusform>
+        <translation type="unfinished">
+            <numerusform>%n æ—¥</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation>
-            <numerusform></numerusform>
+        <translation type="unfinished">
+            <numerusform>%n �時</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation>
-            <numerusform></numerusform>
+        <translation type="unfinished">
+            <numerusform>%n 分�</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n second(s)</source>
-        <translation>
-            <numerusform></numerusform>
+        <translation type="unfinished">
+            <numerusform>%n 秒</numerusform>
         </translation>
     </message>
     <message>
         <source>(CD/DVD)</source>
-        <translation type="unfinished"></translation>
+        <translation>(CD/DVD)</translation>
     </message>
 </context>
 <context>
@@ -2821,7 +2821,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Select a CD/DVD-ROM disk image file</source>
-        <translation>��一個 CD/DVD-ROM 映�檔</translation>
+        <translation>��一個 CD/DVD-ROM 光碟映�檔</translation>
     </message>
     <message>
         <source>Floppy images (*.img);;All files (*)</source>
@@ -2838,7 +2838,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>--</source>
         <comment>no info</comment>
-        <translation type="unfinished"></translation>
+        <translation>--</translation>
     </message>
     <message>
         <source>Virtual Media Manager</source>
@@ -2922,7 +2922,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Virtual Disk Location and Size</source>
-        <translation>虛擬�碟�置和大�</translation>
+        <translation>虛擬�碟�置與大�</translation>
     </message>
     <message>
         <source>Summary</source>
@@ -2970,7 +2970,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Bytes</source>
         <comment>summary</comment>
-        <translation type="unfinished"></translation>
+        <translation>Bytes</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -2982,27 +2982,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Hard Disk Storage Type</source>
-        <translation>硬碟儲存類型</translation>
+        <translation>硬碟存放類型</translation>
     </message>
     <message>
         <source>&lt;p&gt;Select the type of virtual hard disk you want to create.&lt;/p&gt;&lt;p&gt;A &lt;b&gt;dynamically expanding storage&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;A &lt;b&gt;fixed-size storage&lt;/b&gt; does not grow. It is stored in a file of approximately the same size as the size of the virtual hard disk. The creation of a fixed-size storage may take a long time depending on the storage size and the write performance of your harddisk.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;�擇您�建立的虛擬硬碟類型。 &lt;/p&gt;&lt;p&gt;&lt;b&gt;動態延伸儲存&lt;/b&gt;最�在您的實體硬碟佔用�常少的空間。 它將會動態�長 (直到指定的大�) 作為客體作業系統索�的�碟空間。 &lt;/p&gt;&lt;p&gt;&lt;b&gt;固定大�儲存&lt;/b&gt;�會�長。 它儲存在與虛擬硬碟大�大約相�的檔案大�。 固定大�儲存�能需�長時間的建立，�決於儲存大�與您硬碟的寫入性能。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;�擇您�建立的虛擬硬碟類型。 &lt;/p&gt;&lt;p&gt;&lt;b&gt;動態延伸存放&lt;/b&gt;最�在您的實體硬碟佔用�常少的空間。 它將會動態�長 (直到指定的大�) 作為客體作業系統索�的�碟空間。 &lt;/p&gt;&lt;p&gt;&lt;b&gt;固定大�存放&lt;/b&gt;�會�長。 它儲存在與虛擬硬碟大�大約相�的檔案大�。 固定大�存放�能需�長時間的建立，�決於存放大�與您硬碟的寫入性能。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Storage Type</source>
-        <translation>儲存類型</translation>
+        <translation>存放�置類型</translation>
     </message>
     <message>
         <source>&amp;Dynamically expanding storage</source>
-        <translation>動態延伸儲存(&amp;D)</translation>
+        <translation>動態延伸存放(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Fixed-size storage</source>
-        <translation>固定大�儲存(&amp;F)</translation>
+        <translation>固定大�存放(&amp;F)</translation>
     </message>
     <message>
         <source>&lt;p&gt;Press the &lt;b&gt;Select&lt;/b&gt; button to select the location of a file to store the hard disk data or type a file name in the entry field.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;按下 [&lt;b&gt;��&lt;/b&gt;] 按鈕以��儲存硬碟資料的檔案�置或在欄�中輸入檔案�稱。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;按下 [&lt;b&gt;��&lt;/b&gt;] 按鈕��儲存硬碟資料的檔案�置或在欄�中輸入檔案�稱。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Location</source>
@@ -3010,7 +3010,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;以 MB 為單���虛擬硬碟的大�。這個大�將回報給客體 OS 為硬碟的最大容�。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;以 MB 為單���虛擬硬碟的大�。這個大�將回報至客體作業系統作為硬碟的最大容�。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Size</source>
@@ -3018,11 +3018,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>You are going to create a new virtual hard disk with the following parameters:</source>
-        <translation>您�使用以下�數新建虛擬硬碟:</translation>
+        <translation>您�將使用以下�數新建虛擬硬碟:</translation>
     </message>
     <message>
         <source>If the above settings are correct, press the &lt;b&gt;Finish&lt;/b&gt; button. Once you press it, a new hard disk will be created.</source>
-        <translation>如果上方設定值正確，按下 [&lt;b&gt;完�&lt;/b&gt;] 按鈕。 一旦您按下，將建立新硬碟。</translation>
+        <translation>如果上方設定值正確，按下 [&lt;b&gt;完�&lt;/b&gt;] 按鈕。 一旦您按下後，將建立新硬碟。</translation>
     </message>
 </context>
 <context>
@@ -3057,7 +3057,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation>MB</translation>
     </message>
     <message>
         <source>Memory</source>
@@ -3101,7 +3101,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;If the above is correct press the &lt;b&gt;Finish&lt;/b&gt; button. Once you press it, a new virtual machine will be created. &lt;/p&gt;&lt;p&gt;Note that you can alter these and all other setting of the created virtual machine at any time using the &lt;b&gt;Settings&lt;/b&gt; dialog accessible through the menu of the main window.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;如果以上正確按下 [&lt;b&gt;完�&lt;/b&gt;] 按鈕。 一旦您按下，將新建虛擬機器。 &lt;/p&gt;&lt;p&gt;請注�您�以通�主視窗的功能表存� &lt;b&gt;設定值&lt;/b&gt; �話方塊，隨時變更建立虛擬機器的這些和所有其它設定值。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;如果以上正確按下 [&lt;b&gt;完�&lt;/b&gt;] 按鈕。 一旦您按下後，將新建虛擬機器。 &lt;/p&gt;&lt;p&gt;請注�您�以通�主視窗的功能表存� &lt;b&gt;設定值&lt;/b&gt; �話方塊，隨時變更建立虛擬機器的這些和所有其它設定值。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&amp;Finish</source>
@@ -3110,7 +3110,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>MB</source>
         <comment>megabytes</comment>
-        <translation type="unfinished"></translation>
+        <translation>MB</translation>
     </message>
     <message>
         <source>Name</source>
@@ -3314,7 +3314,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;The Virtual Machine reports that the guest OS does not support &lt;b&gt;mouse pointer integration&lt;/b&gt; 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.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;虛擬機器回報在目�的視訊模�中，客體作業系統�支�&lt;b&gt;滑鼠游標整�&lt;/b&gt;。 為了在客體作業系統之內使用滑鼠，您需�擷�滑鼠 (在虛擬機器顯示上方按一下或按下 Host �) 。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;虛擬機器回報在目�的視訊模�中，客體作業系統�支�&lt;b&gt;滑鼠指標整�&lt;/b&gt;。 為了在客體作業系統之內使用滑鼠，您需�擷�滑鼠 (在虛擬機器顯示上方按一下或按下 Host �) 。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Virtual Machine is currently in the &lt;b&gt;Paused&lt;/b&gt; 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.&lt;/p&gt;</source>
@@ -3574,7 +3574,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;The Virtual Machine reports that the guest OS supports &lt;b&gt;mouse pointer integration&lt;/b&gt;. This means that you do not need to &lt;i&gt;capture&lt;/i&gt; 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&apos;s display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.&lt;/p&gt;&lt;p&gt;The mouse icon on the status bar will look like&amp;nbsp;&lt;img src=:/mouse_seamless_16px.png/&gt;&amp;nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note&lt;/b&gt;: Some applications may behave incorrectly in mouse pointer integration mode. You can always disable it for the current session (and enable it again) by selecting the corresponding action from the menu bar.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;虛擬機器回報客體 OS 支�&lt;b&gt;滑鼠游標整�&lt;/b&gt;。 這�味著您�需�在客體 OS 中使用&lt;i&gt;擷�&lt;/i&gt;滑鼠游標來使用它 -- 當滑鼠游標�於虛擬機器的顯示上方時，所有您執行的滑鼠動作將直接傳�到客體作業系統。 如果目�已擷�滑鼠，將會自動�消擷�。&lt;/p&gt;&lt;p&gt;狀態列的滑鼠圖示將看起來�&amp;nbsp;&lt; img src=:/mouse_seamless_16px.png/ &gt;&amp;nbsp;以通知您客體作業系統支�滑鼠游標整�並且目�已開啟。 &lt;/p&gt;&lt;p&gt;&lt;b&gt;注�&lt;/b&gt;: �些應用程��能在滑鼠游標整�模�下的行為�正確。 您�以從功能表列中��相�應的動作於目�工作階段始終�用它 (與�次啟用) 。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;虛擬機器回報客體作業系統支�&lt;b&gt;滑鼠指標整�&lt;/b&gt;。 這�味著您�需�在客體作業系統中使用&lt;i&gt;擷�&lt;/i&gt;滑鼠指標來使用它 -- 當滑鼠指標�於虛擬機器的顯示上方時，所有您執行的滑鼠動作將直接傳�到客體作業系統。 如果目�已擷�滑鼠，將會自動�消擷�。&lt;/p&gt;&lt;p&gt;狀態列的滑鼠圖示將看起來�&amp;nbsp;&lt; img src=:/mouse_seamless_16px.png/ &gt;&amp;nbsp;以通知您客體作業系統支�滑鼠指標整�並且目�已開啟。 &lt;/p&gt;&lt;p&gt;&lt;b&gt;注�&lt;/b&gt;: �些應用程��能在滑鼠指標整�模�下的行為�正確。 您�以從功能表列中��相�應的動作於目�工作階段一律�用它 (與�次啟用) 。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The virtual machine window will be now switched to &lt;b&gt;fullscreen&lt;/b&gt; mode. You can go back to windowed mode at any time by pressing &lt;b&gt;%1&lt;/b&gt;. Note that the &lt;i&gt;Host&lt;/i&gt; key is currently defined as &lt;b&gt;%2&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing &lt;b&gt;Host+Home&lt;/b&gt;.&lt;/p&gt;</source>
@@ -3606,7 +3606,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Go back to showing all suppressed warnings and messages</source>
-        <translation>返回以顯示所有�止抑制的警告與訊�</translation>
+        <translation>返回以顯示所有抑制的警告與訊�</translation>
     </message>
     <message>
         <source>R&amp;egister VirtualBox...</source>
@@ -3655,11 +3655,11 @@ p, li { white-space: pre-wrap; }
     </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>下一個�話方塊會讓您�擇是�也�刪除這個硬碟儲存單元或�留它供以後使用。</translation>
+        <translation>下一個�話方塊會讓您�擇是�也�刪除這個硬碟存放單元或�留它供以後使用。</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;請注�，這個媒體的儲存單元將�會刪除且這將有�能�次將其加入到清單中。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;請注�，這個媒體的存放單元將�會刪除且這將有�能�後�次將其加入到清單中。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -3668,11 +3668,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;The hard disk storage unit at location &lt;b&gt;%1&lt;/b&gt; 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.&lt;/p&gt;&lt;p&gt;Please specify a different location.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;硬碟儲存單元於�置 &lt;b&gt;%1&lt;/b&gt; 已經存在。 您�能使用這個�置新建虛擬硬碟因為�一個虛擬硬碟已經使用中。&lt;/p&gt;&lt;p&gt;請指定��的�置。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;硬碟存放單元於�置 &lt;b&gt;%1&lt;/b&gt; 已經存在。 您�能使用這個�置新建虛擬硬碟因為�一個虛擬硬碟已經使用中。&lt;/p&gt;&lt;p&gt;請指定��的�置。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you want to delete the storage unit of the hard disk &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;?&lt;/p&gt;&lt;p&gt;If you select &lt;b&gt;Delete&lt;/b&gt; then the specified storage unit will be permanently deleted. This operation &lt;b&gt;cannot be undone&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;If you select &lt;b&gt;Keep&lt;/b&gt; 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 possible to add this hard disk to the list later again.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;您�刪除硬碟的儲存單元 &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;嗎?&lt;/p&gt;&lt;p&gt;如果您�� [&lt;b&gt;刪除&lt;/b&gt;] 將永久刪除指定的儲存單元。 這個�作&lt;b&gt;無法復原&lt;/b&gt;。 &lt;/p&gt;&lt;p&gt;如果您�� [&lt;b&gt;�留&lt;/b&gt;] 硬碟將�從未知硬碟清單中移除，但儲存單元將��未接觸，使得�後�以�次加入這個硬碟到清單。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;您�刪除硬碟的存放單元 &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;嗎?&lt;/p&gt;&lt;p&gt;如果您�� [&lt;b&gt;刪除&lt;/b&gt;] 將永久刪除指定的存放單元。 這個�作&lt;b&gt;無法復原&lt;/b&gt;。 &lt;/p&gt;&lt;p&gt;如果您�� [&lt;b&gt;�留&lt;/b&gt;] 硬碟將�從未知硬碟清單中移除，但存放單元將��未接觸，使得�後�以�次加入這個硬碟到清單。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -3686,11 +3686,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Failed to delete the storage unit of the hard disk &lt;b&gt;%1&lt;/b&gt;.</source>
-        <translation>刪除硬碟 &lt;b&gt;%1&lt;/b&gt; 的儲存單元時失敗。</translation>
+        <translation>刪除硬碟 &lt;b&gt;%1&lt;/b&gt; 的存放單元時失敗。</translation>
     </message>
     <message>
         <source>Failed to create the hard disk storage &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;</source>
-        <translation>建立硬碟儲存 &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt; 失敗。&lt;/nobr&gt;</translation>
+        <translation>建立硬碟存放 &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt; 失敗。&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>Failed to open the %1 &lt;nobr&gt;&lt;b&gt;%2&lt;/b&gt;&lt;/nobr&gt;.</source>
@@ -3742,7 +3742,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;VT-x/AMD-V 硬體加速已啟用，但是未�作。 您的 64-bit 客體將�測 64-bit CPU 失敗且將無法開機。&lt;/p&gt;&lt;p&gt;請確�在您主機電腦的 BIOS 中已正確啟用 VT-x/AMD-V 。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;VT-x/AMD-V 硬體加速已啟用，但是���作。 您的 64-bit 客體將�測 64-bit CPU 失敗且將無法開機。&lt;/p&gt;&lt;p&gt;請確�在您主機電腦的 BIOS 中已正確啟用 VT-x/AMD-V 。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Close VM</source>
@@ -3815,7 +3815,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Certain guests (e.g. OS/2 and QNX) require this feature.&lt;/p&gt;&lt;p&gt;Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;VT-x/AMD-V 硬體加速已啟用，但是未�作。 �些客體 (例如 OS/2 與 QNX) 需�這個功能。&lt;/p&gt;&lt;p&gt;請確�在您主機電腦的 BIOS 中已正確啟用 VT-x/AMD-V 。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;VT-x/AMD-V 硬體加速已啟用，但是���作。 �些客體 (例如 OS/2 與 QNX) 需�這個功能。&lt;/p&gt;&lt;p&gt;請確�在您主機電腦的 BIOS 中已正確啟用 VT-x/AMD-V 。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Invalid e-mail address or password specified.&lt;/p&gt;</source>
@@ -3917,7 +3917,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;p&gt;Could not insert the VirtualBox Guest Additions installer CD image into the virtual machine &lt;b&gt;%1&lt;/b&gt;, as the machine has no CD/DVD-ROM drives. Please add a drive using the storage page of the virtual machine settings dialog.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;無法�入 VirtualBox Guest Additions 安�程� CD 映�至虛擬機器 &lt;b&gt;%1&lt;/b&gt;，由於機器沒有 CD/DVD-ROM 光碟機。 請使用虛擬機器設定�話方塊的儲存��加入一個光碟機。&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;無法�入 VirtualBox Guest Additions 安�程� CD 映�至虛擬機器 &lt;b&gt;%1&lt;/b&gt;，由於機器沒有 CD/DVD-ROM 光碟機。 請使用虛擬機器設定�話方塊的存放�置��加入一個光碟機。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
@@ -3936,7 +3936,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>CD/DVD</source>
         <comment>failed to mount ... host-drive</comment>
-        <translation type="unfinished"></translation>
+        <translation>CD/DVD</translation>
     </message>
     <message>
         <source>CD/DVD image</source>
@@ -4011,83 +4011,83 @@ p, li { white-space: pre-wrap; }
     <name>VBoxRegistrationDlg</name>
     <message>
         <source>VirtualBox Registration Dialog</source>
-        <translation>VirtualBox 註冊�話方塊</translation>
+        <translation type="obsolete">VirtualBox 註冊�話方塊</translation>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation>使用拉�字�輸入您的全�。</translation>
+        <translation type="obsolete">使用拉�字�輸入您的全�。</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation>輸入您的電�郵件��。 請在此使用有效的��。</translation>
+        <translation type="obsolete">輸入您的電�郵件��。 請在此使用有效的��。</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation>歡迎使用 VirtualBox 註冊表單!</translation>
+        <translation type="obsolete">歡迎使用 VirtualBox 註冊表單!</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation>無法執行連線交�。</translation>
+        <translation type="obsolete">無法執行連線交�。</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>�消</translation>
+        <translation type="obsolete">�消</translation>
     </message>
     <message>
         <source>Select Country/Territory</source>
-        <translation>��國家/地�</translation>
+        <translation type="obsolete">��國家/地�</translation>
     </message>
     <message>
         <source>&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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 use your personal data can be found in the &lt;b&gt;Privacy Policy&lt;/b&gt; section of the VirtualBox Manual or on the &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt;Privacy Policy&lt;/a&gt; page of the VirtualBox web-site.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;請填寫這個註冊表單�以讓我們知�您使用 VirtualBox ，並�擇性的��通知您有關 VirtualBox 新�與更新。&lt;/p&gt;&lt;p&gt;請�使用拉�字元填寫以下欄�。 Sun Microsystems �使用這個資訊，收集產�使用情�統計資訊並�您傳� VirtualBox 電�報。 特別是， Sun Microsystems 將永�傳�您的資料給�力廠商。 VirtualBox 手冊的 &lt;b&gt; 隱�權原則&lt;/b&gt; 單元或 VirtualBox 的網站 &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt; 隱�權原則 &lt;/a&gt; 中�以找到有關我們如何使用您個人資料的詳細資訊。&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;請填寫這個註冊表單�以讓我們知�您使用 VirtualBox ，並�擇性的��通知您有關 VirtualBox 新�與更新。&lt;/p&gt;&lt;p&gt;請�使用拉�字元填寫以下欄�。 Sun Microsystems �使用這個資訊，收集產�使用情�統計資訊並�您傳� VirtualBox 電�報。 特別是， Sun Microsystems 將永�傳�您的資料給�力廠商。 VirtualBox 手冊的 &lt;b&gt; 隱�權原則&lt;/b&gt; 單元或 VirtualBox 的網站 &lt;a href=http://www.virtualbox.org/wiki/PrivacyPolicy&gt; 隱�權原則 &lt;/a&gt; 中�以找到有關我們如何使用您個人資料的詳細資訊。&lt;/p&gt;</translation>
     </message>
     <message>
         <source>I &amp;already have a Sun Online account:</source>
-        <translation>我已經有 Sun Online 帳戶(&amp;A):</translation>
+        <translation type="obsolete">我已經有 Sun Online 帳戶(&amp;A):</translation>
     </message>
     <message>
         <source>&amp;E-mail:</source>
-        <translation>電�郵件(&amp;E):</translation>
+        <translation type="obsolete">電�郵件(&amp;E):</translation>
     </message>
     <message>
         <source>&amp;Password:</source>
-        <translation>密碼(&amp;P):</translation>
+        <translation type="obsolete">密碼(&amp;P):</translation>
     </message>
     <message>
         <source>I &amp;would like to create a new Sun Online account:</source>
-        <translation>我希望新建 Sun Online 帳戶(&amp;W):</translation>
+        <translation type="obsolete">我希望新建 Sun Online 帳戶(&amp;W):</translation>
     </message>
     <message>
         <source>&amp;First Name:</source>
-        <translation>�字(&amp;F):</translation>
+        <translation type="obsolete">�字(&amp;F):</translation>
     </message>
     <message>
         <source>&amp;Last Name:</source>
-        <translation>姓�(&amp;L):</translation>
+        <translation type="obsolete">姓�(&amp;L):</translation>
     </message>
     <message>
         <source>&amp;Company:</source>
-        <translation>公�(&amp;C):</translation>
+        <translation type="obsolete">公�(&amp;C):</translation>
     </message>
     <message>
         <source>Co&amp;untry:</source>
-        <translation>國家(&amp;U):</translation>
+        <translation type="obsolete">國家(&amp;U):</translation>
     </message>
     <message>
         <source>E-&amp;mail:</source>
-        <translation>電�郵件(&amp;M):</translation>
+        <translation type="obsolete">電�郵件(&amp;M):</translation>
     </message>
     <message>
         <source>P&amp;assword:</source>
-        <translation>密碼(&amp;A):</translation>
+        <translation type="obsolete">密碼(&amp;A):</translation>
     </message>
     <message>
         <source>Co&amp;nfirm Password:</source>
-        <translation>確�密碼(&amp;N):</translation>
+        <translation type="obsolete">確�密碼(&amp;N):</translation>
     </message>
     <message>
         <source>&amp;Register</source>
-        <translation>註冊(&amp;R)</translation>
+        <translation type="obsolete">註冊(&amp;R)</translation>
     </message>
 </context>
 <context>
@@ -4258,7 +4258,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Sun VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <translation>Sun VirtualBox</translation>
     </message>
     <message>
         <source>&amp;Import Appliance...</source>
@@ -4285,7 +4285,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxSettingsDialog</name>
     <message>
         <source>&lt;i&gt;Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information&lt;/i&gt;.</source>
-        <translation>&lt;i&gt;請從左手邊的清單��設定值分類並將滑鼠移至設定項目上方以�得更多資訊&lt;/i&gt;。</translation>
+        <translation>&lt;i&gt;請從左手邊的清單��設定分類並將滑鼠移至設定項目上方以�得更多資訊&lt;/i&gt;。</translation>
     </message>
     <message>
         <source>Invalid settings detected</source>
@@ -4335,7 +4335,7 @@ p, li { white-space: pre-wrap; }
     <name>VBoxSnapshotsWgt</name>
     <message>
         <source>VBoxSnapshotsWgt</source>
-        <translation type="unfinished"></translation>
+        <translation>VBoxSnapshotsWgt</translation>
     </message>
     <message>
         <source>Current State (changed)</source>
@@ -4407,7 +4407,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source> (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1)</translation>
     </message>
     <message>
         <source>&amp;Restore Snapshot</source>
@@ -4803,11 +4803,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Guest Additions</source>
-        <translation type="unfinished"></translation>
+        <translation>Guest Additions</translation>
     </message>
     <message>
         <source>Guest OS Type</source>
-        <translation>客體 OS 類型</translation>
+        <translation>客體作業系統類型</translation>
     </message>
     <message>
         <source>No Network Adapters</source>
@@ -4829,7 +4829,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>VBoxVMInformationDlg</source>
-        <translation type="unfinished"></translation>
+        <translation>VBoxVMInformationDlg</translation>
     </message>
     <message>
         <source>Not Available</source>
@@ -4838,11 +4838,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>儲存統計</translation>
+        <translation>存放�置統計</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>無儲存�置</translation>
+        <translation>無存放�置</translation>
     </message>
     <message>
         <source>Network Statistics</source>
@@ -4968,7 +4968,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&amp;Video</source>
@@ -4984,7 +4984,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation>MB</translation>
     </message>
     <message>
         <source>Extended Features:</source>
@@ -5004,7 +5004,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>勾�時，虛擬機器將扮演�端桌��定 (RDP) 伺�器，�許�端用戶端使用標準的 RDP 用戶端從�端連線與�作虛擬機器 (如果它在執行中)。</translation>
+        <translation>勾�時，虛擬機器將作為�端桌��定 (RDP) 伺�器，�許�端用戶端使用標準的 RDP 用戶端連線與�作虛擬機器 (當它正在執行時)。</translation>
     </message>
     <message>
         <source>&amp;Enable Server</source>
@@ -5044,7 +5044,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero), to select port 3389, the standard port for RDP.</source>
-        <translation>VRDP 伺�器連接埠號。 您應指定 &lt;tt&gt;0&lt;/tt&gt; (零)，來�擇連接埠 3389， RDP 的標準連接埠。</translation>
+        <translation>VRDP 伺�器連接埠號。 您�以指定 &lt;tt&gt;0&lt;/tt&gt; (零)，來�擇連接埠 3389， RDP 的標準連接埠。</translation>
     </message>
 </context>
 <context>
@@ -5055,7 +5055,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Storage</source>
-        <translation>儲存</translation>
+        <translation>存放�置</translation>
     </message>
     <message>
         <source>Hard Disks</source>
@@ -5063,7 +5063,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>CD/DVD-ROM</source>
-        <translation type="unfinished"></translation>
+        <translation>CD/DVD-ROM</translation>
     </message>
     <message>
         <source>Floppy</source>
@@ -5091,7 +5091,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>USB</source>
-        <translation type="unfinished"></translation>
+        <translation>USB</translation>
     </message>
     <message>
         <source>Shared Folders</source>
@@ -5099,7 +5099,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - %2</translation>
     </message>
     <message>
         <source>System</source>
@@ -5111,11 +5111,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>you have selected a 64-bit guest OS type for this VM. As such guests require hardware virtualization (VT-x/AMD-V), this feature will be enabled automatically.</source>
-        <translation>您已�� 64 �元的客體 OS 類型�於這個 VM 。 如此的來賓需�硬體虛擬化 (VT-x/AMD-V)，這個功能將會自動啟用。</translation>
+        <translation>您已��這個 VM �� 64 �元的客體作業系統類型。 如此的客體需�硬體虛擬化 (VT-x/AMD-V)，這個功能將會自動啟用。</translation>
     </message>
     <message>
         <source>you have selected a 64-bit guest OS type for this VM. VirtualBox does not currently support more than one virtual CPU for 64-bit guests executed on 32-bit hosts.</source>
-        <translation>您已�� 64 �元的客體 OS 類型�於這個 VM 。 VirtualBox 目��支�多個虛擬 CPU 的 64 �元來賓執行在 32 �元主機。</translation>
+        <translation>您已��這個 VM �� 64 �元的客體作業系統類型。 VirtualBox 目��支�在 32 �元主機執行多個虛擬 CPU 的 64 �元客體。</translation>
     </message>
     <message>
         <source>you have 2D Video Acceleration enabled. As 2D Video Acceleration is supported for Windows guests only, this feature will be disabled.</source>
@@ -5277,19 +5277,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Adds a new controller to the end of the Storage Tree.</source>
-        <translation>新增控制器至儲存樹的�尾。</translation>
+        <translation>新增控制器至存放�置樹的�尾。</translation>
     </message>
     <message>
         <source>Removes the controller highlighted in the Storage Tree.</source>
-        <translation>移除儲存樹中�白的控制器。</translation>
+        <translation>移除存放�置樹中�白的控制器。</translation>
     </message>
     <message>
         <source>Adds a new attachment to the Storage Tree using currently selected controller as parent.</source>
-        <translation>使用目���的控制器新增附件至儲存樹為上層。</translation>
+        <translation>使用目���的控制器新增附件至存放�置樹為上層。</translation>
     </message>
     <message>
         <source>Removes the attachment highlighted in the Storage Tree.</source>
-        <translation>移除儲存樹中�白的附件。</translation>
+        <translation>移除存放�置樹中�白的附件。</translation>
     </message>
     <message>
         <source>IDE Controller</source>
@@ -5321,11 +5321,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&amp;Storage Tree</source>
-        <translation>儲存樹(&amp;S)</translation>
+        <translation>存放�置樹(&amp;S)</translation>
     </message>
     <message>
         <source>Contains all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation>包�這個機器的所有儲存控制器與附加到它們的虛擬機器�主機�置。</translation>
+        <translation>包�這個機器的所有存放控制器與附加到它們的虛擬機器�主機�置。</translation>
     </message>
     <message>
         <source>Information</source>
@@ -5333,7 +5333,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>
@@ -5345,7 +5345,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Changes the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation>變更目�在儲存樹��的儲存控制器�稱。</translation>
+        <translation>變更目�在存放�置樹��的儲存控制器�稱。</translation>
     </message>
     <message>
         <source>&amp;Type:</source>
@@ -5353,7 +5353,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&amp;lot:</source>
@@ -5361,7 +5361,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>
@@ -5517,7 +5517,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&amp;IRQ:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;IRQ:</translation>
     </message>
     <message>
         <source>I/O Po&amp;rt:</source>
@@ -5634,7 +5634,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <source>Folder Path:</source>
@@ -5686,7 +5686,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&amp;IRQ:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;IRQ:</translation>
     </message>
     <message>
         <source>I/O Po&amp;rt:</source>
@@ -5698,7 +5698,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Controls the working mode of this serial port. If you select &lt;b&gt;Disconnected&lt;/b&gt;, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation>控制這個�列埠的工作模�。如果您�� &lt;b&gt;已離線&lt;/b&gt;，客體作業系統將會�測到�列埠但無法�作它。</translation>
+        <translation>控制這個�列埠的工作模�。如果您��&lt;b&gt;已中斷連接&lt;/b&gt;，客體作業系統將會�測到�列埠但無法�作它。</translation>
     </message>
     <message>
         <source>If checked, the pipe specified in the &lt;b&gt;Port Path&lt;/b&gt; 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>
@@ -5710,7 +5710,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Displays the path to the serial port&apos;s pipe on the host when the port is working in &lt;b&gt;Host Pipe&lt;/b&gt; mode, or the host serial device name when the port is working in &lt;b&gt;Host Device&lt;/b&gt; mode.</source>
-        <translation>顯示主機中�列埠管線的路徑當連接埠工作在&lt;b&gt;主機管線&lt;/b&gt;模�時，或主機�列�置�稱當連接埠工作在&lt;b&gt;主機�置&lt;/b&gt;模�時。</translation>
+        <translation>當連接埠工作在&lt;b&gt;主機管線&lt;/b&gt;模�時顯示主機中�列埠管線的路徑，或者當連接埠工作在&lt;b&gt;主機�置&lt;/b&gt;模�時顯示主機�列�置�稱。</translation>
     </message>
     <message>
         <source>Port/File &amp;Path:</source>
@@ -5764,16 +5764,16 @@ p, li { white-space: pre-wrap; }
     </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>您已指派一個以上虛擬 CPU 到此 VM。 除�也啟用硬體虛擬化 (VT-x/AMD-V) 這將�會動作。 當您按下 [確定] 按鈕接� VM 設定值這將自動完�。</translation>
+        <translation>您已指派一個以上虛擬 CPU 到此 VM。 除�也啟用硬體虛擬化 (VT-x/AMD-V) �則這將�會動作。 當您按下 [確定] 按鈕接� VM 設定值這將自動完�。</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;%1&amp;nbsp;MB&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;CPU&lt;/qt&gt;</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;%1&amp;nbsp;CPU&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&amp;Motherboard</source>
@@ -5789,7 +5789,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation>MB</translation>
     </message>
     <message>
         <source>&amp;Boot Order:</source>
@@ -5836,7 +5836,7 @@ p, li { white-space: pre-wrap; }
         <translation>處�器(&amp;P):</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine.</source>
+        <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>控制虛擬機器中的虛擬 CPU 數。</translation>
     </message>
     <message>
@@ -5857,7 +5857,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the virtual machine will try to make use of the host CPU&apos;s hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
-        <translation>勾�時，虛擬機器將儘�使用主機 CPU 的硬體虛擬化擴充如 Intel VT-x 和 AMD-V 。</translation>
+        <translation>勾�時，虛擬機器將嘗試使用主機 CPU 的硬體虛擬化擴充比如 Intel VT-x 和 AMD-V 。</translation>
     </message>
     <message>
         <source>Enable &amp;VT-x/AMD-V</source>
@@ -5865,7 +5865,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>勾�時，虛擬機器將嘗試使用 Intel VT-x 和 AMD-V 的巢狀分�延伸。</translation>
+        <translation>勾�時，虛擬機器將嘗試使用 Intel VT-x 和 AMD-V 的巢狀分�擴充。</translation>
     </message>
     <message>
         <source>Enable Nested Pa&amp;ging</source>
@@ -5874,7 +5874,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;%1&amp;nbsp;CPUs&lt;/qt&gt;</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>
@@ -5913,11 +5913,11 @@ p, li { white-space: pre-wrap; }
     </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>加入一個新的 USB 篩�器與最�設定為空字串的所有欄�。 請注�這些篩�器會符�任何附加的 USB �置。</translation>
+        <translation>加入一個新的 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>加入一個新的 USB 篩�器所有欄�設定為�� USB �置附加到主機 PC 的值。</translation>
+        <translation>加入一個新的 USB 篩�器，其所有欄�設定為�� USB �置附加到主機 PC 的值。</translation>
     </message>
     <message>
         <source>Edits the selected USB filter.</source>
@@ -6000,7 +6000,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Defines the vendor ID filter. The &lt;i&gt;exact match&lt;/i&gt; string format is &lt;tt&gt;XXXX&lt;/tt&gt; where &lt;tt&gt;X&lt;/tt&gt; is a hexadecimal digit. An empty string will match any value.</source>
-        <translation>定義供應商 ID 篩�器。 &lt;i&gt;完全相符&lt;/i&gt; 字串格�為 &lt;tt&gt;XXXX&lt;/tt&gt; 其中 &lt;tt&gt;X&lt;/tt&gt; 是�六進�數字。 空字串將與任何值相符。</translation>
+        <translation>定義供應商 ID 篩�器。 &lt;i&gt;完全相符&lt;/i&gt; 字串格�為 &lt;tt&gt;XXXX&lt;/tt&gt; 其中 &lt;tt&gt;X&lt;/tt&gt; 是�六進�數字。 空字串將符�任何值。</translation>
     </message>
     <message>
         <source>&amp;Product ID:</source>
@@ -6008,7 +6008,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Defines the product ID filter. The &lt;i&gt;exact match&lt;/i&gt; string format is &lt;tt&gt;XXXX&lt;/tt&gt; where &lt;tt&gt;X&lt;/tt&gt; is a hexadecimal digit. An empty string will match any value.</source>
-        <translation>定義產� ID 篩�器。 &lt;i&gt;完全相符&lt;/i&gt; 字串格�為 &lt;tt&gt;XXXX&lt;/tt&gt; 其中 &lt;tt&gt;X&lt;/tt&gt; 是�六進�數字。 空字串將與任何值相符。</translation>
+        <translation>定義產� ID 篩�器。 &lt;i&gt;完全相符&lt;/i&gt; 字串格�為 &lt;tt&gt;XXXX&lt;/tt&gt; 其中 &lt;tt&gt;X&lt;/tt&gt; 是�六進�數字。 空字串將符�任何值。</translation>
     </message>
     <message>
         <source>&amp;Revision:</source>
@@ -6016,7 +6016,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Defines the revision number filter. The &lt;i&gt;exact match&lt;/i&gt; string format is &lt;tt&gt;IIFF&lt;/tt&gt; where &lt;tt&gt;I&lt;/tt&gt; is a decimal digit of the integer part and &lt;tt&gt;F&lt;/tt&gt; is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation>定義修訂號篩�器。&lt;i&gt;完全相符&lt;/i&gt; 字串格�為 &lt;tt&gt;IIFF&lt;/tt&gt; 其中 &lt;tt&gt;I&lt;/tt&gt; 是�進�數字的整數部分 &lt;tt&gt;F&lt;/tt&gt; 是�進�數字的�數部分。 空字串將與任何值相符。</translation>
+        <translation>定義修訂號篩�器。&lt;i&gt;完全相符&lt;/i&gt; 字串格�為 &lt;tt&gt;IIFF&lt;/tt&gt; 其中 &lt;tt&gt;I&lt;/tt&gt; 是�進�數字的整數部分 &lt;tt&gt;F&lt;/tt&gt; 是�進�數字的�數部分。 空字串將符�任何值。</translation>
     </message>
     <message>
         <source>&amp;Manufacturer:</source>
@@ -6024,7 +6024,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Defines the manufacturer filter as an &lt;i&gt;exact match&lt;/i&gt; string. An empty string will match any value.</source>
-        <translation>定義製造商篩�器為 &lt;i&gt;完全相符&lt;/i&gt; 字串。 空字串將與任何值相符。</translation>
+        <translation>定義製造商篩�器為 &lt;i&gt;完全相符&lt;/i&gt; 字串。 空字串將符�任何值。</translation>
     </message>
     <message>
         <source>Pro&amp;duct:</source>
@@ -6032,7 +6032,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Defines the product name filter as an &lt;i&gt;exact match&lt;/i&gt; string. An empty string will match any value.</source>
-        <translation>定義產��稱篩�器為 &lt;i&gt;完全相符&lt;/i&gt; 字串。 空字串將與任何值相符。</translation>
+        <translation>定義產��稱篩�器為 &lt;i&gt;完全相符&lt;/i&gt; 字串。 空字串將符�任何值。</translation>
     </message>
     <message>
         <source>&amp;Serial No.:</source>
@@ -6040,7 +6040,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Defines the serial number filter as an &lt;i&gt;exact match&lt;/i&gt; string. An empty string will match any value.</source>
-        <translation>定義產�號篩�器為 &lt;i&gt;完全相符&lt;/i&gt; 字串。 空字串將與任何值相符。</translation>
+        <translation>定義產�號篩�器為 &lt;i&gt;完全相符&lt;/i&gt; 字串。 空字串將符�任何值。</translation>
     </message>
     <message>
         <source>Por&amp;t:</source>
@@ -6048,7 +6048,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Defines the host USB port filter as an &lt;i&gt;exact match&lt;/i&gt; string. An empty string will match any value.</source>
-        <translation>定義主機 USB 篩�器為 &lt;i&gt;完全相符&lt;/i&gt; 字串。 空字串將與任何值相符。</translation>
+        <translation>定義主機 USB 連接埠篩�器為 &lt;i&gt;完全相符&lt;/i&gt; 字串。 空字串將符�任何值。</translation>
     </message>
     <message>
         <source>R&amp;emote:</source>
@@ -6064,7 +6064,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Defines an action performed by the host computer when a matching device is attached: give it up to the host OS (&lt;i&gt;Ignore&lt;/i&gt;) or grab it for later usage by virtual machines (&lt;i&gt;Hold&lt;/i&gt;).</source>
-        <translation>定義當附加相符的�置時主機電腦執行的動作: �供它至主機作業系統 (&lt;i&gt;忽略&lt;/i&gt;) 或以虛擬機器��它作為之後使用 (&lt;i&gt;�留&lt;/i&gt;)。</translation>
+        <translation>定義當附加相符的�置時主機電腦執行的動作: 在主機作業系統放棄 (&lt;i&gt;忽略&lt;/i&gt;) 或由虛擬機器擷�它作為之後使用 (&lt;i&gt;�留&lt;/i&gt;)。</translation>
     </message>
     <message>
         <source>USB Filter Details</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/qt_hu.ts b/src/VBox/Frontends/VirtualBox/nls/qt_hu.ts
index 0ec7887bf..9a1ea5c3b 100644
--- a/src/VBox/Frontends/VirtualBox/nls/qt_hu.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/qt_hu.ts
@@ -13,7 +13,7 @@
     </message>
     <message>
         <source>Revert back to device &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Visszaállás a(z) &apos;%1&apos; eszközre</translation>
     </message>
 </context>
 <context>
@@ -1301,7 +1301,7 @@ Biztosan törlöd?</translation>
     </message>
     <message>
         <source>Demi</source>
-        <translation type="unfinished">Fél</translation>
+        <translation>Fél</translation>
     </message>
     <message>
         <source>Light</source>
@@ -1329,7 +1329,7 @@ Biztosan törlöd?</translation>
     </message>
     <message>
         <source>Cyrillic</source>
-        <translation type="unfinished">Cirill</translation>
+        <translation>Cirill</translation>
     </message>
     <message>
         <source>Armenian</source>
@@ -1994,7 +1994,7 @@ Biztosan törlöd?</translation>
     </message>
     <message>
         <source>%1: Unknown error %2</source>
-        <translation>%1: A kívánt socket művelet nem támogatott</translation>
+        <translation>%1: Ismeretlen hiba: %2</translation>
     </message>
 </context>
 <context>
@@ -2196,7 +2196,7 @@ Biztosan törlöd?</translation>
     </message>
     <message>
         <source>&lt;h3&gt;About Qt&lt;/h3&gt;%1&lt;p&gt;Qt is a C++ toolkit for cross-platform application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;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.&lt;/p&gt;&lt;p&gt;Qt is a Nokia product. See &lt;a href=&quot;http://www.trolltech.com/qt/&quot;&gt;www.trolltech.com/qt/&lt;/a&gt; for more information.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h3&gt;A Qt névjegye&lt;/h3&gt;%1&lt;p&gt;A Qt egy C++ eszközkészlet a kereszt-platformos alkalmazásfejlesztéshez.&lt;/p&gt;&lt;p&gt;A Qt egy-forrású hordozhatóságot biztosít az MS&amp;nbsp;Windows, a Mac&amp;nbsp;OS&amp;nbsp;X, a Linux, és az összes nagyobb kereskedelmi Unix változat között. A Qt mobileszközökhöz is elérhető, pl. Qtopia Core.&lt;/p&gt;&lt;p&gt;A Qt a Trolltech terméke. További információk: &lt;a href=&quot;http://www.trolltech.com/qt/&quot;&gt;www.trolltech.com/qt/&lt;/a&gt; .&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -2436,7 +2436,7 @@ Biztosan törlöd?</translation>
     </message>
     <message>
         <source>Unable to execute select statement</source>
-        <translation type="unfinished"></translation>
+        <translation>A SELECT utasítás nem végrehajtható</translation>
     </message>
     <message>
         <source>Unable to execute statement</source>
@@ -2451,7 +2451,7 @@ Biztosan törlöd?</translation>
     </message>
     <message>
         <source>Unable to connect - Driver doesn&apos;t support all needed functionality</source>
-        <translation type="unfinished"></translation>
+        <translation>Nem sikerült kapcsolódni - A driver nem támogat minden szükséges szolgáltatást</translation>
     </message>
     <message>
         <source>Unable to disable autocommit</source>
@@ -2884,7 +2884,7 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>Next page</source>
-        <translation type="unfinished">Következő oldal</translation>
+        <translation>Következő oldal</translation>
     </message>
     <message>
         <source>Previous page</source>
@@ -2936,7 +2936,7 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>Print</source>
-        <translation type="unfinished">Nyomtatás</translation>
+        <translation>Nyomtatás</translation>
     </message>
     <message>
         <source>Page setup</source>
@@ -3084,14 +3084,14 @@ Válassz másik fájlnevet.</translation>
     <name>QProgressDialog</name>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">Mégsem</translation>
+        <translation>Mégsem</translation>
     </message>
 </context>
 <context>
     <name>QPushButton</name>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Megnyitás</translation>
+        <translation>Megnyitás</translation>
     </message>
 </context>
 <context>
@@ -3248,15 +3248,15 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>Page up</source>
-        <translation type="unfinished">Oldal felfelé</translation>
+        <translation>Oldal felfelé</translation>
     </message>
     <message>
         <source>Page right</source>
-        <translation type="unfinished">Oldal jobbra</translation>
+        <translation>Oldal jobbra</translation>
     </message>
     <message>
         <source>Page down</source>
-        <translation type="unfinished">Oldal lefelé</translation>
+        <translation>Oldal lefelé</translation>
     </message>
     <message>
         <source>Scroll left</source>
@@ -3358,55 +3358,55 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>Esc</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Backtab</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Backspace</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Return</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Enter</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Ins</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Del</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Pause</source>
-        <translation type="unfinished">Szünet</translation>
+        <translation></translation>
     </message>
     <message>
         <source>Print</source>
-        <translation type="unfinished">Nyomtatás</translation>
+        <translation>Print Screen</translation>
     </message>
     <message>
         <source>SysReq</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>End</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Left</source>
@@ -3853,7 +3853,7 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>Private key does not certificate public key, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>A privát és a publikus kulcs nem illik össze: %1</translation>
     </message>
 </context>
 <context>
@@ -3972,35 +3972,35 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>ZWJ Zero width joiner</source>
-        <translation type="unfinished"></translation>
+        <translation>ZWJ Nulla szélességű egyesítő jelölő</translation>
     </message>
     <message>
         <source>ZWNJ Zero width non-joiner</source>
-        <translation type="unfinished"></translation>
+        <translation>ZWN Nulla szélességű nem-egyesítő jelölő</translation>
     </message>
     <message>
         <source>ZWSP Zero width space</source>
-        <translation type="unfinished"></translation>
+        <translation>ZWSP Nulla szélességű szóköz</translation>
     </message>
     <message>
         <source>LRE Start of left-to-right embedding</source>
-        <translation type="unfinished"></translation>
+        <translation>LRE balról-jobbra beágyazás kezdete</translation>
     </message>
     <message>
         <source>RLE Start of right-to-left embedding</source>
-        <translation type="unfinished"></translation>
+        <translation>RLE jobbról-balra beágyazás kezdete</translation>
     </message>
     <message>
         <source>LRO Start of left-to-right override</source>
-        <translation type="unfinished"></translation>
+        <translation>LRO balról-jobbra felülbírálás kezdete</translation>
     </message>
     <message>
         <source>RLO Start of right-to-left override</source>
-        <translation type="unfinished"></translation>
+        <translation>RLO Jobbról-balra felülbírálás kezdete</translation>
     </message>
     <message>
         <source>PDF Pop directional formatting</source>
-        <translation type="unfinished"></translation>
+        <translation>PDF normál irányú formázási jelölő</translation>
     </message>
     <message>
         <source>Insert Unicode control character</source>
@@ -4173,7 +4173,7 @@ Válassz másik fájlnevet.</translation>
     <message>
         <source>Ignore</source>
         <comment>Ignore Grammar context menu item</comment>
-        <translation type="unfinished">Kihagyás</translation>
+        <translation>Kihagyás</translation>
     </message>
     <message>
         <source>Spelling</source>
@@ -4398,7 +4398,7 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Bezárás</translation>
+        <translation>Bezárás</translation>
     </message>
     <message>
         <source>&amp;Unshade</source>
@@ -4413,7 +4413,7 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>error triggered by consumer</source>
-        <translation type="unfinished"></translation>
+        <translation>feldolgozó által kiváltott hiba</translation>
     </message>
     <message>
         <source>unexpected end of file</source>
@@ -4481,11 +4481,11 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>external parsed general entity reference not allowed in attribute value</source>
-        <translation type="unfinished"></translation>
+        <translation>külső feldolgozású általános entitáshivatkozás nem engedélyezett attribútum értékében</translation>
     </message>
     <message>
         <source>external parsed general entity reference not allowed in DTD</source>
-        <translation type="unfinished"></translation>
+        <translation>külső feldolgozású általános entitáshivatkozás nem engedélyezett a DTD-ben</translation>
     </message>
     <message>
         <source>unparsed entity reference in wrong context</source>
@@ -4624,23 +4624,23 @@ Válassz másik fájlnevet.</translation>
     </message>
     <message>
         <source>Reference to external entity &apos;%1&apos; in attribute value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hivatkozás &apos;%1&apos; külső entitásra attribútum értékben.</translation>
     </message>
     <message>
         <source>Invalid character reference.</source>
-        <translation type="unfinished"></translation>
+        <translation>Érvénytelen karakterhivatkozás.</translation>
     </message>
     <message>
         <source>Encountered incorrectly encoded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hibás kódolású tartalom.</translation>
     </message>
     <message>
         <source>The standalone pseudo attribute must appear after the encoding.</source>
-        <translation type="unfinished"></translation>
+        <translation>Az egyedülálló pszeudo-attribútumnak a kódolás után kell szerepelnie.</translation>
     </message>
     <message>
         <source>%1 is an invalid PUBLIC identifier.</source>
-        <translation type="unfinished">%1 egy érvénytelen publikus azonosító.</translation>
+        <translation>%1 egy érvénytelen publikus azonosító.</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/qt_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/qt_zh_TW.ts
index 21d946c54..bb0292d7e 100644
--- a/src/VBox/Frontends/VirtualBox/nls/qt_zh_TW.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/qt_zh_TW.ts
@@ -123,11 +123,11 @@ have libgstreamer-plugins-base installed.</source>
     <name>Q3DataTable</name>
     <message>
         <source>True</source>
-        <translation type="unfinished"></translation>
+        <translation>True</translation>
     </message>
     <message>
         <source>False</source>
-        <translation type="unfinished"></translation>
+        <translation>False</translation>
     </message>
     <message>
         <source>Insert</source>
@@ -262,7 +262,7 @@ have libgstreamer-plugins-base installed.</source>
     </message>
     <message>
         <source>Dir</source>
-        <translation type="unfinished"></translation>
+        <translation>Dir</translation>
     </message>
     <message>
         <source>Special</source>
@@ -682,7 +682,7 @@ to
     <message>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this string to the string &apos;LTR&apos; in left-to-right languages or to &apos;RTL&apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
-        <translation type="unfinished"></translation>
+        <translation>QT_LAYOUT_DIRECTION</translation>
     </message>
     <message>
         <source>Activates the program&apos;s main window</source>
@@ -708,15 +708,15 @@ to
     <name>QColorDialog</name>
     <message>
         <source>Hu&amp;e:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hu&amp;e:</translation>
     </message>
     <message>
         <source>&amp;Sat:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sat:</translation>
     </message>
     <message>
         <source>&amp;Val:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Val:</translation>
     </message>
     <message>
         <source>&amp;Red:</source>
@@ -759,11 +759,11 @@ to
     </message>
     <message>
         <source>False</source>
-        <translation type="unfinished"></translation>
+        <translation>False</translation>
     </message>
     <message>
         <source>True</source>
-        <translation type="unfinished"></translation>
+        <translation>True</translation>
     </message>
     <message>
         <source>Close</source>
@@ -863,34 +863,34 @@ to
     <name>QDateTimeEdit</name>
     <message>
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>am</source>
-        <translation type="unfinished"></translation>
+        <translation>am</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>pm</source>
-        <translation type="unfinished"></translation>
+        <translation>pm</translation>
     </message>
 </context>
 <context>
     <name>QDial</name>
     <message>
         <source>QDial</source>
-        <translation type="unfinished"></translation>
+        <translation>QDial</translation>
     </message>
     <message>
         <source>SpeedoMeter</source>
-        <translation type="unfinished"></translation>
+        <translation>SpeedoMeter</translation>
     </message>
     <message>
         <source>SliderHandle</source>
-        <translation type="unfinished"></translation>
+        <translation>SliderHandle</translation>
     </message>
 </context>
 <context>
@@ -1262,23 +1262,23 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>%1 TB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 TB</translation>
     </message>
     <message>
         <source>%1 GB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 GB</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1 KB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 KB</translation>
     </message>
     <message>
         <source>%1 bytes</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 bytes</translation>
     </message>
 </context>
 <context>
@@ -1293,7 +1293,7 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>Demi Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>Demi Bold</translation>
     </message>
     <message>
         <source>Black</source>
@@ -1301,11 +1301,11 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>Demi</source>
-        <translation type="unfinished"></translation>
+        <translation>Demi</translation>
     </message>
     <message>
         <source>Light</source>
-        <translation type="unfinished"></translation>
+        <translation>Light</translation>
     </message>
     <message>
         <source>Italic</source>
@@ -1437,7 +1437,7 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>Symbol</source>
-        <translation type="unfinished"></translation>
+        <translation>Symbol</translation>
     </message>
     <message>
         <source>Ogham</source>
@@ -1837,7 +1837,7 @@ Do you want to delete it anyway?</source>
     <name>QInputContext</name>
     <message>
         <source>XIM</source>
-        <translation type="unfinished"></translation>
+        <translation>XIM</translation>
     </message>
     <message>
         <source>XIM input method</source>
@@ -2077,7 +2077,7 @@ Do you want to delete it anyway?</source>
     <name>QMdiSubWindow</name>
     <message>
         <source>%1 - [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - [%2]</translation>
     </message>
     <message>
         <source>Close</source>
@@ -2121,7 +2121,7 @@ Do you want to delete it anyway?</source>
     </message>
     <message>
         <source>- [%1]</source>
-        <translation type="unfinished"></translation>
+        <translation>- [%1]</translation>
     </message>
     <message>
         <source>Maximize</source>
@@ -2720,99 +2720,99 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>A0</source>
-        <translation type="unfinished"></translation>
+        <translation>A0</translation>
     </message>
     <message>
         <source>A1</source>
-        <translation type="unfinished"></translation>
+        <translation>A1</translation>
     </message>
     <message>
         <source>A2</source>
-        <translation type="unfinished"></translation>
+        <translation>A2</translation>
     </message>
     <message>
         <source>A3</source>
-        <translation type="unfinished"></translation>
+        <translation>A3</translation>
     </message>
     <message>
         <source>A4</source>
-        <translation type="unfinished"></translation>
+        <translation>A4</translation>
     </message>
     <message>
         <source>A5</source>
-        <translation type="unfinished"></translation>
+        <translation>A5</translation>
     </message>
     <message>
         <source>A6</source>
-        <translation type="unfinished"></translation>
+        <translation>A6</translation>
     </message>
     <message>
         <source>A7</source>
-        <translation type="unfinished"></translation>
+        <translation>A7</translation>
     </message>
     <message>
         <source>A8</source>
-        <translation type="unfinished"></translation>
+        <translation>A8</translation>
     </message>
     <message>
         <source>A9</source>
-        <translation type="unfinished"></translation>
+        <translation>A9</translation>
     </message>
     <message>
         <source>B0</source>
-        <translation type="unfinished"></translation>
+        <translation>B0</translation>
     </message>
     <message>
         <source>B1</source>
-        <translation type="unfinished"></translation>
+        <translation>B1</translation>
     </message>
     <message>
         <source>B2</source>
-        <translation type="unfinished"></translation>
+        <translation>B2</translation>
     </message>
     <message>
         <source>B3</source>
-        <translation type="unfinished"></translation>
+        <translation>B3</translation>
     </message>
     <message>
         <source>B4</source>
-        <translation type="unfinished"></translation>
+        <translation>B4</translation>
     </message>
     <message>
         <source>B5</source>
-        <translation type="unfinished"></translation>
+        <translation>B5</translation>
     </message>
     <message>
         <source>B6</source>
-        <translation type="unfinished"></translation>
+        <translation>B6</translation>
     </message>
     <message>
         <source>B7</source>
-        <translation type="unfinished"></translation>
+        <translation>B7</translation>
     </message>
     <message>
         <source>B8</source>
-        <translation type="unfinished"></translation>
+        <translation>B8</translation>
     </message>
     <message>
         <source>B9</source>
-        <translation type="unfinished"></translation>
+        <translation>B9</translation>
     </message>
     <message>
         <source>B10</source>
-        <translation type="unfinished"></translation>
+        <translation>B10</translation>
     </message>
     <message>
         <source>C5E</source>
-        <translation type="unfinished"></translation>
+        <translation>C5E</translation>
     </message>
     <message>
         <source>DLE</source>
-        <translation type="unfinished"></translation>
+        <translation>DLE</translation>
     </message>
     <message>
         <source>Executive</source>
-        <translation type="unfinished"></translation>
+        <translation>Executive</translation>
     </message>
     <message>
         <source>Folio</source>
@@ -2820,19 +2820,19 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Ledger</source>
-        <translation type="unfinished"></translation>
+        <translation>Ledger</translation>
     </message>
     <message>
         <source>Legal</source>
-        <translation type="unfinished"></translation>
+        <translation>Legal</translation>
     </message>
     <message>
         <source>Letter</source>
-        <translation type="unfinished"></translation>
+        <translation>Letter</translation>
     </message>
     <message>
         <source>Tabloid</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabloid</translation>
     </message>
     <message>
         <source>US Common #10 Envelope</source>
@@ -3076,7 +3076,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
@@ -3353,23 +3353,23 @@ Please choose a different file name.</source>
     <name>QShortcut</name>
     <message>
         <source>Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Space</translation>
     </message>
     <message>
         <source>Esc</source>
-        <translation type="unfinished"></translation>
+        <translation>Esc</translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Tab</translation>
     </message>
     <message>
         <source>Backtab</source>
-        <translation type="unfinished"></translation>
+        <translation>Backtab</translation>
     </message>
     <message>
         <source>Backspace</source>
-        <translation type="unfinished"></translation>
+        <translation>Backspace</translation>
     </message>
     <message>
         <source>Return</source>
@@ -3377,19 +3377,19 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Enter</source>
-        <translation type="unfinished"></translation>
+        <translation>Enter</translation>
     </message>
     <message>
         <source>Ins</source>
-        <translation type="unfinished"></translation>
+        <translation>Ins</translation>
     </message>
     <message>
         <source>Del</source>
-        <translation type="unfinished"></translation>
+        <translation>Del</translation>
     </message>
     <message>
         <source>Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>Pause</translation>
     </message>
     <message>
         <source>Print</source>
@@ -3397,15 +3397,15 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>SysReq</source>
-        <translation type="unfinished"></translation>
+        <translation>SysReq</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Home</translation>
     </message>
     <message>
         <source>End</source>
-        <translation type="unfinished"></translation>
+        <translation>End</translation>
     </message>
     <message>
         <source>Left</source>
@@ -3425,23 +3425,23 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>PgUp</source>
-        <translation type="unfinished"></translation>
+        <translation>PgUp</translation>
     </message>
     <message>
         <source>PgDown</source>
-        <translation type="unfinished"></translation>
+        <translation>PgDown</translation>
     </message>
     <message>
         <source>CapsLock</source>
-        <translation type="unfinished"></translation>
+        <translation>CapsLock</translation>
     </message>
     <message>
         <source>NumLock</source>
-        <translation type="unfinished"></translation>
+        <translation>NumLock</translation>
     </message>
     <message>
         <source>ScrollLock</source>
-        <translation type="unfinished"></translation>
+        <translation>ScrollLock</translation>
     </message>
     <message>
         <source>Menu</source>
@@ -3493,11 +3493,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Treble Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Treble Up</translation>
     </message>
     <message>
         <source>Treble Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Treble Down</translation>
     </message>
     <message>
         <source>Media Play</source>
@@ -3609,7 +3609,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Print Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Print Screen</translation>
     </message>
     <message>
         <source>Page Up</source>
@@ -3621,11 +3621,11 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Caps Lock</translation>
     </message>
     <message>
         <source>Num Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Num Lock</translation>
     </message>
     <message>
         <source>Number Lock</source>
@@ -3633,7 +3633,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Scroll Lock</translation>
     </message>
     <message>
         <source>Insert</source>
@@ -3645,7 +3645,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Escape</source>
-        <translation type="unfinished"></translation>
+        <translation>Escape</translation>
     </message>
     <message>
         <source>System Request</source>
@@ -3665,19 +3665,19 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Context1</source>
-        <translation type="unfinished"></translation>
+        <translation>Context1</translation>
     </message>
     <message>
         <source>Context2</source>
-        <translation type="unfinished"></translation>
+        <translation>Context2</translation>
     </message>
     <message>
         <source>Context3</source>
-        <translation type="unfinished"></translation>
+        <translation>Context3</translation>
     </message>
     <message>
         <source>Context4</source>
-        <translation type="unfinished"></translation>
+        <translation>Context4</translation>
     </message>
     <message>
         <source>Call</source>
@@ -3685,7 +3685,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Hangup</source>
-        <translation type="unfinished"></translation>
+        <translation>Hangup</translation>
     </message>
     <message>
         <source>Flip</source>
@@ -3693,27 +3693,27 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl</translation>
     </message>
     <message>
         <source>Shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift</translation>
     </message>
     <message>
         <source>Alt</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt</translation>
     </message>
     <message>
         <source>Meta</source>
-        <translation type="unfinished"></translation>
+        <translation>Meta</translation>
     </message>
     <message>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation>+</translation>
     </message>
     <message>
         <source>F%1</source>
-        <translation type="unfinished"></translation>
+        <translation>F%1</translation>
     </message>
     <message>
         <source>Home Page</source>
@@ -4242,12 +4242,12 @@ Please choose a different file name.</source>
     <message>
         <source>LTR</source>
         <comment>Left to Right context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>LTR</translation>
     </message>
     <message>
         <source>RTL</source>
         <comment>Right to Left context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>RTL</translation>
     </message>
     <message>
         <source>Inspect</source>
@@ -4295,7 +4295,7 @@ Please choose a different file name.</source>
     <name>QWidget</name>
     <message>
         <source>*</source>
-        <translation type="unfinished"></translation>
+        <translation>*</translation>
     </message>
 </context>
 <context>
@@ -4385,7 +4385,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>%1 - [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - [%2]</translation>
     </message>
     <message>
         <source>Minimize</source>
@@ -4682,7 +4682,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source>
-        <translation>時間 24:%1:%2.%3 無效。 �時是 24，但分�� 秒，和毫秒�是所有 0;</translation>
+        <translation>時間 24:%1:%2.%3 無效。 �時是 24，但分�� 秒，和毫秒�是全部 0;</translation>
     </message>
     <message>
         <source>Time %1:%2:%3.%4 is invalid.</source>
@@ -4846,7 +4846,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <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>在處�指示的目標�稱�能為 %1 上的任�組�的和�寫。 因此，無效的 %2。</translation>
+        <translation>在處�指示的目標�稱�能為 %1 上的任�組�的和�寫。 因此， %2 無效。</translation>
     </message>
     <message>
         <source>%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.</source>
@@ -4974,7 +4974,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>A zone offset must be in the range %1..%2 inclusive. %3 is out of range.</source>
-        <translation>�域的�移�必須在 1%範�內...%2 共�。 %3 超出了範�。</translation>
+        <translation>�域的�移�必須在範� %1..%2 包容。 %3 超出範�。</translation>
     </message>
     <message>
         <source>%1 is not a whole number of minutes.</source>
@@ -5038,7 +5038,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <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>�以宣告字首 %1 繫�命命�空間 2%。 �設，它已經繫�至字首 %1。</translation>
+        <translation>�有字首 %1 �以宣告繫�命�空間 %2。 �設，它已經繫�至字首 %1。</translation>
     </message>
     <message>
         <source>Prefix %1 is already declared in the prolog.</source>
@@ -5050,7 +5050,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
-        <translation>�支�架構導入功能，和 %1 的�明�會發生的因此。</translation>
+        <translation>架構匯入功能�支�，且因此 %1 的宣告�能發生。</translation>
     </message>
     <message>
         <source>The target namespace of a %1 cannot be empty.</source>
@@ -5094,7 +5094,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
-        <translation>�支�架構驗證特徵。 因此，1-�能使用�算�。</translation>
+        <translation>架構驗證功能�支�。 因此，%1-�算��能使用。</translation>
     </message>
     <message>
         <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
@@ -5214,7 +5214,7 @@ Please choose a different file name.</source>
     </message>
     <message>
         <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source>
-        <translation>Unicode Codepoint Collation �支� (%1)。 �支� %2 。</translation>
+        <translation>Unicode Codepoint Collation �支� (%1)。 �支� %2。</translation>
     </message>
     <message>
         <source>Attribute %1 can&apos;t be serialized because it appears at the top level.</source>
diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp
index c182bed88..54667cea2 100644
--- a/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp
@@ -1260,6 +1260,10 @@ bool VBoxConsoleView::event (QEvent *e)
                          re->width(), re->height(), re->bitsPerPixel()));
 #endif
 
+                bool notifyMainWnd = mFrameBuf->width() != re->width()
+                        || mFrameBuf->height() != re->height();
+
+
                 /* Store the new size to prevent unwanted resize hints being
                  * sent back. */
                 storeConsoleSize(re->width(), re->height());
@@ -1346,7 +1350,8 @@ bool VBoxConsoleView::event (QEvent *e)
                     mIgnoreFrameBufferResize = false;
                 }
 
-                mMainWnd->onDisplayResize (re->width(), re->height());
+                if (notifyMainWnd)
+                	mMainWnd->onDisplayResize (re->width(), re->height());
 
                 return true;
             }
diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
index da42b21cc..ea634effc 100644
--- a/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
@@ -957,7 +957,7 @@ bool VBoxConsoleWnd::openView (const CSession &aSession)
     if (usbctl.isNull())
     {
         /* hide usb_menu & usb_separator & usb_status_led */
-        mDevicesUSBMenu->setVisible (false);
+        mDevicesUSBMenu->menuAction()->setVisible (false);
         mUSBLed->setHidden (true);
     }
     else
@@ -1229,14 +1229,20 @@ void VBoxConsoleWnd::clearMask()
 #endif
 }
 
-void VBoxConsoleWnd::onDisplayResize (ulong aHeight, ulong aWidth)
+void VBoxConsoleWnd::onDisplayResize (ulong aWidth, ulong aHeight)
 {
-    if (mIsSeamless && QApplication::desktop()->availableGeometry (this).size() != QSize (aHeight, aWidth))
+    if (mIsSeamless)
     {
-        mVmSeamlessAction->setChecked (false);
-        /* should be cleared already, but just in case */
-        if (mIsSeamless)
-            toggleFullscreenMode (false, true);
+        const QRect & geo = QApplication::desktop()->availableGeometry (this);
+        int dW = geo.width() - (int)aWidth;
+        int dH = geo.height() - (int)aHeight;
+        if (RT_ABS (dW) > 16 || RT_ABS (dH) > 16)
+        {
+            mVmSeamlessAction->setChecked (false);
+            /* should be cleared already, but just in case */
+            if (mIsSeamless)
+                toggleFullscreenMode (false, true);
+        }
     }
 }
 
diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.h b/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.h
index bb5556765..4dcdd0cdc 100644
--- a/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.h
+++ b/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.h
@@ -112,7 +112,7 @@ public:
     void clearMask();
 
     /* informs that the guest display is resized */
-    void onDisplayResize (ulong aHeight, ulong aWidth);
+    void onDisplayResize (ulong aWidth, ulong aHeight);
 
 signals:
 
diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
index 7ddf57b27..98198c85d 100644
--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
@@ -58,6 +58,7 @@
 #include <QTimer>
 #include <QDir>
 #include <QHelpEvent>
+#include <QLocale>
 
 #include <math.h>
 
@@ -1616,6 +1617,9 @@ QString VBoxGlobal::detailsReport (const CMachine &aMachine, bool aWithLinks)
         /* BIOS Settings holder */
         CBIOSSettings biosSettings = aMachine.GetBIOSSettings();
 
+        /* System details row count: */
+        int iRowCount = 2; /* Memory & CPU details rows initially. */
+
         /* Boot order */
         QString bootOrder;
         for (ulong i = 1; i <= mVBox.GetSystemProperties().GetMaxBootPosition(); ++ i)
@@ -1630,6 +1634,8 @@ QString VBoxGlobal::detailsReport (const CMachine &aMachine, bool aWithLinks)
         if (bootOrder.isEmpty())
             bootOrder = toString (KDeviceType_Null);
 
+        iRowCount += 1; /* Boot-order row. */
+
 #ifdef VBOX_WITH_FULL_DETAILS_REPORT
         /* ACPI */
         QString acpi = biosSettings.GetACPIEnabled()
@@ -1645,6 +1651,8 @@ QString VBoxGlobal::detailsReport (const CMachine &aMachine, bool aWithLinks)
         QString pae = aMachine.GetCpuProperty(KCpuPropertyType_PAE)
             ? tr ("Enabled", "details report (PAE/NX)")
             : tr ("Disabled", "details report (PAE/NX)");
+
+        iRowCount += 3; /* Full report rows. */
 #endif /* VBOX_WITH_FULL_DETAILS_REPORT */
 
         /* VT-x/AMD-V */
@@ -1657,6 +1665,12 @@ QString VBoxGlobal::detailsReport (const CMachine &aMachine, bool aWithLinks)
             ? tr ("Enabled", "details report (Nested Paging)")
             : tr ("Disabled", "details report (Nested Paging)");
 
+        /* VT-x/AMD-V availability: */
+        bool fVTxAMDVSupported = virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
+
+        if (fVTxAMDVSupported)
+            iRowCount += 2; /* VT-x/AMD-V items. */
+
         QString item = QString (sSectionItemTpl2).arg (tr ("Base Memory", "details report"),
                                                        tr ("<nobr>%1 MB</nobr>", "details report"))
                        .arg (aMachine.GetMemorySize())
@@ -1669,16 +1683,14 @@ QString VBoxGlobal::detailsReport (const CMachine &aMachine, bool aWithLinks)
                      + QString (sSectionItemTpl2).arg (tr ("IO APIC", "details report"), ioapic)
                      + QString (sSectionItemTpl2).arg (tr ("PAE/NX", "details report"), pae)
 #endif /* VBOX_WITH_FULL_DETAILS_REPORT */
-                     + QString (sSectionItemTpl2).arg (tr ("VT-x/AMD-V", "details report"), virt)
-                     + QString (sSectionItemTpl2).arg (tr ("Nested Paging", "details report"), nested)
                      ;
 
+        if (fVTxAMDVSupported)
+                item += QString (sSectionItemTpl2).arg (tr ("VT-x/AMD-V", "details report"), virt)
+                     +  QString (sSectionItemTpl2).arg (tr ("Nested Paging", "details report"), nested);
+
         report += sectionTpl
-#ifdef VBOX_WITH_FULL_DETAILS_REPORT
-                  .arg (2 + 8) /* rows */
-#else
-                  .arg (2 + 5) /* rows */
-#endif /* VBOX_WITH_FULL_DETAILS_REPORT */
+                  .arg (2 + iRowCount) /* rows */
                   .arg (":/chipset_16px.png", /* icon */
                         "#system", /* link */
                         tr ("System", "details report"), /* title */
@@ -4352,6 +4364,8 @@ void VBoxGlobal::showRegistrationDialog (bool aForce)
             mRegDlg->show();
         }
     }
+#else
+    Q_UNUSED(aForce);
 #endif
 }
 
diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp
index adde0f277..6034de7f8 100644
--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp
@@ -501,7 +501,7 @@ void VBoxProblemReporter::cannotLoadGlobalConfig (const CVirtualBox &vbox,
             "<p>The application will now terminate.</p>")
              .arg (vbox.GetSettingsFilePath()),
         !res.isOk() ? formatErrorInfo (res)
-                    : QString ("<p>%1.</p>").arg (vboxGlobal().emphasize (error)));
+                    : QString ("<!--EOM--><p>%1</p>").arg (vboxGlobal().emphasize (error)));
 }
 
 void VBoxProblemReporter::cannotSaveGlobalConfig (const CVirtualBox &vbox)
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.ui b/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.ui
index eecec0bf8..4ec42f386 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.ui
+++ b/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.ui
@@ -156,7 +156,7 @@
    <item row="7" column="1" colspan="2">
     <widget class="QCheckBox" name="mCbCheckPresentationMode">
      <property name="text">
-      <string>&amp;Auto show Dock &amp;&amp; Menubar in fullscreen</string>
+      <string>&amp;Auto show Dock and Menubar in fullscreen</string>
      </property>
     </widget>
    </item>
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp b/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp
index 5700f2d1b..d56c64825 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp
@@ -182,6 +182,10 @@ void VBoxVMSettingsSystem::getFrom (const CMachine &aMachine)
     mCbPae->setEnabled (fPAESupported);
     mCbPae->setChecked (aMachine.GetCpuProperty(KCpuPropertyType_PAE));
 
+    /* VT-x/AMD-V page */
+    if (!fVTxAMDVSupported)
+        mTwSystem->removeTab(2);
+
     /* VT-x/AMD-V */
     mCbVirt->setEnabled (fVTxAMDVSupported);
     mCbVirt->setChecked (aMachine.GetHWVirtExProperty(KHWVirtExPropertyType_Enabled));
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.ui b/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.ui
index 695767f10..b79d9c6e7 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.ui
+++ b/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.ui
@@ -389,7 +389,7 @@
          <item>
           <widget class="QIAdvancedSlider" name="mSlCPU">
            <property name="whatsThis">
-            <string>Controls the number of virtual CPUs in the virtual machine.</string>
+            <string>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.</string>
            </property>
            <property name="maximum">
             <number>4096</number>
@@ -462,7 +462,7 @@
           </sizepolicy>
          </property>
          <property name="whatsThis">
-          <string>Controls the number of virtual CPUs in the virtual machine.</string>
+          <string>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.</string>
          </property>
         </widget>
        </item>
diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
index c7073369f..32160e77a 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -1,4 +1,4 @@
-/* $Rev: 55982 $ */
+/* $Rev: 58763 $ */
 /** @file
  * VBoxDrv - The VirtualBox Support Driver - Linux specifics.
  */
@@ -221,8 +221,10 @@ static struct miscdevice gMiscDevice =
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
 static struct dev_pm_ops gPlatformPMOps =
 {
-    .suspend = VBoxDrvSuspend,
-    .resume = VBoxDrvResume,
+    .suspend = VBoxDrvSuspend,  /* before entering deep sleep */
+    .resume  = VBoxDrvResume,   /* after wakeup from deep sleep */
+    .freeze  = VBoxDrvSuspend,  /* before creating hibernation image */
+    .restore = VBoxDrvResume,   /* after wakeing up from hibernation */
 };
 # endif
 
@@ -231,7 +233,7 @@ static struct platform_driver gPlatformDriver =
     .probe = VBoxDrvProbe,
 # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
     .suspend = VBoxDrvSuspend,
-    .resume = VBoxDrvResume,
+    .resume  = VBoxDrvResume,
 # endif
     /** @todo .shutdown? */
     .driver =
diff --git a/src/VBox/Installer/solaris/Makefile.kmk b/src/VBox/Installer/solaris/Makefile.kmk
index 12403c64f..357ce2646 100644
--- a/src/VBox/Installer/solaris/Makefile.kmk
+++ b/src/VBox/Installer/solaris/Makefile.kmk
@@ -186,7 +186,7 @@ SOLARIS_STRIP_EXES = \
 	VBoxSVC \
 	$(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
 	VBoxXPCOMIPCD \
-	kchmviewer
+	$(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
 
 ifdef VBOX_WITH_USB
  ifndef VBOX_WITH_NEW_USB_CODE_ON_SOLARIS
@@ -223,11 +223,12 @@ SOLARIS_STRIP_BINS = \
 	$(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestPropSvc.so,) \
 	$(if $(VBOX_WITH_QTGUI),\
 	  VBoxKeyboard.so \
-	  libQtCoreVBox.so.4 \
-	  libQtGuiVBox.so.4 \
-	  libQtNetworkVBox.so.4 \
-	  $(if $(VBOX_GUI_USE_QGL), libQtOpenGLVBox.so.4,) \
-	  accessible/libqtaccessiblewidgets.so,) \
+	  $(if $(VBOX_WITH_QT4_SUN),\
+	    libQtCoreVBox.so.4 \
+	    libQtGuiVBox.so.4 \
+	    libQtNetworkVBox.so.4 \
+	    $(if $(VBOX_GUI_USE_QGL),libQtOpenGLVBox.so.4,) \
+	    accessible/libqtaccessiblewidgets.so,)) \
 	$(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so,) \
 	$(if $(VBOX_WITH_CROGL),\
 	  VBoxOGLhostcrutil.so \
@@ -299,9 +300,10 @@ SOLARIS_EXTRAS = \
 # These extra Qt libs are purely for running VBoxQtconfig
 ifdef VBOX_WITH_QTGUI
  SOLARIS_QTLIBS = \
-	libQtXmlVBox.so.4 \
-	libQtSqlVBox.so.4 \
-	libQt3SupportVBox.so.4
+	$(if $(VBOX_WITH_QT4_SUN),\
+	  libQtXmlVBox.so.4 \
+	  libQtSqlVBox.so.4 \
+	  libQt3SupportVBox.so.4,)
 endif
 
 
@@ -530,14 +532,16 @@ endif
 	$(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_VBOXINST_DIR)/LICENSE)
 	$(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_BASEINST_DIR)/vbox.copyright)
 ifdef VBOX_WITH_COMBINED_PACKAGE
+ ifndef VBOX_OSE
 	$(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.x86/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2     $(SOLARIS_VBOXINST_DIR_32)/libSDL-1.2.so.0,)
 	$(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.amd64/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2   $(SOLARIS_VBOXINST_DIR_64)/libSDL-1.2.so.0,)
+ endif
 	@# @todo -XXX- how to get rid of this manual MKDIR ?
 	$(QUIET)$(MKDIR) -p $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64)
 	$(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(wildcard $(SOLARIS_OUT_BIN_32)/VBoxPython*.so)   $(SOLARIS_VBOXINST_DIR)/,)
 	$(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(wildcard $(SOLARIS_OUT_BIN_64)/VBoxPython*.so)   $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64)/,)
-	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_32)/bin/qtconfig                                $(SOLARIS_VBOXINST_DIR_32)/VBoxQtconfig,)
-	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_64)/bin/qtconfig                                $(SOLARIS_VBOXINST_DIR_64)/VBoxQtconfig,)
+	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(if ($VBOX_WITH_QT4_SUN),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_32)/bin/qtconfig      $(SOLARIS_VBOXINST_DIR_32)/VBoxQtconfig,),)
+	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(if $(VBOX_WITH_QT4_SUN),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_64)/bin/qtconfig      $(SOLARIS_VBOXINST_DIR_64)/VBoxQtconfig,),)
 	$(QUIET)$(INSTALL) -m 0755 $(SOLARIS_OUT_BIN_32)/VBoxISAExec                                                         $(SOLARIS_VBOXINST_DIR)/VBoxISAExec
 	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../rdesktop-vrdp-keymaps                                            $(SOLARIS_VBOXINST_DIR_32)/rdesktop-vrdp-keymaps,)
 	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../rdesktop-vrdp-keymaps                                            $(SOLARIS_VBOXINST_DIR_64)/rdesktop-vrdp-keymaps,)
@@ -550,13 +554,15 @@ ifdef VBOX_WITH_COMBINED_PACKAGE
 	$(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI64.fd                                             $(SOLARIS_VBOXINST_DIR_64)/VBoxEFI64.fd,)
 	$(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI64.fd                                             $(SOLARIS_VBOXINST_DIR_32)/VBoxEFI64.fd,)
 else
+ ifndef VBOX_OSE
 	$(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS_TRG)/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2    $(SOLARIS_VBOXINST_DIR_ISA)/libSDL-1.2.so.0,)
+ endif
 	@# @todo -XXX- how to get rid of this manual MKDIR ?
  ifdef VBOX_WITH_PYTHON
 	$(QUIET)$(if $(SOL64_PKG),$(MKDIR) -p $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64),)
 	$(QUIET)$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(wildcard $(SOLARIS_OUT_BIN)/VBoxPython*.so)                   $(SOLARIS_VBOXINST_DIR)/$(if $(SOL64_PKG),$(VBOX_SOL_PYTHON_DIR_64)/,)
  endif
-	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(VBOX_PATH_QT4)/bin/qtconfig                                     $(SOLARIS_VBOXINST_DIR_ISA)/VBoxQtconfig,)
+	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(if $(VBOX_WITH_QT4_SUN),$(INSTALL) -m 0755 $(VBOX_PATH_QT4)/bin/qtconfig           $(SOLARIS_VBOXINST_DIR_ISA)/VBoxQtconfig,),)
 	$(QUIET)$(INSTALL) -m 0755 $(SOLARIS_OUT_BIN)/VBoxISAExec                                                            $(SOLARIS_VBOXINST_DIR)/VBoxISAExec
 	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../rdesktop-vrdp-keymaps                                            $(SOLARIS_VBOXINST_DIR_ISA)/rdesktop-vrdp-keymaps,)
 	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../additions                                                        $(SOLARIS_VBOXINST_DIR_ISA)/additions,)
diff --git a/src/VBox/Installer/solaris/vboxconfig.sh b/src/VBox/Installer/solaris/vboxconfig.sh
index dc9ca94ea..45b96bf5d 100755
--- a/src/VBox/Installer/solaris/vboxconfig.sh
+++ b/src/VBox/Installer/solaris/vboxconfig.sh
@@ -29,6 +29,7 @@ HOST_OS_MAJORVERSION=`uname -r`
 HOST_OS_MINORVERSION=`uname -v | sed -e "s/snv_//" -e "s/[^0-9]//"`
 
 DIR_VBOXBASE=/opt/VirtualBox
+DIR_CONF="/platform/i86pc/kernel/drv"
 DIR_MOD_32="/platform/i86pc/kernel/drv"
 DIR_MOD_64=$DIR_MOD_32/amd64
 
@@ -348,12 +349,17 @@ load_module()
 # !! failure is always fatal
 install_drivers()
 {
-    if test -n "_HARDENED_"; then
-        add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0600 root sys'"
+    if test -f "$DIR_CONF/vboxdrv.conf"; then
+        if test -n "_HARDENED_"; then
+            add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0600 root sys'"
+        else
+            add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0666 root sys'"
+        fi
+        load_module "drv/$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP"
     else
-        add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0666 root sys'"
+        errorprint "Extreme error! Missing $DIR_CONF/vboxdrv.conf, aborting."
+        return 1
     fi
-    load_module "drv/$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP"
 
     # Add vboxdrv to devlink.tab
     sed -e '/name=vboxdrv/d' /etc/devlink.tab > /etc/devlink.vbox
@@ -365,17 +371,17 @@ install_drivers()
 
     if test $? -eq 0 && test -h "/dev/vboxdrv"; then
 
-        if test -f /platform/i86pc/kernel/drv/vboxnet.conf; then
+        if test -f "$DIR_CONF/vboxnet.conf"; then
             add_driver "$MOD_VBOXNET" "$DESC_VBOXNET" "$FATALOP"
             load_module "drv/$MOD_VBOXNET" "$DESC_VBOXNET" "$FATALOP"
         fi
 
-        if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
+        if test -f "$DIR_CONF/vboxflt.conf"; then
             add_driver "$MOD_VBOXFLT" "$DESC_VBOXFLT" "$FATALOP"
             load_module "drv/$MOD_VBOXFLT" "$DESC_VBOXFLT" "$FATALOP"
         fi
 
-        if test -f /platform/i86pc/kernel/drv/vboxusbmon.conf && test "$HOST_OS_MAJORVERSION" != "5.10"; then
+        if test -f "$DIR_CONF/vboxusbmon.conf" && test "$HOST_OS_MAJORVERSION" != "5.10"; then
             # For VirtualBox 3.1 the new USB code requires Nevada > 123
             if test "$HOST_OS_MINORVERSION" -gt 123; then
                 add_driver "$MOD_VBOXUSBMON" "$DESC_VBOXUSBMON" "$FATALOP" "not-$NULLOP" "'* 0666 root sys'"
@@ -397,7 +403,7 @@ install_drivers()
                 # This driver is special, we need it in the boot-archive but since there is no
                 # USB device to attach to now (it's done at runtime) it will fail to attach so
                 # redirect attaching failure output to /dev/null
-                if test -f /platform/i86pc/kernel/drv/vboxusb.conf; then
+                if test -f "$DIR_CONF/vboxusb.conf"; then
                     add_driver "$MOD_VBOXUSB" "$DESC_VBOXUSB" "$FATALOP" "$NULLOP"
                     load_module "drv/$MOD_VBOXUSB" "$DESC_VBOXUSB" "$FATALOP"
                 fi
@@ -467,6 +473,14 @@ remove_drivers()
         mv -f $nwambackupfile $nwamfile
     fi
 
+    # remove netmask configuration
+    nmaskfile=/etc/netmasks
+    nmaskbackupfile=$nmaskfile.vbox
+    if test -f "$nmaskfile"; then
+        sed -e '/#VirtualBox_SectionStart/,/#VirtualBox_SectionEnd/d' $nmaskfile > $nmaskbackupfile
+        mv -f $nmaskbackupfile $nmaskfile
+    fi
+
     return 0
 }
 
@@ -565,7 +579,7 @@ postinstall()
     install_drivers
 
     if test "$?" -eq 0; then
-        if test -f /platform/i86pc/kernel/drv/vboxnet.conf; then
+        if test -f "$DIR_CONF/vboxnet.conf"; then
             # nwam/dhcpagent fix
             nwamfile=/etc/nwam/llp
             nwambackupfile=$nwamfile.vbox
@@ -579,6 +593,23 @@ postinstall()
             $BIN_IFCONFIG vboxnet0 plumb up
             if test "$?" -eq 0; then
                 $BIN_IFCONFIG vboxnet0 192.168.56.1 netmask 255.255.255.0 up
+
+                # add the netmask to stay persistent across host reboots
+                nmaskfile=/etc/netmasks
+                nmaskbackupfile=$nmaskfile.vbox
+                if test -f $nmaskfile; then
+                    sed -e '/#VirtualBox_SectionStart/,/#VirtualBox_SectionEnd/d' $nmaskfile > $nmaskbackupfile
+                    echo "#VirtualBox_SectionStart" >> $nmaskbackupfile
+                    inst=0
+                    networkn=56
+                    while test $inst -ne 1; do
+                        echo "192.168.$networkn.0 255.255.255.0" >> $nmaskbackupfile
+                        inst=`expr $inst + 1`
+                        networkn=`expr $networkn + 1`
+                    done
+                    echo "#VirtualBox_SectionEnd" >> $nmaskbackupfile
+                    mv -f $nmaskbackupfile $nmaskfile
+                fi
             else
                 # Should this be fatal?
                 warnprint "Failed to bring up vboxnet0!!"
@@ -685,7 +716,7 @@ find_bins
 while test $# -gt 0;
 do
     case "$1" in
-        --postinstall | --preremove | --installdrivers | --removedrivers)
+        --postinstall | --preremove | --installdrivers | --removedrivers | --setupdrivers)
             drvop="$1"
             ;;
         --fatal)
@@ -697,6 +728,10 @@ do
         --ips)
             ISIPS="$IPSOP"
             ;;
+        --altkerndir)
+            # Use alternate kernel driver config folder (dev only)
+            DIR_CONF="/usr/kernel/drv"
+            ;;
         *)
             break
             ;;
@@ -719,6 +754,10 @@ case "$drvop" in
 --removedrivers)
     remove_drivers "$fatal"
     ;;
+--setupdrivers)
+    remove_drivers "$fatal"
+    install_drivers
+    ;;
 *)
     errorprint "Invalid operation $drvop"
     exit 1
diff --git a/src/VBox/Main/ConsoleImpl2.cpp b/src/VBox/Main/ConsoleImpl2.cpp
index c49d11534..be9b14867 100644
--- a/src/VBox/Main/ConsoleImpl2.cpp
+++ b/src/VBox/Main/ConsoleImpl2.cpp
@@ -260,11 +260,13 @@ DECLCALLBACK(int) Console::configConstructor(PVM pVM, void *pvConsole)
     rc = CFGMR3InsertInteger(pRoot, "RamHoleSize",          cbRamHole);             RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "NumCPUs",              cCpus);                 RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "TimerMillies",         10);                    RC_CHECK();
+#ifdef VBOX_WITH_RAW_MODE
     rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled",         1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RawR0Enabled",         1);     /* boolean */   RC_CHECK();
     /** @todo Config: RawR0, PATMEnabled and CSAMEnabled needs attention later. */
     rc = CFGMR3InsertInteger(pRoot, "PATMEnabled",          1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "CSAMEnabled",          1);     /* boolean */   RC_CHECK();
+#endif
 
     /* cpuid leaf overrides. */
     static uint32_t const s_auCpuIdRanges[] =
@@ -304,21 +306,25 @@ DECLCALLBACK(int) Console::configConstructor(PVM pVM, void *pvConsole)
 
     /* hardware virtualization extensions */
     BOOL fHWVirtExEnabled;
+    BOOL fHwVirtExtForced;
+#ifdef VBOX_WITH_RAW_MODE
     hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Enabled, &fHWVirtExEnabled); H();
     if (cCpus > 1) /** @todo SMP: This isn't nice, but things won't work on mac otherwise. */
         fHWVirtExEnabled = TRUE;
-
-#ifdef RT_OS_DARWIN
-    rc = CFGMR3InsertInteger(pRoot, "HwVirtExtForced",      fHWVirtExEnabled);      RC_CHECK();
-#else
+# ifdef RT_OS_DARWIN
+    fHwVirtExtForced = fHWVirtExEnabled;
+# else
     /* - With more than 4GB PGM will use different RAMRANGE sizes for raw
          mode and hv mode to optimize lookup times.
        - With more than one virtual CPU, raw-mode isn't a fallback option. */
-    BOOL fHwVirtExtForced = fHWVirtExEnabled
-                         && (   cbRam > (_4G - cbRamHole)
-                             || cCpus > 1);
+    fHwVirtExtForced = fHWVirtExEnabled
+                    && (   cbRam > (_4G - cbRamHole)
+                        || cCpus > 1);
+# endif
+#else  /* !VBOX_WITH_RAW_MODE */
+    fHWVirtExEnabled = fHwVirtExtForced = TRUE;
+#endif /* !VBOX_WITH_RAW_MODE */
     rc = CFGMR3InsertInteger(pRoot, "HwVirtExtForced",      fHwVirtExtForced);      RC_CHECK();
-#endif
 
     PCFGMNODE pHWVirtExt;
     rc = CFGMR3InsertNode(pRoot, "HWVirtExt", &pHWVirtExt);                         RC_CHECK();
@@ -355,7 +361,7 @@ DECLCALLBACK(int) Console::configConstructor(PVM pVM, void *pvConsole)
         }
 #endif
 
-        /* @todo Not exactly pretty to check strings; VBOXOSTYPE would be better, but that requires quite a bit of API change in Main. */
+        /** @todo Not exactly pretty to check strings; VBOXOSTYPE would be better, but that requires quite a bit of API change in Main. */
         if (    !fIs64BitGuest
             &&  fIOAPIC
             &&  (   osTypeId == "WindowsNT4"
@@ -2263,7 +2269,13 @@ DECLCALLBACK(int) Console::configConstructor(PVM pVM, void *pvConsole)
             char *pszColon = (char *)memchr(szTrunk, ':', sizeof(szTrunk));
             if (!pszColon)
             {
-                hrc = aNetworkAdapter->Detach();                        H();
+                /*
+                 * Dynamic changing of attachment causes an attempt to configure
+                 * network with invalid host adapter (as it is must be changed before
+                 * the attachment), calling Detach here will cause a deadlock.
+                 * See #4750.
+                 * hrc = aNetworkAdapter->Detach();                        H();
+                 */
                 return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
                                   N_("Malformed host interface networking name '%ls'"),
                                   HifName.raw());
@@ -2616,7 +2628,6 @@ DECLCALLBACK(int) Console::configConstructor(PVM pVM, void *pvConsole)
 
             Utf8Str HifNameUtf8(HifName);
             const char *pszHifName = HifNameUtf8.raw();
-            LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(HostInterface): %s\n", pszHifName));
             ComPtr<IHostNetworkInterface> hostInterface;
             rc = host->FindHostNetworkInterfaceByName(HifName, hostInterface.asOutParam());
             if (!SUCCEEDED(rc))
@@ -2810,7 +2821,7 @@ DECLCALLBACK(int) Console::configConstructor(PVM pVM, void *pvConsole)
                 if (fAttachDetach)
                 {
                     rc = PDMR3DriverAttach(pVM, pszDevice, uInstance, uLun, 0 /*fFlags*/, NULL /* ppBase */);
-                    AssertRC(rc);
+                    //AssertRC(rc);
                 }
 
                 {
diff --git a/src/VBox/Main/DHCPServerImpl.cpp b/src/VBox/Main/DHCPServerImpl.cpp
index df2e4aabc..9d95a54d4 100644
--- a/src/VBox/Main/DHCPServerImpl.cpp
+++ b/src/VBox/Main/DHCPServerImpl.cpp
@@ -249,10 +249,10 @@ STDMETHODIMP DHCPServer::Start(IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR
     m.dhcp.setOption(DHCPCFG_TRUNKTYPE, Utf8Str(aTrunkType), true);
     //temporary hack for testing
     //    DHCPCFG_NAME
-    char strMAC[13];
+    char strMAC[32];
     Guid guid;
     guid.create();
-    RTStrPrintf (strMAC, sizeof(strMAC), "080027%02X%02X%02X",
+    RTStrPrintf (strMAC, sizeof(strMAC), "08:00:27:%02X:%02X:%02X",
                  guid.ptr()->au8[0], guid.ptr()->au8[1], guid.ptr()->au8[2]);
     m.dhcp.setOption(DHCPCFG_MACADDRESS, strMAC, true);
     m.dhcp.setOption(DHCPCFG_IPADDRESS,  Utf8Str(m.IPAddress), true);
diff --git a/src/VBox/Main/DisplayImpl.cpp b/src/VBox/Main/DisplayImpl.cpp
index f4ca9d71f..fc64c5b43 100644
--- a/src/VBox/Main/DisplayImpl.cpp
+++ b/src/VBox/Main/DisplayImpl.cpp
@@ -430,8 +430,14 @@ Display::displaySSMSaveScreenshot(PSSMHANDLE pSSM, void *pvUser)
         int rc = that->mpDrv->pUpPort->pfnTakeScreenshot (that->mpDrv->pUpPort, &pu8Data, &cbData, &cx, &cy);
 #endif /* !VBOX_WITH_OLD_VBVA_LOCK */
 
-        if (RT_SUCCESS(rc))
+        /*
+         * It is possible that success is returned but everything is 0 or NULL.
+         * (no display attached if a VM is running with VBoxHeadless on OSE for example)
+         */
+        if (RT_SUCCESS(rc) && pu8Data)
         {
+            Assert(cx && cy);
+
             /* Prepare a small thumbnail and a PNG screenshot. */
             displayMakeThumbnail(pu8Data, cx, cy, &pu8Thumbnail, &cbThumbnail, &cxThumbnail, &cyThumbnail);
             displayMakePNG(pu8Data, cx, cy, &pu8PNG, &cbPNG, &cxPNG, &cyPNG);
diff --git a/src/VBox/Main/MachineImpl.cpp b/src/VBox/Main/MachineImpl.cpp
index fb2792d06..18a7dce3c 100644
--- a/src/VBox/Main/MachineImpl.cpp
+++ b/src/VBox/Main/MachineImpl.cpp
@@ -1368,10 +1368,12 @@ STDMETHODIMP Machine::SetCpuProperty(CpuPropertyType_T property, BOOL aVal)
     switch(property)
     {
     case CpuPropertyType_PAE:
+        mHWData.backup();
         mHWData->mPAEEnabled = !!aVal;
         break;
 
     case CpuPropertyType_Synthetic:
+        mHWData.backup();
         mHWData->mSyntheticCpu = !!aVal;
         break;
 
@@ -1466,6 +1468,7 @@ STDMETHODIMP Machine::SetCpuIdLeaf(ULONG aId, ULONG aValEax, ULONG aValEbx, ULON
         case 0xA:
             AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xA);
             AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
+            mHWData.backup();
             mHWData->mCpuIdStdLeafs[aId].ulId  = aId;
             mHWData->mCpuIdStdLeafs[aId].ulEax = aValEax;
             mHWData->mCpuIdStdLeafs[aId].ulEbx = aValEbx;
@@ -1486,6 +1489,7 @@ STDMETHODIMP Machine::SetCpuIdLeaf(ULONG aId, ULONG aValEax, ULONG aValEbx, ULON
         case 0x8000000A:
             AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xA);
             AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
+            mHWData.backup();
             mHWData->mCpuIdExtLeafs[aId - 0x80000000].ulId  = aId;
             mHWData->mCpuIdExtLeafs[aId - 0x80000000].ulEax = aValEax;
             mHWData->mCpuIdExtLeafs[aId - 0x80000000].ulEbx = aValEbx;
@@ -1524,6 +1528,7 @@ STDMETHODIMP Machine::RemoveCpuIdLeaf(ULONG aId)
         case 0xA:
             AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xA);
             AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
+            mHWData.backup();
             /* Invalidate leaf. */
             mHWData->mCpuIdStdLeafs[aId].ulId = UINT32_MAX;
             break;
@@ -1541,6 +1546,7 @@ STDMETHODIMP Machine::RemoveCpuIdLeaf(ULONG aId)
         case 0x8000000A:
             AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xA);
             AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
+            mHWData.backup();
             /* Invalidate leaf. */
             mHWData->mCpuIdExtLeafs[aId - 0x80000000].ulId = UINT32_MAX;
             break;
@@ -1561,6 +1567,8 @@ STDMETHODIMP Machine::RemoveAllCpuIdLeafs()
     HRESULT rc = checkStateDependency(MutableStateDep);
     CheckComRCReturnRC(rc);
 
+    mHWData.backup();
+
     /* Invalidate all standard leafs. */
     for (unsigned i = 0; i < RT_ELEMENTS(mHWData->mCpuIdStdLeafs); i++)
         mHWData->mCpuIdStdLeafs[i].ulId = UINT32_MAX;
@@ -2290,11 +2298,9 @@ STDMETHODIMP Machine::AttachDevice(IN_BSTR aControllerName,
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
 
-    /* VirtualBox::findHardDisk() and the corresponding other methods for
-     * DVD and floppy media need *write* lock (for getting rid of unneeded
-     * host drives which got enumerated); also we want to make sure the
-     * media object we pick up doesn't get unregistered before we finish. */
-    AutoMultiWriteLock2 alock(mParent, this);
+    // request the host lock first, since might be calling Host methods for getting host drives;
+    // next, protect the media tree all the while we're in here, as well as our member variables
+    AutoMultiWriteLock3 alock(mParent->host(), mParent, this);
 
     HRESULT rc = checkStateDependency(MutableStateDep);
     CheckComRCReturnRC(rc);
@@ -6108,11 +6114,6 @@ HRESULT Machine::loadStorageControllers(const settings::Storage &data,
 
     HRESULT rc = S_OK;
 
-    /* Make sure the attached hard disks don't get unregistered until we
-     * associate them with tis machine (important for VMs loaded (opened) after
-     * VirtualBox startup) */
-    AutoReadLock vboxLock(mParent);
-
     for (settings::StorageControllersList::const_iterator it = data.llStorageControllers.begin();
          it != data.llStorageControllers.end();
          ++it)
@@ -9720,7 +9721,6 @@ bool SessionMachine::hasMatchingUSBFilter (const ComObjPtr<HostUSBDevice> &aDevi
     if (!autoCaller.isOk())
         return false;
 
-    AssertReturn(isWriteLockOnCurrentThread(), false);
 
 #ifdef VBOX_WITH_USB
     switch (mData->mMachineState)
diff --git a/src/VBox/Main/Makefile.kmk b/src/VBox/Main/Makefile.kmk
index c48836ca8..dfe861592 100644
--- a/src/VBox/Main/Makefile.kmk
+++ b/src/VBox/Main/Makefile.kmk
@@ -44,7 +44,7 @@ ifdef VBOX_ONLY_SDK
  # I'm Evil! Dr. Evil.
  include $(KBUILD_PATH)/tools/VCC70.kmk
  include $(KBUILD_PATH)/sdks/WINPSDK.kmk
-endif #!VBOX_ONLY_SDK
+endif # !VBOX_ONLY_SDK
 
 
 # Construct VBOX_MAIN_DEFS
@@ -55,10 +55,11 @@ ifneq ($(KBUILD_TARGET),win)
   $(error "VBox: VBOX_WITH_XPCOM isn't defined")
  endif
  ifneq ($(KBUILD_TARGET),os2)
-  VBOX_MAIN_DEFS+= VBOX_WITH_SYS_V_IPC_SESSION_WATCHER
+  VBOX_MAIN_DEFS += VBOX_WITH_SYS_V_IPC_SESSION_WATCHER
  endif
 endif
 VBOX_MAIN_DEFS += \
+	$(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
 	$(if $(VBOX_WITH_NETFLT),VBOX_WITH_NETFLT,) \
 	$(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL,) \
 	$(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,) \
diff --git a/src/VBox/Main/MediumImpl.cpp b/src/VBox/Main/MediumImpl.cpp
index 81b94e385..b03eb882e 100644
--- a/src/VBox/Main/MediumImpl.cpp
+++ b/src/VBox/Main/MediumImpl.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -388,9 +388,12 @@ public:
         {
             AutoWriteLock alock(*it);
             Assert((*it)->m->state == MediumState_LockedWrite ||
+                   (*it)->m->state == MediumState_LockedRead ||
                    (*it)->m->state == MediumState_Deleting);
             if ((*it)->m->state == MediumState_LockedWrite)
                 (*it)->UnlockWrite(NULL);
+            else if ((*it)->m->state == MediumState_LockedRead)
+                (*it)->UnlockRead(NULL);
             else
                 (*it)->m->state = MediumState_Created;
 
@@ -446,6 +449,20 @@ public:
 
                 mParent = aMedium->mParent;
             }
+
+            /* Include all images from base to source. */
+            ComObjPtr <Medium> pParent = aMedium->getParent();
+            while (!pParent.isNull())
+            {
+                rc = pParent->addCaller();
+                if (FAILED(rc)) return rc;
+
+                rc = pParent->LockRead(NULL);
+                if (FAILED(rc)) return rc;
+
+                push_front(pParent);
+                pParent = pParent->getParent();
+            }
         }
         else
         {
@@ -469,6 +486,8 @@ public:
             }
         }
 
+        mSource = aMedium;
+
         return S_OK;
     }
 
@@ -499,6 +518,8 @@ public:
 
         push_front(aMedium);
 
+        mTarget = aMedium;
+
         return S_OK;
     }
 
@@ -532,15 +553,53 @@ public:
         return S_OK;
     }
 
+    int targetIdx()
+    {
+        Assert(!mTarget.isNull());
+        int idx = 0;
+
+        for (List::const_iterator it = begin(); it != end(); ++it)
+        {
+            ComObjPtr<Medium> pMedium = *it;
+
+            /* Do we have the target? */
+            if (pMedium == mTarget)
+                break;
+
+            idx++;
+        }
+
+        return idx;
+    }
+
+    int sourceIdx()
+    {
+        Assert(!mSource.isNull());
+        int idx = 0;
+
+        for (List::const_iterator it = begin(); it != end(); ++it)
+        {
+            ComObjPtr<Medium> pMedium = *it;
+
+            /* Do we have the source? */
+            if (pMedium == mSource)
+                break;
+
+            idx++;
+        }
+
+        return idx;
+    }
+
     bool isForward() const { return mForward; }
     Medium *parent() const { return mParent; }
     const List &children() const { return mChildren; }
 
     Medium *source() const
-    { AssertReturn(size() > 0, NULL); return mForward ? front() : back(); }
+    { AssertReturn(size() > 0, NULL); return mSource; }
 
     Medium *target() const
-    { AssertReturn(size() > 0, NULL); return mForward ? back() : front(); }
+    { AssertReturn(size() > 0, NULL); return mTarget; }
 
 protected:
 
@@ -606,6 +665,10 @@ private:
     ComObjPtr <Medium> mParent;
     /** Children of the source when backward merge (if any) */
     List mChildren;
+    /** Source image */
+    ComObjPtr <Medium> mSource;
+    /** Target image */
+    ComObjPtr <Medium> mTarget;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -822,6 +885,8 @@ HRESULT Medium::FinalConstruct()
     m->vdIfCallsTcpNet.pfnRead = RTTcpRead;
     m->vdIfCallsTcpNet.pfnWrite = RTTcpWrite;
     m->vdIfCallsTcpNet.pfnFlush = RTTcpFlush;
+    m->vdIfCallsTcpNet.pfnGetLocalAddress = RTTcpGetLocalAddress;
+    m->vdIfCallsTcpNet.pfnGetPeerAddress = RTTcpGetPeerAddress;
 
     /* Initialize the per-disk interface chain */
     int vrc;
@@ -2002,20 +2067,13 @@ STDMETHODIMP Medium::UnlockWrite(MediumState_T *aState)
 
 STDMETHODIMP Medium::Close()
 {
-    AutoMayUninitSpan mayUninitSpan(this);
-    CheckComRCReturnRC(mayUninitSpan.rc());
-
-    if (mayUninitSpan.alreadyInProgress())
-        return S_OK;
-
     /* unregisterWithVirtualBox() is assumed to always need a write mVirtualBox
-     * lock as it is intenede to modify its internal structires. Also, we want
+     * lock as it is intended to modify its internal structires. Also, we want
      * to unregister ourselves atomically after detecting that closure is
      * possible to make sure that we don't do that after another thread has done
      * VirtualBox::find*() but before it starts using us (provided that it holds
-     * a mVirtualBox lock of course). */
-
-    AutoWriteLock vboxLock(mVirtualBox);
+     * a mVirtualBox lock of course). Additionally get hard disk tree lock. */
+    AutoMultiWriteLock2 alock(mVirtualBox->lockHandle(), this->getTreeLock());
 
     bool wasCreated = true;
 
@@ -2049,8 +2107,9 @@ STDMETHODIMP Medium::Close()
         CheckComRCReturnRC(rc);
     }
 
-    /* cause uninit() to happen on success */
-    mayUninitSpan.acceptUninit();
+    /* Keep the locks held, as otherwise the consistency of the medium tree
+     * cannot be guaranteed. Just continue with uninitialization. */
+    uninit();
 
     return S_OK;
 }
@@ -4618,9 +4677,6 @@ HRESULT Medium::setFormat(CBSTR aFormat)
 }
 
 /**
- * @note Called from this object's AutoMayUninitSpan and from under mVirtualBox
- *       write lock.
- *
  * @note Also reused by Medium::Reset().
  *
  * @note Locks getTreeLock() for reading.
@@ -4639,9 +4695,6 @@ HRESULT Medium::canClose()
 }
 
 /**
- * @note Called from within this object's AutoMayUninitSpan (or AutoCaller) and
- *       from under mVirtualBox write lock.
- *
  * @note Locks getTreeLock() for writing.
  */
 HRESULT Medium::unregisterWithVirtualBox()
@@ -5199,28 +5252,41 @@ DECLCALLBACK(int) Medium::taskThread(RTTHREAD thread, void *pvUser)
                     for (MergeChain::const_iterator it = chain->begin();
                          it != chain->end(); ++ it)
                     {
-                        /* complex sanity (sane complexity) */
-                        Assert((chain->isForward() &&
-                                ((*it != chain->back() &&
-                                  (*it)->m->state == MediumState_Deleting) ||
-                                 (*it == chain->back() &&
-                                  (*it)->m->state == MediumState_LockedWrite))) ||
-                               (!chain->isForward() &&
-                                ((*it != chain->front() &&
-                                  (*it)->m->state == MediumState_Deleting) ||
-                                 (*it == chain->front() &&
-                                  (*it)->m->state == MediumState_LockedWrite))));
-
-                        Assert(*it == chain->target() ||
-                               (*it)->m->backRefs.size() == 0);
-
-                        /* open the first image with VDOPEN_FLAGS_INFO because
-                         * it's not necessarily the base one */
+                        /*
+                         * complex sanity (sane complexity)
+                         *
+                         * The current image must be in the Deleting (image is merged)
+                         * or LockedRead (parent image) state if it is not the target.
+                         * If it is the target it must be in the LockedWrite state.
+                         */
+                        Assert(   (   *it != chain->target()
+                                   && (   (*it)->m->state == MediumState_Deleting
+                                       || (*it)->m->state == MediumState_LockedRead))
+                               || (   *it == chain->target()
+                                   && (*it)->m->state == MediumState_LockedWrite));
+
+                        /*
+                         * Image must be the target, in the LockedRead state
+                         * or Deleting state where it is not allowed to be attached
+                         * to a virtual machine.
+                         */
+                        Assert(   *it == chain->target()
+                               || (*it)->m->state == MediumState_LockedRead
+                               || (   (*it)->m->backRefs.size() == 0
+                                   && (*it)->m->state == MediumState_Deleting)
+                              );
+
+                        unsigned uOpenFlags = 0;
+
+                        if (   (*it)->m->state == MediumState_LockedRead
+                            || (*it)->m->state == MediumState_Deleting)
+                            uOpenFlags = VD_OPEN_FLAGS_READONLY;
+
+                        /* Open the image */
                         vrc = VDOpen(hdd, (*it)->m->strFormat.c_str(),
-                                      (*it)->m->strLocationFull.c_str(),
-                                      it == chain->begin() ?
-                                          VD_OPEN_FLAGS_INFO : 0,
-                                      (*it)->m->vdDiskIfaces);
+                                     (*it)->m->strLocationFull.c_str(),
+                                     uOpenFlags,
+                                     (*it)->m->vdDiskIfaces);
                         if (RT_FAILURE(vrc))
                             throw vrc;
 #if 0
@@ -5228,29 +5294,17 @@ DECLCALLBACK(int) Medium::taskThread(RTTHREAD thread, void *pvUser)
 #endif
                     }
 
-                    unsigned start = chain->isForward() ?
-                        0 : (unsigned)chain->size() - 1;
-                    unsigned end = chain->isForward() ?
-                        (unsigned)chain->size() - 1 : 0;
 #if 0
-                    LogFlow(("*** MERGE from %d to %d\n", start, end));
+                    LogFlow(("*** MERGE from %d to %d\n", chain->sourceIdx(), chain->targetIdx()));
 #endif
-                    vrc = VDMerge(hdd, start, end, vdOperationIfaces);
+                    vrc = VDMerge(hdd, chain->sourceIdx(), chain->targetIdx(), vdOperationIfaces);
                     if (RT_FAILURE(vrc))
                         throw vrc;
 
                     /* update parent UUIDs */
-                    /// @todo VDMerge should be taught to do so, including the
+                    /// @todo VDMerge should handle the
                     /// multiple children case
-                    if (chain->isForward())
-                    {
-                        /* target's UUID needs to be updated (note that target
-                         * is the only image in the container on success) */
-                        vrc = VDSetParentUuid(hdd, 0, chain->parent()->m->id);
-                        if (RT_FAILURE(vrc))
-                            throw vrc;
-                    }
-                    else
+                    if (!chain->isForward())
                     {
                         /* we need to update UUIDs of all source's children
                          * which cannot be part of the container at once so
@@ -5381,7 +5435,8 @@ DECLCALLBACK(int) Medium::taskThread(RTTHREAD thread, void *pvUser)
                     for (MergeChain::iterator it = chain->begin();
                          it != chain->end();)
                     {
-                        if (*it == chain->target())
+                        if (   *it == chain->target()
+                            || (*it)->m->state == MediumState_LockedRead)
                         {
                             ++ it;
                             continue;
diff --git a/src/VBox/Main/MouseImpl.cpp b/src/VBox/Main/MouseImpl.cpp
index c9f3a2b44..b59ff58b2 100644
--- a/src/VBox/Main/MouseImpl.cpp
+++ b/src/VBox/Main/MouseImpl.cpp
@@ -254,8 +254,8 @@ STDMETHODIMP Mouse::PutMouseEvent(LONG dx, LONG dy, LONG dz, LONG dw, LONG butto
  * when the required guest support has been installed.
  *
  * @returns COM status code
- * @param x          X position (pixel)
- * @param y          Y position (pixel)
+ * @param x          X position (pixel), starting from 1
+ * @param y          Y position (pixel), starting from 1
  * @param dz         Z movement
  * @param buttonState The mouse button state
  */
@@ -302,8 +302,8 @@ STDMETHODIMP Mouse::PutMouseEventAbsolute(LONG x, LONG y, LONG dz, LONG dw,
     rc = pDisplay->COMGETTER(Height)(&displayHeight);
     ComAssertComRCRet (rc, rc);
 
-    uint32_t mouseXAbs = displayWidth? (x * 0xFFFF) / displayWidth: 0;
-    uint32_t mouseYAbs = displayHeight? (y * 0xFFFF) / displayHeight: 0;
+    uint32_t mouseXAbs = displayWidth? ((x - 1) * 0xFFFF) / displayWidth: 0;
+    uint32_t mouseYAbs = displayHeight? ((y - 1) * 0xFFFF) / displayHeight: 0;
 
     /*
      * Send the absolute mouse position to the VMM device.
diff --git a/src/VBox/Main/NetworkAdapterImpl.cpp b/src/VBox/Main/NetworkAdapterImpl.cpp
index 0632659eb..294324739 100644
--- a/src/VBox/Main/NetworkAdapterImpl.cpp
+++ b/src/VBox/Main/NetworkAdapterImpl.cpp
@@ -435,7 +435,7 @@ STDMETHODIMP NetworkAdapter::COMSETTER(HostInterface)(IN_BSTR aHostInterface)
         /* leave the lock before informing callbacks */
         alock.unlock();
 
-        mParent->onNetworkAdapterChange (this, FALSE);
+        mParent->onNetworkAdapterChange (this, TRUE);
     }
 
     return S_OK;
@@ -483,7 +483,7 @@ STDMETHODIMP NetworkAdapter::COMSETTER(InternalNetwork) (IN_BSTR aInternalNetwor
         /* leave the lock before informing callbacks */
         alock.unlock();
 
-        mParent->onNetworkAdapterChange (this, FALSE);
+        mParent->onNetworkAdapterChange (this, TRUE);
     }
 
     return S_OK;
diff --git a/src/VBox/Main/VirtualBoxBase.cpp b/src/VBox/Main/VirtualBoxBase.cpp
index 43413e371..e0aef4773 100644
--- a/src/VBox/Main/VirtualBoxBase.cpp
+++ b/src/VBox/Main/VirtualBoxBase.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -126,12 +126,6 @@ RWLockHandle *VirtualBoxBaseProto::lockHandle() const
  * until the AutoInitSpan destructor signals that it has finished
  * initialization.
  *
- * Also, addCaller() will block if the object is probing uninitialization on
- * another thread with AutoMayUninitSpan (i.e. the object state is MayUninit).
- * And again, the block will last until the AutoMayUninitSpan destructor signals
- * that it has finished probing and the object is either ready again or will
- * uninitialize shortly (so that addCaller() will fail).
- *
  * When this method returns a failure, the caller must not use the object
  * and should return the failed result code to its own caller.
  *
@@ -163,31 +157,25 @@ HRESULT VirtualBoxBaseProto::addCaller (State *aState /* = NULL */,
         rc = S_OK;
     }
     else
-    if (mState == InInit || mState == MayUninit || mState == InUninit)
+    if (mState == InInit || mState == InUninit)
     {
         if (mStateChangeThread == RTThreadSelf())
         {
             /* Called from the same thread that is doing AutoInitSpan or
-             * AutoUninitSpan or AutoMayUninitSpan, just succeed */
+             * AutoUninitSpan, just succeed */
             rc = S_OK;
         }
-        else if (mState == InInit || mState == MayUninit)
+        else if (mState == InInit)
         {
-            /* One of the two:
-             *
-             * 1) addCaller() is called by a "child" thread while the "parent"
-             *    thread is still doing AutoInitSpan/AutoReinitSpan, so wait for
-             *    the state to become either Ready/Limited or InitFailed (in
-             *    case of init failure).
-             *
-             * 2) addCaller() is called while another thread is in
-             *    AutoMayUninitSpan, so wait for the state to become either
-             *    Ready or WillUninit.
+            /* addCaller() is called by a "child" thread while the "parent"
+             * thread is still doing AutoInitSpan/AutoReinitSpan, so wait for
+             * the state to become either Ready/Limited or InitFailed (in
+             * case of init failure).
              *
-             * Note that in either case we increase the number of callers anyway
-             * -- to prevent AutoUninitSpan from early completion if we are
-             * still not scheduled to pick up the posted semaphore when uninit()
-             * is called.
+             * Note that we increase the number of callers anyway -- to
+             * prevent AutoUninitSpan from early completion if we are
+             * still not scheduled to pick up the posted semaphore when
+             * uninit() is called.
              */
             ++ mCallers;
 
@@ -200,10 +188,7 @@ HRESULT VirtualBoxBaseProto::addCaller (State *aState /* = NULL */,
 
             ++ mInitUninitWaiters;
 
-            LogFlowThisFunc((mState == InInit ?
-                              "Waiting for AutoInitSpan/AutoReinitSpan to "
-                              "finish...\n" :
-                              "Waiting for AutoMayUninitSpan to finish...\n"));
+            LogFlowThisFunc(("Waiting for AutoInitSpan/AutoReinitSpan to finish...\n"));
 
             stateLock.leave();
             RTSemEventMultiWait (mInitUninitSem, RT_INDEFINITE_WAIT);
@@ -256,19 +241,18 @@ void VirtualBoxBaseProto::releaseCaller()
         return;
     }
 
-    if (mState == InInit || mState == MayUninit || mState == InUninit)
+    if (mState == InInit || mState == InUninit)
     {
         if (mStateChangeThread == RTThreadSelf())
         {
-            /* Called from the same thread that is doing AutoInitSpan,
-             * AutoMayUninitSpan or AutoUninitSpan: just succeed */
+            /* Called from the same thread that is doing AutoInitSpan or
+             * AutoUninitSpan: just succeed */
             return;
         }
 
-        if (mState == MayUninit || mState == InUninit)
+        if (mState == InUninit)
         {
-            /* the caller is being released after AutoUninitSpan or
-             * AutoMayUninitSpan has begun */
+            /* the caller is being released after AutoUninitSpan has begun */
             AssertMsgReturn (mCallers != 0, ("mCallers is ZERO!"), (void) 0);
             -- mCallers;
 
@@ -529,113 +513,7 @@ VirtualBoxBaseProto::AutoUninitSpan::~AutoUninitSpan()
     mObj->setState (NotReady);
 }
 
-// VirtualBoxBaseProto::AutoMayUninitSpan methods
 ////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Creates a smart initialization span object that places the object to
- * MayUninit state.
- *
- * Please see the AutoMayUninitSpan class description for more info.
- *
- * @param aObj      |this| pointer of the managed VirtualBoxBase object whose
- *                  uninit() method to be probably called.
- */
-VirtualBoxBaseProto::AutoMayUninitSpan::
-AutoMayUninitSpan (VirtualBoxBaseProto *aObj)
-    : mObj (aObj), mRC (E_FAIL), mAlreadyInProgress (false)
-    , mAcceptUninit (false)
-{
-    Assert (aObj);
-
-    AutoWriteLock stateLock (mObj->mStateLock);
-
-    AssertReturnVoid (mObj->mState != InInit &&
-                      mObj->mState != InUninit);
-
-    switch (mObj->mState)
-    {
-        case Ready:
-            break;
-        case MayUninit:
-            /* Nothing to be done if already in MayUninit. */
-            mAlreadyInProgress = true;
-            mRC = S_OK;
-            return;
-        default:
-            /* Abuse mObj->addCaller() to get the extended error info possibly
-             * set by reimplementations of addCaller() and return it to the
-             * caller. Note that this abuse is supposed to be safe because we
-             * should've filtered out all states where addCaller() would do
-             * something else but set error info. */
-            mRC = mObj->addCaller();
-            Assert (FAILED (mRC));
-            return;
-    }
-
-    /* go to MayUninit to cause new callers to wait until we finish */
-    mObj->setState (MayUninit);
-    mRC = S_OK;
-
-    /* wait for already existing callers to drop to zero */
-    if (mObj->mCallers > 0)
-    {
-        /* lazy creation */
-        Assert (mObj->mZeroCallersSem == NIL_RTSEMEVENT);
-        RTSemEventCreate (&mObj->mZeroCallersSem);
-
-        /* wait until remaining callers release the object */
-        LogFlowFunc (("{%p}: Waiting for callers (%d) to drop to zero...\n",
-                      mObj, mObj->mCallers));
-
-        stateLock.leave();
-        RTSemEventWait (mObj->mZeroCallersSem, RT_INDEFINITE_WAIT);
-    }
-}
-
-/**
- * Places the managed VirtualBoxBase object back to Ready state if
- * #acceptUninit() was not called, or places it to WillUninit state and calls
- * the object's uninit() method.
- *
- * Please see the AutoMayUninitSpan class description for more info.
- */
-VirtualBoxBaseProto::AutoMayUninitSpan::~AutoMayUninitSpan()
-{
-    /* if we did nothing in the constructor, do nothing here */
-    if (mAlreadyInProgress || FAILED (mRC))
-        return;
-
-    AutoWriteLock stateLock (mObj->mStateLock);
-
-    Assert (mObj->mState == MayUninit);
-
-    if (mObj->mCallers > 0)
-    {
-        Assert (mObj->mInitUninitWaiters > 0);
-
-        /* We have some pending addCaller() calls on other threads made after
-         * going to during MayUnit, signal that MayUnit is finished and they may
-         * go on. */
-        RTSemEventMultiSignal (mObj->mInitUninitSem);
-    }
-
-    if (!mAcceptUninit)
-    {
-        mObj->setState (Ready);
-    }
-    else
-    {
-        mObj->setState (WillUninit);
-        /* leave the lock to prevent nesting when uninit() is called */
-        stateLock.leave();
-        /* call uninit() to let the object uninit itself */
-        mObj->uninit();
-        /* Note: the object may no longer exist here (for example, it can call
-         * the destructor in uninit()) */
-    }
-}
-
 // VirtualBoxBase methods
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/VBox/Main/darwin/NetIf-darwin.cpp b/src/VBox/Main/darwin/NetIf-darwin.cpp
index 3ddb23262..9ba45ef97 100644
--- a/src/VBox/Main/darwin/NetIf-darwin.cpp
+++ b/src/VBox/Main/darwin/NetIf-darwin.cpp
@@ -339,7 +339,7 @@ int NetIfList(std::list <ComObjPtr<HostNetworkInterface> > &list)
             if (   !strncmp(pSdl->sdl_data, pNIC->szBSDName, pSdl->sdl_nlen)
                 && pNIC->szBSDName[pSdl->sdl_nlen] == '\0')
             {
-                cbNameLen = strlen(pEtherNICs->szName) + 1;
+                cbNameLen = strlen(pNIC->szName) + 1;
                 break;
             }
         PNETIFINFO pNew = (PNETIFINFO)RTMemAllocZ(RT_OFFSETOF(NETIFINFO, szName[cbNameLen]));
diff --git a/src/VBox/Main/include/MediumImpl.h b/src/VBox/Main/include/MediumImpl.h
index 2fbe8d40a..1ccdd03be 100644
--- a/src/VBox/Main/include/MediumImpl.h
+++ b/src/VBox/Main/include/MediumImpl.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -277,14 +277,13 @@ private:
     /**
      * Performs extra checks if the medium can be closed and returns S_OK in
      * this case. Otherwise, returns a respective error message. Called by
-     * Close() from within this object's AutoMayUninitSpan and from under
-     * mVirtualBox write lock.
+     * Close() under the medium tree lock and the medium lock.
      */
     HRESULT canClose();
 
     /**
-     * Unregisters this medium with mVirtualBox. Called by Close() from within
-     * this object's AutoMayUninitSpan and from under mVirtualBox write lock.
+     * Unregisters this medium with mVirtualBox. Called by Close() under
+     * the medium tree lock.
      */
     HRESULT unregisterWithVirtualBox();
 
diff --git a/src/VBox/Main/include/VirtualBoxBase.h b/src/VBox/Main/include/VirtualBoxBase.h
index ee9bd7bc3..78bd803b1 100644
--- a/src/VBox/Main/include/VirtualBoxBase.h
+++ b/src/VBox/Main/include/VirtualBoxBase.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -507,11 +507,11 @@ public:
  *              |              ^                              |         |
  *              v              |                              v         |
  *  [*] ---> NotReady ----> (InInit) -----> Ready -----> (InUninit) ----+
- *                     ^       |      ^       |               ^
- *                     |       v      |       v               |
- *                     |    Limited   |  (MayUninit) --> (WillUninit)
- *                     |       |      |       |
- *                     +-------+      +-------+
+ *                     ^       |
+ *                     |       v
+ *                     |    Limited
+ *                     |       |
+ *                     +-------+
  *
  * The object is fully operational only when its state is Ready. The Limited
  * state means that only some vital part of the object is operational, and it
@@ -529,12 +529,8 @@ public:
  * Limited->InInit->InitFailed transition is done by the AutoReinitSpan smart
  * class.
  *
- * The Ready->InUninit->NotReady, InitFailed->InUninit->NotReady and
- * WillUninit->InUninit->NotReady transitions are done by the AutoUninitSpan
- * smart class.
- *
- * The Ready->MayUninit->Ready and Ready->MayUninit->WillUninit transitions are
- * done by the AutoMayUninitSpan smart class.
+ * The Ready->InUninit->NotReady and InitFailed->InUninit->NotReady
+ * transitions are done by the AutoUninitSpan smart class.
  *
  * In order to maintain the primary state integrity and declared functionality
  * all subclasses must:
@@ -552,9 +548,7 @@ public:
 class ATL_NO_VTABLE VirtualBoxBaseProto : public Lockable
 {
 public:
-
-    enum State { NotReady, Ready, InInit, InUninit, InitFailed, Limited,
-                 MayUninit, WillUninit };
+    enum State { NotReady, Ready, InInit, InUninit, InitFailed, Limited };
 
 protected:
 
diff --git a/src/VBox/Main/webservice/vboxweb.cpp b/src/VBox/Main/webservice/vboxweb.cpp
index 9c8131d63..6041d6f2d 100644
--- a/src/VBox/Main/webservice/vboxweb.cpp
+++ b/src/VBox/Main/webservice/vboxweb.cpp
@@ -30,8 +30,6 @@
 #include <VBox/com/EventQueue.h>
 #include <VBox/VRDPAuth.h>
 #include <VBox/version.h>
-
-#include <iprt/lock.h>
 #include <iprt/rand.h>
 #include <iprt/initterm.h>
 #include <iprt/getopt.h>
@@ -39,6 +37,7 @@
 #include <iprt/process.h>
 #include <iprt/string.h>
 #include <iprt/ldr.h>
+#include <iprt/semaphore.h>
 
 // workaround for compile problems on gcc 4.1
 #ifdef __GNUC__
@@ -50,6 +49,7 @@
 
 // standard headers
 #include <map>
+#include <list>
 
 #ifdef __GNUC__
 #pragma GCC visibility pop
@@ -99,6 +99,7 @@ int                     g_iWatchdogCheckInterval = 5;
 const char              *g_pcszBindToHost = NULL;       // host; NULL = current machine
 unsigned int            g_uBindToPort = 18083;          // port
 unsigned int            g_uBacklog = 100;               // backlog = max queue size for requests
+unsigned int            g_cMaxWorkerThreads = 100;      // max. no. of worker threads
 
 bool                    g_fVerbose = false;             // be verbose
 PRTSTREAM               g_pstrLog = NULL;
@@ -113,18 +114,27 @@ bool                    g_fDaemonize = false;           // run in background.
  *
  ****************************************************************************/
 
-RTLockMtx           g_mutexAuthLib;
+// The one global SOAP queue created by main().
+class SoapQ;
+SoapQ               *g_pSoapQ = NULL;
+
+// this mutex protects the auth lib and authentication
+RTLockMtx           *g_pAuthLibLockHandle;
 
 // this mutex protects all of the below
-RTLockMtx           g_mutexSessions;
+RTLockMtx           *g_pSessionsLockHandle;
 
 SessionsMap         g_mapSessions;
 ULONG64             g_iMaxManagedObjectID = 0;
 ULONG64             g_cManagedObjects = 0;
 
+// Threads map, so we can quickly map an RTTHREAD struct to a logger prefix
+typedef std::map<RTTHREAD, com::Utf8Str> ThreadsMap;
+ThreadsMap          g_mapThreads;
+
 /****************************************************************************
  *
- *  main
+ *  Command line help
  *
  ****************************************************************************/
 
@@ -138,6 +148,7 @@ static const RTGETOPTDEF g_aOptions[]
         { "--port",             'p', RTGETOPT_REQ_UINT32 },
         { "--timeout",          't', RTGETOPT_REQ_UINT32 },
         { "--check-interval",   'i', RTGETOPT_REQ_UINT32 },
+        { "--threads",          'T', RTGETOPT_REQ_UINT32 },
         { "--verbose",          'v', RTGETOPT_REQ_NOTHING },
         { "--logfile",          'F', RTGETOPT_REQ_STRING },
     };
@@ -180,6 +191,10 @@ void DisplayHelp()
                 pcszDescr = "Session timeout in seconds; 0 = disable timeouts (" DEFAULT_TIMEOUT_SECS_STRING ").";
             break;
 
+            case 'T':
+                pcszDescr = "Maximum number of worker threads to run in parallel (100).";
+            break;
+
             case 'i':
                 pcszDescr = "Frequency of timeout checks in seconds (5).";
             break;
@@ -197,6 +212,229 @@ void DisplayHelp()
     }
 }
 
+/****************************************************************************
+ *
+ * SoapQ, SoapThread (multithreading)
+ *
+ ****************************************************************************/
+
+class SoapQ;
+
+class SoapThread
+{
+public:
+    /**
+     * Constructor. Creates the new thread and makes it call process() for processing the queue.
+     * @param u Thread number. (So we can count from 1 and be readable.)
+     * @param q SoapQ instance which has the queue to process.
+     * @param soap struct soap instance from main() which we copy here.
+     */
+    SoapThread(size_t u,
+               SoapQ &q,
+               const struct soap *soap)
+        : m_u(u),
+          m_pQ(&q)
+    {
+        // make a copy of the soap struct for the new thread
+        m_soap = soap_copy(soap);
+
+        if (!RT_SUCCESS(RTThreadCreate(&m_pThread,
+                                       fntWrapper,
+                                       this,             // pvUser
+                                       0,               // cbStack,
+                                       RTTHREADTYPE_MAIN_HEAVY_WORKER,
+                                       0,
+                                       "SoapQWorker")))
+        {
+            RTStrmPrintf(g_pStdErr, "[!] Cannot start worker thread %d\n", u);
+            exit(1);
+        }
+    }
+
+    void process();
+
+    /**
+     * Static function that can be passed to RTThreadCreate and that calls
+     * process() on the SoapThread instance passed as the thread parameter.
+     * @param pThread
+     * @param pvThread
+     * @return
+     */
+    static int fntWrapper(RTTHREAD pThread, void *pvThread)
+    {
+        SoapThread *pst = (SoapThread*)pvThread;
+        pst->process();     // this never returns really
+        return 0;
+    }
+
+    size_t      m_u;            // thread number
+    SoapQ       *m_pQ;          // the single SOAP queue that all the threads service
+    struct soap *m_soap;        // copy of the soap structure for this thread (from soap_copy())
+    RTTHREAD    m_pThread;      // IPRT thread struct for this thread
+};
+
+/**
+ * SOAP queue encapsulation. There is only one instance of this, to
+ * which add() adds a queue item (called on the main thread),
+ * and from which get() fetch items, called from each queue thread.
+ */
+class SoapQ
+{
+public:
+
+    /**
+     * Constructor. Creates the soap queue.
+     * @param pSoap
+     */
+    SoapQ(const struct soap *pSoap)
+        : m_soap(pSoap),
+          m_cIdleThreads(0)
+    {
+        RTSemEventMultiCreate(&m_event);
+    }
+
+    ~SoapQ()
+    {
+        RTSemEventMultiDestroy(m_event);
+    }
+
+    /**
+     * Adds the given socket to the SOAP queue and posts the
+     * member event sem to wake up the workers. Called on the main thread
+     * whenever a socket has work to do. Creates a new SOAP thread on the
+     * first call or when all existing threads are busy.
+     * @param s Socket from soap_accept() which has work to do.
+     */
+    uint32_t add(int s)
+    {
+        uint32_t cItems;
+        RTLock qlock(m_mutex);
+
+        // if no threads have yet been created, or if all threads are busy,
+        // create a new SOAP thread
+        if (    !m_cIdleThreads
+                // but only if we're not exceeding the global maximum (default is 100)
+             && (m_llAllThreads.size() < g_cMaxWorkerThreads)
+           )
+        {
+            SoapThread *pst = new SoapThread(m_llAllThreads.size() + 1,
+                                             *this,
+                                             m_soap);
+            m_llAllThreads.push_back(pst);
+            g_mapThreads[pst->m_pThread] = com::Utf8StrFmt("[%3u]", pst->m_u);
+            ++m_cIdleThreads;
+        }
+
+        // enqueue the socket of this connection and post eventsem so that
+        // one of the threads (possibly the one just creatd) can pick it up
+        m_llSocketsQ.push_back(s);
+        cItems = m_llSocketsQ.size();
+        qlock.release();
+
+        // unblock one of the worker threads
+        RTSemEventMultiSignal(m_event);
+
+        return cItems;
+    }
+
+    /**
+     * Blocks the current thread until work comes in; then returns
+     * the SOAP socket which has work to do. This reduces m_cIdleThreads
+     * by one, and the caller MUST call done() when it's done processing.
+     * Called from the worker threads.
+     * @param cIdleThreads out: no. of threads which are currently idle (not counting the caller)
+     * @param cThreads out: total no. of SOAP threads running
+     * @return
+     */
+    int get(size_t &cIdleThreads, size_t &cThreads)
+    {
+        while (1)
+        {
+            // wait for something to happen
+            RTSemEventMultiWait(m_event, RT_INDEFINITE_WAIT);
+
+            RTLock qlock(m_mutex);
+            if (m_llSocketsQ.size())
+            {
+                int socket = m_llSocketsQ.front();
+                m_llSocketsQ.pop_front();
+                cIdleThreads = --m_cIdleThreads;
+                cThreads = m_llAllThreads.size();
+
+                // reset the multi event only if the queue is now empty; otherwise
+                // another thread will also wake up when we release the mutex and
+                // process another one
+                if (m_llSocketsQ.size() == 0)
+                    RTSemEventMultiReset(m_event);
+
+                qlock.release();
+
+                return socket;
+            }
+
+            // nothing to do: keep looping
+        }
+    }
+
+    /**
+     * To be called by a worker thread after fetching an item from the
+     * queue via get() and having finished its lengthy processing.
+     */
+    void done()
+    {
+        RTLock qlock(m_mutex);
+        ++m_cIdleThreads;
+    }
+
+    const struct soap       *m_soap;            // soap structure created by main(), passed to constructor
+
+    RTLockMtx               m_mutex;
+    RTSEMEVENTMULTI         m_event;            // posted by add(), blocked on by get()
+
+    std::list<SoapThread*>  m_llAllThreads;     // all the threads created by the constructor
+    size_t                  m_cIdleThreads;     // threads which are currently idle (statistics)
+
+    // A std::list abused as a queue; this contains the actual jobs to do,
+    // each int being a socket from soap_accept()
+    std::list<int>          m_llSocketsQ;
+};
+
+/**
+ * Thread function for each of the SOAP queue worker threads. This keeps
+ * running, blocks on the event semaphore in SoapThread.SoapQ and picks
+ * up a socket from the queue therein, which has been put there by
+ * beginProcessing().
+ */
+void SoapThread::process()
+{
+    WebLog("New SOAP thread started\n");
+
+    while (1)
+    {
+        // wait for a socket to arrive on the queue
+        size_t cIdleThreads, cThreads;
+        m_soap->socket = m_pQ->get(cIdleThreads, cThreads);
+
+        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,
+               (m_soap->ip >> 8)  & 0xFF,
+               m_soap->ip         & 0xFF,
+               m_soap->socket,
+               cIdleThreads,
+               cThreads);
+
+        // process the request; this goes into the COM code in methodmaps.cpp
+        soap_serve(m_soap);
+
+        soap_destroy(m_soap); // clean up class instances
+        soap_end(m_soap); // clean up everything and close socket
+
+        // tell the queue we're idle again
+        m_pQ->done();
+    }
+}
+
 /**
  * Implementation for WEBLOG macro defined in vboxweb.h; this prints a message
  * to the console and optionally to the file that may have been given to the
@@ -211,18 +449,23 @@ void WebLog(const char *pszFormat, ...)
     RTStrAPrintfV(&psz, pszFormat, args);
     va_end(args);
 
+    const char *pcszPrefix = "[   ]";
+    ThreadsMap::iterator it = g_mapThreads.find(RTThreadSelf());
+    if (it != g_mapThreads.end())
+        pcszPrefix = it->second.c_str();
+
     // terminal
-    RTPrintf("%s", psz);
+    RTPrintf("%s %s", pcszPrefix, psz);
 
     // log file
     if (g_pstrLog)
     {
-        RTStrmPrintf(g_pstrLog, "%s", psz);
+        RTStrmPrintf(g_pstrLog, "%s %s", pcszPrefix, psz);
         RTStrmFlush(g_pstrLog);
     }
 
     // logger instance
-    RTLogLoggerEx(LOG_INSTANCE, RTLOGGRPFLAGS_DJ, LOG_GROUP, "%s", psz);
+    RTLogLoggerEx(LOG_INSTANCE, RTLOGGRPFLAGS_DJ, LOG_GROUP, "%s %s", pcszPrefix, psz);
 
     RTStrFree(psz);
 }
@@ -246,6 +489,75 @@ void WebLogSoapError(struct soap *soap)
            (ppcszDetail && *ppcszDetail) ? *ppcszDetail : "no details available");
 }
 
+/****************************************************************************
+ *
+ * SOAP queue pumper thread
+ *
+ ****************************************************************************/
+
+void doQueuesLoop()
+{
+    // set up gSOAP
+    struct soap soap;
+    soap_init(&soap);
+
+    soap.bind_flags |= SO_REUSEADDR;
+            // avoid EADDRINUSE on bind()
+
+    int m, s; // master and slave sockets
+    m = soap_bind(&soap,
+                  g_pcszBindToHost,     // host: current machine
+                  g_uBindToPort,     // port
+                  g_uBacklog);     // backlog = max queue size for requests
+    if (m < 0)
+        WebLogSoapError(&soap);
+    else
+    {
+        WebLog("Socket connection successful: host = %s, port = %u, master socket = %d\n",
+               (g_pcszBindToHost) ? g_pcszBindToHost : "default (localhost)",
+               g_uBindToPort,
+               m);
+
+        // initialize thread queue, mutex and eventsem
+        g_pSoapQ = new SoapQ(&soap);
+
+        // start the SOAP processing thread
+
+        for (uint64_t i = 1;
+             ;
+             i++)
+        {
+            // call gSOAP to handle incoming SOAP connection
+            s = soap_accept(&soap);
+            if (s < 0)
+            {
+                WebLogSoapError(&soap);
+                break;
+            }
+
+            // add the socket to the queue and tell worker threads to
+            // pick up the jobn
+            size_t cItemsOnQ = g_pSoapQ->add(s);
+            WebLog("Request %llu on socket %d queued for processing (%d items on Q)\n", i, s, cItemsOnQ);
+        }
+    }
+    soap_done(&soap); // close master socket and detach environment
+}
+
+/**
+ * Thread function for the "queue pumper" thread started from main(). This implements
+ * the loop that takes SOAP calls from HTTP and serves them by handing sockets to the
+ * SOAP queue worker threads.
+ */
+int fntQPumper(RTTHREAD ThreadSelf, void *pvUser)
+{
+    // store a log prefix for this thread
+    g_mapThreads[RTThreadSelf()] = "[ P ]";
+
+    doQueuesLoop();
+
+    return 0;
+}
 
 /**
  * Start up the webservice server. This keeps running and waits
@@ -264,7 +576,10 @@ int main(int argc, char* argv[])
     // intialize runtime
     RTR3Init();
 
-    RTStrmPrintf(g_pStdErr, VBOX_PRODUCT " Webservice Version " VBOX_VERSION_STRING "\n"
+    // store a log prefix for this thread
+    g_mapThreads[RTThreadSelf()] = "[M  ]";
+
+    RTStrmPrintf(g_pStdErr, VBOX_PRODUCT " web service version " VBOX_VERSION_STRING "\n"
                             "(C) 2005-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
                             "All rights reserved.\n");
 
@@ -306,6 +621,10 @@ int main(int argc, char* argv[])
             }
             break;
 
+            case 'T':
+                g_cMaxWorkerThreads = ValueUnion.u32;
+            break;
+
             case 'h':
                 DisplayHelp();
                 exit(0);
@@ -389,6 +708,25 @@ int main(int argc, char* argv[])
         return rc;
     }
 
+    // create the global mutexes
+    g_pAuthLibLockHandle = new RTLockMtx();
+    g_pSessionsLockHandle = new RTLockMtx();
+
+    // SOAP queue pumper thread
+    RTTHREAD  tQPumper;
+    if (RTThreadCreate(&tQPumper,
+                       fntQPumper,
+                       NULL,        // pvUser
+                       0,           // cbStack (default)
+                       RTTHREADTYPE_MAIN_WORKER,
+                       0,           // flags
+                       "SoapQPumper"))
+    {
+        RTStrmPrintf(g_pStdErr, "[!] Cannot start SOAP queue pumper thread\n");
+        exit(1);
+    }
+
+    // watchdog thread
     if (g_iWatchdogTimeoutSecs > 0)
     {
         // start our watchdog thread
@@ -396,7 +734,7 @@ int main(int argc, char* argv[])
         if (RTThreadCreate(&tWatchdog,
                            fntWatchdog,
                            NULL,
-                           32*1024,
+                           0,
                            RTTHREADTYPE_MAIN_WORKER,
                            0,
                            "Watchdog"))
@@ -406,71 +744,19 @@ int main(int argc, char* argv[])
         }
     }
 
-    // set up gSOAP
-    struct soap soap;
-    soap_init(&soap);
-
-    soap.bind_flags |= SO_REUSEADDR;
-            // avoid EADDRINUSE on bind()
-
-    int m, s; // master and slave sockets
-    m = soap_bind(&soap,
-                  g_pcszBindToHost,     // host: current machine
-                  g_uBindToPort,     // port
-                  g_uBacklog);     // backlog = max queue size for requests
-    if (m < 0)
-        WebLogSoapError(&soap);
-    else
+    com::EventQueue *pQ = com::EventQueue::getMainEventQueue();
+    while (1)
     {
-        WebLog("Socket connection successful: host = %s, port = %u, master socket = %d\n",
-               (g_pcszBindToHost) ? g_pcszBindToHost : "default (localhost)",
-               g_uBindToPort,
-               m);
-
-        for (uint64_t i = 1;
-             ;
-             i++)
-        {
-            // call gSOAP to handle incoming SOAP connection
-            s = soap_accept(&soap);
-            if (s < 0)
-            {
-                WebLogSoapError(&soap);
-                break;
-            }
-
-            WebLog("%llu: accepted connection from IP=%lu.%lu.%lu.%lu socket=%d... ",
-                   i,
-                   (soap.ip>>24)&0xFF,
-                   (soap.ip>>16)&0xFF,
-                   (soap.ip>>8)&0xFF,
-                   soap.ip&0xFF,
-                   s);
-
-            // enclose the entire RPC call in the sessions lock
-            // so that the watchdog cannot destroy COM objects
-            // while the RPC is ongoing
-            RTLock lock(g_mutexSessions);
-            // now process the RPC request (this goes into the
-            // generated code in methodmaps.cpp with all the COM calls)
-            if (soap_serve(&soap) != SOAP_OK)
-            {
-                WebLogSoapError(&soap);
-            }
-            lock.release();
-
-            WebLog("Request served\n");
-
-            soap_destroy(&soap); // clean up class instances
-            soap_end(&soap); // clean up everything and close socket
-
-            // we have to process main event queue
-            int vrc = com::EventQueue::getMainEventQueue()->processEventQueue(0);
-        }
+        // we have to process main event queue
+        WEBDEBUG(("Pumping COM event queue\n"));
+        int vrc = pQ->processEventQueue(RT_INDEFINITE_WAIT);
+        if (FAILED(vrc))
+            com::GluePrintRCMessage(vrc);
     }
-    soap_done(&soap); // close master socket and detach environment
 
     com::Shutdown();
+
+    return 0;
 }
 
 /****************************************************************************
@@ -488,6 +774,9 @@ int main(int argc, char* argv[])
  */
 int fntWatchdog(RTTHREAD ThreadSelf, void *pvUser)
 {
+    // store a log prefix for this thread
+    g_mapThreads[RTThreadSelf()] = "[W  ]";
+
     WEBDEBUG(("Watchdog thread started\n"));
 
     while (1)
@@ -498,12 +787,13 @@ int fntWatchdog(RTTHREAD ThreadSelf, void *pvUser)
         time_t                      tNow;
         time(&tNow);
 
-        RTLock lock(g_mutexSessions);
+        // lock the sessions while we're iterating; this blocks
+        // out the COM code from messing with it
+        RTLock lock(*g_pSessionsLockHandle);
         WEBDEBUG(("Watchdog: checking %d sessions\n", g_mapSessions.size()));
 
-        SessionsMap::iterator
-            it = g_mapSessions.begin(),
-            itEnd = g_mapSessions.end();
+        SessionsMap::iterator it = g_mapSessions.begin(),
+                              itEnd = g_mapSessions.end();
         while (it != itEnd)
         {
             WebServiceSession *pSession = it->second;
@@ -519,7 +809,6 @@ int fntWatchdog(RTTHREAD ThreadSelf, void *pvUser)
             else
                 ++it;
         }
-        lock.release();
     }
 
     WEBDEBUG(("Watchdog thread ending\n"));
@@ -616,8 +905,7 @@ std::string ConvertComString(const com::Bstr &bstr)
  */
 std::string ConvertComString(const com::Guid &uuid)
 {
-    com::Bstr bstr(uuid);
-    com::Utf8Str ustr(bstr);
+    com::Utf8Str ustr(uuid.toString());
     const char *pcsz;
     if ((pcsz = ustr.raw()))
         return pcsz;
@@ -738,7 +1026,7 @@ class WebServiceSessionPrivate
 /**
  * Constructor for the session object.
  *
- * Preconditions: Caller must have locked g_mutexSessions.
+ * Preconditions: Caller must have locked g_pSessionsLockHandle in write mode.
  *
  * @param username
  * @param password
@@ -758,7 +1046,7 @@ WebServiceSession::WebServiceSession()
 /**
  * Destructor. Cleans up and destroys all contained managed object references on the way.
  *
- * Preconditions: Caller must have locked g_mutexSessions.
+ * Preconditions: Caller must have locked g_pSessionsLockHandle in write mode.
  */
 WebServiceSession::~WebServiceSession()
 {
@@ -777,9 +1065,8 @@ WebServiceSession::~WebServiceSession()
     //     _pISession = NULL;
     // }
 
-    ManagedObjectsMapById::iterator
-        it,
-        end = _pp->_mapManagedObjectsById.end();
+    ManagedObjectsMapById::iterator it,
+                                    end = _pp->_mapManagedObjectsById.end();
     for (it = _pp->_mapManagedObjectsById.begin();
          it != end;
          ++it)
@@ -803,7 +1090,7 @@ int WebServiceSession::authenticate(const char *pcszUsername,
 {
     int rc = VERR_WEB_NOT_AUTHENTICATED;
 
-    RTLock lock(g_mutexAuthLib);
+    RTLock lock(*g_pAuthLibLockHandle);
 
     static bool fAuthLibLoaded = false;
     static PVRDPAUTHENTRY pfnAuthEntry = NULL;
@@ -874,6 +1161,8 @@ int WebServiceSession::authenticate(const char *pcszUsername,
         WEBDEBUG(("Could not resolve VRDPAuth2 or VRDPAuth entry point"));
     }
 
+    lock.release();
+
     if (!rc)
     {
         do
@@ -911,13 +1200,15 @@ int WebServiceSession::authenticate(const char *pcszUsername,
  *  ComPtr<IVirtualBox>, for example. As we store the ComPtr<IUnknown> in
  *  our private hash table, we must search for one too.
  *
- *  Preconditions: Caller must have locked g_mutexSessions.
+ * Preconditions: Caller must have locked g_pSessionsLockHandle in read mode.
  *
  * @param pcu pointer to a COM object.
  * @return The existing ManagedObjectRef that represents the COM object, or NULL if there's none yet.
  */
 ManagedObjectRef* WebServiceSession::findRefFromPtr(const ComPtr<IUnknown> &pcu)
 {
+    // Assert(g_pSessionsLockHandle->isReadLockOnCurrentThread());      // @todo
+
     IUnknown *p = pcu;
     uintptr_t ulp = (uintptr_t)p;
     ManagedObjectRef *pRef;
@@ -939,13 +1230,15 @@ ManagedObjectRef* WebServiceSession::findRefFromPtr(const ComPtr<IUnknown> &pcu)
  * object reference was created, by splitting the reference into the session and
  * object IDs and then looking up the session object for that session ID.
  *
- * Preconditions: Caller must have locked g_mutexSessions.
+ * Preconditions: Caller must have locked g_pSessionsLockHandle in read mode.
  *
  * @param id Managed object reference (with combined session and object IDs).
  * @return
  */
 WebServiceSession* WebServiceSession::findSessionFromRef(const WSDLT_ID &id)
 {
+    // Assert(g_pSessionsLockHandle->isReadLockOnCurrentThread()); // @todo
+
     WebServiceSession *pSession = NULL;
     uint64_t sessid;
     if (SplitManagedObjectRef(id,
@@ -1009,7 +1302,7 @@ void WebServiceSession::DumpRefs()
 
 /**
  *  Constructor, which assigns a unique ID to this managed object
- *  reference and stores it two global hashs:
+ *  reference and stores it two global hashes:
  *
  *   a) G_mapManagedObjectsById, which maps ManagedObjectID's to
  *      instances of this class; this hash is then used by the
@@ -1029,7 +1322,7 @@ void WebServiceSession::DumpRefs()
  *  createRefFromObject() template function in vboxweb.h, which
  *  does perform that check.
  *
- *  Preconditions: Caller must have locked g_mutexSessions.
+ * Preconditions: Caller must have locked g_pSessionsLockHandle in write mode.
  *
  * @param pObj
  */
@@ -1063,7 +1356,7 @@ ManagedObjectRef::ManagedObjectRef(WebServiceSession &session,
  * Destructor; removes the instance from the global hash of
  * managed objects.
  *
- * Preconditions: Caller must have locked g_mutexSessions.
+ * Preconditions: Caller must have locked g_pSessionsLockHandle in write mode.
  */
 ManagedObjectRef::~ManagedObjectRef()
 {
@@ -1293,6 +1586,9 @@ int __vbox__IWebsessionManager_USCORElogon(
     WEBDEBUG(("\n-- entering %s\n", __FUNCTION__));
 
     do {
+        // WebServiceSession constructor tinkers with global MOR map and requires a write lock
+        RTLock lock(*g_pSessionsLockHandle);
+
         // create new session; the constructor stores the new session
         // in the global map automatically
         WebServiceSession *pSession = new WebServiceSession();
diff --git a/src/VBox/Main/webservice/vboxweb.h b/src/VBox/Main/webservice/vboxweb.h
index 37ff43c3b..352ada7b6 100644
--- a/src/VBox/Main/webservice/vboxweb.h
+++ b/src/VBox/Main/webservice/vboxweb.h
@@ -2,7 +2,7 @@
  * vboxweb.h:
  *      header file for "real" web server code.
  *
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -35,11 +35,12 @@ void WebLog(const char *pszFormat, ...);
 
 #include <VBox/err.h>
 
+#include "iprt/lock.h"
+
 #include <iprt/stream.h>
 
 #include <string>
 
-
 /****************************************************************************
  *
  * global variables
@@ -51,6 +52,10 @@ extern bool g_fVerbose;
 
 extern PRTSTREAM g_pstrLog;
 
+extern RTLockMtx *g_pAuthLibLockHandle;
+
+extern RTLockMtx *g_pSessionsLockHandle;
+
 /****************************************************************************
  *
  * typedefs
@@ -223,6 +228,10 @@ int findComPtrFromId(struct soap *soap,
                      ComPtr<T> &pComPtr,
                      bool fNullAllowed)
 {
+    // we're only reading the MOR maps, not modifying them, so a readlock is good enough
+    // (allow concurrency, this code gets called from everywhere in methodmaps.cpp)
+    RTLock lock(*g_pSessionsLockHandle);
+
     int rc;
     ManagedObjectRef *pRef;
     if ((rc = ManagedObjectRef::findRefFromId(id, &pRef, fNullAllowed)))
@@ -269,6 +278,8 @@ WSDLT_ID createOrFindRefFromComPtr(const WSDLT_ID &idParent,
         return "";
     }
 
+    // we might be modifying the MOR maps below, so request write lock now
+    RTLock lock(*g_pSessionsLockHandle);
     WebServiceSession *pSession;
     if ((pSession = WebServiceSession::findSessionFromRef(idParent)))
     {
@@ -280,6 +291,8 @@ WSDLT_ID createOrFindRefFromComPtr(const WSDLT_ID &idParent,
             return pRef->toWSDL();
     }
 
-    return 0;
+    // session has expired, return an empty MOR instead of allocating a
+    // new reference which couldn't be used anyway.
+    return "";
 }
 
diff --git a/src/VBox/Main/webservice/websrv-php.xsl b/src/VBox/Main/webservice/websrv-php.xsl
index 00d7d9888..026807852 100644
--- a/src/VBox/Main/webservice/websrv-php.xsl
+++ b/src/VBox/Main/webservice/websrv-php.xsl
@@ -43,20 +43,82 @@
   <xsl:param name="safearray" />
 
   <xsl:choose>
-    <xsl:when test="$type='wstring' or $type='uuid'">(string)<xsl:value-of select="$value" /></xsl:when>
-    <xsl:when test="$type='boolean'">(bool)<xsl:value-of select="$value" /></xsl:when>
-    <xsl:when test="$type='long' or $type='unsigned long' or $type='long long' or $type='short' or $type='unsigned short' or $type='unsigned long long' or $type='result'">(int)<xsl:value-of select="$value" /></xsl:when>
-    <xsl:when test="$type='double' or $type='float'">(float)<xsl:value-of select="$value" /></xsl:when>
-    <xsl:when test="$type='octet'"><xsl:value-of select="$value" /></xsl:when>
+    <xsl:when test="$type='wstring' or $type='uuid'">
+      <xsl:call-template name="emitPrimitive">
+        <xsl:with-param name="type">string</xsl:with-param>
+        <xsl:with-param name="value" select="$value" />
+        <xsl:with-param name="safearray" select="$safearray"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$type='boolean'">
+      <xsl:call-template name="emitPrimitive">
+        <xsl:with-param name="type">bool</xsl:with-param>
+        <xsl:with-param name="value" select="$value" />
+        <xsl:with-param name="safearray" select="$safearray"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$type='long' or $type='unsigned long' or $type='long long' or $type='short' or $type='unsigned short' or $type='unsigned long long' or $type='result'">
+      <xsl:call-template name="emitPrimitive">
+        <xsl:with-param name="type">int</xsl:with-param>
+        <xsl:with-param name="value" select="$value" />
+        <xsl:with-param name="safearray" select="$safearray"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$type='double' or $type='float'">
+      <xsl:call-template name="emitPrimitive">
+        <xsl:with-param name="type">float</xsl:with-param>
+        <xsl:with-param name="value" select="$value" />
+        <xsl:with-param name="safearray" select="$safearray"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$type='octet'">
+      <xsl:call-template name="emitPrimitive">
+        <xsl:with-param name="type">octet</xsl:with-param>
+        <xsl:with-param name="value" select="$value" />
+        <xsl:with-param name="safearray" select="$safearray"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$type='$unknown'">
+      <xsl:call-template name="emitObject">
+        <xsl:with-param name="type">VBox_ManagedObject</xsl:with-param>
+        <xsl:with-param name="value" select="$value" />
+        <xsl:with-param name="safearray" select="$safearray"/>
+      </xsl:call-template> 
+   </xsl:when>
     <xsl:otherwise>
-        <xsl:choose>
-            <xsl:when test="$safearray='yes'">
-                <xsl:text>new </xsl:text><xsl:value-of select="$type" />Collection ($this->connection, <xsl:value-of select="$value"/><xsl:text>)</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>new </xsl:text><xsl:value-of select="$type" /> ($this->connection, <xsl:value-of select="$value"/><xsl:text>)</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
+      <xsl:call-template name="emitObject">
+        <xsl:with-param name="type" select="$type" />
+        <xsl:with-param name="value" select="$value" />
+        <xsl:with-param name="safearray" select="$safearray"/>
+      </xsl:call-template> 
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="emitObject">
+  <xsl:param name="type" />
+  <xsl:param name="value" />
+  <xsl:param name="safearray" />
+  <xsl:choose>
+    <xsl:when test="$safearray='yes'">
+      <xsl:text>new </xsl:text><xsl:value-of select="$type" />Collection ($this->connection, (array)<xsl:value-of select="$value"/><xsl:text>)</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>new </xsl:text><xsl:value-of select="$type" /> ($this->connection, <xsl:value-of select="$value"/><xsl:text>)</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="emitPrimitive">
+  <xsl:param name="type" />
+  <xsl:param name="value" />
+  <xsl:param name="safearray" />
+  <xsl:choose>
+    <xsl:when test="$safearray='yes'">
+      <xsl:text>(array)</xsl:text><xsl:value-of select="$value"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>(</xsl:text><xsl:value-of select="$type" /><xsl:text>)</xsl:text><xsl:value-of select="$value"/>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
@@ -87,7 +149,7 @@
   <xsl:param name="attrsafearray" />
   <xsl:variable name="fname"><xsl:call-template name="makeSetterName"><xsl:with-param name="attrname" select="$attrname"/></xsl:call-template></xsl:variable>
    public function <xsl:value-of select="$fname"/>($value) {
-       $request = stdClass();
+       $request = new stdClass();
        $request->_this = $this->handle;
        if (is_int($value) || is_string($value) || is_bool($value)) {
             $request-><xsl:value-of select="$attrname"/> = $value;
@@ -185,15 +247,21 @@ class <xsl:value-of select="$ifname"/> extends VBox_Struct {
     <xsl:for-each select="attribute">
        protected $<xsl:value-of select="@name"/>;
     </xsl:for-each>
-    public function __construct($connection, $handle) {
+    public function __construct($connection, $values) {
+       $this->connection = $connection;
     <xsl:for-each select="attribute">
-       $this-><xsl:value-of select="@name"/> = $handle-><xsl:value-of select="@name"/><xsl:text>;</xsl:text>
+       $this-><xsl:value-of select="@name"/> = $values-><xsl:value-of select="@name"/><xsl:text>;</xsl:text>
     </xsl:for-each>
     }
 
     <xsl:for-each select="attribute">
     public function <xsl:call-template name="makeGetterName"><xsl:with-param name="attrname" select="@name"/></xsl:call-template>() {
-       return $this-><xsl:value-of select="@name"/>;
+        <xsl:text>return </xsl:text>
+        <xsl:call-template name="emitOutParam">
+           <xsl:with-param name="type" select="@type" />
+           <xsl:with-param name="value" select="concat('$this->',@name)" />
+           <xsl:with-param name="safearray" select="@safearray"/>
+         </xsl:call-template>;
     }
     </xsl:for-each>
 
@@ -285,7 +353,7 @@ class <xsl:value-of select="@name"/> extends VBox_Enum {
 * This file is autogenerated from VirtualBox.xidl, DO NOT EDIT!
 */
 
-abstract class VBox_ManagedObject
+class VBox_ManagedObject
 {
     protected $connection;
     protected $handle;
@@ -324,6 +392,15 @@ abstract class VBox_ManagedObject
        return $this->handle;
    }
 
+   public function cast($class)
+   {
+       if (is_subclass_of($class, 'VBox_ManagedObject'))
+       {
+           return new $class($this->connection, $this->handle);
+       }
+       throw new Exception('Cannot cast VBox_ManagedObject to non-child class VBox_ManagedObject');
+   }
+
    public function releaseRemote()
    {
        try
@@ -335,7 +412,7 @@ abstract class VBox_ManagedObject
    }
 }
 
-abstract class VBox_ManagedObjectCollection implements Iterator {
+class VBox_ManagedObjectCollection implements Iterator, Countable {
     protected $connection;
     protected $handles;
     protected $_interfaceName = null;
@@ -372,9 +449,15 @@ abstract class VBox_ManagedObjectCollection implements Iterator {
         $handle = $this->current() !== false;
         return $handle;
     }
+
+    public function count() {
+        return count($this->handles);
+    }
 }
 
 abstract class VBox_Struct {
+    protected $connection;
+
     public function __get($attr)
     {
         $methodName = "get" . $attr;
@@ -413,6 +496,7 @@ abstract class VBox_Enum {
   </xsl:for-each>
   <xsl:for-each select="//enum">
        <xsl:call-template name="enum"/>
+       <xsl:call-template name="collection"/>
   </xsl:for-each>
 
 </xsl:template>
diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp
index e2fbe1d23..fcf52138f 100644
--- a/src/VBox/Main/xml/Settings.cpp
+++ b/src/VBox/Main/xml/Settings.cpp
@@ -1350,7 +1350,7 @@ void MachineConfigFile::readNetworkAdapters(const xml::ElementNode &elmNetwork,
         if ((pelmAdapterChild = pelmAdapter->findChildElement("NAT")))
         {
             nic.mode = NetworkAttachmentType_NAT;
-            pelmAdapterChild->getAttributeValue("name", nic.strName);    // optional network name
+            pelmAdapterChild->getAttributeValue("network", nic.strName);    // optional network name
         }
         else if (    ((pelmAdapterChild = pelmAdapter->findChildElement("HostInterface")))
                   || ((pelmAdapterChild = pelmAdapter->findChildElement("BridgedInterface")))
diff --git a/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp b/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp
index d16e93104..d76894e93 100644
--- a/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp
+++ b/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp
@@ -838,7 +838,9 @@ int VBoxNetDhcp::parseArgs(int argc, char **argv)
                 return 1;
 
             default:
-                break;
+                rc = RTGetOptPrintError(rc, &Val);
+                RTPrintf("Use --help for more information.\n");
+                return rc;
         }
     }
 
diff --git a/src/VBox/Runtime/Makefile.kmk b/src/VBox/Runtime/Makefile.kmk
index c199e78c0..3fac0c7ac 100644
--- a/src/VBox/Runtime/Makefile.kmk
+++ b/src/VBox/Runtime/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2010 Sun Microsystems, Inc.
 #
 # 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,10 @@ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS
  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 
  BLDPROGS += uniread
- LIBRARIES += RuntimeR3 RuntimeR0 RuntimeGC RuntimeEFCPP RuntimeR3NoCRTGCC
+ LIBRARIES += RuntimeR3 RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC
+ ifdef VBOX_WITH_RAW_MODE
+  LIBRARIES += RuntimeGC
+ endif
  ifdef VBOX_WITH_VBOXDRV
   LIBRARIES += RuntimeR0Drv
  endif
@@ -358,8 +361,11 @@ endif
 
 # Some versions of GCC might require this.
 RuntimeR3_SOURCES.x86 += \
+	common/asm/ASMAtomicXchgU64.asm \
 	common/asm/ASMAtomicCmpXchgU64.asm \
-	common/asm/ASMAtomicReadU64.asm
+	common/asm/ASMAtomicCmpXchgExU64.asm \
+	common/asm/ASMAtomicReadU64.asm	\
+	common/asm/ASMAtomicUoReadU64.asm
 
 ifdef IPRT_WITH_KSTUFF
  RuntimeR3_SOURCES += \
@@ -1474,13 +1480,14 @@ RuntimeGuestR0NT4_EXTENDS_BY = appending
 RuntimeGuestR0NT4_DEFS = IPRT_TARGET_NT4
 
 
-#
-# RuntimeGC - Guest context library.
-#
-RuntimeGC_TEMPLATE      = VBOXGC
-RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX
-RuntimeGC_INCS          = include
-RuntimeGC_SOURCES       = \
+ifdef VBOX_WITH_RAW_MODE
+ #
+ # RuntimeGC - Guest context library.
+ #
+ RuntimeGC_TEMPLATE      = VBOXGC
+ RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX
+ RuntimeGC_INCS          = include
+ RuntimeGC_SOURCES       = \
 	common/log/log.cpp \
 	common/log/logellipsis.cpp \
 	common/log/logrel.cpp \
@@ -1516,20 +1523,20 @@ RuntimeGC_SOURCES       = \
 	\
 	$(RuntimeNoCrt_SOURCES)
 
-#if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
-# RuntimeGC_SOURCES += common/time/timesupA.asm
-#else
- RuntimeGC_SOURCES += common/time/timesupref.cpp
-#endif
+ #if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
+ # RuntimeGC_SOURCES += common/time/timesupA.asm
+ #else
+  RuntimeGC_SOURCES += common/time/timesupref.cpp
+ #endif
 
-RuntimeGC_SOURCES.win.x86 = $(RuntimeWin32ASM_SOURCES)
+ RuntimeGC_SOURCES.win.x86 = $(RuntimeWin32ASM_SOURCES)
 
-ifeq ($(VBOX_LDR_FMT32),lx)
- RuntimeGC_SOURCES += os2/sys0.asm
-endif
+ ifeq ($(VBOX_LDR_FMT32),lx)
+  RuntimeGC_SOURCES += os2/sys0.asm
+ endif
 
-if1of ($(KBUILD_TARGET), darwin solaris freebsd)
-RuntimeGC_SOURCES += \
+ if1of ($(KBUILD_TARGET), darwin solaris freebsd)
+ RuntimeGC_SOURCES += \
 	common/math/gcc/adddi3.c \
 	common/math/gcc/anddi3.c \
 	common/math/gcc/ashldi3.c \
@@ -1549,7 +1556,8 @@ RuntimeGC_SOURCES += \
 	common/math/gcc/udivdi3.c \
 	common/math/gcc/umoddi3.c \
 	common/math/gcc/xordi3.c
-endif
+ endif
+endif # VBOX_WITH_RAW_MODE
 
 
 #
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm
new file mode 100644
index 000000000..80f9e244f
--- /dev/null
+++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm
@@ -0,0 +1,88 @@
+; $Id: ASMAtomicCmpXchgExU64.asm 56380 2010-01-06 04:19:49Z bird $

+;; @file

+; IPRT - ASMAtomicCmpXchgExU64().

+;

+

+;

+; Copyright (C) 2006-2010 Sun Microsystems, Inc.

+;

+; 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.

+;

+; Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa

+; Clara, CA 95054 USA or visit http://www.sun.com if you need

+; additional information or have any questions.

+;

+

+;*******************************************************************************

+;* Header Files                                                                *

+;*******************************************************************************

+%include "iprt/asmdefs.mac"

+

+BEGINCODE

+

+;;

+; Atomically Exchange an unsigned 64-bit value, ordered.

+;

+; @param    pu64     x86:ebp+8   gcc:rdi  msc:rcx

+; @param    u64New   x86:ebp+c   gcc:rsi  msc:rdx

+; @param    u64Old   x86:ebp+14  gcc:rcx  msc:r8

+; @param    u64Old   x86:ebp+1c  gcc:rdx  msc:r9

+;

+; @returns  bool result: true if succesfully exchanged, false if not.

+;           x86:al

+;

+BEGINPROC_EXPORTED ASMAtomicCmpXchgExU64

+%ifdef RT_ARCH_AMD64

+ %ifdef ASM_CALL64_MSC

+        mov     rax, r8

+        lock cmpxchg [rcx], rdx

+        mov     [r9], rax

+ %else

+        mov     rax, rcx

+        lock cmpxchg [rdi], rsi

+        mov     [rdx], rax

+ %endif

+        setz    al

+        movzx   eax, al

+        ret

+%endif

+%ifdef RT_ARCH_X86

+        push    ebp

+        mov     ebp, esp

+        push    ebx

+        push    edi

+

+        mov     ebx, dword [ebp+0ch]

+        mov     ecx, dword [ebp+0ch + 4]

+        mov     edi, [ebp+08h]

+        mov     eax, dword [ebp+14h]

+        mov     edx, dword [ebp+14h + 4]

+        lock cmpxchg8b [edi]

+        mov     edi, [ebp + 1ch]

+        mov     [edi],     eax

+        mov     [edi + 4], edx

+        setz    al

+        movzx   eax, al

+

+        pop     edi

+        pop     ebx

+        leave

+        ret

+%endif

+ENDPROC ASMAtomicCmpXchgExU64

+

diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm
index 51eecc4d6..d53ad5718 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2009 Sun Microsystems, Inc.
+; Copyright (C) 2006-2010 Sun Microsystems, Inc.
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
@@ -38,17 +38,27 @@ BEGINCODE
 ;;
 ; Atomically compares and exchanges an unsigned 64-bit int.
 ;
-; @param    pu64     x86:ebp+8
-; @param    u64New   x86:ebp+c
-; @param    u64Old   x86:ebp+14
+; @param    pu64     x86:ebp+8   gcc:rdi  msc:rcx
+; @param    u64New   x86:ebp+c   gcc:rsi  msc:rdx
+; @param    u64Old   x86:ebp+14  gcc:rcx  msc:r8
 ;
 ; @returns  bool result: true if succesfully exchanged, false if not.
 ;           x86:al
 ;
 BEGINPROC_EXPORTED ASMAtomicCmpXchgU64
-%ifndef RT_ARCH_X86
- %error port me
+%ifdef RT_ARCH_AMD64
+ %ifdef ASM_CALL64_MSC
+        mov     rax, r8
+        lock cmpxchg [rcx], rdx
+ %else
+        mov     rax, rcx
+        lock cmpxchg [rdi], rsi
+ %endif
+        setz    al
+        movzx   eax, al
+        ret
 %endif
+%ifdef RT_ARCH_X86
         push    ebp
         mov     ebp, esp
         push    ebx
@@ -67,5 +77,6 @@ BEGINPROC_EXPORTED ASMAtomicCmpXchgU64
         pop     ebx
         leave
         ret
+%endif
 ENDPROC ASMAtomicCmpXchgU64
 
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm
new file mode 100644
index 000000000..8a41c2b3c
--- /dev/null
+++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm
@@ -0,0 +1,67 @@
+; $Id: ASMAtomicCmpXchgU8.asm 56163 2009-12-18 15:22:16Z bird $

+;; @file

+; IPRT - ASMAtomicCmpXchgU8().

+;

+

+;

+; Copyright (C) 2006-2009 Sun Microsystems, Inc.

+;

+; 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.

+;

+; Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa

+; Clara, CA 95054 USA or visit http://www.sun.com if you need

+; additional information or have any questions.

+;

+

+;*******************************************************************************

+;* Header Files                                                                *

+;*******************************************************************************

+%include "iprt/asmdefs.mac"

+

+BEGINCODE

+

+;;

+; Atomically compares and exchanges an unsigned 8-bit int.

+;

+; @param    pu8     x86:esp+4  msc:rcx  gcc:rdi

+; @param    u8New   x86:esp+8  msc:dl   gcc:sil

+; @param    u8Old   x86:esp+c  msc:r8l  gcc:dl

+;

+; @returns  bool result: true if succesfully exchanged, false if not.

+;           x86:al

+;

+BEGINPROC_EXPORTED ASMAtomicCmpXchgU8

+%ifdef RT_ARCH_AMD64

+ %ifdef ASM_CALL64_MSC

+        mov     al, r8b

+        lock cmpxchg [rcx], dl

+ %else

+        mov     al, dl

+        lock cmpxchg [rdi], sil

+ %endif

+%else

+        mov     ecx, [esp + 04h]

+        mov     dl,  [esp + 08h]

+        mov     al,  [esp + 0ch]

+        lock cmpxchg [ecx], dl

+%endif

+        setz    al

+        movzx   eax, al

+        ret

+ENDPROC ASMAtomicCmpXchgU8

+

diff --git a/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm
index 2f34952ef..128acd21a 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm
@@ -44,9 +44,16 @@ BEGINCODE
 ;
 ;
 BEGINPROC_EXPORTED ASMAtomicReadU64
-%ifndef RT_ARCH_X86
- %error port me
+%ifdef RT_ARCH_AMD64
+        mfence                          ; ASSUME its present.
+ %ifdef ASM_CALL64_MSC
+        mov     rax, [rcx]
+ %else
+        mov     rax, [rdi]
+ %endif
+        ret
 %endif
+%ifdef RT_ARCH_X86
         push    ebp
         mov     ebp, esp
         push    ebx
@@ -63,5 +70,6 @@ BEGINPROC_EXPORTED ASMAtomicReadU64
         pop     ebx
         leave
         ret
+%endif
 ENDPROC ASMAtomicReadU64
 
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm
new file mode 100644
index 000000000..1e4180438
--- /dev/null
+++ b/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm
@@ -0,0 +1,74 @@
+; $Id: ASMAtomicUoReadU64.asm 56386 2010-01-06 06:01:40Z bird $

+;; @file

+; IPRT - ASMAtomicUoReadU64().

+;

+

+;

+; Copyright (C) 2006-2010 Sun Microsystems, Inc.

+;

+; 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.

+;

+; Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa

+; Clara, CA 95054 USA or visit http://www.sun.com if you need

+; additional information or have any questions.

+;

+

+;*******************************************************************************

+;* Header Files                                                                *

+;*******************************************************************************

+%include "iprt/asmdefs.mac"

+

+BEGINCODE

+

+;;

+; Atomically reads 64-bit value.

+;

+; @param   pu64     x86:ebp+8

+;

+; @returns The current value. (x86:eax+edx)

+;

+;

+BEGINPROC_EXPORTED ASMAtomicUoReadU64

+%ifdef RT_ARCH_AMD64

+ %ifdef ASM_CALL64_MSC

+        mov     rax, [rcx]

+ %else

+        mov     rax, [rdi]

+ %endif

+        ret

+%endif

+%ifdef RT_ARCH_X86

+        push    ebp

+        mov     ebp, esp

+        push    ebx

+        push    edi

+

+        xor     eax, eax

+        xor     edx, edx

+        mov     edi, [ebp+08h]

+        xor     ecx, ecx

+        xor     ebx, ebx

+        lock cmpxchg8b [edi]

+

+        pop     edi

+        pop     ebx

+        leave

+        ret

+%endif

+ENDPROC ASMAtomicUoReadU64

+

diff --git a/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm
new file mode 100644
index 000000000..d7d1a329d
--- /dev/null
+++ b/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm
@@ -0,0 +1,80 @@
+; $Id: ASMAtomicXchgU64.asm 56380 2010-01-06 04:19:49Z bird $

+;; @file

+; IPRT - ASMAtomicXchgU64().

+;

+

+;

+; Copyright (C) 2006-2010 Sun Microsystems, Inc.

+;

+; 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.

+;

+; Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa

+; Clara, CA 95054 USA or visit http://www.sun.com if you need

+; additional information or have any questions.

+;

+

+;*******************************************************************************

+;* Header Files                                                                *

+;*******************************************************************************

+%include "iprt/asmdefs.mac"

+

+BEGINCODE

+

+;;

+; Atomically Exchange an unsigned 64-bit value, ordered.

+;

+; @param    pu64     x86:ebp+8   gcc:rdi  msc:rcx

+; @param    u64New   x86:ebp+c   gcc:rsi  msc:rdx

+;

+; @returns  bool result: true if succesfully exchanged, false if not.

+;           x86:al

+;

+BEGINPROC_EXPORTED ASMAtomicXchgU64

+%ifdef RT_ARCH_AMD64

+ %ifdef ASM_CALL64_MSC

+        mov     rax, r8

+.try_again:

+        lock cmpxchg [rcx], rdx

+ %else

+.try_again:

+        mov     rax, rcx

+        lock cmpxchg [rdi], rsi

+ %endif

+        jnz     .try_again

+        ret

+%endif

+%ifdef RT_ARCH_X86

+        push    ebp

+        mov     ebp, esp

+        push    ebx

+        push    edi

+

+.try_again:

+        mov     ebx, dword [ebp+0ch]

+        mov     ecx, dword [ebp+0ch + 4]

+        mov     edi, [ebp+08h]

+        lock cmpxchg8b [edi]

+        jnz     .try_again

+

+        pop     edi

+        pop     ebx

+        leave

+        ret

+%endif

+ENDPROC ASMAtomicXchgU64

+

diff --git a/src/VBox/Runtime/common/string/strformatrt.cpp b/src/VBox/Runtime/common/string/strformatrt.cpp
index a05ed8e87..0cca92bdd 100644
--- a/src/VBox/Runtime/common/string/strformatrt.cpp
+++ b/src/VBox/Runtime/common/string/strformatrt.cpp
@@ -51,6 +51,7 @@
  *      - \%RTiop           - Takes a #RTIOPORT value.
  *      - \%RTldrm          - Takes a #RTLDRMOD value.
  *      - \%RTmac           - Takes a #PCRTMAC pointer.
+ *      - \%RTnaddr         - Takes a #PCRTNETADDR value.
  *      - \%RTnaipv4        - Takes a #RTNETADDRIPV4 value.
  *      - \%RTnaipv6        - Takes a #PCRTNETADDRIPV6 value.
  *      - \%RTnthrd         - Takes a #RTNATIVETHREAD value.
@@ -213,6 +214,7 @@ size_t rtstrFormatRt(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, const char **p
                     RTSF_IPV4,
                     RTSF_IPV6,
                     RTSF_MAC,
+                    RTSF_NETADDR,
                     RTSF_UUID
                 } RTSF;
                 static const struct
@@ -264,6 +266,7 @@ size_t rtstrFormatRt(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, const char **p
                     { STRMEM("Tiop"),    sizeof(RTIOPORT),       16, RTSF_INTW,  0 },
                     { STRMEM("Tldrm"),   sizeof(RTLDRMOD),       16, RTSF_INTW,  0 },
                     { STRMEM("Tmac"),    sizeof(PCRTMAC),        16, RTSF_MAC,   0 },
+                    { STRMEM("Tnaddr"),  sizeof(PCRTNETADDR),    10, RTSF_NETADDR,0 },
                     { STRMEM("Tnaipv4"), sizeof(RTNETADDRIPV4),  10, RTSF_IPV4,  0 },
                     { STRMEM("Tnaipv6"), sizeof(PCRTNETADDRIPV6),16, RTSF_IPV6,  0 },
                     { STRMEM("Tnthrd"),  sizeof(RTNATIVETHREAD), 16, RTSF_INTW,  0 },
@@ -314,6 +317,7 @@ size_t rtstrFormatRt(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, const char **p
                     PCRTMAC             pMac;
                     RTNETADDRIPV4       Ipv4Addr;
                     PCRTNETADDRIPV6     pIpv6Addr;
+                    PCRTNETADDR         pNetAddr;
                     PCRTUUID            pUuid;
                 } u;
                 char        szBuf[80];
@@ -530,6 +534,87 @@ size_t rtstrFormatRt(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, const char **p
                         return pfnOutput(pvArgOutput, s_szNull, sizeof(s_szNull) - 1);
                     }
 
+                    case RTSF_NETADDR:
+                    {
+                        if (VALID_PTR(u.pNetAddr))
+                        {
+                            switch (u.pNetAddr->enmType)
+                            {
+                                case RTNETADDRTYPE_IPV4:
+                                    if (u.pNetAddr->uPort == RTNETADDR_PORT_NA)
+                                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
+                                                           "%u.%u.%u.%u",
+                                                           u.pNetAddr->uAddr.IPv4.au8[0],
+                                                           u.pNetAddr->uAddr.IPv4.au8[1],
+                                                           u.pNetAddr->uAddr.IPv4.au8[2],
+                                                           u.pNetAddr->uAddr.IPv4.au8[3]);
+                                    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
+                                                       "%u.%u.%u.%u:%u",
+                                                       u.pNetAddr->uAddr.IPv4.au8[0],
+                                                       u.pNetAddr->uAddr.IPv4.au8[1],
+                                                       u.pNetAddr->uAddr.IPv4.au8[2],
+                                                       u.pNetAddr->uAddr.IPv4.au8[3],
+                                                       u.pNetAddr->uPort);
+
+                                case RTNETADDRTYPE_IPV6:
+                                    if (u.pNetAddr->uPort == RTNETADDR_PORT_NA)
+                                        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
+                                                           "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
+                                                           u.pNetAddr->uAddr.IPv6.au8[0],
+                                                           u.pNetAddr->uAddr.IPv6.au8[1],
+                                                           u.pNetAddr->uAddr.IPv6.au8[2],
+                                                           u.pNetAddr->uAddr.IPv6.au8[3],
+                                                           u.pNetAddr->uAddr.IPv6.au8[4],
+                                                           u.pNetAddr->uAddr.IPv6.au8[5],
+                                                           u.pNetAddr->uAddr.IPv6.au8[6],
+                                                           u.pNetAddr->uAddr.IPv6.au8[7],
+                                                           u.pNetAddr->uAddr.IPv6.au8[8],
+                                                           u.pNetAddr->uAddr.IPv6.au8[9],
+                                                           u.pNetAddr->uAddr.IPv6.au8[10],
+                                                           u.pNetAddr->uAddr.IPv6.au8[11],
+                                                           u.pNetAddr->uAddr.IPv6.au8[12],
+                                                           u.pNetAddr->uAddr.IPv6.au8[13],
+                                                           u.pNetAddr->uAddr.IPv6.au8[14],
+                                                           u.pNetAddr->uAddr.IPv6.au8[15]);
+                                    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
+                                                       "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x %u",
+                                                       u.pNetAddr->uAddr.IPv6.au8[0],
+                                                       u.pNetAddr->uAddr.IPv6.au8[1],
+                                                       u.pNetAddr->uAddr.IPv6.au8[2],
+                                                       u.pNetAddr->uAddr.IPv6.au8[3],
+                                                       u.pNetAddr->uAddr.IPv6.au8[4],
+                                                       u.pNetAddr->uAddr.IPv6.au8[5],
+                                                       u.pNetAddr->uAddr.IPv6.au8[6],
+                                                       u.pNetAddr->uAddr.IPv6.au8[7],
+                                                       u.pNetAddr->uAddr.IPv6.au8[8],
+                                                       u.pNetAddr->uAddr.IPv6.au8[9],
+                                                       u.pNetAddr->uAddr.IPv6.au8[10],
+                                                       u.pNetAddr->uAddr.IPv6.au8[11],
+                                                       u.pNetAddr->uAddr.IPv6.au8[12],
+                                                       u.pNetAddr->uAddr.IPv6.au8[13],
+                                                       u.pNetAddr->uAddr.IPv6.au8[14],
+                                                       u.pNetAddr->uAddr.IPv6.au8[15],
+                                                       u.pNetAddr->uPort);
+
+                                case RTNETADDRTYPE_MAC:
+                                    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
+                                                       "%02x:%02x:%02x:%02x:%02x:%02x",
+                                                       u.pNetAddr->uAddr.Mac.au8[0],
+                                                       u.pNetAddr->uAddr.Mac.au8[1],
+                                                       u.pNetAddr->uAddr.Mac.au8[2],
+                                                       u.pNetAddr->uAddr.Mac.au8[3],
+                                                       u.pNetAddr->uAddr.Mac.au8[4],
+                                                       u.pNetAddr->uAddr.Mac.au8[5]);
+
+                                default:
+                                    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
+                                                       "unsupported-netaddr-type=%u", u.pNetAddr->enmType);
+
+                            }
+                        }
+                        return pfnOutput(pvArgOutput, s_szNull, sizeof(s_szNull) - 1);
+                    }
+
                     case RTSF_UUID:
                     {
                         if (VALID_PTR(u.pUuid))
diff --git a/src/VBox/Runtime/common/string/string.cpp b/src/VBox/Runtime/common/string/string.cpp
index 447d669b7..0a938fe93 100644
--- a/src/VBox/Runtime/common/string/string.cpp
+++ b/src/VBox/Runtime/common/string/string.cpp
@@ -113,7 +113,7 @@ RTDECL(char *) RTStrDupN(const char *pszString, size_t cchMax)
     AssertPtr(pszString);
     char  *pszEnd = (char *)memchr(pszString, '\0', cchMax);
     size_t cch    = pszEnd ? (uintptr_t)pszEnd - (uintptr_t)pszString : cchMax;
-    char  *pszDst = (char *)RTMemAlloc(cch);
+    char  *pszDst = (char *)RTMemAlloc(cch + 1);
     if (pszDst)
     {
         memcpy(pszDst, pszString, cch);
diff --git a/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c
index d95812dd8..87469fa4c 100644
--- a/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c
@@ -75,9 +75,14 @@ RTR0DECL(bool) RTR0MemKernelIsValidAddr(void *pv)
 # endif
 
 #elif defined(RT_ARCH_AMD64)
-# ifdef KERNEL_IMAGE_START
-    return (uintptr_t)pv >= KERNEL_IMAGE_START;
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+    /* Linux 2.6.0 ... 2.6.10 set PAGE_OFFSET to 0x0000010000000000.
+     * Linux 2.6.11 sets PAGE_OFFSET to 0xffff810000000000.
+     * Linux 2.6.33 sets PAGE_OFFSET to 0xffff880000000000. */
+    return (uintptr_t)pv >= PAGE_OFFSET;
 # else
+    /* Not correct (KERNEL_TEXT_START=0xffffffff80000000),
+     * VMALLOC_START (0xffffff0000000000) would be better */
     return (uintptr_t)pv >= KERNEL_TEXT_START;
 # endif
 
diff --git a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
index c652e8bd9..870bbcbec 100644
--- a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
@@ -59,6 +59,11 @@
 # error "RT_USE_LINUX_HRTIMER requires 2.6.16 or later, sorry."
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+# define mod_timer_pinned               mod_timer
+# define HRTIMER_MODE_ABS_PINNED        HRTIMER_MODE_ABS
+#endif
+
 
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -264,8 +269,10 @@ DECLINLINE(unsigned long) rtTimerLnxNanoToJiffies(uint64_t cNanoSecs)
  * @param   pSubTimer   The sub-timer to start.
  * @param   u64Now      The current timestamp (RTTimeNanoTS()).
  * @param   u64First    The interval from u64Now to the first time the timer should fire.
+ * @param   fPinned     true = timer pinned to a specific CPU,
+ *                      false = timer can migrate between CPUs
  */
-static void rtTimerLnxStartSubTimer(PRTTIMERLNXSUBTIMER pSubTimer, uint64_t u64Now, uint64_t u64First)
+static void rtTimerLnxStartSubTimer(PRTTIMERLNXSUBTIMER pSubTimer, uint64_t u64Now, uint64_t u64First, bool fPinned)
 {
     /*
      * Calc when it should start firing.
@@ -276,12 +283,18 @@ static void rtTimerLnxStartSubTimer(PRTTIMERLNXSUBTIMER pSubTimer, uint64_t u64N
     pSubTimer->iTick = 0;
 
 #ifdef RT_USE_LINUX_HRTIMER
-    hrtimer_start(&pSubTimer->LnxTimer, rtTimerLnxNanoToKt(u64NextTS), HRTIMER_MODE_ABS);
+    hrtimer_start(&pSubTimer->LnxTimer, rtTimerLnxNanoToKt(u64NextTS),
+                  fPinned ? HRTIMER_MODE_ABS_PINNED : HRTIMER_MODE_ABS);
 #else
     {
         unsigned long cJiffies = !u64First ? 0 : rtTimerLnxNanoToJiffies(u64First);
         pSubTimer->ulNextJiffies = jiffies + cJiffies;
-        mod_timer(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
+# ifdef CONFIG_SMP
+        if (fPinned)
+            mod_timer_pinned(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
+        else
+# endif
+            mod_timer(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
     }
 #endif
 
@@ -414,7 +427,12 @@ static void rtTimerLinuxCallback(unsigned long ulUser)
             pSubTimer->ulNextJiffies = jiffies + rtTimerLnxNanoToJiffies(pSubTimer->u64NextTS - u64NanoTS);
         }
 
-        mod_timer(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
+# ifdef CONFIG_SMP
+        if (pTimer->fSpecificCpu || pTimer->fAllCpus)
+            mod_timer_pinned(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
+        else
+# endif
+            mod_timer(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
 #endif
 
         /*
@@ -443,7 +461,7 @@ static DECLCALLBACK(void) rtTimerLnxStartAllOnCpu(RTCPUID idCpu, void *pvUser1,
     PRTTIMERLINUXSTARTONCPUARGS pArgs = (PRTTIMERLINUXSTARTONCPUARGS)pvUser2;
     PRTTIMER pTimer = (PRTTIMER)pvUser1;
     Assert(idCpu < pTimer->cCpus);
-    rtTimerLnxStartSubTimer(&pTimer->aSubTimers[idCpu], pArgs->u64Now, pArgs->u64First);
+    rtTimerLnxStartSubTimer(&pTimer->aSubTimers[idCpu], pArgs->u64Now, pArgs->u64First, true /*fPinned*/);
 }
 
 
@@ -595,7 +613,7 @@ static DECLCALLBACK(void) rtTimerLinuxMpStartOnCpu(RTCPUID idCpu, void *pvUser1,
             /* We're sane and the timer is not suspended yet. */
             PRTTIMERLNXSUBTIMER pSubTimer = &pTimer->aSubTimers[idCpu];
             if (rtTimerLnxCmpXchgState(&pSubTimer->enmState, RTTIMERLNXSTATE_MP_STARTING, RTTIMERLNXSTATE_STOPPED))
-                rtTimerLnxStartSubTimer(pSubTimer, pArgs->u64Now, pArgs->u64First);
+                rtTimerLnxStartSubTimer(pSubTimer, pArgs->u64Now, pArgs->u64First, true /*fPinned*/);
         }
 
         RTSpinlockRelease(hSpinlock, &Tmp);
@@ -648,7 +666,7 @@ static DECLCALLBACK(void) rtTimerLinuxMpEvent(RTMPEVENT enmEvent, RTCPUID idCpu,
                     Args.u64First = 0;
 
                     if (RTMpCpuId() == idCpu)
-                        rtTimerLnxStartSubTimer(pSubTimer, Args.u64Now, Args.u64First);
+                        rtTimerLnxStartSubTimer(pSubTimer, Args.u64Now, Args.u64First, true /*fPinned*/);
                     else
                     {
                         rtTimerLnxSetState(&pSubTimer->enmState, RTTIMERLNXSTATE_STOPPED); /* we'll recheck it. */
@@ -696,7 +714,7 @@ static DECLCALLBACK(void) rtTimerLnxStartOnSpecificCpu(RTCPUID idCpu, void *pvUs
 {
     PRTTIMERLINUXSTARTONCPUARGS pArgs = (PRTTIMERLINUXSTARTONCPUARGS)pvUser2;
     PRTTIMER pTimer = (PRTTIMER)pvUser1;
-    rtTimerLnxStartSubTimer(&pTimer->aSubTimers[0], pArgs->u64Now, pArgs->u64First);
+    rtTimerLnxStartSubTimer(&pTimer->aSubTimers[0], pArgs->u64Now, pArgs->u64First, true /*fPinned*/);
 }
 
 
@@ -730,7 +748,7 @@ RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64First)
     rtTimerLnxSetState(&pTimer->aSubTimers[0].enmState, RTTIMERLNXSTATE_STARTING);
     ASMAtomicWriteBool(&pTimer->fSuspended, false);
     if (!pTimer->fSpecificCpu)
-        rtTimerLnxStartSubTimer(&pTimer->aSubTimers[0], Args.u64Now, Args.u64First);
+        rtTimerLnxStartSubTimer(&pTimer->aSubTimers[0], Args.u64Now, Args.u64First, false /*fPinned*/);
     else
     {
         rc2 = RTMpOnSpecific(pTimer->idCpu, rtTimerLnxStartOnSpecificCpu, pTimer, &Args);
diff --git a/src/VBox/Runtime/r3/alloc-ef.cpp b/src/VBox/Runtime/r3/alloc-ef.cpp
index af115fcae..5a4d07dcb 100644
--- a/src/VBox/Runtime/r3/alloc-ef.cpp
+++ b/src/VBox/Runtime/r3/alloc-ef.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -291,6 +291,12 @@ void *rtMemAlloc(const char *pszOp, RTMEMTYPE enmType, size_t cb, void *pvCaller
         cb = 1;
 #endif
     }
+#ifndef RTALLOC_EFENCE_IN_FRONT
+    /* Alignment decreases fence accuracy, but this is at least partially
+     * counteracted by filling and checking the alignment padding. When the
+     * fence is in front then then no extra alignment is needed. */
+    size_t cbAlign = RT_ALIGN_Z(cb, RTALLOC_EFENCE_ALIGNMENT);
+#endif
 
 #ifdef RTALLOC_EFENCE_TRACE
     /*
@@ -318,10 +324,21 @@ void *rtMemAlloc(const char *pszOp, RTMEMTYPE enmType, size_t cb, void *pvCaller
         #ifdef RTALLOC_EFENCE_IN_FRONT
         void *pvEFence = pvBlock;
         void *pv = (char *)pvEFence + RTALLOC_EFENCE_SIZE;
+#ifdef RTALLOC_EFENCE_NOMAN_FILLER
+        memset((char *)pv + cb, RTALLOC_EFENCE_NOMAN_FILLER, cbBlock - RTALLOC_EFENCE_SIZE - cb);
+#endif
         #else
         void *pvEFence = (char *)pvBlock + (cbBlock - RTALLOC_EFENCE_SIZE);
-        void *pv = (char *)pvEFence - cb;
+        void *pv = (char *)pvEFence - cbAlign;
+#ifdef RTALLOC_EFENCE_NOMAN_FILLER
+        memset(pvBlock, RTALLOC_EFENCE_NOMAN_FILLER, cbBlock - RTALLOC_EFENCE_SIZE - cbAlign);
+        memset((char *)pv + cb, RTALLOC_EFENCE_NOMAN_FILLER, cbAlign - cb);
+#endif
         #endif
+
+#ifdef RTALLOC_EFENCE_FENCE_FILLER
+        memset(pvEFence, RTALLOC_EFENCE_FENCE_FILLER, RTALLOC_EFENCE_SIZE);
+#endif
         int rc = RTMemProtect(pvEFence, RTALLOC_EFENCE_SIZE, RTMEM_PROT_NONE);
         if (!rc)
         {
@@ -379,6 +396,30 @@ void rtMemFree(const char *pszOp, RTMEMTYPE enmType, void *pv, void *pvCaller, u
         if (gfRTMemFreeLog)
             RTLogPrintf("RTMem %s: pv=%p pvCaller=%p cb=%#x\n", pszOp, pv, pvCaller, pBlock->cb);
 
+#ifdef RTALLOC_EFENCE_NOMAN_FILLER
+        /*
+         * Check whether the no man's land is untouched.
+         */
+# ifdef RTALLOC_EFENCE_IN_FRONT
+        void *p = ASMMemIsAll8((char *)pv + pBlock->cb,
+                               RT_ALIGN_Z(pBlock->cb, PAGE_SIZE) - pBlock->cb,
+                               RTALLOC_EFENCE_NOMAN_FILLER);
+# else
+        /* Alignment must match allocation alignment in rtMemAlloc(). */
+        size_t cbAlign = RT_ALIGN_Z(pBlock->cb, RTALLOC_EFENCE_ALIGNMENT);
+        void *p = ASMMemIsAll8((char *)pv + pBlock->cb,
+                               cbAlign - pBlock->cb,
+                               RTALLOC_EFENCE_NOMAN_FILLER);
+        if (p)
+            RTAssertDoPanic();
+        p = ASMMemIsAll8((void *)((uintptr_t)pv & ~PAGE_OFFSET_MASK),
+                         RT_ALIGN_Z(cbAlign, PAGE_SIZE) - cbAlign,
+                         RTALLOC_EFENCE_NOMAN_FILLER);
+# endif
+        if (p)
+            RTAssertDoPanic();
+#endif
+
     #ifdef RTALLOC_EFENCE_FREE_FILL
         /*
          * Fill the user part of the block.
diff --git a/src/VBox/Runtime/r3/alloc-ef.h b/src/VBox/Runtime/r3/alloc-ef.h
index 83e0d47c0..c0a4ea84e 100644
--- a/src/VBox/Runtime/r3/alloc-ef.h
+++ b/src/VBox/Runtime/r3/alloc-ef.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -53,6 +53,20 @@
  */
 #define RTALLOC_EFENCE_SIZE             PAGE_SIZE
 
+/** @def RTALLOC_EFENCE_ALIGNMENT
+ * The allocation alignment, power of two of course.
+ *
+ * Normally, 1 would be the perfect choice here, except that there is code, like
+ * the atomic operations in iprt/asm.h, that makes assumptions about naturally
+ * aligned data members.  If the code you're working against doesn't have strict
+ * alignment requirements, changing this to 1 is highly desirable.
+ */
+#if 1
+# define RTALLOC_EFENCE_ALIGNMENT       (ARCH_BITS / 8)
+#else
+# define RTALLOC_EFENCE_ALIGNMENT       1
+#endif
+
 /** @def RTALLOC_EFENCE_IN_FRONT
  * Define this to put the fence up in front of the block.
  * The default (when this isn't defined) is to up it up after the block.
@@ -80,7 +94,7 @@
  * decommitted.
  * Requires RTALLOC_EFENCE_TRACE.
  */
-#if defined(RT_OS_LINUX)
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
 # define RTALLOC_EFENCE_FREE_FILL       'f'
 #endif
 
@@ -90,6 +104,18 @@
  */
 #define RTALLOC_EFENCE_FILLER           0xef
 
+/** @def RTALLOC_EFENCE_NOMAN_FILLER
+ * This define will enable memset(,RTALLOC_EFENCE_NOMAN_FILLER,)'ing the
+ * unprotected but not allocated area of memory, the so called no man's land.
+ */
+#define RTALLOC_EFENCE_NOMAN_FILLER     0xaa
+
+/** @def RTALLOC_EFENCE_FENCE_FILLER
+ * This define will enable memset(,RTALLOC_EFENCE_FENCE_FILLER,)'ing the
+ * fence itself, as debuggers can usually read them.
+ */
+#define RTALLOC_EFENCE_FENCE_FILLER     0xcc
+
 #if defined(__DOXYGEN__)
 /** @def RTALLOC_EFENCE_CPP
  * This define will enable the new and delete wrappers.
diff --git a/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp b/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp
new file mode 100644
index 000000000..980b39152
--- /dev/null
+++ b/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp
@@ -0,0 +1,534 @@
+/* $Id: fileaio-solaris.cpp $ */
+/** @file
+ * IPRT - File async I/O, native implementation for the Solaris host platform.
+ */
+
+/*
+ * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ *
+ * Sun Microsystems, Inc. confidential
+ * All rights reserved
+ */
+
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#define LOG_GROUP RTLOGGROUP_FILE
+#include <iprt/asm.h>
+#include <iprt/file.h>
+#include <iprt/mem.h>
+#include <iprt/assert.h>
+#include <iprt/string.h>
+#include <iprt/err.h>
+#include <iprt/log.h>
+#include "internal/fileaio.h"
+
+#include <port.h>
+#include <aio.h>
+#include <errno.h>
+#include <unistd.h>
+
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+/**
+ * Async I/O completion context state.
+ */
+typedef struct RTFILEAIOCTXINTERNAL
+{
+    /** Handle to the port. */
+    int               iPort;
+    /** Current number of requests active on this context. */
+    volatile int32_t  cRequests;
+    /** Magic value (RTFILEAIOCTX_MAGIC). */
+    uint32_t          u32Magic;
+} RTFILEAIOCTXINTERNAL;
+/** Pointer to an internal context structure. */
+typedef RTFILEAIOCTXINTERNAL *PRTFILEAIOCTXINTERNAL;
+
+/**
+ * Async I/O request state.
+ */
+typedef struct RTFILEAIOREQINTERNAL
+{
+    /** The aio control block. Must be the FIRST
+     *  element. */
+    struct aiocb           AioCB;
+    /** Current state the request is in. */
+    RTFILEAIOREQSTATE      enmState;
+    /** Flag whether this is a flush request. */
+    bool                   fFlush;
+    /** Port notifier object to associate a request to a port. */
+    port_notify_t          PortNotifier;
+    /** Opaque user data. */
+    void                  *pvUser;
+    /** Completion context we are assigned to. */
+    PRTFILEAIOCTXINTERNAL  pCtxInt;
+    /** Magic value  (RTFILEAIOREQ_MAGIC). */
+    uint32_t               u32Magic;
+} RTFILEAIOREQINTERNAL;
+/** Pointer to an internal request structure. */
+typedef RTFILEAIOREQINTERNAL *PRTFILEAIOREQINTERNAL;
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** The max number of events to get in one call. */
+#define AIO_MAXIMUM_REQUESTS_PER_CONTEXT 64
+/** Id for the wakeup event. */
+#define AIO_CONTEXT_WAKEUP_EVENT 1
+
+RTR3DECL(int) RTFileAioGetLimits(PRTFILEAIOLIMITS pAioLimits)
+{
+    int rcBSD = 0;
+    AssertPtrReturn(pAioLimits, VERR_INVALID_POINTER);
+
+    /* No limits known. */
+    pAioLimits->cReqsOutstandingMax = RTFILEAIO_UNLIMITED_REQS;
+    pAioLimits->cbBufferAlignment   = 0;
+
+    return VINF_SUCCESS;
+}
+
+RTR3DECL(int) RTFileAioReqCreate(PRTFILEAIOREQ phReq)
+{
+    AssertPtrReturn(phReq, VERR_INVALID_POINTER);
+
+    PRTFILEAIOREQINTERNAL pReqInt = (PRTFILEAIOREQINTERNAL)RTMemAllocZ(sizeof(RTFILEAIOREQINTERNAL));
+    if (RT_UNLIKELY(!pReqInt))
+        return VERR_NO_MEMORY;
+
+    /* Ininitialize static parts. */
+    pReqInt->AioCB.aio_sigevent.sigev_notify = SIGEV_PORT;
+    pReqInt->AioCB.aio_sigevent.sigev_value.sival_ptr = &pReqInt->PortNotifier;
+    pReqInt->PortNotifier.portnfy_user = pReqInt;
+    pReqInt->pCtxInt                   = NULL;
+    pReqInt->u32Magic                  = RTFILEAIOREQ_MAGIC;
+    RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+
+    *phReq = (RTFILEAIOREQ)pReqInt;
+
+    return VINF_SUCCESS;
+}
+
+RTDECL(int) RTFileAioReqDestroy(RTFILEAIOREQ hReq)
+{
+    /*
+     * Validate the handle and ignore nil.
+     */
+    if (hReq == NIL_RTFILEAIOREQ)
+        return VINF_SUCCESS;
+    PRTFILEAIOREQINTERNAL pReqInt = hReq;
+    RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
+
+    /*
+     * Trash the magic and free it.
+     */
+    ASMAtomicUoWriteU32(&pReqInt->u32Magic, ~RTFILEAIOREQ_MAGIC);
+    RTMemFree(pReqInt);
+    return VINF_SUCCESS;
+}
+
+/**
+ * Worker setting up the request.
+ */
+DECLINLINE(int) rtFileAioReqPrepareTransfer(RTFILEAIOREQ hReq, RTFILE hFile,
+                                            unsigned uTransferDirection,
+                                            RTFOFF off, void *pvBuf, size_t cbTransfer,
+                                            void *pvUser)
+{
+    /*
+     * Validate the input.
+     */
+    PRTFILEAIOREQINTERNAL pReqInt = hReq;
+    RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
+    Assert(hFile != NIL_RTFILE);
+    AssertPtr(pvBuf);
+    Assert(off >= 0);
+    Assert(cbTransfer > 0);
+
+    pReqInt->AioCB.aio_lio_opcode = uTransferDirection;
+    pReqInt->AioCB.aio_fildes     = (int)hFile;
+    pReqInt->AioCB.aio_offset     = off;
+    pReqInt->AioCB.aio_nbytes     = cbTransfer;
+    pReqInt->AioCB.aio_buf        = pvBuf;
+    pReqInt->fFlush               = false;
+    pReqInt->pvUser               = pvUser;
+    pReqInt->pCtxInt              = NULL;
+    RTFILEAIOREQ_SET_STATE(pReqInt, PREPARED);
+
+    return VINF_SUCCESS;
+}
+
+RTDECL(int) RTFileAioReqPrepareRead(RTFILEAIOREQ hReq, RTFILE hFile, RTFOFF off,
+                                    void *pvBuf, size_t cbRead, void *pvUser)
+{
+    return rtFileAioReqPrepareTransfer(hReq, hFile, LIO_READ,
+                                       off, pvBuf, cbRead, pvUser);
+}
+
+RTDECL(int) RTFileAioReqPrepareWrite(RTFILEAIOREQ hReq, RTFILE hFile, RTFOFF off,
+                                     void *pvBuf, size_t cbWrite, void *pvUser)
+{
+    return rtFileAioReqPrepareTransfer(hReq, hFile, LIO_WRITE,
+                                       off, pvBuf, cbWrite, pvUser);
+}
+
+RTDECL(int) RTFileAioReqPrepareFlush(RTFILEAIOREQ hReq, RTFILE hFile, void *pvUser)
+{
+    PRTFILEAIOREQINTERNAL pReqInt = (PRTFILEAIOREQINTERNAL)hReq;
+
+    RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
+    Assert(hFile != NIL_RTFILE);
+
+    pReqInt->fFlush           = true;
+    pReqInt->AioCB.aio_fildes = (int)hFile;
+    pReqInt->pvUser           = pvUser;
+    RTFILEAIOREQ_SET_STATE(pReqInt, PREPARED);
+
+    return VINF_SUCCESS;
+}
+
+RTDECL(void *) RTFileAioReqGetUser(RTFILEAIOREQ hReq)
+{
+    PRTFILEAIOREQINTERNAL pReqInt = hReq;
+    RTFILEAIOREQ_VALID_RETURN_RC(pReqInt, NULL);
+
+    return pReqInt->pvUser;
+}
+
+RTDECL(int) RTFileAioReqCancel(RTFILEAIOREQ hReq)
+{
+    PRTFILEAIOREQINTERNAL pReqInt = hReq;
+    RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_NOT_SUBMITTED);
+
+    int rcSolaris = aio_cancel(pReqInt->AioCB.aio_fildes, &pReqInt->AioCB);
+
+    if (rcSolaris == AIO_CANCELED)
+    {
+        /*
+         * Decrement request count because the request will never arrive at the
+         * completion port.
+         */
+        AssertMsg(VALID_PTR(pReqInt->pCtxInt),
+                  ("Invalid state. Request was canceled but wasn't submitted\n"));
+
+        ASMAtomicDecS32(&pReqInt->pCtxInt->cRequests);
+        RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+        return VINF_SUCCESS;
+    }
+    else if (rcSolaris == AIO_ALLDONE)
+        return VERR_FILE_AIO_COMPLETED;
+    else if (rcSolaris == AIO_NOTCANCELED)
+        return VERR_FILE_AIO_IN_PROGRESS;
+    else
+        return RTErrConvertFromErrno(errno);
+}
+
+RTDECL(int) RTFileAioReqGetRC(RTFILEAIOREQ hReq, size_t *pcbTransfered)
+{
+    PRTFILEAIOREQINTERNAL pReqInt = hReq;
+    RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, PREPARED, VERR_FILE_AIO_NOT_SUBMITTED);
+    AssertPtrNull(pcbTransfered);
+
+    int rcSol = aio_error(&pReqInt->AioCB);
+    Assert(rcSol != EINPROGRESS); /* Handled by our own state handling. */
+
+    if (rcSol == 0)
+    {
+        if (pcbTransfered)
+            *pcbTransfered = aio_return(&pReqInt->AioCB);
+        return VINF_SUCCESS;
+    }
+
+    /* An error occurred. */
+    return RTErrConvertFromErrno(rcSol);
+}
+
+RTDECL(int) RTFileAioCtxCreate(PRTFILEAIOCTX phAioCtx, uint32_t cAioReqsMax)
+{
+    int rc = VINF_SUCCESS;
+    PRTFILEAIOCTXINTERNAL pCtxInt;
+    AssertPtrReturn(phAioCtx, VERR_INVALID_POINTER);
+
+    pCtxInt = (PRTFILEAIOCTXINTERNAL)RTMemAllocZ(sizeof(RTFILEAIOCTXINTERNAL));
+    if (RT_UNLIKELY(!pCtxInt))
+        return VERR_NO_MEMORY;
+
+    /* Init the event handle. */
+    pCtxInt->iPort = port_create();
+    if (RT_LIKELY(pCtxInt->iPort > 0))
+    {
+        pCtxInt->u32Magic     = RTFILEAIOCTX_MAGIC;
+        *phAioCtx = (RTFILEAIOCTX)pCtxInt;
+    }
+    else
+    {
+        RTMemFree(pCtxInt);
+        rc = RTErrConvertFromErrno(errno);
+    }
+
+    return rc;
+}
+
+RTDECL(int) RTFileAioCtxDestroy(RTFILEAIOCTX hAioCtx)
+{
+    /* Validate the handle and ignore nil. */
+    if (hAioCtx == NIL_RTFILEAIOCTX)
+        return VINF_SUCCESS;
+    PRTFILEAIOCTXINTERNAL pCtxInt = hAioCtx;
+    RTFILEAIOCTX_VALID_RETURN(pCtxInt);
+
+    /* Cannot destroy a busy context. */
+    if (RT_UNLIKELY(pCtxInt->cRequests))
+        return VERR_FILE_AIO_BUSY;
+
+    close(pCtxInt->iPort);
+    ASMAtomicUoWriteU32(&pCtxInt->u32Magic, RTFILEAIOCTX_MAGIC_DEAD);
+    RTMemFree(pCtxInt);
+
+    return VINF_SUCCESS;
+}
+
+RTDECL(uint32_t) RTFileAioCtxGetMaxReqCount(RTFILEAIOCTX hAioCtx)
+{
+    return RTFILEAIO_UNLIMITED_REQS;
+}
+
+RTDECL(int) RTFileAioCtxAssociateWithFile(RTFILEAIOCTX hAioCtx, RTFILE hFile)
+{
+    return VINF_SUCCESS;
+}
+
+RTDECL(int) RTFileAioCtxSubmit(RTFILEAIOCTX hAioCtx, PRTFILEAIOREQ pahReqs, size_t cReqs)
+{
+    /*
+     * Parameter validation.
+     */
+    int rc = VINF_SUCCESS;
+    PRTFILEAIOCTXINTERNAL pCtxInt = hAioCtx;
+    RTFILEAIOCTX_VALID_RETURN(pCtxInt);
+    AssertReturn(cReqs > 0,  VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pahReqs, VERR_INVALID_POINTER);
+    size_t i = cReqs;
+
+    do
+    {
+        int rcSol = 0;
+        size_t cReqsSubmit = 0;
+        PRTFILEAIOREQINTERNAL pReqInt;
+
+        while(i-- > 0)
+        {
+            pReqInt = pahReqs[i];
+            if (RTFILEAIOREQ_IS_NOT_VALID(pReqInt))
+            {
+                /* Undo everything and stop submitting. */
+                for (size_t iUndo = 0; iUndo < i; iUndo++)
+                {
+                    pReqInt = pahReqs[iUndo];
+                    RTFILEAIOREQ_SET_STATE(pReqInt, PREPARED);
+                    pReqInt->pCtxInt = NULL;
+                }
+                rc = VERR_INVALID_HANDLE;
+                break;
+            }
+
+            pReqInt->PortNotifier.portnfy_port = pCtxInt->iPort;
+            pReqInt->pCtxInt                   = pCtxInt;
+            RTFILEAIOREQ_SET_STATE(pReqInt, SUBMITTED);
+
+            if (pReqInt->fFlush)
+                break;
+
+            cReqsSubmit++;
+        }
+
+        if (cReqsSubmit)
+        {
+            rcSol = lio_listio(LIO_NOWAIT, (struct aiocb **)pahReqs, cReqsSubmit, NULL);
+            if (RT_UNLIKELY(rcSol < 0))
+            {
+                if (rcSol == EAGAIN)
+                    rc = VERR_FILE_AIO_INSUFFICIENT_RESSOURCES;
+                else
+                    rc = RTErrConvertFromErrno(errno);
+
+                /* Check which requests got actually submitted and which not. */
+                for (i = 0; i < cReqs; i++)
+                {
+                    pReqInt = pahReqs[i];
+                    rcSol = aio_error(&pReqInt->AioCB);
+                    if (rcSol == EINVAL)
+                    {
+                        /* Was not submitted. */
+                        RTFILEAIOREQ_SET_STATE(pReqInt, PREPARED);
+                        pReqInt->pCtxInt = NULL;
+                    }
+                    else if (rcSol != EINPROGRESS)
+                    {
+                        /* The request encountered an error. */
+                        RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+                    }
+                }
+                break;
+            }
+
+            ASMAtomicAddS32(&pCtxInt->cRequests, cReqsSubmit);
+            cReqs   -= cReqsSubmit;
+            pahReqs += cReqsSubmit;
+        }
+
+        if (cReqs)
+        {
+            pReqInt = pahReqs[0];
+            RTFILEAIOREQ_VALID_RETURN(pReqInt);
+
+            /*
+             * If there are still requests left we have a flush request.
+             * lio_listio does not work with this requests so
+             * we have to use aio_fsync directly.
+             */
+            rcSol = aio_fsync(O_SYNC, &pReqInt->AioCB);
+            if (RT_UNLIKELY(rcSol < 0))
+            {
+                RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+                rc = RTErrConvertFromErrno(errno);
+                break;
+            }
+
+            ASMAtomicIncS32(&pCtxInt->cRequests);
+            cReqs--;
+            pahReqs++;
+        }
+    } while (cReqs);
+
+    return rc;
+}
+
+RTDECL(int) RTFileAioCtxWait(RTFILEAIOCTX hAioCtx, size_t cMinReqs, unsigned cMillisTimeout,
+                             PRTFILEAIOREQ pahReqs, size_t cReqs, uint32_t *pcReqs)
+{
+    int rc = VINF_SUCCESS;
+    int cRequestsCompleted = 0;
+
+    /*
+     * Validate the parameters, making sure to always set pcReqs.
+     */
+    AssertPtrReturn(pcReqs, VERR_INVALID_POINTER);
+    *pcReqs = 0; /* always set */
+    PRTFILEAIOCTXINTERNAL pCtxInt = hAioCtx;
+    RTFILEAIOCTX_VALID_RETURN(pCtxInt);
+    AssertPtrReturn(pahReqs, VERR_INVALID_POINTER);
+    AssertReturn(cReqs != 0, VERR_INVALID_PARAMETER);
+    AssertReturn(cReqs >= cMinReqs, VERR_OUT_OF_RANGE);
+
+    if (RT_UNLIKELY(ASMAtomicReadS32(&pCtxInt->cRequests) == 0))
+        return VERR_FILE_AIO_NO_REQUEST;
+
+    /*
+     * Convert the timeout if specified.
+     */
+    struct timespec    *pTimeout = NULL;
+    struct timespec     Timeout = {0,0};
+    uint64_t            StartNanoTS = 0;
+    if (cMillisTimeout != RT_INDEFINITE_WAIT)
+    {
+        Timeout.tv_sec  = cMillisTimeout / 1000;
+        Timeout.tv_nsec = cMillisTimeout % 1000 * 1000000;
+        pTimeout = &Timeout;
+        StartNanoTS = RTTimeNanoTS();
+    }
+
+    /* Wait for at least one. */
+    if (!cMinReqs)
+        cMinReqs = 1;
+
+    while (   cMinReqs
+           && RT_SUCCESS_NP(rc))
+    {
+        port_event_t aPortEvents[AIO_MAXIMUM_REQUESTS_PER_CONTEXT];
+        uint_t cRequests    = cMinReqs;
+        int cRequestsToWait = cMinReqs < AIO_MAXIMUM_REQUESTS_PER_CONTEXT ? cReqs : AIO_MAXIMUM_REQUESTS_PER_CONTEXT;
+        int rcSol;
+        uint64_t StartTime;
+
+        rcSol = port_getn(pCtxInt->iPort, &aPortEvents[0], cRequestsToWait, &cRequests, pTimeout);
+
+        if (RT_UNLIKELY(rcSol < 0))
+            rc = RTErrConvertFromErrno(errno);
+
+        /* Process received events. */
+        for (uint_t i = 0; i < cRequests; i++)
+        {
+            if (aPortEvents[i].portev_source == PORT_SOURCE_ALERT)
+            {
+                Assert(aPortEvents[i].portev_events == AIO_CONTEXT_WAKEUP_EVENT);
+                rc = VERR_INTERRUPTED; /* We've got interrupted. */
+                /* Reset the port. */
+                port_alert(pCtxInt->iPort, PORT_ALERT_SET, 0, NULL);
+            }
+            else
+            {
+                PRTFILEAIOREQINTERNAL pReqInt = (PRTFILEAIOREQINTERNAL)aPortEvents[i].portev_user;
+                AssertPtr(pReqInt);
+                Assert(pReqInt->u32Magic == RTFILEAIOREQ_MAGIC);
+
+                /* A request has finished. */
+                pahReqs[cRequestsCompleted++] = pReqInt;
+
+                /* Mark the request as finished. */
+                RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+            }
+        }
+
+        /*
+         * Done Yet? If not advance and try again.
+         */
+        if (cRequests >= cMinReqs)
+            break;
+        cMinReqs -= cRequests;
+        cReqs    -= cRequests;
+
+        if (cMillisTimeout != RT_INDEFINITE_WAIT)
+        {
+            uint64_t NanoTS = RTTimeNanoTS();
+            uint64_t cMilliesElapsed = (NanoTS - StartNanoTS) / 1000000;
+
+            /* The syscall supposedly updates it, but we're paranoid. :-) */
+            Timeout.tv_sec  = (cMillisTimeout - (unsigned)cMilliesElapsed) / 1000;
+            Timeout.tv_nsec = (cMillisTimeout - (unsigned)cMilliesElapsed) % 1000 * 1000000;
+        }
+    }
+
+    /*
+     * Update the context state and set the return value.
+     */
+    *pcReqs = cRequestsCompleted;
+    ASMAtomicSubS32(&pCtxInt->cRequests, cRequestsCompleted);
+
+    return rc;
+}
+
+RTDECL(int) RTFileAioCtxWakeup(RTFILEAIOCTX hAioCtx)
+{
+    int rc = VINF_SUCCESS;
+    PRTFILEAIOCTXINTERNAL pCtxInt = hAioCtx;
+    RTFILEAIOCTX_VALID_RETURN(pCtxInt);
+
+    rc = port_alert(pCtxInt->iPort, PORT_ALERT_UPDATE, AIO_CONTEXT_WAKEUP_EVENT, NULL);
+    if (RT_UNLIKELY((rc < 0) && (errno != EBUSY)))
+        return RTErrConvertFromErrno(errno);
+
+    return VINF_SUCCESS;
+}
+
diff --git a/src/VBox/Runtime/r3/tcp.cpp b/src/VBox/Runtime/r3/tcp.cpp
index 1ed09111a..a72b37ece 100644
--- a/src/VBox/Runtime/r3/tcp.cpp
+++ b/src/VBox/Runtime/r3/tcp.cpp
@@ -42,6 +42,9 @@
 # include <netinet/in.h>
 # include <netinet/tcp.h>
 # include <arpa/inet.h>
+# ifdef IPRT_WITH_TCPIP_V6
+#  include <netinet6/in6.h>
+# endif
 # include <sys/un.h>
 # include <netdb.h>
 # include <unistd.h>
@@ -140,6 +143,14 @@ typedef struct RTTCPSERVER
     void                       *pvUser;
 } RTTCPSERVER;
 
+typedef union RTSOCKADDRUNION
+{
+    struct sockaddr     Addr;
+    struct sockaddr_in  Ipv4;
+#ifdef IPRT_WITH_TCPIP_V6
+    struct sockaddr_in6 Ipv6;
+#endif
+} RTSOCKADDRUNION;
 
 /*******************************************************************************
 *   Internal Functions                                                         *
@@ -149,6 +160,7 @@ static int  rtTcpServerListen(PRTTCPSERVER pServer);
 static int  rcTcpServerListenCleanup(PRTTCPSERVER pServer);
 static int  rtTcpServerDestroySocket(RTSOCKET volatile *pSockClient, const char *pszMsg);
 static int  rtTcpClose(RTSOCKET Sock, const char *pszMsg, bool fTryGracefulShutdown);
+static int  rtTcpConvertAddress(RTSOCKADDRUNION *pSrc, size_t cbSrc, PRTNETADDR pAddr);
 
 
 
@@ -907,6 +919,68 @@ RTR3DECL(int)  RTTcpSelectOne(RTSOCKET Sock, unsigned cMillies)
 }
 
 
+static int rtTcpConvertAddress(RTSOCKADDRUNION *pSrc, size_t cbSrc, PRTNETADDR pAddr)
+{
+    /*
+     * Convert the address.
+     */
+    if (   cbSrc == sizeof(struct sockaddr_in)
+        && pSrc->Addr.sa_family == AF_INET)
+    {
+        RT_ZERO(*pAddr);
+        pAddr->enmType      = RTNETADDRTYPE_IPV4;
+        pAddr->uPort        = RT_N2H_U16(pSrc->Ipv4.sin_port);
+        pAddr->uAddr.IPv4.u = pSrc->Ipv4.sin_addr.s_addr;
+    }
+#ifdef IPRT_WITH_TCPIP_V6
+    else if (   cbSrc == sizeof(struct sockaddr_in6)
+             && pSrc->Addr.sa_family == AF_INET6)
+    {
+        RT_ZERO(*pAddr);
+        pAddr->enmType            = RTNETADDRTYPE_IPV6;
+        pAddr->uPort              = RT_N2H_U16(pSrc->Ipv6.sin6_port);
+        pAddr->uAddr.IPv6.au32[0] = pSrc->Ipv6.sin6_addr.s6_addr32[0];
+        pAddr->uAddr.IPv6.au32[1] = pSrc->Ipv6.sin6_addr.s6_addr32[1];
+        pAddr->uAddr.IPv6.au32[2] = pSrc->Ipv6.sin6_addr.s6_addr32[2];
+        pAddr->uAddr.IPv6.au32[3] = pSrc->Ipv6.sin6_addr.s6_addr32[3];
+    }
+#endif
+    else
+        return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED;
+    return VINF_SUCCESS;
+}
+
+
+RTR3DECL(int) RTTcpGetLocalAddress(RTSOCKET Sock, PRTNETADDR pAddr)
+{
+    RTSOCKADDRUNION u;
+#ifdef RT_OS_WINDOWS
+    int             cbAddr = sizeof(u);
+#else
+    socklen_t       cbAddr = sizeof(u);
+#endif
+    RT_ZERO(u);
+    if (!getsockname(Sock, &u.Addr, &cbAddr))
+        return rtTcpConvertAddress(&u, cbAddr, pAddr);
+    return rtTcpError();
+}
+
+
+RTR3DECL(int) RTTcpGetPeerAddress(RTSOCKET Sock, PRTNETADDR pAddr)
+{
+    RTSOCKADDRUNION u;
+#ifdef RT_OS_WINDOWS
+    int             cbAddr = sizeof(u);
+#else
+    socklen_t       cbAddr = sizeof(u);
+#endif
+    RT_ZERO(u);
+    if (!getpeername(Sock, &u.Addr, &cbAddr))
+        return rtTcpConvertAddress(&u, cbAddr, pAddr);
+    return rtTcpError();
+}
+
+
 RTR3DECL(int) RTTcpClientConnect(const char *pszAddress, uint32_t uPort, PRTSOCKET pSock)
 {
     int rc;
diff --git a/src/VBox/Runtime/testcase/Makefile.kmk b/src/VBox/Runtime/testcase/Makefile.kmk
index b06353132..5fae108bb 100644
--- a/src/VBox/Runtime/testcase/Makefile.kmk
+++ b/src/VBox/Runtime/testcase/Makefile.kmk
@@ -130,10 +130,12 @@ PROGRAMS.l4 += \
 PROGRAMS.darwin += \
 	tstDarwinSched
 SYSMODS += \
-	tstLdrObj \
 	tstLdrObjR0 \
 	tstRTR0MemUserKernel \
 	tstR0ThreadPreemption
+ifdef VBOX_WITH_RAW_MODE
+ SYSMODS += tstLdrObj
+endif
 if1of ($(VBOX_LDR_FMT)), lx pe)
 LIBRARIES += \
 	tstLdr-4Imp
@@ -226,29 +228,31 @@ tstLdr-2_DEFS = IN_DIS
 tstLdr-2_LIBS = \
 	$(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
 
-tstLdrObj_TEMPLATE = VBOXGC
-tstLdrObj_INST = $(INST_TESTCASE)
-tstLdrObj_SYSSUFF = .gc
-tstLdrObj_SOURCES = tstLdrObj.cpp
-tstLdrObj_DEFS = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
-ifeq ($(VBOX_LDR_FMT32),elf)
-tstLdrObj_DEFS += VBOX_SOME_IMPORT_FUNCTION
-endif
-tstLdrObj_LIBS = \
-	$(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
-	$(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
-ifeq ($(VBOX_LDR_FMT32),pe)
-tstLdrObj_LDFLAGS = -Entry:Entrypoint
-tstLdrObj_LIBS += \
-	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
-endif # PE
-ifeq ($(VBOX_LDR_FMT32),elf)
-tstLdrObj_LDFLAGS = -e Entrypoint
-endif
-ifeq ($(VBOX_LDR_FMT32),lx)
-tstLdrObj_LIBS += \
-	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
-endif
+ifdef VBOX_WITH_RAW_MODE
+ tstLdrObj_TEMPLATE = VBOXGC
+ tstLdrObj_INST = $(INST_TESTCASE)
+ tstLdrObj_SYSSUFF = .gc
+ tstLdrObj_SOURCES = tstLdrObj.cpp
+ tstLdrObj_DEFS = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
+ ifeq ($(VBOX_LDR_FMT32),elf)
+ tstLdrObj_DEFS += VBOX_SOME_IMPORT_FUNCTION
+ endif
+ tstLdrObj_LIBS = \
+ 	$(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
+ 	$(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
+ ifeq ($(VBOX_LDR_FMT32),pe)
+ tstLdrObj_LDFLAGS = -Entry:Entrypoint
+ tstLdrObj_LIBS += \
+ 	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
+ endif # PE
+ ifeq ($(VBOX_LDR_FMT32),elf)
+ tstLdrObj_LDFLAGS = -e Entrypoint
+ endif
+ ifeq ($(VBOX_LDR_FMT32),lx)
+ tstLdrObj_LIBS += \
+ 	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
+ endif
+endif # VBOX_WITH_RAW_MODE
 
 tstLdr-3_SOURCES = tstLdr-3.cpp
 tstLdr-3_DEFS = IN_DIS
diff --git a/src/VBox/VMM/HWACCMInternal.h b/src/VBox/VMM/HWACCMInternal.h
index 5c436ba32..b4c8b930d 100644
--- a/src/VBox/VMM/HWACCMInternal.h
+++ b/src/VBox/VMM/HWACCMInternal.h
@@ -121,10 +121,10 @@ RT_C_DECLS_BEGIN
  *  Currently #NM and #PF only
  */
 #ifdef VBOX_STRICT
-#define HWACCM_VMX_TRAP_MASK                RT_BIT(X86_XCPT_DE) | RT_BIT(X86_XCPT_NM) | RT_BIT(X86_XCPT_PF) | RT_BIT(X86_XCPT_UD) | RT_BIT(X86_XCPT_NP) | RT_BIT(X86_XCPT_SS) | RT_BIT(X86_XCPT_GP) | RT_BIT(X86_XCPT_MF)
+#define HWACCM_VMX_TRAP_MASK                RT_BIT(X86_XCPT_BP) | RT_BIT(X86_XCPT_DB) | RT_BIT(X86_XCPT_DE) | RT_BIT(X86_XCPT_NM) | RT_BIT(X86_XCPT_PF) | RT_BIT(X86_XCPT_UD) | RT_BIT(X86_XCPT_NP) | RT_BIT(X86_XCPT_SS) | RT_BIT(X86_XCPT_GP) | RT_BIT(X86_XCPT_MF)
 #define HWACCM_SVM_TRAP_MASK                HWACCM_VMX_TRAP_MASK
 #else
-#define HWACCM_VMX_TRAP_MASK                RT_BIT(X86_XCPT_NM) | RT_BIT(X86_XCPT_PF)
+#define HWACCM_VMX_TRAP_MASK                RT_BIT(X86_XCPT_DB) | RT_BIT(X86_XCPT_NM) | RT_BIT(X86_XCPT_PF)
 #define HWACCM_SVM_TRAP_MASK                RT_BIT(X86_XCPT_NM) | RT_BIT(X86_XCPT_PF)
 #endif
 /* All exceptions have to be intercept in emulated real-mode (minues NM & PF as they are always intercepted. */
diff --git a/src/VBox/VMM/Makefile.kmk b/src/VBox/VMM/Makefile.kmk
index d8608c65c..dceabe3b8 100644
--- a/src/VBox/VMM/Makefile.kmk
+++ b/src/VBox/VMM/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2010 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -57,6 +57,9 @@ endif
 ifdef VBOX_WITH_LIVE_MIGRATION
  VMMR3_DEFS    += VBOX_WITH_LIVE_MIGRATION
 endif
+ifdef VBOX_WITH_RAW_MODE
+ VMMR3_DEFS    += VBOX_WITH_RAW_MODE
+endif
 VMMR3_DEFS.darwin = VMM_R0_SWITCH_STACK
 VMMR3_DEFS.darwin.x86 = \
 	VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 \
@@ -178,18 +181,21 @@ ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
  	PDMAsyncCompletionFileCache.cpp
 endif
 
-VMMR3_SOURCES.x86 += \
-	VMMSwitcher/32BitTo32Bit.asm \
-	VMMSwitcher/32BitToPAE.asm \
-        VMMSwitcher/32BitToAMD64.asm \
-	VMMSwitcher/PAETo32Bit.asm \
-        VMMSwitcher/PAEToAMD64.asm \
-	VMMSwitcher/PAEToPAE.asm
-VMMR3_SOURCES.amd64 = \
-	VMMSwitcher/AMD64To32Bit.asm \
-	VMMSwitcher/AMD64ToPAE.asm
-VMMR3_SOURCES.darwin.x86 += \
-	VMMSwitcher/AMD64ToPAE.asm
+ifdef VBOX_WITH_RAW_MODE
+ VMMR3_SOURCES.x86 += \
+ 	VMMSwitcher/32BitTo32Bit.asm \
+ 	VMMSwitcher/32BitToPAE.asm \
+ 	VMMSwitcher/32BitToAMD64.asm \
+ 	VMMSwitcher/PAETo32Bit.asm \
+ 	VMMSwitcher/PAEToAMD64.asm \
+ 	VMMSwitcher/PAEToPAE.asm
+ VMMR3_SOURCES.amd64 = \
+ 	VMMSwitcher/AMD64To32Bit.asm \
+ 	VMMSwitcher/AMD64ToPAE.asm
+ VMMR3_SOURCES.darwin.x86 += \
+ 	VMMSwitcher/AMD64ToPAE.asm
+endif
+
 
 # SSM wish to know the build type, host os and arch.
 SSM.cpp_DEFS +=	\
@@ -240,32 +246,32 @@ SSMStandalone_DEFS      = IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE
 SSMStandalone_SOURCES   = SSM.cpp
 
 
-if1of ($(VBOX_LDR_FMT32), pe lx)
+if defined(VBOX_WITH_RAW_MODE) && $(intersects $(VBOX_LDR_FMT32), pe lx)
 
-#
-# VMMGCBuiltin.lib
-#
-LIBRARIES += VMMGCBuiltin
-VMMGCBuiltin_TEMPLATE = VBOXGC
+ #
+ # VMMGCBuiltin.lib
+ #
+ LIBRARIES += VMMGCBuiltin
+ VMMGCBuiltin_TEMPLATE = VBOXGC
  ifeq ($(VBOX_LDR_FMT32),pe)
-VMMGCBuiltin_SOURCES = VMMGC/VMMGCBuiltin.def
+  VMMGCBuiltin_SOURCES = VMMGC/VMMGCBuiltin.def
  endif
  ifeq ($(VBOX_LDR_FMT32),lx)
-VMMGCBuiltin_SOURCES = $(PATH_VMMGCBuiltin)/VMMGCBuiltin.def
-$$(PATH_VMMGCBuiltin)/VMMGCBuiltin.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGCBuiltin.def | $$(dir $$@)
+  VMMGCBuiltin_SOURCES = $(PATH_VMMGCBuiltin)/VMMGCBuiltin.def
+  $$(PATH_VMMGCBuiltin)/VMMGCBuiltin.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGCBuiltin.def | $$(dir $$@)
 	$(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' --output $@ $<
  endif
 
 
-#
-# VMMGCImp.lib
-#
-LIBRARIES += VMMGCImp
-VMMGCImp_TEMPLATE = VBOXGC
-VMMGCImp_SOURCES = $(PATH_VMMGCImp)/VMMGC.def
-VMMGCImp_CLEAN   = $(PATH_VMMGCImp)/VMMGC.def
+ #
+ # VMMGCImp.lib
+ #
+ LIBRARIES += VMMGCImp
+ VMMGCImp_TEMPLATE = VBOXGC
+ VMMGCImp_SOURCES = $(PATH_VMMGCImp)/VMMGC.def
+ VMMGCImp_CLEAN   = $(PATH_VMMGCImp)/VMMGC.def
 
-$$(PATH_VMMGCImp)/VMMGC.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGC.def | $$(dir $$@)
+ $$(PATH_VMMGCImp)/VMMGC.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGC.def | $$(dir $$@)
  ifeq ($(VBOX_LDR_FMT32),lx)
 	$(SED) \
 		-e '/not-os2/d' \
@@ -282,18 +288,19 @@ $$(PATH_VMMGCImp)/VMMGC.def: $(PATH_SUB_CURRENT)/VMMGC/VMMGC.def | $$(dir $$@)
 		--output $@ $<
  endif
 
-endif # RC: pe + lx
+endif # RC && (pe || lx)
 
-ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
-#
-# VMMR0Imp.lib
-#
-LIBRARIES += VMMR0Imp
-VMMR0Imp_TEMPLATE = VBOXR0
-VMMR0Imp_SOURCES  = $(PATH_VMMR0Imp)/VMMR0.def
-VMMR0Imp_CLEAN    = $(PATH_VMMR0Imp)/VMMR0.def
 
-$$(PATH_VMMR0Imp)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
+if1of ($(VBOX_LDR_FMT), pe lx)
+ #
+ # VMMR0Imp.lib
+ #
+ LIBRARIES += VMMR0Imp
+ VMMR0Imp_TEMPLATE = VBOXR0
+ VMMR0Imp_SOURCES  = $(PATH_VMMR0Imp)/VMMR0.def
+ VMMR0Imp_CLEAN    = $(PATH_VMMR0Imp)/VMMR0.def
+
+ $$(PATH_VMMR0Imp)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
  ifeq ($(VBOX_LDR_FMT),lx)
 	$(SED) \
 		-e '/not-os2/d' \
@@ -312,115 +319,117 @@ $$(PATH_VMMR0Imp)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
 endif # R0: pe + lx
 
 
-#
-# VMMGC.gc
-#
-SYSMODS += VMMGC
-VMMGC_TEMPLATE  = VBOXGC
-VMMGC_SYSSUFF   = .gc
-
-VMMGC_DEFS      = IN_VMM_RC IN_RT_GC IN_RT_RC IN_DIS DIS_CORE_ONLY
-ifdef VBOX_WITH_R0_LOGGING
- VMMGC_DEFS    += VBOX_WITH_R0_LOGGING
-endif
-ifdef VBOX_WITH_MULTI_CORE
- VMMGC_DEFS    += VBOX_WITH_MULTI_CORE
-endif
-ifdef VBOX_WITH_VMI
- VMMGC_DEFS    += VBOX_WITH_VMI
-endif
-ifeq ($(KBUILD_TARGET_ARCH),x86)
- VMMGC_DEFS.darwin = VMM_R0_SWITCH_STACK
- VMMGC_DEFS.darwin = \
- 	VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
- 	VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
-endif
+ifdef VBOX_WITH_RAW_MODE
+ #
+ # VMMGC.gc
+ #
+ SYSMODS += VMMGC
+ VMMGC_TEMPLATE  = VBOXGC
+ VMMGC_SYSSUFF   = .gc
 
-VMMGC_INCS     := \
-	. \
-	VMMGC \
-	PATM
+ VMMGC_DEFS      = IN_VMM_RC IN_RT_GC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE
+ ifdef VBOX_WITH_R0_LOGGING
+  VMMGC_DEFS    += VBOX_WITH_R0_LOGGING
+ endif
+ ifdef VBOX_WITH_MULTI_CORE
+  VMMGC_DEFS    += VBOX_WITH_MULTI_CORE
+ endif
+ ifdef VBOX_WITH_VMI
+  VMMGC_DEFS    += VBOX_WITH_VMI
+ endif
+ ifeq ($(KBUILD_TARGET_ARCH),x86)
+  VMMGC_DEFS.darwin = VMM_R0_SWITCH_STACK
+  VMMGC_DEFS.darwin = \
+  	VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
+  	VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
+ endif
 
-VMMGC_LIBS      = \
-	$(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
-	$(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
-ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),)
- VMMGC_LIBS    += \
-	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
-endif
+ VMMGC_INCS     := \
+ 	. \
+ 	VMMGC \
+ 	PATM
+
+ VMMGC_LIBS      = \
+ 	$(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
+ 	$(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
+ ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),)
+  VMMGC_LIBS    += \
+ 	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
+ endif
 
-ifeq ($(VBOX_LDR_FMT32),pe)
- VMMGC_LDFLAGS  = -Entry:VMMGCEntry
-endif
+ ifeq ($(VBOX_LDR_FMT32),pe)
+  VMMGC_LDFLAGS  = -Entry:VMMGCEntry
+ endif
 
-VMMGC_SOURCES   = \
-	VMMGC/VMMGC0.asm \
-	VMMGC/VMMGCDeps.cpp \
-	VMMGC/CPUMGC.cpp \
-	VMMGC/CPUMGCA.asm \
-	VMMGC/EMGCA.asm \
-	VMMGC/IOMGC.cpp \
-	VMMGC/MMRamGC.cpp \
-	VMMGC/MMRamGCA.asm \
-	VMMGC/PDMGCDevice.cpp \
-	VMMGC/PGMGC.cpp \
-	VMMGC/SELMGC.cpp \
-	VMMGC/TRPMGC.cpp \
-	VMMGC/TRPMGCHandlers.cpp \
-	VMMGC/TRPMGCHandlersA.asm \
-	VMMGC/VMMGC.cpp \
-	VMMGC/VMMGCA.asm \
-	VMMGC/HWACCMGCA.asm \
-	VMMRZ/DBGFRZ.cpp \
-	VMMRZ/VMMRZ.cpp \
-	VMMAll/CPUMAllRegs.cpp \
-	VMMAll/CPUMAllA.asm \
-	VMMAll/DBGFAll.cpp \
-	VMMAll/IOMAll.cpp \
-	VMMAll/IOMAllMMIO.cpp \
-	VMMAll/EMAll.cpp \
-	VMMAll/EMAllA.asm \
-	VMMAll/MMAll.cpp \
-	VMMAll/MMAllHyper.cpp \
-	VMMAll/PDMAll.cpp \
-	VMMAll/PDMAllCritSect.cpp \
-	VMMAll/PDMAllQueue.cpp \
-	VMMAll/PGMAll.cpp \
-	VMMAll/PGMAllHandler.cpp \
-	VMMAll/PGMAllMap.cpp \
-	VMMAll/PGMAllPhys.cpp \
-	VMMAll/PGMAllPool.cpp \
-	VMMAll/REMAll.cpp \
-	VMMAll/SELMAll.cpp \
-	VMMAll/TMAll.cpp \
-	VMMAll/TMAllCpu.cpp \
-	VMMAll/TMAllReal.cpp \
-	VMMAll/TMAllVirtual.cpp \
-	VMMAll/TRPMAll.cpp \
-	VMMAll/VMAll.cpp \
-	VMMAll/VMMAll.cpp \
-	VMMAll/VMMAllA.asm \
-	PATM/VMMGC/CSAMGC.cpp \
-	PATM/VMMAll/CSAMAll.cpp \
-	PATM/VMMGC/PATMGC.cpp \
-	PATM/VMMAll/PATMAll.cpp
-ifdef VBOX_WITH_VMI
- VMMGC_SOURCES += \
- 	PARAV/PARAV.cpp \
- 	PARAV/PARAVAll.cpp
-endif
-ifeq ($(VBOX_LDR_FMT32),pe)
- VMMGC_SOURCES += VMMGC/VMMGC.def
-endif
-ifeq ($(VBOX_LDR_FMT32),lx)
- VMMGC_SOURCES += $(PATH_VMMGCImp)/VMMGC.def
-endif
+ VMMGC_SOURCES   = \
+ 	VMMGC/VMMGC0.asm \
+ 	VMMGC/VMMGCDeps.cpp \
+ 	VMMGC/CPUMGC.cpp \
+ 	VMMGC/CPUMGCA.asm \
+ 	VMMGC/EMGCA.asm \
+ 	VMMGC/IOMGC.cpp \
+ 	VMMGC/MMRamGC.cpp \
+ 	VMMGC/MMRamGCA.asm \
+ 	VMMGC/PDMGCDevice.cpp \
+ 	VMMGC/PGMGC.cpp \
+ 	VMMGC/SELMGC.cpp \
+ 	VMMGC/TRPMGC.cpp \
+ 	VMMGC/TRPMGCHandlers.cpp \
+ 	VMMGC/TRPMGCHandlersA.asm \
+ 	VMMGC/VMMGC.cpp \
+ 	VMMGC/VMMGCA.asm \
+ 	VMMGC/HWACCMGCA.asm \
+ 	VMMRZ/DBGFRZ.cpp \
+ 	VMMRZ/VMMRZ.cpp \
+ 	VMMAll/CPUMAllRegs.cpp \
+ 	VMMAll/CPUMAllA.asm \
+ 	VMMAll/DBGFAll.cpp \
+ 	VMMAll/IOMAll.cpp \
+ 	VMMAll/IOMAllMMIO.cpp \
+ 	VMMAll/EMAll.cpp \
+ 	VMMAll/EMAllA.asm \
+ 	VMMAll/MMAll.cpp \
+ 	VMMAll/MMAllHyper.cpp \
+ 	VMMAll/PDMAll.cpp \
+ 	VMMAll/PDMAllCritSect.cpp \
+ 	VMMAll/PDMAllQueue.cpp \
+ 	VMMAll/PGMAll.cpp \
+ 	VMMAll/PGMAllHandler.cpp \
+ 	VMMAll/PGMAllMap.cpp \
+ 	VMMAll/PGMAllPhys.cpp \
+ 	VMMAll/PGMAllPool.cpp \
+ 	VMMAll/REMAll.cpp \
+ 	VMMAll/SELMAll.cpp \
+ 	VMMAll/TMAll.cpp \
+ 	VMMAll/TMAllCpu.cpp \
+ 	VMMAll/TMAllReal.cpp \
+ 	VMMAll/TMAllVirtual.cpp \
+ 	VMMAll/TRPMAll.cpp \
+ 	VMMAll/VMAll.cpp \
+ 	VMMAll/VMMAll.cpp \
+ 	VMMAll/VMMAllA.asm \
+ 	PATM/VMMGC/CSAMGC.cpp \
+ 	PATM/VMMAll/CSAMAll.cpp \
+ 	PATM/VMMGC/PATMGC.cpp \
+ 	PATM/VMMAll/PATMAll.cpp
+ ifdef VBOX_WITH_VMI
+  VMMGC_SOURCES += \
+  	PARAV/PARAV.cpp \
+  	PARAV/PARAVAll.cpp
+ endif
+ ifeq ($(VBOX_LDR_FMT32),pe)
+  VMMGC_SOURCES += VMMGC/VMMGC.def
+ endif
+ ifeq ($(VBOX_LDR_FMT32),lx)
+  VMMGC_SOURCES += $(PATH_VMMGCImp)/VMMGC.def
+ endif
 
 
-# the very last one.
-VMMGC_SOURCES += VMMGC/VMMGC99.asm
+ # the very last one.
+ VMMGC_SOURCES += VMMGC/VMMGC99.asm
 
-VMMGC/VMMGCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMGCDeps.cpp to .c
+ VMMGC/VMMGCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMGCDeps.cpp to .c
+endif # VBOX_WITH_RAW_MODE
 
 
 #
@@ -441,6 +450,9 @@ endif
 ifdef VBOX_WITH_MULTI_CORE
  VMMR0_DEFS    += VBOX_WITH_MULTI_CORE
 endif
+ifdef VBOX_WITH_RAW_MODE
+ VMMR0_DEFS    += VBOX_WITH_RAW_MODE
+endif
 VMMR0_DEFS.darwin = VMM_R0_SWITCH_STACK
 VMMR0_DEFS.darwin.x86 = \
 	VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 \
@@ -517,6 +529,7 @@ VMMR0_SOURCES.darwin.x86 = \
 	VMMR0/PGMR0DynMap.cpp
 
 # disable annoying warnings about array subscript above array bounds in aPages[]
+PGMPool.cpp_CXXFLAGS = $(if-expr $(KBUILD_TARGET) == "win",,$(VBOX_GCC_Wno-array_bounds))
 VMMAll/PGMAllPool.cpp_CXXFLAGS = $(if-expr $(KBUILD_TARGET) == "win",,$(VBOX_GCC_Wno-array_bounds))
 
 
diff --git a/src/VBox/VMM/PDMLdr.cpp b/src/VBox/VMM/PDMLdr.cpp
index 65498931c..a8e8a7fdf 100644
--- a/src/VBox/VMM/PDMLdr.cpp
+++ b/src/VBox/VMM/PDMLdr.cpp
@@ -96,7 +96,7 @@ VMMR3DECL(int) PDMR3LdrLoadVMMR0U(PUVM pUVM)
  */
 int pdmR3LdrInitU(PUVM pUVM)
 {
-#ifdef PDMLDR_FAKE_MODE
+#if defined(PDMLDR_FAKE_MODE) || !defined(VBOX_WITH_RAW_MODE)
     return VINF_SUCCESS;
 
 #else
@@ -147,7 +147,9 @@ void pdmR3LdrTermU(PUVM pUVM)
                 break;
             }
 
+#ifdef VBOX_WITH_RAW_MODE
             case PDMMOD_TYPE_RC:
+#endif
             case PDMMOD_TYPE_R3:
                 /* MM will free this memory for us - it's alloc only memory. :-) */
                 break;
@@ -176,6 +178,7 @@ void pdmR3LdrTermU(PUVM pUVM)
  */
 VMMR3DECL(void) PDMR3LdrRelocateU(PUVM pUVM, RTGCINTPTR offDelta)
 {
+#ifdef VBOX_WITH_RAW_MODE
     LogFlow(("PDMR3LdrRelocate: offDelta=%RGv\n", offDelta));
 
     /*
@@ -216,6 +219,7 @@ VMMR3DECL(void) PDMR3LdrRelocateU(PUVM pUVM, RTGCINTPTR offDelta)
             }
         }
     }
+#endif
 }
 
 
@@ -301,6 +305,7 @@ int pdmR3LoadR3U(PUVM pUVM, const char *pszFilename, const char *pszName)
 }
 
 
+#ifdef VBOX_WITH_RAW_MODE
 /**
  * Resolve an external symbol during RTLdrGetBits() of a RC module.
  *
@@ -537,6 +542,7 @@ VMMR3DECL(int) PDMR3LdrLoadRC(PVM pVM, const char *pszFilename, const char *pszN
     RTMemTmpFree(pszFile);
     return rc;
 }
+#endif /* VBOX_WITH_RAW_MODE */
 
 
 /**
@@ -775,7 +781,7 @@ VMMR3DECL(int) PDMR3LdrGetSymbolR0Lazy(PVM pVM, const char *pszModule, const cha
  */
 VMMR3DECL(int) PDMR3LdrGetSymbolRC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTRCPTR pRCPtrValue)
 {
-#ifdef PDMLDR_FAKE_MODE
+#if defined(PDMLDR_FAKE_MODE) || !defined(VBOX_WITH_RAW_MODE)
     *pRCPtrValue = 0xfeedf00d;
     return VINF_SUCCESS;
 
@@ -831,7 +837,7 @@ VMMR3DECL(int) PDMR3LdrGetSymbolRC(PVM pVM, const char *pszModule, const char *p
  */
 VMMR3DECL(int) PDMR3LdrGetSymbolRCLazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTRCPTR pRCPtrValue)
 {
-#ifdef PDMLDR_FAKE_MODE
+#if defined(PDMLDR_FAKE_MODE) || !defined(VBOX_WITH_RAW_MODE)
     *pRCPtrValue = 0xfeedf00d;
     return VINF_SUCCESS;
 
diff --git a/src/VBox/VMM/PGM.cpp b/src/VBox/VMM/PGM.cpp
index a8012130e..058cb644d 100644
--- a/src/VBox/VMM/PGM.cpp
+++ b/src/VBox/VMM/PGM.cpp
@@ -1190,6 +1190,9 @@ VMMR3DECL(int) PGMR3Init(PVM pVM)
     /*
      * Init the structure.
      */
+#ifdef PGM_WITHOUT_MAPPINGS
+    pVM->pgm.s.fMappingsDisabled = true;
+#endif
     pVM->pgm.s.offVM       = RT_OFFSETOF(VM, pgm.s);
     pVM->pgm.s.offVCpuPGM  = RT_OFFSETOF(VMCPU, pgm.s);
 
@@ -3032,6 +3035,8 @@ VMMR3DECL(int) PGMR3ChangeMode(PVM pVM, PVMCPU pVCpu, PGMMODE enmGuestMode)
      */
     VMMSWITCHER enmSwitcher;
     PGMMODE     enmShadowMode = pgmR3CalcShadowMode(pVM, enmGuestMode, pVM->pgm.s.enmHostMode, pVCpu->pgm.s.enmShadowMode, &enmSwitcher);
+
+#ifdef VBOX_WITH_RAW_MODE
     if (enmSwitcher != VMMSWITCHER_INVALID)
     {
         /*
@@ -3044,6 +3049,7 @@ VMMR3DECL(int) PGMR3ChangeMode(PVM pVM, PVMCPU pVCpu, PGMMODE enmGuestMode)
             return rc;
         }
     }
+#endif
 
     /*
      * Exit old mode(s).
diff --git a/src/VBox/VMM/PGMInternal.h b/src/VBox/VMM/PGMInternal.h
index f7004e7da..452e766e8 100644
--- a/src/VBox/VMM/PGMInternal.h
+++ b/src/VBox/VMM/PGMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -59,7 +59,7 @@
  * Indicates that there are no guest mappings to care about.
  * Currently on raw-mode related code uses mappings, i.e. RC and R3 code.
  */
-#ifdef IN_RING0
+#if defined(IN_RING0) || !defined(VBOX_WITH_RAW_MODE)
 # define PGM_WITHOUT_MAPPINGS
 #endif
 
@@ -3396,7 +3396,6 @@ DECLINLINE(int) pgmPoolTrackFlushGCPhys(PVM pVM, PPGMPAGE pPhysPage, bool *pfFlu
 
 uint16_t        pgmPoolTrackPhysExtAddref(PVM pVM, uint16_t u16, uint16_t iShwPT);
 void            pgmPoolTrackPhysExtDerefGCPhys(PPGMPOOL pPool, PPGMPOOLPAGE pPoolPage, PPGMPAGE pPhysPage);
-void            pgmPoolTracDerefGCPhysHint(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTHCPHYS HCPhys, RTGCPHYS GCPhysHint);
 #ifdef PGMPOOL_WITH_MONITORING
 void            pgmPoolMonitorChainChanging(PVMCPU pVCpu, PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTGCPHYS GCPhysFault, CTXTYPE(RTGCPTR, RTHCPTR, RTGCPTR) pvAddress, PDISCPUSTATE pCpu);
 int             pgmPoolMonitorChainFlush(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
@@ -3427,6 +3426,10 @@ PX86PML4        pgmGstLazyMapPml4(PPGMCPU pPGM);
 
 RT_C_DECLS_END
 
+/** @todo Split out all the inline stuff into a separate file.  Then we can
+ *        include it later when VM and VMCPU are defined and so avoid all that
+ *        &pVM->pgm.s and &pVCpu->pgm.s stuff.  It also chops ~1600 lines off
+ *        this file and will make it somewhat easier to navigate... */
 
 /**
  * Gets the PGMRAMRANGE structure for a guest page.
diff --git a/src/VBox/VMM/VMM.cpp b/src/VBox/VMM/VMM.cpp
index fe9e9450c..c326e4bb5 100644
--- a/src/VBox/VMM/VMM.cpp
+++ b/src/VBox/VMM/VMM.cpp
@@ -751,7 +751,9 @@ VMMR3DECL(void) VMMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     /*
      * Recalc the RC address.
      */
+#ifdef VBOX_WITH_RAW_MODE
     pVM->vmm.s.pvCoreCodeRC = MMHyperR3ToRC(pVM, pVM->vmm.s.pvCoreCodeR3);
+#endif
 
     /*
      * The stack.
diff --git a/src/VBox/VMM/VMMAll/PGMAll.cpp b/src/VBox/VMM/VMMAll/PGMAll.cpp
index 555e029ee..cded57283 100644
--- a/src/VBox/VMM/VMMAll/PGMAll.cpp
+++ b/src/VBox/VMM/VMMAll/PGMAll.cpp
@@ -1878,16 +1878,19 @@ VMMDECL(int) PGMSyncCR3(PVMCPU pVCpu, uint64_t cr0, uint64_t cr3, uint64_t cr4,
             pVCpu->pgm.s.GCPhysCR3 = GCPhysCR3;
             rc = PGM_BTH_PFN(MapCR3, pVCpu)(pVCpu, GCPhysCR3);
         }
+        /* Make sure we check for pending pgm pool syncs as we clear VMCPU_FF_PGM_SYNC_CR3 later on! */
+        if (    rc == VINF_PGM_SYNC_CR3
+            ||  (pVCpu->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL))
+        {
+            Log(("PGMSyncCR3: pending pgm pool sync after MapCR3!\n"));
 #ifdef IN_RING3
-        if (rc == VINF_PGM_SYNC_CR3)
             rc = pgmPoolSyncCR3(pVCpu);
 #else
-        if (rc == VINF_PGM_SYNC_CR3)
-        {
-            pVCpu->pgm.s.GCPhysCR3 = GCPhysCR3Old;
-            return rc;
-        }
+            if (rc == VINF_PGM_SYNC_CR3)
+                pVCpu->pgm.s.GCPhysCR3 = GCPhysCR3Old;
+            return VINF_PGM_SYNC_CR3;
 #endif
+        }
         AssertRCReturn(rc, rc);
         AssertRCSuccessReturn(rc, VERR_INTERNAL_ERROR);
     }
diff --git a/src/VBox/VMM/VMMAll/PGMAllBth.h b/src/VBox/VMM/VMMAll/PGMAllBth.h
index 267f17aa1..4dc82dbc3 100644
--- a/src/VBox/VMM/VMMAll/PGMAllBth.h
+++ b/src/VBox/VMM/VMMAll/PGMAllBth.h
@@ -780,12 +780,14 @@ PGM_BTH_DECL(int, Trap0eHandler)(PVMCPU pVCpu, RTGCUINT uErr, PCPUMCTXCORE pRegF
                  * to physical monitored regions, that are no longer valid.
                  * Assume for now it only applies to the read/write flag.
                  */
-                if (RT_SUCCESS(rc) && (uErr & X86_TRAP_PF_RW))
+                if (    RT_SUCCESS(rc) 
+                    &&  (uErr & X86_TRAP_PF_RW))
                 {
                     if (PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED)
                     {
-                        Log(("PGM #PF: Make writable: %RGp %R[pgmpage] pvFault=%RGp uErr=%#x\n",
-                             GCPhys, pPage, pvFault, uErr));
+                        Log(("PGM #PF: Make writable: %RGp %R[pgmpage] pvFault=%RGp uErr=%#x\n", GCPhys, pPage, pvFault, uErr));
+                        Assert(!PGM_PAGE_IS_ZERO(pPage));
+
                         rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, GCPhys);
                         if (rc != VINF_SUCCESS)
                         {
@@ -1403,9 +1405,13 @@ DECLINLINE(void) PGM_BTH_NAME(SyncPageWorkerTrackDeref)(PVMCPU pVCpu, PPGMPOOLPA
             if (PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]) == HCPhys)
             {
                 PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
-                pgmTrackDerefGCPhys(pPool, pShwPage, &pRam->aPages[iPage]);
+
+                Assert(pShwPage->cPresent);
+                Assert(pPool->cPresent);
                 pShwPage->cPresent--;
                 pPool->cPresent--;
+
+                pgmTrackDerefGCPhys(pPool, pShwPage, &pRam->aPages[iPage]);
                 STAM_PROFILE_STOP(&pVM->pgm.s.StatTrackDeref, a);
                 return;
             }
@@ -1503,13 +1509,17 @@ DECLINLINE(void) PGM_BTH_NAME(SyncPageWorker)(PVMCPU pVCpu, PSHWPTE pPteDst, GST
         if (RT_SUCCESS(rc))
         {
 #ifndef VBOX_WITH_NEW_LAZY_PAGE_ALLOC
-            /* Try make the page writable if necessary. */
-            if (    PteSrc.n.u1Write
-                &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
+            /* Try to make the page writable if necessary. */
+            if (    PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM
+                &&  (   PGM_PAGE_IS_ZERO(pPage)
+                     || (   PteSrc.n.u1Write
+                         && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
 # ifdef VBOX_WITH_REAL_WRITE_MONITORED_PAGES
-                &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
+                         && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
 # endif
-                &&  PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+                        )
+                     )
+               )
             {
                 rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, PteSrc.u & GST_PTE_PG_MASK);
                 AssertRC(rc);
@@ -1596,6 +1606,8 @@ DECLINLINE(void) PGM_BTH_NAME(SyncPageWorker)(PVMCPU pVCpu, PSHWPTE pPteDst, GST
                 &&  PteDst.n.u1Present
                 &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED)
             {
+                /* Still applies to shared pages. */
+                Assert(!PGM_PAGE_IS_ZERO(pPage));
                 PteDst.n.u1Write = 0;   /** @todo this isn't quite working yet. */
                 Log3(("SyncPageWorker: write-protecting %RGp pPage=%R[pgmpage]at iPTDst=%d\n", (RTGCPHYS)(PteSrc.u & X86_PTE_PAE_PG_MASK), pPage, iPTDst));
             }
@@ -1896,13 +1908,17 @@ PGM_BTH_DECL(int, SyncPage)(PVMCPU pVCpu, GSTPDE PdeSrc, RTGCPTR GCPtrPage, unsi
                 if (RT_SUCCESS(rc))
                 {
 # ifndef VBOX_WITH_NEW_LAZY_PAGE_ALLOC
-                    /* Try make the page writable if necessary. */
-                    if (    PdeSrc.n.u1Write
-                        &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
+                    /* Try to make the page writable if necessary. */
+                    if (    PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM
+                        &&  (   PGM_PAGE_IS_ZERO(pPage)
+                             || (   PdeSrc.n.u1Write
+                                 && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
 #  ifdef VBOX_WITH_REAL_WRITE_MONITORED_PAGES
-                        &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
+                                 && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
 #  endif
-                        &&  PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+                                )
+                             )
+                       )
                     {
                         rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, GCPhys);
                         AssertRC(rc);
@@ -1932,6 +1948,8 @@ PGM_BTH_DECL(int, SyncPage)(PVMCPU pVCpu, GSTPDE PdeSrc, RTGCPTR GCPtrPage, unsi
                         &&  PteDst.n.u1Present
                         &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED)
                     {
+                        /* Still applies to shared pages. */
+                        Assert(!PGM_PAGE_IS_ZERO(pPage));
                         PteDst.n.u1Write = 0;   /** @todo this isn't quite working yet... */
                         Log3(("SyncPage: write-protecting %RGp pPage=%R[pgmpage] at %RGv\n", GCPhys, pPage, GCPtrPage));
                     }
@@ -1949,7 +1967,8 @@ PGM_BTH_DECL(int, SyncPage)(PVMCPU pVCpu, GSTPDE PdeSrc, RTGCPTR GCPtrPage, unsi
                     /** @todo r=bird: figure out why we need this here, SyncPT should've taken care of this already.
                      * As for invlpg, it simply frees the whole shadow PT.
                      * ...It's possibly because the guest clears it and the guest doesn't really tell us... */
-                    if (!PdeSrc.b.u1Dirty && PdeSrc.b.u1Write)
+                    if (   !PdeSrc.b.u1Dirty
+                        &&  PdeSrc.b.u1Write)
                     {
                         STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_MID_Z(Stat,DirtyPageBig));
                         PdeDst.u |= PGM_PDFLAGS_TRACK_DIRTY;
@@ -2037,7 +2056,14 @@ PGM_BTH_DECL(int, SyncPage)(PVMCPU pVCpu, GSTPDE PdeSrc, RTGCPTR GCPtrPage, unsi
     Assert(pPDDst);
     PdeDst = pPDDst->a[iPDDst];
 # endif
-    AssertMsg(PdeDst.n.u1Present, ("%#llx\n", (uint64_t)PdeDst.u));
+    /* In the guest SMP case we could have blocked while another VCPU reused this page table. */
+    if (!PdeDst.n.u1Present)
+    {
+        AssertMsg(pVM->cCpus > 1, ("Unexpected missing PDE %RX64\n", (uint64_t)PdeDst.u));
+        Log(("CPU%d: SyncPage: Pde at %RGv changed behind our back!\n", GCPtrPage));
+        return VINF_SUCCESS;    /* force the instruction to be executed again. */
+    }
+
     PPGMPOOLPAGE  pShwPage = pgmPoolGetPage(pPool, PdeDst.u & SHW_PDE_PG_MASK);
     PSHWPT        pPTDst   = (PSHWPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage);
 
@@ -2703,7 +2729,8 @@ PGM_BTH_DECL(int, SyncPT)(PVMCPU pVCpu, unsigned iPDSrc, PGSTPD pPDSrc, RTGCPTR
                 PdeDst.u = pShwPage->Core.Key
                          | (PdeSrc.u & ~(GST_PDE_PG_MASK | X86_PDE_AVL_MASK | X86_PDE_PCD | X86_PDE_PWT | X86_PDE_PS | X86_PDE4M_G | X86_PDE4M_D));
                 /* (see explanation and assumptions further down.) */
-                if (!PdeSrc.b.u1Dirty && PdeSrc.b.u1Write)
+                if (    !PdeSrc.b.u1Dirty 
+                    &&  PdeSrc.b.u1Write)
                 {
                     STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_MID_Z(Stat,DirtyPageBig));
                     PdeDst.u |= PGM_PDFLAGS_TRACK_DIRTY;
@@ -2851,7 +2878,8 @@ PGM_BTH_DECL(int, SyncPT)(PVMCPU pVCpu, unsigned iPDSrc, PGSTPD pPDSrc, RTGCPTR
              */
             /** @todo move the above stuff to a section in the PGM documentation. */
             Assert(!(PdeDst.u & PGM_PDFLAGS_TRACK_DIRTY));
-            if (!PdeSrc.b.u1Dirty && PdeSrc.b.u1Write)
+            if (    !PdeSrc.b.u1Dirty 
+                &&  PdeSrc.b.u1Write)
             {
                 STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_MID_Z(Stat,DirtyPageBig));
                 PdeDst.u |= PGM_PDFLAGS_TRACK_DIRTY;
@@ -2892,13 +2920,17 @@ PGM_BTH_DECL(int, SyncPT)(PVMCPU pVCpu, unsigned iPDSrc, PGSTPD pPDSrc, RTGCPTR
                         SHWPTE      PteDst;
 
 # ifndef VBOX_WITH_NEW_LAZY_PAGE_ALLOC
-                        /* Try make the page writable if necessary. */
-                        if (    PteDstBase.n.u1Write
-                            &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
-# ifdef VBOX_WITH_REAL_WRITE_MONITORED_PAGES
-                            &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
-# endif
-                            &&  PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+                        /* Try to make the page writable if necessary. */
+                        if (    PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM
+                            &&  (   PGM_PAGE_IS_ZERO(pPage)
+                                 || (   PteDstBase.n.u1Write
+                                     && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
+#  ifdef VBOX_WITH_REAL_WRITE_MONITORED_PAGES
+                                     && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_WRITE_MONITORED
+#  endif
+                                    )
+                                 )
+                           )
                         {
                             rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, GCPhys);
                             AssertRCReturn(rc, rc);
@@ -2935,6 +2967,8 @@ PGM_BTH_DECL(int, SyncPT)(PVMCPU pVCpu, unsigned iPDSrc, PGSTPD pPDSrc, RTGCPTR
                             &&  PteDst.n.u1Present
                             &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED)
                         {
+                            /* Still applies to shared pages. */
+                            Assert(!PGM_PAGE_IS_ZERO(pPage));
                             PteDst.n.u1Write = 0;   /** @todo this isn't quite working yet... */
                             Log3(("SyncPT: write-protecting %RGp pPage=%R[pgmpage] at %RGv\n", GCPhys, pPage, (RTGCPTR)(GCPtr | (iPTDst << SHW_PT_SHIFT))));
                         }
diff --git a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp
index 833d54514..f16e0d7a7 100644
--- a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp
+++ b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp
@@ -429,6 +429,9 @@ void pgmHandlerPhysicalResetAliasedPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys
     PGM_PAGE_SET_PAGEID(pPage, NIL_GMM_PAGEID);
     PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, PGM_PAGE_HNDL_PHYS_STATE_ALL);
 
+    /* Flush its TLB entry. */
+    PGMPhysInvalidatePageMapTLBEntry(pVM, GCPhysPage);
+
     NOREF(GCPhysPage);
 }
 
@@ -843,7 +846,6 @@ VMMDECL(int)  PGMHandlerPhysicalReset(PVM pVM, RTGCPHYS GCPhys)
                         Assert(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO);
                         pPage++;
                     }
-                    PGMPhysInvalidatePageMapTLB(pVM);
                 }
                 else
                 {
@@ -1042,7 +1044,9 @@ VMMDECL(int)  PGMHandlerPhysicalPageAlias(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCP
             PGM_PAGE_SET_STATE(pPage, PGM_PAGE_STATE_ALLOCATED);
             PGM_PAGE_SET_PAGEID(pPage, PGM_PAGE_GET_PAGEID(pPageRemap));
             PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, PGM_PAGE_HNDL_PHYS_STATE_DISABLED);
-            PGMPhysInvalidatePageMapTLB(pVM);
+
+            /* Flush its TLB entry. */
+            PGMPhysInvalidatePageMapTLBEntry(pVM, GCPhysPage);
 
             LogFlow(("PGMHandlerPhysicalPageAlias: => %R[pgmpage]\n", pPage));
             pgmUnlock(pVM);
@@ -1143,7 +1147,10 @@ VMMDECL(int)  PGMHandlerPhysicalPageAliasHC(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS G
              */
             PGM_PAGE_SET_PAGEID(pPage, NIL_GMM_PAGEID);
             PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, PGM_PAGE_HNDL_PHYS_STATE_DISABLED);
-            PGMPhysInvalidatePageMapTLB(pVM);
+
+            /* Flush its TLB entry. */
+            PGMPhysInvalidatePageMapTLBEntry(pVM, GCPhysPage);
+
             LogFlow(("PGMHandlerPhysicalPageAliasHC: => %R[pgmpage]\n", pPage));
             pgmUnlock(pVM);
             return VINF_SUCCESS;
diff --git a/src/VBox/VMM/VMMAll/PGMAllPool.cpp b/src/VBox/VMM/VMMAll/PGMAllPool.cpp
index 3d8ecda37..c0554399c 100644
--- a/src/VBox/VMM/VMMAll/PGMAllPool.cpp
+++ b/src/VBox/VMM/VMMAll/PGMAllPool.cpp
@@ -72,6 +72,7 @@ int             pgmPoolTrackFlushGCPhysPTsSlow(PVM pVM, PPGMPAGE pPhysPage);
 PPGMPOOLPHYSEXT pgmPoolTrackPhysExtAlloc(PVM pVM, uint16_t *piPhysExt);
 void            pgmPoolTrackPhysExtFree(PVM pVM, uint16_t iPhysExt);
 void            pgmPoolTrackPhysExtFreeList(PVM pVM, uint16_t iPhysExt);
+static void     pgmPoolTracDerefGCPhysHint(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTHCPHYS HCPhys, RTGCPHYS GCPhysHint);
 
 RT_C_DECLS_END
 
@@ -709,28 +710,25 @@ void pgmPoolMonitorChainChanging(PVMCPU pVCpu, PPGMPOOL pPool, PPGMPOOLPAGE pPag
                  * Hopefully this doesn't happen very often:
                  * - messing with the bits of pd pointers without changing the physical address
                  */
-                if (!VMCPU_FF_ISSET(pVCpu, VMCPU_FF_PGM_SYNC_CR3))
+                uShw.pv = PGMPOOL_PAGE_2_LOCKED_PTR(pVM, pPage);
+                const unsigned iShw = off / sizeof(X86PDPE);
+                if (uShw.pPDPT->a[iShw].n.u1Present)
                 {
-                    uShw.pv = PGMPOOL_PAGE_2_LOCKED_PTR(pVM, pPage);
-                    const unsigned iShw = off / sizeof(X86PDPE);
-                    if (uShw.pPDPT->a[iShw].n.u1Present)
-                    {
-                        LogFlow(("pgmPoolMonitorChainChanging: pdpt iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPDPT->a[iShw].u));
-                        pgmPoolFree(pVM, uShw.pPDPT->a[iShw].u & X86_PDPE_PG_MASK, pPage->idx, iShw);
-                        ASMAtomicWriteSize(&uShw.pPDPT->a[iShw].u, 0);
-                    }
-                    /* paranoia / a bit assumptive. */
-                    if (   pDis
-                        && (off & 7)
-                        && (off & 7) + cbWrite > sizeof(X86PDPE))
+                    LogFlow(("pgmPoolMonitorChainChanging: pdpt iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPDPT->a[iShw].u));
+                    pgmPoolFree(pVM, uShw.pPDPT->a[iShw].u & X86_PDPE_PG_MASK, pPage->idx, iShw);
+                    ASMAtomicWriteSize(&uShw.pPDPT->a[iShw].u, 0);
+                }
+                /* paranoia / a bit assumptive. */
+                if (   pDis
+                    && (off & 7)
+                    && (off & 7) + cbWrite > sizeof(X86PDPE))
+                {
+                    const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PDPE);
+                    if (uShw.pPDPT->a[iShw2].n.u1Present)
                     {
-                        const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PDPE);
-                        if (uShw.pPDPT->a[iShw2].n.u1Present)
-                        {
-                            LogFlow(("pgmPoolMonitorChainChanging: pdpt iShw2=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPDPT->a[iShw2].u));
-                            pgmPoolFree(pVM, uShw.pPDPT->a[iShw2].u & X86_PDPE_PG_MASK, pPage->idx, iShw2);
-                            ASMAtomicWriteSize(&uShw.pPDPT->a[iShw2].u, 0);
-                        }
+                        LogFlow(("pgmPoolMonitorChainChanging: pdpt iShw2=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPDPT->a[iShw2].u));
+                        pgmPoolFree(pVM, uShw.pPDPT->a[iShw2].u & X86_PDPE_PG_MASK, pPage->idx, iShw2);
+                        ASMAtomicWriteSize(&uShw.pPDPT->a[iShw2].u, 0);
                     }
                 }
                 break;
@@ -743,28 +741,25 @@ void pgmPoolMonitorChainChanging(PVMCPU pVCpu, PPGMPOOL pPool, PPGMPOOLPAGE pPag
                  * Hopefully this doesn't happen very often:
                  * - messing with the bits of pd pointers without changing the physical address
                  */
-                if (!VMCPU_FF_ISSET(pVCpu, VMCPU_FF_PGM_SYNC_CR3))
+                uShw.pv = PGMPOOL_PAGE_2_LOCKED_PTR(pVM, pPage);
+                const unsigned iShw = off / sizeof(X86PDPE);
+                if (uShw.pPML4->a[iShw].n.u1Present)
                 {
-                    uShw.pv = PGMPOOL_PAGE_2_LOCKED_PTR(pVM, pPage);
-                    const unsigned iShw = off / sizeof(X86PDPE);
-                    if (uShw.pPML4->a[iShw].n.u1Present)
-                    {
-                        LogFlow(("pgmPoolMonitorChainChanging: pml4 iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPML4->a[iShw].u));
-                        pgmPoolFree(pVM, uShw.pPML4->a[iShw].u & X86_PML4E_PG_MASK, pPage->idx, iShw);
-                        ASMAtomicWriteSize(&uShw.pPML4->a[iShw].u, 0);
-                    }
-                    /* paranoia / a bit assumptive. */
-                    if (   pDis
-                        && (off & 7)
-                        && (off & 7) + cbWrite > sizeof(X86PDPE))
+                    LogFlow(("pgmPoolMonitorChainChanging: pml4 iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPML4->a[iShw].u));
+                    pgmPoolFree(pVM, uShw.pPML4->a[iShw].u & X86_PML4E_PG_MASK, pPage->idx, iShw);
+                    ASMAtomicWriteSize(&uShw.pPML4->a[iShw].u, 0);
+                }
+                /* paranoia / a bit assumptive. */
+                if (   pDis
+                    && (off & 7)
+                    && (off & 7) + cbWrite > sizeof(X86PDPE))
+                {
+                    const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PML4E);
+                    if (uShw.pPML4->a[iShw2].n.u1Present)
                     {
-                        const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PML4E);
-                        if (uShw.pPML4->a[iShw2].n.u1Present)
-                        {
-                            LogFlow(("pgmPoolMonitorChainChanging: pml4 iShw2=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPML4->a[iShw2].u));
-                            pgmPoolFree(pVM, uShw.pPML4->a[iShw2].u & X86_PML4E_PG_MASK, pPage->idx, iShw2);
-                            ASMAtomicWriteSize(&uShw.pPML4->a[iShw2].u, 0);
-                        }
+                        LogFlow(("pgmPoolMonitorChainChanging: pml4 iShw2=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPML4->a[iShw2].u));
+                        pgmPoolFree(pVM, uShw.pPML4->a[iShw2].u & X86_PML4E_PG_MASK, pPage->idx, iShw2);
+                        ASMAtomicWriteSize(&uShw.pPML4->a[iShw2].u, 0);
                     }
                 }
                 break;
@@ -1604,6 +1599,10 @@ static void pgmPoolFlushDirtyPage(PVM pVM, PPGMPOOL pPool, unsigned idxSlot, boo
     Assert(rc == VINF_SUCCESS);
     pPage->fDirty = false;
 
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+    uint32_t iPrevSubset = PGMDynMapPushAutoSubset(VMMGetCpu(pVM));
+#endif
+
 #ifdef VBOX_STRICT
     uint64_t fFlags = 0;
     RTHCPHYS HCPhys;
@@ -1649,6 +1648,10 @@ static void pgmPoolFlushDirtyPage(PVM pVM, PPGMPOOL pPool, unsigned idxSlot, boo
     }
     else
         Log(("Removed dirty page %RGp cMods=%d cChanges=%d\n", pPage->GCPhys, pPage->cModifications, cChanges));
+
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+    PGMDynMapPopAutoSubset(VMMGetCpu(pVM), iPrevSubset);
+#endif
 }
 
 # ifndef IN_RING3
@@ -2405,7 +2408,7 @@ static int pgmPoolMonitorInsert(PPGMPOOL pPool, PPGMPOOLPAGE pPage)
         /** @todo we should probably deal with out-of-memory conditions here, but for now increasing
          * the heap size should suffice. */
         AssertFatalMsgRC(rc, ("PGMHandlerPhysicalRegisterEx %RGp failed with %Rrc\n", GCPhysPage, rc));
-        Assert(!(VMMGetCpu(pVM)->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL) || VMCPU_FF_ISSET(VMMGetCpu(pVM), VMCPU_FF_PGM_SYNC_CR3));
+        AssertMsg(!(VMMGetCpu(pVM)->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL) || VMCPU_FF_ISSET(VMMGetCpu(pVM), VMCPU_FF_PGM_SYNC_CR3), ("fSyncFlags=%x syncff=%d\n", VMMGetCpu(pVM)->pgm.s.fSyncFlags, VMCPU_FF_ISSET(VMMGetCpu(pVM), VMCPU_FF_PGM_SYNC_CR3)));
     }
     pPage->fMonitored = true;
     return rc;
@@ -2660,8 +2663,17 @@ int pgmPoolSyncCR3(PVMCPU pVCpu)
     }
 # endif /* !IN_RING3 */
     else
+    {
         pgmPoolMonitorModifiedClearAll(pVM);
 
+        /* pgmPoolMonitorModifiedClearAll can cause a pgm pool flush (dirty page clearing), so make sure we handle this! */
+        if (pVCpu->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL)
+        {
+            Log(("pgmPoolMonitorModifiedClearAll caused a pgm flush -> call pgmPoolSyncCR3 again!\n"));
+            return pgmPoolSyncCR3(pVCpu);
+        }
+    }
+
     return VINF_SUCCESS;
 }
 
@@ -3106,6 +3118,15 @@ static bool pgmPoolTrackFlushGCPhysPTInt(PVM pVM, PCPGMPAGE pPhysPage, bool fFlu
             else
                 STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
 
+            /* Update the counter if we're removing references. */
+            if (!u32AndMask)
+            {
+                Assert(pPage->cPresent >= cRefs);
+                Assert(pPool->cPresent >= cRefs);
+                pPage->cPresent -= cRefs;
+                pPool->cPresent -= cRefs;
+            }
+
             for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pPT->a); i++)
                 if ((pPT->a[i].u & (X86_PTE_PG_MASK | X86_PTE_P)) == u32)
                 {
@@ -3129,7 +3150,7 @@ static bool pgmPoolTrackFlushGCPhysPTInt(PVM pVM, PCPGMPAGE pPhysPage, bool fFlu
                     Log(("i=%d cRefs=%d\n", i, cRefs--));
                 }
 #endif
-            AssertFatalMsgFailed(("cRefs=%d iFirstPresent=%d cPresent=%d\n", cRefs, pPage->iFirstPresent, pPage->cPresent));
+            AssertFatalMsgFailed(("cRefs=%d iFirstPresent=%d cPresent=%d u32=%RX32 poolkind=%x\n", cRefs, pPage->iFirstPresent, pPage->cPresent, u32, pPage->enmKind));
             break;
         }
 
@@ -3172,6 +3193,15 @@ static bool pgmPoolTrackFlushGCPhysPTInt(PVM pVM, PCPGMPAGE pPhysPage, bool fFlu
             else
                 STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
 
+            /* Update the counter if we're removing references. */
+            if (!u64AndMask)
+            {
+                Assert(pPage->cPresent >= cRefs);
+                Assert(pPool->cPresent >= cRefs);
+                pPage->cPresent -= cRefs;
+                pPool->cPresent -= cRefs;
+            }
+
             for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pPT->a); i++)
                 if ((pPT->a[i].u & (X86_PTE_PAE_PG_MASK | X86_PTE_P)) == u64)
                 {
@@ -3195,7 +3225,7 @@ static bool pgmPoolTrackFlushGCPhysPTInt(PVM pVM, PCPGMPAGE pPhysPage, bool fFlu
                     Log(("i=%d cRefs=%d\n", i, cRefs--));
                 }
 #endif
-            AssertFatalMsgFailed(("cRefs=%d iFirstPresent=%d cPresent=%d u64=%RX64\n", cRefs, pPage->iFirstPresent, pPage->cPresent, u64));
+            AssertFatalMsgFailed(("cRefs=%d iFirstPresent=%d cPresent=%d u64=%RX64 poolkind=%x\n", cRefs, pPage->iFirstPresent, pPage->cPresent, u64, pPage->enmKind));
             break;
         }
 
@@ -3210,6 +3240,13 @@ static bool pgmPoolTrackFlushGCPhysPTInt(PVM pVM, PCPGMPAGE pPhysPage, bool fFlu
                     STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
                     pPT->a[i].u = 0;
                     cRefs--;
+
+                    /* Update the counter as we're removing references. */
+                    Assert(pPage->cPresent);
+                    Assert(pPool->cPresent);
+                    pPage->cPresent--;
+                    pPool->cPresent--;
+
                     if (!cRefs)
                         return bRet;
                 }
@@ -3245,6 +3282,10 @@ static void pgmPoolTrackFlushGCPhysPT(PVM pVM, PPGMPAGE pPhysPage, bool fFlushPT
 {
     PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool); NOREF(pPool);
 
+    /* We should only come here with when there's only one reference in this physical page. */
+    Assert(PGMPOOL_TD_GET_CREFS(PGM_PAGE_GET_TRACKING(pPhysPage)) == 1);
+    Assert(cRefs == 1);
+
     Log2(("pgmPoolTrackFlushGCPhysPT: pPhysPage=%RHp iShw=%d cRefs=%d\n", PGM_PAGE_GET_HCPHYS(pPhysPage), iShw, cRefs));
     STAM_PROFILE_START(&pPool->StatTrackFlushGCPhysPT, f);
     bool fKeptPTEs = pgmPoolTrackFlushGCPhysPTInt(pVM, pPhysPage, fFlushPTEs, iShw, cRefs);
@@ -3463,6 +3504,12 @@ int pgmPoolTrackFlushGCPhysPTsSlow(PVM pVM, PPGMPAGE pPhysPage)
                             {
                                 //Log4(("pgmPoolTrackFlushGCPhysPTsSlow: idx=%d i=%d pte=%RX32\n", iPage, i, pPT->a[i]));
                                 pPT->a[i].u = 0;
+
+                                /* Update the counter as we're removing references. */
+                                Assert(pPage->cPresent);
+                                Assert(pPool->cPresent);
+                                pPage->cPresent--;
+                                pPool->cPresent--;
                             }
                             if (!--cPresent)
                                 break;
@@ -3485,12 +3532,45 @@ int pgmPoolTrackFlushGCPhysPTsSlow(PVM pVM, PPGMPAGE pPhysPage)
                             {
                                 //Log4(("pgmPoolTrackFlushGCPhysPTsSlow: idx=%d i=%d pte=%RX64\n", iPage, i, pPT->a[i]));
                                 pPT->a[i].u = 0;
+
+                                /* Update the counter as we're removing references. */
+                                Assert(pPage->cPresent);
+                                Assert(pPool->cPresent);
+                                pPage->cPresent--;
+                                pPool->cPresent--;
                             }
                             if (!--cPresent)
                                 break;
                         }
                     break;
                 }
+
+#ifndef IN_RC
+                case PGMPOOLKIND_EPT_PT_FOR_PHYS:
+                {
+                    unsigned  cPresent = pPage->cPresent;
+                    PEPTPT    pPT = (PEPTPT)PGMPOOL_PAGE_2_PTR(pVM, pPage);
+                    for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pPT->a); i++)
+                        if (pPT->a[i].n.u1Present)
+                        {
+                            if ((pPT->a[i].u & (EPT_PTE_PG_MASK | X86_PTE_P)) == u64)
+                            {
+                                //Log4(("pgmPoolTrackFlushGCPhysPTsSlow: idx=%d i=%d pte=%RX64\n", iPage, i, pPT->a[i]));
+                                pPT->a[i].u = 0;
+
+                                /* Update the counter as we're removing references. */
+                                Assert(pPage->cPresent);
+                                Assert(pPool->cPresent);
+                                pPage->cPresent--;
+                                pPool->cPresent--;
+                            }
+                            if (!--cPresent)
+                                break;
+                        }
+                    break;
+                }
+#endif
+
             }
             if (!--cLeft)
                 break;
@@ -3955,11 +4035,15 @@ static void pgmPoolTracDerefGCPhys(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTHCPHYS
             const unsigned iPage = off >> PAGE_SHIFT;
             Assert(PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]));
 #ifdef LOG_ENABLED
-RTHCPHYS HCPhysPage = PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]);
-Log2(("pgmPoolTracDerefGCPhys %RHp vs %RHp\n", HCPhysPage, HCPhys));
+            RTHCPHYS HCPhysPage = PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]);
+            Log2(("pgmPoolTracDerefGCPhys %RHp vs %RHp\n", HCPhysPage, HCPhys));
 #endif
             if (PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]) == HCPhys)
             {
+                Assert(pPage->cPresent);
+                Assert(pPool->cPresent);
+                pPage->cPresent--;
+                pPool->cPresent--;
                 pgmTrackDerefGCPhys(pPool, pPage, &pRam->aPages[iPage]);
                 return;
             }
@@ -3979,7 +4063,7 @@ Log2(("pgmPoolTracDerefGCPhys %RHp vs %RHp\n", HCPhysPage, HCPhys));
  * @param   HCPhys      The host physical address corresponding to the guest page.
  * @param   GCPhysHint  The guest physical address which may corresponding to HCPhys.
  */
-void pgmPoolTracDerefGCPhysHint(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTHCPHYS HCPhys, RTGCPHYS GCPhysHint)
+static void pgmPoolTracDerefGCPhysHint(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTHCPHYS HCPhys, RTGCPHYS GCPhysHint)
 {
     Log4(("pgmPoolTracDerefGCPhysHint %RHp %RGp\n", HCPhys, GCPhysHint));
 
@@ -3997,6 +4081,10 @@ void pgmPoolTracDerefGCPhysHint(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTHCPHYS HCP
             Assert(PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]));
             if (PGM_PAGE_GET_HCPHYS(&pRam->aPages[iPage]) == HCPhys)
             {
+                Assert(pPage->cPresent);
+                Assert(pPool->cPresent);
+                pPage->cPresent--;
+                pPool->cPresent--;
                 pgmTrackDerefGCPhys(pPool, pPage, &pRam->aPages[iPage]);
                 return;
             }
@@ -4019,6 +4107,10 @@ void pgmPoolTracDerefGCPhysHint(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTHCPHYS HCP
             {
                 Log4(("pgmPoolTracDerefGCPhysHint: Linear HCPhys=%RHp GCPhysHint=%RGp GCPhysReal=%RGp\n",
                       HCPhys, GCPhysHint, pRam->GCPhys + (iPage << PAGE_SHIFT)));
+                Assert(pPage->cPresent);
+                Assert(pPool->cPresent);
+                pPage->cPresent--;
+                pPool->cPresent--;
                 pgmTrackDerefGCPhys(pPool, pPage, &pRam->aPages[iPage]);
                 return;
             }
@@ -4046,7 +4138,7 @@ DECLINLINE(void) pgmPoolTrackDerefPT32Bit32Bit(PPGMPOOL pPool, PPGMPOOLPAGE pPag
             Log4(("pgmPoolTrackDerefPT32Bit32Bit: i=%d pte=%RX32 hint=%RX32\n",
                   i, pShwPT->a[i].u & X86_PTE_PG_MASK, pGstPT->a[i].u & X86_PTE_PG_MASK));
             pgmPoolTracDerefGCPhysHint(pPool, pPage, pShwPT->a[i].u & X86_PTE_PG_MASK, pGstPT->a[i].u & X86_PTE_PG_MASK);
-            if (!--pPage->cPresent)
+            if (!pPage->cPresent)
                 break;
         }
 }
@@ -4068,7 +4160,7 @@ DECLINLINE(void) pgmPoolTrackDerefPTPae32Bit(PPGMPOOL pPool, PPGMPOOLPAGE pPage,
             Log4(("pgmPoolTrackDerefPTPae32Bit: i=%d pte=%RX64 hint=%RX32\n",
                   i, pShwPT->a[i].u & X86_PTE_PAE_PG_MASK, pGstPT->a[i].u & X86_PTE_PG_MASK));
             pgmPoolTracDerefGCPhysHint(pPool, pPage, pShwPT->a[i].u & X86_PTE_PAE_PG_MASK, pGstPT->a[i].u & X86_PTE_PG_MASK);
-            if (!--pPage->cPresent)
+            if (!pPage->cPresent)
                 break;
         }
 }
@@ -4090,7 +4182,7 @@ DECLINLINE(void) pgmPoolTrackDerefPTPaePae(PPGMPOOL pPool, PPGMPOOLPAGE pPage, P
             Log4(("pgmPoolTrackDerefPTPaePae: i=%d pte=%RX32 hint=%RX32\n",
                   i, pShwPT->a[i].u & X86_PTE_PAE_PG_MASK, pGstPT->a[i].u & X86_PTE_PAE_PG_MASK));
             pgmPoolTracDerefGCPhysHint(pPool, pPage, pShwPT->a[i].u & X86_PTE_PAE_PG_MASK, pGstPT->a[i].u & X86_PTE_PAE_PG_MASK);
-            if (!--pPage->cPresent)
+            if (!pPage->cPresent)
                 break;
         }
 }
@@ -4112,7 +4204,7 @@ DECLINLINE(void) pgmPoolTrackDerefPT32Bit4MB(PPGMPOOL pPool, PPGMPOOLPAGE pPage,
             Log4(("pgmPoolTrackDerefPT32Bit4MB: i=%d pte=%RX32 GCPhys=%RGp\n",
                   i, pShwPT->a[i].u & X86_PTE_PG_MASK, GCPhys));
             pgmPoolTracDerefGCPhys(pPool, pPage, pShwPT->a[i].u & X86_PTE_PG_MASK, GCPhys);
-            if (!--pPage->cPresent)
+            if (!pPage->cPresent)
                 break;
         }
 }
@@ -4134,7 +4226,7 @@ DECLINLINE(void) pgmPoolTrackDerefPTPaeBig(PPGMPOOL pPool, PPGMPOOLPAGE pPage, P
             Log4(("pgmPoolTrackDerefPTPaeBig: i=%d pte=%RX64 hint=%RGp\n",
                   i, pShwPT->a[i].u & X86_PTE_PAE_PG_MASK, GCPhys));
             pgmPoolTracDerefGCPhys(pPool, pPage, pShwPT->a[i].u & X86_PTE_PAE_PG_MASK, GCPhys);
-            if (!--pPage->cPresent)
+            if (!pPage->cPresent)
                 break;
         }
 }
@@ -4156,7 +4248,7 @@ DECLINLINE(void) pgmPoolTrackDerefPTEPT(PPGMPOOL pPool, PPGMPOOLPAGE pPage, PEPT
             Log4(("pgmPoolTrackDerefPTEPT: i=%d pte=%RX64 GCPhys=%RX64\n",
                   i, pShwPT->a[i].u & EPT_PTE_PG_MASK, pPage->GCPhys));
             pgmPoolTracDerefGCPhys(pPool, pPage, pShwPT->a[i].u & EPT_PTE_PG_MASK, GCPhys);
-            if (!--pPage->cPresent)
+            if (!pPage->cPresent)
                 break;
         }
 }
diff --git a/src/VBox/VMM/VMMR0/HWACCMR0.cpp b/src/VBox/VMM/VMMR0/HWACCMR0.cpp
index e236eb519..8c732e2b6 100644
--- a/src/VBox/VMM/VMMR0/HWACCMR0.cpp
+++ b/src/VBox/VMM/VMMR0/HWACCMR0.cpp
@@ -1098,6 +1098,10 @@ VMMR0DECL(int) HWACCMR0Enter(PVM pVM, PVMCPU pVCpu)
         AssertRCReturn(rc, rc);
     }
 
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+    bool fStartedSet = PGMDynMapStartOrMigrateAutoSet(pVCpu);
+#endif
+
     rc  = HWACCMR0Globals.pfnEnterSession(pVM, pVCpu, pCpu);
     AssertRC(rc);
     /* We must save the host context here (VT-x) as we might be rescheduled on a different cpu after a long jump back to ring 3. */
@@ -1106,14 +1110,13 @@ VMMR0DECL(int) HWACCMR0Enter(PVM pVM, PVMCPU pVCpu)
     rc |= HWACCMR0Globals.pfnLoadGuestState(pVM, pVCpu, pCtx);
     AssertRC(rc);
 
-    /* keep track of the CPU owning the VMCS for debugging scheduling weirdness and ring-3 calls. */
-    if (RT_SUCCESS(rc))
-    {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-        PGMDynMapMigrateAutoSet(pVCpu);
+    if (fStartedSet)
+        PGMDynMapReleaseAutoSet(pVCpu);
 #endif
-    }
-    else
+
+    /* keep track of the CPU owning the VMCS for debugging scheduling weirdness and ring-3 calls. */
+    if (RT_FAILURE(rc))
         pVCpu->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
     return rc;
 }
diff --git a/src/VBox/VMM/VMMR0/HWVMXR0.cpp b/src/VBox/VMM/VMMR0/HWVMXR0.cpp
index 51afab42a..ae026e58f 100644
--- a/src/VBox/VMM/VMMR0/HWVMXR0.cpp
+++ b/src/VBox/VMM/VMMR0/HWVMXR0.cpp
@@ -1275,15 +1275,6 @@ static void vmxR0UpdateExceptionBitmap(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
         pVCpu->hwaccm.s.fFPUOldStyleOverride = true;
     }
 
-#ifdef DEBUG /* till after branching, enable it by default then. */
-    /* Intercept X86_XCPT_DB if stepping is enabled */
-    if (    DBGFIsStepping(pVCpu)
-        ||  CPUMIsHyperDebugStateActive(pVCpu))
-        u32TrapMask |= RT_BIT(X86_XCPT_DB);
-    /** @todo Don't trap it unless the debugger has armed breakpoints.  */
-    u32TrapMask |= RT_BIT(X86_XCPT_BP);
-#endif
-
 #ifdef VBOX_STRICT
     Assert(u32TrapMask & RT_BIT(X86_XCPT_GP));
 #endif
@@ -2982,18 +2973,19 @@ ResumeExecution:
                 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitGuestDB);
 
                 /* Note that we don't support guest and host-initiated debugging at the same time. */
-                Assert(DBGFIsStepping(pVCpu) || CPUMIsGuestInRealModeEx(pCtx) || CPUMIsHyperDebugStateActive(pVCpu));
 
                 uDR6  = X86_DR6_INIT_VAL;
                 uDR6 |= (exitQualification & (X86_DR6_B0|X86_DR6_B1|X86_DR6_B2|X86_DR6_B3|X86_DR6_BD|X86_DR6_BS));
                 rc = DBGFRZTrap01Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx), uDR6);
                 if (rc == VINF_EM_RAW_GUEST_TRAP)
                 {
-                    /** @todo this isn't working, but we'll never get here normally. */
-
                     /* Update DR6 here. */
                     pCtx->dr[6]  = uDR6;
 
+                    /* Resync DR6 if the debug state is active. */
+                    if (CPUMIsGuestDebugStateActive(pVCpu))
+                        ASMSetDR6(pCtx->dr[6]);
+
                     /* X86_DR7_GD will be cleared if drx accesses should be trapped inside the guest. */
                     pCtx->dr[7] &= ~X86_DR7_GD;
 
@@ -3649,6 +3641,13 @@ ResumeExecution:
             rc = CPUMR0LoadGuestDebugState(pVM, pVCpu, pCtx, true /* include DR6 */);
             AssertRC(rc);
 
+#ifdef LOG_ENABLED
+            if (VMX_EXIT_QUALIFICATION_DRX_DIRECTION(exitQualification) == VMX_EXIT_QUALIFICATION_DRX_DIRECTION_WRITE)
+                Log(("VMX_EXIT_DRX_MOVE: write DR%d genreg %d\n", VMX_EXIT_QUALIFICATION_DRX_REGISTER(exitQualification), VMX_EXIT_QUALIFICATION_DRX_GENREG(exitQualification)));
+            else
+                Log(("VMX_EXIT_DRX_MOVE: read DR%d\n", VMX_EXIT_QUALIFICATION_DRX_REGISTER(exitQualification)));
+#endif
+
 #ifdef VBOX_WITH_STATISTICS
             STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatDRxContextSwitch);
             if (VMX_EXIT_QUALIFICATION_DRX_DIRECTION(exitQualification) == VMX_EXIT_QUALIFICATION_DRX_DIRECTION_WRITE)
@@ -4182,6 +4181,7 @@ VMMR0DECL(int) VMXR0Leave(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
     if (CPUMIsHyperDebugStateActive(pVCpu))
     {
         CPUMR0LoadHostDebugState(pVM, pVCpu);
+        Assert(pVCpu->hwaccm.s.vmx.proc_ctls & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_MOV_DR_EXIT);
     }
     else
 #endif
diff --git a/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp b/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp
index 8ef487cd0..c24d5df22 100644
--- a/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp
+++ b/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp
@@ -1516,6 +1516,29 @@ VMMDECL(void) PGMDynMapStartAutoSet(PVMCPU pVCpu)
 
 
 /**
+ * Starts or migrates the autoset of a virtual CPU.
+ *
+ * This is used by HWACCMR0Enter.  When we've longjumped out of the HWACCM
+ * execution loop with the set open, we'll migrate it when re-entering.  While
+ * under normal circumstances, we'll start it so VMXR0LoadGuestState can access
+ * guest memory.
+ *
+ * @returns @c true if started, @c false if migrated.
+ * @param   pVCpu       The shared data for the current virtual CPU.
+ * @thread  EMT
+ */
+VMMDECL(bool) PGMDynMapStartOrMigrateAutoSet(PVMCPU pVCpu)
+{
+    bool fStartIt = pVCpu->pgm.s.AutoSet.cEntries == PGMMAPSET_CLOSED;
+    if (fStartIt)
+        PGMDynMapStartAutoSet(pVCpu);
+    else
+        PGMDynMapMigrateAutoSet(pVCpu);
+    return fStartIt;
+}
+
+
+/**
  * Worker that performs the actual flushing of the set.
  *
  * @param   pSet        The set to flush.
@@ -1724,6 +1747,8 @@ VMMDECL(uint32_t) PGMDynMapPushAutoSubset(PVMCPU pVCpu)
     PPGMMAPSET      pSet = &pVCpu->pgm.s.AutoSet;
     AssertReturn(pSet->cEntries != PGMMAPSET_CLOSED, UINT32_MAX);
     uint32_t        iPrevSubset = pSet->iSubset;
+    LogFlow(("PGMDynMapPushAutoSubset: pVCpu=%p iPrevSubset=%u\n", pVCpu, iPrevSubset));
+
     pSet->iSubset = pSet->cEntries;
     STAM_COUNTER_INC(&pVCpu->pgm.s.StatR0DynMapSubsets);
     return iPrevSubset;
@@ -1740,8 +1765,9 @@ VMMDECL(void) PGMDynMapPopAutoSubset(PVMCPU pVCpu, uint32_t iPrevSubset)
 {
     PPGMMAPSET      pSet = &pVCpu->pgm.s.AutoSet;
     uint32_t        cEntries = pSet->cEntries;
+    LogFlow(("PGMDynMapPopAutoSubset: pVCpu=%p iPrevSubset=%u iSubset=%u cEntries=%u\n", pVCpu, iPrevSubset, pSet->iSubset, cEntries));
     AssertReturnVoid(cEntries != PGMMAPSET_CLOSED);
-    AssertReturnVoid(pSet->iSubset <= iPrevSubset || iPrevSubset == UINT32_MAX);
+    AssertReturnVoid(pSet->iSubset >= iPrevSubset || iPrevSubset == UINT32_MAX);
     STAM_COUNTER_INC(&pVCpu->pgm.s.aStatR0DynMapSetSize[(cEntries * 10 / RT_ELEMENTS(pSet->aEntries)) % 11]);
     if (    cEntries >= RT_ELEMENTS(pSet->aEntries) * 40 / 100
         &&  cEntries != pSet->iSubset)
@@ -1813,6 +1839,8 @@ static void pgmDynMapOptimizeAutoSet(PPGMMAPSET pSet)
  */
 int pgmR0DynMapHCPageCommon(PVM pVM, PPGMMAPSET pSet, RTHCPHYS HCPhys, void **ppv)
 {
+    LogFlow(("pgmR0DynMapHCPageCommon: pVM=%p pSet=%p HCPhys=%RHp ppv=%p\n",
+             pVM, pSet, HCPhys, ppv));
 #ifdef VBOX_WITH_STATISTICS
     PVMCPU pVCpu = VMMGetCpu(pVM);
 #endif
diff --git a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp
index 86668182d..1594a7923 100644
--- a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp
+++ b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp
@@ -88,12 +88,14 @@ VMMRZDECL(int) DBGFRZTrap01Handler(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame
         return fInHyper ? VINF_EM_DBG_HYPER_STEPPED : VINF_EM_DBG_STEPPED;
     }
 
+#ifdef IN_RC
     /*
      * Currently we only implement single stepping in the guest,
      * so we'll bitch if this is not a BS event.
      */
     AssertMsg(uDr6 & X86_DR6_BS, ("hey! we're not doing guest BPs yet! dr6=%RTreg %04x:%RGv\n",
                                   uDr6, pRegFrame->cs, pRegFrame->rip));
+#endif
 
     LogFlow(("DBGFRZTrap01Handler: guest debug event %RTreg at %04x:%RGv!\n", uDr6, pRegFrame->cs, pRegFrame->rip));
     return fInHyper ? VERR_INTERNAL_ERROR : VINF_EM_RAW_GUEST_TRAP;
diff --git a/src/VBox/VMM/VMMSwitcher.cpp b/src/VBox/VMM/VMMSwitcher.cpp
index a8d33198b..921340330 100644
--- a/src/VBox/VMM/VMMSwitcher.cpp
+++ b/src/VBox/VMM/VMMSwitcher.cpp
@@ -51,7 +51,8 @@
 static PVMMSWITCHERDEF s_apSwitchers[VMMSWITCHER_MAX] =
 {
     NULL, /* invalid entry */
-#ifndef RT_ARCH_AMD64
+#ifdef VBOX_WITH_RAW_MODE
+# ifndef RT_ARCH_AMD64
     &vmmR3Switcher32BitTo32Bit_Def,
     &vmmR3Switcher32BitToPAE_Def,
     &vmmR3Switcher32BitToAMD64_Def,
@@ -59,13 +60,13 @@ static PVMMSWITCHERDEF s_apSwitchers[VMMSWITCHER_MAX] =
     &vmmR3SwitcherPAEToPAE_Def,
     &vmmR3SwitcherPAEToAMD64_Def,
     NULL,   //&vmmR3SwitcherPAETo32Bit_Def,
-# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
+#  ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
     &vmmR3SwitcherAMD64ToPAE_Def,
-# else
+#  else
     NULL,   //&vmmR3SwitcherAMD64ToPAE_Def,
-# endif
+#  endif
     NULL    //&vmmR3SwitcherAMD64ToAMD64_Def,
-#else  /* RT_ARCH_AMD64 */
+# else  /* RT_ARCH_AMD64 */
     NULL,   //&vmmR3Switcher32BitTo32Bit_Def,
     NULL,   //&vmmR3Switcher32BitToPAE_Def,
     NULL,   //&vmmR3Switcher32BitToAMD64_Def,
@@ -75,7 +76,18 @@ static PVMMSWITCHERDEF s_apSwitchers[VMMSWITCHER_MAX] =
     &vmmR3SwitcherAMD64To32Bit_Def,
     &vmmR3SwitcherAMD64ToPAE_Def,
     NULL    //&vmmR3SwitcherAMD64ToAMD64_Def,
-#endif /* RT_ARCH_AMD64 */
+# endif /* RT_ARCH_AMD64 */
+#else  /* !VBOX_WITH_RAW_MODE */
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+#endif /* !VBOX_WITH_RAW_MODE */
 };
 
 
@@ -90,6 +102,9 @@ static PVMMSWITCHERDEF s_apSwitchers[VMMSWITCHER_MAX] =
  */
 int vmmR3SwitcherInit(PVM pVM)
 {
+#ifndef VBOX_WITH_RAW_MODE
+    return VINF_SUCCESS;
+#else
     /*
      * Calc the size.
      */
@@ -210,6 +225,7 @@ int vmmR3SwitcherInit(PVM pVM)
     pVM->vmm.s.pvCoreCodeR0 = NIL_RTR0PTR;
     pVM->vmm.s.pvCoreCodeRC = 0;
     return rc;
+#endif
 }
 
 /**
@@ -220,6 +236,7 @@ int vmmR3SwitcherInit(PVM pVM)
  */
 void vmmR3SwitcherRelocate(PVM pVM, RTGCINTPTR offDelta)
 {
+#ifdef VBOX_WITH_RAW_MODE
     /*
      * Relocate all the switchers.
      */
@@ -250,6 +267,7 @@ void vmmR3SwitcherRelocate(PVM pVM, RTGCINTPTR offDelta)
     pVM->pfnVMMGCGuestToHostAsmGuestCtx = RCPtr + pSwitcher->offGCGuestToHostAsmGuestCtx;
 
 //    AssertFailed();
+#endif
 }
 
 
diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk
index 4be53f077..89b5203b1 100644
--- a/src/VBox/VMM/testcase/Makefile.kmk
+++ b/src/VBox/VMM/testcase/Makefile.kmk
@@ -25,9 +25,12 @@ include	$(KBUILD_PATH)/subheader.kmk
 #
 # Target lists.
 #
-PROGRAMS   += tstVMStructSize tstVMStructGC tstAsmStructs tstAsmStructsGC tstVMM tstVMM-HwAccm tstGlobalConfig tstInstrEmul
-ifneq ($(KBUILD_TARGET),win)
-PROGRAMS   += tstVMMFork
+PROGRAMS   += tstVMStructSize tstAsmStructs tstGlobalConfig tstInstrEmul
+ifdef VBOX_WITH_RAW_MODE
+ PROGRAMS  += tstVMStructRC tstAsmStructsRC tstVMM tstVMM-HwAccm
+ ifneq ($(KBUILD_TARGET),win)
+  PROGRAMS += tstVMMFork
+ endif
 endif
 ifdef VBOX_WITH_TESTCASES
  PROGRAMS  += \
@@ -36,21 +39,22 @@ ifdef VBOX_WITH_TESTCASES
  	tstSSM \
  	tstMMHyperHeap \
  	tstVMREQ \
- 	tstMicro \
  	tstCompiler \
  	tstVMMR0CallHost-1 \
  	tstVMMR0CallHost-2
  ifneq ($(KBUILD_TARGET),l4)
   PROGRAMS += tstAnimate
  endif
- SYSMODS   += tstMicroGC
+ ifdef VBOX_WITH_RAW_MODE
+  PROGRAMS += tstMicro
+  SYSMODS  += tstMicroGC
+ endif
+ ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
+  PROGRAMS  += tstPDMAsyncCompletion
+  PROGRAMS  += tstPDMAsyncCompletionStress
+ endif
 endif # VBOX_WITH_TESTCASES
 
-ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
- PROGRAMS  += tstPDMAsyncCompletion
- PROGRAMS  += tstPDMAsyncCompletionStress
-endif
-
 # Where we put our temporary files (just for simplicity)
 VBOX_VMM_TESTCASE_OUT_DIR := $(PATH_TARGET)/VMM
 BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
@@ -83,9 +87,9 @@ OTHER_CLEAN += \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.mac.o \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsAsm.mac.lst \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.h.dump \
-	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsGC.h \
+	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsRC.h \
 	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h \
-	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructGC.h
+	$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h
 
 #
 # Globals
@@ -95,54 +99,66 @@ VBOX_PATH_VMM_SRC = $(PATH_ROOT)/src/VBox/VMM
 #
 # Targets
 #
-tstVMStructGC_TEMPLATE  = VBOXGCEXE
-tstVMStructGC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
-tstVMStructGC_DEFS     += \
-	VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
-	VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
-endif
-ifdef VBOX_WITH_R0_LOGGING
-tstVMStructGC_DEFS     += VBOX_WITH_R0_LOGGING
+ifdef VBOX_WITH_RAW_MODE
+ tstVMStructRC_TEMPLATE  = VBOXGCEXE
+ tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC VBOX_WITH_RAW_MODE
+ ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
+  tstVMStructRC_DEFS    += \
+  	VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
+  	VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
+ endif
+ ifdef VBOX_WITH_R0_LOGGING
+  tstVMStructRC_DEFS    += VBOX_WITH_R0_LOGGING
+ endif
+ tstVMStructRC_SOURCES   = tstVMStructRC.cpp
+ tstVMStructRC_INCS      = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM
 endif
-tstVMStructGC_SOURCES   = tstVMStructGC.cpp
-tstVMStructGC_INCS      = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM
 
 tstVMStructSize_TEMPLATE= VBOXR3AUTOTST
 tstVMStructSize_DEFS    = IN_VMM_R3 IN_DIS
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
-tstVMStructSize_DEFS   += \
-	VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 \
-	VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R3
+ tstVMStructSize_DEFS   += \
+ 	VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 \
+ 	VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R3
+endif
+ifdef VBOX_WITH_RAW_MODE
+ tstVMStructSize_DEFS  += VBOX_WITH_RAW_MODE
 endif
 tstVMStructSize_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM $(VBOX_VMM_TESTCASE_OUT_DIR)
 tstVMStructSize_SOURCES = tstVMStructSize.cpp
-tstVMStructSize.cpp_DEPS= $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructGC.h
+ifdef VBOX_WITH_RAW_MODE
+ tstVMStructSize.cpp_DEPS= $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h
+endif
 ifdef VBOX_WITH_R0_LOGGING
-tstVMStructSize_DEFS   += VBOX_WITH_R0_LOGGING
+ tstVMStructSize_DEFS  += VBOX_WITH_R0_LOGGING
 endif
 ifdef VBOX_WITH_VMI
-tstVMStructSize_DEFS   += VBOX_WITH_VMI
-tstVMStructSize_INCS   += $(VBOX_PATH_VMM_SRC)/PARAV
+ tstVMStructSize_DEFS  += VBOX_WITH_VMI
+ tstVMStructSize_INCS  += $(VBOX_PATH_VMM_SRC)/PARAV
 endif
 
 tstAsmStructs_TEMPLATE  = VBOXR3AUTOTST
 tstAsmStructs_DEFS      = IN_VMM_R3 IN_DIS
+ifdef VBOX_WITH_RAW_MODE
+ tstAsmStructs_DEFS    += VBOX_WITH_RAW_MODE
+endif
 ifdef VBOX_WITH_R0_LOGGING
-tstAsmStructs_DEFS     += VBOX_WITH_R0_LOGGING
+ tstAsmStructs_DEFS    += VBOX_WITH_R0_LOGGING
 endif
 tstAsmStructs_INCS      = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)
 tstAsmStructs_SOURCES   = tstAsmStructs.cpp
+tstAsmStructs.cpp_DEPS  = $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h
 
-tstAsmStructsGC_TEMPLATE= VBOXGCEXE
-tstAsmStructsGC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC
-ifdef VBOX_WITH_R0_LOGGING
-tstAsmStructsGC_DEFS   += VBOX_WITH_R0_LOGGING
-endif
-tstAsmStructsGC_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)
-tstAsmStructsGC_SOURCES = tstAsmStructs.cpp
-
-tstAsmStructs.cpp_DEPS  = $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsGC.h
+ifdef VBOX_WITH_RAW_MODE
+ tstAsmStructsRC_TEMPLATE= VBOXGCEXE
+ tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC VBOX_WITH_RAW_MODE
+ ifdef VBOX_WITH_R0_LOGGING
+  tstAsmStructsRC_DEFS  += VBOX_WITH_R0_LOGGING
+ endif
+ tstAsmStructsRC_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_VMM_TESTCASE_OUT_DIR)
+ tstAsmStructsRC_SOURCES = tstAsmStructs.cpp
+ tstAsmStructs.cpp_DEPS += $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsRC.h
+endif # VBOX_WITH_RAW_MODE
 
 
 tstGlobalConfig_TEMPLATE= VBOXR3TSTEXE
@@ -168,18 +184,6 @@ tstCFGM_LIBS            = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 tstCompressionBenchmark_TEMPLATE = VBOXR3TSTEXE
 tstCompressionBenchmark_SOURCES  = tstCompressionBenchmark.cpp
 
-tstVMM_TEMPLATE         = VBOXR3EXE
-tstVMM_SOURCES          = tstVMM.cpp
-tstVMM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
-
-tstVMM-HwAccm_TEMPLATE  = VBOXR3EXE
-tstVMM-HwAccm_SOURCES   = tstVMM-HwAccm.cpp
-tstVMM-HwAccm_LIBS      = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
-
-tstVMMFork_TEMPLATE     = VBOXR3EXE
-tstVMMFork_SOURCES      = tstVMMFork.cpp
-tstVMMFork_LIBS         = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
-
 tstVMMR0CallHost-1_TEMPLATE = VBOXR3TSTEXE
 tstVMMR0CallHost-1_DEFS = VMM_R0_NO_SWITCH_STACK
 tstVMMR0CallHost-1_INCS = $(VBOX_PATH_VMM_SRC)
@@ -205,37 +209,52 @@ tstCompiler_TEMPLATE    = VBOXR3TSTEXE
 tstCompiler_SOURCES     = tstCompiler.cpp
 tstCompiler_LIBS        = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 
-tstMicro_TEMPLATE       = VBOXR3EXE
-tstMicro_SOURCES        = tstMicro.cpp
-tstMicro_LIBS           = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
-
-# tstMicroGC.gc
-tstMicroGC_TEMPLATE     = VBOXGC
-tstMicroGC_SOURCES      = tstMicroGC.cpp tstMicroGCA.asm
-tstMicroGC_DEFS         =
-tstMicroGC_INCS         = $(VBOX_PATH_VMM_SRC)/testcase
-ifeq ($(VBOX_LDR_FMT32),pe)
-tstMicroGC_LDFLAGS      = -Entry:tstMicroGC
-endif
-tstMicroGC_SYSSUFF      = .gc
-tstMicroGC_LIBS         = \
-	$(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
-	$(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
-ifeq ($(filter-out pe lx,$(VBOX_LDR_FMT32)),)
-tstMicroGC_LIBS        += \
-	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \
-	$(LIB_VMMGC)
-endif
-tstMicroGC_SOURCES.win = tstMicroGC.def
+ifdef VBOX_WITH_RAW_MODE
+
+ tstVMM_TEMPLATE        = VBOXR3EXE
+ tstVMM_SOURCES         = tstVMM.cpp
+ tstVMM_LIBS            = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+
+ tstVMM-HwAccm_TEMPLATE = VBOXR3EXE
+ tstVMM-HwAccm_SOURCES  = tstVMM-HwAccm.cpp
+ tstVMM-HwAccm_LIBS     = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+
+ tstVMMFork_TEMPLATE    = VBOXR3EXE
+ tstVMMFork_SOURCES     = tstVMMFork.cpp
+ tstVMMFork_LIBS        = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+
+ tstMicro_TEMPLATE       = VBOXR3EXE
+ tstMicro_SOURCES        = tstMicro.cpp
+ tstMicro_LIBS           = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+
+ tstMicroGC_TEMPLATE     = VBOXGC
+ tstMicroGC_SOURCES      = tstMicroGC.cpp tstMicroGCA.asm
+ tstMicroGC_DEFS         =
+ tstMicroGC_INCS         = $(VBOX_PATH_VMM_SRC)/testcase
+ ifeq ($(VBOX_LDR_FMT32),pe)
+  tstMicroGC_LDFLAGS     = -Entry:tstMicroGC
+ endif
+ tstMicroGC_SYSSUFF      = .gc
+ tstMicroGC_LIBS         = \
+ 	$(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
+ 	$(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
+ ifeq ($(filter-out pe lx,$(VBOX_LDR_FMT32)),)
+  tstMicroGC_LIBS        += \
+  	$(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB) \
+  	$(LIB_VMMGC)
+ endif
+ tstMicroGC_SOURCES.win = tstMicroGC.def
+
+endif # VBOX_WITH_RAW_MODE
 
 ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
-tstPDMAsyncCompletion_TEMPLATE         = VBOXR3EXE
-tstPDMAsyncCompletion_SOURCES          = tstPDMAsyncCompletion.cpp
-tstPDMAsyncCompletion_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+ tstPDMAsyncCompletion_TEMPLATE         = VBOXR3EXE
+ tstPDMAsyncCompletion_SOURCES          = tstPDMAsyncCompletion.cpp
+ tstPDMAsyncCompletion_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 
-tstPDMAsyncCompletionStress_TEMPLATE         = VBOXR3EXE
-tstPDMAsyncCompletionStress_SOURCES          = tstPDMAsyncCompletionStress.cpp
-tstPDMAsyncCompletionStress_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
+ tstPDMAsyncCompletionStress_TEMPLATE   = VBOXR3EXE
+ tstPDMAsyncCompletionStress_SOURCES    = tstPDMAsyncCompletionStress.cpp
+ tstPDMAsyncCompletionStress_LIBS       = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 endif
 
 include	$(KBUILD_PATH)/subfooter.kmk
@@ -332,19 +351,22 @@ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h: $(VBOX_VMM_TESTCASE_OUT_DIR)/tst
 	$(QUIET)$(MV) -f $@.tmp $@
 	$(QUIET)$(RM) -f $@.dump
 
-# 3. transform the HC header into a GC one by omitting some HC only structures.
-$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsGC.h: $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h
+ifdef VBOX_WITH_RAW_MODE
+# 3. transform the HC header into a RC one by omitting some HC only structures.
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsRC.h: $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsHC.h
 	$(call MSG_GENERATE,tstVMStructSize,$@,$<)
 	$(QUIET)$(SED) -e '/VMMSWITCHERDEF/d' --output $@ $^
-
-## @todo make this default kBuild behaviour.
-.SECONDEXPANSION:
+endif
 
 # 4. run it.
-$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run: $$(INSTARGET_tstAsmStructs) $$(INSTARGET_tstAsmStructsGC)
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run: \
+		$$(INSTARGET_tstAsmStructs) \
+		$(if-expr defined(VBOX_WITH_RAW_MODE),$$(INSTARGET_tstAsmStructsRC),)
 	$(QUIET)$(RM) -f $@
 	$(INSTARGET_tstAsmStructs)
-	$(INSTARGET_tstAsmStructsGC)
+ifdef VBOX_WITH_RAW_MODE
+	$(INSTARGET_tstAsmStructsRC)
+endif
 	$(QUIET)$(APPEND) "$@" "done"
 
 
@@ -353,10 +375,12 @@ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run: $$(INSTARGET_tstAsmStructs) $$(I
 # Run rule for tstVMStructSize.
 #
 
+ifdef VBOX_WITH_RAW_MODE
 # 1. Manually dump selected structures and members.
-$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructGC.h: $$(INSTARGET_tstVMStructGC) | $$(dir $$@)
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h: $$(INSTARGET_tstVMStructRC) | $$(dir $$@)
 	$(call MSG_GENERATE,tstVMStructSize,$@)
 	$(QUIET)$(REDIRECT) -wo $@ -- $<
+endif # VBOX_WITH_RAW_MODE
 
 # 2. run it.
 $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run: $$(INSTARGET_tstVMStructSize) | $$(dir $$@)
diff --git a/src/VBox/VMM/testcase/tstAsmStructs.cpp b/src/VBox/VMM/testcase/tstAsmStructs.cpp
index 40d198fe6..3705f8247 100644
--- a/src/VBox/VMM/testcase/tstAsmStructs.cpp
+++ b/src/VBox/VMM/testcase/tstAsmStructs.cpp
@@ -43,7 +43,7 @@ int main()
 #ifdef IN_RING3
 # include "tstAsmStructsHC.h"
 #else
-# include "tstAsmStructsGC.h"
+# include "tstAsmStructsRC.h"
 #endif
 
     if (rc)
diff --git a/src/VBox/VMM/testcase/tstVMStructGC.cpp b/src/VBox/VMM/testcase/tstVMStructRC.cpp
index c0d3fa5e9..67836ba10 100644
--- a/src/VBox/VMM/testcase/tstVMStructGC.cpp
+++ b/src/VBox/VMM/testcase/tstVMStructRC.cpp
@@ -1,13 +1,14 @@
-/* $Id: tstVMStructGC.cpp $ */
+/* $Id: tstVMStructRC.cpp $ */
 /** @file
- * tstVMMStructGC - Generate structure member and size checks from the GC perspective.
+ * tstVMMStructGC - Generate structure member and size checks from the
+ *                  RC perspective.
  *
- * This is built using the VBOXGC template but linked into a host
+ * This is built using the VBOXRC template but linked into a host
  * ring-3 executable, rather hacky.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is 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 993526284..480bccbdb 100644
--- a/src/VBox/VMM/testcase/tstVMStructSize.cpp
+++ b/src/VBox/VMM/testcase/tstVMStructSize.cpp
@@ -392,11 +392,13 @@ int main()
     printf("struct UVMCPU: %d bytes\n", (int)sizeof(UVMCPU));
     CHECK_PADDING_UVMCPU(32, vm);
 
+#ifdef VBOX_WITH_RAW_MODE
     /*
-     * Compare HC and GC.
+     * Compare HC and RC.
      */
-    printf("tstVMStructSize: Comparing HC and GC...\n");
-#include "tstVMStructGC.h"
+    printf("tstVMStructSize: Comparing HC and RC...\n");
+# include "tstVMStructRC.h"
+#endif /* VBOX_WITH_RAW_MODE */
 
     /*
      * Report result.
diff --git a/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp b/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp
index 2c44652e5..0722b617e 100644
--- a/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp
+++ b/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp
@@ -404,6 +404,20 @@ WaitTarget(const nsID           &aTarget,
       rv = NS_OK;
       break;
     }
+#ifdef VBOX
+    else
+    {
+      /* Special client liveness check if there is no message to process.
+       * This is necessary as there might be several threads waiting for
+       * a message from a single client, and only one gets the DOWN msg. */
+      PRBool alive = (aSelector)(aArg, td, NULL);
+      if (!alive)
+      {
+        *aMsg = NULL;
+        break;
+      }
+    }
+#endif /* VBOX */
 
     PRIntervalTime t = PR_IntervalNow();
     if (t > timeEnd) // check if timeout has expired
@@ -586,6 +600,10 @@ static nsresult nsresult_from_ipcm_result(PRInt32 status)
 static PRBool
 WaitIPCMResponseSelector(void *arg, ipcTargetData *td, const ipcMessage *msg)
 {
+#ifdef VBOX
+  if (!msg)
+    return PR_TRUE;
+#endif /* VBOX */
   PRUint32 requestIndex = *(PRUint32 *) arg;
   return IPCM_GetRequestIndex(msg) == requestIndex;
 }
@@ -913,6 +931,25 @@ struct WaitMessageSelectorData
 static PRBool WaitMessageSelector(void *arg, ipcTargetData *td, const ipcMessage *msg)
 {
   WaitMessageSelectorData *data = (WaitMessageSelectorData *) arg;
+#ifdef VBOX
+  if (!msg)
+  {
+    /* Special NULL message which asks to check whether the client is
+     * still alive. Called when there is nothing suitable in the queue. */
+    ipcIMessageObserver *obs = data->observer;
+    if (!obs)
+      obs = td->observer;
+    NS_ASSERTION(obs, "must at least have a default observer");
+
+    nsresult rv = obs->OnMessageAvailable(IPC_SENDER_ANY, nsID(), 0, 0);
+    if (rv != IPC_WAIT_NEXT_MESSAGE)
+    {
+      data->senderDead = PR_TRUE;
+      return PR_FALSE;
+    }
+    return PR_TRUE;
+  }
+#endif /* VBOX */
 
   // process the specially forwarded client state message to see if the
   // sender we're waiting a message from has died.
@@ -942,7 +979,7 @@ static PRBool WaitMessageSelector(void *arg, ipcTargetData *td, const ipcMessage
           else
           {
             // otherwise inform the observer about the client death using a special
-            // null message with an emply target id, and fail IPC_WaitMessage call
+            // null message with an empty target id, and fail IPC_WaitMessage call
             // with NS_ERROR_xxx only if the observer accepts this message.
 
             ipcIMessageObserver *obs = data->observer;
@@ -958,6 +995,36 @@ static PRBool WaitMessageSelector(void *arg, ipcTargetData *td, const ipcMessage
             }
           }
         }
+#ifdef VBOX
+        else if ((data->senderID == IPC_SENDER_ANY ||
+                  status->ClientID() == data->senderID) &&
+                 status->ClientState() == IPCM_CLIENT_STATE_UP)
+        {
+          LOG(("sender (%d) we're waiting a message from (%d) has come up\n",
+               status->ClientID(), data->senderID));
+          if (data->senderID == IPC_SENDER_ANY)
+          {
+            // inform the observer about the client appearance using a special
+            // null message with an empty target id, but a length of 1.
+
+            ipcIMessageObserver *obs = data->observer;
+            if (!obs)
+              obs = td->observer;
+            NS_ASSERTION(obs, "must at least have a default observer");
+
+            nsresult rv = obs->OnMessageAvailable(status->ClientID(), nsID(), 0, 1);
+            /* VBoxSVC/VBoxXPCOMIPCD auto-start can cause that a client up
+             * message arrives while we're already waiting for a response
+             * from this client. Don't declare the connection as dead in
+             * this case. A client ID wraparound can't falsely trigger
+             * this, since the waiting thread would have hit the liveness
+             * check in the mean time. Also, DO NOT consume the message,
+             * otherwise it gets passed to the DConnect message handling
+             * without any further checks. IPCM messages are automatically
+             * discarded if they are left unclaimed. */
+          }
+        }
+#endif /* VBOX */
         break;
       }
       default:
diff --git a/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp b/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
index 24a0bdccb..fb27777ca 100644
--- a/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
+++ b/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
@@ -51,6 +51,11 @@
 #include "nsDeque.h"
 #include "xptcall.h"
 
+#ifdef VBOX
+#include <map>
+#include <list>
+#endif /* VBOX */
+
 #if defined(DCONNECT_MULTITHREADED)
 
 #include "nsIThread.h"
@@ -1254,6 +1259,29 @@ NewRequestIndex()
 
 //-----------------------------------------------------------------------------
 
+#ifdef VBOX
+typedef struct ClientDownInfo
+{
+    ClientDownInfo(PRUint32 aClient)
+    {
+        uClient = aClient;
+        uTimestamp = PR_IntervalNow();
+    }
+
+    PRUint32 uClient;
+    PRIntervalTime uTimestamp;
+} ClientDownInfo;
+typedef std::map<PRUint32, ClientDownInfo *> ClientDownMap;
+typedef std::list<ClientDownInfo *> ClientDownList;
+
+#define MAX_CLIENT_DOWN_SIZE 10000
+
+/* Protected by the queue monitor. */
+static ClientDownMap g_ClientDownMap;
+static ClientDownList g_ClientDownList;
+
+#endif /* VBOX */
+
 class DConnectMsgSelector : public ipcIMessageObserver
 {
 public:
@@ -1274,8 +1302,81 @@ public:
   {
     // accept special "client dead" messages for a given peer
     // (empty target id, zero data and data length)
+#ifndef VBOX
     if (aSenderID == mPeer && aTarget.Equals(nsID()) && !aData && !aDataLen)
         return NS_OK;
+#else /* VBOX */
+    if (aSenderID != IPC_SENDER_ANY && aTarget.Equals(nsID()) && !aData && !aDataLen)
+    {
+        // Insert new client down information. Start by expiring outdated
+        // entries and free one element if there's still no space (if needed).
+        PRIntervalTime now = PR_IntervalNow();
+        while (!g_ClientDownList.empty())
+        {
+            ClientDownInfo *cInfo = g_ClientDownList.back();
+            PRInt64 diff = (PRInt64)now - cInfo->uTimestamp;
+            if (diff < 0)
+                diff += (PRInt64)((PRIntervalTime)-1) + 1;
+            if (diff > PR_SecondsToInterval(15 * 60))
+            {
+                g_ClientDownMap.erase(cInfo->uClient);
+                g_ClientDownList.pop_back();
+                NS_ASSERTION(g_ClientDownMap.size() == g_ClientDownList.size(),
+                             "client down info inconsistency during expiry");
+                delete cInfo;
+            }
+            else
+                break;
+        }
+
+        ClientDownMap::iterator it = g_ClientDownMap.find(aSenderID);
+        if (it == g_ClientDownMap.end())
+        {
+            /* Getting size of a map is O(1), size of a list can be O(n). */
+            while (g_ClientDownMap.size() >= MAX_CLIENT_DOWN_SIZE)
+            {
+                ClientDownInfo *cInfo = g_ClientDownList.back();
+                g_ClientDownMap.erase(cInfo->uClient);
+                g_ClientDownList.pop_back();
+                NS_ASSERTION(g_ClientDownMap.size() == g_ClientDownList.size(),
+                             "client down info inconsistency during emergency evicting");
+                delete cInfo;
+            }
+
+            ClientDownInfo *cInfo = new ClientDownInfo(aSenderID);
+            g_ClientDownMap[aSenderID] = cInfo;
+            g_ClientDownList.push_front(cInfo);
+            NS_ASSERTION(g_ClientDownMap.size() == g_ClientDownList.size(),
+                         "client down info inconsistency after adding entry");
+        }
+        return (aSenderID == mPeer) ? NS_OK : IPC_WAIT_NEXT_MESSAGE;
+    }
+    // accept special "client up" messages for a given peer
+    // (empty target id, zero data and data length=1)
+    if (aTarget.Equals(nsID()) && !aData && aDataLen == 1)
+    {
+        ClientDownMap::iterator it = g_ClientDownMap.find(aSenderID);
+        if (it != g_ClientDownMap.end())
+        {
+            ClientDownInfo *cInfo = it->second;
+            g_ClientDownMap.erase(it);
+            g_ClientDownList.remove(cInfo);
+            NS_ASSERTION(g_ClientDownMap.size() == g_ClientDownList.size(),
+                         "client down info inconsistency in client up case");
+            delete cInfo;
+        }
+        return (aSenderID == mPeer) ? NS_OK : IPC_WAIT_NEXT_MESSAGE;
+    }
+    // accept special "client check" messages for an anonymous sender
+    // (invalid sender id, empty target id, zero data and data length
+    if (aSenderID == IPC_SENDER_ANY && aTarget.Equals(nsID()) && !aData && !aDataLen)
+    {
+        LOG(("DConnectMsgSelector::OnMessageAvailable: poll liveness for mPeer=%d\n",
+             mPeer));
+        ClientDownMap::iterator it = g_ClientDownMap.find(mPeer);
+        return (it == g_ClientDownMap.end()) ? IPC_WAIT_NEXT_MESSAGE : NS_OK;
+    }
+#endif /* VBOX */
     const DConnectOp *op = (const DConnectOp *) aData;
     // accept only reply messages with the given peer/opcode/index
     // (to prevent eating replies the other thread might be waiting for)
diff --git a/src/libs/xpcom18a4/xpcom/base/nscore.h b/src/libs/xpcom18a4/xpcom/base/nscore.h
index be5c3d655..b00e07af7 100644
--- a/src/libs/xpcom18a4/xpcom/base/nscore.h
+++ b/src/libs/xpcom18a4/xpcom/base/nscore.h
@@ -458,8 +458,8 @@ typedef PRUint32 nsresult;
  */
 
 #if defined(__GNUC__) && (__GNUC__ > 2)
-#define NS_LIKELY(x)    (__builtin_expect((x), 1))
-#define NS_UNLIKELY(x)  (__builtin_expect((x), 0))
+#define NS_LIKELY(x)    (__builtin_expect(!!(x), 1))
+#define NS_UNLIKELY(x)  (__builtin_expect(!!(x), 0))
 #else
 #define NS_LIKELY(x)    (x)
 #define NS_UNLIKELY(x)  (x)