diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2011-10-17 14:18:31 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2011-10-17 14:18:31 +0200 |
| commit | 1cf00a61132b69bc7e27254fdd74bf105d2da28c (patch) | |
| tree | a7d314cc5ec77b4ce3e1f037af600b53ae1d43f8 /src | |
| parent | f8fd93b0b6b13ba94584bb61c1efd1a761f438c9 (diff) | |
| download | virtualbox-1cf00a61132b69bc7e27254fdd74bf105d2da28c.tar.gz | |
Imported Upstream version 4.1.4-dfsgupstream/4.1.4-dfsg
Diffstat (limited to 'src')
2513 files changed, 14875 insertions, 11255 deletions
diff --git a/src/Makefile.kmk b/src/Makefile.kmk index 68f8f31d3..687e28aa9 100644 --- a/src/Makefile.kmk +++ b/src/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 34662 2010-12-02 21:51:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the src directory. # diff --git a/src/VBox/Additions/Makefile.kmk b/src/VBox/Additions/Makefile.kmk index 6d0f3fa53..ee8d7a1c6 100644 --- a/src/VBox/Additions/Makefile.kmk +++ b/src/VBox/Additions/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38093 2011-07-21 12:45:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VirtualBox Guest Additions. # diff --git a/src/VBox/Additions/common/Makefile.kmk b/src/VBox/Additions/common/Makefile.kmk index 1dab16ba2..dc6d66fbb 100644 --- a/src/VBox/Additions/common/Makefile.kmk +++ b/src/VBox/Additions/common/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 34817 2010-12-07 21:36:12Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the common addition code. # diff --git a/src/VBox/Additions/common/VBoxControl/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/Makefile.kmk index c57b43c28..f3c520307 100644 --- a/src/VBox/Additions/common/VBoxControl/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxControl/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 31002 2010-07-22 14:45:41Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Guest Additions Command Line Management Interface. # diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp index e97876e93..5f2c9e015 100644 --- a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxControl.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxControl.cpp $ */ /** @file * VBoxControl - Guest Additions Command Line Management Interface. */ diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.rc b/src/VBox/Additions/common/VBoxControl/VBoxControl.rc index e24f5fdfb..c9d1dd83a 100644 --- a/src/VBox/Additions/common/VBoxControl/VBoxControl.rc +++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxControl.rc 32394 2010-09-10 12:13:11Z vboxsync $ */ +/* $Id: VBoxControl.rc $ */ /** @file * VBoxControl - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk index 77c765d90..05a94c447 100644 --- a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBoxControl testcases. # diff --git a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp index e1b489607..7536162bb 100644 --- a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVBoxControl.cpp 32705 2010-09-23 07:06:34Z vboxsync $ */ +/* $Id: tstVBoxControl.cpp $ */ /** @file * VBoxControl - Guest Additions Command Line Management Interface, test case */ diff --git a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk index e9c760a38..d2e46af5d 100644 --- a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38316 2011-08-04 15:02:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Cross Platform Guest Additions Driver. # diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c index f206bb834..1720abb23 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-freebsd.c 38322 2011-08-05 10:15:15Z vboxsync $ */ +/* $Id: VBoxGuest-freebsd.c $ */ /** @file * VirtualBox Guest Additions Driver for FreeBSD. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c index 89b02e1fa..7275435fc 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c @@ -1,4 +1,4 @@ -/* $Rev: 36408 $ */ +/* $Rev: 74186 $ */ /** @file * VBoxGuest - Linux specifics. * @@ -26,10 +26,10 @@ #define LOG_GROUP LOG_GROUP_SUP_DRV #include "the-linux-kernel.h" #include "VBoxGuestInternal.h" +#include <linux/input.h> #include <linux/miscdevice.h> #include <linux/poll.h> -#include "version-generated.h" -#include "product-generated.h" +#include <VBox/version.h> #include <iprt/assert.h> #include <iprt/asm.h> @@ -105,6 +105,9 @@ static void *g_pvMMIOBase; static wait_queue_head_t g_PollEventQueue; /** Asynchronous notification stuff. */ static struct fasync_struct *g_pFAsyncQueue; +/** Pre-allocated mouse status VMMDev request for use in the IRQ + * handler. */ +static VMMDevReqMouseStatus *g_pMouseStatusReq; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) /** Whether we've create the logger or not. */ static volatile bool g_fLoggerCreated; @@ -135,6 +138,14 @@ static unsigned int g_iModuleMajor = 0; # error "CONFIG_VBOXADD_MAJOR -> CONFIG_VBOXGUEST_MAJOR" #endif +/** The input device handle */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) +static struct input_dev g_InputDevice; +#endif +static struct input_dev *g_pInputDevice = NULL; +/** Is the input device registered? */ +static bool g_fInputDeviceRegistered = false; + /** The file_operations structure. */ static struct file_operations g_FileOps = { @@ -197,6 +208,7 @@ static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] = }; MODULE_DEVICE_TABLE(pci, g_VBoxGuestPciId); +static PVBOXGUESTSESSION g_pKernelSession = NULL; /** * Converts a VBox status code to a linux error code. @@ -374,6 +386,132 @@ static void vboxguestLinuxTermISR(void) } +enum +{ + /** The minumum value our device can return */ + RANGE_MIN = 0, + /** The maximum value our device can return */ + RANGE_MAX = 0xFFFF +}; + + +/** Calls the kernel IOCtl to report mouse status to the host on behalf of + * our kernel session. */ +static int vboxguestLinuxSetMouseStatus(uint32_t fStatus) +{ + return VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &g_DevExt, + g_pKernelSession, &fStatus, sizeof(fStatus), + NULL); +} + + +/** Called when the input device is first opened. Sets up absolute reporting. + */ +static int vboxguestOpenInputDevice(struct input_dev *pDev) +{ + NOREF(pDev); + if (RT_FAILURE(vboxguestLinuxSetMouseStatus + ( VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE + | VMMDEV_MOUSE_NEW_PROTOCOL))) + return ENODEV; + return 0; +} + + +/** Called if all open handles to the device are closed, disables absolute + * reporting. */ +static void vboxguestCloseInputDevice(struct input_dev *pDev) +{ + NOREF(pDev); + vboxguestLinuxSetMouseStatus(0); +} + + +/** + * Creates the kernel input device. + */ +static int __init vboxguestLinuxCreateInputDevice(void) +{ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 29) +# define INPUT_DEV_ID(val) id.val +#else +# define INPUT_DEV_ID(val) id##val +#endif + int rc; + + rc = VbglGRAlloc((VMMDevRequestHeader **)&g_pMouseStatusReq, + sizeof(*g_pMouseStatusReq), + VMMDevReq_GetMouseStatus); + if (RT_FAILURE(rc)) + return -ENOMEM; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) + g_pInputDevice = input_allocate_device(); + if (!g_pInputDevice) + { + VbglGRFree(&g_pMouseStatusReq->header); + return -ENOMEM; + } + g_pInputDevice->INPUT_DEV_ID(bustype) = BUS_PCI; +#else + g_pInputDevice = &g_InputDevice; + g_pInputDevice->INPUT_DEV_ID(bus) = BUS_PCI; +#endif + g_pInputDevice->INPUT_DEV_ID(vendor) = VMMDEV_VENDORID; + g_pInputDevice->INPUT_DEV_ID(product) = VMMDEV_DEVICEID; + g_pInputDevice->INPUT_DEV_ID(version) = VBOX_SHORT_VERSION; + g_pInputDevice->open = vboxguestOpenInputDevice; + g_pInputDevice->close = vboxguestCloseInputDevice; + /** @todo parent (PCI?) device in device model view. */ + /* g_pInputDevice->dev.parent = */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) + { + int rc = input_register_device(g_pInputDevice); + if (rc) + { + VbglGRFree(&g_pMouseStatusReq->header); + input_free_device(g_pInputDevice); + return rc; + } + } +#else + input_register_device(g_pInputDevice); +#endif + /* Do what one of our competitors apparently does as that works. */ + ASMBitSet(g_pInputDevice->evbit, EV_ABS); + ASMBitSet(g_pInputDevice->evbit, EV_KEY); +#ifdef EV_SYN + ASMBitSet(g_pInputDevice->evbit, EV_SYN); +#endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7) + input_set_abs_params(g_pInputDevice, ABS_X, RANGE_MIN, RANGE_MAX, 0, 0); + input_set_abs_params(g_pInputDevice, ABS_Y, RANGE_MIN, RANGE_MAX, 0, 0); +#else + ASMBitSet(g_pInputDevice->absbit, ABS_X); + ASMBitSet(g_pInputDevice->absbit, ABS_Y); + g_pInputDevice->absmin[ABS_X] = g_pInputDevice->absmin[ABS_Y] = RANGE_MIN; + g_pInputDevice->absmax[ABS_X] = g_pInputDevice->absmax[ABS_Y] = RANGE_MAX; +#endif + ASMBitSet(g_pInputDevice->keybit, BTN_MOUSE); + /** @todo this string should be in a header file somewhere. */ + g_pInputDevice->name = "VirtualBox mouse integration"; + return 0; +#undef INPUT_DEV_ID +} + + +/** + * Terminates the kernel input device. + */ +static void vboxguestLinuxTermInputDevice(void) +{ + VbglGRFree(&g_pMouseStatusReq->header); + input_unregister_device(g_pInputDevice); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) + input_free_device(g_pInputDevice); +#endif +} + + /** * Creates the device nodes. * @@ -436,7 +574,6 @@ static void vboxguestLinuxTermDeviceNodes(void) } - /** * Initialize module. * @@ -515,20 +652,42 @@ static int __init vboxguestLinuxModInit(void) if (RT_SUCCESS(rc)) { /* - * Finally, create the device nodes. + * Create the kernel session for this driver. */ - rc = vboxguestLinuxInitDeviceNodes(); - if (rc >= 0) + rc = VBoxGuestCreateKernelSession(&g_DevExt, + &g_pKernelSession); + if (RT_SUCCESS(rc)) { - /* some useful information for the user but don't show this on the console */ - LogRel((DEVICE_NAME ": major %d, IRQ %d, I/O port %RTiop, MMIO at %RHp (size 0x%x)\n", - g_iModuleMajor, g_pPciDev->irq, g_IOPortBase, g_MMIOPhysAddr, g_cbMMIO)); - printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version " - VBOX_VERSION_STRING " (interface " RT_XSTR(VMMDEV_VERSION) ")\n"); - return rc; + /* + * Create the kernel input device. + */ + rc = vboxguestLinuxCreateInputDevice(); + if (rc >= 0) + { + /* + * Finally, create the device nodes. + */ + rc = vboxguestLinuxInitDeviceNodes(); + if (rc >= 0) + { + /* some useful information for the user but don't show this on the console */ + LogRel((DEVICE_NAME ": major %d, IRQ %d, I/O port %RTiop, MMIO at %RHp (size 0x%x)\n", + g_iModuleMajor, g_pPciDev->irq, g_IOPortBase, g_MMIOPhysAddr, g_cbMMIO)); + printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version " + VBOX_VERSION_STRING " (interface " RT_XSTR(VMMDEV_VERSION) ")\n"); + return rc; + } + + /* bail out */ + vboxguestLinuxTermInputDevice(); + } + else + { + LogRel((DEVICE_NAME ": vboxguestCreateInputDevice failed with rc=%Rrc\n", rc)); + rc = RTErrConvertFromErrno(rc); + } + VBoxGuestCloseSession(&g_DevExt, g_pKernelSession); } - - /* bail out */ VBoxGuestDeleteDevExt(&g_DevExt); } else @@ -556,6 +715,8 @@ static void __exit vboxguestLinuxModExit(void) * Inverse order of init. */ vboxguestLinuxTermDeviceNodes(); + vboxguestLinuxTermInputDevice(); + VBoxGuestCloseSession(&g_DevExt, g_pKernelSession); VBoxGuestDeleteDevExt(&g_DevExt); vboxguestLinuxTermISR(); vboxguestLinuxTermPci(); @@ -775,6 +936,7 @@ static ssize_t vboxguestRead(struct file *pFile, char *pbBuf, size_t cbRead, lof void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt) { + int rc; NOREF(pDevExt); /* @@ -785,6 +947,21 @@ void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt) wake_up_all(&g_PollEventQueue); Log(("VBoxGuestNativeISRMousePollEvent: kill_fasync\n")); kill_fasync(&g_pFAsyncQueue, SIGIO, POLL_IN); + /* Report events to the kernel input device */ + g_pMouseStatusReq->mouseFeatures = 0; + g_pMouseStatusReq->pointerXPos = 0; + g_pMouseStatusReq->pointerYPos = 0; + rc = VbglGRPerform(&g_pMouseStatusReq->header); + if (RT_SUCCESS(rc)) + { + input_report_abs(g_pInputDevice, ABS_X, + g_pMouseStatusReq->pointerXPos); + input_report_abs(g_pInputDevice, ABS_Y, + g_pMouseStatusReq->pointerYPos); +#ifdef EV_SYN + input_sync(g_pInputDevice); +#endif + } Log(("VBoxGuestNativeISRMousePollEvent: done\n")); } diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp index 1feac79d1..b1ae4156f 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-os2.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuest-os2.cpp $ */ /** @file * VBoxGuest - OS/2 specifics. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def index c1526e368..4728686eb 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def @@ -1,4 +1,4 @@ -; $Id: VBoxGuest-os2.def 31517 2010-08-10 11:28:35Z vboxsync $ +; $Id: VBoxGuest-os2.def $ ;; @file ; VBoxGuest - OS/2 definition file. ; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c index d87907ad3..8e9aa4971 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-solaris.c 36408 2011-03-24 16:25:47Z vboxsync $ */ +/* $Id: VBoxGuest-solaris.c $ */ /** @file * VirtualBox Guest Additions Driver for Solaris. */ @@ -28,6 +28,8 @@ #include <sys/ddi_intr.h> #include <sys/sunddi.h> #include <sys/open.h> +#include <sys/sunldi.h> +#include <sys/file.h> #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */ #include "VBoxGuestInternal.h" @@ -172,6 +174,12 @@ static size_t g_cIntrAllocated; static pollhead_t g_PollHead; /** The IRQ Mutex */ static kmutex_t g_IrqMtx; +/** Layered device handle for kernel keep-attached opens */ +static ldi_handle_t g_LdiHandle = NULL; +/** Ref counting for IDCOpen calls */ +static uint64_t g_cLdiOpens = 0; +/** The Mutex protecting the LDI handle in IDC opens */ +static kmutex_t g_LdiMtx; /** * Kernel entry points @@ -194,6 +202,8 @@ int _init(void) else cmn_err(CE_NOTE, "failed to initialize driver logging rc=%d!\n", rc); + mutex_init(&g_LdiMtx, NULL, MUTEX_DRIVER, NULL); + /* * Prevent module autounloading. */ @@ -231,6 +241,8 @@ int _fini(void) RTLogDestroy(RTLogRelSetDefaultInstance(NULL)); RTLogDestroy(RTLogSetDefaultInstance(NULL)); + mutex_destroy(&g_LdiMtx); + RTR0Term(); return rc; } diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp index bab93c98d..9e811cae1 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp @@ -109,6 +109,9 @@ ULONG DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath) case 1: /* Note: Also could be Windows 2008 Server R2! */ g_winVersion = WIN7; break; + case 2: + g_winVersion = WIN8; + break; default: Log(("VBoxGuest::DriverEntry: Unknown version of Windows (%u.%u), refusing!\n", majorVersion, minorVersion)); @@ -514,6 +517,26 @@ NTSTATUS vboxguestwinCleanup(PDEVICE_OBJECT pDevObj) PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pDevObj->DeviceExtension; if (pDevExt) { + +#if 0 /* @todo: test & enable cleaning global session data */ +#ifdef VBOX_WITH_HGCM + if (pDevExt->win.s.pKernelSession) + { + VBoxGuestCloseSession(pDevExt, pDevExt->win.s.pKernelSession); + pDevExt->win.s.pKernelSession = NULL; + } +#endif +#endif + + if (pDevExt->win.s.pInterruptObject) + { + IoDisconnectInterrupt(pDevExt->win.s.pInterruptObject); + pDevExt->win.s.pInterruptObject = NULL; + } + + /* @todo: cleanup the rest stuff */ + + #ifdef VBOX_WITH_GUEST_BUGCHECK_DETECTION hlpDeregisterBugCheckCallback(pDevExt); /* ignore failure! */ #endif @@ -1255,6 +1278,14 @@ VBOXOSTYPE vboxguestwinVersionToOSType(winVersion_t winVer) #endif break; + case WIN8: +#if ARCH_BITS == 64 + enmOsType = VBOXOSTYPE_Win8_x64; +#else + enmOsType = VBOXOSTYPE_Win8; +#endif + break; + default: /* We don't know, therefore NT family. */ enmOsType = VBOXOSTYPE_WinNT; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h index db3307dd0..db978a6d3 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h @@ -143,7 +143,8 @@ typedef enum WINXP = 3, WIN2K3 = 4, WINVISTA = 5, - WIN7 = 6 + WIN7 = 6, + WIN8 = 7 } winVersion_t; extern winVersion_t winVersion; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp index 77a66bcd9..e0a056b2e 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest.cpp 34406 2010-11-26 16:45:34Z vboxsync $ */ +/* $Id: VBoxGuest.cpp $ */ /** @file * VBoxGuest - Guest Additions Driver, Common Code. */ @@ -56,6 +56,10 @@ #ifdef VBOX_WITH_HGCM static DECLCALLBACK(int) VBoxGuestHGCMAsyncWaitCallback(VMMDevHGCMRequestHeader *pHdrNonVolatile, void *pvUser, uint32_t u32User); #endif +#ifdef DEBUG +static void testSetMouseStatus(void); +#endif +static int VBoxGuestCommonIOCtl_SetMouseStatus(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fFeatures); /******************************************************************************* @@ -708,7 +712,6 @@ int VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, pDevExt->f32PendingEvents = 0; pDevExt->u32MousePosChangedSeq = 0; pDevExt->SessionSpinlock = NIL_RTSPINLOCK; - pDevExt->u32ClipboardClientId = 0; pDevExt->MemBalloon.hMtx = NIL_RTSEMFASTMUTEX; pDevExt->MemBalloon.cChunks = 0; pDevExt->MemBalloon.cMaxChunks = 0; @@ -788,6 +791,10 @@ int VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, { vboxGuestInitFixateGuestMappings(pDevExt); +#ifdef DEBUG + testSetMouseStatus(); /* Other tests? */ +#endif + rc = VBoxGuestReportDriverStatus(true /* Driver is active */); if (RT_FAILURE(rc)) LogRel(("VBoxGuestInitDevExt: VBoxReportGuestDriverStatus failed, rc=%Rrc\n", rc)); @@ -978,6 +985,8 @@ void VBoxGuestCloseSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession) pSession->Process = NIL_RTPROCESS; pSession->R0Process = NIL_RTR0PROCESS; vboxGuestCloseMemBalloon(pDevExt, pSession); + /* Reset any mouse status flags which the session may have set. */ + VBoxGuestCommonIOCtl_SetMouseStatus(pDevExt, pSession, 0); RTMemFree(pSession); } @@ -1817,74 +1826,6 @@ static int VBoxGuestCommonIOCtl_HGCMCall(PVBOXGUESTDEVEXT pDevExt, } -/** - * @returns VBox status code. Unlike the other HGCM IOCtls this will combine - * the VbglHGCMConnect/Disconnect return code with the Info.result. - * - * @param pDevExt The device extension. - * @param pu32ClientId The client id. - * @param pcbDataReturned Where to store the amount of returned data. Can - * be NULL. - */ -static int VBoxGuestCommonIOCtl_HGCMClipboardReConnect(PVBOXGUESTDEVEXT pDevExt, uint32_t *pu32ClientId, size_t *pcbDataReturned) -{ - int rc; - VBoxGuestHGCMConnectInfo CnInfo; - - Log(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: Current u32ClientId=%RX32\n", pDevExt->u32ClipboardClientId)); - - /* - * If there is an old client, try disconnect it first. - */ - if (pDevExt->u32ClipboardClientId != 0) - { - VBoxGuestHGCMDisconnectInfo DiInfo; - DiInfo.result = VERR_WRONG_ORDER; - DiInfo.u32ClientID = pDevExt->u32ClipboardClientId; - rc = VbglR0HGCMInternalDisconnect(&DiInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT); - if (RT_SUCCESS(rc)) - { - LogRel(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: failed to disconnect old client. VbglHGCMDisconnect -> rc=%Rrc\n", rc)); - return rc; - } - if (RT_FAILURE((int32_t)DiInfo.result)) - { - Log(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: failed to disconnect old client. DiInfo.result=%Rrc\n", DiInfo.result)); - return DiInfo.result; - } - pDevExt->u32ClipboardClientId = 0; - } - - /* - * Try connect. - */ - CnInfo.Loc.type = VMMDevHGCMLoc_LocalHost_Existing; - strcpy(CnInfo.Loc.u.host.achName, "VBoxSharedClipboard"); - CnInfo.u32ClientID = 0; - CnInfo.result = VERR_WRONG_ORDER; - - rc = VbglR0HGCMInternalConnect(&CnInfo, VBoxGuestHGCMAsyncWaitCallback, pDevExt, RT_INDEFINITE_WAIT); - if (RT_FAILURE(rc)) - { - LogRel(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: VbglHGCMConnected -> rc=%Rrc\n", rc)); - return rc; - } - if (RT_FAILURE(CnInfo.result)) - { - LogRel(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: VbglHGCMConnected -> rc=%Rrc\n", rc)); - return rc; - } - - Log(("VBoxGuestCommonIOCtl: CLIPBOARD_CONNECT: connected successfully u32ClientId=%RX32\n", CnInfo.u32ClientID)); - - pDevExt->u32ClipboardClientId = CnInfo.u32ClientID; - *pu32ClientId = CnInfo.u32ClientID; - if (pcbDataReturned) - *pcbDataReturned = sizeof(uint32_t); - - return VINF_SUCCESS; -} - #endif /* VBOX_WITH_HGCM */ /** @@ -2068,6 +2009,172 @@ static int VBoxGuestCommonIOCtl_DisableVRDPSession(VBOXGUESTDEVEXT pDevExt, PVBO } #endif /* VBOX_WITH_VRDP_SESSION_HANDLING */ +#ifdef DEBUG +/** Unit test SetMouseStatus instead of really executing the request. */ +static bool g_test_fSetMouseStatus = false; +/** When unit testing SetMouseStatus, the fake RC for the GR to return. */ +static int g_test_SetMouseStatusGRRC; +/** When unit testing SetMouseStatus this will be set to the status passed to + * the GR. */ +static uint32_t g_test_statusSetMouseStatus; +#endif + +static int vboxguestcommonSetMouseStatus(uint32_t fFeatures) +{ + VMMDevReqMouseStatus *pReq; + int rc; + + LogRelFlowFunc(("fFeatures=%u\n", (int) fFeatures)); + rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetMouseStatus); + if (RT_SUCCESS(rc)) + { + pReq->mouseFeatures = fFeatures; + pReq->pointerXPos = 0; + pReq->pointerYPos = 0; +#ifdef DEBUG + if (g_test_fSetMouseStatus) + { + g_test_statusSetMouseStatus = pReq->mouseFeatures; + rc = g_test_SetMouseStatusGRRC; + } + else +#endif + rc = VbglGRPerform(&pReq->header); + VbglGRFree(&pReq->header); + } + LogRelFlowFunc(("rc=%Rrc\n", rc)); + return rc; +} + + +/** + * Sets the mouse status features for this session and updates them + * globally. We aim to ensure that if several threads call this in + * parallel the most recent status will always end up being set. + * + * @returns VBox status code. + * + * @param pDevExt The device extention. + * @param pSession The session. + * @param fFeatures New bitmap of enabled features. + */ +static int VBoxGuestCommonIOCtl_SetMouseStatus(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, uint32_t fFeatures) +{ + unsigned i; + RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER; + uint32_t fNewDevExtStatus = 0; + int rc; + /* Exit early if nothing has changed - hack to work around the + * Windows Additions not using the common code. */ + bool fNoAction; + + RTSpinlockAcquireNoInts(pDevExt->SessionSpinlock, &Tmp); + for (i = 0; i < sizeof(fFeatures) * 8; ++i) + { + if (RT_BIT_32(i) & VMMDEV_MOUSE_GUEST_MASK) + { + if ( (RT_BIT_32(i) & fFeatures) + && !(RT_BIT_32(i) & pSession->fMouseStatus)) + ++pDevExt->cMouseFeatureUsage[i]; + else if ( !(RT_BIT_32(i) & fFeatures) + && (RT_BIT_32(i) & pSession->fMouseStatus)) + --pDevExt->cMouseFeatureUsage[i]; + } + if (pDevExt->cMouseFeatureUsage[i] > 0) + fNewDevExtStatus |= RT_BIT_32(i); + } + pSession->fMouseStatus = fFeatures & VMMDEV_MOUSE_GUEST_MASK; + fNoAction = (pDevExt->fMouseStatus == fNewDevExtStatus); + pDevExt->fMouseStatus = fNewDevExtStatus; + RTSpinlockReleaseNoInts(pDevExt->SessionSpinlock, &Tmp); + if (fNoAction) + return VINF_SUCCESS; + do + { + fNewDevExtStatus = pDevExt->fMouseStatus; + rc = vboxguestcommonSetMouseStatus(fNewDevExtStatus); + } while(RT_SUCCESS(rc) && fNewDevExtStatus != pDevExt->fMouseStatus); + return rc; +} + + +#ifdef DEBUG +/** Unit test for the SET_MOUSE_STATUS IoCtl. Since this is closely tied to + * the code in question it probably makes most sense to keep it next to the + * code. */ +static void testSetMouseStatus(void) +{ + int cFailures = 0; + uint32_t u32Data; + int rc; + RTSPINLOCK Spinlock; + + g_test_fSetMouseStatus = true; + rc = RTSpinlockCreate(&Spinlock); + AssertRCReturnVoid(rc); + { + VBOXGUESTDEVEXT DevExt = { 0 }; + VBOXGUESTSESSION Session = { 0 }; + + g_test_statusSetMouseStatus = ~0; + g_test_SetMouseStatusGRRC = VINF_SUCCESS; + DevExt.SessionSpinlock = Spinlock; + u32Data = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE, + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR) - 1] = 1; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == ( VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE + | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR), + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + u32Data = VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE; /* Can't change this */ + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR, + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + u32Data = VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR, + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + u32Data = 0; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + AssertMsg( g_test_statusSetMouseStatus + == VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR, + ("Actual status: 0x%x\n", g_test_statusSetMouseStatus)); + AssertMsg(DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR) - 1] == 1, + ("Actual value: %d\n", DevExt.cMouseFeatureUsage[ASMBitFirstSetU32(VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR)])); + g_test_SetMouseStatusGRRC = VERR_UNRESOLVED_ERROR; + /* This should succeed as the host request should not be made + * since nothing has changed. */ + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertRCSuccess(rc); + /* This should fail with VERR_UNRESOLVED_ERROR as set above. */ + u32Data = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE; + rc = VBoxGuestCommonIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &DevExt, + &Session, &u32Data, sizeof(u32Data), NULL); + AssertMsg(rc == VERR_UNRESOLVED_ERROR, ("rc == %Rrc\n", rc)); + /* Untested paths: out of memory; race setting status to host */ + } + RTSpinlockDestroy(Spinlock); + g_test_fSetMouseStatus = false; +} +#endif + /** * Guest backdoor logging. @@ -2143,6 +2250,20 @@ int VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUES return VERR_INVALID_POINTER; \ } \ } while (0) +#define CHECKRET_SIZE(mnemonic, cb) \ + do { \ + if (cbData != (cb)) \ + { \ + LogFunc((mnemonic ": cbData=%#zx (%zu) expected is %#zx (%zu)\n", \ + cbData, cbData, (size_t)(cb), (size_t)(cb))); \ + return VERR_BUFFER_OVERFLOW; \ + } \ + if ((cb) != 0 && !VALID_PTR(pvData)) \ + { \ + LogFunc((mnemonic ": Invalid pointer %p\n", pvData)); \ + return VERR_INVALID_POINTER; \ + } \ + } while (0) /* @@ -2243,11 +2364,6 @@ int VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUES CHECKRET_MIN_SIZE("HGCM_DISCONNECT", sizeof(VBoxGuestHGCMDisconnectInfo)); rc = VBoxGuestCommonIOCtl_HGCMDisconnect(pDevExt, pSession, (VBoxGuestHGCMDisconnectInfo *)pvData, pcbDataReturned); break; - - case VBOXGUEST_IOCTL_CLIPBOARD_CONNECT: - CHECKRET_MIN_SIZE("CLIPBOARD_CONNECT", sizeof(uint32_t)); - rc = VBoxGuestCommonIOCtl_HGCMClipboardReConnect(pDevExt, (uint32_t *)pvData, pcbDataReturned); - break; #endif /* VBOX_WITH_HGCM */ case VBOXGUEST_IOCTL_CHECK_BALLOON: @@ -2274,6 +2390,11 @@ int VBoxGuestCommonIOCtl(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUES rc = VBoxGuestCommonIOCtl_DisableVRDPSession(pDevExt, pSession); break; #endif /* VBOX_WITH_VRDP_SESSION_HANDLING */ + case VBOXGUEST_IOCTL_SET_MOUSE_STATUS: + CHECKRET_SIZE("SET_MOUSE_STATUS", sizeof(uint32_t)); + rc = VBoxGuestCommonIOCtl_SetMouseStatus(pDevExt, pSession, + *(uint32_t *)pvData); + break; default: { diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp index a326513cf..db507545e 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest2.cpp 35907 2011-02-09 11:20:31Z vboxsync $ */ +/* $Id: VBoxGuest2.cpp $ */ /** @file * VBoxGuest - Guest Additions Driver, bits shared with the windows code. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h index a7214d7a9..74fac205d 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest2.h @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest2.h 32434 2010-09-12 23:11:51Z vboxsync $ */ +/* $Id: VBoxGuest2.h $ */ /** @file * VBoxGuest - Guest Additions Driver, bits shared with the windows code. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm index bb018c4de..bb8757f19 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm @@ -1,4 +1,4 @@ -; $Id: VBoxGuestA-os2.asm 31517 2010-08-10 11:28:35Z vboxsync $ +; $Id: VBoxGuestA-os2.asm $ ;; @file ; VBoxGuest - OS/2 assembly file, the first file in the link. ; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h index be447cc0e..62fe75da3 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestIDC-unix.c.h @@ -1,4 +1,4 @@ -/* $Rev: 33595 $ */ +/* $Rev: 74164 $ */ /** @file * VBoxGuest - Inter Driver Communication, unix implementation. * @@ -39,12 +39,45 @@ DECLVBGL(void *) VBoxGuestIDCOpen(uint32_t *pu32Version) LogFlow(("VBoxGuestIDCOpen: Version=%#x\n", pu32Version ? *pu32Version : 0)); AssertPtrReturn(pu32Version, NULL); + +#ifdef RT_OS_SOLARIS + mutex_enter(&g_LdiMtx); + if (!g_LdiHandle) + { + ldi_ident_t DevIdent = ldi_ident_from_anon(); + rc = ldi_open_by_name(VBOXGUEST_DEVICE_NAME, FREAD, kcred, &g_LdiHandle, DevIdent); + ldi_ident_release(DevIdent); + if (rc) + { + LogRel(("VBoxGuestIDCOpen: ldi_open_by_name failed. rc=%d\n", rc)); + mutex_exit(&g_LdiMtx); + return NULL; + } + } + ++g_cLdiOpens; + mutex_exit(&g_LdiMtx); +#endif + rc = VBoxGuestCreateKernelSession(&g_DevExt, &pSession); if (RT_SUCCESS(rc)) { *pu32Version = VMMDEV_VERSION; return pSession; } + +#ifdef RT_OS_SOLARIS + mutex_enter(&g_LdiMtx); + if (g_cLdiOpens > 0) + --g_cLdiOpens; + if ( g_cLdiOpens == 0 + && g_LdiHandle) + { + ldi_close(g_LdiHandle, FREAD, kcred); + g_LdiHandle = NULL; + } + mutex_exit(&g_LdiMtx); +#endif + LogRel(("VBoxGuestIDCOpen: VBoxGuestCreateKernelSession failed. rc=%d\n", rc)); return NULL; } @@ -63,6 +96,20 @@ DECLVBGL(int) VBoxGuestIDCClose(void *pvSession) AssertPtrReturn(pSession, VERR_INVALID_POINTER); VBoxGuestCloseSession(&g_DevExt, pSession); + +#ifdef RT_OS_SOLARIS + mutex_enter(&g_LdiMtx); + if (g_cLdiOpens > 0) + --g_cLdiOpens; + if ( g_cLdiOpens == 0 + && g_LdiHandle) + { + ldi_close(g_LdiHandle, FREAD, kcred); + g_LdiHandle = NULL; + } + mutex_exit(&g_LdiMtx); +#endif + return VINF_SUCCESS; } diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h index a82215821..b974c2b49 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestInternal.h 33750 2010-11-03 21:00:26Z vboxsync $ */ +/* $Id: VBoxGuestInternal.h $ */ /** @file * VBoxGuest - Guest Additions Driver. */ @@ -144,24 +144,20 @@ typedef struct VBOXGUESTDEVEXT /** Spinlock various items in the VBOXGUESTSESSION. */ RTSPINLOCK SessionSpinlock; - - /** The current clipboard client ID, 0 if no client. - * For implementing the VBOXGUEST_IOCTL_CLIPBOARD_CONNECT interface. */ - uint32_t u32ClipboardClientId; #ifdef VBOX_WITH_VRDP_SESSION_HANDLING BOOL fVRDPEnabled; #endif /** Memory balloon information for RTR0MemObjAllocPhysNC(). */ VBOXGUESTMEMBALLOON MemBalloon; - /** Align the next bit on a 64-byte boundary and make sure it starts at the same - * offset in both 64-bit and 32-bit builds. - * - * @remarks The alignments of the members that are larger than 48 bytes should be - * 64-byte for cache line reasons. structs containing small amounts of - * data could be lumped together at the end with a < 64 byte padding - * following it (to grow into and align the struct size). - */ - uint8_t abAlignment1[HC_ARCH_BITS == 32 ? 24 : 4]; + /** For each mouse status feature the number of sessions which have + * enabled it. A feature is enabled globally if at least one session has + * requested it. */ + /** @todo can we programmatically determine the size of the array and + * still get the following alignment right? */ + uint32_t volatile cMouseFeatureUsage[32]; + /** The mouse feature status matching the counts above. These are updated + * together inside the session spinlock. */ + uint32_t volatile fMouseStatus; /** Windows part. */ union @@ -169,7 +165,6 @@ typedef struct VBOXGUESTDEVEXT #ifdef ___VBoxGuest_win_h VBOXGUESTDEVEXTWIN s; #endif - uint8_t padding[256]; /* Multiple of 64; fix me! */ } win; } VBOXGUESTDEVEXT; @@ -212,6 +207,9 @@ typedef struct VBOXGUESTSESSION /** The last consumed VMMDEV_EVENT_MOUSE_POSITION_CHANGED sequence number. * Used to implement polling. */ uint32_t volatile u32MousePosChangedSeq; + /** Mouse features supported. A feature enabled in any guest session will + * be enabled for the host. */ + uint32_t volatile fMouseStatus; } VBOXGUESTSESSION; diff --git a/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile b/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile index a295456af..e186a7342 100644 --- a/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile +++ b/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 37233 2011-05-27 13:31:57Z vboxsync $ +# $Id: Makefile $ ## @file # VirtualBox Guest Additions Module Makefile. # diff --git a/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest b/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest index 7d022ca77..303440b45 100644..100755 --- a/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest +++ b/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxguest 37955 2011-07-14 12:23:02Z vboxsync $ +# $Id: files_vboxguest $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/common/VBoxGuest/linux/Makefile b/src/VBox/Additions/common/VBoxGuest/linux/Makefile index c14476892..2211952af 100644 --- a/src/VBox/Additions/common/VBoxGuest/linux/Makefile +++ b/src/VBox/Additions/common/VBoxGuest/linux/Makefile @@ -1,4 +1,4 @@ -# $Revision: 37233 $ +# $Revision: 71955 $ ## @file # VirtualBox Guest Additions Module Makefile. # diff --git a/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest b/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest index 8c56bcd8c..6d0900fe8 100644..100755 --- a/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest +++ b/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxguest 37964 2011-07-14 13:20:55Z vboxsync $ +# $Id: files_vboxguest $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc index f08489a4d..0b2920e9e 100644 --- a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc +++ b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest.rc 32399 2010-09-10 12:47:16Z vboxsync $ */ +/* $Id: VBoxGuest.rc $ */ /** @file * VBoxGuest - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp b/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp index 01cf1c682..ea1fe1873 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp @@ -1,4 +1,4 @@ -/* $Revision: 36740 $ */ +/* $Revision: 71271 $ */ /** @file * VBoxGuestLibR0 - Generic VMMDev request management. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp b/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp index 1c7b2a572..7fef12879 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp @@ -1,4 +1,4 @@ -/* $Revision: 28800 $ */ +/* $Revision: 60692 $ */ /** @file * VBoxGuestLib - Host-Guest Communication Manager. * diff --git a/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp b/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp index d2f726a8a..5cde531d0 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp @@ -1,4 +1,4 @@ -/* $Revision: 36373 $ */ +/* $Revision: 70720 $ */ /** @file * VBoxGuestLib - Host-Guest Communication Manager internal functions, implemented by VBoxGuest */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/Init.cpp b/src/VBox/Additions/common/VBoxGuestLib/Init.cpp index f76743293..4a736a345 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/Init.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/Init.cpp @@ -1,4 +1,4 @@ -/* $Revision: 34066 $ */ +/* $Revision: 67748 $ */ /** @file * VBoxGuestLibR0 - Library initialization. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk index 7d5e1a9e6..242aeb5b9 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 35380 2010-12-30 16:06:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the common guest addition code library. # diff --git a/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp b/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp index 407f14c94..51f1281d0 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp @@ -1,4 +1,4 @@ -/* $Revision: 33540 $ */ +/* $Revision: 67140 $ */ /** @file * VBoxGuestLibR0 - Physical memory heap. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp index 3cc126602..4b40de0c5 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp @@ -1,4 +1,4 @@ -/* $Revision: 33540 $ */ +/* $Revision: 67140 $ */ /** @file * VBoxGuestLibR0 - IDC with VBoxGuest and HGCM helpers. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h index 80b50f895..8b68df513 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h +++ b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h @@ -1,4 +1,4 @@ -/* $Revision: 28800 $ */ +/* $Revision: 60692 $ */ /** @file * VBoxGuestLibR0 - System dependent helpers internal header. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h index 2c077c52f..eb36f231f 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h @@ -1,4 +1,4 @@ -/* $Revision: 38407 $ */ +/* $Revision: 73443 $ */ /** @file * VBoxGuestLibR0 - Internal header. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h index 8a767d0da..a36e81291 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h @@ -1,4 +1,4 @@ -/* $Id: VBGLR3Internal.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBGLR3Internal.h $ */ /** @file * VBoxGuestR3Lib - Ring-3 support library for the guest additions, Internal header. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c index 6ca0c727a..55fd41230 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c @@ -1,4 +1,4 @@ -/* $Revision: 37672 $ */ +/* $Revision: 72532 $ */ /** @file * VBoxGuestR0LibSharedFolders - Ring 0 Shared Folders calls. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp index e71425377..07e888b66 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3Lib.cpp 38317 2011-08-04 15:27:37Z vboxsync $ */ +/* $Id: VBoxGuestR3Lib.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Core. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp index bfc9e4a24..ef9559000 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibAdditions.cpp 37262 2011-05-30 14:13:17Z vboxsync $ */ +/* $Id: VBoxGuestR3LibAdditions.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Additions Info. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp index 076fe9721..cd4279bb0 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibBalloon.cpp 31045 2010-07-23 09:48:52Z vboxsync $ */ +/* $Id: VBoxGuestR3LibBalloon.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Ballooning. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp index ad21c4873..2c13b0aa1 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibClipboard.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibClipboard.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Clipboard. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp index 0ff3e2140..8ef0006b4 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibCoreDump.cpp 32574 2010-09-16 17:44:29Z vboxsync $ */ +/* $Id: VBoxGuestR3LibCoreDump.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Core Dumps. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp index 5c626654f..563548394 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibCpuHotPlug.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibCpuHotPlug.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, CPU Hot Plugging. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp index 25c72bd18..678d32ee3 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibCredentials.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibCredentials.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, user credentials. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp index 9ca617fb7..a314e522c 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxGuestR3LibDaemonize.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/** $Id: VBoxGuestR3LibDaemonize.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, daemonize a process. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp index 93caeb8a3..f1d901428 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibEvent.cpp 29291 2010-05-10 10:12:44Z vboxsync $ */ +/* $Id: VBoxGuestR3LibEvent.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Events. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp index 133b6a80f..b8a3fa7f2 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibGR.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibGR.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, GR. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp index 0964c3557..dd9729515 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibGuestCtrl.cpp 38133 2011-07-25 09:02:17Z vboxsync $ */ +/* $Id: VBoxGuestR3LibGuestCtrl.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, guest control. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp index 1014b44d6..32c7d7968 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibGuestProp.cpp 36638 2011-04-11 09:51:59Z vboxsync $ */ +/* $Id: VBoxGuestR3LibGuestProp.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, guest properties. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp index 468c37971..01aacd4ed 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibLog.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibLog.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Logging. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp index 5cdcadd97..cc298cb26 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibMisc.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibMisc.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Misc. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp index 1807bdc03..f0bb28d50 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibModule.cpp 30061 2010-06-07 09:34:15Z vboxsync $ */ +/* $Id: VBoxGuestR3LibModule.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Shared modules. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp index c23134dca..c21342843 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibMouse.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibMouse.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Mouse. */ @@ -70,11 +70,7 @@ VBGLR3DECL(int) VbglR3GetMouseStatus(uint32_t *pfFeatures, uint32_t *px, uint32_ */ VBGLR3DECL(int) VbglR3SetMouseStatus(uint32_t fFeatures) { - VMMDevReqMouseStatus Req; - vmmdevInitRequest(&Req.header, VMMDevReq_SetMouseStatus); - Req.mouseFeatures = fFeatures; - Req.pointerXPos = 0; - Req.pointerYPos = 0; - return vbglR3GRPerform(&Req.header); + return vbglR3DoIOCtl(VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fFeatures, + sizeof(fFeatures)); } diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp index c1f0af5bd..36427fe87 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibRuntimeXF86.cpp 31159 2010-07-28 03:28:00Z vboxsync $ */ +/* $Id: VBoxGuestR3LibRuntimeXF86.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, * implements the minimum of runtime functions needed for diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp index a0ba5e5c1..aa146281b 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibSeamless.cpp 37384 2011-06-08 15:09:14Z vboxsync $ */ +/* $Id: VBoxGuestR3LibSeamless.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Seamless mode. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp index a481a8bcf..11123a847 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibSharedFolders.cpp 35351 2010-12-27 17:04:17Z vboxsync $ */ +/* $Id: VBoxGuestR3LibSharedFolders.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, shared folders. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp index 6609aa41d..289181a1d 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibStat.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibStat.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Statistics. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp index 9275900c0..c03b2c222 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibTime.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibTime.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Time. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp index 8d1e989dd..3298d85d8 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibVideo.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxGuestR3LibVideo.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Video. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp b/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp index 74a2c69d4..c95198f0f 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp @@ -1,4 +1,4 @@ -/* $Revision: 28800 $ */ +/* $Revision: 60692 $ */ /** @file * VBoxGuestLibR0 - Physical memory heap. */ diff --git a/src/VBox/Additions/common/VBoxService/Makefile.kmk b/src/VBox/Additions/common/VBoxService/Makefile.kmk index d3b38a4ec..ee88c6ba8 100644 --- a/src/VBox/Additions/common/VBoxService/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxService/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38133 2011-07-25 09:02:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Cross Platform Guest Addition Services. # diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp index 6f0a51b53..ca54b67a0 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxService-win.cpp 36338 2011-03-22 10:57:01Z vboxsync $ */ +/* $Id: VBoxService-win.cpp $ */ /** @file * VBoxService - Guest Additions Service Skeleton, Windows Specific Parts. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-win.rc b/src/VBox/Additions/common/VBoxService/VBoxService-win.rc index 28ff919ba..91db5f56c 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService-win.rc +++ b/src/VBox/Additions/common/VBoxService/VBoxService-win.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxService-win.rc 32394 2010-09-10 12:13:11Z vboxsync $ */ +/* $Id: VBoxService-win.rc $ */ /** @file * VBoxService - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxService.cpp b/src/VBox/Additions/common/VBoxService/VBoxService.cpp index 873ca1343..d093d23ea 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxService.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxService.cpp 38223 2011-07-28 14:38:54Z vboxsync $ */ +/* $Id: VBoxService.cpp $ */ /** @file * VBoxService - Guest Additions Service Skeleton. */ @@ -217,19 +217,18 @@ RTEXITCODE VBoxServiceError(const char *pszFormat, ...) * Displays a verbose message. * * @returns 1 + * @param iLevel Minimum log level required to display this message. * @param pszFormat The message text. * @param ... Format arguments. */ void VBoxServiceVerbose(int iLevel, const char *pszFormat, ...) { -#ifdef DEBUG - int rc = RTCritSectEnter(&g_csLog); - if (RT_SUCCESS(rc)) + if (iLevel <= g_cVerbosity) { -#endif - if (iLevel <= g_cVerbosity) - { #ifdef DEBUG + int rc = RTCritSectEnter(&g_csLog); + if (RT_SUCCESS(rc)) + { const char *pszThreadName = RTThreadSelfName(); AssertPtr(pszThreadName); RTStrmPrintf(g_pStdOut, "%s [%s]: ", @@ -244,13 +243,11 @@ void VBoxServiceVerbose(int iLevel, const char *pszFormat, ...) va_start(va, pszFormat); LogRel(("%s: %N", g_pszProgName, pszFormat, &va)); va_end(va); - } #ifdef DEBUG - int rc2 = RTCritSectLeave(&g_csLog); - if (RT_SUCCESS(rc)) - rc = rc2; - } + RTCritSectLeave(&g_csLog); + } #endif + } } diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp index 5f8db00a1..498cee8df 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceAutoMount.cpp 37832 2011-07-08 10:13:18Z vboxsync $ */ +/* $Id: VBoxServiceAutoMount.cpp $ */ /** @file * VBoxService - Auto-mounting for Shared Folders. */ @@ -331,7 +331,8 @@ static int VBoxServiceAutoMountSharedFolder(const char *pszShareName, const char break; case 3: - VBoxServiceError("VBoxServiceAutoMountWorker: Could not add an entry to the mount table: %s\n", strerror(errno)); + /* VBoxServiceError("VBoxServiceAutoMountWorker: Could not add an entry to the mount table: %s\n", strerror(errno)); */ + errno = 0; break; default: diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp index 800427066..8b609d432 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceBalloon.cpp 32813 2010-09-29 11:50:19Z vboxsync $ */ +/* $Id: VBoxServiceBalloon.cpp $ */ /** @file * VBoxService - Memory Ballooning. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp index 978cdd2d0..ea32683cf 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxServiceClipboard-os2.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/** $Id: VBoxServiceClipboard-os2.cpp $ */ /** @file * VBoxService - Guest Additions Clipboard Service, OS/2. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp index 80ce6e61c..8de4144e4 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceControl.cpp 38157 2011-07-25 13:10:12Z vboxsync $ */ +/* $Id: VBoxServiceControl.cpp $ */ /** @file * VBoxServiceControl - Host-driven Guest Control. */ @@ -251,6 +251,7 @@ static DECLCALLBACK(void) VBoxServiceControlStop(void) } } + void VBoxServiceControlThreadSignalShutdown(const PVBOXSERVICECTRLTHREAD pThread) { AssertPtrReturnVoid(pThread); @@ -262,7 +263,8 @@ int VBoxServiceControlThreadWaitForShutdown(const PVBOXSERVICECTRLTHREAD pThread { AssertPtrReturn(pThread, VERR_INVALID_POINTER); int rc = VINF_SUCCESS; - if (pThread->Thread != NIL_RTTHREAD) + if ( pThread->Thread != NIL_RTTHREAD + && !pThread->fShutdown) /* Only shutdown threads which aren't yet. */ { /* Wait a bit ... */ rc = RTThreadWait(pThread->Thread, 30 * 1000 /* Wait 30 seconds max. */, NULL); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp index 83ba405c9..1c7b7c280 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceControlExec.cpp 38395 2011-08-10 11:48:29Z vboxsync $ */ +/* $Id: VBoxServiceControlExec.cpp $ */ /** @file * VBoxServiceControlExec - Utility functions for process execution. */ @@ -247,6 +247,11 @@ static int VBoxServiceControlExecProcHandleOutputEvent(RTPOLLSET hPollSet, uint3 rc2 = RTPipeClose(*phPipeR); AssertRC(rc2); *phPipeR = NIL_RTPIPE; + + /* Sinc some error occured (or because the pipe simply broke) we + * have to set our pipe buffer to disabled so that others don't wait + * for new data to arrive anymore. */ + VBoxServicePipeBufSetStatus(pBuf, false); } return rc; } @@ -606,6 +611,18 @@ static int VBoxServiceControlExecProcLoop(PVBOXSERVICECTRLTHREAD pThread, cbOffset, &cbRead, &cbLeft)) && cbRead) { +#ifdef DEBUG + int rc2 = RTCritSectEnter(&g_csLog); + if (RT_SUCCESS(rc2)) + { +#endif + RTStrmWriteEx(g_pStdOut, szBuf, cbRead, NULL /* No partial write. */); +#ifdef DEBUG + rc2 = RTCritSectLeave(&g_csLog); + if (RT_SUCCESS(rc)) + rc = rc2; + } +#endif cbOffset += cbRead; if (!cbLeft) break; @@ -885,10 +902,10 @@ static int VBoxServiceControlExecCreateProcess(const char *pszExec, const char * { /* Process Main flag "ExecuteProcessFlag_Hidden". */ if (fFlags & RT_BIT(2)) - uProcFlags = RTPROC_FLAGS_HIDDEN; + uProcFlags |= RTPROC_FLAGS_HIDDEN; /* Process Main flag "ExecuteProcessFlag_NoProfile". */ if (fFlags & RT_BIT(3)) - uProcFlags = RTPROC_FLAGS_NO_PROFILE; + uProcFlags |= RTPROC_FLAGS_NO_PROFILE; } /* If no user name specified run with current credentials (e.g. @@ -1405,7 +1422,6 @@ int VBoxServiceControlExecHandleCmdGetOutput(uint32_t u32ClientId, uint32_t uNum else VBoxServiceError("ControlExec: [PID %u]: Failed to retrieve output, CID=%u, uHandle=%u, rc=%Rrc\n", uPID, uContextID, uHandleID, rc); - /* Note: Since the context ID is unique the request *has* to be completed here, * regardless whether we got data or not! Otherwise the progress object * on the host never will get completed! */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp index c336eeda8..4692437bc 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceControlExecThread.cpp 38445 2011-08-12 20:43:24Z vboxsync $ */ +/* $Id: VBoxServiceControlExecThread.cpp $ */ /** @file * VBoxServiceControlExecThread - Thread for an executed guest process. */ @@ -338,60 +338,69 @@ int VBoxServiceControlExecThreadGetOutput(uint32_t uPID, uint32_t uHandleId, uin int rc = RTCritSectEnter(&g_GuestControlThreadsCritSect); if (RT_SUCCESS(rc)) { - const PVBOXSERVICECTRLTHREAD pNode = vboxServiceControlExecThreadGetByPID(uPID); - if (pNode) + const PVBOXSERVICECTRLTHREAD pThread = vboxServiceControlExecThreadGetByPID(uPID); + if (pThread) { - const PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)pNode->pvData; + const PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)pThread->pvData; AssertPtr(pData); PVBOXSERVICECTRLEXECPIPEBUF pPipeBuf = NULL; switch (uHandleId) { - case OUTPUT_HANDLE_ID_STDERR: /* StdErr */ + case OUTPUT_HANDLE_ID_STDERR: pPipeBuf = &pData->stdErr; break; - case OUTPUT_HANDLE_ID_STDOUT: /* StdOut */ + case OUTPUT_HANDLE_ID_STDOUT: + case OUTPUT_HANDLE_ID_STDOUT_DEPRECATED: pPipeBuf = &pData->stdOut; break; default: - AssertReleaseMsgFailed(("Unknown output handle ID (%u)\n", uHandleId)); + rc = VERR_NOT_FOUND; /* Handle ID not found! */ break; } - AssertPtr(pPipeBuf); - -#ifdef DEBUG_andy - VBoxServiceVerbose(4, "ControlExec: [PID %u]: Getting output from pipe buffer %u ...\n", - uPID, pPipeBuf->uPipeId); -#endif - /* If the stdout pipe buffer is enabled (that is, still could be filled by a running - * process) wait for the signal to arrive so that we don't return without any actual - * data read. */ - bool fEnabled = VBoxServicePipeBufIsEnabled(pPipeBuf); - if (fEnabled) - { -#ifdef DEBUG_andy - VBoxServiceVerbose(4, "ControlExec: [PID %u]: Waiting for pipe buffer %u (%ums)\n", - uPID, pPipeBuf->uPipeId, uTimeout); -#endif - rc = VBoxServicePipeBufWaitForEvent(pPipeBuf, uTimeout); - } + if (RT_SUCCESS(rc)) { - uint32_t cbRead = cbSize; - rc = VBoxServicePipeBufRead(pPipeBuf, pBuf, cbSize, &cbRead); + AssertPtr(pPipeBuf); + + #ifdef DEBUG_andy + VBoxServiceVerbose(4, "ControlExec: [PID %u]: Getting output from pipe buffer %u ...\n", + uPID, pPipeBuf->uPipeId); + #endif + /* If the stdout pipe buffer is enabled (that is, still could be filled by a running + * process) wait for the signal to arrive so that we don't return without any actual + * data read. */ + bool fEnabled = VBoxServicePipeBufIsEnabled(pPipeBuf); + if (fEnabled) + { + #ifdef DEBUG_andy + VBoxServiceVerbose(4, "ControlExec: [PID %u]: Waiting for pipe buffer %u (%ums)\n", + uPID, pPipeBuf->uPipeId, uTimeout); + #endif + rc = VBoxServicePipeBufWaitForEvent(pPipeBuf, uTimeout); + } if (RT_SUCCESS(rc)) { - if (fEnabled && !cbRead) - AssertMsgFailed(("[PID %u]: Waited (%ums) for pipe buffer %u (%u bytes left), but nothing read!\n", - uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize - pPipeBuf->cbOffset)); - if (pcbRead) - *pcbRead = cbRead; + uint32_t cbRead = cbSize; /* Read as much as possible. */ + rc = VBoxServicePipeBufRead(pPipeBuf, pBuf, cbSize, &cbRead); + if (RT_SUCCESS(rc)) + { + if ( !cbRead + && fEnabled) + { + AssertReleaseMsg(!VBoxServicePipeBufIsEnabled(pPipeBuf), + ("[PID %u]: Waited (%ums) for active pipe buffer %u (%u size, %u bytes left), but nothing read!\n", + uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize, pPipeBuf->cbSize - pPipeBuf->cbOffset)); + } + if (pcbRead) + *pcbRead = cbRead; + } + else + VBoxServiceError("ControlExec: [PID %u]: Unable to read from pipe buffer %u, rc=%Rrc\n", + uPID, pPipeBuf->uPipeId, rc); } - else - VBoxServiceError("ControlExec: [PID %u]: Unable to read from pipe buffer %u, rc=%Rrc\n", - uPID, pPipeBuf->uPipeId, rc); } } else @@ -405,6 +414,38 @@ int VBoxServiceControlExecThreadGetOutput(uint32_t uPID, uint32_t uHandleId, uin } +int VBoxServiceControlExecThreadRemove(uint32_t uPID) +{ + int rc = RTCritSectEnter(&g_GuestControlThreadsCritSect); + if (RT_SUCCESS(rc)) + { + PVBOXSERVICECTRLTHREAD pThread = vboxServiceControlExecThreadGetByPID(uPID); + if (pThread) + { + Assert(pThread->fStarted != pThread->fStopped); + if (pThread->fStopped) /* Only shut down stopped threads. */ + { + VBoxServiceVerbose(4, "ControlExec: [PID %u]: Removing thread ... \n", + uPID); + + rc = VBoxServiceControlExecThreadShutdown(pThread); + + RTListNodeRemove(&pThread->Node); + RTMemFree(pThread); + } + } + else + rc = VERR_NOT_FOUND; + + int rc2 = RTCritSectLeave(&g_GuestControlThreadsCritSect); + if (RT_SUCCESS(rc)) + rc = rc2; + } + + return rc; +} + +/* Does not do locking, must be done by the caller! */ int VBoxServiceControlExecThreadShutdown(const PVBOXSERVICECTRLTHREAD pThread) { AssertPtrReturn(pThread, VERR_INVALID_POINTER); @@ -433,6 +474,8 @@ int VBoxServiceControlExecThreadShutdown(const PVBOXSERVICECTRLTHREAD pThread) int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) { + AssertPtrReturn(pbAllowed, VERR_INVALID_POINTER); + int rc = RTCritSectEnter(&g_GuestControlThreadsCritSect); if (RT_SUCCESS(rc)) { @@ -441,7 +484,7 @@ int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) * how many guest processes are started and served already. */ bool fLimitReached = false; - if (g_GuestControlProcsMaxKept) /* If we allow unlimited processes, take a shortcut. */ + if (g_GuestControlProcsMaxKept) /* If we allow unlimited processes (=0), take a shortcut. */ { /** @todo Put running/stopped (+ memory alloc) stats into global struct! */ uint32_t uProcsRunning = 0; @@ -467,7 +510,8 @@ int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) int32_t iProcsLeft = (g_GuestControlProcsMaxKept - uProcsRunning - 1); if (iProcsLeft < 0) { - VBoxServiceVerbose(3, "ControlExec: Maximum running guest processes reached\n"); + VBoxServiceVerbose(3, "ControlExec: Maximum running guest processes reached (%u)\n", + g_GuestControlProcsMaxKept); fLimitReached = true; } else if (uProcsStopped > (uint32_t)iProcsLeft) @@ -486,7 +530,7 @@ int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) int rc2 = VBoxServiceControlExecThreadShutdown(pNode); if (RT_FAILURE(rc2)) { - VBoxServiceError("ControlExec: Unable to shut down thread due to policy, rc=%Rrc", rc2); + VBoxServiceError("ControlExec: Unable to shut down thread due to policy, rc=%Rrc\n", rc2); if (RT_SUCCESS(rc)) rc = rc2; /* Keep going. */ @@ -496,10 +540,10 @@ int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed) RTMemFree(pNode); pNode = pNext; + Assert(uProcsToKill); uProcsToKill--; if (!uProcsToKill) break; - } } Assert(uProcsToKill == 0); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.h b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.h index 69393804e..b1369a987 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceControlExecThread.h 38180 2011-07-26 12:26:34Z vboxsync $ */ +/* $Id: VBoxServiceControlExecThread.h $ */ /** @file * VBoxServiceControlExecThread - Thread for an executed guest process. */ @@ -30,6 +30,7 @@ int VBoxServiceControlExecThreadAssignPID(PVBOXSERVICECTRLTHREADDATAEXEC pData, void VBoxServiceControlExecThreadDataDestroy(PVBOXSERVICECTRLTHREADDATAEXEC pData); int VBoxServiceControlExecThreadGetOutput(uint32_t uPID, uint32_t uHandleId, uint32_t uTimeout, uint8_t *pBuf, uint32_t cbSize, uint32_t *pcbRead); +int VBoxServiceControlExecThreadRemove(uint32_t uPID); int VBoxServiceControlExecThreadSetInput(uint32_t uPID, bool fPendingClose, uint8_t *pBuf, uint32_t cbSize, uint32_t *pcbWritten); int VBoxServiceControlExecThreadStartAllowed(bool *pbAllowed); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp index 25616a759..600ef09b0 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceCpuHotPlug.cpp 33468 2010-10-26 12:49:59Z vboxsync $ */ +/* $Id: VBoxServiceCpuHotPlug.cpp $ */ /** @file * VBoxService - Guest Additions CPU Hot Plugging Service. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h index 79935ed0b..df22915c2 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceInternal.h 38180 2011-07-26 12:26:34Z vboxsync $ */ +/* $Id: VBoxServiceInternal.h $ */ /** @file * VBoxService - Guest Additions Services. */ @@ -157,7 +157,7 @@ typedef struct /** The other end of hNotificationPipeW. */ RTPIPE hNotificationPipeR; /** The event semaphore for getting notified whether something - * has changed, e.g. written or read from this buffer. */ + * has changed, e.g. written to this buffer or enabled/disabled it. */ RTSEMEVENT hEventSem; } VBOXSERVICECTRLEXECPIPEBUF; /** Pointer to buffered pipe data. */ @@ -275,6 +275,9 @@ extern VBOXSERVICE g_PageSharing; #ifdef VBOX_WITH_SHARED_FOLDERS extern VBOXSERVICE g_AutoMount; #endif +#ifdef DEBUG +extern RTCRITSECT g_csLog; /* For guest process stdout dumping. */ +#endif extern RTEXITCODE VBoxServiceSyntax(const char *pszFormat, ...); extern RTEXITCODE VBoxServiceError(const char *pszFormat, ...); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp index 1dd83ad98..c051f1220 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServicePageSharing.cpp 38411 2011-08-11 09:40:35Z vboxsync $ */ +/* $Id: VBoxServicePageSharing.cpp $ */ /** @file * VBoxService - Guest page sharing. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp index 9807c3894..f38868bf5 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServicePipeBuf.cpp 38437 2011-08-12 15:05:41Z vboxsync $ */ +/* $Id: VBoxServicePipeBuf.cpp $ */ /** @file * VBoxServicePipeBuf - Pipe buffering. */ @@ -111,14 +111,11 @@ int VBoxServicePipeBufRead(PVBOXSERVICECTRLEXECPIPEBUF pBuf, pBuf->cbOffset += cbToRead; #ifdef DEBUG_andy - VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read pcbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n", + VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read cbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n", pBuf->uPID, pBuf->uPipeId, pBuf, pBuf->fEnabled ? "EN" : "DIS", cbToRead, pBuf->cbSize, pBuf->cbAllocated, pBuf->cbOffset); #endif - if (pBuf->hEventSem != NIL_RTSEMEVENT) - { - rc = RTSemEventSignal(pBuf->hEventSem); - AssertRC(rc); - } + /* Don't signal event semaphore here -- we only read out something from + * this pipe buffer. */ *pcbToRead = cbToRead; } @@ -401,7 +398,8 @@ bool VBoxServicePipeBufIsEnabled(PVBOXSERVICECTRLEXECPIPEBUF pBuf) if (RT_SUCCESS(rc)) { fEnabled = pBuf->fEnabled; - RTCritSectLeave(&pBuf->CritSect); + rc = RTCritSectLeave(&pBuf->CritSect); + AssertRC(rc); } return fEnabled; } @@ -452,6 +450,11 @@ int VBoxServicePipeBufSetStatus(PVBOXSERVICECTRLEXECPIPEBUF pBuf, bool fEnabled) if ( pBuf->fEnabled != fEnabledOld && pBuf->hEventSem) { +#ifdef DEBUG_andy + VBoxServiceVerbose(4, "Pipe [%u %u] status %s -> %s\n", + pBuf->uPID, pBuf->uPipeId, + fEnabledOld ? "EN" : "DIS", pBuf->fEnabled ? "EN" : "DIS"); +#endif /* Let waiter know that something has changed ... */ RTSemEventSignal(pBuf->hEventSem); } diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.h b/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.h index 3ffa8d9af..587e263ea 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServicePipeBuf.h 38113 2011-07-22 13:57:35Z vboxsync $ */ +/* $Id: VBoxServicePipeBuf.h $ */ /** @file * VBoxServicePipeBuf - Pipe buffering. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp index c0d378f2f..347faa951 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServicePropCache.cpp 36249 2011-03-10 12:18:20Z vboxsync $ */ +/* $Id: VBoxServicePropCache.cpp $ */ /** @file * VBoxServicePropCache - Guest property cache. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h b/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h index d484a17ec..cf932cbe2 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceResource-win.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxServiceResource-win.h $ */ /** @file * VBoxService - Guest Additions Service, resource IDs. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp index b81330e69..6f51be217 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceStats.cpp 32813 2010-09-29 11:50:19Z vboxsync $ */ +/* $Id: VBoxServiceStats.cpp $ */ /** @file * VBoxStats - Guest statistics notification */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp index 70cb0781f..3371cb2f8 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceTimeSync.cpp 37608 2011-06-23 11:47:33Z vboxsync $ */ +/* $Id: VBoxServiceTimeSync.cpp $ */ /** @file * VBoxService - Guest Additions TimeSync Service. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp index 3bc0e1e3f..06fe3f239 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceToolBox.cpp 38015 2011-07-18 12:49:31Z vboxsync $ */ +/* $Id: VBoxServiceToolBox.cpp $ */ /** @file * VBoxServiceToolbox - Internal (BusyBox-like) toolbox. */ @@ -607,7 +607,8 @@ static int VBoxServiceToolboxLsHandleDir(const char *pszDir, int rc = RTPathAbs(pszDir, szPathAbs, sizeof(szPathAbs)); if (RT_FAILURE(rc)) { - RTMsgError("Failed to retrieve absolute path of '%s', rc=%Rrc\n", pszDir, rc); + if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Failed to retrieve absolute path of '%s', rc=%Rrc\n", pszDir, rc); return rc; } @@ -615,7 +616,8 @@ static int VBoxServiceToolboxLsHandleDir(const char *pszDir, rc = RTDirOpen(&pDir, szPathAbs); if (RT_FAILURE(rc)) { - RTMsgError("Failed to open directory '%s', rc=%Rrc\n", szPathAbs, rc); + if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Failed to open directory '%s', rc=%Rrc\n", szPathAbs, rc); return rc; } @@ -649,8 +651,9 @@ static int VBoxServiceToolboxLsHandleDir(const char *pszDir, int rc2 = RTDirClose(pDir); if (RT_FAILURE(rc2)) { - RTMsgError("Failed to close dir '%s', rc=%Rrc\n", - pszDir, rc2); + if (!(uOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Failed to close dir '%s', rc=%Rrc\n", + pszDir, rc2); if (RT_SUCCESS(rc)) rc = rc2; } @@ -837,8 +840,9 @@ static RTEXITCODE VBoxServiceToolboxLs(int argc, char **argv) RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK /* @todo Follow link? */); if (RT_FAILURE(rc2)) { - RTMsgError("Cannot access '%s': No such file or directory\n", - pNodeIt->pszName); + if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Cannot access '%s': No such file or directory\n", + pNodeIt->pszName); rc = VERR_FILE_NOT_FOUND; /* Do not break here -- process every element in the list * and keep failing rc. */ @@ -1069,8 +1073,9 @@ static RTEXITCODE VBoxServiceToolboxStat(int argc, char **argv) RTFSOBJATTRADD_UNIX, RTPATH_F_ON_LINK /* @todo Follow link? */); if (RT_FAILURE(rc2)) { - RTMsgError("Cannot stat for '%s': No such file or directory\n", - pNodeIt->pszName); + if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)) + RTMsgError("Cannot stat for '%s': No such file or directory\n", + pNodeIt->pszName); rc = VERR_FILE_NOT_FOUND; /* Do not break here -- process every element in the list * and keep failing rc. */ @@ -1179,10 +1184,42 @@ bool VBoxServiceToolboxMain(int argc, char **argv, RTEXITCODE *prcExit) } /* + * The input is ASSUMED to be in the current process codeset (NT guarantees + * ACP, unixy systems doesn't guarantee anything). This loop converts all + * the argv[*] strings to UTF-8, which is a tad ugly but who cares. + * (As a rule all strings in VirtualBox are UTF-8.) + */ + for (int i = 0; i < argc; i++) + { + char *pszConverted; + int rc = RTStrCurrentCPToUtf8(&pszConverted, argv[i]); + if (RT_SUCCESS(rc)) + argv[i] = pszConverted; + else + { + RTMsgError("Failed to convert argument %d to UTF-8, rc=%Rrc\n", + i + 1, rc); + + /* Conversion was not possible,probably due to invalid characters. + * Keep in mind that we do RTStrFree on the whole array below. */ + argv[i] = RTStrDup(argv[i]); + } + } + + /* * Invoke the handler. */ RTMsgSetProgName("VBoxService/%s", pszTool); *prcExit = pfnHandler(argc, argv); + + /* + * Free converted argument vector + */ + for (int i = 0; i < argc; i++) + { + RTStrFree(argv[i]); + argv[i] = NULL; + } return true; } diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp index d988b992e..6dcff3a89 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceUtils.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxServiceUtils.cpp $ */ /** @file * VBoxServiceUtils - Some utility functions. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h index bc4ad0031..7cd6dfc96 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceUtils.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxServiceUtils.h $ */ /** @file * VBoxServiceUtils - Guest Additions Services (Utilities). */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp index c3d78e678..9be261dfd 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceVMInfo-win.cpp 38131 2011-07-25 08:38:59Z vboxsync $ */ +/* $Id: VBoxServiceVMInfo-win.cpp $ */ /** @file * VBoxService - Virtual Machine Information for the Host, Windows specifics. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp index a6d7d354e..2c31fcfce 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceVMInfo.cpp 38224 2011-07-28 14:53:13Z vboxsync $ */ +/* $Id: VBoxServiceVMInfo.cpp $ */ /** @file * VBoxService - Virtual Machine Information for the Host. */ diff --git a/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk index 678611500..d75c86ff9 100644 --- a/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 32634 2010-09-20 12:00:44Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxServicec test cases. # diff --git a/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp b/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp index b9a2405b9..b27e986a6 100644 --- a/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp +++ b/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: tstUserInfo.cpp 32652 2010-09-21 07:04:49Z vboxsync $ */ +/* $Id: tstUserInfo.cpp $ */ /** @file * Test case for correct user environment. */ diff --git a/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp b/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp index 387c2d871..5f37c56f0 100644 --- a/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp +++ b/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp @@ -1,4 +1,4 @@ -/* $Id: HGSMIBase.cpp 35398 2011-01-04 09:39:07Z vboxsync $ */ +/* $Id: HGSMIBase.cpp $ */ /** @file * VirtualBox Video driver, common code - HGSMI initialisation and helper * functions. diff --git a/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp b/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp index efce4243a..3a2eb24be 100644 --- a/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp +++ b/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp @@ -1,4 +1,4 @@ -/* $Id: Modesetting.cpp 38207 2011-07-27 21:56:28Z vboxsync $ */ +/* $Id: Modesetting.cpp $ */ /** @file * VirtualBox Video driver, common code - HGSMI initialisation and helper * functions. diff --git a/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp b/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp index e29186999..5f481049c 100644 --- a/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp +++ b/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp @@ -1,4 +1,4 @@ -/* $Id: VBVABase.cpp 35398 2011-01-04 09:39:07Z vboxsync $ */ +/* $Id: VBVABase.cpp $ */ /** @file * VirtualBox Video driver, common code - VBVA initialisation and helper * functions. diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk index a8d9fc56f..dd75c8e5d 100644 --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest OpenGL part # diff --git a/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc b/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc index f5240bf22..fe7f561bf 100644 --- a/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc +++ b/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxCROGL.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: VBoxCROGL.rc $ */ /** @file * VBoxCROGL - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc b/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc index bff467cf2..19972f35b 100644 --- a/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc +++ b/src/VBox/Additions/common/crOpenGL/array/arrayspu.rc @@ -1,4 +1,4 @@ -/* $Id: arrayspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: arrayspu.rc $ */ /** @file * VBoxOGLarrayspu.so - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/crOpenGL/dri_drv.c b/src/VBox/Additions/common/crOpenGL/dri_drv.c index 55734ccf3..d19b99b1c 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_drv.c +++ b/src/VBox/Additions/common/crOpenGL/dri_drv.c @@ -1,4 +1,4 @@ -/* $Id: dri_drv.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: dri_drv.c $ */ /** @file * VBox OpenGL DRI driver functions diff --git a/src/VBox/Additions/common/crOpenGL/dri_drv.h b/src/VBox/Additions/common/crOpenGL/dri_drv.h index 13b5b0b9d..9ee57766c 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_drv.h +++ b/src/VBox/Additions/common/crOpenGL/dri_drv.h @@ -1,4 +1,4 @@ -/* $Id: dri_drv.h 32404 2010-09-10 13:17:42Z vboxsync $ */ +/* $Id: dri_drv.h $ */ /** @file * diff --git a/src/VBox/Additions/common/crOpenGL/dri_glx.h b/src/VBox/Additions/common/crOpenGL/dri_glx.h index 366417a35..a2a389701 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_glx.h +++ b/src/VBox/Additions/common/crOpenGL/dri_glx.h @@ -1,4 +1,4 @@ -/* $Id: dri_glx.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: dri_glx.h $ */ /** @file * diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c index 3159e9eb4..7e222af66 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c @@ -1,4 +1,4 @@ -/* $Id: fakedri_drv.c 37594 2011-06-22 16:26:29Z vboxsync $ */ +/* $Id: fakedri_drv.c $ */ /** @file * VBox OpenGL DRI driver functions diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.h b/src/VBox/Additions/common/crOpenGL/fakedri_drv.h index 2fff8be8a..0d94e1c3a 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.h @@ -1,4 +1,4 @@ -/* $Id: fakedri_drv.h 32404 2010-09-10 13:17:42Z vboxsync $ */ +/* $Id: fakedri_drv.h $ */ /** @file * diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h b/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h index 8caeef2d7..ce5510f51 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h @@ -1,4 +1,4 @@ -/* $Id: fakedri_glfuncsList.h 35039 2010-12-13 17:37:15Z vboxsync $ */ +/* $Id: fakedri_glfuncsList.h $ */ /** @file * VBox OpenGL list of opengl functions common in Mesa and vbox opengl stub diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h b/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h index 34ce69304..c1592cdf1 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h @@ -1,4 +1,4 @@ -/* $Id: fakedri_glxfuncsList.h 32404 2010-09-10 13:17:42Z vboxsync $ */ +/* $Id: fakedri_glxfuncsList.h $ */ /** @file * VBox OpenGL list of opengl functions common in Mesa and vbox opengl stub diff --git a/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c b/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c index 630c12708..e285e585c 100644 --- a/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c +++ b/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c @@ -1,4 +1,4 @@ -/* $Id: feedback_context.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: feedback_context.c $ */ /** @file * VBox feedback spu, context tracking. diff --git a/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc b/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc index 64dbaddc9..36f5fa54d 100644 --- a/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc +++ b/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu.rc @@ -1,4 +1,4 @@ -/* $Id: feedbackspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: feedbackspu.rc $ */ /** @file * VBoxOGLfeedbackspu - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/crOpenGL/glx_c_exports.c b/src/VBox/Additions/common/crOpenGL/glx_c_exports.c index cb6f645e0..4f94870ae 100644 --- a/src/VBox/Additions/common/crOpenGL/glx_c_exports.c +++ b/src/VBox/Additions/common/crOpenGL/glx_c_exports.c @@ -1,4 +1,4 @@ -/* $Id: glx_c_exports.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: glx_c_exports.c $ */ /** @file * * VirtualBox guest OpenGL DRI GLX C stubs diff --git a/src/VBox/Additions/common/crOpenGL/glx_proto.h b/src/VBox/Additions/common/crOpenGL/glx_proto.h index 63b5dda4b..2ab6d05cb 100644 --- a/src/VBox/Additions/common/crOpenGL/glx_proto.h +++ b/src/VBox/Additions/common/crOpenGL/glx_proto.h @@ -1,4 +1,4 @@ -/* $Id: glx_proto.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: glx_proto.h $ */ /** @file * * VirtualBox guest OpenGL DRI GLX header C prototypes diff --git a/src/VBox/Additions/common/crOpenGL/icd_drv.c b/src/VBox/Additions/common/crOpenGL/icd_drv.c index 14b896986..76dd2f5a4 100644 --- a/src/VBox/Additions/common/crOpenGL/icd_drv.c +++ b/src/VBox/Additions/common/crOpenGL/icd_drv.c @@ -1,4 +1,4 @@ -/* $Id: icd_drv.c 37986 2011-07-15 15:14:35Z vboxsync $ */ +/* $Id: icd_drv.c $ */ /** @file * VBox OpenGL windows ICD driver functions diff --git a/src/VBox/Additions/common/crOpenGL/icd_drv.h b/src/VBox/Additions/common/crOpenGL/icd_drv.h index a0109ea11..e610de150 100644 --- a/src/VBox/Additions/common/crOpenGL/icd_drv.h +++ b/src/VBox/Additions/common/crOpenGL/icd_drv.h @@ -1,4 +1,4 @@ -/* $Id: icd_drv.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: icd_drv.h $ */ /** @file * diff --git a/src/VBox/Additions/common/crOpenGL/load.c b/src/VBox/Additions/common/crOpenGL/load.c index d8ba30bd5..52fcd758e 100644 --- a/src/VBox/Additions/common/crOpenGL/load.c +++ b/src/VBox/Additions/common/crOpenGL/load.c @@ -1129,8 +1129,10 @@ stubInit(void) crDebug("Stub launched for %s", response); #if defined(CR_NEWWINTRACK) && !defined(WINDOWS) - /*@todo when vm boots with compiz turned on, new code causes hang in xcb_wait_for_reply in the sync thread*/ - if (!crStrcmp(response, "compiz") || !crStrcmp(response, "compiz_real") + /*@todo when vm boots with compiz turned on, new code causes hang in xcb_wait_for_reply in the sync thread + * as at the start compiz runs our code under XGrabServer. + */ + if (!crStrcmp(response, "compiz") || !crStrcmp(response, "compiz_real") || !crStrcmp(response, "compiz.real") || !crStrcmp(response, "compiz-bin")) { disable_sync = 1; diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu.rc b/src/VBox/Additions/common/crOpenGL/pack/packspu.rc index 337538c26..4b4961087 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu.rc +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu.rc @@ -1,4 +1,4 @@ -/* $Id: packspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: packspu.rc $ */ /** @file * VBoxOGLpackspu.so - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c index c7dd95ec4..4c010f35a 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c @@ -1,4 +1,4 @@ -/* $Id: packspu_framebuffer.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: packspu_framebuffer.c $ */ /** @file * VBox OpenGL FBO related functions diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c index 694fcf642..9165ea30b 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c @@ -1,4 +1,4 @@ -/* $Id: packspu_getshaders.c 37157 2011-05-19 14:53:33Z vboxsync $ */ +/* $Id: packspu_getshaders.c $ */ /** @file * VBox OpenGL GLSL related functions diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c index bf36b6d35..71295d15e 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c @@ -1,4 +1,4 @@ -/* $Id: packspu_glsl.c 33988 2010-11-11 13:03:17Z vboxsync $ */ +/* $Id: packspu_glsl.c $ */ /** @file * VBox OpenGL GLSL related functions diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c index 342c96861..b5c60aec5 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c @@ -1,4 +1,4 @@ -/* $Id: packspu_texture.c 29298 2010-05-10 12:16:24Z vboxsync $ */ +/* $Id: packspu_texture.c $ */ /** @file * VBox OpenGL DRI driver functions diff --git a/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc b/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc index 2f0e60117..9569ed3d6 100644 --- a/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc +++ b/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc @@ -1,4 +1,4 @@ -/* $Id: passthroughspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: passthroughspu.rc $ */ /** @file * VBoxOGLpassthroughspu - Resource file containing version info and icon. */ diff --git a/src/VBox/Additions/common/pam/Makefile.kmk b/src/VBox/Additions/common/pam/Makefile.kmk index 3d30ea769..cff82bb67 100644 --- a/src/VBox/Additions/common/pam/Makefile.kmk +++ b/src/VBox/Additions/common/pam/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 29058 2010-05-05 08:49:52Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for VBox PAM module for automated logons. # diff --git a/src/VBox/Additions/common/pam/pam_vbox.c b/src/VBox/Additions/common/pam/pam_vbox.c index 603a91e56..600da91c8 100644 --- a/src/VBox/Additions/common/pam/pam_vbox.c +++ b/src/VBox/Additions/common/pam/pam_vbox.c @@ -1,4 +1,4 @@ -/* $Id: pam_vbox.c 36051 2011-02-22 11:55:10Z vboxsync $ */ +/* $Id: pam_vbox.c $ */ /** @file * pam_vbox - PAM module for auto logons. */ diff --git a/src/VBox/Additions/common/testcase/Makefile.kmk b/src/VBox/Additions/common/testcase/Makefile.kmk index 8fa7d1ff0..e2c478319 100644 --- a/src/VBox/Additions/common/testcase/Makefile.kmk +++ b/src/VBox/Additions/common/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 32431 2010-09-11 18:02:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Cross Platform Guest Addition test cases. # diff --git a/src/VBox/Additions/common/testcase/tstPageFusion.cpp b/src/VBox/Additions/common/testcase/tstPageFusion.cpp index 1a2d60ab1..3e4c8fa41 100644 --- a/src/VBox/Additions/common/testcase/tstPageFusion.cpp +++ b/src/VBox/Additions/common/testcase/tstPageFusion.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPageFusion.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: tstPageFusion.cpp $ */ /** @file * VBoxService - Guest page sharing testcase */ diff --git a/src/VBox/Additions/freebsd/Installer/vboxguest.sh b/src/VBox/Additions/freebsd/Installer/vboxguest.sh index 85bec4e87..85bec4e87 100644..100755 --- a/src/VBox/Additions/freebsd/Installer/vboxguest.sh +++ b/src/VBox/Additions/freebsd/Installer/vboxguest.sh diff --git a/src/VBox/Additions/freebsd/Makefile.kmk b/src/VBox/Additions/freebsd/Makefile.kmk index 3e5c86e28..c9c8c4138 100644 --- a/src/VBox/Additions/freebsd/Makefile.kmk +++ b/src/VBox/Additions/freebsd/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38158 2011-07-25 13:13:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the FreeBSD guest additions base directory. # diff --git a/src/VBox/Additions/freebsd/drm/Makefile b/src/VBox/Additions/freebsd/drm/Makefile index 1022bb574..15a581a4d 100644 --- a/src/VBox/Additions/freebsd/drm/Makefile +++ b/src/VBox/Additions/freebsd/drm/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile $ ## @file # Makefile for the VirtualBox FreeBSD Host Driver. # diff --git a/src/VBox/Additions/freebsd/drm/Makefile.kmk b/src/VBox/Additions/freebsd/drm/Makefile.kmk index 571bf11e3..d986a26d3 100644 --- a/src/VBox/Additions/freebsd/drm/Makefile.kmk +++ b/src/VBox/Additions/freebsd/drm/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38317 2011-08-04 15:27:37Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvideo DRM module (FreeBSD kernel OpenGL module). # diff --git a/src/VBox/Additions/freebsd/drm/files_vboxvideo_drm b/src/VBox/Additions/freebsd/drm/files_vboxvideo_drm index 9d806b766..67fdecb65 100644..100755 --- a/src/VBox/Additions/freebsd/drm/files_vboxvideo_drm +++ b/src/VBox/Additions/freebsd/drm/files_vboxvideo_drm @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxvideo_drm 29250 2010-05-09 17:53:58Z vboxsync $ +# $Id: files_vboxvideo_drm $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c b/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c index 163fba369..2e2a91d80 100644 --- a/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c +++ b/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c @@ -1,4 +1,4 @@ -/* $Id: vboxvideo_drm.c 28854 2010-04-27 19:41:12Z vboxsync $ */ +/* $Id: vboxvideo_drm.c $ */ /** @file * VirtualBox Guest Additions - vboxvideo DRM module. * FreeBSD kernel OpenGL module. diff --git a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk index b3f855009..b605540e5 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk +++ b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 35380 2010-12-30 16:06:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the FreeBSD Shared folder kernel module. # diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h index 6d5d466d0..7c9b8f4d6 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h @@ -1,4 +1,4 @@ -/* $Id: vboxvfs.h 31012 2010-07-22 15:55:04Z vboxsync $ */ +/* $Id: vboxvfs.h $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c index a4292513b..a9d9c14a3 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_vfsops.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: vboxvfs_vfsops.c $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c index 3e1d06506..575a55ed2 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_vnops.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: vboxvfs_vnops.c $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk index a87ae2e1e..f3b37f475 100644 --- a/src/VBox/Additions/linux/Makefile.kmk +++ b/src/VBox/Additions/linux/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38196 2011-07-27 11:25:22Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the linux guest additions base directory. # @@ -132,10 +132,6 @@ VBOX_ADD_STRIP_MOD.linux = \ vboxmouse_drv_14.so \ vboxmouse_drv_15.so \ vboxmouse_drv_16.so \ - vboxmouse_drv_17.so \ - vboxmouse_drv_18.so \ - vboxmouse_drv_19.so \ - vboxmouse_drv_110.so \ vboxvideo_drv_70.so \ vboxvideo_drv_71.so \ vboxvideo_drv_13.so \ @@ -146,6 +142,7 @@ VBOX_ADD_STRIP_MOD.linux = \ vboxvideo_drv_18.so \ vboxvideo_drv_19.so \ vboxvideo_drv_110.so \ + vboxvideo_drv_111.so \ pam_vbox.so \ mount.vboxsf @@ -321,9 +318,6 @@ lnx_add_inst-noexec_INSTTYPE = stage lnx_add_inst-noexec_SOURCES = \ $(VBOX_REL_X11_ADD_INST)vboxclient.desktop \ $(VBOX_REL_X11_ADD_INST)vboxvideo.ids \ - $(VBOX_REL_X11_ADD_INST)50-vboxmouse.conf \ - $(VBOX_REL_LNX_ADD_INST)70-xorg-vboxmouse.rules \ - $(VBOX_REL_LNX_ADD_INST)90-vboxguest.fdi \ selinux-fedora/vbox_x11.pp \ selinux-fedora/vbox_accel.pp @@ -413,13 +407,13 @@ $(VBOX_LNX_ADD_ARCHIVE.$(KBUILD_TARGET_ARCH)): \ $(QUIET)$(RM) -f -- $(wildcard $(dir $@)VBoxGuestAdditions-*r*.tar.bz2) $(QUIET)$(MKDIR) -p $(@D) ifdef VBOX_USE_PBZIP2 - $(QUIET)tar --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \ + $(QUIET)tar --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \ -C $(VBOX_LNX_ADD_INST_OUT_DIR) \ LICENSE bin init lib sbin share src \ $(if $(filter $(KBUILD_TYPE),debug),debug) $(QUIET)pbzip2 $(patsubst %.bz2,%,$@) else - $(QUIET)tar --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ + $(QUIET)tar --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ -C $(VBOX_LNX_ADD_INST_OUT_DIR) \ LICENSE bin init lib sbin share src \ $(if $(filter $(KBUILD_TYPE),debug),debug) @@ -437,12 +431,12 @@ $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2: \ $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@) $(QUIET)$(MKDIR) -p $(@D) ifdef VBOX_USE_PBZIP2 - $(QUIET)tar --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \ + $(QUIET)tar --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \ -C $(VBOX_LNX_ADD_INST_DBG_DIR) \ bin lib sbin $(QUIET)pbzip2 $(patsubst %.bz2,%,$@) else - $(QUIET)tar --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ + $(QUIET)tar --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ -C $(VBOX_LNX_ADD_INST_DBG_DIR) \ bin lib sbin endif diff --git a/src/VBox/Additions/linux/drm/Makefile.kmk b/src/VBox/Additions/linux/drm/Makefile.kmk index 8aa952a1d..d42959446 100644 --- a/src/VBox/Additions/linux/drm/Makefile.kmk +++ b/src/VBox/Additions/linux/drm/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38216 2011-07-28 11:15:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvideo DRM module (linux kernel OpenGL module). # diff --git a/src/VBox/Additions/linux/drm/files_vboxvideo_drm b/src/VBox/Additions/linux/drm/files_vboxvideo_drm index c27650459..9f18c86fa 100644..100755 --- a/src/VBox/Additions/linux/drm/files_vboxvideo_drm +++ b/src/VBox/Additions/linux/drm/files_vboxvideo_drm @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxvideo_drm 37350 2011-06-07 13:44:25Z vboxsync $ +# $Id: files_vboxvideo_drm $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c index 4a0a89cd9..b335f76eb 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c @@ -1,4 +1,4 @@ -/** @file $Id: vboxvideo_drm.c 37351 2011-06-07 13:45:11Z vboxsync $ +/** @file $Id: vboxvideo_drm.c $ * * VirtualBox Additions Linux kernel driver, DRM support */ diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.h b/src/VBox/Additions/linux/drm/vboxvideo_drm.h index 239d7ed6a..0613a9d23 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drm.h +++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.h @@ -1,4 +1,4 @@ -/** @file $Id: vboxvideo_drm.h 28800 2010-04-27 08:22:32Z vboxsync $ +/** @file $Id: vboxvideo_drm.h $ * * VirtualBox Additions Linux kernel driver, DRM support */ diff --git a/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules b/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules deleted file mode 100644 index 795726add..000000000 --- a/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="vboxguest",ENV{ID_INPUT}="1" diff --git a/src/VBox/Additions/linux/installer/90-vboxguest.fdi b/src/VBox/Additions/linux/installer/90-vboxguest.fdi deleted file mode 100644 index 4583a27cc..000000000 --- a/src/VBox/Additions/linux/installer/90-vboxguest.fdi +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -# Hal driver description for the vboxmouse driver -# $Id: 90-vboxguest.fdi 32396 2010-09-10 12:22:20Z vboxsync $ - - Copyright (C) 2008-2010 Oracle Corporation - - This file is part of VirtualBox Open Source Edition (OSE), as - available from http://www.virtualbox.org. This file is free software; - you can redistribute it and/or modify it under the terms of the GNU - General Public License (GPL) as published by the Free Software - Foundation, in version 2 as it comes in the "COPYING" file of the - VirtualBox OSE distribution. VirtualBox OSE is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. ---> -<deviceinfo version="0.2"> - <device> - <match key="info.subsystem" string="pci"> - <match key="info.product" string="VirtualBox Guest Service"> - <append key="info.capabilities" type="strlist">input</append> - <append key="info.capabilities" type="strlist">input.mouse</append> - <merge key="input.x11_driver" type="string">vboxmouse</merge> - <merge key="input.device" type="string">/dev/vboxguest</merge> - </match> - </match> - </device> -</deviceinfo> - diff --git a/src/VBox/Additions/linux/installer/autorun.sh b/src/VBox/Additions/linux/installer/autorun.sh index 28997631f..45afb034a 100644..100755 --- a/src/VBox/Additions/linux/installer/autorun.sh +++ b/src/VBox/Additions/linux/installer/autorun.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: autorun.sh 36759 2011-04-20 16:40:13Z vboxsync $ +# $Id: autorun.sh $ # # VirtualBox Guest Additions installation script for *nix guests # diff --git a/src/VBox/Additions/linux/installer/vboxadd-service.sh b/src/VBox/Additions/linux/installer/vboxadd-service.sh index 02016ee4a..85251c9ce 100755 --- a/src/VBox/Additions/linux/installer/vboxadd-service.sh +++ b/src/VBox/Additions/linux/installer/vboxadd-service.sh @@ -33,7 +33,7 @@ if [ -f /etc/redhat-release ]; then PIDFILE="/var/lock/subsys/vboxadd-service" elif [ -f /etc/SuSE-release ]; then system=suse - PIDFILE="/var/lock/subsys/vboxadd-service" + PIDFILE="/var/run/vboxadd-service" elif [ -f /etc/debian_version ]; then system=debian PIDFILE="/var/run/vboxadd-service" @@ -170,7 +170,7 @@ if [ "$system" = "arch" ]; then fi -if [ "$system" = "slackware" ]; then +if [ "$system" = "slackware" -o "$system" = "other" ]; then daemon() { $1 $2 } @@ -217,20 +217,6 @@ if [ "$system" = "lfs" ]; then } fi -if [ "$system" = "other" ]; then - fail_msg() { - echo " ...fail!" - } - - succ_msg() { - echo " ...done." - } - - begin() { - echo -n "$1" - } -fi - binary=/usr/sbin/VBoxService testbinary() { diff --git a/src/VBox/Additions/linux/installer/vboxadd-x11.sh b/src/VBox/Additions/linux/installer/vboxadd-x11.sh index f7ff32020..3d20d8a1e 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 # -# Linux Additions X11 setup init script ($Revision: 38093 $) +# Linux Additions X11 setup init script ($Revision: 74215 $) # # @@ -283,11 +283,11 @@ setup() dox11config="true" # By default, we want to run our xorg.conf setup script setupxorgconf="true" - # But not to install the configuration file into xorg.conf.d - doxorgconfd="" - # But without the workaround for SUSE 11.1 not doing input auto-detection - newmouse="" - # By default we want to use hal/udev/whatever for auto-loading the mouse driver + # On all but the oldest X servers we want to use our new mouse + # driver. + newmouse="--newMouse" + # On more recent servers our kernel mouse driver will be used + # automatically automouse="--autoMouse" # We need to tell our xorg.conf hacking script whether /dev/psaux exists nopsaux="--nopsaux" @@ -296,6 +296,8 @@ setup() vboxvideo_src= # The mouse driver to install for X.Org 6.9+ vboxmouse_src= + # The driver extension + driver_ext=".so" modules_dir=`X -showDefaultModulePath 2>&1` || modules_dir= if [ -z "$modules_dir" ]; then @@ -324,96 +326,91 @@ setup() echo "installing the X.Org drivers." dox11config="" ;; + 1.11.* ) + xserver_version="X.Org Server 1.11" + vboxvideo_src=vboxvideo_drv_111.so + # Does Fedora still ship without vboxvideo detection? + # test "$system" = "redhat" || setupxorgconf="" + ;; 1.10.* ) - begin "Installing X.Org Server 1.10 modules" + xserver_version="X.Org Server 1.10" vboxvideo_src=vboxvideo_drv_110.so - vboxmouse_src=vboxmouse_drv_110.so - doxorgconfd="true" # Does Fedora still ship without vboxvideo detection? # test "$system" = "redhat" || setupxorgconf="" ;; 1.9.* ) - begin "Installing X.Org Server 1.9 modules" + xserver_version="X.Org Server 1.9" vboxvideo_src=vboxvideo_drv_19.so - vboxmouse_src=vboxmouse_drv_19.so - doxorgconfd="true" # Fedora 14 looks likely to ship without vboxvideo detection # test "$system" = "redhat" || setupxorgconf="" ;; 1.8.* ) - begin "Installing X.Org Server 1.8 modules" + xserver_version="X.Org Server 1.8" vboxvideo_src=vboxvideo_drv_18.so - vboxmouse_src=vboxmouse_drv_18.so - doxorgconfd="true" # Fedora 13 shipped without vboxvideo detection test "$system" = "redhat" || setupxorgconf="" ;; 1.7.* ) - begin "Installing X.Org Server 1.7 modules" + xserver_version="X.Org Server 1.7" vboxvideo_src=vboxvideo_drv_17.so - vboxmouse_src=vboxmouse_drv_17.so setupxorgconf="" - test "$system" = "debian" && doxorgconfd="true" ;; 1.6.* ) - begin "Installing X.Org Server 1.6 modules" + xserver_version="X.Org Server 1.6" vboxvideo_src=vboxvideo_drv_16.so vboxmouse_src=vboxmouse_drv_16.so # SUSE SLE* with X.Org 1.6 does not do input autodetection; # openSUSE does. if grep -q -E '^SLE[^ ]' /etc/SuSE-brand 2>/dev/null; then automouse="" - newmouse="--newMouse" else test "$system" = "suse" && setupxorgconf="" fi ;; 1.5.* ) - begin "Installing X.Org Server 1.5 modules" + xserver_version="X.Org Server 1.5" vboxvideo_src=vboxvideo_drv_15.so vboxmouse_src=vboxmouse_drv_15.so # SUSE with X.Org 1.5 is another special case, and is also # handled specially - test "$system" = "suse" && - { automouse=""; newmouse="--newMouse"; } + test "$system" = "suse" && automouse="" ;; 1.4.* ) - begin "Installing X.Org Server 1.4 modules" + xserver_version="X.Org Server 1.4" vboxvideo_src=vboxvideo_drv_14.so vboxmouse_src=vboxmouse_drv_14.so automouse="" - newmouse="--newMouse" ;; 1.3.* ) # This was the first release which gave the server version number # rather than the X11 release version when you did 'X -version'. - begin "Installing X.Org Server 1.3 modules" + xserver_version="X.Org Server 1.3" vboxvideo_src=vboxvideo_drv_13.so vboxmouse_src=vboxmouse_drv_13.so automouse="" - newmouse="--newMouse" ;; 7.1.* | 7.2.* ) - begin "Installing X.Org 7.1 modules" + xserver_version="X.Org 7.1" vboxvideo_src=vboxvideo_drv_71.so vboxmouse_src=vboxmouse_drv_71.so automouse="" + newmouse="" ;; 6.9.* | 7.0.* ) - begin "Installing X.Org 6.9/7.0 modules" + xserver_version="X.Org 6.9/7.0" vboxvideo_src=vboxvideo_drv_70.so vboxmouse_src=vboxmouse_drv_70.so automouse="" + newmouse="" ;; 6.7* | 6.8.* | 4.2.* | 4.3.* ) # Assume X.Org post-fork or XFree86 - begin "Installing XFree86 4.2/4.3 and X.Org 6.7/6.8 modules" - rm "$modules_dir/drivers/vboxvideo_drv.o" 2>/dev/null - 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" + xserver_version="XFree86 4.2/4.3 and X.Org 6.7/6.8" + driver_ext=.o + vboxvideo_src=vboxvideo_drv.o + vboxmouse_src=vboxmouse_drv.o automouse="" - succ_msg + newmouse="" ;; * ) echo "Warning: unknown version of the X Window System installed. Not installing" @@ -421,13 +418,16 @@ setup() dox11config="" ;; esac - if [ -n "$vboxvideo_src" -a -n "$vboxmouse_src" ]; then - rm "$modules_dir/drivers/vboxvideo_drv.so" 2>/dev/null - rm "$modules_dir/input/vboxmouse_drv.so" 2>/dev/null - ln -s "$lib_dir/$vboxvideo_src" "$modules_dir/drivers/vboxvideo_drv.so" - ln -s "$lib_dir/$vboxmouse_src" "$modules_dir/input/vboxmouse_drv.so" && - succ_msg - fi + begin "Installing $xserver_version modules" + rm "$modules_dir/drivers/vboxvideo_drv$driver_ext" 2>/dev/null + rm "$modules_dir/input/vboxmouse_drv$driver_ext" 2>/dev/null + case "$vboxvideo_src" in ?*) + ln -s "$lib_dir/$vboxvideo_src" "$modules_dir/drivers/vboxvideo_drv$driver_ext";; + esac + case "$vboxmouse_src" in ?*) + ln -s "$lib_dir/$vboxmouse_src" "$modules_dir/input/vboxmouse_drv$driver_ext";; + esac + succ_msg if test -n "$dox11config"; then begin "Setting up the Window System to use the Guest Additions" @@ -469,34 +469,6 @@ setup() 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 "$automouse" && - if [ -d /etc/hal/fdi/policy ] - then - # Install hal information about the mouse driver so that X.Org - # knows to load it. - install -o 0 -g 0 -m 0644 "$share_dir/90-vboxguest.fdi" /etc/hal/fdi/policy - # Delete the hal cache so that it notices our fdi file - rm -r /var/cache/hald/fdi-cache 2> /dev/null - fi - if test -n "$doxorgconfd" - then - if test -d /etc/udev/rules.d - then - install -o 0 -g 0 -m 0644 "$share_dir/70-xorg-vboxmouse.rules" /etc/udev/rules.d - # 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 --subsystem-match=misc - fi - test -d /usr/share/X11/xorg.conf.d && - install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/share/X11/xorg.conf.d - test -d /usr/lib/X11/xorg.conf.d && - install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /usr/lib/X11/xorg.conf.d - test -d /etc/X11/xorg.conf.d && - install -o 0 -g 0 -m 0644 "$share_dir/50-vboxmouse.conf" /etc/X11/xorg.conf.d - fi succ_msg test -n "$generated" && cat << EOF @@ -638,11 +610,6 @@ EOF rm /usr/share/autostart/vboxclient.desktop 2>/dev/null # 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 --subsystem-match=misc 2>/dev/null - rm /usr/lib/X11/xorg.conf.d/50-vboxmouse.conf 2>/dev/null - rm /usr/share/X11/xorg.conf.d/50-vboxmouse.conf 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 326b8ceed..18d752d64 100755 --- a/src/VBox/Additions/linux/installer/vboxadd.sh +++ b/src/VBox/Additions/linux/installer/vboxadd.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# Linux Additions kernel module init script ($Revision: 38093 $) +# Linux Additions kernel module init script ($Revision: 73698 $) # # @@ -196,14 +196,18 @@ test_sane_kernel_dir() fi } -fail() +show_error() { if [ "$system" = "gentoo" ]; then eerror $1 - exit 1 fi fail_msg echo "($1)" +} + +fail() +{ + show_error "$1" exit 1 } @@ -388,7 +392,8 @@ setup_modules() if ! $BUILDVBOXGUEST \ --save-module-symvers /tmp/vboxguest-Module.symvers \ --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" + show_error "Look at $LOG to find out what went wrong" + return 1 fi succ_msg fi @@ -397,7 +402,8 @@ setup_modules() if ! $BUILDVBOXSF \ --use-module-symvers /tmp/vboxguest-Module.symvers \ --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" + show_error "Look at $LOG to find out what went wrong" + return 1 fi succ_msg fi @@ -406,7 +412,8 @@ setup_modules() if ! $BUILDVBOXVIDEO \ --use-module-symvers /tmp/vboxguest-Module.symvers \ --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" + show_error "Look at $LOG to find out what went wrong" + return 1 fi succ_msg fi diff --git a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk index c1d35c038..8baa2ef52 100644 --- a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk +++ b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38194 2011-07-27 09:55:19Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxsf (linux shared folders module). # diff --git a/src/VBox/Additions/linux/sharedfolders/files_vboxsf b/src/VBox/Additions/linux/sharedfolders/files_vboxsf index 6d94398c8..6ad29a626 100644..100755 --- a/src/VBox/Additions/linux/sharedfolders/files_vboxsf +++ b/src/VBox/Additions/linux/sharedfolders/files_vboxsf @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxsf 37350 2011-06-07 13:44:25Z vboxsync $ +# $Id: files_vboxsf $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c b/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c index 9a8c02cd0..16f814ebf 100644 --- a/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c +++ b/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c @@ -530,7 +530,7 @@ main (int argc, char **argv) break; case 3: - panic_err("%s: Could not add an entry to the mount table.", argv[0]); + /* panic_err("%s: Could not add an entry to the mount table.", argv[0]); */ break; default: diff --git a/src/VBox/Additions/linux/sharedfolders/utils.c b/src/VBox/Additions/linux/sharedfolders/utils.c index cb12d8337..22d5b01ad 100644 --- a/src/VBox/Additions/linux/sharedfolders/utils.c +++ b/src/VBox/Additions/linux/sharedfolders/utils.c @@ -18,6 +18,7 @@ */ #include "vfsmod.h" +#include <iprt/asm.h> #include <linux/nfs_fs.h> #include <linux/vfs.h> @@ -827,9 +828,13 @@ struct dentry_operations sf_dentry_ops = .d_revalidate = sf_dentry_revalidate }; -int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name) +int sf_init_backing_dev(struct sf_glob_info *sf_g) { int rc = 0; + /* Each new shared folder map gets a new uint64_t identifier, + * allocated in sequence. We ASSUME the sequence will not wrap. */ + static uint64_t s_u64Sequence = 0; + uint64_t u64CurrentSequence = ASMAtomicIncU64(&s_u64Sequence); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) sf_g->bdi.ra_pages = 0; /* No readahead */ @@ -844,7 +849,8 @@ int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name) rc = bdi_init(&sf_g->bdi); # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) if (!rc) - rc = bdi_register(&sf_g->bdi, NULL, "vboxsf-%s", name); + rc = bdi_register(&sf_g->bdi, NULL, "vboxsf-%llu", + (unsigned long long)u64CurrentSequence); # endif /* >= 2.6.26 */ # endif /* >= 2.6.24 */ #endif /* >= 2.6.0 */ diff --git a/src/VBox/Additions/linux/sharedfolders/vbsfmount.c b/src/VBox/Additions/linux/sharedfolders/vbsfmount.c index 2f580db50..f6f704cb8 100644 --- a/src/VBox/Additions/linux/sharedfolders/vbsfmount.c +++ b/src/VBox/Additions/linux/sharedfolders/vbsfmount.c @@ -1,4 +1,4 @@ -/* $Id: vbsfmount.c 31205 2010-07-29 12:48:43Z vboxsync $ */ +/* $Id: vbsfmount.c $ */ /** @file * vbsfmount - Commonly used code to mount shared folders on Linux-based * systems. Currently used by mount.vboxsf and VBoxService. diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.c b/src/VBox/Additions/linux/sharedfolders/vfsmod.c index b0228096e..95aad5279 100644 --- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c +++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c @@ -277,10 +277,13 @@ static int sf_read_super_aux(struct super_block *sb, void *data, int flags) goto fail3; } - if (sf_init_backing_dev(sf_g, info->name)) + if (sf_init_backing_dev(sf_g)) { err = -EINVAL; LogFunc(("could not init bdi\n")); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 25) + unlock_new_inode(iroot); +#endif goto fail4; } diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.h b/src/VBox/Additions/linux/sharedfolders/vfsmod.h index 51920eef6..21ab0c14b 100644 --- a/src/VBox/Additions/linux/sharedfolders/vfsmod.h +++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.h @@ -116,7 +116,7 @@ extern void sf_dir_info_empty(struct sf_dir_info *p); extern struct sf_dir_info *sf_dir_info_alloc(void); extern int sf_dir_read_all(struct sf_glob_info *sf_g, struct sf_inode_info *sf_i, struct sf_dir_info *sf_d, SHFLHANDLE handle); -extern int sf_init_backing_dev(struct sf_glob_info *sf_g, const char *name); +extern int sf_init_backing_dev(struct sf_glob_info *sf_g); extern void sf_done_backing_dev(struct sf_glob_info *sf_g); #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) diff --git a/src/VBox/Additions/solaris/DRM/Makefile.kmk b/src/VBox/Additions/solaris/DRM/Makefile.kmk index 320f3c035..0daddebd6 100644 --- a/src/VBox/Additions/solaris/DRM/Makefile.kmk +++ b/src/VBox/Additions/solaris/DRM/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 33656 2010-11-01 14:18:11Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvideo DRM module (Solaris kernel OpenGL module). # diff --git a/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c b/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c index e7e7561f1..c49ec803b 100644 --- a/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c +++ b/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c @@ -1,4 +1,4 @@ -/* $Id: vboxvideo_drm.c 33656 2010-11-01 14:18:11Z vboxsync $ */ +/* $Id: vboxvideo_drm.c $ */ /** @file * vboxvideo_drm - Direct Rendering Module, Solaris Specific Code. */ diff --git a/src/VBox/Additions/solaris/Installer/makepackage.sh b/src/VBox/Additions/solaris/Installer/makepackage.sh index b3b804487..b3b804487 100644..100755 --- a/src/VBox/Additions/solaris/Installer/makepackage.sh +++ b/src/VBox/Additions/solaris/Installer/makepackage.sh diff --git a/src/VBox/Additions/solaris/Installer/postinstall.sh b/src/VBox/Additions/solaris/Installer/postinstall.sh index 262499b86..262499b86 100644..100755 --- a/src/VBox/Additions/solaris/Installer/postinstall.sh +++ b/src/VBox/Additions/solaris/Installer/postinstall.sh diff --git a/src/VBox/Additions/solaris/Installer/preremove.sh b/src/VBox/Additions/solaris/Installer/preremove.sh index 58bade74c..58bade74c 100644..100755 --- a/src/VBox/Additions/solaris/Installer/preremove.sh +++ b/src/VBox/Additions/solaris/Installer/preremove.sh diff --git a/src/VBox/Additions/solaris/Makefile.kmk b/src/VBox/Additions/solaris/Makefile.kmk index 67a83459b..fdb4d7f92 100644 --- a/src/VBox/Additions/solaris/Makefile.kmk +++ b/src/VBox/Additions/solaris/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Solaris guest additions base directory. # diff --git a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk index 58f042d4b..12c66abdc 100644 --- a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk +++ b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38078 2011-07-19 17:24:10Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Solaris Shared folder kernel module. # diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs.h index 13654a569..1e15e922d 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs.h @@ -1,4 +1,4 @@ -/* $Id: vboxfs.h 33994 2010-11-11 14:26:08Z vboxsync $ */ +/* $Id: vboxfs.h $ */ /** @file * VirtualBox File System Driver for Solaris Guests, Internal Header. */ diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c index 531e4e9b3..4d92587f0 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c @@ -1,4 +1,4 @@ -/* $Id: vboxfs_mount.c 37833 2011-07-08 10:16:08Z vboxsync $ */ +/* $Id: vboxfs_mount.c $ */ /** @file * VirtualBox File System Mount Helper, Solaris host. * Userspace mount wrapper that parses mount (or user-specified) options diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c index a16b3ee82..d0ecc4446 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c @@ -108,6 +108,7 @@ sfprov_connect(int version) } else cmn_err(CE_WARN, "sfprov_connect: vboxInit() failed rc=%d\n", rc); + return (NULL); } void @@ -138,7 +139,7 @@ sfprov_mount(sfp_connection_t *conn, char *path, sfp_mount_t **mnt) m = kmem_zalloc(sizeof (*m), KM_SLEEP); str = sfprov_string(path, &size); rc = vboxCallMapFolder(&vbox_client, str, &m->map); - if (!RT_SUCCESS(rc)) { + if (RT_FAILURE(rc)) { cmn_err(CE_WARN, "sfprov_mount: vboxCallMapFolder() failed rc=%d\n", rc); kmem_free(m, sizeof (*m)); *mnt = NULL; @@ -157,7 +158,7 @@ sfprov_unmount(sfp_mount_t *mnt) int rc; rc = vboxCallUnmapFolder(&vbox_client, &mnt->map); - if (!RT_SUCCESS(rc)) { + if (RT_FAILURE(rc)) { cmn_err(CE_WARN, "sfprov_mount: vboxCallUnmapFolder() failed rc=%d\n", rc); rc = EINVAL; } else { @@ -335,6 +336,8 @@ sfprov_open(sfp_mount_t *mnt, char *path, sfp_file_t **fp) return (ENOENT); } } + else + kmem_free(str, size); newfp = kmem_alloc(sizeof(sfp_file_t), KM_SLEEP); newfp->handle = parms.Handle; newfp->map = mnt->map; @@ -359,9 +362,9 @@ sfprov_trunc(sfp_mount_t *mnt, char *path) 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); + kmem_free(str, size); if (RT_FAILURE(rc)) { - kmem_free(str, size); return (EINVAL); } (void)vboxCallClose(&vbox_client, &mnt->map, parms.Handle); diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h index 77939ff74..0dd49d17b 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h @@ -1,4 +1,4 @@ -/* $Id: vboxfs_prov.h 31691 2010-08-16 12:59:23Z vboxsync $ */ +/* $Id: vboxfs_prov.h $ */ /** @file * VirtualBox File System for Solaris Guests, provider header. * Portions contributed by: Ronald. diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h index d088d818d..f222b808a 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h @@ -1,4 +1,4 @@ -/* $Id: vboxfs_vfs.h 31691 2010-08-16 12:59:23Z vboxsync $ */ +/* $Id: vboxfs_vfs.h $ */ /** @file * VirtualBox File System for Solaris Guests, VFS header. */ diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c index 317e8e6b8..e54629309 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c @@ -210,7 +210,6 @@ sfnode_get_vnode(sfnode_t *node) 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 = VNOSWAP | VNOMAP; /* @todo -XXX- remove VNOMAP when ro-mmap is working*/ vn_exists(vp); @@ -246,6 +245,7 @@ sfnode_make( LogFlowFunc(("sffs_make(%s)\n", path)); node = kmem_alloc(sizeof (*node), KM_SLEEP); node->sf_sffs = sffs; + VFS_HOLD(node->sf_sffs->sf_vfsp); node->sf_path = path; node->sf_ino = sffs->sf_ino++; node->sf_type = type; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h index df663f832..11e5d3905 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h @@ -1,4 +1,4 @@ -/* $Id: vboxfs_vnode.h 37806 2011-07-06 15:11:02Z vboxsync $ */ +/* $Id: vboxfs_vnode.h $ */ /** @file * VirtualBox File System for Solaris Guests, VNode header. */ diff --git a/src/VBox/Additions/solaris/Virtio/Makefile.kmk b/src/VBox/Additions/solaris/Virtio/Makefile.kmk index 6c92a5679..9a80aef1e 100644 --- a/src/VBox/Additions/solaris/Virtio/Makefile.kmk +++ b/src/VBox/Additions/solaris/Virtio/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 34233 2010-11-22 11:25:55Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for Solaris Virtio drivers. # diff --git a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c index 370221bac..c521c0be9 100644 --- a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c @@ -1,4 +1,4 @@ -/* $Id: Virtio-solaris.c 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: Virtio-solaris.c $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris. */ diff --git a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.h b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.h index 68e389b9d..b7bef0736 100644 --- a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.h +++ b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.h @@ -1,4 +1,4 @@ -/* $Id: Virtio-solaris.h 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: Virtio-solaris.h $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris, header. */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c index 91c2f638f..0fe733ce2 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VirtioNet-solaris.c 34143 2010-11-17 20:05:36Z vboxsync $ */ +/* $Id: VirtioNet-solaris.c $ */ /** @file * VirtualBox Guest Additions: Virtio Network Driver for Solaris. */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c index 0d5fe55f3..4a5737a10 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VirtioPci-solaris.c 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: VirtioPci-solaris.c $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris, PCI Hypervisor Interface. */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.h b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.h index 004cc8106..df9ab0ed8 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.h +++ b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.h @@ -1,4 +1,4 @@ -/* $Id: VirtioPci-solaris.h 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: VirtioPci-solaris.h $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris, PCI Hypervisor Interface. */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c index d8e6921ca..81e3a12db 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VirtioRing-solaris.c 34233 2010-11-22 11:25:55Z vboxsync $ */ +/* $Id: VirtioRing-solaris.c $ */ /** @file * VirtualBox Guest Additions: Virtio Driver for Solaris, Ring implementation. */ diff --git a/src/VBox/Additions/x11/Installer/50-vboxmouse.conf b/src/VBox/Additions/x11/Installer/50-vboxmouse.conf deleted file mode 100644 index b7c15320d..000000000 --- a/src/VBox/Additions/x11/Installer/50-vboxmouse.conf +++ /dev/null @@ -1,5 +0,0 @@ -Section "InputClass" - Identifier "vboxmouse" - MatchDevicePath "/dev/vboxguest" - Driver "vboxmouse" -EndSection diff --git a/src/VBox/Additions/x11/Installer/x11config.pl b/src/VBox/Additions/x11/Installer/x11config.pl index 333c659f2..333c659f2 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11config.pl +++ b/src/VBox/Additions/x11/Installer/x11config.pl diff --git a/src/VBox/Additions/x11/Installer/x11config15.pl b/src/VBox/Additions/x11/Installer/x11config15.pl index 877add382..877add382 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11config15.pl +++ b/src/VBox/Additions/x11/Installer/x11config15.pl diff --git a/src/VBox/Additions/x11/Installer/x11config15sol.pl b/src/VBox/Additions/x11/Installer/x11config15sol.pl index dc6e59579..dc6e59579 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11config15sol.pl +++ b/src/VBox/Additions/x11/Installer/x11config15sol.pl diff --git a/src/VBox/Additions/x11/Installer/x11config15suse.pl b/src/VBox/Additions/x11/Installer/x11config15suse.pl index e75fdcc2b..e75fdcc2b 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11config15suse.pl +++ b/src/VBox/Additions/x11/Installer/x11config15suse.pl diff --git a/src/VBox/Additions/x11/Installer/x11restore.pl b/src/VBox/Additions/x11/Installer/x11restore.pl index eba375855..96c1aae97 100644..100755 --- a/src/VBox/Additions/x11/Installer/x11restore.pl +++ b/src/VBox/Additions/x11/Installer/x11restore.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# $Revision: 32388 $ +# $Revision: 65744 $ # # Restore xorg.conf while removing Guest Additions. # diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk index 2d1c46c4a..c810f328b 100644 --- a/src/VBox/Additions/x11/Makefile.kmk +++ b/src/VBox/Additions/x11/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the X11 Guest Additions. # diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk index ee73ed08c..61947e196 100644 --- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk +++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest Addition X11 Client. # diff --git a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp index 60eb2a04c..1e6421909 100644 --- a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp +++ b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp @@ -1,4 +1,4 @@ -/** $Id: clipboard.cpp 37434 2011-06-14 13:14:57Z vboxsync $ */ +/** $Id: clipboard.cpp $ */ /** @file * Guest Additions - X11 Shared Clipboard. */ diff --git a/src/VBox/Additions/x11/VBoxClient/display.cpp b/src/VBox/Additions/x11/VBoxClient/display.cpp index 645273033..f86dac132 100644 --- a/src/VBox/Additions/x11/VBoxClient/display.cpp +++ b/src/VBox/Additions/x11/VBoxClient/display.cpp @@ -1,4 +1,4 @@ -/* $Id: display.cpp 34918 2010-12-09 18:08:01Z vboxsync $ */ +/* $Id: display.cpp $ */ /** @file * X11 guest client - display management. */ diff --git a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp index cf55d1771..a8b2ffe70 100644 --- a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp +++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp @@ -21,10 +21,13 @@ #include <iprt/thread.h> #ifdef VBOX_WITH_DBUS - #include <VBox/dbus.h> +# include <VBox/dbus.h> #endif #include <VBox/log.h> #include <VBox/VBoxGuestLib.h> +#ifdef VBOX_OSE +# include <VBox/version.h> +#endif #include "VBoxClient.h" @@ -163,14 +166,20 @@ public: { if (bUpdate) { - char szMsg[256]; + char szMsg[1024]; char szTitle[64]; /** @todo add some translation macros here */ RTStrPrintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions update available!"); +#ifndef VBOX_OSE RTStrPrintf(szMsg, sizeof(szMsg), "Your guest is currently running the Guest Additions version %s. " "We recommend updating to the latest version (%s) by choosing the " "install option from the Devices menu.", pszGuestVersion, pszHostVersion); +#else +/* This is the message which appears for non-Oracle builds of the + * Guest Additions. Distributors are encouraged to customise this. */ + RTStrPrintf(szMsg, sizeof(szMsg), "Your virtual machine is currently running the Guest Additions version %s. Since you are running a version of the Guest Additions provided by the operating system you installed in the virtual machine we recommend that you update it to at least version %s using that system's update features, or alternatively that you remove this version and then install the " VBOX_VENDOR_SHORT " Guest Additions package using the install option from the Devices menu. Please consult the documentation for the operating system you are running to find out how to update or remove the current Guest Additions package.", pszGuestVersion, pszHostVersion); +#endif rc = showNotify(szTitle, szMsg); LogRel(("VBoxClient: VirtualBox Guest Additions update available!")); if (RT_FAILURE(rc)) diff --git a/src/VBox/Additions/x11/VBoxClient/main.cpp b/src/VBox/Additions/x11/VBoxClient/main.cpp index 3941f0464..896cc36c1 100644 --- a/src/VBox/Additions/x11/VBoxClient/main.cpp +++ b/src/VBox/Additions/x11/VBoxClient/main.cpp @@ -261,13 +261,6 @@ int main(int argc, char *argv[]) LogRel(("Failed to connect to the VirtualBox kernel service\n")); return 1; } - if (g_szPidFile[0] && RT_FAILURE(VbglR3PidFile(g_szPidFile, &g_hPidFile))) - { - RTPrintf("Failed to create a pidfile. Exiting.\n"); - LogRel(("Failed to create a pidfile. Exiting.\n")); - VbglR3Term(); - return 1; - } if (fDaemonise) { rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */); @@ -281,6 +274,13 @@ int main(int argc, char *argv[]) return 1; } } + if (g_szPidFile[0] && RT_FAILURE(VbglR3PidFile(g_szPidFile, &g_hPidFile))) + { + RTPrintf("Failed to create a pidfile. Exiting.\n"); + LogRel(("Failed to create a pidfile. Exiting.\n")); + VbglR3Term(); + return 1; + } /* Set signal handlers to clean up on exit. */ vboxClientSetSignalHandlers(); /* Set an X11 error handler, so that we don't die when we get unavoidable errors. */ diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk index 5422a717f..74f579045 100644 --- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Additions XFree86 and X.org mouse drivers. # @@ -154,6 +154,8 @@ vboxmouse_drv_16_SOURCES = \ vboxmouse_15.c +ifneq ($(KBUILD_TARGET), linux) + # # vboxmouse_drv_17 # @@ -233,6 +235,7 @@ vboxmouse_drv_110_INCS := \ vboxmouse_drv_110_SOURCES = \ vboxmouse_15.c +endif # neq ($(KBUILD_TARGET),linux) # Check the undefined symbols in the X.Org modules against lists of allowed # symbols. Not very elegant, but it will catch problems early. @@ -301,6 +304,8 @@ $$(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run: $$(vboxmouse_drv_16_1_STAGE_TA $(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15 $(QUIET)$(APPEND) -t "$@" "done" +ifneq ($(KBUILD_TARGET), linux) + TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run $$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET) @@ -333,9 +338,11 @@ $$(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run: $$(vboxmouse_drv_110_1_STAGE $(vboxmouse_drv_110_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15 $(QUIET)$(APPEND) -t "$@" "done" +endif # neq ($(KBUILD_TARGET),linux) + endif # ! VBOX_ONLY_SDK endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) - endif # eq ($(KBUILD_TARGET),linux) + endif # 1of ($(KBUILD_TARGET),linux solaris) # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES diff --git a/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c b/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c index d9692399e..b53f149b5 100644 --- a/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c +++ b/src/VBox/Additions/x11/vboxmouse/VBoxUtils.c @@ -48,10 +48,7 @@ int VBoxMouseInit(void) return 1; } - rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL); - if (RT_SUCCESS(rc)) - rc = VbglR3SetMouseStatus( fFeatures - | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE); + rc = VbglR3SetMouseStatus(VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE); if (RT_FAILURE(rc)) { ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n", @@ -97,13 +94,6 @@ int VBoxMouseQueryPosition(unsigned int *pcx, unsigned int *pcy) int VBoxMouseFini(void) { - if (gDeviceOpenFailed) - return VINF_SUCCESS; - uint32_t fFeatures; - int rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL); - if (RT_SUCCESS(rc)) - rc = VbglR3SetMouseStatus( fFeatures - & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE); VbglR3Term(); - return rc; + return VINF_SUCCESS; } diff --git a/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c b/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c index 861dbc807..c372da3c1 100644 --- a/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c +++ b/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c @@ -89,7 +89,7 @@ static VMMDevReqMouseStatus *g_vmmreqMouseStatus = NULL; */ int VBoxMouseInit(void) { - VMMDevReqMouseStatus req; + uint32_t fFeatures; /* return immediately if already initialized */ if (g_vboxguestHandle != -1) @@ -114,12 +114,10 @@ int VBoxMouseInit(void) vmmdevInitRequest((VMMDevRequestHeader*)g_vmmreqMouseStatus, VMMDevReq_GetMouseStatus); /* tell the host that we want absolute coordinates */ - vmmdevInitRequest((VMMDevRequestHeader*)&req, VMMDevReq_SetMouseStatus); - req.mouseFeatures = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR; - req.pointerXPos = 0; - req.pointerYPos = 0; + fFeatures = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE; /** @todo r=bird: Michael, I thought we decided a long time ago that all these should be replaced by VbglR3. I assume this is just a leftover... */ - if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0) + if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fFeatures) + < 0) { ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n", errno, strerror(errno)); @@ -174,18 +172,8 @@ int VBoxMouseFini(void) /* If we are not initialised, there is nothing to do */ if (g_vboxguestHandle < 0) return 0; - /* tell VMM that we no longer support absolute mouse handling */ - vmmdevInitRequest((VMMDevRequestHeader*)&req, VMMDevReq_SetMouseStatus); - req.mouseFeatures = 0; - req.pointerXPos = 0; - req.pointerYPos = 0; -/** @todo r=bird: Michael, ditto. */ - if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0) - { - ErrorF("ioctl to vboxguest module failed, rc = %d (%s)\n", - errno, strerror(errno)); - } - + /* Tell VMM that we no longer support absolute mouse handling - done + * automatically when we close the handle. */ free(g_vmmreqMouseStatus); g_vmmreqMouseStatus = NULL; close(g_vboxguestHandle); diff --git a/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c b/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c index 72867f01a..6d7c38d48 100644 --- a/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c +++ b/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c @@ -60,17 +60,10 @@ enum { -#if ABI_XINPUT_VERSION > SET_ABI_VERSION(2, 0) -/* The X server does (to my mind) incorrect rounding, so we adjust our range to - * compensate. */ - ADJUST_RANGE = 32, -#else - ADJUST_RANGE = 0, -#endif /** The minumum value our device can return */ - RANGE_MIN = ADJUST_RANGE, + RANGE_MIN = 0, /** The maximum value our device can return */ - RANGE_MAX = 0xFFFF + ADJUST_RANGE + RANGE_MAX = 0xFFFF }; static void diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk index 58fd5e149..24cdccffb 100644 --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Linux Additions X.org graphics driver. # @@ -325,6 +325,33 @@ vboxvideo_drv_110_INCS += $(PATH_ROOT)/src/VBox/Runtime/include vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) +# +# vboxvideo_drv_111 +# +DLLS += vboxvideo_drv_111 +vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD +vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS) +vboxvideo_drv_111_DEFS := $(vboxvideo_drv_15_DEFS) +## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +vboxvideo_drv_111_INCS = \ + $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \ + $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \ + $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \ + $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \ + $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \ + $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \ + $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \ + $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \ + $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \ + $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ + $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \ + $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 +vboxvideo_drv_111_INCS += $(PATH_ROOT)/src/VBox/Runtime/include +vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_15_SOURCES) + + # Check the undefined symbols in the X.Org modules against lists of allowed # symbols. Not very elegant, but it will catch problems early. ifdef VBOX_WITH_TESTCASES @@ -424,6 +451,14 @@ $$(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo110.run: $$(vboxvideo_drv_110_1_STAGE $(vboxvideo_drv_110_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined $(QUIET)$(APPEND) -t "$@" "done" + TESTING += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run + OTHERS += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run +$$(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run: $$(vboxvideo_drv_111_1_STAGE_TARGET) + $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) + $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \ + $(vboxvideo_drv_111_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined + $(QUIET)$(APPEND) -t "$@" "done" + endif # ! VBOX_ONLY_SDK endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) endif # eq ($(KBUILD_TARGET),linux) diff --git a/src/VBox/Additions/x11/vboxvideo/edid.c b/src/VBox/Additions/x11/vboxvideo/edid.c index c73a70fce..9f7f73a6e 100644 --- a/src/VBox/Additions/x11/vboxvideo/edid.c +++ b/src/VBox/Additions/x11/vboxvideo/edid.c @@ -1,4 +1,4 @@ -/* $Id: edid.c 35776 2011-01-30 00:14:29Z vboxsync $ */ +/* $Id: edid.c $ */ /** @file * * Linux Additions X11 graphics driver, EDID construction diff --git a/src/VBox/Additions/x11/vboxvideo/pointer.c b/src/VBox/Additions/x11/vboxvideo/pointer.c index f59fd4867..ea7572ddd 100644 --- a/src/VBox/Additions/x11/vboxvideo/pointer.c +++ b/src/VBox/Additions/x11/vboxvideo/pointer.c @@ -188,13 +188,6 @@ vbox_init(int scrnIndex, VBOXPtr pVBox) rc = FALSE; } pVBox->useDevice = rc; - /* We can't switch to a software cursor at will without help from - * VBoxClient. So tell that to the host and wait for VBoxClient to - * change this. */ - vrc = VbglR3GetMouseStatus(&fMouseFeatures, NULL, NULL); - if (RT_SUCCESS(vrc)) - VbglR3SetMouseStatus( fMouseFeatures - | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR); return rc; } diff --git a/src/VBox/Additions/x11/vboxvideo/setmode.c b/src/VBox/Additions/x11/vboxvideo/setmode.c index 00c69070b..0ede80526 100644 --- a/src/VBox/Additions/x11/vboxvideo/setmode.c +++ b/src/VBox/Additions/x11/vboxvideo/setmode.c @@ -1,4 +1,4 @@ -/* $Id: setmode.c 36020 2011-02-18 14:18:51Z vboxsync $ */ +/* $Id: setmode.c $ */ /** @file * * Linux Additions X11 graphics driver, mode setting diff --git a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk index ca773307f..171acbb55 100644 --- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 37520 2011-06-16 20:57:39Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvideo testcases. # diff --git a/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c b/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c index 0bc1020b4..b30a35b00 100644 --- a/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c +++ b/src/VBox/Additions/x11/vboxvideo/testcase/tstSetModeXOrg.c @@ -1,4 +1,4 @@ -/* $Id: tstSetModeXOrg.c 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: tstSetModeXOrg.c $ */ /** @file * vboxvideo unit test - modesetting. */ diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c index 22749cefd..dd32da3af 100644 --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c @@ -1,4 +1,4 @@ -/* $Id: vboxvideo.c 38207 2011-07-27 21:56:28Z vboxsync $ */ +/* $Id: vboxvideo.c $ */ /** @file * * Linux Additions X11 graphics driver diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c b/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c index 644275933..ab9324ed3 100644 --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c @@ -1,4 +1,4 @@ -/** @file $Id: vboxvideo_dri.c 35268 2010-12-20 23:30:58Z vboxsync $ +/** @file $Id: vboxvideo_dri.c $ * * VirtualBox X11 Additions graphics driver, DRI support */ diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/sparc/sparc.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/sparc/sparc.h index 55ab12122..835bdf4b1 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/sparc/sparc.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/sparc/sparc.h @@ -1,4 +1,4 @@ -/* $Id: sparc.h,v 1.3 2001/06/06 22:55:28 davem69 Exp $ */ +/* $Id: sparc.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86-64/x86-64.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86-64/x86-64.h index fdbd154d5..a6b68d527 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86-64/x86-64.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86-64/x86-64.h @@ -1,4 +1,4 @@ -/* $Id: x86-64.h,v 1.1 2005/05/07 16:59:59 brianp Exp $ */ +/* $Id: x86-64.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/3dnow.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/3dnow.h index 1f2fd8e8b..673d45994 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/3dnow.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/3dnow.h @@ -1,4 +1,4 @@ -/* $Id: 3dnow.h,v 1.6 2002/04/09 14:58:03 keithw Exp $ */ +/* $Id: 3dnow.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/clip_args.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/clip_args.h index cccf80198..7540c6a49 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/clip_args.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/clip_args.h @@ -1,4 +1,4 @@ -/* $Id: clip_args.h,v 1.5 2002/10/29 20:28:57 brianp Exp $ */ +/* $Id: clip_args.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_asm.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_asm.h index 997729832..e093b1872 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_asm.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_asm.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_asm.h,v 1.12 2005/07/16 00:56:20 ajax Exp $ */ +/* $Id: common_x86_asm.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_features.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_features.h index 90509775c..9a0cedc99 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_features.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_features.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_features.h,v 1.6 2003/01/21 16:14:00 brianp Exp $ */ +/* $Id: common_x86_features.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_macros.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_macros.h index ba155caae..43033732b 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_macros.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/common_x86_macros.h @@ -1,4 +1,4 @@ -/* $Id: common_x86_macros.h,v 1.3 2002/10/29 20:28:58 brianp Exp $ */ +/* $Id: common_x86_macros.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/norm_args.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/norm_args.h index 1b43d57a2..1e7d79c67 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/norm_args.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/norm_args.h @@ -1,4 +1,4 @@ -/* $Id: norm_args.h,v 1.4 2003/11/26 08:32:36 dborca Exp $ */ +/* $Id: norm_args.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/sse.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/sse.h index 98146a904..fe1233653 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/sse.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/sse.h @@ -1,4 +1,4 @@ -/* $Id: sse.h,v 1.2 2002/04/09 14:58:03 keithw Exp $ */ +/* $Id: sse.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/x86.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/x86.h index a646aff46..8d529110b 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/x86.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/x86.h @@ -1,4 +1,4 @@ -/* $Id: x86.h,v 1.5 2002/04/09 14:58:03 keithw Exp $ */ +/* $Id: x86.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/xform_args.h b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/xform_args.h index 89a04205c..6bc1b8060 100644 --- a/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/xform_args.h +++ b/src/VBox/Additions/x11/x11include/mesa-7.2/src/mesa/x86/xform_args.h @@ -1,4 +1,4 @@ -/* $Id: xform_args.h,v 1.5 2002/10/29 20:28:58 brianp Exp $ */ +/* $Id: xform_args.h $ */ /* * Mesa 3-D graphics library diff --git a/src/VBox/Additions/x11/x11stubs/Makefile.kmk b/src/VBox/Additions/x11/x11stubs/Makefile.kmk index b7f6bfe04..37279143c 100644 --- a/src/VBox/Additions/x11/x11stubs/Makefile.kmk +++ b/src/VBox/Additions/x11/x11stubs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the X11 linker stub (import) libraries. # 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 50aac7dd3..401eec1d7 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: libXcomposite.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $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 index aa6dbabf1..bcf008ea0 100644 --- a/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c +++ b/src/VBox/Additions/x11/x11stubs/libXdamage-1.1.0/libXdamage.c @@ -1,4 +1,4 @@ -/* $Id: libXdamage.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: libXdamage.c $ */ /** @file * X.Org libXdamage.so linker stub 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 index 0aec41467..f83809adb 100644 --- a/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c +++ b/src/VBox/Additions/x11/x11stubs/libXext-6.4.0/libXext.c @@ -1,4 +1,4 @@ -/* $Id: libXext.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: libXext.c $ */ /** @file * X.Org libXext.so linker stub 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 index 82dab131a..211f7f491 100644 --- a/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c +++ b/src/VBox/Additions/x11/x11stubs/libXfixes-3.1.0/libXfixes.c @@ -1,4 +1,4 @@ -/* $Id: libXfixes.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: libXfixes.c $ */ /** @file * X.Org libXfixes.so linker stub diff --git a/src/VBox/Debugger/DBGCBuiltInSymbols.cpp b/src/VBox/Debugger/DBGCBuiltInSymbols.cpp index 17abd3125..dbe5db7a1 100644 --- a/src/VBox/Debugger/DBGCBuiltInSymbols.cpp +++ b/src/VBox/Debugger/DBGCBuiltInSymbols.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCBuiltInSymbols.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: DBGCBuiltInSymbols.cpp $ */ /** @file * DBGC - Debugger Console, Built-In Symbols. */ diff --git a/src/VBox/Debugger/DBGCCmdHlp.cpp b/src/VBox/Debugger/DBGCCmdHlp.cpp index badf37e60..5fdca3f5d 100644 --- a/src/VBox/Debugger/DBGCCmdHlp.cpp +++ b/src/VBox/Debugger/DBGCCmdHlp.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCCmdHlp.cpp 36032 2011-02-21 12:46:48Z vboxsync $ */ +/* $Id: DBGCCmdHlp.cpp $ */ /** @file * DBGC - Debugger Console, Command Helpers. */ diff --git a/src/VBox/Debugger/DBGCCmdWorkers.cpp b/src/VBox/Debugger/DBGCCmdWorkers.cpp index 87af63717..a450efcf4 100644 --- a/src/VBox/Debugger/DBGCCmdWorkers.cpp +++ b/src/VBox/Debugger/DBGCCmdWorkers.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCCmdWorkers.cpp 35673 2011-01-24 10:15:44Z vboxsync $ */ +/* $Id: DBGCCmdWorkers.cpp $ */ /** @file * DBGC - Debugger Console, Command Worker Routines. */ diff --git a/src/VBox/Debugger/DBGCCommands.cpp b/src/VBox/Debugger/DBGCCommands.cpp index 543f6b1d6..2cdafd68c 100644 --- a/src/VBox/Debugger/DBGCCommands.cpp +++ b/src/VBox/Debugger/DBGCCommands.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCCommands.cpp 35696 2011-01-24 18:03:33Z vboxsync $ */ +/* $Id: DBGCCommands.cpp $ */ /** @file * DBGC - Debugger Console, Native Commands. */ diff --git a/src/VBox/Debugger/DBGCEmulateCodeView.cpp b/src/VBox/Debugger/DBGCEmulateCodeView.cpp index 7fcc363b4..0be0cb5a9 100644 --- a/src/VBox/Debugger/DBGCEmulateCodeView.cpp +++ b/src/VBox/Debugger/DBGCEmulateCodeView.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCEmulateCodeView.cpp 36640 2011-04-11 11:44:08Z vboxsync $ */ +/* $Id: DBGCEmulateCodeView.cpp $ */ /** @file * DBGC - Debugger Console, CodeView / WinDbg Emulation. */ diff --git a/src/VBox/Debugger/DBGCEval.cpp b/src/VBox/Debugger/DBGCEval.cpp index c9e6830d7..f440afdb9 100644 --- a/src/VBox/Debugger/DBGCEval.cpp +++ b/src/VBox/Debugger/DBGCEval.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCEval.cpp 35696 2011-01-24 18:03:33Z vboxsync $ */ +/* $Id: DBGCEval.cpp $ */ /** @file * DBGC - Debugger Console, command evaluator. */ diff --git a/src/VBox/Debugger/DBGCGdbRemoteStub.cpp b/src/VBox/Debugger/DBGCGdbRemoteStub.cpp index ec5747ecc..a48d1d12c 100644 --- a/src/VBox/Debugger/DBGCGdbRemoteStub.cpp +++ b/src/VBox/Debugger/DBGCGdbRemoteStub.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCGdbRemoteStub.cpp 35628 2011-01-19 14:58:26Z vboxsync $ */ +/* $Id: DBGCGdbRemoteStub.cpp $ */ /** @file * DBGC - Debugger Console, GDB Remote Stub. */ diff --git a/src/VBox/Debugger/DBGCInternal.h b/src/VBox/Debugger/DBGCInternal.h index 7296bdb9c..d81183c8f 100644 --- a/src/VBox/Debugger/DBGCInternal.h +++ b/src/VBox/Debugger/DBGCInternal.h @@ -1,4 +1,4 @@ -/* $Id: DBGCInternal.h 35694 2011-01-24 17:35:59Z vboxsync $ */ +/* $Id: DBGCInternal.h $ */ /** @file * DBGC - Debugger Console, Internal Header File. */ diff --git a/src/VBox/Debugger/DBGCOps.cpp b/src/VBox/Debugger/DBGCOps.cpp index fac77b38d..abbc4f059 100644 --- a/src/VBox/Debugger/DBGCOps.cpp +++ b/src/VBox/Debugger/DBGCOps.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCOps.cpp 35637 2011-01-19 17:42:59Z vboxsync $ */ +/* $Id: DBGCOps.cpp $ */ /** @file * DBGC - Debugger Console, Operators. */ diff --git a/src/VBox/Debugger/DBGCTcp.cpp b/src/VBox/Debugger/DBGCTcp.cpp index dc7501cf0..58ce10a2a 100644 --- a/src/VBox/Debugger/DBGCTcp.cpp +++ b/src/VBox/Debugger/DBGCTcp.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGCTcp.cpp 35628 2011-01-19 14:58:26Z vboxsync $ */ +/* $Id: DBGCTcp.cpp $ */ /** @file * DBGC - Debugger Console, TCP backend. */ diff --git a/src/VBox/Debugger/DBGConsole.cpp b/src/VBox/Debugger/DBGConsole.cpp index e8804020b..990396497 100644 --- a/src/VBox/Debugger/DBGConsole.cpp +++ b/src/VBox/Debugger/DBGConsole.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGConsole.cpp 35829 2011-02-03 10:18:53Z vboxsync $ */ +/* $Id: DBGConsole.cpp $ */ /** @file * DBGC - Debugger Console. */ diff --git a/src/VBox/Debugger/DBGPlugInCommonELF.cpp b/src/VBox/Debugger/DBGPlugInCommonELF.cpp index bedab4a9a..7b27b7d1a 100644 --- a/src/VBox/Debugger/DBGPlugInCommonELF.cpp +++ b/src/VBox/Debugger/DBGPlugInCommonELF.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGPlugInCommonELF.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGPlugInCommonELF.cpp $ */ /** @file * DBGPlugInCommonELF - Common code for dealing with ELF images. */ diff --git a/src/VBox/Debugger/DBGPlugInCommonELF.h b/src/VBox/Debugger/DBGPlugInCommonELF.h index c586c3968..5590d45a8 100644 --- a/src/VBox/Debugger/DBGPlugInCommonELF.h +++ b/src/VBox/Debugger/DBGPlugInCommonELF.h @@ -1,4 +1,4 @@ -/* $Id: DBGPlugInCommonELF.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: DBGPlugInCommonELF.h $ */ /** @file * DBGPlugInCommonELF - Common code for dealing with ELF images, Header. */ diff --git a/src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h b/src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h index 8de656ff5..52419f35d 100644 --- a/src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h +++ b/src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h @@ -1,4 +1,4 @@ -/* $Id: DBGPlugInCommonELFTmpl.cpp.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: DBGPlugInCommonELFTmpl.cpp.h $ */ /** @file * DBGPlugInCommonELF - Code Template for dealing with one kind of ELF. */ diff --git a/src/VBox/Debugger/DBGPlugInDiggers.cpp b/src/VBox/Debugger/DBGPlugInDiggers.cpp index f8b0d4f01..48f550afc 100644 --- a/src/VBox/Debugger/DBGPlugInDiggers.cpp +++ b/src/VBox/Debugger/DBGPlugInDiggers.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGPlugInDiggers.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGPlugInDiggers.cpp $ */ /** @file * DBGPlugInDiggers - Debugger and Guest OS Digger Plug-in. */ diff --git a/src/VBox/Debugger/DBGPlugInLinux.cpp b/src/VBox/Debugger/DBGPlugInLinux.cpp index 71657cebb..07fa9648b 100644 --- a/src/VBox/Debugger/DBGPlugInLinux.cpp +++ b/src/VBox/Debugger/DBGPlugInLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGPlugInLinux.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGPlugInLinux.cpp $ */ /** @file * DBGPlugInLinux - Debugger and Guest OS Digger Plugin For Linux. */ diff --git a/src/VBox/Debugger/DBGPlugInSolaris.cpp b/src/VBox/Debugger/DBGPlugInSolaris.cpp index 341a5fa6b..6f717252b 100644 --- a/src/VBox/Debugger/DBGPlugInSolaris.cpp +++ b/src/VBox/Debugger/DBGPlugInSolaris.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGPlugInSolaris.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGPlugInSolaris.cpp $ */ /** @file * DBGPlugInSolaris - Debugger and Guest OS Digger Plugin For Solaris. */ diff --git a/src/VBox/Debugger/DBGPlugInWinNt.cpp b/src/VBox/Debugger/DBGPlugInWinNt.cpp index 626e50e26..503bc48a3 100644 --- a/src/VBox/Debugger/DBGPlugInWinNt.cpp +++ b/src/VBox/Debugger/DBGPlugInWinNt.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGPlugInWinNt.cpp 37809 2011-07-07 08:15:02Z vboxsync $ */ +/* $Id: DBGPlugInWinNt.cpp $ */ /** @file * DBGPlugInWindows - Debugger and Guest OS Digger Plugin For Windows NT. */ diff --git a/src/VBox/Debugger/DBGPlugIns.h b/src/VBox/Debugger/DBGPlugIns.h index d060c3256..bbb4a9d33 100644 --- a/src/VBox/Debugger/DBGPlugIns.h +++ b/src/VBox/Debugger/DBGPlugIns.h @@ -1,4 +1,4 @@ -/* $Id: DBGPlugIns.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGPlugIns.h $ */ /** @file * DBGPlugIns - Debugger Plug-Ins. * diff --git a/src/VBox/Debugger/Makefile.kmk b/src/VBox/Debugger/Makefile.kmk index 98fb8f649..90595362b 100644 --- a/src/VBox/Debugger/Makefile.kmk +++ b/src/VBox/Debugger/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the VBox debugger. # diff --git a/src/VBox/Debugger/VBoxDbg.cpp b/src/VBox/Debugger/VBoxDbg.cpp index 9ec90c9d0..9c41c934c 100644 --- a/src/VBox/Debugger/VBoxDbg.cpp +++ b/src/VBox/Debugger/VBoxDbg.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDbg.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxDbg.cpp $ */ /** @file * VBox Debugger GUI. */ diff --git a/src/VBox/Debugger/VBoxDbgBase.cpp b/src/VBox/Debugger/VBoxDbgBase.cpp index 5c400e754..461c0e5de 100644 --- a/src/VBox/Debugger/VBoxDbgBase.cpp +++ b/src/VBox/Debugger/VBoxDbgBase.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgBase.cpp 31530 2010-08-10 12:24:45Z vboxsync $ */ +/* $Id: VBoxDbgBase.cpp $ */ /** @file * VBox Debugger GUI - Base classes. */ diff --git a/src/VBox/Debugger/VBoxDbgBase.h b/src/VBox/Debugger/VBoxDbgBase.h index c54e1f826..660d44e63 100644 --- a/src/VBox/Debugger/VBoxDbgBase.h +++ b/src/VBox/Debugger/VBoxDbgBase.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgBase.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxDbgBase.h $ */ /** @file * VBox Debugger GUI - Base classes. */ diff --git a/src/VBox/Debugger/VBoxDbgConsole.cpp b/src/VBox/Debugger/VBoxDbgConsole.cpp index ab0ae229d..46756985c 100644 --- a/src/VBox/Debugger/VBoxDbgConsole.cpp +++ b/src/VBox/Debugger/VBoxDbgConsole.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgConsole.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxDbgConsole.cpp $ */ /** @file * VBox Debugger GUI - Console. */ diff --git a/src/VBox/Debugger/VBoxDbgConsole.h b/src/VBox/Debugger/VBoxDbgConsole.h index 6b9a82163..ca762e96d 100644 --- a/src/VBox/Debugger/VBoxDbgConsole.h +++ b/src/VBox/Debugger/VBoxDbgConsole.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgConsole.h 31530 2010-08-10 12:24:45Z vboxsync $ */ +/* $Id: VBoxDbgConsole.h $ */ /** @file * VBox Debugger GUI - Console. */ diff --git a/src/VBox/Debugger/VBoxDbgDisas.h b/src/VBox/Debugger/VBoxDbgDisas.h index c17df349d..bbd706fe4 100644 --- a/src/VBox/Debugger/VBoxDbgDisas.h +++ b/src/VBox/Debugger/VBoxDbgDisas.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgDisas.h 31531 2010-08-10 12:29:45Z vboxsync $ */ +/* $Id: VBoxDbgDisas.h $ */ /** @file * VBox Debugger GUI - Disassembly View. */ diff --git a/src/VBox/Debugger/VBoxDbgGui.cpp b/src/VBox/Debugger/VBoxDbgGui.cpp index 9fbdb12f9..d2f7f451e 100644 --- a/src/VBox/Debugger/VBoxDbgGui.cpp +++ b/src/VBox/Debugger/VBoxDbgGui.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgGui.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxDbgGui.cpp $ */ /** @file * VBox Debugger GUI - The Manager. */ diff --git a/src/VBox/Debugger/VBoxDbgGui.h b/src/VBox/Debugger/VBoxDbgGui.h index 093347c6a..01eb89722 100644 --- a/src/VBox/Debugger/VBoxDbgGui.h +++ b/src/VBox/Debugger/VBoxDbgGui.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgGui.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxDbgGui.h $ */ /** @file * VBox Debugger GUI - The Manager. */ diff --git a/src/VBox/Debugger/VBoxDbgStatsQt4.cpp b/src/VBox/Debugger/VBoxDbgStatsQt4.cpp index 8d1e052d4..33c846da1 100644 --- a/src/VBox/Debugger/VBoxDbgStatsQt4.cpp +++ b/src/VBox/Debugger/VBoxDbgStatsQt4.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgStatsQt4.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxDbgStatsQt4.cpp $ */ /** @file * VBox Debugger GUI - Statistics. */ diff --git a/src/VBox/Debugger/VBoxDbgStatsQt4.h b/src/VBox/Debugger/VBoxDbgStatsQt4.h index edc04d445..2b8a2fc87 100644 --- a/src/VBox/Debugger/VBoxDbgStatsQt4.h +++ b/src/VBox/Debugger/VBoxDbgStatsQt4.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgStatsQt4.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxDbgStatsQt4.h $ */ /** @file * VBox Debugger GUI - Statistics. */ diff --git a/src/VBox/Debugger/testcase/tstDBGCParser.cpp b/src/VBox/Debugger/testcase/tstDBGCParser.cpp index 77cd49c40..5f415fd54 100644 --- a/src/VBox/Debugger/testcase/tstDBGCParser.cpp +++ b/src/VBox/Debugger/testcase/tstDBGCParser.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDBGCParser.cpp 35629 2011-01-19 15:15:21Z vboxsync $ */ +/* $Id: tstDBGCParser.cpp $ */ /** @file * DBGC Testcase - Command Parser. */ diff --git a/src/VBox/Debugger/testcase/tstDBGCStubs.cpp b/src/VBox/Debugger/testcase/tstDBGCStubs.cpp index 528131547..ba6b54b00 100644 --- a/src/VBox/Debugger/testcase/tstDBGCStubs.cpp +++ b/src/VBox/Debugger/testcase/tstDBGCStubs.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDBGCStubs.cpp 35629 2011-01-19 15:15:21Z vboxsync $ */ +/* $Id: tstDBGCStubs.cpp $ */ /** @file * DBGC Testcase - Command Parser, VMM Stub Functions. */ diff --git a/src/VBox/Debugger/testcase/tstVBoxDbg.cpp b/src/VBox/Debugger/testcase/tstVBoxDbg.cpp index 49aab8f01..13977789e 100644 --- a/src/VBox/Debugger/testcase/tstVBoxDbg.cpp +++ b/src/VBox/Debugger/testcase/tstVBoxDbg.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVBoxDbg.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstVBoxDbg.cpp $ */ /** @file * VBox Debugger GUI, dummy testcase. */ diff --git a/src/VBox/Devices/Audio/DevCodec.cpp b/src/VBox/Devices/Audio/DevCodec.cpp index 070d6b0a8..66abf9cfe 100644 --- a/src/VBox/Devices/Audio/DevCodec.cpp +++ b/src/VBox/Devices/Audio/DevCodec.cpp @@ -1,4 +1,4 @@ -/* $Id: DevCodec.cpp 37482 2011-06-16 04:09:27Z vboxsync $ */ +/* $Id: DevCodec.cpp $ */ /** @file * DevCodec - VBox ICH Intel HD Audio Codec. */ diff --git a/src/VBox/Devices/Audio/DevCodec.h b/src/VBox/Devices/Audio/DevCodec.h index 682260e1d..81489797f 100644 --- a/src/VBox/Devices/Audio/DevCodec.h +++ b/src/VBox/Devices/Audio/DevCodec.h @@ -1,4 +1,4 @@ -/* $Id: DevCodec.h 37482 2011-06-16 04:09:27Z vboxsync $ */ +/* $Id: DevCodec.h $ */ /** @file * DevCodec - VBox ICH Intel HD Audio Codec. */ diff --git a/src/VBox/Devices/Audio/DevIchAc97.cpp b/src/VBox/Devices/Audio/DevIchAc97.cpp index b5fe6a7d6..e6bba5a73 100644 --- a/src/VBox/Devices/Audio/DevIchAc97.cpp +++ b/src/VBox/Devices/Audio/DevIchAc97.cpp @@ -1,4 +1,4 @@ -/* $Id: DevIchAc97.cpp 35487 2011-01-11 13:45:20Z vboxsync $ */ +/* $Id: DevIchAc97.cpp $ */ /** @file * DevIchAc97 - VBox ICH AC97 Audio Controller. */ diff --git a/src/VBox/Devices/Audio/DevIchIntelHDA.cpp b/src/VBox/Devices/Audio/DevIchIntelHDA.cpp index 1e82865f6..3f4257c36 100644 --- a/src/VBox/Devices/Audio/DevIchIntelHDA.cpp +++ b/src/VBox/Devices/Audio/DevIchIntelHDA.cpp @@ -1,4 +1,4 @@ -/* $Id: DevIchIntelHDA.cpp 37654 2011-06-28 06:02:23Z vboxsync $ */ +/* $Id: DevIchIntelHDA.cpp $ */ /** @file * DevIchIntelHD - VBox ICH Intel HD Audio Controller. */ diff --git a/src/VBox/Devices/Audio/DevSB16.cpp b/src/VBox/Devices/Audio/DevSB16.cpp index 7686ddb76..393df6c49 100644 --- a/src/VBox/Devices/Audio/DevSB16.cpp +++ b/src/VBox/Devices/Audio/DevSB16.cpp @@ -1,4 +1,4 @@ -/* $Id: DevSB16.cpp 35487 2011-01-11 13:45:20Z vboxsync $ */ +/* $Id: DevSB16.cpp $ */ /** @file * DevSB16 - VBox SB16 Audio Controller. * diff --git a/src/VBox/Devices/Audio/alsa_stubs.c b/src/VBox/Devices/Audio/alsa_stubs.c index 442ddc519..4428d8905 100644 --- a/src/VBox/Devices/Audio/alsa_stubs.c +++ b/src/VBox/Devices/Audio/alsa_stubs.c @@ -1,4 +1,4 @@ -/* $Id: alsa_stubs.c 34451 2010-11-29 11:00:53Z vboxsync $ */ +/* $Id: alsa_stubs.c $ */ /** @file * Stubs for libasound. */ diff --git a/src/VBox/Devices/Audio/audiosniffer.c b/src/VBox/Devices/Audio/audiosniffer.c index 72003d328..7cff38cda 100644 --- a/src/VBox/Devices/Audio/audiosniffer.c +++ b/src/VBox/Devices/Audio/audiosniffer.c @@ -1,4 +1,4 @@ -/* $Id: audiosniffer.c 35402 2011-01-04 14:59:31Z vboxsync $ */ +/* $Id: audiosniffer.c $ */ /** @file * VBox audio device: Audio sniffer device */ diff --git a/src/VBox/Devices/Audio/coreaudio.c b/src/VBox/Devices/Audio/coreaudio.c index e7606eacc..a9dbee6fd 100644 --- a/src/VBox/Devices/Audio/coreaudio.c +++ b/src/VBox/Devices/Audio/coreaudio.c @@ -1,4 +1,4 @@ -/* $Id: coreaudio.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: coreaudio.c $ */ /** @file * VBox audio devices: Mac OS X CoreAudio audio driver */ diff --git a/src/VBox/Devices/Audio/filteraudio.c b/src/VBox/Devices/Audio/filteraudio.c index 3f1319de0..4a3bf9782 100644 --- a/src/VBox/Devices/Audio/filteraudio.c +++ b/src/VBox/Devices/Audio/filteraudio.c @@ -1,4 +1,4 @@ -/* $Id: filteraudio.c 36327 2011-03-21 15:49:12Z vboxsync $ */ +/* $Id: filteraudio.c $ */ /** @file * VBox audio devices: filter driver, which sits between the host audio driver * and the virtual audio device and intercept all host driver operations. diff --git a/src/VBox/Devices/Audio/pulse_stubs.c b/src/VBox/Devices/Audio/pulse_stubs.c index bbd757bad..4fdb2bdcc 100644 --- a/src/VBox/Devices/Audio/pulse_stubs.c +++ b/src/VBox/Devices/Audio/pulse_stubs.c @@ -1,4 +1,4 @@ -/* $Id: pulse_stubs.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: pulse_stubs.c $ */ /** @file * Stubs for libpulse. */ diff --git a/src/VBox/Devices/Audio/solaudio.c b/src/VBox/Devices/Audio/solaudio.c index dc4c0900e..26c84734d 100644 --- a/src/VBox/Devices/Audio/solaudio.c +++ b/src/VBox/Devices/Audio/solaudio.c @@ -1,4 +1,4 @@ -/* $Id: solaudio.c 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: solaudio.c $ */ /** @file * VirtualBox Audio Driver - Solaris host. */ diff --git a/src/VBox/Devices/Bus/DevPCI.cpp b/src/VBox/Devices/Bus/DevPCI.cpp index e9caba053..473c4eae3 100644 --- a/src/VBox/Devices/Bus/DevPCI.cpp +++ b/src/VBox/Devices/Bus/DevPCI.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPCI.cpp 36079 2011-02-24 17:10:31Z vboxsync $ */ +/* $Id: DevPCI.cpp $ */ /** @file * DevPCI - PCI BUS Device. */ diff --git a/src/VBox/Devices/Bus/DevPciIch9.cpp b/src/VBox/Devices/Bus/DevPciIch9.cpp index a0f2fea6a..6923424a5 100644 --- a/src/VBox/Devices/Bus/DevPciIch9.cpp +++ b/src/VBox/Devices/Bus/DevPciIch9.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPciIch9.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: DevPciIch9.cpp $ */ /** @file * DevPCI - ICH9 southbridge PCI bus emulation device. */ diff --git a/src/VBox/Devices/Bus/MsiCommon.cpp b/src/VBox/Devices/Bus/MsiCommon.cpp index ccd935156..5a25e104f 100644 --- a/src/VBox/Devices/Bus/MsiCommon.cpp +++ b/src/VBox/Devices/Bus/MsiCommon.cpp @@ -1,4 +1,4 @@ -/* $Id: MsiCommon.cpp 36663 2011-04-13 15:57:33Z vboxsync $ */ +/* $Id: MsiCommon.cpp $ */ /** @file * MSI support routines */ diff --git a/src/VBox/Devices/Bus/MsiCommon.h b/src/VBox/Devices/Bus/MsiCommon.h index 21ce870ba..e386b8905 100644 --- a/src/VBox/Devices/Bus/MsiCommon.h +++ b/src/VBox/Devices/Bus/MsiCommon.h @@ -1,4 +1,4 @@ -/* $Id: MsiCommon.h 36663 2011-04-13 15:57:33Z vboxsync $ */ +/* $Id: MsiCommon.h $ */ /** @file * Header for MSI/MSI-X support routines. */ diff --git a/src/VBox/Devices/Bus/MsixCommon.cpp b/src/VBox/Devices/Bus/MsixCommon.cpp index 038336f02..13d776d1d 100644 --- a/src/VBox/Devices/Bus/MsixCommon.cpp +++ b/src/VBox/Devices/Bus/MsixCommon.cpp @@ -1,4 +1,4 @@ -/* $Id: MsixCommon.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: MsixCommon.cpp $ */ /** @file * MSI-X support routines */ diff --git a/src/VBox/Devices/Bus/PCIInternal.h b/src/VBox/Devices/Bus/PCIInternal.h index 82faa8810..0e0bc08f2 100644 --- a/src/VBox/Devices/Bus/PCIInternal.h +++ b/src/VBox/Devices/Bus/PCIInternal.h @@ -1,4 +1,4 @@ -/* $Id: PCIInternal.h 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: PCIInternal.h $ */ /** @file * DevPCI - PCI Internal header - Only for hiding bits of PCIDEVICE. */ diff --git a/src/VBox/Devices/Bus/SrvPciRawR0.cpp b/src/VBox/Devices/Bus/SrvPciRawR0.cpp index 084d5fdc6..85d6452ae 100644 --- a/src/VBox/Devices/Bus/SrvPciRawR0.cpp +++ b/src/VBox/Devices/Bus/SrvPciRawR0.cpp @@ -1,4 +1,4 @@ -/* $Id: SrvPciRawR0.cpp 37810 2011-07-07 08:36:00Z vboxsync $ */ +/* $Id: SrvPciRawR0.cpp $ */ /** @file * PCI passthrough - The ring 0 service. */ diff --git a/src/VBox/Devices/EFI/DevEFI.cpp b/src/VBox/Devices/EFI/DevEFI.cpp index 413395fd1..b6b57ff7e 100644 --- a/src/VBox/Devices/EFI/DevEFI.cpp +++ b/src/VBox/Devices/EFI/DevEFI.cpp @@ -1,4 +1,4 @@ -/* $Id: DevEFI.cpp 35431 2011-01-07 15:19:34Z vboxsync $ */ +/* $Id: DevEFI.cpp $ */ /** @file * DevEFI - EFI <-> VirtualBox Integration Framework. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h index a521ca87a..eda72db03 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h @@ -1,4 +1,4 @@ -/* $Id: DevEFI.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: DevEFI.h $ */ /** @file * EFI for VirtualBox Common Definitions. * diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac index 6a02b9fb8..bf21d4d8b 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac @@ -1,4 +1,4 @@ -; $Id: DevEFI.mac 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: DevEFI.mac $ ;; @file ; DevEFI Interface Definitions, Assembly (Yasm) Variant. ; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxDebugLib.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxDebugLib.h index b754141d6..4cb9cb4dd 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxDebugLib.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxDebugLib.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDebugLib.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxDebugLib.h $ */ /** @file * VBoxDebugLib.h - Debug and logging routines implemented by VBoxDebugLib. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxMemLayout.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxMemLayout.h index f571c2818..bf5caf4f1 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxMemLayout.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxMemLayout.h @@ -1,4 +1,4 @@ -/* $Id: VBoxMemLayout.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxMemLayout.h $ */ /** @file * VBoxMemLayout.h - Constants defining the memory layout. (Merge with DevEFI?) */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxPkg.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxPkg.h index bee8d90da..58f6743ad 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxPkg.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxPkg.h @@ -1,4 +1,4 @@ -/* $Id: VBoxPkg.h 29252 2010-05-09 17:58:53Z vboxsync $ */ +/* $Id: VBoxPkg.h $ */ /** @file * VBoxPkg.h - Common header, must be include before IPRT and VBox headers. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c index 51c4a34fc..9652c44e4 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c @@ -1,4 +1,4 @@ -/* $Id: VBoxDebugLib.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxDebugLib.c $ */ /** @file * VBoxDebugLib.c - Debug logging and assertions support routines using DevEFI. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf index e4dc33786..8f3b1707f 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf @@ -1,4 +1,4 @@ -# $Id: VBoxDebugLib.inf 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: VBoxDebugLib.inf $ ## @file # VBoxDebugLib - Debug logging and assertions support routines using DevEFI. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c index c622bdadd..d73dc1d83 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c @@ -1,4 +1,4 @@ -/* $Id: VBoxPrintChar.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxPrintChar.c $ */ /** @file * VBoxPrintChar.c - Implementation of the VBoxPrintChar() debug logging routine. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c index 0fa49d6de..6f3e21666 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c @@ -1,4 +1,4 @@ -/* $Id: VBoxPrintGuid.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxPrintGuid.c $ */ /** @file * VBoxPrintGuid.c - Implementation of the VBoxPrintGuid() debug logging routine. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c index 6fa88dda0..532dea079 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c @@ -1,4 +1,4 @@ -/* $Id: VBoxPrintHex.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxPrintHex.c $ */ /** @file * VBoxPrintHex.c - Implementation of the VBoxPrintHex() debug logging routine. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHexDump.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHexDump.c index 25ed77639..c1e2074a5 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHexDump.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHexDump.c @@ -1,4 +1,4 @@ -/* $Id: VBoxPrintHexDump.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxPrintHexDump.c $ */ /** @file * VBoxPrintHex.c - Implementation of the VBoxPrintHex() debug logging routine. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c index 723939124..8d789563b 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c @@ -1,4 +1,4 @@ -/* $Id: VBoxPrintString.c 29085 2010-05-05 14:03:59Z vboxsync $ */ +/* $Id: VBoxPrintString.c $ */ /** @file * VBoxPrintString.c - Implementation of the VBoxPrintString() debug logging routine. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c index 25f66b4fb..37bb9a842 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c @@ -1,4 +1,4 @@ -/* $Id: BdsBoot.c 37147 2011-05-19 02:44:57Z vboxsync $ */ +/* $Id: BdsBoot.c $ */ /** @file * BdsBoot.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsConnect.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsConnect.c index dfdec7357..2508caca9 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsConnect.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsConnect.c @@ -1,4 +1,4 @@ -/* $Id: BdsConnect.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: BdsConnect.c $ */ /** @file * BdsConnect.c - BDS Lib functions which relate with connect the device */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsConsole.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsConsole.c index 803832977..5fc2f68e5 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsConsole.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsConsole.c @@ -1,4 +1,4 @@ -/* $Id: BdsConsole.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: BdsConsole.c $ */ /** @file * BdsConsole.c - BDS Lib functions which contain all the code to connect console device. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsMisc.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsMisc.c index 613c5e994..ebac61360 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsMisc.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsMisc.c @@ -1,4 +1,4 @@ -/* $Id: BdsMisc.c 33676 2010-11-02 09:48:24Z vboxsync $ */ +/* $Id: BdsMisc.c $ */ /** @file * BdsMisc.c - Misc BDS library function. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/Bmp.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/Bmp.h index de2fbf8b3..62cb75d9b 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/Bmp.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/Bmp.h @@ -1,4 +1,4 @@ -/* $Id: Bmp.h 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: Bmp.h $ */ /** @file * Bmp.h - This file defines BMP file header data structures. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/DevicePath.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/DevicePath.c index 140a6c240..c4933c70d 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/DevicePath.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/DevicePath.c @@ -1,4 +1,4 @@ -/* $Id: DevicePath.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: DevicePath.c $ */ /** @file * DevicePath.c - BDS internal function define the default device path string, * it can be replaced by platform device path. diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/InternalBdsLib.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/InternalBdsLib.h index 606499c22..49f91d177 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/InternalBdsLib.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/InternalBdsLib.h @@ -1,4 +1,4 @@ -/* $Id: InternalBdsLib.h 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: InternalBdsLib.h $ */ /** @file * InternalBdsLib.h - BDS library definition, include the file and data structure */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/Performance.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/Performance.c index ac5823a05..c4c1a0c79 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/Performance.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/Performance.c @@ -1,4 +1,4 @@ -/* $Id: Performance.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: Performance.c $ */ /** @file * Performance.c - This file include the file which can help to get the * system performance, all the function will only include if the performance diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/VBoxGenericBdsLib.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/VBoxGenericBdsLib.inf index 8a5277ad5..69b7b1177 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/VBoxGenericBdsLib.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/VBoxGenericBdsLib.inf @@ -1,4 +1,4 @@ -# $Id: VBoxGenericBdsLib.inf 33540 2010-10-28 09:27:05Z vboxsync $ +# $Id: VBoxGenericBdsLib.inf $ #/** @file # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.c index 14e475f98..53a1967c8 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.c @@ -1,4 +1,4 @@ -/* $Id: VBoxOemHookStatusCodeLib.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxOemHookStatusCodeLib.c $ */ /** @file * DxeVBoxOemHookStatusCodeLib.c - Logging. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf index a15f5aad7..a282c5a85 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf @@ -1,4 +1,4 @@ -# $Id: VBoxOemHookStatusCodeLib.inf 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: VBoxOemHookStatusCodeLib.inf $ ## @file # VBoxOemHookStatusCodeLib - Logging. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c index 2ded21fc0..02318114f 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c @@ -1,4 +1,4 @@ -/* $Id: BasePeCoff.c 35644 2011-01-20 08:29:40Z vboxsync $ */ +/* $Id: BasePeCoff.c $ */ /** @file * BasePeCoff.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoffLibInternals.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoffLibInternals.h index 665a123e6..f04fc314d 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoffLibInternals.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoffLibInternals.h @@ -1,4 +1,4 @@ -/* $Id: BasePeCoffLibInternals.h 29081 2010-05-05 13:32:04Z vboxsync $ */ +/* $Id: BasePeCoffLibInternals.h $ */ /** @file * BasePeCoffLibInternals.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c index 7bbab5610..ab1ab7c39 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c @@ -1,4 +1,4 @@ -/* $Id: PeCoffLoaderEx.c 29081 2010-05-05 13:32:04Z vboxsync $ */ +/* $Id: PeCoffLoaderEx.c $ */ /** @file * PeCoffLoaderEx.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf index 48572d525..ad441bf88 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf @@ -1,4 +1,4 @@ -# $Id: VBoxPeCoffLib.inf 29081 2010-05-05 13:32:04Z vboxsync $ +# $Id: VBoxPeCoffLib.inf $ ## @file # VBoxPeCoffLib.inf # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/ReadMe.txt b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/ReadMe.txt index 889069eb8..a7c54393b 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/ReadMe.txt +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/ReadMe.txt @@ -1,4 +1,4 @@ -$Id: ReadMe.txt 36424 2011-03-25 12:29:29Z vboxsync $ +$Id: ReadMe.txt $ Setting up the source trees =========================== diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/Console.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/Console.c index 2563f9b7c..a2a755225 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/Console.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/Console.c @@ -1,4 +1,4 @@ -/* $Id: Console.c 29070 2010-05-05 12:32:52Z vboxsync $ */ +/* $Id: Console.c $ */ /** @file * Console.c - VirtualBox Console control emulation */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/ConsoleControl.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/ConsoleControl.h index beddbc2e2..fcef0a049 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/ConsoleControl.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/ConsoleControl.h @@ -1,4 +1,4 @@ -/* $Id: ConsoleControl.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: ConsoleControl.h $ */ /** @file * ConsoleControl.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/Cpu.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/Cpu.c index ed0598510..7f8579bd3 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/Cpu.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/Cpu.c @@ -1,4 +1,4 @@ -/* $Id: Cpu.c 29070 2010-05-05 12:32:52Z vboxsync $ */ +/* $Id: Cpu.c $ */ /** @file * Cpu.c - VirtualBox CPU descriptors */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c index a584318f8..649db9ee1 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c @@ -1,4 +1,4 @@ -/* $Id: VBoxAppleSim.c 35646 2011-01-20 09:40:17Z vboxsync $ */ +/* $Id: VBoxAppleSim.c $ */ /** @file * VBoxAppleSim.c - VirtualBox Apple Firmware simulation support */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf index c0659cda0..d2a8d77cc 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf @@ -1,4 +1,4 @@ -# $Id: VBoxAppleSim.inf 33540 2010-10-28 09:27:05Z vboxsync $ +# $Id: VBoxAppleSim.inf $ ## @file # VBoxAppleSim - VBox Apple interfaces simulation support. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c index a05e7aeb8..1ee7d6087 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c @@ -1,4 +1,4 @@ -/* $Id: VBoxConsole.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxConsole.c $ */ /** @file * VBoxConsole.c - Helper driver waiting for Ready to Boot event to switch graphic mode into user-defined one. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h index eabcc79f3..564c4d50e 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h @@ -1,4 +1,4 @@ -/* $Id: VBoxConsole.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxConsole.h $ */ /** @file * VBoxConsole.h - Some declarations. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf index e5bb3dd4a..643e16701 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf @@ -1,4 +1,4 @@ -# $Id: VBoxConsoleDxe.inf 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: VBoxConsoleDxe.inf $ ## @file # VBoxConsole.inf - VBoxConsoleDxe module declarations. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c index 2f962a07e..af2922e94 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c @@ -1,4 +1,4 @@ -/* $Id: VBoxFsDxe.c 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: VBoxFsDxe.c $ */ /** @file * VBoxFsDxe.c - VirtualBox FS wrapper */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf index dfcdfe194..fe075809c 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf @@ -1,4 +1,4 @@ -# $Id: VBoxFsDxe.inf 29125 2010-05-06 09:43:05Z vboxsync $ +# $Id: VBoxFsDxe.inf $ ## @file # VBoxFsDxe - VBox filesystem wrapper. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFswParam.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFswParam.h index 4edefd155..c9209fb03 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFswParam.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxFswParam.h @@ -1,4 +1,4 @@ -/* $Id: VBoxFswParam.h 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: VBoxFswParam.h $ */ /** @file * VBoxFswParam.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxHfs.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxHfs.inf index 631dd1bb2..6bae40576 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxHfs.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxHfs.inf @@ -1,4 +1,4 @@ -# $Id: VBoxHfs.inf 29125 2010-05-06 09:43:05Z vboxsync $ +# $Id: VBoxHfs.inf $ ## @file # VBoxHfs - VBox HFS FS driver. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf index 7f8033ba1..038ee85a9 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf @@ -1,4 +1,4 @@ -# $Id: VBoxIso9660.inf 29125 2010-05-06 09:43:05Z vboxsync $ +# $Id: VBoxIso9660.inf $ ## @file # VBox ISO9660 FS driver diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_base.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_base.h index 03253f523..01caaee13 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_base.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_base.h @@ -1,4 +1,4 @@ -/* $Id: fsw_base.h 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: fsw_base.h $ */ /** @file * fsw_base.h - Base definitions switch. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.c index 3bf13e135..84fca4e33 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.c @@ -1,4 +1,4 @@ -/* $Id: fsw_core.c 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: fsw_core.c $ */ /** @file * fsw_core.c - Core file system wrapper abstraction layer code. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.h index 872ef91bb..45661ac6f 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.h @@ -1,4 +1,4 @@ -/* $Id: fsw_core.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: fsw_core.h $ */ /** @file * fsw_core.h - Core file system wrapper abstraction layer header. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.c index 9305d35ef..16c452763 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.c @@ -1,4 +1,4 @@ -/* $Id: fsw_efi.c 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: fsw_efi.c $ */ /** @file * fsw_efi.c - EFI host environment code. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.h index 8e6c2b673..aebc7df07 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.h @@ -1,4 +1,4 @@ -/* $Id: fsw_efi.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: fsw_efi.h $ */ /** @file * fsw_efi.h - EFI host environment header. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_base.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_base.h index dd604de68..bcdab2fb8 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_base.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_base.h @@ -1,4 +1,4 @@ -/* $Id: fsw_efi_base.h 36444 2011-03-28 03:14:24Z vboxsync $ */ +/* $Id: fsw_efi_base.h $ */ /** @file * fsw_efi_base.h - Base definitions for the EFI host environment. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c index 956e9ee40..b2143f016 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c @@ -1,4 +1,4 @@ -/* $Id: fsw_efi_lib.c 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: fsw_efi_lib.c $ */ /** @file * fsw_efi_lib.c - EFI host environment library functions. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.c index a397b16cc..d865734f5 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.c @@ -1,4 +1,4 @@ -/* $Id: fsw_hfs.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: fsw_hfs.c $ */ /** @file * fsw_hfs.c - HFS file system driver code, see * diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.h index 53600cba5..78e0f2e03 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_hfs.h @@ -1,4 +1,4 @@ -/* $Id: fsw_hfs.h 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: fsw_hfs.h $ */ /** @file * fsw_hfs.h - HFS file system driver header. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.c index 1651f9b16..614b0d6d7 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.c @@ -1,4 +1,4 @@ -/* $Id: fsw_iso9660.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: fsw_iso9660.c $ */ /** @file * fsw_iso9660.c - ISO9660 file system driver code. * diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.h index 87138dd40..7a7518607 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.h @@ -1,4 +1,4 @@ -/* $Id: fsw_iso9660.h 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: fsw_iso9660.h $ */ /** @file * fsw_iso9660.h - ISO9660 file system driver header. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_lib.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_lib.c index ade2b6bad..2412f36b2 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_lib.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_lib.c @@ -1,4 +1,4 @@ -/* $Id: fsw_lib.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: fsw_lib.c $ */ /** @file * fsw_lib.c - Core file system wrapper library functions. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_strfunc.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_strfunc.h index 61cf25d87..e803634a6 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_strfunc.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_strfunc.h @@ -1,4 +1,4 @@ -/* $Id: fsw_strfunc.h 29125 2010-05-06 09:43:05Z vboxsync $ */ +/* $Id: fsw_strfunc.h $ */ /** @file * fsw_strfunc.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/hfs_format.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/hfs_format.h index 427c1fe0a..96079cbe3 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/hfs_format.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/hfs_format.h @@ -1,4 +1,4 @@ -/* $Id: hfs_format.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: hfs_format.h $ */ /** @file * hfs_format.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ata.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ata.c index 6bb6781bd..2c89480e7 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ata.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ata.c @@ -1,4 +1,4 @@ -/* $Id: Ata.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: Ata.c $ */ /** @file * Ata.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Atapi.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Atapi.c index f0467474f..72d10146e 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Atapi.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Atapi.c @@ -1,4 +1,4 @@ -/* $Id: Atapi.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: Atapi.c $ */ /** @file * Atapi.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/ComponentName.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/ComponentName.c index 312ca6310..c033c7f23 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/ComponentName.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/ComponentName.c @@ -1,4 +1,4 @@ -/* $Id: ComponentName.c 33027 2010-10-11 06:17:12Z vboxsync $ */ +/* $Id: ComponentName.c $ */ /** @file * ComponentName.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/ComponentName.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/ComponentName.h index fb46ce45d..e5e138e1d 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/ComponentName.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/ComponentName.h @@ -1,4 +1,4 @@ -/* $Id: ComponentName.h 33027 2010-10-11 06:17:12Z vboxsync $ */ +/* $Id: ComponentName.h $ */ /** @file * ComponentName.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/DriverConfiguration.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/DriverConfiguration.c index 6459ab90b..13ae2284f 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/DriverConfiguration.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/DriverConfiguration.c @@ -1,4 +1,4 @@ -/* $Id: DriverConfiguration.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: DriverConfiguration.c $ */ /** @file * DriverConfiguration.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/DriverDiagnostics.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/DriverDiagnostics.c index 8cb886816..b49fe36a4 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/DriverDiagnostics.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/DriverDiagnostics.c @@ -1,4 +1,4 @@ -/* $Id: DriverDiagnostics.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: DriverDiagnostics.c $ */ /** @file * DriverDiagnostics.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ide.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ide.c index c2bb3b249..c47cd919b 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ide.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ide.c @@ -1,4 +1,4 @@ -/* $Id: Ide.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: Ide.c $ */ /** @file * Ide.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ide.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ide.h index 15b3f4a4e..172f608ef 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ide.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/Ide.h @@ -1,4 +1,4 @@ -/* $Id: Ide.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: Ide.h $ */ /** @file * Ide.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeBus.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeBus.c index b8525e7e8..b5e982a76 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeBus.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeBus.c @@ -1,4 +1,4 @@ -/* $Id: IdeBus.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: IdeBus.c $ */ /** @file * IdeBus.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeBus.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeBus.h index a96d4f9ee..727e9c389 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeBus.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeBus.h @@ -1,4 +1,4 @@ -/* $Id: IdeBus.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: IdeBus.h $ */ /** @file * IdeBus.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeData.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeData.h index 961e502bb..cba6c9f78 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeData.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/IdeData.h @@ -1,4 +1,4 @@ -/* $Id: IdeData.h 33027 2010-10-11 06:17:12Z vboxsync $ */ +/* $Id: IdeData.h $ */ /** @file * IdeData.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/VBoxIdeBusDxe.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/VBoxIdeBusDxe.inf index 26fbe956e..0a7846097 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/VBoxIdeBusDxe.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxIdeBusDxe/VBoxIdeBusDxe.inf @@ -1,4 +1,4 @@ -# $Id: VBoxIdeBusDxe.inf 33027 2010-10-11 06:17:12Z vboxsync $ +# $Id: VBoxIdeBusDxe.inf $ ## @file # VBoxIdeBusDxe.inf # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/Makefile b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/Makefile index 888cdce45..e7e209b37 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/Makefile +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 32404 2010-09-10 13:17:42Z vboxsync $ +# $Id: Makefile $ #* @file # Makefile - assembling the iso image for experimenting with EFI. #/ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/efi-app/Readme.txt b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/efi-app/Readme.txt index 1aed898ce..04e688031 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/efi-app/Readme.txt +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/efi-app/Readme.txt @@ -1,4 +1,4 @@ -# $Id: Readme.txt 33540 2010-10-28 09:27:05Z vboxsync $ */ +# $Id: Readme.txt $ */ #* @file # Readme.txt - Some description about using this module. diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxOSELogo/VBoxOSELogo.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxOSELogo/VBoxOSELogo.inf index 7bd8a7d12..53da9cf97 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxOSELogo/VBoxOSELogo.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxOSELogo/VBoxOSELogo.inf @@ -1,4 +1,4 @@ -# $Id: VBoxOSELogo.inf 32404 2010-09-10 13:17:42Z vboxsync $
+# $Id: VBoxOSELogo.inf $
#* @file
# VBoxOSELogo.inf - Logo module declarations.
diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dec b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dec index 6b006ad20..2179f15c3 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dec +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dec @@ -1,4 +1,4 @@ -# $Id: VBoxPkg.dec 32394 2010-09-10 12:13:11Z vboxsync $ +# $Id: VBoxPkg.dec $ ## @file # VBoxPkg.dec - VirtualBox Package description. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dsc b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dsc index 45fcaf707..92d0818f5 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dsc +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.dsc @@ -1,4 +1,4 @@ -# $Id: VBoxPkg.dsc 33540 2010-10-28 09:27:05Z vboxsync $ +# $Id: VBoxPkg.dsc $ ## @file # VBoxPkg.dsc - VirtualBox Flash Device. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.fdf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.fdf index 7041ac11b..a05f89187 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.fdf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkg.fdf @@ -1,4 +1,4 @@ -# $Id: VBoxPkg.fdf 33028 2010-10-11 06:23:00Z vboxsync $ +# $Id: VBoxPkg.fdf $ ## @file # VBoxPkg.fdf - VirtualBox Flash Device. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSE.dsc b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSE.dsc index cc12fb609..22d30e9e8 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSE.dsc +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSE.dsc @@ -1,4 +1,4 @@ -# $Id: VBoxPkgOSE.dsc 33540 2010-10-28 09:27:05Z vboxsync $ +# $Id: VBoxPkgOSE.dsc $ ## @file # VBoxPkg.dsc - VirtualBox Flash Device. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSE.fdf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSE.fdf index bf2279657..6363b1984 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSE.fdf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSE.fdf @@ -1,4 +1,4 @@ -# $Id: VBoxPkgOSE.fdf 32394 2010-09-10 12:13:11Z vboxsync $ +# $Id: VBoxPkgOSE.fdf $ ## @file # VBoxPkg.fdf - VirtualBox Flash Device. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSEX64.dsc b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSEX64.dsc index c199bab39..5b856eada 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSEX64.dsc +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgOSEX64.dsc @@ -1,4 +1,4 @@ -# $Id: VBoxPkgOSEX64.dsc 32436 2010-09-13 07:30:33Z vboxsync $ +# $Id: VBoxPkgOSEX64.dsc $ # # Copyright (C) 2009-2010 Oracle Corporation diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgX64.dsc b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgX64.dsc index 9069909ac..96ca8ec35 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgX64.dsc +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxPkgX64.dsc @@ -1,4 +1,4 @@ -# $Id: VBoxPkgX64.dsc 33028 2010-10-11 06:23:00Z vboxsync $ +# $Id: VBoxPkgX64.dsc $ # # Copyright (C) 2009-2010 Oracle Corporation diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h index 8b1b01163..ebd0ca9ca 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h @@ -1,4 +1,4 @@ -/* $Id: LegacyBiosMpTable.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: LegacyBiosMpTable.h $ */ /** @file * LegacyBiosMpTable.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/TableConversion.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/TableConversion.c index 1bb6026d9..deaaeaea3 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/TableConversion.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/TableConversion.c @@ -1,4 +1,4 @@ -/* $Id: TableConversion.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: TableConversion.c $ */ /** @file * TableConversion.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/VBoxSysTables.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/VBoxSysTables.c index 5f5732feb..47331e5ef 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/VBoxSysTables.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/VBoxSysTables.c @@ -1,4 +1,4 @@ -/* $Id: VBoxSysTables.c 29081 2010-05-05 13:32:04Z vboxsync $ */ +/* $Id: VBoxSysTables.c $ */ /** @file * VBoxSysTables.c - VirtualBox system tables */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/VBoxSysTables.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/VBoxSysTables.inf index b37637fa0..e0d544f1d 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/VBoxSysTables.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxSysTables/VBoxSysTables.inf @@ -1,4 +1,4 @@ -# $Id: VBoxSysTables.inf 29081 2010-05-05 13:32:04Z vboxsync $ +# $Id: VBoxSysTables.inf $ ## @file # VBoxSysTables - VBox system tables. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/ComponentName.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/ComponentName.c index e810c05a6..b6cce90ae 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/ComponentName.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/ComponentName.c @@ -1,4 +1,4 @@ -/* $Id: ComponentName.c 29081 2010-05-05 13:32:04Z vboxsync $ */ +/* $Id: ComponentName.c $ */ /** @file * ComponentName.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c index da6a85486..fbd3c9ac9 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c @@ -1,4 +1,4 @@ -/* $Id: DriverSupportedEfiVersion.c 29081 2010-05-05 13:32:04Z vboxsync $ */ +/* $Id: DriverSupportedEfiVersion.c $ */ /** @file * DriverSupportedEfiVersion.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/Edid.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/Edid.c index 7b2215a9b..5b2488aa9 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/Edid.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/Edid.c @@ -1,4 +1,4 @@ -/* $Id: Edid.c 29081 2010-05-05 13:32:04Z vboxsync $ */ +/* $Id: Edid.c $ */ /** @file * Edid.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVga.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVga.c index e1633f838..723dae26d 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVga.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVga.c @@ -1,4 +1,4 @@ -/* $Id: VBoxVga.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxVga.c $ */ /** @file * VBoxVga.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVga.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVga.h index 3d66f2b05..e1900807a 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVga.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVga.h @@ -1,4 +1,4 @@ -/* $Id: VBoxVga.h 33086 2010-10-13 07:27:19Z vboxsync $ */ +/* $Id: VBoxVga.h $ */ /** @file * VBoxVga.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf index 51e1272fc..1f3057bc7 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf @@ -1,4 +1,4 @@ -# $Id: VBoxVgaDxe.inf 29081 2010-05-05 13:32:04Z vboxsync $ +# $Id: VBoxVgaDxe.inf $ ## @file # VBoxVgaDxe.inf # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c index 5badfaee5..6a704ea8a 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaGraphicsOutput.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxVgaGraphicsOutput.c $ */ /** @file * LegacyBiosMpTable.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c index 77aeaf08d..f4b88a376 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaI2c.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxVgaI2c.c $ */ /** @file * VBoxVgaI2c.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h index 8e6fdd472..4841cc75a 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaI2c.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxVgaI2c.h $ */ /** @file * VBoxVgaI2c.h */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c index 9d2bbdddc..5aa414d04 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaUgaDraw.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxVgaUgaDraw.c $ */ /** @file * VBoxVgaUgaDraw.c */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x14.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x14.h index b81fcf363..2342f4a50 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x14.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x14.h @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaFont-8x14.h 29104 2010-05-05 19:06:09Z vboxsync $ */ +/* $Id: VBoxVgaFont-8x14.h $ */ /** @file * VGA-ROM.F14 from ftp://ftp.simtel.net/pub/simtelnet/msdos/screen/fntcol16.zip . * The package is (C) Joseph (Yossi) Gil. diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x16.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x16.h index 358b6b730..bb8b6b46a 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x16.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x16.h @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaFont-8x16.h 29104 2010-05-05 19:06:09Z vboxsync $ */ +/* $Id: VBoxVgaFont-8x16.h $ */ /** @file * VGA-ROM.F16 from ftp://ftp.simtel.net/pub/simtelnet/msdos/screen/fntcol16.zip . * The package is (C) Joseph (Yossi) Gil. diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x8.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x8.h index 6d491ced0..369fbb118 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x8.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFont-8x8.h @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaFont-8x8.h 29104 2010-05-05 19:06:09Z vboxsync $ */ +/* $Id: VBoxVgaFont-8x8.h $ */ /** @file * VGA-ROM.F8 from ftp://ftp.simtel.net/pub/simtelnet/msdos/screen/fntcol16.zip . * The package is (C) Joseph (Yossi) Gil. diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFonts.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFonts.h index df78da1b5..ef94497de 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFonts.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaFonts.h @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaFonts.h 29104 2010-05-05 19:06:09Z vboxsync $ */ +/* $Id: VBoxVgaFonts.h $ */ /** @file * Some of the VGA-ROM fonts from ftp://ftp.simtel.net/pub/simtelnet/msdos/screen/fntcol16.zip . * The package is (C) Joseph (Yossi) Gil. diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c index 519579fb4..393d15939 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c @@ -1,4 +1,4 @@ -/* $Id: VBoxVgaMiniPortDxe.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxVgaMiniPortDxe.c $ */ /** @file * VBoxVgaMiniPortDxe.c - VgaMiniPort Protocol Implementation. */ diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf index 26132aa2a..7987c5126 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf @@ -1,4 +1,4 @@ -# $Id: VBoxVgaMiniPortDxe.inf 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: VBoxVgaMiniPortDxe.inf $ ## @file # VBoxVgaMiniPortDxe.inf - VgaMiniPort Protocol module declaration. # diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd index 2eeead491..1b11dc228 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd @@ -6,16 +6,16 @@ REM * Environment Setup Script for VBoxPkg + EDK2. REM */
REM /*
-REM Copyright (C) 2009 Oracle Corporation
-REM
-REM This file is part of VirtualBox Open Source Edition (OSE), as
-REM available from http://www.virtualbox.org. This file is free software;
-REM you can redistribute it and/or modify it under the terms of the GNU
-REM General Public License (GPL) as published by the Free Software
-REM Foundation, in version 2 as it comes in the "COPYING" file of the
-REM VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-REM hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-REM
+REM Copyright (C) 2009 Oracle Corporation +REM +REM This file is part of VirtualBox Open Source Edition (OSE), as +REM available from http://www.virtualbox.org. This file is free software; +REM you can redistribute it and/or modify it under the terms of the GNU +REM General Public License (GPL) as published by the Free Software +REM Foundation, in version 2 as it comes in the "COPYING" file of the +REM VirtualBox OSE distribution. VirtualBox OSE is distributed in the +REM hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +REM REM */
rem
diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.sh b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.sh index 1c85a744f..eab8a9081 100755 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.sh +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.sh @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: env.sh 30101 2010-06-09 09:48:56Z vboxsync $ +# $Id: env.sh $ # @file # Environmental Setup Script for VBoxPkg + EDK2. diff --git a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd Binary files differindex e8f687c39..d1651bf77 100644 --- a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd +++ b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd diff --git a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd Binary files differindex 22cce5633..5ae0aac6e 100644 --- a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd +++ b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd diff --git a/src/VBox/Devices/EFI/Thunk/EfiThunk.asm b/src/VBox/Devices/EFI/Thunk/EfiThunk.asm index 6e7157b74..84bd0a8ed 100644 --- a/src/VBox/Devices/EFI/Thunk/EfiThunk.asm +++ b/src/VBox/Devices/EFI/Thunk/EfiThunk.asm @@ -1,4 +1,4 @@ -; $Id: EfiThunk.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: EfiThunk.asm $ ;; @file ; 16-bit EFI Thunk - 16-bit code executed immediately after CPU startup/reset, ; performs minimal setup, switches CPU to 32-bit mode diff --git a/src/VBox/Devices/EFI/Thunk/Makefile.kmk b/src/VBox/Devices/EFI/Thunk/Makefile.kmk index 77b9bb3ac..e49574211 100644 --- a/src/VBox/Devices/EFI/Thunk/Makefile.kmk +++ b/src/VBox/Devices/EFI/Thunk/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for EFI thunking ROM image. # diff --git a/src/VBox/Devices/Graphics/BIOS/Makefile.kmk b/src/VBox/Devices/Graphics/BIOS/Makefile.kmk index 38f89c7b2..73385fbd6 100644 --- a/src/VBox/Devices/Graphics/BIOS/Makefile.kmk +++ b/src/VBox/Devices/Graphics/BIOS/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 35440 2011-01-09 23:43:10Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # VGA BIOS Sub-Makefile # diff --git a/src/VBox/Devices/Graphics/BIOS/dataseghack b/src/VBox/Devices/Graphics/BIOS/dataseghack index 02a2d4c52..02a2d4c52 100644..100755 --- a/src/VBox/Devices/Graphics/BIOS/dataseghack +++ b/src/VBox/Devices/Graphics/BIOS/dataseghack diff --git a/src/VBox/Devices/Graphics/DevVGA.cpp b/src/VBox/Devices/Graphics/DevVGA.cpp index 4339ca7f8..b61a59127 100644 --- a/src/VBox/Devices/Graphics/DevVGA.cpp +++ b/src/VBox/Devices/Graphics/DevVGA.cpp @@ -1,4 +1,4 @@ -/* $Id: DevVGA.cpp 37770 2011-07-04 17:43:06Z vboxsync $ */ +/* $Id: DevVGA.cpp $ */ /** @file * DevVGA - VBox VGA/VESA device. */ diff --git a/src/VBox/Devices/Graphics/DevVGA.h b/src/VBox/Devices/Graphics/DevVGA.h index 6ca11f0df..365f50877 100644 --- a/src/VBox/Devices/Graphics/DevVGA.h +++ b/src/VBox/Devices/Graphics/DevVGA.h @@ -1,4 +1,4 @@ -/* $Id: DevVGA.h 36899 2011-04-29 15:52:47Z vboxsync $ */ +/* $Id: DevVGA.h $ */ /** @file * DevVGA - VBox VGA/VESA device, internal header. */ diff --git a/src/VBox/Devices/Graphics/DevVGAModes.h b/src/VBox/Devices/Graphics/DevVGAModes.h index 72bc923cb..f03f7e7e6 100644 --- a/src/VBox/Devices/Graphics/DevVGAModes.h +++ b/src/VBox/Devices/Graphics/DevVGAModes.h @@ -1,4 +1,4 @@ -/* $Id: DevVGAModes.h 34399 2010-11-26 16:30:44Z vboxsync $ */ +/* $Id: DevVGAModes.h $ */ /** @file * DevVGA - VBox VGA/VESA device, VBE modes. * diff --git a/src/VBox/Devices/Graphics/DevVGASavedState.h b/src/VBox/Devices/Graphics/DevVGASavedState.h index 5af682610..6c4067d14 100644 --- a/src/VBox/Devices/Graphics/DevVGASavedState.h +++ b/src/VBox/Devices/Graphics/DevVGASavedState.h @@ -1,4 +1,4 @@ -/* $Id: DevVGASavedState.h 37770 2011-07-04 17:43:06Z vboxsync $ */ +/* $Id: DevVGASavedState.h $ */ /** @file * DevVGA - Saved state versions. * diff --git a/src/VBox/Devices/Graphics/DevVGATmpl.h b/src/VBox/Devices/Graphics/DevVGATmpl.h index 620731c7f..8d6268db1 100644 --- a/src/VBox/Devices/Graphics/DevVGATmpl.h +++ b/src/VBox/Devices/Graphics/DevVGATmpl.h @@ -1,4 +1,4 @@ -/* $Id: DevVGATmpl.h 34024 2010-11-12 09:47:37Z vboxsync $ */ +/* $Id: DevVGATmpl.h $ */ /** @file * DevVGA - VBox VGA/VESA device, code templates. */ diff --git a/src/VBox/Devices/Input/DevPS2.cpp b/src/VBox/Devices/Input/DevPS2.cpp index 8c830b042..b25232897 100644 --- a/src/VBox/Devices/Input/DevPS2.cpp +++ b/src/VBox/Devices/Input/DevPS2.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPS2.cpp 38454 2011-08-15 09:15:47Z vboxsync $ */ +/* $Id: DevPS2.cpp $ */ /** @file * DevPS2 - PS/2 keyboard & mouse controller device. */ diff --git a/src/VBox/Devices/Input/DrvKeyboardQueue.cpp b/src/VBox/Devices/Input/DrvKeyboardQueue.cpp index 1fe7e8479..449744dac 100644 --- a/src/VBox/Devices/Input/DrvKeyboardQueue.cpp +++ b/src/VBox/Devices/Input/DrvKeyboardQueue.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvKeyboardQueue.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvKeyboardQueue.cpp $ */ /** @file * VBox input devices: Keyboard queue driver */ diff --git a/src/VBox/Devices/Input/DrvMouseQueue.cpp b/src/VBox/Devices/Input/DrvMouseQueue.cpp index ed1689b18..f63fdfe1d 100644 --- a/src/VBox/Devices/Input/DrvMouseQueue.cpp +++ b/src/VBox/Devices/Input/DrvMouseQueue.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvMouseQueue.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvMouseQueue.cpp $ */ /** @file * VBox input devices: Mouse queue driver */ diff --git a/src/VBox/Devices/Input/UsbKbd.cpp b/src/VBox/Devices/Input/UsbKbd.cpp index 8f709012c..d9a1fa3ca 100644 --- a/src/VBox/Devices/Input/UsbKbd.cpp +++ b/src/VBox/Devices/Input/UsbKbd.cpp @@ -1,4 +1,4 @@ -/* $Id: UsbKbd.cpp 37795 2011-07-06 10:28:24Z vboxsync $ */ +/* $Id: UsbKbd.cpp $ */ /** @file * UsbKbd - USB Human Interface Device Emulation, Keyboard. */ diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk index 0e70fefac..d294b1076 100644 --- a/src/VBox/Devices/Makefile.kmk +++ b/src/VBox/Devices/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level sub-makefile for the devices, drivers and services. # @@ -719,7 +719,7 @@ if !defined(VBOX_ONLY_EXTPACKS) # Goes on almost to the end of the file. endif if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) - VBoxDDR0_SOURCES += + VBoxDDR0_SOURCES += \ Bus/DevPciRaw.cpp endif @@ -935,15 +935,20 @@ if !defined(VBOX_ONLY_EXTPACKS) # Goes on almost to the end of the file. endif ifdef VBOX_WITH_UDPTUNNEL - Drivers_SOURCES += \ + Drivers_SOURCES += \ Network/DrvUDPTunnel.cpp - Drivers_DEFS += VBOX_WITH_UDPTUNNEL + Drivers_DEFS += VBOX_WITH_UDPTUNNEL endif ifdef VBOX_WITH_VDE - Drivers_SOURCES += \ + Drivers_SOURCES += \ Network/DrvVDE.cpp \ Network/VDEPlug.cpp - Drivers_DEFS += VBOX_WITH_VDE + Drivers_DEFS += VBOX_WITH_VDE + endif + if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) + Drivers_SOURCES += \ + Bus/DrvPciRaw.cpp + Drivers_DEFS += VBOX_WITH_PCI_PASSTHROUGH_IMPL endif # -- OS specific -- @@ -1145,7 +1150,7 @@ if !defined(VBOX_ONLY_EXTPACKS) # Goes on almost to the end of the file. # Ring-0 Services (library, linked into VMMR0.r0) # ServicesR0_TEMPLATE = VBoxR0 - ServicesR0_DEFS = IN_INTNET_R0 IN_RT_R0 $(if $(VBOX_WITH_PCI_PASSTHROUGH_IMPL),IN_PCIRAW_R0,) + ServicesR0_DEFS = IN_INTNET_R0 IN_RT_R0 $(if $(VBOX_WITH_PCI_PASSTHROUGH),IN_PCIRAW_R0,) ServicesR0_SOURCES = \ Network/SrvIntNetR0.cpp \ $(if $(VBOX_WITH_PCI_PASSTHROUGH),Bus/SrvPciRawR0.cpp,) diff --git a/src/VBox/Devices/Network/DevE1000.cpp b/src/VBox/Devices/Network/DevE1000.cpp index 3bee0e4ae..e804f60c6 100644 --- a/src/VBox/Devices/Network/DevE1000.cpp +++ b/src/VBox/Devices/Network/DevE1000.cpp @@ -1,4 +1,4 @@ -/* $Id: DevE1000.cpp 37644 2011-06-27 11:09:36Z vboxsync $ */ +/* $Id: DevE1000.cpp $ */ /** @file * DevE1000 - Intel 82540EM Ethernet Controller Emulation. * diff --git a/src/VBox/Devices/Network/DevE1000Phy.cpp b/src/VBox/Devices/Network/DevE1000Phy.cpp index 76d3e906c..0d8af67a1 100644 --- a/src/VBox/Devices/Network/DevE1000Phy.cpp +++ b/src/VBox/Devices/Network/DevE1000Phy.cpp @@ -1,4 +1,4 @@ -/** $Id: DevE1000Phy.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/** $Id: DevE1000Phy.cpp $ */ /** @file * DevE1000Phy - Intel 82540EM Ethernet Controller Internal PHY Emulation. * diff --git a/src/VBox/Devices/Network/DevE1000Phy.h b/src/VBox/Devices/Network/DevE1000Phy.h index 8fcdee246..a4e6e2aa0 100644 --- a/src/VBox/Devices/Network/DevE1000Phy.h +++ b/src/VBox/Devices/Network/DevE1000Phy.h @@ -1,4 +1,4 @@ -/** $Id: DevE1000Phy.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/** $Id: DevE1000Phy.h $ */ /** @file * DevE1000Phy - Intel 82540EM Ethernet Controller Internal PHY Emulation, Header. */ diff --git a/src/VBox/Devices/Network/DevEEPROM.cpp b/src/VBox/Devices/Network/DevEEPROM.cpp index 001b2f9f8..88272be3e 100644 --- a/src/VBox/Devices/Network/DevEEPROM.cpp +++ b/src/VBox/Devices/Network/DevEEPROM.cpp @@ -1,4 +1,4 @@ -/* $Id: DevEEPROM.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DevEEPROM.cpp $ */ /** @file * DevEEPROM - Microware-compatible 64x16-bit 93C46 EEPROM Emulation. */ diff --git a/src/VBox/Devices/Network/DevEEPROM.h b/src/VBox/Devices/Network/DevEEPROM.h index 3dbb6bad5..20e829406 100644 --- a/src/VBox/Devices/Network/DevEEPROM.h +++ b/src/VBox/Devices/Network/DevEEPROM.h @@ -1,4 +1,4 @@ -/* $Id: DevEEPROM.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: DevEEPROM.h $ */ /** @file * DevEEPROM - Microware-compatible 64x16-bit 93C46 EEPROM Emulation, Header. */ diff --git a/src/VBox/Devices/Network/DevINIP.cpp b/src/VBox/Devices/Network/DevINIP.cpp index ed5e91c68..756bf302e 100644 --- a/src/VBox/Devices/Network/DevINIP.cpp +++ b/src/VBox/Devices/Network/DevINIP.cpp @@ -1,4 +1,4 @@ -/* $Id: DevINIP.cpp 36044 2011-02-21 17:06:48Z vboxsync $ */ +/* $Id: DevINIP.cpp $ */ /** @file * DevINIP - Internal Network IP stack device/service. */ diff --git a/src/VBox/Devices/Network/DevPCNet.cpp b/src/VBox/Devices/Network/DevPCNet.cpp index a9cd7b98a..c0e058a9a 100644 --- a/src/VBox/Devices/Network/DevPCNet.cpp +++ b/src/VBox/Devices/Network/DevPCNet.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPCNet.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: DevPCNet.cpp $ */ /** @file * DevPCNet - AMD PCnet-PCI II / PCnet-FAST III (Am79C970A / Am79C973) Ethernet Controller Emulation. * diff --git a/src/VBox/Devices/Network/DevVirtioNet.cpp b/src/VBox/Devices/Network/DevVirtioNet.cpp index ec7c9fd4a..59487406d 100644 --- a/src/VBox/Devices/Network/DevVirtioNet.cpp +++ b/src/VBox/Devices/Network/DevVirtioNet.cpp @@ -1,4 +1,4 @@ -/* $Id: DevVirtioNet.cpp 37324 2011-06-03 16:28:03Z vboxsync $ */ +/* $Id: DevVirtioNet.cpp $ */ /** @file * DevVirtioNet - Virtio Network Device */ @@ -334,7 +334,7 @@ PDMBOTHCBDECL(uint32_t) vnetGetHostFeatures(void *pvState) | VNET_F_CSUM | VNET_F_HOST_TSO4 | VNET_F_HOST_TSO6 - | VNET_F_HOST_UFO +/* | VNET_F_HOST_UFO UDP fragmentation offloading was broken prior 4.2 (#5846) */ #endif #ifdef VNET_WITH_MERGEABLE_RX_BUFS | VNET_F_MRG_RXBUF diff --git a/src/VBox/Devices/Network/DrvDedicatedNic.cpp b/src/VBox/Devices/Network/DrvDedicatedNic.cpp index 5c789d7cb..0196d30b1 100644 --- a/src/VBox/Devices/Network/DrvDedicatedNic.cpp +++ b/src/VBox/Devices/Network/DrvDedicatedNic.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvDedicatedNic.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvDedicatedNic.cpp $ */ /** @file * DrvDedicatedNic - Experimental network driver for using a dedicated (V)NIC. */ diff --git a/src/VBox/Devices/Network/DrvIntNet.cpp b/src/VBox/Devices/Network/DrvIntNet.cpp index b40cf96e5..5b81661f7 100644 --- a/src/VBox/Devices/Network/DrvIntNet.cpp +++ b/src/VBox/Devices/Network/DrvIntNet.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvIntNet.cpp 37979 2011-07-15 14:04:24Z vboxsync $ */ +/* $Id: DrvIntNet.cpp $ */ /** @file * DrvIntNet - Internal network transport driver. */ diff --git a/src/VBox/Devices/Network/DrvNAT.cpp b/src/VBox/Devices/Network/DrvNAT.cpp index 877cabc1e..26dc75423 100644 --- a/src/VBox/Devices/Network/DrvNAT.cpp +++ b/src/VBox/Devices/Network/DrvNAT.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvNAT.cpp 38111 2011-07-22 06:05:36Z vboxsync $ */ +/* $Id: DrvNAT.cpp $ */ /** @file * DrvNAT - NAT network transport driver. */ diff --git a/src/VBox/Devices/Network/DrvNetSniffer.cpp b/src/VBox/Devices/Network/DrvNetSniffer.cpp index fa371a7e2..48eeb2fe8 100644 --- a/src/VBox/Devices/Network/DrvNetSniffer.cpp +++ b/src/VBox/Devices/Network/DrvNetSniffer.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvNetSniffer.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvNetSniffer.cpp $ */ /** @file * DrvNetSniffer - Network sniffer filter driver. */ diff --git a/src/VBox/Devices/Network/DrvTAP.cpp b/src/VBox/Devices/Network/DrvTAP.cpp index 6bfbe76cc..c08792f33 100644 --- a/src/VBox/Devices/Network/DrvTAP.cpp +++ b/src/VBox/Devices/Network/DrvTAP.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvTAP.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvTAP.cpp $ */ /** @file * DrvTAP - Universal TAP network transport driver. */ diff --git a/src/VBox/Devices/Network/DrvUDPTunnel.cpp b/src/VBox/Devices/Network/DrvUDPTunnel.cpp index 3dce6ae6d..b0dbf1659 100644 --- a/src/VBox/Devices/Network/DrvUDPTunnel.cpp +++ b/src/VBox/Devices/Network/DrvUDPTunnel.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvUDPTunnel.cpp 37259 2011-05-30 13:31:21Z vboxsync $ */ +/* $Id: DrvUDPTunnel.cpp $ */ /** @file * DrvUDPTunnel - UDP tunnel network transport driver * diff --git a/src/VBox/Devices/Network/DrvVDE.cpp b/src/VBox/Devices/Network/DrvVDE.cpp index b09221b65..9ffc45050 100644 --- a/src/VBox/Devices/Network/DrvVDE.cpp +++ b/src/VBox/Devices/Network/DrvVDE.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvVDE.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvVDE.cpp $ */ /** @file * VDE network transport driver. */ diff --git a/src/VBox/Devices/Network/Pcap.cpp b/src/VBox/Devices/Network/Pcap.cpp index 0ab7422a5..2c33563d8 100644 --- a/src/VBox/Devices/Network/Pcap.cpp +++ b/src/VBox/Devices/Network/Pcap.cpp @@ -1,4 +1,4 @@ -/* $Id: Pcap.cpp 37369 2011-06-07 22:32:14Z vboxsync $ */ +/* $Id: Pcap.cpp $ */ /** @file * Helpers for writing libpcap files. */ diff --git a/src/VBox/Devices/Network/Pcap.h b/src/VBox/Devices/Network/Pcap.h index dab0cd2eb..c05b39030 100644 --- a/src/VBox/Devices/Network/Pcap.h +++ b/src/VBox/Devices/Network/Pcap.h @@ -1,4 +1,4 @@ -/* $Id: Pcap.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: Pcap.h $ */ /** @file * Helpers for writing libpcap files. */ diff --git a/src/VBox/Devices/Network/SrvIntNetR0.cpp b/src/VBox/Devices/Network/SrvIntNetR0.cpp index 5c58c3305..08f5d38f0 100644 --- a/src/VBox/Devices/Network/SrvIntNetR0.cpp +++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp @@ -1,4 +1,4 @@ -/* $Id: SrvIntNetR0.cpp 37979 2011-07-15 14:04:24Z vboxsync $ */ +/* $Id: SrvIntNetR0.cpp $ */ /** @file * Internal networking - The ring 0 service. */ diff --git a/src/VBox/Devices/Network/lwip/src/netif/ppp/chap.h b/src/VBox/Devices/Network/lwip/src/netif/ppp/chap.h index 6fd972752..06d1b15f8 100644 --- a/src/VBox/Devices/Network/lwip/src/netif/ppp/chap.h +++ b/src/VBox/Devices/Network/lwip/src/netif/ppp/chap.h @@ -62,7 +62,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: chap.h,v 1.1 2003/05/27 14:37:56 jani Exp $ + * $Id: chap.h $ */ #ifndef CHAP_H diff --git a/src/VBox/Devices/Network/lwip/src/netif/ppp/chpms.h b/src/VBox/Devices/Network/lwip/src/netif/ppp/chpms.h index c58447215..cfb20471c 100644 --- a/src/VBox/Devices/Network/lwip/src/netif/ppp/chpms.h +++ b/src/VBox/Devices/Network/lwip/src/netif/ppp/chpms.h @@ -51,7 +51,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: chpms.h,v 1.3 2004/02/07 00:30:03 likewise Exp $ + * $Id: chpms.h $ */ #ifndef CHPMS_H diff --git a/src/VBox/Devices/Network/lwip/src/netif/ppp/fsm.h b/src/VBox/Devices/Network/lwip/src/netif/ppp/fsm.h index 0e1d9f61a..17bdd4a21 100644 --- a/src/VBox/Devices/Network/lwip/src/netif/ppp/fsm.h +++ b/src/VBox/Devices/Network/lwip/src/netif/ppp/fsm.h @@ -48,7 +48,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: fsm.h,v 1.1 2003/05/27 14:37:56 jani Exp $ + * $Id: fsm.h $ */ #ifndef FSM_H diff --git a/src/VBox/Devices/Network/lwip/src/netif/ppp/ipcp.h b/src/VBox/Devices/Network/lwip/src/netif/ppp/ipcp.h index 416aa79a2..d96c02ec8 100644 --- a/src/VBox/Devices/Network/lwip/src/netif/ppp/ipcp.h +++ b/src/VBox/Devices/Network/lwip/src/netif/ppp/ipcp.h @@ -48,7 +48,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipcp.h,v 1.1 2003/05/27 14:37:56 jani Exp $ + * $Id: ipcp.h $ */ #ifndef IPCP_H diff --git a/src/VBox/Devices/Network/lwip/src/netif/ppp/lcp.h b/src/VBox/Devices/Network/lwip/src/netif/ppp/lcp.h index 3876d39ae..1decc386b 100644 --- a/src/VBox/Devices/Network/lwip/src/netif/ppp/lcp.h +++ b/src/VBox/Devices/Network/lwip/src/netif/ppp/lcp.h @@ -48,7 +48,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: lcp.h,v 1.1 2003/05/27 14:37:56 jani Exp $ + * $Id: lcp.h $ */ #ifndef LCP_H diff --git a/src/VBox/Devices/Network/lwip/src/netif/ppp/magic.h b/src/VBox/Devices/Network/lwip/src/netif/ppp/magic.h index 7574f32b9..54619b7b8 100644 --- a/src/VBox/Devices/Network/lwip/src/netif/ppp/magic.h +++ b/src/VBox/Devices/Network/lwip/src/netif/ppp/magic.h @@ -48,7 +48,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: magic.h,v 1.1 2003/05/27 14:37:56 jani Exp $ + * $Id: magic.h $ */ #ifndef MAGIC_H diff --git a/src/VBox/Devices/Network/lwip/src/netif/ppp/vj.h b/src/VBox/Devices/Network/lwip/src/netif/ppp/vj.h index 717208145..b7374b3f0 100644 --- a/src/VBox/Devices/Network/lwip/src/netif/ppp/vj.h +++ b/src/VBox/Devices/Network/lwip/src/netif/ppp/vj.h @@ -1,7 +1,7 @@ /* * Definitions for tcp compression routines. * - * $Id: vj.h,v 1.4 2004/02/07 00:30:03 likewise Exp $ + * $Id: vj.h $ * * Copyright (c) 1989 Regents of the University of California. * All rights reserved. diff --git a/src/VBox/Devices/Network/lwip/vbox/sys_arch.c b/src/VBox/Devices/Network/lwip/vbox/sys_arch.c index 0f247118f..047ecc2f6 100644 --- a/src/VBox/Devices/Network/lwip/vbox/sys_arch.c +++ b/src/VBox/Devices/Network/lwip/vbox/sys_arch.c @@ -1,4 +1,4 @@ -/** $Id: sys_arch.c 33464 2010-10-26 12:27:50Z vboxsync $ */ +/** $Id: sys_arch.c $ */ /** @file * System dependent parts of lwIP, implemented with IPRT. */ diff --git a/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh b/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh index 5c871dae9..5c871dae9 100644..100755 --- a/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh +++ b/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh diff --git a/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py b/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py index 513b1d608..513b1d608 100644..100755 --- a/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py +++ b/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py diff --git a/src/VBox/Devices/Network/slirp/bootp.c b/src/VBox/Devices/Network/slirp/bootp.c index 27855a2b7..9b6768fec 100644 --- a/src/VBox/Devices/Network/slirp/bootp.c +++ b/src/VBox/Devices/Network/slirp/bootp.c @@ -1,4 +1,4 @@ -/* $Id: bootp.c 37746 2011-07-04 06:07:37Z vboxsync $ */ +/* $Id: bootp.c $ */ /** @file * NAT - BOOTP/DHCP server emulation. */ diff --git a/src/VBox/Devices/Network/slirp/bootp.h b/src/VBox/Devices/Network/slirp/bootp.h index 7c2e3b869..1ffa3a5dd 100644 --- a/src/VBox/Devices/Network/slirp/bootp.h +++ b/src/VBox/Devices/Network/slirp/bootp.h @@ -1,4 +1,4 @@ -/* $Id: bootp.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: bootp.h $ */ /** @file * NAT - BOOTP/DHCP server emulation (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/cksum.c b/src/VBox/Devices/Network/slirp/cksum.c index 0cfb94c02..8e2cbd78a 100644 --- a/src/VBox/Devices/Network/slirp/cksum.c +++ b/src/VBox/Devices/Network/slirp/cksum.c @@ -1,4 +1,4 @@ -/* $Id: cksum.c 34103 2010-11-16 11:18:55Z vboxsync $ */ +/* $Id: cksum.c $ */ /** @file * NAT - IP checksum generation. */ diff --git a/src/VBox/Devices/Network/slirp/counters.h b/src/VBox/Devices/Network/slirp/counters.h index 9f0f9a169..14f353b41 100644 --- a/src/VBox/Devices/Network/slirp/counters.h +++ b/src/VBox/Devices/Network/slirp/counters.h @@ -1,4 +1,4 @@ -/** $Id: counters.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/** $Id: counters.h $ */ /** @file * Counters macro invocation template. * diff --git a/src/VBox/Devices/Network/slirp/ctl.h b/src/VBox/Devices/Network/slirp/ctl.h index fae638af7..172b0c075 100644 --- a/src/VBox/Devices/Network/slirp/ctl.h +++ b/src/VBox/Devices/Network/slirp/ctl.h @@ -1,4 +1,4 @@ -/* $Id: ctl.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ctl.h $ */ /** @file * NAT - IP subnet constants. */ diff --git a/src/VBox/Devices/Network/slirp/debug.c b/src/VBox/Devices/Network/slirp/debug.c index 512145fe0..132ed3a01 100644 --- a/src/VBox/Devices/Network/slirp/debug.c +++ b/src/VBox/Devices/Network/slirp/debug.c @@ -1,4 +1,4 @@ -/* $Id: debug.c 37938 2011-07-14 04:28:46Z vboxsync $ */ +/* $Id: debug.c $ */ /** @file * NAT - debug helpers. */ diff --git a/src/VBox/Devices/Network/slirp/debug.h b/src/VBox/Devices/Network/slirp/debug.h index cf7fd581d..4663e9697 100644 --- a/src/VBox/Devices/Network/slirp/debug.h +++ b/src/VBox/Devices/Network/slirp/debug.h @@ -1,4 +1,4 @@ -/* $Id: debug.h 37738 2011-07-03 11:41:17Z vboxsync $ */ +/* $Id: debug.h $ */ /** @file * NAT - debug helpers (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c b/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c index e8efbaee1..aacb4e251 100644 --- a/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c +++ b/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c @@ -1,4 +1,4 @@ -/* $Id: dnsproxy.c 37746 2011-07-04 06:07:37Z vboxsync $ */ +/* $Id: dnsproxy.c $ */ /* * Copyright (c) 2003,2004,2005 Armin Wolfermann * diff --git a/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.h b/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.h index 24a3b3aa9..9d9df8515 100644 --- a/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.h +++ b/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.h @@ -1,4 +1,4 @@ -/* $Id: dnsproxy.h 26495 2010-02-14 07:59:48Z vboxsync $ */ +/* $Id: dnsproxy.h $ */ /* * Copyright (c) 2003,2004,2005 Armin Wolfermann * diff --git a/src/VBox/Devices/Network/slirp/dnsproxy/hash.c b/src/VBox/Devices/Network/slirp/dnsproxy/hash.c index f22ad1f9e..0d007d05a 100644 --- a/src/VBox/Devices/Network/slirp/dnsproxy/hash.c +++ b/src/VBox/Devices/Network/slirp/dnsproxy/hash.c @@ -1,4 +1,4 @@ -/* $Id: hash.c 18815 2009-04-07 12:34:27Z vboxsync $ */ +/* $Id: hash.c $ */ /* * Copyright (c) 2003,2004 Armin Wolfermann * diff --git a/src/VBox/Devices/Network/slirp/ext.h b/src/VBox/Devices/Network/slirp/ext.h index 53be7f25c..b1812b874 100644 --- a/src/VBox/Devices/Network/slirp/ext.h +++ b/src/VBox/Devices/Network/slirp/ext.h @@ -1,4 +1,4 @@ -/** $Id: ext.h 30016 2010-06-03 18:31:14Z vboxsync $ */ +/** $Id: ext.h $ */ /** @file * NAT - some externals helpers */ diff --git a/src/VBox/Devices/Network/slirp/icmp_var.h b/src/VBox/Devices/Network/slirp/icmp_var.h index adfc45d56..829182bec 100644 --- a/src/VBox/Devices/Network/slirp/icmp_var.h +++ b/src/VBox/Devices/Network/slirp/icmp_var.h @@ -1,4 +1,4 @@ -/* $Id: icmp_var.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: icmp_var.h $ */ /** @file * NAT - ICMP handling (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/if.h b/src/VBox/Devices/Network/slirp/if.h index aa37c2104..08cb4ea16 100644 --- a/src/VBox/Devices/Network/slirp/if.h +++ b/src/VBox/Devices/Network/slirp/if.h @@ -1,4 +1,4 @@ -/* $Id: if.h 30016 2010-06-03 18:31:14Z vboxsync $ */ +/* $Id: if.h $ */ /** @file * NAT - if_*. */ diff --git a/src/VBox/Devices/Network/slirp/ip.h b/src/VBox/Devices/Network/slirp/ip.h index 985df9d92..1d1880296 100644 --- a/src/VBox/Devices/Network/slirp/ip.h +++ b/src/VBox/Devices/Network/slirp/ip.h @@ -1,4 +1,4 @@ -/* $Id: ip.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ip.h $ */ /** @file * NAT - IP handling (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/ip_icmp.c b/src/VBox/Devices/Network/slirp/ip_icmp.c index c5029723c..21c1f5f9d 100644 --- a/src/VBox/Devices/Network/slirp/ip_icmp.c +++ b/src/VBox/Devices/Network/slirp/ip_icmp.c @@ -1,4 +1,4 @@ -/* $Id: ip_icmp.c 37936 2011-07-14 03:54:41Z vboxsync $ */ +/* $Id: ip_icmp.c $ */ /** @file * NAT - IP/ICMP handling. */ diff --git a/src/VBox/Devices/Network/slirp/ip_icmp.h b/src/VBox/Devices/Network/slirp/ip_icmp.h index 46bb2c8b9..b165ba5b5 100644 --- a/src/VBox/Devices/Network/slirp/ip_icmp.h +++ b/src/VBox/Devices/Network/slirp/ip_icmp.h @@ -1,4 +1,4 @@ -/* $Id: ip_icmp.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ip_icmp.h $ */ /** @file * NAT - IP/ICMP handling (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/ip_input.c b/src/VBox/Devices/Network/slirp/ip_input.c index 27bc598ae..5069d200c 100644 --- a/src/VBox/Devices/Network/slirp/ip_input.c +++ b/src/VBox/Devices/Network/slirp/ip_input.c @@ -1,4 +1,4 @@ -/* $Id: ip_input.c 37936 2011-07-14 03:54:41Z vboxsync $ */ +/* $Id: ip_input.c $ */ /** @file * NAT - IP input. */ diff --git a/src/VBox/Devices/Network/slirp/ip_output.c b/src/VBox/Devices/Network/slirp/ip_output.c index 397967bf1..62a2c4afd 100644 --- a/src/VBox/Devices/Network/slirp/ip_output.c +++ b/src/VBox/Devices/Network/slirp/ip_output.c @@ -1,4 +1,4 @@ -/* $Id: ip_output.c 38110 2011-07-22 04:52:59Z vboxsync $ */ +/* $Id: ip_output.c $ */ /** @file * NAT - IP output. */ diff --git a/src/VBox/Devices/Network/slirp/libalias/alias_dns.c b/src/VBox/Devices/Network/slirp/libalias/alias_dns.c index fe6bd0c68..194779957 100644 --- a/src/VBox/Devices/Network/slirp/libalias/alias_dns.c +++ b/src/VBox/Devices/Network/slirp/libalias/alias_dns.c @@ -1,4 +1,4 @@ -/* $Id: alias_dns.c 37746 2011-07-04 06:07:37Z vboxsync $ */ +/* $Id: alias_dns.c $ */ /** @file * libalias helper for using the host resolver instead of dnsproxy. */ diff --git a/src/VBox/Devices/Network/slirp/libslirp.h b/src/VBox/Devices/Network/slirp/libslirp.h index 472ade93a..1f5bd387b 100644 --- a/src/VBox/Devices/Network/slirp/libslirp.h +++ b/src/VBox/Devices/Network/slirp/libslirp.h @@ -1,4 +1,4 @@ -/* $Id: libslirp.h 38111 2011-07-22 06:05:36Z vboxsync $ */ +/* $Id: libslirp.h $ */ /** @file * NAT - slirp interface. */ diff --git a/src/VBox/Devices/Network/slirp/main.h b/src/VBox/Devices/Network/slirp/main.h index e1f72a91b..52f292462 100644 --- a/src/VBox/Devices/Network/slirp/main.h +++ b/src/VBox/Devices/Network/slirp/main.h @@ -1,4 +1,4 @@ -/* $Id: main.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: main.h $ */ /** @file * NAT - main. */ diff --git a/src/VBox/Devices/Network/slirp/misc.c b/src/VBox/Devices/Network/slirp/misc.c index dc55472fa..27e5d407e 100644 --- a/src/VBox/Devices/Network/slirp/misc.c +++ b/src/VBox/Devices/Network/slirp/misc.c @@ -1,4 +1,4 @@ -/* $Id: misc.c 35957 2011-02-14 12:27:21Z vboxsync $ */ +/* $Id: misc.c $ */ /** @file * NAT - helpers. */ diff --git a/src/VBox/Devices/Network/slirp/misc.h b/src/VBox/Devices/Network/slirp/misc.h index 95d464f19..2d5b8d2f5 100644 --- a/src/VBox/Devices/Network/slirp/misc.h +++ b/src/VBox/Devices/Network/slirp/misc.h @@ -1,4 +1,4 @@ -/* $Id: misc.h 30016 2010-06-03 18:31:14Z vboxsync $ */ +/* $Id: misc.h $ */ /** @file * NAT - helpers (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/queue.h b/src/VBox/Devices/Network/slirp/queue.h index 7f99f7a31..20535faba 100644 --- a/src/VBox/Devices/Network/slirp/queue.h +++ b/src/VBox/Devices/Network/slirp/queue.h @@ -1,4 +1,4 @@ -/* $Id: queue.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: queue.h $ */ /** @file * NAT - Queue handling. */ diff --git a/src/VBox/Devices/Network/slirp/sbuf.c b/src/VBox/Devices/Network/slirp/sbuf.c index 41a8d0be9..fadb7fb8e 100644 --- a/src/VBox/Devices/Network/slirp/sbuf.c +++ b/src/VBox/Devices/Network/slirp/sbuf.c @@ -1,4 +1,4 @@ -/* $Id: sbuf.c 37936 2011-07-14 03:54:41Z vboxsync $ */ +/* $Id: sbuf.c $ */ /** @file * NAT - sbuf implemenation. */ diff --git a/src/VBox/Devices/Network/slirp/sbuf.h b/src/VBox/Devices/Network/slirp/sbuf.h index 178c72eb1..9035d3371 100644 --- a/src/VBox/Devices/Network/slirp/sbuf.h +++ b/src/VBox/Devices/Network/slirp/sbuf.h @@ -1,4 +1,4 @@ -/* $Id: sbuf.h 30045 2010-06-04 20:38:56Z vboxsync $ */ +/* $Id: sbuf.h $ */ /** @file * NAT - sbuf declarations/defines. */ diff --git a/src/VBox/Devices/Network/slirp/slirp.c b/src/VBox/Devices/Network/slirp/slirp.c index fa679047c..9c5dfeae6 100644 --- a/src/VBox/Devices/Network/slirp/slirp.c +++ b/src/VBox/Devices/Network/slirp/slirp.c @@ -1,4 +1,4 @@ -/* $Id: slirp.c 38170 2011-07-26 04:50:31Z vboxsync $ */ +/* $Id: slirp.c $ */ /** @file * NAT - slirp glue. */ diff --git a/src/VBox/Devices/Network/slirp/slirp.h b/src/VBox/Devices/Network/slirp/slirp.h index e8c82b864..26ff00790 100644 --- a/src/VBox/Devices/Network/slirp/slirp.h +++ b/src/VBox/Devices/Network/slirp/slirp.h @@ -1,4 +1,4 @@ -/* $Id: slirp.h 36901 2011-04-29 18:03:48Z vboxsync $ */ +/* $Id: slirp.h $ */ /** @file * NAT - slirp (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/slirp_config.h b/src/VBox/Devices/Network/slirp/slirp_config.h index 390eed449..481bc87db 100644 --- a/src/VBox/Devices/Network/slirp/slirp_config.h +++ b/src/VBox/Devices/Network/slirp/slirp_config.h @@ -1,4 +1,4 @@ -/* $Id: slirp_config.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: slirp_config.h $ */ /** @file * NAT - compile-time configuration. */ diff --git a/src/VBox/Devices/Network/slirp/socket.c b/src/VBox/Devices/Network/slirp/socket.c index 76e11b757..5a77a1c68 100644 --- a/src/VBox/Devices/Network/slirp/socket.c +++ b/src/VBox/Devices/Network/slirp/socket.c @@ -1,4 +1,4 @@ -/* $Id: socket.c 38402 2011-08-10 14:30:29Z vboxsync $ */ +/* $Id: socket.c $ */ /** @file * NAT - socket handling. */ diff --git a/src/VBox/Devices/Network/slirp/socket.h b/src/VBox/Devices/Network/slirp/socket.h index 3631ec4d5..15bea049f 100644 --- a/src/VBox/Devices/Network/slirp/socket.h +++ b/src/VBox/Devices/Network/slirp/socket.h @@ -1,4 +1,4 @@ -/* $Id: socket.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: socket.h $ */ /** @file * NAT - socket handling (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/tcp.h b/src/VBox/Devices/Network/slirp/tcp.h index d86772ffa..71fb70dbc 100644 --- a/src/VBox/Devices/Network/slirp/tcp.h +++ b/src/VBox/Devices/Network/slirp/tcp.h @@ -1,4 +1,4 @@ -/* $Id: tcp.h 30016 2010-06-03 18:31:14Z vboxsync $ */ +/* $Id: tcp.h $ */ /** @file * NAT - TCP. */ diff --git a/src/VBox/Devices/Network/slirp/tcp_input.c b/src/VBox/Devices/Network/slirp/tcp_input.c index 9373e68f7..67cd1447c 100644 --- a/src/VBox/Devices/Network/slirp/tcp_input.c +++ b/src/VBox/Devices/Network/slirp/tcp_input.c @@ -1,4 +1,4 @@ -/* $Id: tcp_input.c 37936 2011-07-14 03:54:41Z vboxsync $ */ +/* $Id: tcp_input.c $ */ /** @file * NAT - TCP input. */ diff --git a/src/VBox/Devices/Network/slirp/tcp_output.c b/src/VBox/Devices/Network/slirp/tcp_output.c index a6e268686..c3c0bb975 100644 --- a/src/VBox/Devices/Network/slirp/tcp_output.c +++ b/src/VBox/Devices/Network/slirp/tcp_output.c @@ -1,4 +1,4 @@ -/* $Id: tcp_output.c 38110 2011-07-22 04:52:59Z vboxsync $ */ +/* $Id: tcp_output.c $ */ /** @file * NAT - TCP output. */ diff --git a/src/VBox/Devices/Network/slirp/tcp_subr.c b/src/VBox/Devices/Network/slirp/tcp_subr.c index 222dc13d9..6a389fe2e 100644 --- a/src/VBox/Devices/Network/slirp/tcp_subr.c +++ b/src/VBox/Devices/Network/slirp/tcp_subr.c @@ -1,4 +1,4 @@ -/* $Id: tcp_subr.c 37936 2011-07-14 03:54:41Z vboxsync $ */ +/* $Id: tcp_subr.c $ */ /** @file * NAT - TCP support. */ diff --git a/src/VBox/Devices/Network/slirp/tcp_timer.c b/src/VBox/Devices/Network/slirp/tcp_timer.c index 542808fef..f1f015c69 100644 --- a/src/VBox/Devices/Network/slirp/tcp_timer.c +++ b/src/VBox/Devices/Network/slirp/tcp_timer.c @@ -1,4 +1,4 @@ -/* $Id: tcp_timer.c 37936 2011-07-14 03:54:41Z vboxsync $ */ +/* $Id: tcp_timer.c $ */ /** @file * NAT - TCP timers. */ diff --git a/src/VBox/Devices/Network/slirp/tcp_timer.h b/src/VBox/Devices/Network/slirp/tcp_timer.h index 91aab640d..8e162325f 100644 --- a/src/VBox/Devices/Network/slirp/tcp_timer.h +++ b/src/VBox/Devices/Network/slirp/tcp_timer.h @@ -1,4 +1,4 @@ -/* $Id: tcp_timer.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tcp_timer.h $ */ /** @file * NAT - TCP timer (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/tcp_var.h b/src/VBox/Devices/Network/slirp/tcp_var.h index c3d19ca41..5c24ad1e5 100644 --- a/src/VBox/Devices/Network/slirp/tcp_var.h +++ b/src/VBox/Devices/Network/slirp/tcp_var.h @@ -1,4 +1,4 @@ -/* $Id: tcp_var.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tcp_var.h $ */ /** @file * NAT - TCP (declarations). */ diff --git a/src/VBox/Devices/Network/slirp/tcpip.h b/src/VBox/Devices/Network/slirp/tcpip.h index d73942b60..e9b8e1680 100644 --- a/src/VBox/Devices/Network/slirp/tcpip.h +++ b/src/VBox/Devices/Network/slirp/tcpip.h @@ -1,4 +1,4 @@ -/* $Id: tcpip.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tcpip.h $ */ /** @file * NAT - TCP/IP (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/tftp.c b/src/VBox/Devices/Network/slirp/tftp.c index cb3560b96..8b77bf0c6 100644 --- a/src/VBox/Devices/Network/slirp/tftp.c +++ b/src/VBox/Devices/Network/slirp/tftp.c @@ -1,4 +1,4 @@ -/* $Id: tftp.c 36901 2011-04-29 18:03:48Z vboxsync $ */ +/* $Id: tftp.c $ */ /** @file * NAT - TFTP server. */ diff --git a/src/VBox/Devices/Network/slirp/tftp.h b/src/VBox/Devices/Network/slirp/tftp.h index 44889624c..6fb0ef7a1 100644 --- a/src/VBox/Devices/Network/slirp/tftp.h +++ b/src/VBox/Devices/Network/slirp/tftp.h @@ -1,4 +1,4 @@ -/* $Id: tftp.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tftp.h $ */ /** @file * NAT - TFTP server (declarations/defines). */ diff --git a/src/VBox/Devices/Network/slirp/udp.c b/src/VBox/Devices/Network/slirp/udp.c index 8d437d849..1e15dc45f 100644 --- a/src/VBox/Devices/Network/slirp/udp.c +++ b/src/VBox/Devices/Network/slirp/udp.c @@ -1,4 +1,4 @@ -/* $Id: udp.c 38345 2011-08-08 10:53:27Z vboxsync $ */ +/* $Id: udp.c $ */ /** @file * NAT - UDP protocol. */ diff --git a/src/VBox/Devices/Network/slirp/udp.h b/src/VBox/Devices/Network/slirp/udp.h index 66ad62eea..fb1c76a37 100644 --- a/src/VBox/Devices/Network/slirp/udp.h +++ b/src/VBox/Devices/Network/slirp/udp.h @@ -1,4 +1,4 @@ -/* $Id: udp.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: udp.h $ */ /** @file * NAT - UDP protocol (declarations/defines). */ diff --git a/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp b/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp index 2b47a4b97..568dfeead 100644 --- a/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp +++ b/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp @@ -1,4 +1,4 @@ -/** $Id: vbox-libdlpi.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/** $Id: vbox-libdlpi.cpp $ */ /** @file * Dynamically load libdpli & symbols on Solaris hosts, Internal header. */ diff --git a/src/VBox/Devices/Network/solaris/vbox-libdlpi.h b/src/VBox/Devices/Network/solaris/vbox-libdlpi.h index 0d8ca42bb..1707605b8 100644 --- a/src/VBox/Devices/Network/solaris/vbox-libdlpi.h +++ b/src/VBox/Devices/Network/solaris/vbox-libdlpi.h @@ -1,4 +1,4 @@ -/** $Id: vbox-libdlpi.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/** $Id: vbox-libdlpi.h $ */ /** @file * Dynamically load libdpli & symbols on Solaris hosts, Internal header. */ diff --git a/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp b/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp index ca0b23475..ebec4d9c6 100644 --- a/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp +++ b/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDevEEPROM.cpp 31885 2010-08-24 07:22:23Z vboxsync $ */ +/* $Id: tstDevEEPROM.cpp $ */ /** @file * EEPROM 93C46 unit tests. */ diff --git a/src/VBox/Devices/Network/testcase/tstDevPhy.cpp b/src/VBox/Devices/Network/testcase/tstDevPhy.cpp index a0ea07092..b6393beab 100644 --- a/src/VBox/Devices/Network/testcase/tstDevPhy.cpp +++ b/src/VBox/Devices/Network/testcase/tstDevPhy.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDevPhy.cpp 31885 2010-08-24 07:22:23Z vboxsync $ */ +/* $Id: tstDevPhy.cpp $ */ /** @file * PHY MDIO unit tests. */ diff --git a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp index 851eb3e0a..34126865c 100644 --- a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp +++ b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIntNet-1.cpp 36470 2011-03-30 09:36:09Z vboxsync $ */ +/* $Id: tstIntNet-1.cpp $ */ /** @file * VBox - Testcase for internal networking, simple NetFlt trunk creation. */ @@ -749,7 +749,7 @@ int main(int argc, char **argv) return 1; case 'V': - RTPrintf("$Revision: 36470 $\n"); + RTPrintf("$Revision: 70854 $\n"); return 0; default: diff --git a/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp b/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp index a9b2e8b02..6d982f59a 100644 --- a/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp +++ b/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIntNetR0.cpp 33595 2010-10-29 10:35:00Z vboxsync $ */ +/* $Id: tstIntNetR0.cpp $ */ /** @file * Internal networking - Usermode testcase for the kernel mode bits. * diff --git a/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp b/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp index c4aa304d0..3f961b71e 100644 --- a/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp +++ b/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxAcpi.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxAcpi.cpp $ */ /** @file * VBoxAcpi - VirtualBox ACPI manipulation functionality. */ diff --git a/src/VBox/Devices/PC/BIOS/Makefile.kmk b/src/VBox/Devices/PC/BIOS/Makefile.kmk index e979f3287..1fda552db 100644 --- a/src/VBox/Devices/PC/BIOS/Makefile.kmk +++ b/src/VBox/Devices/PC/BIOS/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 36877 2011-04-28 19:38:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # PC BIOS Sub-Makefile. # diff --git a/src/VBox/Devices/PC/BIOS/ahci.c b/src/VBox/Devices/PC/BIOS/ahci.c index 24e632d91..33167d9f9 100644 --- a/src/VBox/Devices/PC/BIOS/ahci.c +++ b/src/VBox/Devices/PC/BIOS/ahci.c @@ -1,4 +1,4 @@ -/* $Id: ahci.c 37427 2011-06-13 17:45:37Z vboxsync $ */ +/* $Id: ahci.c $ */ /** @file * AHCI host adapter driver to boot from SATA disks. */ diff --git a/src/VBox/Devices/PC/BIOS/logo.c b/src/VBox/Devices/PC/BIOS/logo.c index afc1bdd15..1bace9174 100644 --- a/src/VBox/Devices/PC/BIOS/logo.c +++ b/src/VBox/Devices/PC/BIOS/logo.c @@ -1,4 +1,4 @@ -/* $Id: logo.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: logo.c $ */ /** @file * Stuff for drawing the BIOS logo. */ diff --git a/src/VBox/Devices/PC/BIOS/rombios.c b/src/VBox/Devices/PC/BIOS/rombios.c index 44b2e4b91..f1d7ba214 100644 --- a/src/VBox/Devices/PC/BIOS/rombios.c +++ b/src/VBox/Devices/PC/BIOS/rombios.c @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: rombios.c,v 1.176 2006/12/30 17:13:17 vruppert Exp $ +// $Id: rombios.c $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -11317,10 +11317,15 @@ rom_scan_increment: #define LVT0 0xFEE00350 #define LVT1 0xFEE00360 -;; Program LVT0/LVT1 entries in the local APIC. Some Linux kernels (e.g., RHEL4 -;; SMP 32-bit) expect the entries to be unmasked in virtual wire mode. +;; Run initialization steps which must be performed in protected mode. +;; - Program LVT0/LVT1 entries in the local APIC. Some Linux kernels (e.g., RHEL4 +;; SMP 32-bit) expect the entries to be unmasked in virtual wire mode. +;; - Clear the CD and NW bits in CR0; these are not relevant (except possibly +;; under AMD-V with nested paging) but the guest should see the right state. -setup_lapic: +pmode_setup: + push eax + push esi pushf cli ;; Interrupts would kill us! call pmode_enter @@ -11334,8 +11339,13 @@ setup_lapic: and eax, #0xfffe00ff or ah, #0x04 mov [esi], eax + mov eax, cr0 ;; Clear CR0.CD and CR0.NW + and eax, #0x9fffffff + mov cr0, eax call pmode_exit popf + pop esi + pop eax ret ;; Enter and exit minimal protected-mode environment. May only be called from @@ -11465,7 +11475,7 @@ normal_post: ; case 0: normal startup cli - mov ax, #0xfffe + mov ax, #0x7C00 mov sp, ax xor ax, ax mov ds, ax @@ -11517,6 +11527,8 @@ memory_cleared: call _log_bios_start + call pmode_setup + ;; set all interrupts to default handler xor bx, bx ;; offset index mov cx, #0x0100 ;; counter (256 interrupts) @@ -11711,7 +11723,6 @@ post_default_ints: call pcibios_init_iomem_bases call pcibios_init_irqs #endif - call setup_lapic call rom_scan #if BX_USE_ATADRV diff --git a/src/VBox/Devices/PC/BIOS/scsi.c b/src/VBox/Devices/PC/BIOS/scsi.c index 0d16601c2..4b6e8bbda 100644 --- a/src/VBox/Devices/PC/BIOS/scsi.c +++ b/src/VBox/Devices/PC/BIOS/scsi.c @@ -1,4 +1,4 @@ -/* $Id: scsi.c 37427 2011-06-13 17:45:37Z vboxsync $ */ +/* $Id: scsi.c $ */ /** @file * SCSI host adapter driver to boot from SCSI disks */ diff --git a/src/VBox/Devices/PC/DevACPI.cpp b/src/VBox/Devices/PC/DevACPI.cpp index b20915635..7c197c7da 100644 --- a/src/VBox/Devices/PC/DevACPI.cpp +++ b/src/VBox/Devices/PC/DevACPI.cpp @@ -1,4 +1,4 @@ -/* $Id: DevACPI.cpp 37526 2011-06-17 10:17:38Z vboxsync $ */ +/* $Id: DevACPI.cpp $ */ /** @file * DevACPI - Advanced Configuration and Power Interface (ACPI) Device. */ diff --git a/src/VBox/Devices/PC/DevAPIC.cpp b/src/VBox/Devices/PC/DevAPIC.cpp index b1ff50975..75e9e1798 100644 --- a/src/VBox/Devices/PC/DevAPIC.cpp +++ b/src/VBox/Devices/PC/DevAPIC.cpp @@ -1,4 +1,4 @@ -/* $Id: DevAPIC.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: DevAPIC.cpp $ */ /** @file * Advanced Programmable Interrupt Controller (APIC) Device and * I/O Advanced Programmable Interrupt Controller (IO-APIC) Device. diff --git a/src/VBox/Devices/PC/DevApic.h b/src/VBox/Devices/PC/DevApic.h index 9a87d5fcf..7e245b300 100644 --- a/src/VBox/Devices/PC/DevApic.h +++ b/src/VBox/Devices/PC/DevApic.h @@ -1,4 +1,4 @@ -/* $Id: DevApic.h 37481 2011-06-15 18:59:27Z vboxsync $ */ +/* $Id: DevApic.h $ */ /** @file * Advanced Programmable Interrupt Controller (APIC) Device Definitions. */ diff --git a/src/VBox/Devices/PC/DevDMA.cpp b/src/VBox/Devices/PC/DevDMA.cpp index bbfcd78e3..ebcefdd5b 100644 --- a/src/VBox/Devices/PC/DevDMA.cpp +++ b/src/VBox/Devices/PC/DevDMA.cpp @@ -1,4 +1,4 @@ -/* $Id: DevDMA.cpp 38221 2011-07-28 14:11:14Z vboxsync $ */ +/* $Id: DevDMA.cpp $ */ /** @file * DevDMA - DMA Controller Device. */ diff --git a/src/VBox/Devices/PC/DevFwCommon.cpp b/src/VBox/Devices/PC/DevFwCommon.cpp index 583bdcea0..40160cf04 100644 --- a/src/VBox/Devices/PC/DevFwCommon.cpp +++ b/src/VBox/Devices/PC/DevFwCommon.cpp @@ -1,4 +1,4 @@ -/* $Id: DevFwCommon.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DevFwCommon.cpp $ */ /** @file * FwCommon - Shared firmware code (used by DevPcBios & DevEFI). */ diff --git a/src/VBox/Devices/PC/DevFwCommon.h b/src/VBox/Devices/PC/DevFwCommon.h index 2cf33094c..239310702 100644 --- a/src/VBox/Devices/PC/DevFwCommon.h +++ b/src/VBox/Devices/PC/DevFwCommon.h @@ -1,4 +1,4 @@ -/* $Id: DevFwCommon.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: DevFwCommon.h $ */ /** @file * FwCommon - Shared firmware code, header. */ diff --git a/src/VBox/Devices/PC/DevHPET.cpp b/src/VBox/Devices/PC/DevHPET.cpp index c83d55379..119b4fb8c 100644 --- a/src/VBox/Devices/PC/DevHPET.cpp +++ b/src/VBox/Devices/PC/DevHPET.cpp @@ -1,4 +1,4 @@ -/* $Id: DevHPET.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: DevHPET.cpp $ */ /** @file * HPET virtual device - high precision event timer emulation */ diff --git a/src/VBox/Devices/PC/DevIoApic.cpp b/src/VBox/Devices/PC/DevIoApic.cpp index 123d7c674..f90ec5e2e 100644 --- a/src/VBox/Devices/PC/DevIoApic.cpp +++ b/src/VBox/Devices/PC/DevIoApic.cpp @@ -1,4 +1,4 @@ -/* $Id: DevIoApic.cpp 37637 2011-06-24 15:06:23Z vboxsync $ */ +/* $Id: DevIoApic.cpp $ */ /** @file * I/O Advanced Programmable Interrupt Controller (IO-APIC) Device. */ diff --git a/src/VBox/Devices/PC/DevLPC.cpp b/src/VBox/Devices/PC/DevLPC.cpp index 6bcee81f1..49974453a 100644 --- a/src/VBox/Devices/PC/DevLPC.cpp +++ b/src/VBox/Devices/PC/DevLPC.cpp @@ -1,4 +1,4 @@ -/* $Id: DevLPC.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: DevLPC.cpp $ */ /** @file * DevLPC - LPC device emulation */ diff --git a/src/VBox/Devices/PC/DevPIC.cpp b/src/VBox/Devices/PC/DevPIC.cpp index ce7f0a56a..32e1a229d 100644 --- a/src/VBox/Devices/PC/DevPIC.cpp +++ b/src/VBox/Devices/PC/DevPIC.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPIC.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: DevPIC.cpp $ */ /** @file * DevPIC - Intel 8259 Programmable Interrupt Controller (PIC) Device. */ diff --git a/src/VBox/Devices/PC/DevPcArch.c b/src/VBox/Devices/PC/DevPcArch.c index 4470cbad6..6c9ea9a8b 100644 --- a/src/VBox/Devices/PC/DevPcArch.c +++ b/src/VBox/Devices/PC/DevPcArch.c @@ -1,4 +1,4 @@ -/* $Id: DevPcArch.c 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DevPcArch.c $ */ /** @file * DevPcArch - PC Architecture Device. */ diff --git a/src/VBox/Devices/PC/DevPcBios.cpp b/src/VBox/Devices/PC/DevPcBios.cpp index ec87b7191..c6afc7411 100644 --- a/src/VBox/Devices/PC/DevPcBios.cpp +++ b/src/VBox/Devices/PC/DevPcBios.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPcBios.cpp 38220 2011-07-28 14:09:57Z vboxsync $ */ +/* $Id: DevPcBios.cpp $ */ /** @file * PC BIOS Device. */ diff --git a/src/VBox/Devices/PC/DevPcBios.h b/src/VBox/Devices/PC/DevPcBios.h index 878c66155..c340f069c 100644 --- a/src/VBox/Devices/PC/DevPcBios.h +++ b/src/VBox/Devices/PC/DevPcBios.h @@ -1,4 +1,4 @@ -/* $Id: DevPcBios.h 34081 2010-11-15 17:18:30Z vboxsync $ */ +/* $Id: DevPcBios.h $ */ /** @file * DevPcBios - PC BIOS Device, header shared with the BIOS code. */ diff --git a/src/VBox/Devices/PC/DevPit-i8254.cpp b/src/VBox/Devices/PC/DevPit-i8254.cpp index ee8a53c71..525fad96b 100644 --- a/src/VBox/Devices/PC/DevPit-i8254.cpp +++ b/src/VBox/Devices/PC/DevPit-i8254.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPit-i8254.cpp 37526 2011-06-17 10:17:38Z vboxsync $ */ +/* $Id: DevPit-i8254.cpp $ */ /** @file * DevPIT-i8254 - Intel 8254 Programmable Interval Timer (PIT) And Dummy Speaker Device. */ diff --git a/src/VBox/Devices/PC/DevRTC.cpp b/src/VBox/Devices/PC/DevRTC.cpp index d10286704..3edc624d1 100644 --- a/src/VBox/Devices/PC/DevRTC.cpp +++ b/src/VBox/Devices/PC/DevRTC.cpp @@ -1,4 +1,4 @@ -/* $Id: DevRTC.cpp 38195 2011-07-27 11:21:13Z vboxsync $ */ +/* $Id: DevRTC.cpp $ */ /** @file * Motorola MC146818 RTC/CMOS Device with PIIX4 extensions. */ diff --git a/src/VBox/Devices/PC/DevSMC.cpp b/src/VBox/Devices/PC/DevSMC.cpp index a8047ee4b..01e76a0f5 100644 --- a/src/VBox/Devices/PC/DevSMC.cpp +++ b/src/VBox/Devices/PC/DevSMC.cpp @@ -1,4 +1,4 @@ -/* $Id: DevSMC.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DevSMC.cpp $ */ /** @file * DevSMC - SMC device emulation. */ diff --git a/src/VBox/Devices/PC/DrvACPI.cpp b/src/VBox/Devices/PC/DrvACPI.cpp index 4637b78f2..37e8cd569 100644 --- a/src/VBox/Devices/PC/DrvACPI.cpp +++ b/src/VBox/Devices/PC/DrvACPI.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvACPI.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvACPI.cpp $ */ /** @file * DrvACPI - ACPI Host Driver. */ diff --git a/src/VBox/Devices/PC/DrvAcpiCpu.cpp b/src/VBox/Devices/PC/DrvAcpiCpu.cpp index 70da6678b..eebcfcb6b 100644 --- a/src/VBox/Devices/PC/DrvAcpiCpu.cpp +++ b/src/VBox/Devices/PC/DrvAcpiCpu.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvAcpiCpu.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvAcpiCpu.cpp $ */ /** @file * DrvAcpiCpu - ACPI CPU dummy driver for hotplugging. */ diff --git a/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk b/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk index a5a9d0fab..92e3dd14c 100644 --- a/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk +++ b/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 35399 2011-01-04 09:40:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # VBox Etherboot Network boot ROM makefile. # diff --git a/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c b/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c index 6ba9ea2de..857a5dfee 100644 --- a/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c +++ b/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c @@ -6,7 +6,7 @@ This file Copyright (C) 2003 Michael Brown <mbrown@fensystems.co.uk> of Fen Systems Ltd. (http://www.fensystems.co.uk/). All rights reserved. -$Id: undi.c 33656 2010-11-01 14:18:11Z vboxsync $ +$Id: undi.c $ ***************************************************************************/ /* diff --git a/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h b/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h index ba0a07310..535d2354d 100644 --- a/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h +++ b/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h @@ -6,7 +6,7 @@ This file Copyright (C) 2003 Michael Brown <mbrown@fensystems.co.uk> of Fen Systems Ltd. (http://www.fensystems.co.uk/). All rights reserved. -$Id: undi.h 33656 2010-11-01 14:18:11Z vboxsync $ +$Id: undi.h $ ***************************************************************************/ /* diff --git a/src/VBox/Devices/PC/Etherboot-src/arch/i386/firmware/pcbios/basemem.c b/src/VBox/Devices/PC/Etherboot-src/arch/i386/firmware/pcbios/basemem.c index 8339ee020..5ba665960 100644 --- a/src/VBox/Devices/PC/Etherboot-src/arch/i386/firmware/pcbios/basemem.c +++ b/src/VBox/Devices/PC/Etherboot-src/arch/i386/firmware/pcbios/basemem.c @@ -7,7 +7,7 @@ * updating the Free Base Memory Size counter at 40:13h. * * Michael Brown <mbrown@fensystems.co.uk> (mcb30) - * $Id: basemem.c 1 vboxsync $ + * $Id: basemem.c $ */ #define fbms ( ( uint16_t * ) phys_to_virt ( 0x413 ) ) diff --git a/src/VBox/Devices/PC/Etherboot-src/arch/i386/include/callbacks_arch.h b/src/VBox/Devices/PC/Etherboot-src/arch/i386/include/callbacks_arch.h index 47dbe33c2..1deef4253 100644 --- a/src/VBox/Devices/PC/Etherboot-src/arch/i386/include/callbacks_arch.h +++ b/src/VBox/Devices/PC/Etherboot-src/arch/i386/include/callbacks_arch.h @@ -5,7 +5,7 @@ * * Initial version by Michael Brown <mbrown@fensystems.co.uk>, January 2004. * - * $Id: callbacks_arch.h 1 vboxsync $ + * $Id: callbacks_arch.h $ */ #ifndef CALLBACKS_ARCH_H diff --git a/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c b/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c index cf8b3cb6d..f862bd6b6 100644 --- a/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c +++ b/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c @@ -22,8 +22,8 @@ * This code is using nuts and bolts from throughout etherboot. * It is a fresh implementation according to the DNS RFC, #1035 * -* $Revision: 33656 $ -* $Author: vboxsync $ +* $Revision: 67272 $ +* $Author: umoeller $ * $Date: 2010-11-01 15:18:11 +0100 (Mon, 01 Nov 2010) $ * * REVISION HISTORY: diff --git a/src/VBox/Devices/PC/Etherboot-src/genrules.pl b/src/VBox/Devices/PC/Etherboot-src/genrules.pl index 3cf9c6d84..3cf9c6d84 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/genrules.pl +++ b/src/VBox/Devices/PC/Etherboot-src/genrules.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/include/callbacks.h b/src/VBox/Devices/PC/Etherboot-src/include/callbacks.h index 2f635f27f..95ba2af9b 100644 --- a/src/VBox/Devices/PC/Etherboot-src/include/callbacks.h +++ b/src/VBox/Devices/PC/Etherboot-src/include/callbacks.h @@ -5,7 +5,7 @@ * * Initial version by Michael Brown <mbrown@fensystems.co.uk>, January 2004. * - * $Id: callbacks.h 1 vboxsync $ + * $Id: callbacks.h $ */ #ifndef CALLBACKS_H diff --git a/src/VBox/Devices/PC/Etherboot-src/include/pxe.h b/src/VBox/Devices/PC/Etherboot-src/include/pxe.h index 396891864..ec12cddce 100644 --- a/src/VBox/Devices/PC/Etherboot-src/include/pxe.h +++ b/src/VBox/Devices/PC/Etherboot-src/include/pxe.h @@ -632,7 +632,7 @@ typedef struct { * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: pxe.h 1 vboxsync $ + * $Id: pxe.h $ */ /* diff --git a/src/VBox/Devices/PC/Etherboot-src/util/catrom.pl b/src/VBox/Devices/PC/Etherboot-src/util/catrom.pl index fe37e6b6e..fe37e6b6e 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/catrom.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/catrom.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/disrom.pl b/src/VBox/Devices/PC/Etherboot-src/util/disrom.pl index 64128698c..64128698c 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/disrom.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/disrom.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/geniso b/src/VBox/Devices/PC/Etherboot-src/util/geniso index cf0469902..cf0469902 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/geniso +++ b/src/VBox/Devices/PC/Etherboot-src/util/geniso diff --git a/src/VBox/Devices/PC/Etherboot-src/util/genliso b/src/VBox/Devices/PC/Etherboot-src/util/genliso index b8d9a11df..b8d9a11df 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/genliso +++ b/src/VBox/Devices/PC/Etherboot-src/util/genliso diff --git a/src/VBox/Devices/PC/Etherboot-src/util/get-pci-ids b/src/VBox/Devices/PC/Etherboot-src/util/get-pci-ids index 6501a7f7c..6501a7f7c 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/get-pci-ids +++ b/src/VBox/Devices/PC/Etherboot-src/util/get-pci-ids diff --git a/src/VBox/Devices/PC/Etherboot-src/util/makelilo.pl b/src/VBox/Devices/PC/Etherboot-src/util/makelilo.pl index 8f995bc46..8f995bc46 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/makelilo.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/makelilo.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/makerom.pl b/src/VBox/Devices/PC/Etherboot-src/util/makerom.pl index 9d751e190..9d751e190 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/makerom.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/makerom.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/modrom.pl b/src/VBox/Devices/PC/Etherboot-src/util/modrom.pl index 695468c26..695468c26 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/modrom.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/modrom.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/swapdevids.pl b/src/VBox/Devices/PC/Etherboot-src/util/swapdevids.pl index c6255ae73..c6255ae73 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/swapdevids.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/swapdevids.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/zfilelen.pl b/src/VBox/Devices/PC/Etherboot-src/util/zfilelen.pl index 1f58ff9ee..1f58ff9ee 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/zfilelen.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/zfilelen.pl diff --git a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl index b51670c83..9da7063c4 100644 --- a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl +++ b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl @@ -1,4 +1,4 @@ -// $Id: vbox-cpuhotplug.dsl 32786 2010-09-28 09:54:55Z vboxsync $ +// $Id: vbox-cpuhotplug.dsl $ /// @file // // VirtualBox ACPI diff --git a/src/VBox/Devices/PC/vbox-standard.dsl b/src/VBox/Devices/PC/vbox-standard.dsl index 52372876a..a7bec34c7 100644 --- a/src/VBox/Devices/PC/vbox-standard.dsl +++ b/src/VBox/Devices/PC/vbox-standard.dsl @@ -1,4 +1,4 @@ -// $Id: vbox-standard.dsl 28800 2010-04-27 08:22:32Z vboxsync $ +// $Id: vbox-standard.dsl $ /// @file // // VirtualBox ACPI diff --git a/src/VBox/Devices/PC/vbox.dsl b/src/VBox/Devices/PC/vbox.dsl index c4bf42c38..20e0649fa 100644 --- a/src/VBox/Devices/PC/vbox.dsl +++ b/src/VBox/Devices/PC/vbox.dsl @@ -1,4 +1,4 @@ -// $Id: vbox.dsl 35782 2011-01-31 11:25:55Z vboxsync $ +// $Id: vbox.dsl $ /// @file // // VirtualBox ACPI diff --git a/src/VBox/Devices/Parallel/DevParallel.cpp b/src/VBox/Devices/Parallel/DevParallel.cpp index 10eed9e4d..962b776c8 100644 --- a/src/VBox/Devices/Parallel/DevParallel.cpp +++ b/src/VBox/Devices/Parallel/DevParallel.cpp @@ -1,4 +1,4 @@ -/* $Id: DevParallel.cpp 37466 2011-06-15 12:44:16Z vboxsync $ */ +/* $Id: DevParallel.cpp $ */ /** @file * DevParallel - Parallel (Port) Device Emulation. * diff --git a/src/VBox/Devices/Parallel/DrvHostParallel.cpp b/src/VBox/Devices/Parallel/DrvHostParallel.cpp index 6b8fdc193..070caf7ed 100644 --- a/src/VBox/Devices/Parallel/DrvHostParallel.cpp +++ b/src/VBox/Devices/Parallel/DrvHostParallel.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvHostParallel.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvHostParallel.cpp $ */ /** @file * VirtualBox Host Parallel Port Driver. * diff --git a/src/VBox/Devices/Samples/Makefile.kmk b/src/VBox/Devices/Samples/Makefile.kmk index 1a1a8d71c..3d68ec672 100644 --- a/src/VBox/Devices/Samples/Makefile.kmk +++ b/src/VBox/Devices/Samples/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the device and driver samples. # diff --git a/src/VBox/Devices/Samples/VBoxSampleDevice.cpp b/src/VBox/Devices/Samples/VBoxSampleDevice.cpp index cff444956..926d0277f 100644 --- a/src/VBox/Devices/Samples/VBoxSampleDevice.cpp +++ b/src/VBox/Devices/Samples/VBoxSampleDevice.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxSampleDevice.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxSampleDevice.cpp $ */ /** @file * VBox Sample Device. */ diff --git a/src/VBox/Devices/Serial/DevSerial.cpp b/src/VBox/Devices/Serial/DevSerial.cpp index d9fa695e3..a176b65a0 100644 --- a/src/VBox/Devices/Serial/DevSerial.cpp +++ b/src/VBox/Devices/Serial/DevSerial.cpp @@ -1,4 +1,4 @@ -/* $Id: DevSerial.cpp 37466 2011-06-15 12:44:16Z vboxsync $ */ +/* $Id: DevSerial.cpp $ */ /** @file * DevSerial - 16550A UART emulation. * (taken from hw/serial.c 2010/05/15 with modifications) diff --git a/src/VBox/Devices/Serial/DrvChar.cpp b/src/VBox/Devices/Serial/DrvChar.cpp index a753a92eb..5ab6caa21 100644 --- a/src/VBox/Devices/Serial/DrvChar.cpp +++ b/src/VBox/Devices/Serial/DrvChar.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvChar.cpp 37114 2011-05-16 16:34:49Z vboxsync $ */ +/* $Id: DrvChar.cpp $ */ /** @file * Driver that adapts PDMISTREAM into PDMICHARCONNECTOR / PDMICHARPORT. * diff --git a/src/VBox/Devices/Serial/DrvHostSerial.cpp b/src/VBox/Devices/Serial/DrvHostSerial.cpp index 073f3abe6..e3213f7e4 100644 --- a/src/VBox/Devices/Serial/DrvHostSerial.cpp +++ b/src/VBox/Devices/Serial/DrvHostSerial.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvHostSerial.cpp 37597 2011-06-22 20:54:05Z vboxsync $ */ +/* $Id: DrvHostSerial.cpp $ */ /** @file * VBox stream I/O devices: Host serial driver */ diff --git a/src/VBox/Devices/Serial/DrvNamedPipe.cpp b/src/VBox/Devices/Serial/DrvNamedPipe.cpp index d0687378a..f23160b46 100644 --- a/src/VBox/Devices/Serial/DrvNamedPipe.cpp +++ b/src/VBox/Devices/Serial/DrvNamedPipe.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvNamedPipe.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvNamedPipe.cpp $ */ /** @file * Named pipe / local socket stream driver. */ diff --git a/src/VBox/Devices/Serial/DrvRawFile.cpp b/src/VBox/Devices/Serial/DrvRawFile.cpp index d239eb9c7..57c52e050 100644 --- a/src/VBox/Devices/Serial/DrvRawFile.cpp +++ b/src/VBox/Devices/Serial/DrvRawFile.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvRawFile.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvRawFile.cpp $ */ /** @file * VBox stream drivers - Raw file output. */ diff --git a/src/VBox/Devices/Storage/ATAController.cpp b/src/VBox/Devices/Storage/ATAController.cpp index 9b125cf30..8954f1ca3 100644 --- a/src/VBox/Devices/Storage/ATAController.cpp +++ b/src/VBox/Devices/Storage/ATAController.cpp @@ -1,4 +1,4 @@ -/* $Id: ATAController.cpp 37687 2011-06-29 15:22:11Z vboxsync $ */ +/* $Id: ATAController.cpp $ */ /** @file * DevATA, DevAHCI - Shared ATA/ATAPI controller code (disk and cdrom). * diff --git a/src/VBox/Devices/Storage/ATAController.h b/src/VBox/Devices/Storage/ATAController.h index 6e71592a9..12addeb5e 100644 --- a/src/VBox/Devices/Storage/ATAController.h +++ b/src/VBox/Devices/Storage/ATAController.h @@ -1,4 +1,4 @@ -/* $Id: ATAController.h 37690 2011-06-29 16:05:54Z vboxsync $ */ +/* $Id: ATAController.h $ */ /** @file * DevATA, DevAHCI - Shared ATA/ATAPI controller types. */ diff --git a/src/VBox/Devices/Storage/Debug.cpp b/src/VBox/Devices/Storage/Debug.cpp index f73d32d7c..774722734 100644 --- a/src/VBox/Devices/Storage/Debug.cpp +++ b/src/VBox/Devices/Storage/Debug.cpp @@ -1,4 +1,4 @@ -/* $Id: Debug.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: Debug.cpp $ */ /** @file * VBox storage devices: debug helpers */ diff --git a/src/VBox/Devices/Storage/DevAHCI.cpp b/src/VBox/Devices/Storage/DevAHCI.cpp index a315425f5..7f5869de6 100644 --- a/src/VBox/Devices/Storage/DevAHCI.cpp +++ b/src/VBox/Devices/Storage/DevAHCI.cpp @@ -1,4 +1,4 @@ -/* $Id: DevAHCI.cpp 38328 2011-08-05 15:16:49Z vboxsync $ */ +/* $Id: DevAHCI.cpp $ */ /** @file * VBox storage devices: AHCI controller device (disk and cdrom). * Implements the AHCI standard 1.1 diff --git a/src/VBox/Devices/Storage/DevATA.cpp b/src/VBox/Devices/Storage/DevATA.cpp index f7c355aef..923e7509c 100644 --- a/src/VBox/Devices/Storage/DevATA.cpp +++ b/src/VBox/Devices/Storage/DevATA.cpp @@ -1,4 +1,4 @@ -/* $Id: DevATA.cpp 38219 2011-07-28 13:41:34Z vboxsync $ */ +/* $Id: DevATA.cpp $ */ /** @file * VBox storage devices: ATA/ATAPI controller device (disk and cdrom). */ diff --git a/src/VBox/Devices/Storage/DevBusLogic.cpp b/src/VBox/Devices/Storage/DevBusLogic.cpp index 439384882..a77b8318c 100644 --- a/src/VBox/Devices/Storage/DevBusLogic.cpp +++ b/src/VBox/Devices/Storage/DevBusLogic.cpp @@ -1,4 +1,4 @@ -/* $Id: DevBusLogic.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: DevBusLogic.cpp $ */ /** @file * VBox storage devices: BusLogic SCSI host adapter BT-958. */ diff --git a/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp b/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp index cb51411a7..06f27c0d7 100644 --- a/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp +++ b/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp @@ -1,4 +1,4 @@ -/* $Id: DevLsiLogicSCSI.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: DevLsiLogicSCSI.cpp $ */ /** @file * VBox storage devices: LsiLogic LSI53c1030 SCSI controller. */ diff --git a/src/VBox/Devices/Storage/DevLsiLogicSCSI.h b/src/VBox/Devices/Storage/DevLsiLogicSCSI.h index 6044ccf9f..527f5d30c 100644 --- a/src/VBox/Devices/Storage/DevLsiLogicSCSI.h +++ b/src/VBox/Devices/Storage/DevLsiLogicSCSI.h @@ -1,4 +1,4 @@ -/* $Id: DevLsiLogicSCSI.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: DevLsiLogicSCSI.h $ */ /** @file * VBox storage devices: LsiLogic LSI53c1030 SCSI controller - Defines and structures. */ diff --git a/src/VBox/Devices/Storage/DrvBlock.cpp b/src/VBox/Devices/Storage/DrvBlock.cpp index 4b45bc16a..7a92757fa 100644 --- a/src/VBox/Devices/Storage/DrvBlock.cpp +++ b/src/VBox/Devices/Storage/DrvBlock.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvBlock.cpp 35560 2011-01-14 13:37:32Z vboxsync $ */ +/* $Id: DrvBlock.cpp $ */ /** @file * VBox storage devices: Generic block driver */ diff --git a/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp b/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp index bb2be1882..6fc17a927 100644 --- a/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp +++ b/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvDiskIntegrity.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvDiskIntegrity.cpp $ */ /** @file * VBox storage devices: Disk integrity check. */ diff --git a/src/VBox/Devices/Storage/DrvHostBase.cpp b/src/VBox/Devices/Storage/DrvHostBase.cpp index ef7d4b3ad..cf2cbdd1a 100644 --- a/src/VBox/Devices/Storage/DrvHostBase.cpp +++ b/src/VBox/Devices/Storage/DrvHostBase.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvHostBase.cpp 37780 2011-07-05 12:55:13Z vboxsync $ */ +/* $Id: DrvHostBase.cpp $ */ /** @file * DrvHostBase - Host base drive access driver. */ diff --git a/src/VBox/Devices/Storage/DrvHostBase.h b/src/VBox/Devices/Storage/DrvHostBase.h index e74442fbd..c999fc059 100644 --- a/src/VBox/Devices/Storage/DrvHostBase.h +++ b/src/VBox/Devices/Storage/DrvHostBase.h @@ -1,4 +1,4 @@ -/* $Id: DrvHostBase.h 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvHostBase.h $ */ /** @file * DrvHostBase - Host base drive access driver. */ diff --git a/src/VBox/Devices/Storage/DrvHostDVD.cpp b/src/VBox/Devices/Storage/DrvHostDVD.cpp index 0767fa16d..08ed929db 100644 --- a/src/VBox/Devices/Storage/DrvHostDVD.cpp +++ b/src/VBox/Devices/Storage/DrvHostDVD.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvHostDVD.cpp 37601 2011-06-22 22:11:50Z vboxsync $ */ +/* $Id: DrvHostDVD.cpp $ */ /** @file * DrvHostDVD - Host DVD block driver. */ diff --git a/src/VBox/Devices/Storage/DrvHostFloppy.cpp b/src/VBox/Devices/Storage/DrvHostFloppy.cpp index 3f6620865..925d90c6c 100644 --- a/src/VBox/Devices/Storage/DrvHostFloppy.cpp +++ b/src/VBox/Devices/Storage/DrvHostFloppy.cpp @@ -64,6 +64,42 @@ typedef struct DRVHOSTFLOPPY +#ifdef RT_OS_WINDOWS +/** + * Get media size - needs a special IOCTL. + * + * @param pThis The instance data. + */ +static DECLCALLBACK(int) drvHostFloppyGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb) +{ + DISK_GEOMETRY geom; + DWORD cbBytesReturned; + int rc; + int cbSectors; + + memset(&geom, 0, sizeof(geom)); + rc = DeviceIoControl((HANDLE)RTFileToNative(pThis->hFileDevice), IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, 0, &geom, sizeof(geom), &cbBytesReturned, NULL); + if (rc) { + cbSectors = geom.Cylinders.QuadPart * geom.TracksPerCylinder * geom.SectorsPerTrack; + *pcb = cbSectors * geom.BytesPerSector; + rc = VINF_SUCCESS; + } + else + { + DWORD dwLastError; + + dwLastError = GetLastError(); + rc = RTErrConvertFromWin32(dwLastError); + Log(("DrvHostFloppy: IOCTL_DISK_GET_DRIVE_GEOMETRY(%s) failed, LastError=%d rc=%Rrc\n", + pThis->pszDevice, dwLastError, rc)); + return rc; + } + + return rc; +} +#endif /* RT_OS_WINDOWS */ + #ifdef RT_OS_LINUX /** * Get media size and do change processing. @@ -162,6 +198,9 @@ static DECLCALLBACK(int) drvHostFloppyConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pC /* * Override stuff. */ +#ifdef RT_OS_WINDOWS + pThis->Base.pfnGetMediaSize = drvHostFloppyGetMediaSize; +#endif #ifdef RT_OS_LINUX pThis->Base.pfnPoll = drvHostFloppyPoll; pThis->Base.pfnGetMediaSize = drvHostFloppyGetMediaSize; diff --git a/src/VBox/Devices/Storage/DrvMediaISO.cpp b/src/VBox/Devices/Storage/DrvMediaISO.cpp index 325c3e12d..746a6977d 100644 --- a/src/VBox/Devices/Storage/DrvMediaISO.cpp +++ b/src/VBox/Devices/Storage/DrvMediaISO.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvMediaISO.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvMediaISO.cpp $ */ /** @file * VBox storage devices: ISO image media driver */ diff --git a/src/VBox/Devices/Storage/DrvRawImage.cpp b/src/VBox/Devices/Storage/DrvRawImage.cpp index 7f20558d5..1570813d2 100644 --- a/src/VBox/Devices/Storage/DrvRawImage.cpp +++ b/src/VBox/Devices/Storage/DrvRawImage.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvRawImage.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvRawImage.cpp $ */ /** @file * VBox storage devices: Raw image driver */ diff --git a/src/VBox/Devices/Storage/DrvSCSI.cpp b/src/VBox/Devices/Storage/DrvSCSI.cpp index f1ea50cd3..81de28295 100644 --- a/src/VBox/Devices/Storage/DrvSCSI.cpp +++ b/src/VBox/Devices/Storage/DrvSCSI.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvSCSI.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvSCSI.cpp $ */ /** @file * VBox storage drivers: Generic SCSI command parser and execution driver */ diff --git a/src/VBox/Devices/Storage/DrvSCSIHost.cpp b/src/VBox/Devices/Storage/DrvSCSIHost.cpp index 1bada3384..2a45c671b 100644 --- a/src/VBox/Devices/Storage/DrvSCSIHost.cpp +++ b/src/VBox/Devices/Storage/DrvSCSIHost.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvSCSIHost.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: DrvSCSIHost.cpp $ */ /** @file * VBox storage drivers: Host SCSI access driver. */ diff --git a/src/VBox/Devices/Storage/DrvVD.cpp b/src/VBox/Devices/Storage/DrvVD.cpp index e19b8a920..ebd0315fd 100644 --- a/src/VBox/Devices/Storage/DrvVD.cpp +++ b/src/VBox/Devices/Storage/DrvVD.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvVD.cpp 37641 2011-06-26 17:16:35Z vboxsync $ */ +/* $Id: DrvVD.cpp $ */ /** @file * DrvVD - Generic VBox disk media driver. */ diff --git a/src/VBox/Devices/Storage/UsbMsd.cpp b/src/VBox/Devices/Storage/UsbMsd.cpp index 27c680e85..73648559c 100644 --- a/src/VBox/Devices/Storage/UsbMsd.cpp +++ b/src/VBox/Devices/Storage/UsbMsd.cpp @@ -1,4 +1,4 @@ -/* $Id: UsbMsd.cpp 37795 2011-07-06 10:28:24Z vboxsync $ */ +/* $Id: UsbMsd.cpp $ */ /** @file * UsbMSD - USB Mass Storage Device Emulation. */ diff --git a/src/VBox/Devices/Storage/VBoxSCSI.cpp b/src/VBox/Devices/Storage/VBoxSCSI.cpp index b96788779..80361100e 100644 --- a/src/VBox/Devices/Storage/VBoxSCSI.cpp +++ b/src/VBox/Devices/Storage/VBoxSCSI.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxSCSI.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxSCSI.cpp $ */ /** @file * * VBox storage devices: diff --git a/src/VBox/Devices/Storage/VBoxSCSI.h b/src/VBox/Devices/Storage/VBoxSCSI.h index 26366d197..c30749a5e 100644 --- a/src/VBox/Devices/Storage/VBoxSCSI.h +++ b/src/VBox/Devices/Storage/VBoxSCSI.h @@ -1,4 +1,4 @@ -/* $Id: VBoxSCSI.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxSCSI.h $ */ /** @file * * VBox storage devices: diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp index 78887ca4e..d912bf57f 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp @@ -1,4 +1,4 @@ -/* $Id: VSCSIDevice.cpp 32983 2010-10-07 15:14:54Z vboxsync $ */ +/* $Id: VSCSIDevice.cpp $ */ /** @file * Virtual SCSI driver: Device handling */ diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h b/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h index 67bcc6458..d897a21eb 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h +++ b/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h @@ -1,4 +1,4 @@ -/* $Id: VSCSIInline.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VSCSIInline.h $ */ /** @file * Virtual SCSI driver: Inline helpers */ diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h b/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h index 61dc71dec..0b0d8b157 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h +++ b/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h @@ -1,4 +1,4 @@ -/* $Id: VSCSIInternal.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VSCSIInternal.h $ */ /** @file * Virtual SCSI driver: Internal defines */ diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp index 64f6a31f9..83888eecd 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp @@ -1,4 +1,4 @@ -/* $Id: VSCSIIoReq.cpp 32983 2010-10-07 15:14:54Z vboxsync $ */ +/* $Id: VSCSIIoReq.cpp $ */ /** @file * Virtual SCSI driver: I/O request handling. */ diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp index 86911cd85..5758a99bc 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp @@ -1,4 +1,4 @@ -/* $Id: VSCSILun.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VSCSILun.cpp $ */ /** @file * Virtual SCSI driver: LUN handling */ diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp index 4d2cc2d5e..cec7c9ff5 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp @@ -1,4 +1,4 @@ -/* $Id: VSCSILunSbc.cpp 32983 2010-10-07 15:14:54Z vboxsync $ */ +/* $Id: VSCSILunSbc.cpp $ */ /** @file * Virtual SCSI driver: SBC LUN implementation (hard disks) */ @@ -303,6 +303,12 @@ static int vscsiLunSbcReqProcess(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq) rcReq = vscsiReqSenseErrorSet(pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR); vscsiDeviceReqComplete(pVScsiLun->pVScsiDevice, pVScsiReq, rcReq, false, VINF_SUCCESS); } + else if (!cSectorTransfer) + { + /* A 0 transfer length is not an error. */ + rcReq = vscsiReqSenseOkSet(pVScsiReq); + vscsiDeviceReqComplete(pVScsiLun->pVScsiDevice, pVScsiReq, rcReq, false, VINF_SUCCESS); + } else { /* Enqueue new I/O request */ diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp index 48a84d986..6c981dca5 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp @@ -1,4 +1,4 @@ -/* $Id: VSCSISense.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VSCSISense.cpp $ */ /** @file * Virtual SCSI driver: Sense handling */ diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSISgBuf.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSISgBuf.cpp index 820d93617..8acd2ded7 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSISgBuf.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSISgBuf.cpp @@ -1,4 +1,4 @@ -/* $Id: VSCSISgBuf.cpp 35062 2010-12-14 11:05:57Z vboxsync $ */ +/* $Id: VSCSISgBuf.cpp $ */ /** @file * Virtual SCSI driver: S/G list handling */ diff --git a/src/VBox/Devices/Storage/fdc.c b/src/VBox/Devices/Storage/fdc.c index 3bd0ce43d..703639e36 100644 --- a/src/VBox/Devices/Storage/fdc.c +++ b/src/VBox/Devices/Storage/fdc.c @@ -1,4 +1,4 @@ -/* $Id: fdc.c 37478 2011-06-15 18:49:40Z vboxsync $ */ +/* $Id: fdc.c $ */ /** @file * VBox storage devices: Floppy disk controller */ @@ -2454,7 +2454,7 @@ static DECLCALLBACK(int) fdcAttach (PPDMDEVINS pDevIns, /* * Validate. */ - if (iLUN > 2) { + if (iLUN >= 2) { AssertMsgFailed (("Configuration error: cannot attach or detach any but the first two LUNs - iLUN=%u\n", iLUN)); return VERR_PDM_DEVINS_NO_ATTACH; diff --git a/src/VBox/Devices/Storage/ide.h b/src/VBox/Devices/Storage/ide.h index 81b147238..25ceac2a2 100644 --- a/src/VBox/Devices/Storage/ide.h +++ b/src/VBox/Devices/Storage/ide.h @@ -1,4 +1,4 @@ -/* $Id: ide.h 37264 2011-05-30 14:47:02Z vboxsync $ */ +/* $Id: ide.h $ */ /** @file * VBox storage devices: ATA/ATAPI declarations */ diff --git a/src/VBox/Devices/USB/DevOHCI.cpp b/src/VBox/Devices/USB/DevOHCI.cpp index c19e0a6e2..c01507491 100644 --- a/src/VBox/Devices/USB/DevOHCI.cpp +++ b/src/VBox/Devices/USB/DevOHCI.cpp @@ -1,4 +1,4 @@ -/* $Id: DevOHCI.cpp 38350 2011-08-08 13:57:50Z vboxsync $ */ +/* $Id: DevOHCI.cpp $ */ /** @file * DevOHCI - Open Host Controller Interface for USB. */ diff --git a/src/VBox/Devices/USB/DrvVUSBRootHub.cpp b/src/VBox/Devices/USB/DrvVUSBRootHub.cpp index 33472e577..cbc37c060 100644 --- a/src/VBox/Devices/USB/DrvVUSBRootHub.cpp +++ b/src/VBox/Devices/USB/DrvVUSBRootHub.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvVUSBRootHub.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: DrvVUSBRootHub.cpp $ */ /** @file * Virtual USB - Root Hub Driver. */ diff --git a/src/VBox/Devices/USB/USBProxyDevice-stub.cpp b/src/VBox/Devices/USB/USBProxyDevice-stub.cpp index baed9620d..236b023a4 100644 --- a/src/VBox/Devices/USB/USBProxyDevice-stub.cpp +++ b/src/VBox/Devices/USB/USBProxyDevice-stub.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice-stub.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: USBProxyDevice-stub.cpp $ */ /** @file * USB device proxy - Stub. */ diff --git a/src/VBox/Devices/USB/USBProxyDevice.cpp b/src/VBox/Devices/USB/USBProxyDevice.cpp index c306d2c11..c218bbc5b 100644 --- a/src/VBox/Devices/USB/USBProxyDevice.cpp +++ b/src/VBox/Devices/USB/USBProxyDevice.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice.cpp 36479 2011-03-31 11:34:56Z vboxsync $ */ +/* $Id: USBProxyDevice.cpp $ */ /** @file * USBProxy - USB device proxy. */ diff --git a/src/VBox/Devices/USB/USBProxyDevice.h b/src/VBox/Devices/USB/USBProxyDevice.h index 3f2f82831..d9aa68493 100644 --- a/src/VBox/Devices/USB/USBProxyDevice.h +++ b/src/VBox/Devices/USB/USBProxyDevice.h @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice.h 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: USBProxyDevice.h $ */ /** @file * USBPROXY - USB proxy header */ diff --git a/src/VBox/Devices/USB/VUSBDevice.cpp b/src/VBox/Devices/USB/VUSBDevice.cpp index 82305b380..49ffcb47f 100644 --- a/src/VBox/Devices/USB/VUSBDevice.cpp +++ b/src/VBox/Devices/USB/VUSBDevice.cpp @@ -1,4 +1,4 @@ -/* $Id: VUSBDevice.cpp 37359 2011-06-07 17:12:57Z vboxsync $ */ +/* $Id: VUSBDevice.cpp $ */ /** @file * Virtual USB - Device. */ diff --git a/src/VBox/Devices/USB/VUSBInternal.h b/src/VBox/Devices/USB/VUSBInternal.h index 827e809c7..c325a7ab1 100644 --- a/src/VBox/Devices/USB/VUSBInternal.h +++ b/src/VBox/Devices/USB/VUSBInternal.h @@ -1,4 +1,4 @@ -/* $Id: VUSBInternal.h 37361 2011-06-07 18:31:56Z vboxsync $ */ +/* $Id: VUSBInternal.h $ */ /** @file * Virtual USB - Internal header. * diff --git a/src/VBox/Devices/USB/VUSBReadAhead.cpp b/src/VBox/Devices/USB/VUSBReadAhead.cpp index 70dd00eee..69ba7f566 100644 --- a/src/VBox/Devices/USB/VUSBReadAhead.cpp +++ b/src/VBox/Devices/USB/VUSBReadAhead.cpp @@ -1,4 +1,4 @@ -/* $Id: VUSBReadAhead.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VUSBReadAhead.cpp $ */ /** @file * Virtual USB - Read-ahead buffering for periodic endpoints. */ diff --git a/src/VBox/Devices/USB/VUSBUrb.cpp b/src/VBox/Devices/USB/VUSBUrb.cpp index 348689ab8..017e5a7e6 100644 --- a/src/VBox/Devices/USB/VUSBUrb.cpp +++ b/src/VBox/Devices/USB/VUSBUrb.cpp @@ -1,4 +1,4 @@ -/* $Id: VUSBUrb.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VUSBUrb.cpp $ */ /** @file * Virtual USB - URBs. */ diff --git a/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp b/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp index 1f3f48a21..79102d085 100644 --- a/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp +++ b/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice-darwin.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: USBProxyDevice-darwin.cpp $ */ /** @file * USB device proxy - the Darwin backend. */ diff --git a/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp b/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp index 470778cb3..0a1263369 100644 --- a/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp +++ b/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice-freebsd.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: USBProxyDevice-freebsd.cpp $ */ /** @file * USB device proxy - the FreeBSD backend. */ diff --git a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp b/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp index 82ca2ce75..9aa2f7e52 100644 --- a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp +++ b/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice-linux.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: USBProxyDevice-linux.cpp $ */ /** @file * USB device proxy - the Linux backend. */ diff --git a/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp b/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp index 0440048f4..58074a429 100644 --- a/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp +++ b/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice-os2.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: USBProxyDevice-os2.cpp $ */ /** @file * USB device proxy - the Linux backend. */ diff --git a/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp b/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp index 2a94a429a..eb363fbd8 100644 --- a/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp +++ b/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice-solaris.cpp 37811 2011-07-07 08:37:58Z vboxsync $ */ +/* $Id: USBProxyDevice-solaris.cpp $ */ /** @file * USB device proxy - the Solaris backend. */ diff --git a/src/VBox/Devices/USB/testcase/tstPalmOne.c b/src/VBox/Devices/USB/testcase/tstPalmOne.c index 03656f01b..136c5d2ce 100644 --- a/src/VBox/Devices/USB/testcase/tstPalmOne.c +++ b/src/VBox/Devices/USB/testcase/tstPalmOne.c @@ -1,4 +1,4 @@ -/* $Id: tstPalmOne.c 33595 2010-10-29 10:35:00Z vboxsync $ */ +/* $Id: tstPalmOne.c $ */ /** @file * USB PalmOne testcase */ diff --git a/src/VBox/Devices/USB/testcase/tstTrekStorGo.c b/src/VBox/Devices/USB/testcase/tstTrekStorGo.c index 33a484537..22c857725 100644 --- a/src/VBox/Devices/USB/testcase/tstTrekStorGo.c +++ b/src/VBox/Devices/USB/testcase/tstTrekStorGo.c @@ -1,4 +1,4 @@ -/* $Id: tstTrekStorGo.c 33595 2010-10-29 10:35:00Z vboxsync $ */ +/* $Id: tstTrekStorGo.c $ */ /** @file * Some simple inquiry test for the TrekStor USB-Stick GO, linux usbfs */ diff --git a/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp b/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp index 1bb7e451f..9aeb0e4e2 100644 --- a/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp +++ b/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice-vrdp.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: USBProxyDevice-vrdp.cpp $ */ /** @file * USB device proxy - the VRDP backend, calls the RemoteUSBBackend methods. */ diff --git a/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp b/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp index d219cbb2e..3031a38e3 100644 --- a/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp +++ b/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyDevice-win.cpp 37346 2011-06-07 13:06:29Z vboxsync $ */ +/* $Id: USBProxyDevice-win.cpp $ */ /** @file * USBPROXY - USB proxy, Win32 backend * diff --git a/src/VBox/Devices/VMMDev/VMMDev.cpp b/src/VBox/Devices/VMMDev/VMMDev.cpp index 14c71c2d6..13a744569 100644 --- a/src/VBox/Devices/VMMDev/VMMDev.cpp +++ b/src/VBox/Devices/VMMDev/VMMDev.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMDev.cpp 38227 2011-07-28 17:24:16Z vboxsync $ */ +/* $Id: VMMDev.cpp $ */ /** @file * VMMDev - Guest <-> VMM/Host communication device. */ diff --git a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp index 9b264ba8d..e4230cddb 100644 --- a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp +++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMDevHGCM.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VMMDevHGCM.cpp $ */ /** @file * VMMDev - HGCM - Host-Guest Communication Manager Device. */ diff --git a/src/VBox/Devices/VMMDev/VMMDevState.h b/src/VBox/Devices/VMMDev/VMMDevState.h index ddb8396f4..41f3d7cee 100644 --- a/src/VBox/Devices/VMMDev/VMMDevState.h +++ b/src/VBox/Devices/VMMDev/VMMDevState.h @@ -1,4 +1,4 @@ -/* $Id: VMMDevState.h 35989 2011-02-15 19:55:27Z vboxsync $ */ +/* $Id: VMMDevState.h $ */ /** @file * VMMDev - Guest <-> VMM/Host communication device, internal header. */ diff --git a/src/VBox/Devices/VMMDev/VMMDevTesting.cpp b/src/VBox/Devices/VMMDev/VMMDevTesting.cpp index c8b65c67c..05c007c63 100644 --- a/src/VBox/Devices/VMMDev/VMMDevTesting.cpp +++ b/src/VBox/Devices/VMMDev/VMMDevTesting.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMDevTesting.cpp 37636 2011-06-24 14:59:59Z vboxsync $ */ +/* $Id: VMMDevTesting.cpp $ */ /** @file * VMMDev - Testing Extensions. */ diff --git a/src/VBox/Devices/VMMDev/VMMDevTesting.h b/src/VBox/Devices/VMMDev/VMMDevTesting.h index 5b5d5dab6..aa8f28de5 100644 --- a/src/VBox/Devices/VMMDev/VMMDevTesting.h +++ b/src/VBox/Devices/VMMDev/VMMDevTesting.h @@ -1,4 +1,4 @@ -/* $Id: VMMDevTesting.h 30724 2010-07-08 08:30:20Z vboxsync $ */ +/* $Id: VMMDevTesting.h $ */ /** @file * VMMDev - Guest <-> VMM/Host communication device, internal header. */ diff --git a/src/VBox/Devices/VirtIO/Virtio.cpp b/src/VBox/Devices/VirtIO/Virtio.cpp index b40e134a0..5b57d77a0 100644 --- a/src/VBox/Devices/VirtIO/Virtio.cpp +++ b/src/VBox/Devices/VirtIO/Virtio.cpp @@ -1,4 +1,4 @@ -/* $Id: Virtio.cpp 37466 2011-06-15 12:44:16Z vboxsync $ */ +/* $Id: Virtio.cpp $ */ /** @file * Virtio - Virtio Common Functions (VRing, VQueue, Virtio PCI) */ diff --git a/src/VBox/Devices/VirtIO/Virtio.h b/src/VBox/Devices/VirtIO/Virtio.h index 96a66e743..0dad92a06 100644 --- a/src/VBox/Devices/VirtIO/Virtio.h +++ b/src/VBox/Devices/VirtIO/Virtio.h @@ -1,4 +1,4 @@ -/* $Id: Virtio.h 33325 2010-10-21 20:34:14Z vboxsync $ */ +/* $Id: Virtio.h $ */ /** @file * Virtio.h - Virtio Declarations */ diff --git a/src/VBox/Devices/build/VBoxDD-dtrace.d b/src/VBox/Devices/build/VBoxDD-dtrace.d index 90c55221a..0e0b90243 100644 --- a/src/VBox/Devices/build/VBoxDD-dtrace.d +++ b/src/VBox/Devices/build/VBoxDD-dtrace.d @@ -1,4 +1,4 @@ -/* $Id: VBoxDD-dtrace.d 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: VBoxDD-dtrace.d $ */ /** @file * VBoxDD - Static dtrace probes */ diff --git a/src/VBox/Devices/build/VBoxDD.cpp b/src/VBox/Devices/build/VBoxDD.cpp index 2e416a70b..e893677d4 100644 --- a/src/VBox/Devices/build/VBoxDD.cpp +++ b/src/VBox/Devices/build/VBoxDD.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDD.cpp 37781 2011-07-05 13:35:29Z vboxsync $ */ +/* $Id: VBoxDD.cpp $ */ /** @file * VBoxDD - Built-in drivers & devices (part 1). */ @@ -315,7 +315,7 @@ extern "C" DECLEXPORT(int) VBoxDriversRegister(PCPDMDRVREGCB pCallbacks, uint32_ #ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvPciRaw); - if (RT_FAILURED(rc)) + if (RT_FAILURE(rc)) return rc; #endif diff --git a/src/VBox/Devices/build/VBoxDD.h b/src/VBox/Devices/build/VBoxDD.h index f2fb28a29..bce646b0a 100644 --- a/src/VBox/Devices/build/VBoxDD.h +++ b/src/VBox/Devices/build/VBoxDD.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDD.h 37781 2011-07-05 13:35:29Z vboxsync $ */ +/* $Id: VBoxDD.h $ */ /** @file * Built-in drivers & devices (part 1) header. */ @@ -123,6 +123,9 @@ extern const PDMDRVREG g_DrvHostSerial; #ifdef VBOX_WITH_DRV_DISK_INTEGRITY extern const PDMDRVREG g_DrvDiskIntegrity; #endif +#ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL +extern const PDMDRVREG g_DrvPciRaw; +#endif #ifdef VBOX_WITH_USB extern const PDMUSBREG g_UsbDevProxy; diff --git a/src/VBox/Devices/build/VBoxDD2.h b/src/VBox/Devices/build/VBoxDD2.h index 58d9150cf..cef579d25 100644 --- a/src/VBox/Devices/build/VBoxDD2.h +++ b/src/VBox/Devices/build/VBoxDD2.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDD2.h 35400 2011-01-04 11:58:52Z vboxsync $ */ +/* $Id: VBoxDD2.h $ */ /** @file * Built-in drivers & devices part 2 header. * diff --git a/src/VBox/Devices/build/VBoxDDUDeps.cpp b/src/VBox/Devices/build/VBoxDDUDeps.cpp index 8372e8973..a614cef12 100644 --- a/src/VBox/Devices/build/VBoxDDUDeps.cpp +++ b/src/VBox/Devices/build/VBoxDDUDeps.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDDUDeps.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: VBoxDDUDeps.cpp $ */ /** @file * VBoxDDU - For dragging in library objects. */ diff --git a/src/VBox/Devices/build/vl_vbox.h b/src/VBox/Devices/build/vl_vbox.h index 219954289..ecf26a608 100644 --- a/src/VBox/Devices/build/vl_vbox.h +++ b/src/VBox/Devices/build/vl_vbox.h @@ -1,4 +1,4 @@ -/* $Id: vl_vbox.h 35353 2010-12-27 17:25:52Z vboxsync $ */ +/* $Id: vl_vbox.h $ */ /** @file * VBox vl.h Replacement. * diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk index a8a5515ad..d2d437547 100644 --- a/src/VBox/Devices/testcase/Makefile.kmk +++ b/src/VBox/Devices/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the device testcases. # diff --git a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp index aafb8a627..870f7cc03 100644 --- a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp +++ b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDeviceStructSize.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: tstDeviceStructSize.cpp $ */ /** @file * tstDeviceStructSize - testcase for check structure sizes/alignment * and to verify that HC and RC uses the same diff --git a/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp b/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp index d5f260c8e..41d158b52 100644 --- a/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp +++ b/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDeviceStructSizeRC.cpp 37752 2011-07-04 10:02:23Z vboxsync $ */ +/* $Id: tstDeviceStructSizeRC.cpp $ */ /** @file * tstDeviceStructSizeGC - Generate structure member and size checks from the RC perspective. * diff --git a/src/VBox/Disassembler/DisasmFormatBytes.cpp b/src/VBox/Disassembler/DisasmFormatBytes.cpp index f7c1ed70e..2046fe0d3 100644 --- a/src/VBox/Disassembler/DisasmFormatBytes.cpp +++ b/src/VBox/Disassembler/DisasmFormatBytes.cpp @@ -1,4 +1,4 @@ -/* $Id: DisasmFormatBytes.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: DisasmFormatBytes.cpp $ */ /** @file * VBox Disassembler - Helper for formatting the opcode bytes. */ diff --git a/src/VBox/Disassembler/DisasmFormatYasm.cpp b/src/VBox/Disassembler/DisasmFormatYasm.cpp index 792f55795..4ad0a153d 100644 --- a/src/VBox/Disassembler/DisasmFormatYasm.cpp +++ b/src/VBox/Disassembler/DisasmFormatYasm.cpp @@ -1,4 +1,4 @@ -/* $Id: DisasmFormatYasm.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: DisasmFormatYasm.cpp $ */ /** @file * VBox Disassembler - Yasm(/Nasm) Style Formatter. */ diff --git a/src/VBox/Disassembler/DisasmTestA.asm b/src/VBox/Disassembler/DisasmTestA.asm index 592641678..b091c0b9a 100644 --- a/src/VBox/Disassembler/DisasmTestA.asm +++ b/src/VBox/Disassembler/DisasmTestA.asm @@ -1,4 +1,4 @@ -; $Id: DisasmTestA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: DisasmTestA.asm $ ;; @file ; VBox disassembler: Assembler test routines ; diff --git a/src/VBox/Disassembler/Makefile.kmk b/src/VBox/Disassembler/Makefile.kmk index 6c276fb15..9853a7932 100644 --- a/src/VBox/Disassembler/Makefile.kmk +++ b/src/VBox/Disassembler/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Disassembler. # diff --git a/src/VBox/Disassembler/testcase/Makefile.kmk b/src/VBox/Disassembler/testcase/Makefile.kmk index fc4a89111..f2739d6f4 100644 --- a/src/VBox/Disassembler/testcase/Makefile.kmk +++ b/src/VBox/Disassembler/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Disassembler. # diff --git a/src/VBox/Disassembler/testcase/tstAsm.mac b/src/VBox/Disassembler/testcase/tstAsm.mac index ad135c9bb..0854d8615 100644 --- a/src/VBox/Disassembler/testcase/tstAsm.mac +++ b/src/VBox/Disassembler/testcase/tstAsm.mac @@ -1,4 +1,4 @@ -; $Id: tstAsm.mac 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: tstAsm.mac $ ;; @file ; Disassembly testcase - Common header for the xREG macros. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm b/src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm index 61662310b..71416661b 100644 --- a/src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmLock-1.asm 60692 2010-04-27 08:22:32Z umoeller $ +; $Id: tstAsmLock-1.asm $ ;; @file ; Disassembly testcase - Valid fnstsw* instructitons. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-1.asm b/src/VBox/Disassembler/testcase/tstAsmLock-1.asm index 7826591b7..533592011 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmLock-1.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: tstAsmLock-1.asm $ ;; @file ; Disassembly testcase - Valid lock sequences and related instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-2.asm b/src/VBox/Disassembler/testcase/tstAsmLock-2.asm index b050a6e5d..f692b7e14 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-2.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-2.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmLock-2.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: tstAsmLock-2.asm $ ;; @file ; Disassembly testcase - Invalid invariants. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-3.asm b/src/VBox/Disassembler/testcase/tstAsmLock-3.asm index c52573945..ece8485a4 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-3.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-3.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmLock-3.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: tstAsmLock-3.asm $ ;; @file ; Disassembly testcase - Invalid lock sequences for non-locking instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm b/src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm index 5a4888822..8c6d0a5b1 100644 --- a/src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmMovSeg-1.asm 35474 2011-01-11 09:08:30Z vboxsync $ +; $Id: tstAsmMovSeg-1.asm $ ;; @file ; Disassembly testcase - Valid mov from/to segment instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm b/src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm index 0cb415658..57e72f13a 100644 --- a/src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmMovzx-1.asm 35474 2011-01-11 09:08:30Z vboxsync $ +; $Id: tstAsmMovzx-1.asm $ ;; @file ; Disassembly testcase - Valid movzx sequences and related instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmPop-1.asm b/src/VBox/Disassembler/testcase/tstAsmPop-1.asm index f1af94b92..25cae4eb4 100644 --- a/src/VBox/Disassembler/testcase/tstAsmPop-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmPop-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmPop-1.asm 35474 2011-01-11 09:08:30Z vboxsync $ +; $Id: tstAsmPop-1.asm $ ;; @file ; Disassembly testcase - Valid pop sequences and related instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmPush-1.asm b/src/VBox/Disassembler/testcase/tstAsmPush-1.asm index dd32571f8..1c4286dc3 100644 --- a/src/VBox/Disassembler/testcase/tstAsmPush-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmPush-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmPush-1.asm 35474 2011-01-11 09:08:30Z vboxsync $ +; $Id: tstAsmPush-1.asm $ ;; @file ; Disassembly testcase - Valid push sequences and related instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm b/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm index bb4543266..daba0fadb 100644 --- a/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmRegs-1.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: tstAsmRegs-1.asm $ ;; @file ; Disassembly testcase - Accessing all the registers ; diff --git a/src/VBox/Disassembler/testcase/tstAsmSignExtend-1.asm b/src/VBox/Disassembler/testcase/tstAsmSignExtend-1.asm index e8717e085..97f5cf9c5 100644 --- a/src/VBox/Disassembler/testcase/tstAsmSignExtend-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmSignExtend-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmSignExtend-1.asm 35474 2011-01-11 09:08:30Z vboxsync $ +; $Id: tstAsmSignExtend-1.asm $ ;; @file ; Disassembly testcase - Valid sign extension instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp index 64aacbd1a..670d1f5f5 100644 --- a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp +++ b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDisasm-2.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstDisasm-2.cpp $ */ /** @file * Testcase - Generic Disassembler Tool. */ diff --git a/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp b/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp index 069ed6364..734361055 100644 --- a/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp +++ b/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp @@ -1,4 +1,4 @@ -/* $Id: BusMouse.cpp 35683 2011-01-24 15:28:09Z vboxsync $ */ +/* $Id: BusMouse.cpp $ */ /** @file * BusMouse - Microsoft Bus (parallel) mouse controller device. */ diff --git a/src/VBox/ExtPacks/Skeleton/Makefile.kmk b/src/VBox/ExtPacks/Skeleton/Makefile.kmk index a80ccdb76..b51e44227 100644 --- a/src/VBox/ExtPacks/Skeleton/Makefile.kmk +++ b/src/VBox/ExtPacks/Skeleton/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38154 2011-07-25 12:30:55Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Skeleton Extension Pack Sample. # diff --git a/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp b/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp index 7325a8991..15f00102d 100644 --- a/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp +++ b/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxSkeletonMain.cpp 35963 2011-02-14 16:18:36Z vboxsync $ */ +/* $Id: VBoxSkeletonMain.cpp $ */ /** @file * Skeleton main module. */ diff --git a/src/VBox/Frontends/Common/Makefile.kmk b/src/VBox/Frontends/Common/Makefile.kmk index 38ec05bf6..204889576 100644 --- a/src/VBox/Frontends/Common/Makefile.kmk +++ b/src/VBox/Frontends/Common/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 30054 2010-06-07 08:13:46Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for VBox frontends shared bits # diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk index 8662bc4ff..2f8ea5afe 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk +++ b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38158 2011-07-25 13:13:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the VirtualBox X11 keyboard library # @@ -75,7 +75,8 @@ $$(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2: \ $(call MSG_L1,Packing $@) $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@) ifdef VBOX_GTAR - $(QUIET)$(VBOX_GTAR) --owner 0 --group 0 --ignore-failed-read -cjRf $@ \ + $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 --ignore-failed-read \ + -cjRf $@ \ -C $(PATH_STAGE)/$(VBoxKeyboard-Files_INST).. VBoxKeyboard else $(QUIET)tar -cjf $@ \ diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-layouts.h b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-layouts.h index 896e6ab4c..593eee719 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-layouts.h +++ b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-layouts.h @@ -1,4 +1,4 @@ -/* $Id: keyboard-layouts.h 33656 2010-11-01 14:18:11Z vboxsync $ */ +/* $Id: keyboard-layouts.h $ */ /** @file * VBox/Frontends/Common - X11 keyboard driver translation tables (keyboard layouts). * diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-list.h b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-list.h index 9ba53c295..71f317f4e 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-list.h +++ b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-list.h @@ -1,4 +1,4 @@ -/* $Id: keyboard-list.h 33656 2010-11-01 14:18:11Z vboxsync $ */ +/* $Id: keyboard-list.h $ */ /** @file * VBox/Frontends/Common - X11 keyboard driver translation tables (keyboard layouts) */ diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-tables.h b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-tables.h index cd144230e..5457a35f2 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-tables.h +++ b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-tables.h @@ -1,4 +1,4 @@ -/* $Id: keyboard-tables.h 35479 2011-01-11 11:37:08Z vboxsync $ */ +/* $Id: keyboard-tables.h $ */ /** @file * VBox/Frontends/Common - X11 keyboard driver translation tables. */ diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-types.h b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-types.h index 2b2725ae1..f95ace725 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-types.h +++ b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-types.h @@ -1,4 +1,4 @@ -/* $Id: keyboard-types.h 33656 2010-11-01 14:18:11Z vboxsync $ */ +/* $Id: keyboard-types.h $ */ /** @file * VBox/Frontends/Common - X11 keyboard driver translation tables (PC scan code * mappings for known keyboard maps). diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c index df4b01462..835abe295 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c +++ b/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c @@ -1,4 +1,4 @@ -/* $Id: keyboard.c 36335 2011-03-21 21:58:58Z vboxsync $ */ +/* $Id: keyboard.c $ */ /** @file * VBox/Frontends/Common - X11 keyboard handler library. */ diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h b/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h index 4edace984..f9f346b3d 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h +++ b/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h @@ -1,4 +1,4 @@ -/* $Id: xkbtoscan.h 36093 2011-02-26 21:14:12Z vboxsync $ */ +/* $Id: xkbtoscan.h $ */ /** @file * VBox/Frontends/Common - X11 keyboard driver translation tables (XT scan * code mappings for XKB key names). diff --git a/src/VBox/Frontends/Makefile.kmk b/src/VBox/Frontends/Makefile.kmk index f4f144d37..45c9f2b4f 100644 --- a/src/VBox/Frontends/Makefile.kmk +++ b/src/VBox/Frontends/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 37429 2011-06-13 19:59:08Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VBox frontends. # diff --git a/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp b/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp index 5bdd60e4c..42eab9381 100644 --- a/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: DisplayImpl.cpp 36590 2011-04-06 15:35:26Z vboxsync $ */ +/* $Id: DisplayImpl.cpp $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Implementation of Display class diff --git a/src/VBox/Frontends/VBoxBFE/DisplayImpl.h b/src/VBox/Frontends/VBoxBFE/DisplayImpl.h index 9b329f200..be620b12f 100644 --- a/src/VBox/Frontends/VBoxBFE/DisplayImpl.h +++ b/src/VBox/Frontends/VBoxBFE/DisplayImpl.h @@ -1,4 +1,4 @@ -/* $Id: DisplayImpl.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DisplayImpl.h $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Declaration of Display class diff --git a/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp b/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp index 42195032e..9c40b20e4 100644 --- a/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: KeyboardImpl.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: KeyboardImpl.cpp $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Implementation of Keyboard class and related things diff --git a/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h b/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h index 0e6c3aff3..434da9f14 100644 --- a/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h +++ b/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h @@ -1,4 +1,4 @@ -/* $Id: KeyboardImpl.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: KeyboardImpl.h $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Declaration of Keyboard class and related things diff --git a/src/VBox/Frontends/VBoxBFE/Makefile.kmk b/src/VBox/Frontends/VBoxBFE/Makefile.kmk index e8ca179af..0da60dd46 100644 --- a/src/VBox/Frontends/VBoxBFE/Makefile.kmk +++ b/src/VBox/Frontends/VBoxBFE/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 36586 2011-04-06 15:19:46Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxBFE (a basic frontend which doesn't make use of Main). # diff --git a/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp b/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp index 181f9f846..c4906487a 100644 --- a/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: StatusImpl.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: StatusImpl.cpp $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Implementation of VMStatus class diff --git a/src/VBox/Frontends/VBoxBFE/StatusImpl.h b/src/VBox/Frontends/VBoxBFE/StatusImpl.h index c66cb1c5f..83347d4a1 100644 --- a/src/VBox/Frontends/VBoxBFE/StatusImpl.h +++ b/src/VBox/Frontends/VBoxBFE/StatusImpl.h @@ -1,4 +1,4 @@ -/* $Id: StatusImpl.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: StatusImpl.h $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Declaration of VMStatus class diff --git a/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp b/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp index db53aa762..edb60ba06 100644 --- a/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp +++ b/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxBFE.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: VBoxBFE.cpp $ */ /** @file * Basic Frontend (BFE): VBoxBFE main routines. * diff --git a/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp b/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp index 16646741c..62635e487 100644 --- a/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp +++ b/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxBFEHardened.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxBFEHardened.cpp $ */ /** @file * VBoxSDL - Hardened main(). */ diff --git a/src/VBox/Frontends/VBoxBFE/VMMDev.h b/src/VBox/Frontends/VBoxBFE/VMMDev.h index 4f705d809..5be26a50a 100644 --- a/src/VBox/Frontends/VBoxBFE/VMMDev.h +++ b/src/VBox/Frontends/VBoxBFE/VMMDev.h @@ -1,4 +1,4 @@ -/* $Id: VMMDev.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VMMDev.h $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Declaration of VMMDev: driver interface to VMM device diff --git a/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp b/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp index 1f6e56d16..425909501 100644 --- a/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp +++ b/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMDevInterface.cpp 36590 2011-04-06 15:35:26Z vboxsync $ */ +/* $Id: VMMDevInterface.cpp $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Implementation of VMMDev: driver interface to VMM device diff --git a/src/VBox/Frontends/VBoxBFE/testcase/tstMouseImpl.cpp b/src/VBox/Frontends/VBoxBFE/testcase/tstMouseImpl.cpp index 3549fe077..7c82060be 100644 --- a/src/VBox/Frontends/VBoxBFE/testcase/tstMouseImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/testcase/tstMouseImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMouseImpl.cpp 36162 2011-03-04 10:43:19Z vboxsync $ */ +/* $Id: tstMouseImpl.cpp $ */ /** @file * Main unit test - Mouse class. */ diff --git a/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk b/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk index 3321605fa..a5e3742e6 100644 --- a/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk +++ b/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 36693 2011-04-18 07:57:57Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # VBoxBalloonCtrl - Memory balloon control. # diff --git a/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp b/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp index f1fe597a6..b42d1cdb4 100644 --- a/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp +++ b/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxBalloonCtrl.cpp 37103 2011-05-16 12:59:24Z vboxsync $ */ +/* $Id: VBoxBalloonCtrl.cpp $ */ /** @file * VBoxBalloonCtrl - VirtualBox Ballooning Control Service. */ diff --git a/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.h b/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.h index 174322bb3..64adeda60 100644 --- a/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.h +++ b/src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.h @@ -1,4 +1,4 @@ -/* $Id: VBoxBalloonCtrl.h 36707 2011-04-18 12:17:33Z vboxsync $ */ +/* $Id: VBoxBalloonCtrl.h $ */ /** @file * VBoxBalloonCtrl - VirtualBox Ballooning Control Service. */ diff --git a/src/VBox/Frontends/VBoxFB/Makefile.kmk b/src/VBox/Frontends/VBoxFB/Makefile.kmk index b02d4dcea..cc5d5d71d 100644 --- a/src/VBox/Frontends/VBoxFB/Makefile.kmk +++ b/src/VBox/Frontends/VBoxFB/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxFB. # diff --git a/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp b/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp index 1265d3d2c..bc211dbfe 100644 --- a/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp +++ b/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp @@ -1,4 +1,4 @@ -/* $Id: FramebufferVNC.cpp 36694 2011-04-18 08:18:00Z vboxsync $ */ +/* $Id: FramebufferVNC.cpp $ */ /** @file * VBoxHeadless - VNC server implementation for VirtualBox. * diff --git a/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.h b/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.h index 93538d4f1..c7e42cf23 100644 --- a/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.h +++ b/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.h @@ -1,4 +1,4 @@ -/* $Id: FramebufferVNC.h 31698 2010-08-16 15:00:05Z vboxsync $ */ +/* $Id: FramebufferVNC.h $ */ /** @file * VBox Remote Desktop Protocol - VNC server interface. */ diff --git a/src/VBox/Frontends/VBoxHeadless/Makefile.kmk b/src/VBox/Frontends/VBoxHeadless/Makefile.kmk index 6c0b419f8..a6a44175d 100644 --- a/src/VBox/Frontends/VBoxHeadless/Makefile.kmk +++ b/src/VBox/Frontends/VBoxHeadless/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 33590 2010-10-29 08:55:09Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the headless frontend. # diff --git a/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp b/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp index 0eb0c4c66..6ee0f54e4 100644 --- a/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp +++ b/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxHeadless.cpp 37473 2011-06-15 16:16:31Z vboxsync $ */ +/* $Id: VBoxHeadless.cpp $ */ /** @file * VBoxHeadless - The VirtualBox Headless frontend for running VMs on servers. */ diff --git a/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp b/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp index 543f4a3c2..abb18eea8 100644 --- a/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp +++ b/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxHeadlessHardened.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxHeadlessHardened.cpp $ */ /** @file * VBoxHeadless - Hardened main(). */ diff --git a/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk b/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk index 8a4e5f056..885e755b7 100644 --- a/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk +++ b/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the ffmpeg frame buffer module. # diff --git a/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk b/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk index e7c97b8cb..ed7ab74f1 100644 --- a/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk +++ b/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VRDP (headless RDP server) frontend testcase. # diff --git a/src/VBox/Frontends/VBoxManage/Makefile.kmk b/src/VBox/Frontends/VBoxManage/Makefile.kmk index e1a5823ee..cac191045 100644 --- a/src/VBox/Frontends/VBoxManage/Makefile.kmk +++ b/src/VBox/Frontends/VBoxManage/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38416 2011-08-11 13:47:31Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxManage (the cli frontend). # diff --git a/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp b/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp index 52adb6f10..e2d5a15e2 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxInternalManage.cpp 37925 2011-07-13 15:31:10Z vboxsync $ */ +/* $Id: VBoxInternalManage.cpp $ */ /** @file * VBoxManage - The 'internalcommands' command. * diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp index a82fcb48c..c7d91f5ba 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManage.cpp 38417 2011-08-11 13:58:34Z vboxsync $ */ +/* $Id: VBoxManage.cpp $ */ /** @file * VBoxManage - VirtualBox's command-line interface. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.h b/src/VBox/Frontends/VBoxManage/VBoxManage.h index f557d92de..1f949d138 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManage.h +++ b/src/VBox/Frontends/VBoxManage/VBoxManage.h @@ -1,4 +1,4 @@ -/* $Id: VBoxManage.h 37525 2011-06-17 10:09:21Z vboxsync $ */ +/* $Id: VBoxManage.h $ */ /** @file * VBoxManage - VirtualBox command-line interface, internal header file. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp index d49d91fc4..1f9f70953 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageAppliance.cpp 37862 2011-07-11 10:09:29Z vboxsync $ */ +/* $Id: VBoxManageAppliance.cpp $ */ /** @file * VBoxManage - The appliance-related commands. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp index a12174045..363b8c8c5 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageBandwidthControl.cpp 34587 2010-12-01 20:30:02Z vboxsync $ */ +/* $Id: VBoxManageBandwidthControl.cpp $ */ /** @file * VBoxManage - The bandwidth control related commands. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp index ceb1d7cf5..f496295c3 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageControlVM.cpp 37202 2011-05-24 15:57:55Z vboxsync $ */ +/* $Id: VBoxManageControlVM.cpp $ */ /** @file * VBoxManage - Implementation of the controlvm command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp index 958cd774a..68ef44fc3 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageDHCPServer.cpp 33489 2010-10-27 10:31:41Z vboxsync $ */ +/* $Id: VBoxManageDHCPServer.cpp $ */ /** @file * VBoxManage - Implementation of dhcpserver command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp index 1d8dd9fdb..6b1e46305 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageDebugVM.cpp 35550 2011-01-13 18:08:54Z vboxsync $ */ +/* $Id: VBoxManageDebugVM.cpp $ */ /** @file * VBoxManage - Implementation of the debugvm command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp index 5c6fce980..cd043169e 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageDisk.cpp 37525 2011-06-17 10:09:21Z vboxsync $ */ +/* $Id: VBoxManageDisk.cpp $ */ /** @file * VBoxManage - The disk related commands. */ @@ -704,6 +704,7 @@ static const RTGETOPTDEF g_aConvertFromRawHardDiskOptions[] = { "-static", 'F', RTGETOPT_REQ_NOTHING }, { "--variant", 'm', RTGETOPT_REQ_STRING }, { "-variant", 'm', RTGETOPT_REQ_STRING }, + { "--uuid", 'u', RTGETOPT_REQ_STRING }, }; RTEXITCODE handleConvertFromRaw(int argc, char *argv[]) @@ -716,6 +717,8 @@ RTEXITCODE handleConvertFromRaw(int argc, char *argv[]) const char *filesize = NULL; unsigned uImageFlags = VD_IMAGE_FLAGS_NONE; void *pvBuf = NULL; + RTUUID uuid; + PCRTUUID pUuid = NULL; int c; RTGETOPTUNION ValueUnion; @@ -727,6 +730,11 @@ RTEXITCODE handleConvertFromRaw(int argc, char *argv[]) { switch (c) { + case 'u': // --uuid + if (RT_FAILURE(RTUuidFromStr(&uuid, ValueUnion.psz))) + return errorSyntax(USAGE_CONVERTFROMRAW, "Invalid UUID '%s'", ValueUnion.psz); + pUuid = &uuid; + break; case 'o': // --format format = ValueUnion.psz; break; @@ -826,7 +834,7 @@ RTEXITCODE handleConvertFromRaw(int argc, char *argv[]) LCHS.cHeads = 0; LCHS.cSectors = 0; rc = VDCreateBase(pDisk, format, dstfilename, cbFile, - uImageFlags, pszComment, &PCHS, &LCHS, NULL, + uImageFlags, pszComment, &PCHS, &LCHS, pUuid, VD_OPEN_FLAGS_NORMAL, NULL, NULL); if (RT_FAILURE(rc)) { diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp index a472ad34a..b07c81b43 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageGuestCtrl.cpp 38456 2011-08-15 10:16:40Z vboxsync $ */ +/* $Id: VBoxManageGuestCtrl.cpp $ */ /** @file * VBoxManage - Implementation of guestcontrol command. */ @@ -72,6 +72,7 @@ typedef struct COPYCONTEXT { IGuest *pGuest; bool fVerbose; + bool fDryRun; bool fHostToGuest; char *pszUsername; char *pszPassword; @@ -813,7 +814,22 @@ static int handleCtrlExecProgram(ComPtr<IGuest> guest, HandlerArg *pArg) return rcProc; } -static int ctrlCopyContextCreate(IGuest *pGuest, bool fVerbose, bool fHostToGuest, +/** + * Creates a copy context structure which then can be used with various + * guest control copy functions. Needs to be free'd with ctrlCopyContextFree(). + * + * @return IPRT status code. + * @param pGuest Pointer to IGuest interface to use. + * @param fVerbose Flag indicating if we want to run in verbose mode. + * @param fDryRun Flag indicating if we want to run a dry run only. + * @param fHostToGuest Flag indicating if we want to copy from host to guest + * or vice versa. + * @param pszUsername Username of account to use on the guest side. + * @param pszPassword Password of account to use. + * @param ppContext Pointer which receives the allocated copy context. + */ +static int ctrlCopyContextCreate(IGuest *pGuest, bool fVerbose, bool fDryRun, + bool fHostToGuest, const char *pszUsername, const char *pszPassword, PCOPYCONTEXT *ppContext) { @@ -825,6 +841,7 @@ static int ctrlCopyContextCreate(IGuest *pGuest, bool fVerbose, bool fHostToGues AssertPtrReturn(pContext, VERR_NO_MEMORY); pContext->pGuest = pGuest; pContext->fVerbose = fVerbose; + pContext->fDryRun = fDryRun; pContext->fHostToGuest = fHostToGuest; pContext->pszUsername = RTStrDup(pszUsername); @@ -847,6 +864,11 @@ static int ctrlCopyContextCreate(IGuest *pGuest, bool fVerbose, bool fHostToGues return VINF_SUCCESS; } +/** + * Frees are previously allocated copy context structure. + * + * @param pContext Pointer to copy context to free. + */ static void ctrlCopyContextFree(PCOPYCONTEXT pContext) { if (pContext) @@ -864,7 +886,7 @@ static void ctrlCopyContextFree(PCOPYCONTEXT pContext) * path. * * @return IPRT status code. - * @param pszSourceRoot Source root path. + * @param pszSourceRoot Source root path. No trailing directory slash! * @param pszSource Actual source to transform. Must begin with * the source root path! * @param pszDest Destination path. @@ -878,10 +900,7 @@ static int ctrlCopyTranslatePath(const char *pszSourceRoot, const char *pszSourc AssertPtrReturn(pszSource, VERR_INVALID_POINTER); AssertPtrReturn(pszDest, VERR_INVALID_POINTER); AssertPtrReturn(ppszTranslated, VERR_INVALID_POINTER); - - /* Source path must contain the source root! */ - if (!RTPathStartsWith(pszSource, pszSourceRoot)) - return VERR_INVALID_PARAMETER; + AssertReturn(RTPathStartsWith(pszSource, pszSourceRoot), VERR_INVALID_PARAMETER); /* Construct the relative dest destination path by "subtracting" the * source from the source root, e.g. @@ -890,22 +909,18 @@ static int ctrlCopyTranslatePath(const char *pszSourceRoot, const char *pszSourc * dest = "d:\baz\" * translated = "d:\baz\bar\" */ - - size_t lenRoot = strlen(pszSourceRoot); - AssertReturn(lenRoot, VERR_INVALID_PARAMETER); - char *pszTranslated = RTStrDup(pszDest); - AssertReturn(pszTranslated, VERR_NO_MEMORY); - int vrc = RTStrAAppend(&pszTranslated, &pszSource[lenRoot]); - if (RT_FAILURE(vrc)) - return vrc; - - *ppszTranslated = pszTranslated; - - return vrc; + char szTranslated[RTPATH_MAX]; + size_t srcOff = strlen(pszSourceRoot); + AssertReturn(srcOff, VERR_INVALID_PARAMETER); + int rc = RTPathJoin(szTranslated, sizeof(szTranslated), + pszDest, &pszSource[srcOff]); + if (RT_SUCCESS(rc)) + *ppszTranslated = RTStrDup(szTranslated); + return rc; } #ifdef DEBUG_andy -static void tstTranslatePath() +static int tstTranslatePath() { static struct { @@ -954,14 +969,30 @@ static void tstTranslatePath() RTStrFree(pszTranslated); } } + + return VINF_SUCCESS; /* @todo */ } #endif +/** + * Creates a directory on the destination, based on the current copy + * context. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszDir Directory to create. + */ static int ctrlCopyDirCreate(PCOPYCONTEXT pContext, const char *pszDir) { AssertPtrReturn(pContext, VERR_INVALID_POINTER); AssertPtrReturn(pszDir, VERR_INVALID_POINTER); + if (pContext->fVerbose) + RTPrintf("Creating directory \"%s\" ...\n", pszDir); + + if (pContext->fDryRun) + return VINF_SUCCESS; + int rc = VINF_SUCCESS; if (pContext->fHostToGuest) /* We want to create directories on the guest. */ { @@ -973,13 +1004,24 @@ static int ctrlCopyDirCreate(PCOPYCONTEXT pContext, const char *pszDir) } else /* ... or on the host. */ { - rc = RTDirCreate(pszDir, 700); + rc = RTDirCreateFullPath(pszDir, 700); if (rc == VERR_ALREADY_EXISTS) rc = VINF_SUCCESS; } return rc; } +/** + * Checks whether a specific host/guest directory exists. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param bGuest true if directory needs to be checked on the guest + * or false if on the host. + * @param pszDir Actual directory to check. + * @param fExists Pointer which receives the result if the + * given directory exists or not. + */ static int ctrlCopyDirExists(PCOPYCONTEXT pContext, bool bGuest, const char *pszDir, bool *fExists) { @@ -1005,6 +1047,16 @@ static int ctrlCopyDirExists(PCOPYCONTEXT pContext, bool bGuest, return rc; } +/** + * Checks whether a specific directory exists on the destination, based + * on the current copy context. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszDir Actual directory to check. + * @param fExists Pointer which receives the result if the + * given directory exists or not. + */ static int ctrlCopyDirExistsOnDest(PCOPYCONTEXT pContext, const char *pszDir, bool *fExists) { @@ -1012,6 +1064,16 @@ static int ctrlCopyDirExistsOnDest(PCOPYCONTEXT pContext, const char *pszDir, pszDir, fExists); } +/** + * Checks whether a specific directory exists on the source, based + * on the current copy context. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszDir Actual directory to check. + * @param fExists Pointer which receives the result if the + * given directory exists or not. + */ static int ctrlCopyDirExistsOnSource(PCOPYCONTEXT pContext, const char *pszDir, bool *fExists) { @@ -1019,6 +1081,17 @@ static int ctrlCopyDirExistsOnSource(PCOPYCONTEXT pContext, const char *pszDir, pszDir, fExists); } +/** + * Checks whether a specific host/guest file exists. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param bGuest true if file needs to be checked on the guest + * or false if on the host. + * @param pszFile Actual file to check. + * @param fExists Pointer which receives the result if the + * given file exists or not. + */ static int ctrlCopyFileExists(PCOPYCONTEXT pContext, bool bOnGuest, const char *pszFile, bool *fExists) { @@ -1043,6 +1116,16 @@ static int ctrlCopyFileExists(PCOPYCONTEXT pContext, bool bOnGuest, return rc; } +/** + * Checks whether a specific file exists on the destination, based on the + * current copy context. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszFile Actual file to check. + * @param fExists Pointer which receives the result if the + * given file exists or not. + */ static int ctrlCopyFileExistsOnDest(PCOPYCONTEXT pContext, const char *pszFile, bool *fExists) { @@ -1050,6 +1133,16 @@ static int ctrlCopyFileExistsOnDest(PCOPYCONTEXT pContext, const char *pszFile, pszFile, fExists); } +/** + * Checks whether a specific file exists on the source, based on the + * current copy context. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszFile Actual file to check. + * @param fExists Pointer which receives the result if the + * given file exists or not. + */ static int ctrlCopyFileExistsOnSource(PCOPYCONTEXT pContext, const char *pszFile, bool *fExists) { @@ -1057,18 +1150,30 @@ static int ctrlCopyFileExistsOnSource(PCOPYCONTEXT pContext, const char *pszFile pszFile, fExists); } -static int ctrlCopyFileToTarget(PCOPYCONTEXT pContext, const char *pszFileSource, - const char *pszFileDest, uint32_t fFlags) +/** + * Copies a source file to the destination. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszFileSource Source file to copy to the destination. + * @param pszFileDest Name of copied file on the destination. + * @param fFlags Copy flags. No supported at the moment and needs + * to be set to 0. + */ +static int ctrlCopyFileToDest(PCOPYCONTEXT pContext, const char *pszFileSource, + const char *pszFileDest, uint32_t fFlags) { AssertPtrReturn(pContext, VERR_INVALID_POINTER); AssertPtrReturn(pszFileSource, VERR_INVALID_POINTER); AssertPtrReturn(pszFileDest, VERR_INVALID_POINTER); + AssertReturn(!fFlags, VERR_INVALID_POINTER); /* No flags supported yet. */ if (pContext->fVerbose) - { RTPrintf("Copying \"%s\" to \"%s\" ...\n", pszFileSource, pszFileDest); - } + + if (pContext->fDryRun) + return VINF_SUCCESS; int vrc = VINF_SUCCESS; ComPtr<IProgress> progress; @@ -1098,10 +1203,22 @@ static int ctrlCopyFileToTarget(PCOPYCONTEXT pContext, const char *pszFileSource return vrc; } +/** + * Copys a directory (tree) from host to the guest. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszSource Source directory on the host to copy to the guest. + * @param pszFilter DOS-style wildcard filter (?, *). Optional. + * @param pszDest Destination directory on the guest. + * @param fFlags Copy flags, such as recursive copying. + * @param pszSubDir Current sub directory to handle. Needs to NULL and only + * is needed for recursion. + */ static int ctrlCopyDirToGuest(PCOPYCONTEXT pContext, const char *pszSource, const char *pszFilter, const char *pszDest, uint32_t fFlags, - const char *pszSubDir /* For recursion */) + const char *pszSubDir /* For recursion. */) { AssertPtrReturn(pContext, VERR_INVALID_POINTER); AssertPtrReturn(pszSource, VERR_INVALID_POINTER); @@ -1117,6 +1234,9 @@ static int ctrlCopyDirToGuest(PCOPYCONTEXT pContext, if (RT_SUCCESS(rc) && pszSubDir) rc = RTPathAppend(szCurDir, sizeof(szCurDir), pszSubDir); + if (pContext->fVerbose) + RTPrintf("Processing directory: %s\n", szCurDir); + /* Flag indicating whether the current directory was created on the * target or not. */ bool fDirCreated = false; @@ -1156,13 +1276,19 @@ static int ctrlCopyDirToGuest(PCOPYCONTEXT pContext, || !strcmp(DirEntry.szName, "..")) break; + if (pContext->fVerbose) + RTPrintf("Directory: %s\n", DirEntry.szName); + if (fFlags & CopyFileFlag_Recursive) { char *pszNewSub = NULL; if (pszSubDir) - RTStrAPrintf(&pszNewSub, "%s/%s", pszSubDir, DirEntry.szName); + pszNewSub = RTPathJoinA(pszSubDir, DirEntry.szName); else - RTStrAPrintf(&pszNewSub, "%s", DirEntry.szName); + { + pszNewSub = RTStrDup(DirEntry.szName); + RTPathStripTrailingSlash(pszNewSub); + } if (pszNewSub) { @@ -1188,40 +1314,44 @@ static int ctrlCopyDirToGuest(PCOPYCONTEXT pContext, case RTDIRENTRYTYPE_FILE: { - if ( !pszFilter - || RTStrSimplePatternMatch(pszFilter, DirEntry.szName)) + if ( pszFilter + && !RTStrSimplePatternMatch(pszFilter, DirEntry.szName)) + { + break; /* Filter does not match. */ + } + + if (pContext->fVerbose) + RTPrintf("File: %s\n", DirEntry.szName); + + if (!fDirCreated) { - if (!fDirCreated) + char *pszDestDir; + rc = ctrlCopyTranslatePath(pszSource, szCurDir, + pszDest, &pszDestDir); + if (RT_SUCCESS(rc)) { - char *pszDestDir; - rc = ctrlCopyTranslatePath(pszSource, szCurDir, - pszDest, &pszDestDir); - if (RT_SUCCESS(rc)) - { - rc = ctrlCopyDirCreate(pContext, pszDestDir); - RTStrFree(pszDestDir); + rc = ctrlCopyDirCreate(pContext, pszDestDir); + RTStrFree(pszDestDir); - fDirCreated = true; - } + fDirCreated = true; } + } - if (RT_SUCCESS(rc)) + if (RT_SUCCESS(rc)) + { + char *pszFileSource = RTPathJoinA(szCurDir, DirEntry.szName); + if (pszFileSource) { - char *pszFileSource; - if (RTStrAPrintf(&pszFileSource, "%s/%s", - szCurDir, DirEntry.szName)) + char *pszFileDest; + rc = ctrlCopyTranslatePath(pszSource, pszFileSource, + pszDest, &pszFileDest); + if (RT_SUCCESS(rc)) { - char *pszFileDest; - rc = ctrlCopyTranslatePath(pszSource, pszFileSource, - pszDest, &pszFileDest); - if (RT_SUCCESS(rc)) - { - rc = ctrlCopyFileToTarget(pContext, pszFileSource, - pszFileDest, 0 /* Flags? */); - RTStrFree(pszFileDest); - } - RTStrFree(pszFileSource); + rc = ctrlCopyFileToDest(pContext, pszFileSource, + pszFileDest, 0 /* Flags */); + RTStrFree(pszFileDest); } + RTStrFree(pszFileSource); } } break; @@ -1239,10 +1369,22 @@ static int ctrlCopyDirToGuest(PCOPYCONTEXT pContext, return rc; } +/** + * Copys a directory (tree) from guest to the host. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszSource Source directory on the guest to copy to the host. + * @param pszFilter DOS-style wildcard filter (?, *). Optional. + * @param pszDest Destination directory on the host. + * @param fFlags Copy flags, such as recursive copying. + * @param pszSubDir Current sub directory to handle. Needs to NULL and only + * is needed for recursion. + */ static int ctrlCopyDirToHost(PCOPYCONTEXT pContext, const char *pszSource, const char *pszFilter, const char *pszDest, uint32_t fFlags, - const char *pszSubDir /* For recursion */) + const char *pszSubDir /* For recursion. */) { AssertPtrReturn(pContext, VERR_INVALID_POINTER); AssertPtrReturn(pszSource, VERR_INVALID_POINTER); @@ -1261,6 +1403,9 @@ static int ctrlCopyDirToHost(PCOPYCONTEXT pContext, if (RT_FAILURE(rc)) return rc; + if (pContext->fVerbose) + RTPrintf("Processing directory: %s\n", szCurDir); + /* Flag indicating whether the current directory was created on the * target or not. */ bool fDirCreated = false; @@ -1292,15 +1437,23 @@ static int ctrlCopyDirToHost(PCOPYCONTEXT pContext, || !strName.compare(Bstr(".."))) break; + if (pContext->fVerbose) + { + Utf8Str Utf8Dir(strName); + RTPrintf("Directory: %s\n", Utf8Dir.c_str()); + } + if (fFlags & CopyFileFlag_Recursive) { Utf8Str strDir(strName); char *pszNewSub = NULL; if (pszSubDir) - RTStrAPrintf(&pszNewSub, "%s/%s", pszSubDir, strDir.c_str()); + pszNewSub = RTPathJoinA(pszSubDir, strDir.c_str()); else - RTStrAPrintf(&pszNewSub, "%s", strDir.c_str()); - + { + pszNewSub = RTStrDup(strDir.c_str()); + RTPathStripTrailingSlash(pszNewSub); + } if (pszNewSub) { rc = ctrlCopyDirToHost(pContext, @@ -1326,43 +1479,47 @@ static int ctrlCopyDirToHost(PCOPYCONTEXT pContext, case GuestDirEntryType_File: { Utf8Str strFile(strName); - if ( !pszFilter - || RTStrSimplePatternMatch(pszFilter, strFile.c_str())) + if ( pszFilter + && !RTStrSimplePatternMatch(pszFilter, strFile.c_str())) + { + break; /* Filter does not match. */ + } + + if (pContext->fVerbose) + RTPrintf("File: %s\n", strFile.c_str()); + + if (!fDirCreated) { - if (!fDirCreated) + char *pszDestDir; + rc = ctrlCopyTranslatePath(pszSource, szCurDir, + pszDest, &pszDestDir); + if (RT_SUCCESS(rc)) { - char *pszDestDir; - rc = ctrlCopyTranslatePath(pszSource, szCurDir, - pszDest, &pszDestDir); - if (RT_SUCCESS(rc)) - { - rc = ctrlCopyDirCreate(pContext, pszDestDir); - RTStrFree(pszDestDir); + rc = ctrlCopyDirCreate(pContext, pszDestDir); + RTStrFree(pszDestDir); - fDirCreated = true; - } + fDirCreated = true; } + } - if (RT_SUCCESS(rc)) + if (RT_SUCCESS(rc)) + { + char *pszFileSource = RTPathJoinA(szCurDir, strFile.c_str()); + if (pszFileSource) { - char *pszFileSource; - if (RTStrAPrintf(&pszFileSource, "%s/%s", - szCurDir, strFile.c_str())) + char *pszFileDest; + rc = ctrlCopyTranslatePath(pszSource, pszFileSource, + pszDest, &pszFileDest); + if (RT_SUCCESS(rc)) { - char *pszFileDest; - rc = ctrlCopyTranslatePath(pszSource, pszFileSource, - pszDest, &pszFileDest); - if (RT_SUCCESS(rc)) - { - rc = ctrlCopyFileToTarget(pContext, pszFileSource, - pszFileDest, 0 /* Flags? */); - RTStrFree(pszFileDest); - } - RTStrFree(pszFileSource); + rc = ctrlCopyFileToDest(pContext, pszFileSource, + pszFileDest, 0 /* Flags */); + RTStrFree(pszFileDest); } - else - rc = VERR_NO_MEMORY; + RTStrFree(pszFileSource); } + else + rc = VERR_NO_MEMORY; } break; } @@ -1395,18 +1552,37 @@ static int ctrlCopyDirToHost(PCOPYCONTEXT pContext, return rc; } -static int ctrlCopyDirToTarget(PCOPYCONTEXT pContext, - const char *pszSource, const char *pszFilter, - const char *pszDest, uint32_t fFlags, - const char *pszSubDir /* For recursion */) +/** + * Copys a directory (tree) to the destination, based on the current copy + * context. + * + * @return IPRT status code. + * @param pContext Pointer to current copy control context. + * @param pszSource Source directory to copy to the destination. + * @param pszFilter DOS-style wildcard filter (?, *). Optional. + * @param pszDest Destination directory where to copy in the source + * source directory. + * @param fFlags Copy flags, such as recursive copying. + */ +static int ctrlCopyDirToDest(PCOPYCONTEXT pContext, + const char *pszSource, const char *pszFilter, + const char *pszDest, uint32_t fFlags) { if (pContext->fHostToGuest) return ctrlCopyDirToGuest(pContext, pszSource, pszFilter, - pszDest, fFlags, pszSubDir); + pszDest, fFlags, NULL /* Sub directory, only for recursion. */); return ctrlCopyDirToHost(pContext, pszSource, pszFilter, - pszDest, fFlags, pszSubDir); + pszDest, fFlags, NULL /* Sub directory, only for recursion. */); } +/** + * Creates a source root by stripping file names or filters of the specified source. + * + * @return IPRT status code. + * @param pszSource Source to create source root for. + * @param ppszSourceRoot Pointer that receives the allocated source root. Needs + * to be free'd with ctrlCopyFreeSourceRoot(). + */ static int ctrlCopyCreateSourceRoot(const char *pszSource, char **ppszSourceRoot) { AssertPtrReturn(pszSource, VERR_INVALID_POINTER); @@ -1439,6 +1615,12 @@ static int ctrlCopyCreateSourceRoot(const char *pszSource, char **ppszSourceRoot return VINF_SUCCESS; } +/** + * Frees a previously allocated source root. + * + * @return IPRT status code. + * @param pszSourceRoot Source root to free. + */ static void ctrlCopyFreeSourceRoot(char *pszSourceRoot) { RTStrFree(pszSourceRoot); @@ -1463,12 +1645,6 @@ static int handleCtrlCopyTo(ComPtr<IGuest> guest, HandlerArg *pArg, * what and how to implement the file enumeration/recursive lookup, like VBoxManage * does in here. */ - -#ifdef DEBUG_andy - tstTranslatePath(); - return VINF_SUCCESS; -#endif - static const RTGETOPTDEF s_aOptions[] = { { "--dryrun", GETOPTDEF_COPYTO_DRYRUN, RTGETOPT_REQ_NOTHING }, @@ -1582,7 +1758,7 @@ static int handleCtrlCopyTo(ComPtr<IGuest> guest, HandlerArg *pArg, /* Create the copy context -- it contains all information * the routines need to know when handling the actual copying. */ PCOPYCONTEXT pContext; - vrc = ctrlCopyContextCreate(guest, fVerbose, fHostToGuest, + vrc = ctrlCopyContextCreate(guest, fVerbose, fDryRun, fHostToGuest, Utf8UserName.c_str(), Utf8Password.c_str(), &pContext); if (RT_FAILURE(vrc)) @@ -1610,7 +1786,8 @@ static int handleCtrlCopyTo(ComPtr<IGuest> guest, HandlerArg *pArg, */ for (unsigned long s = 0; s < vecSources.size(); s++) { - const char *pszSource = vecSources[s].mSource.c_str(); + char *pszSource = RTStrDup(vecSources[s].mSource.c_str()); + AssertPtrBreakStmt(pszSource, vrc = VERR_NO_MEMORY); const char *pszFilter = vecSources[s].mFilter.c_str(); if (!strlen(pszFilter)) pszFilter = NULL; /* If empty filter then there's no filter :-) */ @@ -1629,18 +1806,26 @@ static int handleCtrlCopyTo(ComPtr<IGuest> guest, HandlerArg *pArg, /** @todo Files with filter?? */ bool fIsFile = false; bool fExists; - Utf8Str Utf8CurSource(pszSource); - if ( Utf8CurSource.endsWith("/") - || Utf8CurSource.endsWith("\\")) + + size_t cchSource = strlen(pszSource); + if ( cchSource > 1 + && RTPATH_IS_SLASH(pszSource[cchSource - 1])) { #ifndef DEBUG_andy if (pContext->fHostToGuest) { #endif - if (pszFilter) /* Directory with filter. */ + if (pszFilter) /* Directory with filter (so use source root w/o the actual filter). */ vrc = ctrlCopyDirExistsOnSource(pContext, pszSourceRoot, &fExists); else /* Regular directory without filter. */ vrc = ctrlCopyDirExistsOnSource(pContext, pszSource, &fExists); + + if (fExists) + { + /* Strip trailing slash from our source element so that other functions + * can use this stuff properly (like RTPathStartsWith). */ + RTPathStripTrailingSlash(pszSource); + } #ifndef DEBUG_andy } else @@ -1655,10 +1840,13 @@ static int handleCtrlCopyTo(ComPtr<IGuest> guest, HandlerArg *pArg, vrc = ctrlCopyFileExistsOnSource(pContext, pszSource, &fExists); if ( RT_SUCCESS(vrc) && fExists) + { fIsFile = true; + } } - if (RT_SUCCESS(vrc)) + if ( RT_SUCCESS(vrc) + && fExists) { if (fIsFile) { @@ -1668,21 +1856,19 @@ static int handleCtrlCopyTo(ComPtr<IGuest> guest, HandlerArg *pArg, Utf8Dest.c_str(), &pszDestFile); if (RT_SUCCESS(vrc)) { - vrc = ctrlCopyFileToTarget(pContext, pszSource, - pszDestFile, fFlags); + vrc = ctrlCopyFileToDest(pContext, pszSource, + pszDestFile, 0 /* Flags */); RTStrFree(pszDestFile); } else - { RTMsgError("Unable to translate path for \"%s\", rc=%Rrc\n", pszSource, vrc); - } } else { /* Directory (with filter?). */ - vrc = ctrlCopyDirToTarget(pContext, pszSource, pszFilter, - Utf8Dest.c_str(), fFlags, NULL /* Subdir */); + vrc = ctrlCopyDirToDest(pContext, pszSource, pszFilter, + Utf8Dest.c_str(), fFlags); } } @@ -1693,15 +1879,18 @@ static int handleCtrlCopyTo(ComPtr<IGuest> guest, HandlerArg *pArg, { RTMsgError("Warning: Source \"%s\" does not exist, skipping!\n", pszSource); + RTStrFree(pszSource); continue; } - - if (RT_FAILURE(vrc)) + else if (RT_FAILURE(vrc)) { RTMsgError("Error processing \"%s\", rc=%Rrc\n", pszSource, vrc); + RTStrFree(pszSource); break; } + + RTStrFree(pszSource); } } @@ -1927,7 +2116,7 @@ static int handleCtrlStat(ComPtr<IGuest> guest, HandlerArg *pArg) * drop out with exitcode 1. */ if (!fExists) { - RTPrintf("Cannot stat for element \"%s\": No such file or directory.\n", + RTPrintf("Cannot stat for element \"%s\": No such file or directory\n", it->first.c_str()); rcExit = RTEXITCODE_FAILURE; } @@ -2011,7 +2200,7 @@ static int handleCtrlUpdateAdditions(ComPtr<IGuest> guest, HandlerArg *pArg) Utf8Source = Utf8Src2; else { - RTMsgError("Source could not be determined! Please use --source to specify a valid source.\n"); + RTMsgError("Source could not be determined! Please use --source to specify a valid source\n"); vrc = VERR_FILE_NOT_FOUND; } } @@ -2039,8 +2228,11 @@ static int handleCtrlUpdateAdditions(ComPtr<IGuest> guest, HandlerArg *pArg) rc = showProgress(progress); if (FAILED(rc)) vrc = ctrlPrintProgressError(progress); - else if (fVerbose) - RTPrintf("Guest Additions update successful.\n"); + else if ( SUCCEEDED(rc) + && fVerbose) + { + RTPrintf("Guest Additions update successful\n"); + } } } @@ -2057,6 +2249,11 @@ int handleGuestControl(HandlerArg *pArg) { AssertPtrReturn(pArg, VERR_INVALID_PARAMETER); +#ifdef DEBUG_andy + if (RT_FAILURE(tstTranslatePath())) + return RTEXITCODE_FAILURE; +#endif + HandlerArg arg = *pArg; arg.argc = pArg->argc - 2; /* Skip VM name and sub command. */ arg.argv = pArg->argv + 2; /* Same here. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp index 5933d3288..dd045f206 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageGuestProp.cpp 35951 2011-02-14 08:15:55Z vboxsync $ */ +/* $Id: VBoxManageGuestProp.cpp $ */ /** @file * VBoxManage - Implementation of guestproperty command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp index 292dfcb55..4679258f1 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageHelp.cpp 38191 2011-07-26 17:02:38Z vboxsync $ */ +/* $Id: VBoxManageHelp.cpp $ */ /** @file * VBoxManage - help and other message output. */ @@ -542,10 +542,12 @@ void printUsage(USAGECATEGORY u64Cmd, PRTSTREAM pStrm) "VBoxManage convertfromraw <filename> <outputfile>\n" " [--format VDI|VMDK|VHD]\n" " [--variant Standard,Fixed,Split2G,Stream,ESX]\n" + " [--uuid <uuid>\n>" #ifndef RT_OS_WINDOWS "VBoxManage convertfromraw stdin <outputfile> <bytes>\n" " [--format VDI|VMDK|VHD]\n" " [--variant Standard,Fixed,Split2G,Stream,ESX]\n" + " [--uuid <uuid>\n>" #endif "\n"); diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp index 7c417aba8..31b456507 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageHostonly.cpp 35330 2010-12-24 18:05:33Z vboxsync $ */ +/* $Id: VBoxManageHostonly.cpp $ */ /** @file * VBoxManage - Implementation of hostonlyif command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp index 8a2159cde..618697df2 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageInfo.cpp 37778 2011-07-05 12:10:49Z vboxsync $ */ +/* $Id: VBoxManageInfo.cpp $ */ /** @file * VBoxManage - The 'showvminfo' command and helper routines. */ @@ -1436,10 +1436,17 @@ HRESULT showVMInfo(ComPtr<IVirtualBox> virtualBox, if (console) { - ComPtr<IDisplay> display; - CHECK_ERROR_RET(console, COMGETTER(Display)(display.asOutParam()), rc); do { + ComPtr<IDisplay> display; + rc = console->COMGETTER(Display)(display.asOutParam()); + if (rc == E_ACCESSDENIED) + break; /* VM not powered up */ + if (FAILED(rc)) + { + com::GlueHandleComError(console, "COMGETTER(Display)(display.asOutParam())", rc, __FILE__, __LINE__); + return rc; + } ULONG xRes, yRes, bpp; rc = display->GetScreenResolution(0, &xRes, &yRes, &bpp); if (rc == E_ACCESSDENIED) diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp index 9776711c6..fae93a06a 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageList.cpp 37244 2011-05-30 08:28:07Z vboxsync $ */ +/* $Id: VBoxManageList.cpp $ */ /** @file * VBoxManage - The 'list' command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp index f35957ea6..69249f451 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageMetrics.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxManageMetrics.cpp $ */ /** @file * VBoxManage - The 'metrics' command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp index 377e245a8..5d5a768d5 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageMisc.cpp 38191 2011-07-26 17:02:38Z vboxsync $ */ +/* $Id: VBoxManageMisc.cpp $ */ /** @file * VBoxManage - VirtualBox's command-line interface. */ @@ -1070,9 +1070,9 @@ int handleExtPack(HandlerArg *a) return errorSyntax(USAGE_EXTPACK, "No extension pack name was given to \"extpack install\""); char szPath[RTPATH_MAX]; - int vrc = RTPathAbs(a->argv[1], szPath, sizeof(szPath)); + int vrc = RTPathAbs(pszName, szPath, sizeof(szPath)); if (RT_FAILURE(vrc)) - return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs(%s,,) failed with rc=%Rrc", a->argv[1], vrc); + return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs(%s,,) failed with rc=%Rrc", pszName, vrc); Bstr bstrTarball(szPath); Bstr bstrName; diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp index e4250438f..ac9e0896f 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageModifyVM.cpp 37817 2011-07-07 13:02:40Z vboxsync $ */ +/* $Id: VBoxManageModifyVM.cpp $ */ /** @file * VBoxManage - Implementation of modifyvm command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp index 9bcbd79a4..dbb2e47cb 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageSnapshot.cpp 33425 2010-10-25 14:30:43Z vboxsync $ */ +/* $Id: VBoxManageSnapshot.cpp $ */ /** @file * VBoxManage - The 'snapshot' command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp index c924499e0..a3df29ad5 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageStorageController.cpp 38330 2011-08-05 15:19:55Z vboxsync $ */ +/* $Id: VBoxManageStorageController.cpp $ */ /** @file * VBoxManage - The storage controller related commands. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp index 13f2e9d2b..91d987813 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageUSB.cpp 33294 2010-10-21 10:45:26Z vboxsync $ */ +/* $Id: VBoxManageUSB.cpp $ */ /** @file * VBoxManage - VirtualBox's command-line interface. */ diff --git a/src/VBox/Frontends/VBoxSDL/Makefile.kmk b/src/VBox/Frontends/VBoxSDL/Makefile.kmk index b5ca7a216..26eb02b20 100644 --- a/src/VBox/Frontends/VBoxSDL/Makefile.kmk +++ b/src/VBox/Frontends/VBoxSDL/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxSDL (a simple frontend based on SDL). # diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp index 45ea2aa8b..f2ae76400 100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxSDLHardened.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxSDLHardened.cpp $ */ /** @file * VBoxSDL - Hardened main(). */ diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m b/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m index 6383e7c1a..6383e7c1a 100755..100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m diff --git a/src/VBox/Frontends/VBoxShell/Makefile.kmk b/src/VBox/Frontends/VBoxShell/Makefile.kmk index 5702fb21c..2af597825 100644 --- a/src/VBox/Frontends/VBoxShell/Makefile.kmk +++ b/src/VBox/Frontends/VBoxShell/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38003 2011-07-18 10:17:01Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the shell frontend. # diff --git a/src/VBox/Frontends/VBoxShell/vboxinfo.vbs b/src/VBox/Frontends/VBoxShell/vboxinfo.vbs index c62659549..7ef0d6e57 100644 --- a/src/VBox/Frontends/VBoxShell/vboxinfo.vbs +++ b/src/VBox/Frontends/VBoxShell/vboxinfo.vbs @@ -1,14 +1,14 @@ '
-' Copyright (C) 2009 Oracle Corporation
-'
-' This file is part of VirtualBox Open Source Edition (OSE), as
-' available from http://www.virtualbox.org. This file is free software;
-' you can redistribute it and/or modify it under the terms of the GNU
-' General Public License (GPL) as published by the Free Software
-' Foundation, in version 2 as it comes in the "COPYING" file of the
-' VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-' hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-'
+' Copyright (C) 2009 Oracle Corporation +' +' This file is part of VirtualBox Open Source Edition (OSE), as +' available from http://www.virtualbox.org. This file is free software; +' you can redistribute it and/or modify it under the terms of the GNU +' General Public License (GPL) as published by the Free Software +' Foundation, in version 2 as it comes in the "COPYING" file of the +' VirtualBox OSE distribution. VirtualBox OSE is distributed in the +' hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +' Sub Print(str)
Wscript.Echo str
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index ed0163b8b..255792712 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38421 2011-08-11 14:55:02Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the VirtualBox Qt GUI. # @@ -129,6 +129,7 @@ VirtualBox_DEFS += \ $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \ $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \ $(if $(VBOX_WITH_UDPTUNNEL),VBOX_WITH_UDPTUNNEL) \ + $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK) \ $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI) \ $(if $(VBOX_GUI_WITH_PIDFILE),VBOX_GUI_WITH_PIDFILE) \ $(if $(VBOX_GUI_WITH_KEYS_RESET_HANDLER),VBOX_GUI_WITH_KEYS_RESET_HANDLER) \ @@ -145,6 +146,9 @@ ifdef VBOX_WITH_VIDEOHWACCEL else ifdef VBOX_GUI_USE_QGL VirtualBox_DEFS += VBOX_GUI_USE_QGL endif +ifdef VBOX_WITH_CROGL + VirtualBox_DEFS += VBOX_WITH_CROGL +endif ifdef VBOX_WITH_VIRTIO VirtualBox_DEFS += VBOX_WITH_VIRTIO endif @@ -270,7 +274,6 @@ VirtualBox_QT_MOCHDRS = \ src/UIMediumTypeChangeDialog.h \ src/VBoxSnapshotDetailsDlg.h \ src/VBoxTakeSnapshotDlg.h \ - src/VBoxUpdateDlg.h \ src/VBoxVMInformationDlg.h \ src/VBoxVMLogViewer.h \ src/VBoxLicenseViewer.h \ @@ -352,9 +355,11 @@ VirtualBox_QT_MOCHDRS = \ src/widgets/VBoxOSTypeSelectorWidget.h \ src/widgets/VBoxWarningPane.h \ src/net/UINetworkManager.h \ + src/net/UIUpdateManager.h \ src/net/UIDownloader.h \ src/net/UIDownloaderAdditions.h \ src/net/UIDownloaderUserManual.h \ + src/net/UIDownloaderExtensionPack.h \ src/selector/UIActionPoolSelector.h \ src/selector/UIVMDesktop.h \ src/selector/UIVMListView.h \ @@ -439,7 +444,6 @@ VirtualBox_SOURCES = \ src/VBoxMedium.cpp \ src/VBoxSnapshotDetailsDlg.cpp \ src/VBoxTakeSnapshotDlg.cpp \ - src/VBoxUpdateDlg.cpp \ src/VBoxVMInformationDlg.cpp \ src/VBoxVMLogViewer.cpp \ src/VBoxLicenseViewer.cpp \ @@ -525,9 +529,12 @@ VirtualBox_SOURCES = \ src/widgets/VBoxOSTypeSelectorWidget.cpp \ src/widgets/VBoxWarningPane.cpp \ src/net/UINetworkManager.cpp \ + src/net/UIUpdateDefs.cpp \ + src/net/UIUpdateManager.cpp \ src/net/UIDownloader.cpp \ src/net/UIDownloaderAdditions.cpp \ src/net/UIDownloaderUserManual.cpp \ + src/net/UIDownloaderExtensionPack.cpp \ src/selector/UIActionPoolSelector.cpp \ src/selector/UISelectorShortcuts.cpp \ src/selector/UIVMDesktop.cpp \ diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro index 3826454cf..094a76142 100644 --- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro +++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro @@ -25,7 +25,6 @@ FORMS = \ src/VBoxMediaManagerDlg.ui \ src/VBoxSnapshotDetailsDlg.ui \ src/VBoxTakeSnapshotDlg.ui \ - src/VBoxUpdateDlg.ui \ src/VBoxVMLogViewer.ui \ src/settings/UISettingsDialog.ui \ src/settings/global/UIGlobalSettingsGeneral.ui \ diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc index abde5e020..dc15f4f96 100644 --- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc @@ -54,6 +54,8 @@ <file alias="os_win31.png">images/os_win31.png</file> <file alias="os_win7.png">images/os_win7.png</file> <file alias="os_win7_64.png">images/os_win7_64.png</file> + <file alias="os_win8.png">images/os_win8.png</file> + <file alias="os_win8_64.png">images/os_win8_64.png</file> <file alias="os_win95.png">images/os_win95.png</file> <file alias="os_win98.png">images/os_win98.png</file> <file alias="os_winme.png">images/os_winme.png</file> diff --git a/src/VBox/Frontends/VirtualBox/images/os_win8.png b/src/VBox/Frontends/VirtualBox/images/os_win8.png Binary files differnew file mode 100644 index 000000000..974bbecc2 --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/images/os_win8.png diff --git a/src/VBox/Frontends/VirtualBox/images/os_win8_64.png b/src/VBox/Frontends/VirtualBox/images/os_win8_64.png Binary files differnew file mode 100644 index 000000000..943bc0369 --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/images/os_win8_64.png diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk index e4cadd809..905238525 100644 --- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk +++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk @@ -1,4 +1,4 @@ -# $Id: ApprovedLanguages.kmk 31132 2010-07-27 09:06:38Z vboxsync $ +# $Id: ApprovedLanguages.kmk $ ## @file # ApprovedLanguages.kmk - List of approved GUI translations # diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts index 7c1cb0e7a..d698a3ffd 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts @@ -1007,6 +1007,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4598,6 +4605,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -4637,6 +4674,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -4826,6 +4874,18 @@ <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -5202,6 +5262,57 @@ </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>4 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>5 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>6 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 week</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 month</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Never</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">إلغاء</translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7919,93 +8030,6 @@ </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>4 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>5 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>6 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 week</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 month</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Never</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Chec&k</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Close</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Check for Updates</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Cancel</source> - <translation type="unfinished">إلغاء</translation> - </message> - <message> - <source>Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>Ctrl+E</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts index cb0dc5a57..791a63c26 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts @@ -193,11 +193,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>Копиране в буфера на вÑички грешки</translation> </message> <message> <source>Copy</source> - <translation type="unfinished">Копиране</translation> + <translation>Копиране</translation> </message> </context> <context> @@ -692,7 +692,7 @@ </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translation>Свързана оÑнова за %1 и %2</translation> </message> </context> <context> @@ -723,7 +723,7 @@ </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Когато е избрано, нов уникален MAC Ð°Ð´Ñ€ÐµÑ Ñ‰Ðµ бъде аÑоцииран към вÑички конфигурирани мрежови карти.</translation> </message> </context> <context> @@ -762,54 +762,54 @@ </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Пълно клониране</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Свързано клониране</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>МолÑ, изберете типа на клонирането.</p><p>Ðко изберете <b>Пълно клониране</b>, ще бъде Ñъздадено точно копие (включващо вÑички Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð½Ð° виртуални диÑкове) на оригиналната Ð’Ðœ, а ако изберете <b>Свързано клониране</b>, ще бъде Ñъздадена нова Ð’Ðœ, но изображениÑта на виртуалните диÑкове ще Ñочат към изображениÑта на виртуалните диÑкове на оригиналната Ð’Ðœ.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Имайте предвид, че Ñе Ñъздава нова Ñнимка Ñ Ð½Ð°Ñ‡Ð°Ð»Ð½Ð°Ñ‚Ð° Ð’Ðœ, в Ñлучай че изберете <b>Свързано клониране</b>.</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished">Текущо ÑÑŠÑтоÑние на машината</translation> + <translation>Текущо ÑÑŠÑтоÑние на машината</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished">Текущо ÑÑŠÑтоÑние на тази и дъщерните машини</translation> + <translation>Текущо ÑÑŠÑтоÑние на тази и дъщерните машини</translation> </message> <message> <source>All states</source> - <translation type="unfinished">Ð’Ñички ÑÑŠÑтоÑниÑ</translation> + <translation>Ð’Ñички ÑÑŠÑтоÑниÑ</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished">ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð° клониране</translation> + <translation>ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð·Ð° клониране</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished">МолÑ, изберете кои чаÑти от виртуалната машина да бъдат клонирани.</translation> + <translation>МолÑ, изберете кои чаÑти от виртуалната машина да бъдат клонирани.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished">Ðко изберете <b>Текущо ÑÑŠÑтоÑние на машината</b>, ще бъде клонирано Ñамо текущото ÑÑŠÑтоÑние на тази виртуална машина.</translation> + <translation>Ðко изберете <b>Текущо ÑÑŠÑтоÑние на машината</b>, ще бъде клонирано Ñамо текущото ÑÑŠÑтоÑние на тази виртуална машина.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished">Ðко изберете <b>Текущо ÑÑŠÑтоÑние на тази и на дъщерните машини</b>, ще бъдат клонрани ÑÑŠÑтоÑниÑта на тази машина и на вÑички нейни дъщерни Ñнимки.</translation> + <translation>Ðко изберете <b>Текущо ÑÑŠÑтоÑние на тази и на дъщерните машини</b>, ще бъдат клонрани ÑÑŠÑтоÑниÑта на тази машина и на вÑички нейни дъщерни Ñнимки.</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished">Ðко изберете <b>Ð’Ñички ÑÑŠÑтоÑниÑ</b>, ще бъдат клонирани тази машина и вÑички Ñнимки.</translation> + <translation>Ðко изберете <b>Ð’Ñички ÑÑŠÑтоÑниÑ</b>, ще бъдат клонирани тази машина и вÑички Ñнимки.</translation> </message> </context> <context> @@ -1158,6 +1158,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Изберете папка, в коÑто да Ñе запази %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2264,23 +2271,23 @@ p, li { white-space: pre-wrap; </style></head><body style=" </message> <message> <source>Left Shift</source> - <translation type="unfinished">ЛÑв Shift</translation> + <translation>ЛÑв Shift</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">ДеÑен Shift</translation> + <translation>ДеÑен Shift</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">ЛÑв Ctrl</translation> + <translation>ЛÑв Ctrl</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">ДеÑен Ctrl</translation> + <translation>ДеÑен Ctrl</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">ЛÑв Alt</translation> + <translation>ЛÑв Alt</translation> </message> <message> <source>Right Alt</source> @@ -3965,7 +3972,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation type="unfinished">Когато е избрано, Ñпира демонтирането на медиÑта, когато виртуалната ОС Ñ Ð¸Ð·Ð²Ð°Ð´Ð¸.</translation> + <translation>Когато е избрано, Ñпира демонтирането на медиÑта, когато виртуалната ОС Ñ Ð¸Ð·Ð²Ð°Ð´Ð¸.</translation> </message> <message> <source>&Live CD/DVD</source> @@ -3973,7 +3980,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the guest system will see the virtual disk as a solid state device.</source> - <translation type="unfinished">Когато е избрано, това маркира медиÑта като механично Ñтатично Ñъхранение (SSD).</translation> + <translation>Когато е избрано, това маркира медиÑта като механично Ñтатично Ñъхранение (SSD).</translation> </message> <message> <source>&Solid-state drive</source> @@ -4015,7 +4022,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source> - <translation type="unfinished">Избира Ð±Ñ€Ð¾Ñ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð²Ðµ на контролера за SATA Ñъхранение, текущо избран в Дървото за Ñъхранение. Тази ÑтойноÑÑ‚ не може да бъде по-малка от макÑимално Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ð¸Ñ Ð±Ñ€Ð¾Ð¹ портове + 1.</translation> + <translation>Избира Ð±Ñ€Ð¾Ñ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð²Ðµ на контролера за SATA Ñъхранение, текущо избран в Дървото за Ñъхранение. Тази ÑтойноÑÑ‚ Ñ‚Ñ€Ñбва да бъде поне Ñ ÐµÐ´Ð½Ð¾ по-голÑма от най-Ð³Ð¾Ð»ÐµÐ¼Ð¸Ñ Ð±Ñ€Ð¾Ð¹ портове, от които имате нужда.</translation> </message> </context> <context> @@ -4201,7 +4208,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source> - <translation type="unfinished">Указва тип на чипÑета, който да Ñе използва в тази Ð’Ðœ.</translation> + <translation>Избира чипÑета, който да бъде емулиран в тази виртуална машина. Имайте предвид, че емулациÑта на ICH9 чипÑет е екÑпериментална и не Ñе препоръчва, оÑвен за виртуални ÑиÑтеми (като Mac OS X), които го изиÑкват.</translation> </message> <message> <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> @@ -4235,7 +4242,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>избрали Ñте чипÑет тип ICH9 за тази Ð’Ðœ. Той нÑма да работи коректно, докато IO-APIC Ñъщо е позволен. Това ще бъде променено автоматично, когато потвърдите наÑтройките на Ð’Ðœ Ñ Ð½Ð°Ñ‚Ð¸Ñкането на бутона Добре.</translation> </message> </context> <context> @@ -5686,7 +5693,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> - <translation type="unfinished">СъÑтоÑнието на виртуалната машина, коÑто текущо редактирате, Ñе промени. Само наÑтройките, които Ñа редактируеми по време на изпълнение, ще бъдат запазени, когато натиÑнете Добре. Ð’Ñички промени в другите наÑтройки ще бъдат загубени.</translation> + <translation>Виртуалната машина, коÑто текущо редактирате, беше Ñтартирана. Само нÑкои наÑтройки могат да бъдат променÑни, докато машината е включена. Ð’Ñички промени в другите наÑтройки ще бъдат загубени, ако затворите този прозорец Ñега.</translation> </message> <message> <source>Failed to clone the virtual machine <b>%1</b>.</source> @@ -5734,11 +5741,41 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Ðе може да Ñе намери Ñнимка Ñ Ð¸Ð¼Ðµ <b>%1</b>.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="unfinished"><p>ИзтеглениÑÑ‚ файл не може да Ñе запише като <nobr><b>%1</b>.</nobr></p></translation> + <translation><p>ИзтеглениÑÑ‚ файл не може да Ñе запише като <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Имате инÑталирана Ñтара верÑÐ¸Ñ (%1) на <b><nobr>%2</nobr></b>.</p><p>ИÑкате ли да изтеглите поÑледната от Интернет?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>ИзтеглÑне</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Сигурни ли Ñте, че иÑкате да изтеглите <b><nobr>%1</nobr></b> от <nobr><a href="%2">%2</a></nobr> (размер %3 байта)?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p>УÑпешно изтеглÑне на <b><nobr>%1</nobr></b> от <nobr><a href="%2">%2</a></nobr> и запазване локално като <nobr><b>%3</b>.</nobr></p><p>ИÑкате ли да инÑталирате този пакет Ñ Ñ€Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>ИнÑталациÑ</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p>УÑпешно изтеглÑне на <b><nobr>%1</nobr></b> от <nobr><a href="%2">%2</a></nobr> но не може да Ñе запази локално като <nobr><b>%3</b>.</nobr></p><p>МолÑ, изберете друго мÑÑто за този файл.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>ÐеуÑпех при изтеглÑнето на <b><nobr>%1</nobr></b> от <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> </message> </context> <context> @@ -5779,11 +5816,22 @@ p, li { white-space: pre-wrap; } <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished">ПрекъÑване изтеглÑнето на CD изображението VirtualBox Виртуални Добавки</translation> + <translation>ПрекъÑване изтеглÑнето на CD изображението VirtualBox Виртуални Добавки</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished">ИзтеглÑне на CD изображението VirtualBox Виртуални Добавки от <nobr><b>%1</b>...</nobr></translation> + <translation>ИзтеглÑне на CD изображението VirtualBox Виртуални Добавки от <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>ПрекъÑване изтеглÑнето на <nobr><b>%1</b></nobr></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>ИзтеглÑне на <nobr><b>%1</b></nobr> от <nobr><b>%2</b>...</nobr></translation> </message> </context> <context> @@ -6018,7 +6066,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> - <translation type="unfinished">ÐатиÑнете бутона <b>Избор</b>, за да изберете меÑтоположение на файла, в който ще Ñе ÑъхранÑват данните на Ñ‚Ð²ÑŠÑ€Ð´Ð¸Ñ Ð´Ð¸Ñк, или въведете име на файла в полето за въвеждане.</translation> + <translation>МолÑ, впишете името на файла на Ð½Ð¾Ð²Ð¸Ñ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÐµÐ½ диÑк в кутийката по-долу, или кликнете на иконата Ñ Ð¿Ð°Ð¿ÐºÐ°, за да изберете друга папка, в коÑто да Ñе Ñъздаде файлът.</translation> </message> <message> <source><nobr>%1 (%2 B)</nobr></source> @@ -6050,6 +6098,18 @@ p, li { white-space: pre-wrap; } <comment>summary</comment> <translation>Детайли</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (Паралелен Твърд ДиÑк)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (QEMU уÑилен диÑк)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (QEMU Копиране-При-ЗапиÑ)</translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6405,11 +6465,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">Зареждащ твърд &диÑк</translation> + <translation>Зареждащ &диÑк</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>Изберете виртуален твърд диÑк, който да Ñе използва като зареждащ твърд диÑк във виртуалната машина. Можете или да Ñъздадете нов твърд диÑк, или да изберете вече ÑъщеÑтвуващ от Ð¿Ð°Ð´Ð°Ñ‰Ð¸Ñ ÑпиÑък, Ñ Ð½Ð°Ñ‚Ð¸Ñкане на ÑÑŠÐ¾Ñ‚Ð²ÐµÑ‚Ð½Ð¸Ñ Ð±ÑƒÑ‚Ð¾Ð½ (за да извикате прозорец за отварÑне на файл).</p><p>Ðко имате нужда от по-Ñложна наÑтройка на Ñ‚Ð²ÑŠÑ€Ð´Ð¸Ñ Ð´Ð¸Ñк, можете да пропуÑнете тази Ñтъпка и да закачите твърд диÑк по-къÑно, като използвате диалога за нÑтройки на Ð’Ðœ.</p></translation> + <translation><p>Ðко иÑкате, Ñега можете да добавите зареждащ диÑк към новата машина. Можете или да Ñъздадете нов виртуален диÑк, или да изберете един от ÑпиÑъка или друго мÑÑто, като използвате иконата Ñ Ð¿Ð°Ð¿ÐºÐ°.</p><p>Ðко имате нужда от по-Ñложна наÑтройка на Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»Ð½Ñ Ð´Ð¸Ñк, можете да пропуÑнете тази Ñтъпка и да направите промените в наÑтройките на машината, Ñлед като машината бъде Ñъздадена.</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -6417,7 +6477,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">ПрепоръчителниÑÑ‚ размер на Ð·Ð°Ñ€ÐµÐ¶Ð´Ð°Ñ‰Ð¸Ñ Ñ‚Ð²ÑŠÑ€Ð´ диÑк е <b>%1</b>.</translation> + <translation>ПрепоръчителниÑÑ‚ размер на Ð·Ð°Ñ€ÐµÐ¶Ð´Ð°Ñ‰Ð¸Ñ Ð´Ð¸Ñк е <b>%1</b>.</translation> </message> </context> <context> @@ -6453,7 +6513,7 @@ p, li { white-space: pre-wrap; } <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">Зареждащ твърд диÑк</translation> + <translation>Зареждащ диÑк</translation> </message> <message> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> @@ -6740,6 +6800,93 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 ден</translation> + </message> + <message> + <source>2 days</source> + <translation>2 дена</translation> + </message> + <message> + <source>3 days</source> + <translation>3 дена</translation> + </message> + <message> + <source>4 days</source> + <translation>4 дена</translation> + </message> + <message> + <source>5 days</source> + <translation>5 дена</translation> + </message> + <message> + <source>6 days</source> + <translation>6 дена</translation> + </message> + <message> + <source>1 week</source> + <translation>1 Ñедмица</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 Ñедмици</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 Ñедмици</translation> + </message> + <message> + <source>1 month</source> + <translation>1 меÑец</translation> + </message> + <message> + <source>Never</source> + <translation>Ðикога</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Проверка</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&ЗатварÑне</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox помощник за обновлениÑ</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Проверка за обновлениÑ</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Отказ</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Обобщение</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>ИзлÑзла е нова верÑÐ¸Ñ Ð½Ð° VirtualBox! ВерÑÐ¸Ñ <b>%1</b> е доÑтъпна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>. Можете да изтеглите тази верÑÐ¸Ñ Ð¾Ñ‚ тази директна връзка:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Ðе може да Ñе получи информациÑта за нова верÑиÑ, поради ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ Ñ Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Вече Ñте инÑталирали поÑледната верÑÐ¸Ñ Ð½Ð° VirtualBox. МолÑ, повторете проверката за верÑÐ¸Ñ Ð¿Ð¾-къÑно.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Този помощник ще Ñе Ñвърже към уеб Ñайта на VirtualBox и ще провери дали е доÑтъпна нова верÑÐ¸Ñ Ð½Ð° VirtualBox.</p><p>Използвайте бутона <b>Проверка</b>, за да проверите за нова верÑÐ¸Ñ Ñега, или бутона <b>Отказ</b>, ако не иÑкате да извършите тази проверка.</p><p>Можете да Ñтартирате този помощник по вÑÑко време като изберете <b>Проверка за обновлениÑ...</b> от менюто <b>Помощ</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -10057,93 +10204,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 ден</translation> - </message> - <message> - <source>2 days</source> - <translation>2 дена</translation> - </message> - <message> - <source>3 days</source> - <translation>3 дена</translation> - </message> - <message> - <source>4 days</source> - <translation>4 дена</translation> - </message> - <message> - <source>5 days</source> - <translation>5 дена</translation> - </message> - <message> - <source>6 days</source> - <translation>6 дена</translation> - </message> - <message> - <source>1 week</source> - <translation>1 Ñедмица</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 Ñедмици</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 Ñедмици</translation> - </message> - <message> - <source>1 month</source> - <translation>1 меÑец</translation> - </message> - <message> - <source>Never</source> - <translation>Ðикога</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Проверка</translation> - </message> - <message> - <source>&Close</source> - <translation>&ЗатварÑне</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox помощник за обновлениÑ</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Проверка за обновлениÑ</translation> - </message> - <message> - <source>Cancel</source> - <translation>Отказ</translation> - </message> - <message> - <source>Summary</source> - <translation>Обобщение</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>ИзлÑзла е нова верÑÐ¸Ñ Ð½Ð° VirtualBox! ВерÑÐ¸Ñ <b>%1</b> е доÑтъпна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>. Можете да изтеглите тази верÑÐ¸Ñ Ð¾Ñ‚ тази директна връзка:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Ðе може да Ñе получи информациÑта за нова верÑиÑ, поради ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ Ñ Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Вече Ñте инÑталирали поÑледната верÑÐ¸Ñ Ð½Ð° VirtualBox. МолÑ, повторете проверката за верÑÐ¸Ñ Ð¿Ð¾-къÑно.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Този помощник ще Ñе Ñвърже към уеб Ñайта на VirtualBox и ще провери дали е доÑтъпна нова верÑÐ¸Ñ Ð½Ð° VirtualBox.</p><p>Използвайте бутона <b>Проверка</b>, за да проверите за нова верÑÐ¸Ñ Ñега, или бутона <b>Отказ</b>, ако не иÑкате да извършите тази проверка.</p><p>Можете да Ñтартирате този помощник по вÑÑко време като изберете <b>Проверка за обновлениÑ...</b> от менюто <b>Помощ</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts index 7415f784a..220131bb3 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts @@ -234,11 +234,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>Copia tots els errors al porta-retalls</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation>Copia</translation> </message> </context> <context> @@ -585,15 +585,15 @@ </message> <message> <source>&Settings...</source> - <translation type="unfinished">Parà metre&s...</translation> + <translation>Parà metre&s...</translation> </message> <message> <source>Manage the virtual machine settings</source> - <translation type="unfinished"></translation> + <translation>Gestiona els parà metres de la mà quina virtual</translation> </message> <message> <source>Session I&nformation...</source> - <translation type="unfinished"></translation> + <translation>I&nformació de la sessió...</translation> </message> </context> <context> @@ -718,11 +718,11 @@ </message> <message> <source>When checked a new unique MAC address will assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Quan estigui marcat, s'assignarà una única adreça MAC a totes les targetes de xarxa configurades.</translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&Reinicialitza l'adreça MAC de totes les targetes de xarxa</translation> </message> </context> <context> @@ -740,100 +740,100 @@ <name>UICloneVMWizard</name> <message> <source>Clone a virtual machine</source> - <translation type="unfinished"></translation> + <translation>Clona una mà quina virtual</translation> </message> <message> <source>Clone</source> - <translation type="unfinished"></translation> + <translation>Clona</translation> </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translation>Base enllaçada per %1 i %2</translation> </message> </context> <context> <name>UICloneVMWizardPage1</name> <message> <source><p>This wizard will help you to create a clone of your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Aquest auxiliar us ajudarà a crear un clon de la mà quina virtual.</p></translation> </message> <message> <source><p>Please choose a name for the new virtual machine:</p></source> - <translation type="unfinished"></translation> + <translation><p>Seleccioneu un nom per a la mà quina virtual nova:</p></translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&Reinicialitza l'adreça MAC per a totes les targetes de xarxa</translation> </message> <message> <source>Welcome to the virtual machine clone wizard</source> - <translation type="unfinished"></translation> + <translation>Us donem la benvinguda a l'auxiliar de clonació de mà quines virtuals</translation> </message> <message> <source>%1 Clone</source> - <translation type="unfinished"></translation> + <translation>%1 clona</translation> </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Quan estigui marcat, s'assignarà una única adreça MAC nova a totes les targetes de xarxa configurades.</translation> </message> </context> <context> <name>UICloneVMWizardPage2</name> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Configuració de la clonació</translation> </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Clonació completa</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Clonació enllaçada</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>Seleccioneu el tipus de clonació.</p><p>Si seleccioneu <b>Clonació completa</b>, es crearà una còpia exacta (incloent totes les imatges virtuals de disc) de la mà quina virtual original. Si seleccioneu <b>Clonació enllaçada</b>, es crearà una mà quina virtual nova, però les imatges virtuals de disc apuntaran a les imatges virtuals de disc de la mà quina virtual original.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Tingueu en compte que es crearà una nova captura a través de la mà quina virtual original en cas que seleccioneu <b>Clonació enllaçada</b>.</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished"></translation> + <translation>Estat actual de la mà quina</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished"></translation> + <translation>Mà quina actual i tots els estats fills</translation> </message> <message> <source>All states</source> - <translation type="unfinished"></translation> + <translation>Tots els estats</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Configuració de la clonació</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu quines parts de la mà quina virtual s'han de clonar.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished"></translation> + <translation>Si seleccioneu <b>Estat actual de la mà quina</b>, només es clonarà l'estat actual de la mà quina virtual.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Si seleccioneu <b>Mà quina actual i tots els estats fills</b>, es clonarà l'estat actual de la mà quina i qualsevol captura fill d'estats.</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Si seleccioneu <b>Tots els estats</b>, es clonarà l'estat actual de la mà quina i totes les captures.</translation> </message> </context> <context> @@ -1129,22 +1129,22 @@ <message> <source>Execution Cap</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>LÃmit d'execució</translation> </message> <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Generic driver, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Mòdul genèric, «%1»</translation> </message> <message> <source>Generic driver, '%1' {&nbsp;%2&nbsp;}</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Mòdul genèric, «%1» {&nbsp;%2&nbsp;}</translation> </message> </context> <context> @@ -1210,6 +1210,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -1356,7 +1363,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Export</source> - <translation type="unfinished"></translation> + <translation>Exporta</translation> </message> </context> <context> @@ -1698,7 +1705,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Start</source> - <translation type="unfinished">Inicia</translation> + <translation>Inicia</translation> </message> </context> <context> @@ -2217,51 +2224,51 @@ p, li { white-space: pre-wrap; } <name>UIGlobalSettingsProxy</name> <message> <source>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</source> - <translation type="unfinished"></translation> + <translation>Quan estigui marcat, el VirtualBox farà servir els parà metres de servidor intermediari proveïts per a tasques com la baixada de les Guest Additions o la comprovació d'actualitzacions.</translation> </message> <message> <source>&Enable proxy</source> - <translation type="unfinished"></translation> + <translation>Habilita &el servidor intermediari</translation> </message> <message> <source>Ho&st:</source> - <translation type="unfinished"></translation> + <translation>Am&fitrió:</translation> </message> <message> <source>Changes the proxy host.</source> - <translation type="unfinished"></translation> + <translation>Canvia l'amfitrió del servidor intermediari.</translation> </message> <message> <source>&Port:</source> - <translation type="unfinished"></translation> + <translation>Por&t:</translation> </message> <message> <source>Changes the proxy port.</source> - <translation type="unfinished"></translation> + <translation>Canvia el port del servidor intermediari.</translation> </message> <message> <source>When checked the authentication supplied will be used with the proxy server.</source> - <translation type="unfinished"></translation> + <translation>Quan estigui marcat, l'autenticació proveïda es farà servir amb el servidor intermediari.</translation> </message> <message> <source>&Use authentication</source> - <translation type="unfinished"></translation> + <translation>Fes servir a&utenticació</translation> </message> <message> <source>User &name:</source> - <translation type="unfinished"></translation> + <translation>&Nom d'usuari:</translation> </message> <message> <source>Changes the user name used for authentication.</source> - <translation type="unfinished"></translation> + <translation>Canvia el nom d'usuari que es fa servir per a l'autenticació.</translation> </message> <message> <source>Pass&word:</source> - <translation type="unfinished"></translation> + <translation>&Contrasenya:</translation> </message> <message> <source>Changes the password used for authentication.</source> - <translation type="unfinished"></translation> + <translation>Canvia la contrasenya que es fa servir per a l'autenticació.</translation> </message> </context> <context> @@ -2334,23 +2341,23 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Left Shift</source> - <translation type="unfinished">Tecla de majúscules esquerra</translation> + <translation>Tecla de majúscules esquerra</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">Tecla de majúscules dreta</translation> + <translation>Tecla de majúscules dreta</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">Control esquerra</translation> + <translation>Control esquerra</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">Control dreta</translation> + <translation>Control dreta</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">Alt esquerra</translation> + <translation>Alt esquerra</translation> </message> <message> <source>Right Alt</source> @@ -2569,7 +2576,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Import</source> - <translation type="unfinished"></translation> + <translation>Importa</translation> </message> </context> <context> @@ -2705,10 +2712,6 @@ p, li { white-space: pre-wrap; } <translation><br><nobr><b>No hi ha carpetes compartides</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica si la pantalla remota (servidor VRDP) està activada (<img src=:/vrdp_16px.png/>) o no (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>El servidor VRDP està escoltant el port %1</translation> </message> @@ -2741,7 +2744,7 @@ p, li { white-space: pre-wrap; } <message> <source>Indicates the status of different features used by this virtual machine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></source> <comment>Virtualization Stuff LED</comment> - <translation type="unfinished"></translation> + <translation>Indica l'estat de caracterÃstiques diferents que fa servir aquesta mà quina virtual: <br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></translation> </message> </context> <context> @@ -2953,11 +2956,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. For maximal performance set the guest VRAM to at least <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>teniu l'acceleració 3D activada per a una operació del sistema que fa servir el mòdul de vÃdeo WDDM. Per a un rendiment mà xim, establiu la memòria VRAM del client com a mÃnim a <b>%1</b>.</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> + <translation>l'acceleració 2D està activada. Atès que l'acceleració de vÃdeo 2D només és compatible amb clients Windows, es desactivarà aquesta caracterÃstica.</translation> </message> </context> <context> @@ -3204,7 +3207,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 type="unfinished"></translation> + <translation>heu seleccionat un tipus de sistema client de 64 bits per a aquesta mà quina virtual. Amb aquests tipus de clients es requereix maquinari de virtualització (VT-x/AMD-V), aquesta caracterÃstica s'activarà automà ticament.</translation> </message> </context> <context> @@ -3415,39 +3418,39 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Promiscuous Mode:</source> - <translation type="unfinished"></translation> + <translation>Mode &promiscu:</translation> </message> <message> <source>Selects the promiscuous mode policy of the network adapter when attached to an internal network, host only network or a bridge.</source> - <translation type="unfinished"></translation> + <translation>Selecciona el mode de privacitat promiscu per a l'adaptador de xarxa quan es connecta a una xarxa interna, a una xarxxa de només amfitrió o a un pont.</translation> </message> <message> <source>Generic Properties:</source> - <translation type="unfinished"></translation> + <translation>Propietats genèriques:</translation> </message> <message> <source>Enter any configuration settings here for the network attachment driver you will be using. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source> - <translation type="unfinished"></translation> + <translation>Introduïu qualsevol parà metre de configuració per al mòdul de connexió de xarxa que fareu servir. Els parà metres hauran de ser de la forma <b>name=valor</b> i dependran del mòdul. Feu servir <b>alt-intro</b> per afegir una nova entrada.</translation> </message> <message> <source>no generic driver is selected</source> - <translation type="unfinished"></translation> + <translation>no s'ha seleccionat cap mòdul genèric</translation> </message> <message> <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source> - <translation type="unfinished"></translation> + <translation>Selecciona l'adaptador de xarxa al sistema amfitrió on anirà el trà nsit d'origen i destà d'aquesta targeta de xarxa.</translation> </message> <message> <source>Enter the name of the internal network that this network card will be connected to. You can create a new internal network by choosing a name which is not used by any other network cards in this virtual machine or others.</source> - <translation type="unfinished"></translation> + <translation>Introduïu el nom de la xarxa interna a la qual es connectarà aquesta targeta de xarxa. Podeu crear una xarxa interna nova seleccionant un nom que no es faci servir per cap altra targeta de xarxa en aquesta o altres mà quines virtuals.</translation> </message> <message> <source>Selects the virtual network adapter on the host system that traffic to and from this network card will go through. You can create and remove adapters using the global network settings in the virtual machine manager window.</source> - <translation type="unfinished"></translation> + <translation>Selecciona l'adaptador de xarxa virtual a l'amfitrió on anirà el trà nsit d'orÃgen i destà d'aquesta targeta de xarxa. Podeu crear i eliminar adaptadors fent servir els parà metres globals de xarxa a la finestra del gestor de mà quines virtuals.</translation> </message> <message> <source>Selects the driver to be used with this network card.</source> - <translation type="unfinished"></translation> + <translation>Selecciona el mòdul que es farà servir amb aquesta targeta de xarxa.</translation> </message> </context> <context> @@ -4259,57 +4262,57 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation type="unfinished"></translation> + <translation>Quan estigui marcat, el disc virtual no s'eliminarà quan el client l'expulsi.</translation> </message> <message> <source>&Live CD/DVD</source> - <translation type="unfinished"></translation> + <translation>CD/DVD &live</translation> </message> <message> <source>When checked the guest system will see the virtual disk as a solid state device.</source> - <translation type="unfinished"></translation> + <translation>Quan estigui marcat, el sistema client veurà el disc virtual com a un dispositiu d'estat sòlid.</translation> </message> <message> <source>&Solid-state drive</source> - <translation type="unfinished"></translation> + <translation>Dispositiu d'e&stat sòlid</translation> </message> <message> <source>Details:</source> - <translation type="unfinished"></translation> + <translation>Detalls:</translation> </message> <message> <source>no name specified for controller at position <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>no s'ha especificat cap nom per al controlador de la posició <b>%1</b>.</translation> </message> <message> <source>controller at position <b>%1</b> uses the name that is already used by controller at position <b>%2</b>.</source> - <translation type="unfinished"></translation> + <translation>el controlador de la posició <b>%1</b> fa servir el nom que ja fa servir el controlador de la posició <b>%2</b>.</translation> </message> <message> <source>no hard disk is selected for <i>%1</i>.</source> - <translation type="unfinished"></translation> + <translation>no s'ha seleccionat cap disc per a <b>%1</b>.</translation> </message> <message> <source>at most one supported</source> <comment>controller</comment> - <translation type="unfinished">com a mÃnim una suportada</translation> + <translation>com a mÃnim una compatible</translation> </message> <message> <source>up to %1 supported</source> <comment>controllers</comment> - <translation type="unfinished">fins %1 suportades</translation> + <translation>fins %1 compatibles</translation> </message> <message> <source>you are currently using more storage controllers than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2.</source> - <translation type="unfinished">actualment esteu fent servir més controlador d'emmagatzematge que els xips %1 suporten. Canvieu el tipus de xip a la pà gina de parà metres del sistema o reduïu el nombre dels següents controladors d'emmagatzematge a la pà gina de parà metres d'emmagatzematge: %2.</translation> + <translation>actualment esteu fent servir més controladors d'emmagatzematge del que els xips %1 són compatibles. Canvieu el tipus de xip a la pà gina de parà metres del sistema o reduïu el nombre dels controladors següents d'emmagatzematge a la pà gina de parà metres d'emmagatzematge: %2.</translation> </message> <message> <source>&Port Count:</source> - <translation type="unfinished"></translation> + <translation>Recompte de &ports:</translation> </message> <message> <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source> - <translation type="unfinished"></translation> + <translation>Selecciona el recompte de ports del controlador d'emmagatzematge SATA que estan seleccionats actualment a l'arbre d'emmagatzematge. Això ha de ser com a mÃnim un més que el valor més alt del nombre de ports que necessiteu fer servir.</translation> </message> </context> <context> @@ -4495,7 +4498,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source> - <translation type="unfinished">Defineix el tipus de xip que es fa servir en aquesta mà quina virtual.</translation> + <translation>Selecciona el xip que s'emularà en aquesta mà quina virtual. Tingueu en compte que l'emulació del xip ICH9 és experimental i no es recomana exceptuat per a sistemes clients (com el Mac OS X) que ho requereixin.</translation> </message> <message> <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> @@ -4503,33 +4506,33 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Execution Cap:</source> - <translation type="unfinished"></translation> + <translation>LÃmit d'&execució:</translation> </message> <message> <source>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</source> - <translation type="unfinished"></translation> + <translation>Limita la quantitat de temps durant el qual cada CPU virtual pot executar-se. Es permetrà a cada CPU virtual fer servir aquest temps fins al percentatge de temps disponible en cada CPU fÃsica. Es pot deshabilitar el lÃmit d'execució establint-lo al 100%. Si s'estableix el lÃmit molt baix pot fer que la mà quina respongui molt lentament.</translation> </message> <message> <source>you have set the processor execution cap to a low value. This can make the machine feel slow to respond.</source> - <translation type="unfinished"></translation> + <translation>heu establert la limitació d'execució del processador a un valor molt baix. Això pot fer que la mà quina respongui lentament.</translation> </message> <message> <source>you have enabled a USB HID (Human Interface Device). This will not work unless USB emulation 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>heu habilitat un USB HID (dispositiu d'interfÃcie humana). Això no funcionarà a menys que l'emulació USB també estigui habilitada. Això es farà automà ticament quan accepteu els parà metres de la mà quina virtual en prémer el botó «D'acord».</translation> </message> <message> <source><qt>%1%</qt></source> <comment>Min CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source><qt>%1%</qt></source> <comment>Max CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>he assignat un tipus de xip ICH9 a aquesta mà quina virtual. No funcionarà correctament a menys que la caracterÃstica IO-APIC estigui habilitada. Això es farà automà ticament quan accepteu els parà metres de la mà quina virtual en prémer el botó «D'acord».</translation> </message> </context> <context> @@ -4661,7 +4664,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</source> - <translation type="unfinished"></translation> + <translation>L'USB 2.0 es troba activat per a aquesta mà quina virtual. Tot i aixÃ, això requereix la instal·lació de <b>%1</b>. Instal·leu el paquet d'extensions des del lloc web de baixades del VirtualBox. Una vegada fet això, haureu de tornar a activar l'USB 2.0. Mentrestant es desactivarà a no ser que cancel·leu els canvis dels parà metres actuals.</translation> </message> </context> <context> @@ -4777,15 +4780,15 @@ p, li { white-space: pre-wrap; } <name>UIMediumTypeChangeDialog</name> <message> <source>Modify medium attributes</source> - <translation type="unfinished"></translation> + <translation>Modifica els atributs del suport</translation> </message> <message> <source><p>You are about to change the attributes of the virtual disk located in <b>%1</b>.</p><p>Please choose one of the following medium types and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p></source> - <translation type="unfinished"></translation> + <translation><p>Ara canviareu els atributs del disc virtual ubicat a <b>%1</b>.</p><p>Seleccioneu un dels tipus de suport següents i premeu <b>%2</b> per procedir o <b>%3</b> en altre cas.</p></translation> </message> <message> <source>Choose medium type:</source> - <translation type="unfinished"></translation> + <translation>Trieu el tipus de suport:</translation> </message> </context> <context> @@ -5120,10 +5123,6 @@ p, li { white-space: pre-wrap; } <translation><p>La mà quina virtual ha informat que el sistema client no suporta <b>integració del punter</b> al mode de vÃdeo actual. Heu de capturar el punter (clicant sobre la pantalla de la mà quina virtual o prement la tecla amfitrió) per tal de poder controlar el punter a dins del sistema client.</p></translation> </message> <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>La Mà quina Virtual ha informat que el sistema client suporta <b>integració del punter del ratolÃ</b>. Això significa que no necessiteu <i>capturar</i> el punter del ratolà per poder fer-lo servir al sistema client -- totes les accions que executeu quan el punter del ratolà estigui a sobre de la Mà quina virtual s'enviaran directament al sistema client. Si es captura el ratolÃ, automà ticament es tornarà al mode normal.</p><p>La icona del ratolà a la barra d'estat es mostrarà com&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;per informar-vos que la integració del punter està suportada pel sistema client que està actiu.</p><p><b>Nota</b>: Algunes aplicacions poden comportar-se incorrectament treballant en el mode d'integració del ratolÃ. Sempre podeu inhabilitar-ho a la sessió actual (o habilitar-ho) seleccionat l'opció corresponent a la barra de menú.</p></translation> - </message> - <message> <source><p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode but the virtual display is currently set to <b>%2&nbsp;bit</b>.</p><p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, if it is available, for best possible performance of the virtual video subsystem.</p><p><b>Note</b>. Some operating systems, like OS/2, may actually work in 32&nbsp;bit mode but report it as 24&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&nbsp;bit) is not available in the guest OS.</p></source> <translation><p>La finestra de la mà quina virtual està optimitzada per treballar en el mode de color <b>%1&nbsp;bit</b> però la qualitat del color que es mostra actualment està establerta a <b>%2&nbsp;bit</b>.</p><p>. Obriu el dià leg de propietats de la pantalla del sistema client i seleccioneu el mode de color <b>%3&nbsp;bit</b>, si és disponible, per obtenir el millor funcionament possible del subsistema de vÃdeo.</p><p><b>Nota</b>: Alguns sistemes operatius, com OS/2, necessiten treballar actualment al mode 32&nbsp;bit però informen que és 24&nbsp;bit (16 milions de colors). Haureu de provar a seleccionar una qualitat de color diferent per veure si és correcta i aquest missatge desapareix o simplemente podeu inhabilitar aquest missatge si esteu segur que la qualitat de color requerida (%4&nbsp;bit) no és disponible al sistema client.</p></translation> </message> @@ -5152,14 +5151,6 @@ p, li { white-space: pre-wrap; } <translation><p>No heu afegit cap disc dur a la nova mà quina virtual. La mà quina no podrà iniciar-se fins que no afegiu un disc dur amb un sistema operatiu client o qualsevol altre suport arrencable.</p><p>Voleu continuar?</p></translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Heu fet <b>clic amb el ratolÃ</b> a dins de la finestra de la Mà quina Virtual o heu premut la <b>tecla d'amfitrió</b>. Això fa que la Mà quina Virtual <b>capture</b> el punter del ratolà (només en cas que la integració del ratolà no estigui suportada pel sistema client) i el teclat, que ara no estaran disponibles per funcionar a la mà quina amfitriona.</p><p>Podeu prémer la <b>tecla d'amfitrió</b> en qualsevol moment per <b>tornar</b> el ratolà i el teclat al mode normal de funcionament. La tecla d'amfitrió assiganada actualment es mostra a la barra d'estat a la part inferior de la finestra, al costat de la icona &nbsp;<img src=hostkey_16px.png/>&nbsp;. Aquesta icona indica si el teclat i el ratolà estan en estat de captura o no.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>L'opció de <b>Captura automà tica del teclat</b> és activa. Això farà que la Mà quina Virtual <b>capture</b> el teclat sempre que la finestra de la mà quina virtual estigui activa i farà que el teclat no estigui disponible per a d'altres aplicacions que s'estiguin executant a l'ordinador amfitrió: quan el teclat està capturat, totes les tecles especials (incloent Alt-Tab) es readrecen a la mà quina virtual.</p><p>Podeu prémer la <b>tecla d'amfitrió</b> en qualsevol moment per <b>tornar</b> el ratolà i el teclat al mode normal de funcionament. La tecla d'amfitrió assiganada actualment es mostra a la barra d'estat a la part inferior de la finestra, al costat de la icona &nbsp;<img src=hostkey_16px.png/>&nbsp;. Aquesta icona indica si el teclat i el ratolà estan en estat de captura o no.</p></translation> - </message> - <message> <source>Result&nbsp;Code: </source> <comment>error info</comment> <translation>Resultat&nbsp;Codi:</translation> @@ -5386,7 +5377,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation><p>L'opció de <b>captura automà tica del teclat</b> és activa. Això farà que la mà quina virtual <b>capturi</b> el teclat sempre que la finestra de la mà quina virtual estigui activa i farà que el teclat no estigui disponible per a altres aplicacions que s'estiguin executant a l'ordinador amfitrió: quan el teclat està capturat, totes les tecles especials (incloent Alt-Tab) es readrecen a la mà quina virtual.</p><p>Podeu prémer la <b>tecla d'amfitrió</b> en qualsevol moment per <b>tornar</b> el punter i el teclat al mode normal de funcionament. La tecla d'amfitrió assiganada actualment es mostra a la barra d'estat a la part inferior de la finestra, al costat de la icona &nbsp;<img src=hostkey_16px.png/>&nbsp;. Aquesta icona indica si el teclat i el punter estan en estat de captura o no.</p></translation> + <translation><p>L'opció de <b>captura automà tica del teclat</b> és activa. Això farà que la mà quina virtual <b>capturi</b> el teclat sempre que la finestra de la mà quina virtual estigui activa i farà que el teclat no estigui disponible per a altres aplicacions que s'estiguin executant a l'ordinador amfitrió: quan el teclat està capturat, totes les tecles especials (incloent Alt-Tab) es readrecen a la mà quina virtual.</p><p>Podeu prémer la <b>tecla d'amfitrió</b> en qualsevol moment per <b>tornar</b> el punter i el teclat al mode normal de funcionament. La tecla d'amfitrió assiganada actualment es mostra a la barra d'estat a la part inferior de la finestra, al costat de la icona &nbsp;<img src=:/hostkey_16px.png/>&nbsp;. Aquesta icona indica si el teclat i el punter estan en estat de captura o no.</p></translation> </message> <message> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> @@ -6038,7 +6029,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Sorry, some generic error happens.</source> - <translation type="unfinished">S'han produït alguns errors genèrics.</translation> + <translation>S'han produït alguns errors genèrics.</translation> </message> <message> <source>Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source> @@ -6139,74 +6130,104 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Failed to register the virtual machine <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>No s'ha pogut registrar la mà quina virtual <b>%1</b>.</translation> </message> <message> <source><p>The machine settings were changed while you were editing them. You currently have unsaved setting changes.</p><p>Would you like to reload the changed settings or to keep your own changes?</p></source> - <translation type="unfinished"></translation> + <translation><p>Els parà metres de la mà quina van canviar mentre els està veu editant. Actualment teniu canvis no desats.</p><p>Voleu tornar a carregar els parà metres canviats o mantenir els vostres canvis?</p></translation> </message> <message> <source>Reload settings</source> - <translation type="unfinished"></translation> + <translation>Torna a carregar els parà metres</translation> </message> <message> <source>Keep changes</source> - <translation type="unfinished"></translation> + <translation>Manté els canvis</translation> </message> <message> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> - <translation type="unfinished"></translation> + <translation>S'ha iniciat la mà quina virtual que esteu canviant. Només es poden canviar alguns parà metres quan la mà quina està en execució. La resta de canvis es perdran si tanqueu ara aquesta finestra.</translation> </message> <message> <source>Failed to clone the virtual machine <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>No s'ha pogut clonar la mà quina virtual <b>%1</b>.</translation> </message> <message> <source><p>You are about to restore snapshot <b>%1</b>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source> - <translation type="unfinished"></translation> + <translation><p>Ara restaurareu la captura <b>%1</b>.</p><p>Podeu crear primer una captura de l'estat actual de la mà quina virtual si seleccioneu la següent casella; si no ho feu, es perdrà l'estat actual de la mà quina de forma permanent. Voleu procedir?</p></translation> </message> <message> <source>Create a snapshot of the current machine state</source> - <translation type="unfinished"></translation> + <translation>Crea una captura de l'estat de la mà quina actual</translation> </message> <message> <source><p>Are you sure you want to restore snapshot <b>%1</b>?</p></source> - <translation type="unfinished"></translation> + <translation><p>Segur que voleu restaurar la captura <b>%1</b>?</p></translation> </message> <message> <source><p>Error changing medium type from <b>%1</b> to <b>%2</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>S'ha produït un error en canviar el tipus de suport de <b>%1</b> a <b>%2</b>.</p></translation> </message> <message> <source><p>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b><nobr>%1</nobr></b> to be installed.</p><p>Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</p></source> - <translation type="unfinished"></translation> + <translation><p>L'USB 2.0 es troba activat per a aquesta mà quina virtual. Tot i aixÃ, es requereix la instal·lació de <b><nobr>%1</nobr></b>.</p><p>Instal·leu el paquet d'extensions des del lloc web de baixades del VirtualBox. Una vegada fet això, podreu tornar a activar l'USB 2.0. Mentrestant es desactivarà a no ser que cancel·leu els canvis dels parà metres actuals.</p></translation> </message> <message> <source>Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer</source> - <translation type="unfinished"></translation> + <translation>No s'ha pogut carregar el servei de servidor intermediari USB (VERR_FILE_NOT_FOUND). Pot ser que el servei no estigui instal·lat a l'ordinador amfitrió</translation> </message> <message> <source>VirtualBox is not currently allowed to access USB devices. You can change this by adding your user to the 'vboxusers' group. Please see the user manual for a more detailed explanation</source> - <translation type="unfinished"></translation> + <translation>El VirtualBox no té permisos per accedir als dispositius USB. Podeu canviar això afegint el vostre usuari al grup «vboxusers». Vegeu el manual de l'usuari per a una explicació més detallada</translation> </message> <message> <source>VirtualBox is not currently allowed to access USB devices. You can change this by allowing your user to access the 'usbfs' folder and files. Please see the user manual for a more detailed explanation</source> - <translation type="unfinished"></translation> + <translation>El VirtualBox no té permisos per accedir als dispositius USB. Podeu canviar això permetent accedir al vostre usuari a la carpeta i fitxers «usbfs». Vegeu el manual de l'usuari per a una explicació més detallada</translation> </message> <message> <source>The USB Proxy Service has not yet been ported to this host</source> - <translation type="unfinished"></translation> + <translation>El servei de servidor intermediari USB no s'ha portat encara a aques amfitrió</translation> </message> <message> <source>Could not load the Host USB Proxy service</source> - <translation type="unfinished"></translation> + <translation>No s'ha pogut carregar el servei de servidor intermediari USB de l'amfitrió</translation> </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>No es pot trobar la captura anomenada <b>%1</b>.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> + <translation><p>No s'ha pogut desar el fitxer baixat com a <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Baixa</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">Instal·la</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> <translation type="unfinished"></translation> </message> </context> @@ -6248,10 +6269,21 @@ p, li { white-space: pre-wrap; } <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished"></translation> + <translation>Cancel·la la baixada del CD del VirtualBox Guest Additions</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> + <translation>S'està baixant la imatge de CD del VirtualBox Guest Additions des de <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> <translation type="unfinished"></translation> </message> </context> @@ -6356,7 +6388,7 @@ al sistema operatiu client com a mida del disc dur.</p></translation> </message> <message> <source>Summary</source> - <translation type="unfinished">Resum</translation> + <translation>Resum</translation> </message> <message> <source><nobr>%1 Bytes</nobr></source> @@ -6372,7 +6404,7 @@ al sistema operatiu client com a mida del disc dur.</p></translation> </message> <message> <source>Select a file for the new hard disk image file</source> - <translation type="unfinished">Seleccioneu un fitxer per al fitxer d'imatge del disc dur nou</translation> + <translation>Seleccioneu un fitxer per al fitxer d'imatge del disc dur nou</translation> </message> <message> <source><p>Select the type of virtual hard disk image you want to create.</p> @@ -6431,12 +6463,12 @@ l'eficiència d'escriptura del disc dur fÃsic.</p></translation <message> <source>Location</source> <comment>summary</comment> - <translation type="unfinished">Ubicació</translation> + <translation>Ubicació</translation> </message> <message> <source>Size</source> <comment>summary</comment> - <translation type="unfinished">Mida</translation> + <translation>Mida</translation> </message> <message> <source>Bytes</source> @@ -6498,140 +6530,152 @@ l'eficiència d'escriptura del disc dur fÃsic.</p></translation <message> <source>%1_copy</source> <comment>copied virtual disk name</comment> - <translation type="unfinished"></translation> + <translation>%1_còpia</translation> </message> <message> <source>Create</source> - <translation type="unfinished"></translation> + <translation>Crea</translation> </message> <message> <source>Copy Virtual Disk</source> - <translation type="unfinished"></translation> + <translation>Copia el disc virtual</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation>Copia</translation> </message> <message> <source>Welcome to the virtual disk copying wizard</source> - <translation type="unfinished"></translation> + <translation>Us donem la benvinguda a l'auxiliar de còpia de discos virtuals</translation> </message> <message> <source><p>This wizard will help you to copy a virtual disk.</p></source> - <translation type="unfinished"></translation> + <translation><p>Aquest auxiliar us ajudarà a copiar un disc virtual.</p></translation> </message> <message> <source>Please select the virtual disk which you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select a virtual disk file.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu el disc virtual que voleu copiar si no es troba encara seleccionat. Podeu seleccionar un de la llista o fer servir la icona de carpeta al costat de la llista per seleccionar un fitxer de disc virtual.</translation> </message> <message> <source>&VDI (VirtualBox Disk Image)</source> - <translation type="unfinished"></translation> + <translation>ID&V (Imatge de disc del VirtualBox)</translation> </message> <message> <source>V&MDK (Virtual Machine Disk)</source> - <translation type="unfinished"></translation> + <translation>D&CMV (Disc de mà quina virtual)</translation> </message> <message> <source>V&HD (Virtual Hard Disk)</source> - <translation type="unfinished"></translation> + <translation>D&DV (Disc dur virtual)</translation> </message> <message> <source>Welcome to the virtual disk creation wizard</source> - <translation type="unfinished"></translation> + <translation>Us donem la benvinguda a l'auxiliar de creació de disc virtuals</translation> </message> <message> <source><p>This wizard will help you to create a new virtual disk for your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Aquest auxiliar us ajudarà a crear un disc virtual nou per a la vostra mà quina virtual.</p></translation> </message> <message> <source><p>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p></source> - <translation type="unfinished"></translation> + <translation><p>Seleccioneu el tipus de fitxer que voleu fer servir per al disc virtual nou. Si no necessiteu fer-lo servir amb cap altre programari de virtualització, podeu deixar aquest parà metre com està .</p></translation> </message> <message> <source>Virtual disk file type</source> - <translation type="unfinished"></translation> + <translation>Tipus de fitxer de disc virtual</translation> </message> <message> <source>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu el tipus de fitxer que voleu fer servir per al disc virtual nou. Si no necessiteu fer-lo servir amb cap altre programari de virtualització, podeu deixar aquest parà metre com està .</translation> </message> <message> <source>Virtual disk storage details</source> - <translation type="unfinished"></translation> + <translation>Detalls d'emmagatzematge del disc virtual</translation> </message> <message> <source>Please choose whether the new virtual disk file should be allocated as it is used or if it should be created fully allocated.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu si el fitxer de disc virtual nou s'ha d'ubicar a mesura que es fa servir o si s'hauria de crear completament ubicat.</translation> </message> <message> <source><p>A <b>dynamically allocated</b> virtual disk file will only use space on your physical hard disk as it fills up, although it will not shrink again automatically when space on it is freed.</p></source> - <translation type="unfinished"></translation> + <translation><p>Un disc virtual <b>ubicat de forma dinà mica</b> farà servir espai al disc dur conforme el necessiti. Tot i aixÃ, no s'encongirà quan s'alliberi espai.</p></translation> </message> <message> <source><p>A <b>fixed size</b> virtual disk file may take longer to create on some systems but is often faster to use.</p></source> - <translation type="unfinished"></translation> + <translation><p>Un fitxer de disc virtual de <b>mida fixa</b> trigarà més en crear-se en alguns sistemes, però és més rà pid de fer servir.</p></translation> </message> <message> <source><p>You can also choose to <b>split</b> the virtual disk into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source> - <translation type="unfinished"></translation> + <translation><p>També podeu seleccionar <b>dividir</b> el disc virtual en molts fitxers fins a 2GB cada un. Això és útil principalment si voleu emmagatzemar la mà quina virtual en dispositius extraïbles o sistemes antics, alguns dels quals no poden gestionar fitxers molt grans.</translation> </message> <message> <source>&Dynamically allocated</source> - <translation type="unfinished"></translation> + <translation>Ubicat de forma &dinà mica</translation> </message> <message> <source>&Fixed size</source> - <translation type="unfinished"></translation> + <translation>Mida &fixa</translation> </message> <message> <source>&Split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>&Divideix en fitxers de menys de 2GB</translation> </message> <message> <source>Virtual disk file location and size</source> - <translation type="unfinished"></translation> + <translation>Ubicació i mida del fitxer de disc virtual</translation> </message> <message> <source>Select the size of the virtual disk in megabytes. This size will be reported to the Guest OS as the maximum size of this virtual disk.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu la mida del disc virtual en megabytes. Es donarà aquesta mida al sistema operatiu client com a mida mà xima del disc virtual.</translation> </message> <message> <source>Virtual disk file location</source> - <translation type="unfinished"></translation> + <translation>Ubicació del fitxer de disc virtual</translation> </message> <message> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> - <translation type="unfinished"></translation> + <translation>Introduïu el nom del fitxer de disc virtual nou a la caixa següent o feu clic a la icona de la carpeta per a seleccionar una carpeta diferent on es crearà el fitxer.</translation> </message> <message> <source><nobr>%1 (%2 B)</nobr></source> - <translation type="unfinished"><nobr>%1 (%2 B)</nobr></translation> + <translation><nobr>%1 (%2 B)</nobr></translation> </message> <message> <source>You are going to create a new virtual disk with the following parameters:</source> - <translation type="unfinished"></translation> + <translation>Ara creareu una disc virtual nou amb els parà metres següents:</translation> </message> <message> <source>You are going to create a copied virtual disk with the following parameters:</source> - <translation type="unfinished"></translation> + <translation>Ara creareu un disc virtual copiat amb els parà metres següents:</translation> </message> <message> <source>If the above settings are correct, press the <b>%1</b> button. Once you press it the new virtual disk file will be created.</source> - <translation type="unfinished"></translation> + <translation>Si els parà metres de dalt són correctes, premeu el botó <b>%1</b>. En prémer-lo, es crearà el fitxer de disc virtual nou.</translation> </message> <message> <source>%1 B</source> - <translation type="unfinished">%1 B</translation> + <translation>%1 B</translation> </message> <message> <source>File type</source> <comment>summary</comment> - <translation type="unfinished"></translation> + <translation>Tipus de fitxer</translation> </message> <message> <source>Details</source> <comment>summary</comment> + <translation>Detalls</translation> + </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> <translation type="unfinished"></translation> </message> </context> @@ -6639,25 +6683,25 @@ l'eficiència d'escriptura del disc dur fÃsic.</p></translation <name>UINewHDWizardPageFormat</name> <message> <source>File type</source> - <translation type="unfinished"></translation> + <translation>Tipus de fitxer</translation> </message> </context> <context> <name>UINewHDWizardPageOptions</name> <message> <source>&Location</source> - <translation type="unfinished">&Ubicació</translation> + <translation>&Ubicació</translation> </message> <message> <source>&Size</source> - <translation type="unfinished">&Mida</translation> + <translation>&Mida</translation> </message> </context> <context> <name>UINewHDWizardPageVariant</name> <message> <source>Storage details</source> - <translation type="unfinished"></translation> + <translation>Detalls d'emmagatzematge</translation> </message> </context> <context> @@ -6672,11 +6716,11 @@ l'eficiència d'escriptura del disc dur fÃsic.</p></translation </message> <message> <source>Virtual disk to copy</source> - <translation type="unfinished"></translation> + <translation>Disc virtual que s'ha de copiar</translation> </message> <message> <source>Choose a virtual hard disk file...</source> - <translation type="unfinished">Selecciona un fitxer de disc dur virtual...</translation> + <translation>Trieu un fitxer de disc dur virtual...</translation> </message> </context> <context> @@ -7014,7 +7058,7 @@ pas i connectar discos durs més endavant, fent servir el dià leg de configuraci </message> <message> <source>Create</source> - <translation type="unfinished"></translation> + <translation>Crea</translation> </message> </context> <context> @@ -7103,11 +7147,11 @@ pas i connectar discos durs més endavant, fent servir el dià leg de configuraci </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">Arrenca el &disc dur</translation> + <translation>Arrenca el &disc dur</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>Seleccioneu un disc dur virtual que s'utilitzarà com a disc d'arrencada de la mà quina virtual. Podeu crear un disc dur nou o bé seleccionar un d'existent de la llista desplegable o bé prement el botó corresponent (per invocar una finestra per obrir el fitxer).</p><p>Si necessiteu una configuració més avançada, podeu ometre aquest pas i adjuntar discos durs més tard des del dià leg de parà metres de la mà quina virtual.</p></translation> + <translation><p>Si voleu, ara podeu afegir un disc d'arrencada a la mà quina nova. Podeu crear un disc virtual nou o seleccionar-ne un de la llista o bé des d'una altra ubicació fent servir la icona de carpeta.</p><p>Si necessiteu una configració més complexa de disc virtual, podeu ometre aquest pas i fer els canvis als parà metres de la mà quina una vegada que s'hagi creat.</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -7115,7 +7159,7 @@ pas i connectar discos durs més endavant, fent servir el dià leg de configuraci </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">La mida recomanada del disc dur d'arrencada és <b>%1</b>.</translation> + <translation>La mida recomanada del disc dur d'arrencada és <b>%1</b>.</translation> </message> </context> <context> @@ -7151,7 +7195,7 @@ pas i connectar discos durs més endavant, fent servir el dià leg de configuraci <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">Arrenca el disc</translation> + <translation>Disc d'arrencada</translation> </message> <message> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> @@ -7336,7 +7380,7 @@ pas i connectar discos durs més endavant, fent servir el dià leg de configuraci </message> <message> <source>Proxy</source> - <translation type="unfinished"></translation> + <translation>Servidor intermediari</translation> </message> </context> <context> @@ -7438,6 +7482,109 @@ pas i connectar discos durs més endavant, fent servir el dià leg de configuraci </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dia</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dies</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dies</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dies</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dies</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dies</translation> + </message> + <message> + <source>1 week</source> + <translation>1 setmana</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 setmanes</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 setmanes</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mes</translation> + </message> + <message> + <source>Never</source> + <translation>Mai</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">S'ha excedit el temps d'espera de la connexió.</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">No es pot localitzar el formulari de registre al servidor (resposta: %1).</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">Com&prova</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">Tan&ca</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Auxiliar d'acutliatzació del VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Comprova si hi ha actualitzacions</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Aquest assistent connectarà amb el lloc web del VirtualBox i comprovarà si hi ha una versió més nova de VirtualBox.</p> +<p>Feu servir el botó <b>Comprova</b> per comprovar ara si hi ha noves versions o <b>Cancel·la</b> si no voleu comprovar ara si hi ha noves versions.</p> +<p>Podeu iniciar aquest assistent en qualsevol moment seleccionant <b>Comprova si hi ha actualitzacions...</b> al menú d'<b>Ajuda</b>.</p></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Cancel·la</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Resum</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'aquest enllaç: </p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>No es pot obtenir informació de noves versions degut a un problema amb la xarxa:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Ja teniu instal·lada la darrera versió del VirtualBox. Proveu novament més tard.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Aquest auxiliar connectarà amb el lloc web del VirtualBox i comprovarà si hi ha una versió més nova del VirtualBox.<p></p>Feu servir el botó <b>Comprova</b> per comprovar ara si hi ha noves versions o <b>Cancel·la</b> si no voleu comprovar ara si hi ha noves versions. Podeu iniciar aquest auxiliar en qualsevol moment seleccionant <b>Comprova si hi ha actualitzacions...</b> al menú d'<b>Ajuda</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7994,12 +8141,8 @@ Versió %1</translation> <translation type="obsolete">&Ajuda</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si la funció d'autoredimensió de la pantalla client està activada (<img src=auto_resize_on_16px.png/>) o desactivada (<img src=auto_resize_off_16px.png/>). Tingueu en compte que aquesta funció requereix tenir les Guest Additions instal·lades en el sistema operatiu client.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si el punter del ratolà de l'ordinador amfitrió és capturat pel sistema operatiu client:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;no captura el punter</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;captura el punter</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;la integració del ratolà (MI) està activada</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI està desactivada, captura el punter</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI està desactivada, no captura el punter</nobr><br>Tingueu en compte que la funció d'integració del ratolà requereix tenir instal·lades les Guest Additions en el sistema operatiu client.</translation> + <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Indica si el punter del ratolà de l'ordinador amfitrió és capturat pel sistema operatiu client:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;no captura el punter</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;captura el punter</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;la integració del ratolà (MI) està activada</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI està desactivada, captura el punter</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI està desactivada, no captura el punter</nobr><br>Tingueu en compte que la funció d'integració del ratolà requereix tenir instal·lades les Guest Additions en el sistema operatiu client.</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -8097,10 +8240,6 @@ Versió %1</translation> <translation type="obsolete">Canvia al mode d'integració de l'escriptori fluid</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indica si el teclat és capturat pel sistema operatiu client (<img src=hostkey_captured_16px.png/>) o no (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Indica l'activitat del disquet:</nobr>%1</qt></translation> @@ -8191,10 +8330,6 @@ Versió %1</translation> <translation type="obsolete"><br><nobr><b>El controlador USB està desactivat</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica si la pantalla remota (servidor VRDP) està activada (<img src=vrdp_16px.png/>) o no (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>Indica l'activitat de les carpetes compartides:</nobr>%1</qt></translation> @@ -8247,10 +8382,6 @@ Versió %1</translation> <translation type="obsolete">Indica si la funció d'autoredimensió de la pantalla client està activada (<img src=:/auto_resize_on_16px.png/>) o desactivada (<img src=:/auto_resize_off_16px.png/>). Tingueu en compte que aquesta funció requereix tenir les Guest Additions instal·lades en el sistema operatiu client.</translation> </message> <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si el punter de l'ordinador amfitrió és capturat pel sistema operatiu client:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;no captura el punter</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;captura el punter</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;la integració del punter (MI) està activada</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI està desactivada, captura el punter</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI està desactivada, no captura el punter</nobr><br>Tingueu en compte que la funció d'integració del punter requereix tenir instal·lades les Guest Additions en el sistema operatiu client.</translation> - </message> - <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> <translation type="obsolete">Indica si el teclat és capturat pel sistema operatiu client (<img src=:/hostkey_captured_16px.png/>) o no (<img src=:/hostkey_16px.png/>).</translation> </message> @@ -10285,58 +10416,58 @@ Versió %1</translation> </message> <message> <source>Dynamically allocated storage</source> - <translation type="unfinished"></translation> + <translation>Emmagatzematge d'ubicació dinà mica</translation> </message> <message> <source>Fixed size storage</source> - <translation type="unfinished"></translation> + <translation>Emmagatzematge de mida fixa</translation> </message> <message> <source>Dynamically allocated storage split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>L'emmagatzematge d'ubicació dinà mica divideix en fitxers de menys de 2GB</translation> </message> <message> <source>Fixed size storage split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>L'emmagatzematge de mida fixa divideix els fitxers de menys de 2GB</translation> </message> <message> <source>Execution Cap</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>LÃmit d'execució</translation> </message> <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation><nobr>%1</nobr></translation> </message> <message> <source>Generic, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Genèric, «%1»</translation> </message> <message> <source>Generic Driver</source> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>Mòdul genèric</translation> </message> <message> <source>Deny</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Denega</translation> </message> <message> <source>Allow VMs</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Permet mà quines virtuals</translation> </message> <message> <source>Allow All</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Permet-ho tot</translation> </message> <message> <source>Adapter %1</source> - <translation type="unfinished">Adaptador %1</translation> + <translation>Adaptador %1</translation> </message> </context> <context> @@ -11142,43 +11273,43 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati </message> <message> <source>Type:</source> - <translation type="unfinished">Tipus:</translation> + <translation>Tipus:</translation> </message> <message> <source>Location:</source> - <translation type="unfinished">Ubicació:</translation> + <translation>Ubicació:</translation> </message> <message> <source>Format:</source> - <translation type="unfinished"></translation> + <translation>Format:</translation> </message> <message> <source>Storage details:</source> - <translation type="unfinished"></translation> + <translation>Detalls d'emmagatzematge:</translation> </message> <message> <source>Attached to:</source> - <translation type="unfinished"></translation> + <translation>Connectat a:</translation> </message> <message> <source>&Copy...</source> - <translation type="unfinished"></translation> + <translation>&Copia...</translation> </message> <message> <source>&Modify...</source> - <translation type="unfinished"></translation> + <translation>&Modifica...</translation> </message> <message> <source>Copy an existing medium</source> - <translation type="unfinished"></translation> + <translation>Copia un suport existent</translation> </message> <message> <source>Modify the attributes of the selected medium</source> - <translation type="unfinished"></translation> + <translation>Modifica els atributs del suport seleccionat</translation> </message> <message> <source>C&lose</source> - <translation type="unfinished"></translation> + <translation>&Tanca</translation> </message> </context> <context> @@ -11506,7 +11637,7 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati </message> <message> <source>Discard</source> - <translation type="unfinished">Descarta</translation> + <translation>Descarta</translation> </message> <message> <source>D&iscard</source> @@ -11537,10 +11668,6 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati <translation type="obsolete">&Fitxer</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Benvinguts a VirtualBox!</h3><p>A la part esquerra d'aquesta finestra es mostra un llistat de totes les mà quines virtuals a l'ordinador. Aquest llistat és buit actualment perquè encara no heu creat cap mà quina virtual.<img src=welcome.png align=right/></p><p>Per crear una nova mà quina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'aquesta finestra.</p><p>Podeu prémer la tecla <b>%1</b> per obtenir ajuda o bé visitar <a href=http://www.virtualbox.org>www.virtualbox.org</a> per veure altra informació i novetats.</p></translation> - </message> - <message> <source>&Help</source> <translation type="obsolete">&Ajuda</translation> </message> @@ -11819,15 +11946,15 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati </message> <message> <source>Cl&one...</source> - <translation type="unfinished"></translation> + <translation>Cl&ona...</translation> </message> <message> <source>Clone the selected virtual machine</source> - <translation type="unfinished"></translation> + <translation>Clona la mà quina virtual seleccionada</translation> </message> <message> <source>D&iscard Saved State</source> - <translation type="unfinished"></translation> + <translation>D&escarta l'estat desat</translation> </message> </context> <context> @@ -12233,11 +12360,11 @@ per accedir a ella des d'un sistema Linux. Aquesta caracterÃstica requerei </message> <message> <source>&Clone...</source> - <translation type="unfinished"></translation> + <translation>&Clona...</translation> </message> <message> <source>Clone the selected virtual machine</source> - <translation type="unfinished"></translation> + <translation>Clona la mà quina virtual seleccionada</translation> </message> </context> <context> @@ -12482,109 +12609,6 @@ o a ambdòs (<i>Qualsevol</i>).</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dia</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dies</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dies</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dies</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dies</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dies</translation> - </message> - <message> - <source>1 week</source> - <translation>1 setmana</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 setmanes</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 setmanes</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mes</translation> - </message> - <message> - <source>Never</source> - <translation>Mai</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">S'ha excedit el temps d'espera de la connexió.</translation> - </message> - <message> - <source>Could not locate the latest version list on the server (response: %1).</source> - <translation type="obsolete">No es pot localitzar el formulari de registre al servidor (resposta: %1).</translation> - </message> - <message> - <source>Chec&k</source> - <translation>Com&prova</translation> - </message> - <message> - <source>&Close</source> - <translation>Tan&ca</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Auxiliar d'acutliatzació del VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Comprova si hi ha actualitzacions</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>Aquest assistent connectarà amb el lloc web del VirtualBox i comprovarà si hi ha una versió més nova de VirtualBox.</p> -<p>Feu servir el botó <b>Comprova</b> per comprovar ara si hi ha noves versions o <b>Cancel·la</b> si no voleu comprovar ara si hi ha noves versions.</p> -<p>Podeu iniciar aquest assistent en qualsevol moment seleccionant <b>Comprova si hi ha actualitzacions...</b> al menú d'<b>Ajuda</b>.</p></translation> - </message> - <message> - <source>Cancel</source> - <translation>Cancel·la</translation> - </message> - <message> - <source>Summary</source> - <translation>Resum</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'aquest enllaç: </p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>No es pot obtenir informació de noves versions degut a un problema amb la xarxa:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Ja teniu instal·lada la darrera versió del VirtualBox. Proveu novament més tard.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Aquest auxiliar connectarà amb el lloc web del VirtualBox i comprovarà si hi ha una versió més nova del VirtualBox.<p></p>Feu servir el botó <b>Comprova</b> per comprovar ara si hi ha noves versions o <b>Cancel·la</b> si no voleu comprovar ara si hi ha noves versions. Podeu iniciar aquest auxiliar en qualsevol moment seleccionant <b>Comprova si hi ha actualitzacions...</b> al menú d'<b>Ajuda</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>Ctrl+E</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts index 58d2e362f..8c45f04c6 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts @@ -234,11 +234,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>Copia tots els errors al porta-retalls</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation>Copia</translation> </message> </context> <context> @@ -585,15 +585,15 @@ </message> <message> <source>&Settings...</source> - <translation type="unfinished">Parà metre&s...</translation> + <translation>Parà metre&s...</translation> </message> <message> <source>Manage the virtual machine settings</source> - <translation type="unfinished"></translation> + <translation>Gestiona els parà metres de la mà quina virtual</translation> </message> <message> <source>Session I&nformation...</source> - <translation type="unfinished"></translation> + <translation>I&nformació de la sessió...</translation> </message> </context> <context> @@ -718,11 +718,11 @@ </message> <message> <source>When checked a new unique MAC address will assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Quan estiga marcat, s'assignarà una única adreça MAC a totes les targetes de xarxa configurades.</translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&Reinicialitza l'adreça MAC de totes les targetes de xarxa</translation> </message> </context> <context> @@ -740,100 +740,100 @@ <name>UICloneVMWizard</name> <message> <source>Clone a virtual machine</source> - <translation type="unfinished"></translation> + <translation>Clona una mà quina virtual</translation> </message> <message> <source>Clone</source> - <translation type="unfinished"></translation> + <translation>Clona</translation> </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translation>Base enllaçada per %1 i %2</translation> </message> </context> <context> <name>UICloneVMWizardPage1</name> <message> <source><p>This wizard will help you to create a clone of your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Este auxiliar vos ajudarà a crear un clon de la mà quina virtual.</p></translation> </message> <message> <source><p>Please choose a name for the new virtual machine:</p></source> - <translation type="unfinished"></translation> + <translation><p>Seleccioneu un nom per a la mà quina virtual nova:</p></translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&Reinicialitza l'adreça MAC per a totes les targetes de xarxa</translation> </message> <message> <source>Welcome to the virtual machine clone wizard</source> - <translation type="unfinished"></translation> + <translation>Vos donem la benvinguda a l'auxiliar de clonació de mà quines virtuals</translation> </message> <message> <source>%1 Clone</source> - <translation type="unfinished"></translation> + <translation>%1 clona</translation> </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Quan estiga marcat, s'assignarà una única adreça MAC nova a totes les targetes de xarxa configurades.</translation> </message> </context> <context> <name>UICloneVMWizardPage2</name> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Configuració de la clonació</translation> </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Clonació completa</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Clonació enllaçada</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>Seleccioneu el tipus de clonació.</p><p>Si seleccioneu <b>Clonació completa</b>, es crearà una còpia exacta (incloent totes les imatges virtuals de disc) de la mà quina virtual original. Si seleccioneu <b>Clonació enllaçada</b>, es crearà una mà quina virtual nova, però les imatges virtuals de disc apuntaran a les imatges virtuals de disc de la mà quina virtual original.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Tingueu en compte que es crearà una nova captura a través de la mà quina virtual original en cas que seleccioneu <b>Clonació enllaçada</b>.</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished"></translation> + <translation>Estat actual de la mà quina</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished"></translation> + <translation>Mà quina actual i tots els estats fills</translation> </message> <message> <source>All states</source> - <translation type="unfinished"></translation> + <translation>Tots els estats</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Configuració de la clonació</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu quines parts de la mà quina virtual s'han de clonar.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished"></translation> + <translation>Si seleccioneu <b>Estat actual de la mà quina</b>, només es clonarà l'estat actual de la mà quina virtual.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Si seleccioneu <b>Mà quina actual i tots els estats fills</b>, es clonarà l'estat actual de la mà quina i qualsevol captura fill d'estats.</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Si seleccioneu <b>Tots els estats</b>, es clonarà l'estat actual de la mà quina i totes les captures.</translation> </message> </context> <context> @@ -1129,22 +1129,22 @@ <message> <source>Execution Cap</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>LÃmit d'execució</translation> </message> <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Generic driver, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Mòdul genèric, «%1»</translation> </message> <message> <source>Generic driver, '%1' {&nbsp;%2&nbsp;}</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Mòdul genèric, «%1» {&nbsp;%2&nbsp;}</translation> </message> </context> <context> @@ -1210,6 +1210,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -1356,7 +1363,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Export</source> - <translation type="unfinished"></translation> + <translation>Exporta</translation> </message> </context> <context> @@ -1698,7 +1705,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Start</source> - <translation type="unfinished">Inicia</translation> + <translation>Inicia</translation> </message> </context> <context> @@ -2217,51 +2224,51 @@ p, li { white-space: pre-wrap; } <name>UIGlobalSettingsProxy</name> <message> <source>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</source> - <translation type="unfinished"></translation> + <translation>Quan estiga marcat, el VirtualBox farà servir els parà metres de servidor intermediari proveïts per a tasques com la baixada de les Guest Additions o la comprovació d'actualitzacions.</translation> </message> <message> <source>&Enable proxy</source> - <translation type="unfinished"></translation> + <translation>Habilita &el servidor intermediari</translation> </message> <message> <source>Ho&st:</source> - <translation type="unfinished"></translation> + <translation>Am&fitrió:</translation> </message> <message> <source>Changes the proxy host.</source> - <translation type="unfinished"></translation> + <translation>Canvia l'amfitrió del servidor intermediari.</translation> </message> <message> <source>&Port:</source> - <translation type="unfinished"></translation> + <translation>Por&t:</translation> </message> <message> <source>Changes the proxy port.</source> - <translation type="unfinished"></translation> + <translation>Canvia el port del servidor intermediari.</translation> </message> <message> <source>When checked the authentication supplied will be used with the proxy server.</source> - <translation type="unfinished"></translation> + <translation>Quan estiga marcat, l'autenticació proveïda es farà servir amb el servidor intermediari.</translation> </message> <message> <source>&Use authentication</source> - <translation type="unfinished"></translation> + <translation>Fes servir a&utenticació</translation> </message> <message> <source>User &name:</source> - <translation type="unfinished"></translation> + <translation>&Nom d'usuari:</translation> </message> <message> <source>Changes the user name used for authentication.</source> - <translation type="unfinished"></translation> + <translation>Canvia el nom d'usuari que es fa servir per a l'autenticació.</translation> </message> <message> <source>Pass&word:</source> - <translation type="unfinished"></translation> + <translation>&Contrasenya:</translation> </message> <message> <source>Changes the password used for authentication.</source> - <translation type="unfinished"></translation> + <translation>Canvia la contrasenya que es fa servir per a l'autenticació.</translation> </message> </context> <context> @@ -2334,23 +2341,23 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Left Shift</source> - <translation type="unfinished">Tecla de majúscules esquerra</translation> + <translation>Tecla de majúscules esquerra</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">Tecla de majúscules dreta</translation> + <translation>Tecla de majúscules dreta</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">Control esquerra</translation> + <translation>Control esquerra</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">Control dreta</translation> + <translation>Control dreta</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">Alt esquerra</translation> + <translation>Alt esquerra</translation> </message> <message> <source>Right Alt</source> @@ -2569,7 +2576,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Import</source> - <translation type="unfinished"></translation> + <translation>Importa</translation> </message> </context> <context> @@ -2705,10 +2712,6 @@ p, li { white-space: pre-wrap; } <translation><br><nobr><b>No hi ha carpetes compartides</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica si la pantalla remota (servidor VRDP) està activada (<img src=:/vrdp_16px.png/>) o no (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>El servidor VRDP està escoltant el port %1</translation> </message> @@ -2741,7 +2744,7 @@ p, li { white-space: pre-wrap; } <message> <source>Indicates the status of different features used by this virtual machine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></source> <comment>Virtualization Stuff LED</comment> - <translation type="unfinished"></translation> + <translation>Indica l'estat de caracterÃstiques diferents que fa servir esta mà quina virtual: <br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></translation> </message> </context> <context> @@ -2953,11 +2956,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. For maximal performance set the guest VRAM to at least <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>teniu l'acceleració 3D activada per a una operació del sistema que fa servir el mòdul de vÃdeo WDDM. Per a un rendiment mà xim, establiu la memòria VRAM del client com a mÃnim a <b>%1</b>.</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> + <translation>l'acceleració 2D està activada. Atès que l'acceleració de vÃdeo 2D només és compatible amb clients Windows, es desactivarà esta caracterÃstica.</translation> </message> </context> <context> @@ -3204,7 +3207,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 type="unfinished"></translation> + <translation>heu seleccionat un tipus de sistema client de 64 bits per a esta mà quina virtual. Amb estos tipus de clients es requereix maquinari de virtualització (VT-x/AMD-V), esta caracterÃstica s'activarà automà ticament.</translation> </message> </context> <context> @@ -3415,39 +3418,39 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Promiscuous Mode:</source> - <translation type="unfinished"></translation> + <translation>Mode &promiscu:</translation> </message> <message> <source>Selects the promiscuous mode policy of the network adapter when attached to an internal network, host only network or a bridge.</source> - <translation type="unfinished"></translation> + <translation>Selecciona el mode de privacitat promiscu per a l'adaptador de xarxa quan es connecta a una xarxa interna, a una xarxxa de només amfitrió o a un pont.</translation> </message> <message> <source>Generic Properties:</source> - <translation type="unfinished"></translation> + <translation>Propietats genèriques:</translation> </message> <message> <source>Enter any configuration settings here for the network attachment driver you will be using. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source> - <translation type="unfinished"></translation> + <translation>Introduïu qualsevol parà metre de configuració per al mòdul de connexió de xarxa que fareu servir. Els parà metres hauran de ser de la forma <b>name=valor</b> i dependran del mòdul. Feu servir <b>alt-intro</b> per afegir una nova entrada.</translation> </message> <message> <source>no generic driver is selected</source> - <translation type="unfinished"></translation> + <translation>no s'ha seleccionat cap mòdul genèric</translation> </message> <message> <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source> - <translation type="unfinished"></translation> + <translation>Selecciona l'adaptador de xarxa al sistema amfitrió on anirà el trà nsit d'origen i destà d'esta targeta de xarxa.</translation> </message> <message> <source>Enter the name of the internal network that this network card will be connected to. You can create a new internal network by choosing a name which is not used by any other network cards in this virtual machine or others.</source> - <translation type="unfinished"></translation> + <translation>Introduïu el nom de la xarxa interna a la qual es connectarà esta targeta de xarxa. Podeu crear una xarxa interna nova seleccionant un nom que no es faça servir per cap altra targeta de xarxa en esta o altres mà quines virtuals.</translation> </message> <message> <source>Selects the virtual network adapter on the host system that traffic to and from this network card will go through. You can create and remove adapters using the global network settings in the virtual machine manager window.</source> - <translation type="unfinished"></translation> + <translation>Selecciona l'adaptador de xarxa virtual a l'amfitrió on anirà el trà nsit d'orÃgen i destà d'esta targeta de xarxa. Podeu crear i eliminar adaptadors fent servir els parà metres globals de xarxa a la finestra del gestor de mà quines virtuals.</translation> </message> <message> <source>Selects the driver to be used with this network card.</source> - <translation type="unfinished"></translation> + <translation>Selecciona el mòdul que es farà servir amb esta targeta de xarxa.</translation> </message> </context> <context> @@ -4259,57 +4262,57 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation type="unfinished"></translation> + <translation>Quan estiga marcat, el disc virtual no s'eliminarà quan el client l'expulse.</translation> </message> <message> <source>&Live CD/DVD</source> - <translation type="unfinished"></translation> + <translation>CD/DVD &live</translation> </message> <message> <source>When checked the guest system will see the virtual disk as a solid state device.</source> - <translation type="unfinished"></translation> + <translation>Quan estiga marcat, el sistema client veurà el disc virtual com a un dispositiu d'estat sòlid.</translation> </message> <message> <source>&Solid-state drive</source> - <translation type="unfinished"></translation> + <translation>Dispositiu d'e&stat sòlid</translation> </message> <message> <source>Details:</source> - <translation type="unfinished"></translation> + <translation>Detalls:</translation> </message> <message> <source>no name specified for controller at position <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>no s'ha especificat cap nom per al controlador de la posició <b>%1</b>.</translation> </message> <message> <source>controller at position <b>%1</b> uses the name that is already used by controller at position <b>%2</b>.</source> - <translation type="unfinished"></translation> + <translation>el controlador de la posició <b>%1</b> fa servir el nom que ja fa servir el controlador de la posició <b>%2</b>.</translation> </message> <message> <source>no hard disk is selected for <i>%1</i>.</source> - <translation type="unfinished"></translation> + <translation>no s'ha seleccionat cap disc per a <b>%1</b>.</translation> </message> <message> <source>at most one supported</source> <comment>controller</comment> - <translation type="unfinished">com a mÃnim una suportada</translation> + <translation>com a mÃnim una compatible</translation> </message> <message> <source>up to %1 supported</source> <comment>controllers</comment> - <translation type="unfinished">fins %1 suportades</translation> + <translation>fins %1 compatibles</translation> </message> <message> <source>you are currently using more storage controllers than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2.</source> - <translation type="unfinished">actualment esteu fent servir més controlador d'emmagatzematge que els xips %1 suporten. Canvieu el tipus de xip a la pà gina de parà metres del sistema o reduïu el nombre dels següents controladors d'emmagatzematge a la pà gina de parà metres d'emmagatzematge: %2.</translation> + <translation>actualment esteu fent servir més controladors d'emmagatzematge del que els xips %1 són compatibles. Canvieu el tipus de xip a la pà gina de parà metres del sistema o reduïu el nombre dels controladors següents d'emmagatzematge a la pà gina de parà metres d'emmagatzematge: %2.</translation> </message> <message> <source>&Port Count:</source> - <translation type="unfinished"></translation> + <translation>Recompte de &ports:</translation> </message> <message> <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source> - <translation type="unfinished"></translation> + <translation>Selecciona el recompte de ports del controlador d'emmagatzematge SATA que estan seleccionats actualment a l'arbre d'emmagatzematge. Això ha de ser com a mÃnim un més que el valor més alt del nombre de ports que necessiteu fer servir.</translation> </message> </context> <context> @@ -4495,7 +4498,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source> - <translation type="unfinished">Defineix el tipus de xip que es fa servir en esta mà quina virtual.</translation> + <translation>Selecciona el xip que s'emularà en esta mà quina virtual. Tingueu en compte que l'emulació del xip ICH9 és experimental i no es recomana exceptuat per a sistemes clients (com el Mac OS X) que ho requerisquen.</translation> </message> <message> <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> @@ -4503,33 +4506,33 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Execution Cap:</source> - <translation type="unfinished"></translation> + <translation>LÃmit d'&execució:</translation> </message> <message> <source>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</source> - <translation type="unfinished"></translation> + <translation>Limita la quantitat de temps durant el qual cada CPU virtual pot executar-se. Es permetrà a cada CPU virtual fer servir este temps fins al percentatge de temps disponible en cada CPU fÃsica. Es pot deshabilitar el lÃmit d'execució establint-lo al 100%. Si s'estableix el lÃmit molt baix pot fer que la mà quina responga molt lentament.</translation> </message> <message> <source>you have set the processor execution cap to a low value. This can make the machine feel slow to respond.</source> - <translation type="unfinished"></translation> + <translation>heu establit la limitació d'execució del processador a un valor molt baix. Això pot fer que la mà quina responga lentament.</translation> </message> <message> <source>you have enabled a USB HID (Human Interface Device). This will not work unless USB emulation 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>heu habilitat un USB HID (dispositiu d'interfÃcie humana). Això no funcionarà a menys que l'emulació USB també estiga habilitada. Això es farà automà ticament quan accepteu els parà metres de la mà quina virtual en prémer el botó «D'acord».</translation> </message> <message> <source><qt>%1%</qt></source> <comment>Min CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source><qt>%1%</qt></source> <comment>Max CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>he assignat un tipus de xip ICH9 a esta mà quina virtual. No funcionarà correctament a menys que la caracterÃstica IO-APIC estiga habilitada. Això es farà automà ticament quan accepteu els parà metres de la mà quina virtual en prémer el botó «D'acord».</translation> </message> </context> <context> @@ -4661,7 +4664,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</source> - <translation type="unfinished"></translation> + <translation>L'USB 2.0 es troba activat per a esta mà quina virtual. Tot i aixÃ, això requereix la instal·lació de <b>%1</b>. Instal·leu el paquet d'extensions des del lloc web de baixades del VirtualBox. Una vegada fet això, haureu de tornar a activar l'USB 2.0. Mentrestant es desactivarà a no ser que cancel·leu els canvis dels parà metres actuals.</translation> </message> </context> <context> @@ -4777,15 +4780,15 @@ p, li { white-space: pre-wrap; } <name>UIMediumTypeChangeDialog</name> <message> <source>Modify medium attributes</source> - <translation type="unfinished"></translation> + <translation>Modifica els atributs del suport</translation> </message> <message> <source><p>You are about to change the attributes of the virtual disk located in <b>%1</b>.</p><p>Please choose one of the following medium types and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p></source> - <translation type="unfinished"></translation> + <translation><p>Ara canviareu els atributs del disc virtual ubicat a <b>%1</b>.</p><p>Seleccioneu un dels tipus de suport següents i premeu <b>%2</b> per procedir o <b>%3</b> en altre cas.</p></translation> </message> <message> <source>Choose medium type:</source> - <translation type="unfinished"></translation> + <translation>Trieu el tipus de suport:</translation> </message> </context> <context> @@ -5120,10 +5123,6 @@ p, li { white-space: pre-wrap; } <translation><p>La mà quina virtual ha informat que el sistema client no suporta <b>integració del punter</b> al mode de vÃdeo actual. Heu de capturar el punter (clicant sobre la pantalla de la mà quina virtual o prement la tecla amfitrió) per tal de poder controlar el punter a dins del sistema client.</p></translation> </message> <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>La Mà quina Virtual ha informat que el sistema client suporta <b>integració del punter del ratolÃ</b>. Això significa que no necessiteu <i>capturar</i> el punter del ratolà per poder fer-lo servir al sistema client -- totes les accions que executeu quan el punter del ratolà estiga a sobre de la Mà quina virtual s'enviaran directament al sistema client. Si es captura el ratolÃ, automà ticament es tornarà al mode normal.</p><p>La icona del ratolà a la barra d'estat es mostrarà com&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;per informar-vos que la integració del punter està suportada pel sistema client que està actiu.</p><p><b>Nota</b>: Algunes aplicacions poden comportar-s'incorrectament treballant en el mode d'integració del ratolÃ. Sempre podeu inhabilitar-ho a la sessió actual (o habilitar-ho) seleccionat l'opció corresponent a la barra de menú.</p></translation> - </message> - <message> <source><p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode but the virtual display is currently set to <b>%2&nbsp;bit</b>.</p><p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, if it is available, for best possible performance of the virtual video subsystem.</p><p><b>Note</b>. Some operating systems, like OS/2, may actually work in 32&nbsp;bit mode but report it as 24&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&nbsp;bit) is not available in the guest OS.</p></source> <translation><p>La finestra de la mà quina virtual està optimitzada per treballar en el mode de color <b>%1&nbsp;bit</b> però la qualitat del color que es mostra actualment està establerta a <b>%2&nbsp;bit</b>.</p><p>. Obriu el dià leg de propietats de la pantalla del sistema client i seleccioneu el mode de color <b>%3&nbsp;bit</b>, si és disponible, per obtindre el millor funcionament possible del subsistema de vÃdeo.</p><p><b>Nota</b>: Alguns sistemes operatius, com OS/2, necessiten treballar actualment al mode 32&nbsp;bit però informen que és 24&nbsp;bit (16 milions de colors). Haureu de provar a seleccionar una qualitat de color diferent per veure si és correcta i este missatge desapareix o simplemente podeu inhabilitar este missatge si esteu segur que la qualitat de color requerida (%4&nbsp;bit) no és disponible al sistema client.</p></translation> </message> @@ -5152,14 +5151,6 @@ p, li { white-space: pre-wrap; } <translation><p>No heu afegit cap disc dur a la nova mà quina virtual. La mà quina no podrà iniciar-se fins que no afegiu un disc dur amb un sistema operatiu client o qualsevol altre suport arrencable.</p><p>Voleu continuar?</p></translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Heu fet <b>clic amb el ratolÃ</b> a dins de la finestra de la Mà quina Virtual o heu premut la <b>tecla d'amfitrió</b>. Això fa que la Mà quina Virtual <b>capture</b> el punter del ratolà (només en cas que la integració del ratolà no estiga suportada pel sistema client) i el teclat, que ara no estaran disponibles per funcionar a la mà quina amfitriona.</p><p>Podeu prémer la <b>tecla d'amfitrió</b> en qualsevol moment per <b>tornar</b> el ratolà i el teclat al mode normal de funcionament. La tecla d'amfitrió assiganada actualment es mostra a la barra d'estat a la part inferior de la finestra, al costat de la icona &nbsp;<img src=hostkey_16px.png/>&nbsp;. Esta icona indica si el teclat i el ratolà estan en estat de captura o no.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>L'opció de <b>Captura automà tica del teclat</b> és activa. Això farà que la Mà quina Virtual <b>capture</b> el teclat sempre que la finestra de la mà quina virtual estiga activa i farà que el teclat no estiga disponible per a d'altres aplicacions que s'estiguen executant a l'ordinador amfitrió: quan el teclat està capturat, totes les tecles especials (incloent Alt-Tab) es readrecen a la mà quina virtual.</p><p>Podeu prémer la <b>tecla d'amfitrió</b> en qualsevol moment per <b>tornar</b> el ratolà i el teclat al mode normal de funcionament. La tecla d'amfitrió assiganada actualment es mostra a la barra d'estat a la part inferior de la finestra, al costat de la icona &nbsp;<img src=hostkey_16px.png/>&nbsp;. Esta icona indica si el teclat i el ratolà estan en estat de captura o no.</p></translation> - </message> - <message> <source>Result&nbsp;Code: </source> <comment>error info</comment> <translation>Resultat&nbsp;Codi:</translation> @@ -5386,7 +5377,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation><p>L'opció de <b>captura automà tica del teclat</b> és activa. Això farà que la mà quina virtual <b>capturi</b> el teclat sempre que la finestra de la mà quina virtual estiga activa i farà que el teclat no estiga disponible per a altres aplicacions que s'estiguen executant a l'ordinador amfitrió: quan el teclat està capturat, totes les tecles especials (incloent Alt-Tab) es readrecen a la mà quina virtual.</p><p>Podeu prémer la <b>tecla d'amfitrió</b> en qualsevol moment per <b>tornar</b> el punter i el teclat al mode normal de funcionament. La tecla d'amfitrió assiganada actualment es mostra a la barra d'estat a la part inferior de la finestra, al costat de la icona &nbsp;<img src=hostkey_16px.png/>&nbsp;. Esta icona indica si el teclat i el punter estan en estat de captura o no.</p></translation> + <translation><p>L'opció de <b>captura automà tica del teclat</b> és activa. Això farà que la mà quina virtual <b>capturi</b> el teclat sempre que la finestra de la mà quina virtual estiga activa i farà que el teclat no estiga disponible per a altres aplicacions que s'estiguen executant a l'ordinador amfitrió: quan el teclat està capturat, totes les tecles especials (incloent Alt-Tab) es readrecen a la mà quina virtual.</p><p>Podeu prémer la <b>tecla d'amfitrió</b> en qualsevol moment per <b>tornar</b> el punter i el teclat al mode normal de funcionament. La tecla d'amfitrió assiganada actualment es mostra a la barra d'estat a la part inferior de la finestra, al costat de la icona &nbsp;<img src=:/hostkey_16px.png/>&nbsp;. Esta icona indica si el teclat i el punter estan en estat de captura o no.</p></translation> </message> <message> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> @@ -6038,7 +6029,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Sorry, some generic error happens.</source> - <translation type="unfinished">S'han produït alguns errors genèrics.</translation> + <translation>S'han produït alguns errors genèrics.</translation> </message> <message> <source>Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source> @@ -6139,74 +6130,104 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Failed to register the virtual machine <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>No s'ha pogut registrar la mà quina virtual <b>%1</b>.</translation> </message> <message> <source><p>The machine settings were changed while you were editing them. You currently have unsaved setting changes.</p><p>Would you like to reload the changed settings or to keep your own changes?</p></source> - <translation type="unfinished"></translation> + <translation><p>Els parà metres de la mà quina van canviar mentre els està veu editant. Actualment teniu canvis no alçats.</p><p>Voleu tornar a carregar els parà metres canviats o mantindre els vostres canvis?</p></translation> </message> <message> <source>Reload settings</source> - <translation type="unfinished"></translation> + <translation>Torna a carregar els parà metres</translation> </message> <message> <source>Keep changes</source> - <translation type="unfinished"></translation> + <translation>Manté els canvis</translation> </message> <message> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> - <translation type="unfinished"></translation> + <translation>S'ha iniciat la mà quina virtual que esteu canviant. Només es poden canviar alguns parà metres quan la mà quina està en execució. La resta de canvis es perdran si tanqueu ara esta finestra.</translation> </message> <message> <source>Failed to clone the virtual machine <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>No s'ha pogut clonar la mà quina virtual <b>%1</b>.</translation> </message> <message> <source><p>You are about to restore snapshot <b>%1</b>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source> - <translation type="unfinished"></translation> + <translation><p>Ara restaurareu la captura <b>%1</b>.</p><p>Podeu crear primer una captura de l'estat actual de la mà quina virtual si seleccioneu la següent casella; si no ho feu, es perdrà l'estat actual de la mà quina de forma permanent. Voleu procedir?</p></translation> </message> <message> <source>Create a snapshot of the current machine state</source> - <translation type="unfinished"></translation> + <translation>Crea una captura de l'estat de la mà quina actual</translation> </message> <message> <source><p>Are you sure you want to restore snapshot <b>%1</b>?</p></source> - <translation type="unfinished"></translation> + <translation><p>Segur que voleu restaurar la captura <b>%1</b>?</p></translation> </message> <message> <source><p>Error changing medium type from <b>%1</b> to <b>%2</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>S'ha produït un error en canviar el tipus de suport de <b>%1</b> a <b>%2</b>.</p></translation> </message> <message> <source><p>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b><nobr>%1</nobr></b> to be installed.</p><p>Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</p></source> - <translation type="unfinished"></translation> + <translation><p>L'USB 2.0 es troba activat per a esta mà quina virtual. Tot i aixÃ, es requereix la instal·lació de <b><nobr>%1</nobr></b>.</p><p>Instal·leu el paquet d'extensions des del lloc web de baixades del VirtualBox. Una vegada fet això, podreu tornar a activar l'USB 2.0. Mentrestant es desactivarà a no ser que cancel·leu els canvis dels parà metres actuals.</p></translation> </message> <message> <source>Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer</source> - <translation type="unfinished"></translation> + <translation>No s'ha pogut carregar el servei de servidor intermediari USB (VERR_FILE_NOT_FOUND). Pot ser que el servei no estiga instal·lat a l'ordinador amfitrió</translation> </message> <message> <source>VirtualBox is not currently allowed to access USB devices. You can change this by adding your user to the 'vboxusers' group. Please see the user manual for a more detailed explanation</source> - <translation type="unfinished"></translation> + <translation>El VirtualBox no té permisos per accedir als dispositius USB. Podeu canviar això afegint el vostre usuari al grup «vboxusers». Vegeu el manual de l'usuari per a una explicació més detallada</translation> </message> <message> <source>VirtualBox is not currently allowed to access USB devices. You can change this by allowing your user to access the 'usbfs' folder and files. Please see the user manual for a more detailed explanation</source> - <translation type="unfinished"></translation> + <translation>El VirtualBox no té permisos per accedir als dispositius USB. Podeu canviar això permetent accedir al vostre usuari a la carpeta i fitxers «usbfs». Vegeu el manual de l'usuari per a una explicació més detallada</translation> </message> <message> <source>The USB Proxy Service has not yet been ported to this host</source> - <translation type="unfinished"></translation> + <translation>El servei de servidor intermediari USB no s'ha portat encara a aques amfitrió</translation> </message> <message> <source>Could not load the Host USB Proxy service</source> - <translation type="unfinished"></translation> + <translation>No s'ha pogut carregar el servei de servidor intermediari USB de l'amfitrió</translation> </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>No es pot trobar la captura anomenada <b>%1</b>.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> + <translation><p>No s'ha pogut alçar el fitxer baixat com a <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Baixa</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">Instal·la</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> <translation type="unfinished"></translation> </message> </context> @@ -6248,10 +6269,21 @@ p, li { white-space: pre-wrap; } <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished"></translation> + <translation>Cancel·la la baixada del CD del VirtualBox Guest Additions</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> + <translation>S'està baixant la imatge de CD del VirtualBox Guest Additions des de <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> <translation type="unfinished"></translation> </message> </context> @@ -6356,7 +6388,7 @@ al sistema operatiu client com a mida del disc dur.</p></translation> </message> <message> <source>Summary</source> - <translation type="unfinished">Resum</translation> + <translation>Resum</translation> </message> <message> <source><nobr>%1 Bytes</nobr></source> @@ -6372,7 +6404,7 @@ al sistema operatiu client com a mida del disc dur.</p></translation> </message> <message> <source>Select a file for the new hard disk image file</source> - <translation type="unfinished">Seleccioneu un fitxer per al fitxer d'imatge del disc dur nou</translation> + <translation>Seleccioneu un fitxer per al fitxer d'imatge del disc dur nou</translation> </message> <message> <source><p>Select the type of virtual hard disk image you want to create.</p> @@ -6431,12 +6463,12 @@ l'eficiència d'escriptura del disc dur fÃsic.</p></translation <message> <source>Location</source> <comment>summary</comment> - <translation type="unfinished">Ubicació</translation> + <translation>Ubicació</translation> </message> <message> <source>Size</source> <comment>summary</comment> - <translation type="unfinished">Mida</translation> + <translation>Mida</translation> </message> <message> <source>Bytes</source> @@ -6498,140 +6530,152 @@ l'eficiència d'escriptura del disc dur fÃsic.</p></translation <message> <source>%1_copy</source> <comment>copied virtual disk name</comment> - <translation type="unfinished"></translation> + <translation>%1_còpia</translation> </message> <message> <source>Create</source> - <translation type="unfinished"></translation> + <translation>Crea</translation> </message> <message> <source>Copy Virtual Disk</source> - <translation type="unfinished"></translation> + <translation>Copia el disc virtual</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation>Copia</translation> </message> <message> <source>Welcome to the virtual disk copying wizard</source> - <translation type="unfinished"></translation> + <translation>Vos donem la benvinguda a l'auxiliar de còpia de discos virtuals</translation> </message> <message> <source><p>This wizard will help you to copy a virtual disk.</p></source> - <translation type="unfinished"></translation> + <translation><p>Este auxiliar vos ajudarà a copiar un disc virtual.</p></translation> </message> <message> <source>Please select the virtual disk which you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select a virtual disk file.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu el disc virtual que voleu copiar si no es troba encara seleccionat. Podeu seleccionar un de la llista o fer servir la icona de carpeta al costat de la llista per seleccionar un fitxer de disc virtual.</translation> </message> <message> <source>&VDI (VirtualBox Disk Image)</source> - <translation type="unfinished"></translation> + <translation>ID&V (Imatge de disc del VirtualBox)</translation> </message> <message> <source>V&MDK (Virtual Machine Disk)</source> - <translation type="unfinished"></translation> + <translation>D&CMV (Disc de mà quina virtual)</translation> </message> <message> <source>V&HD (Virtual Hard Disk)</source> - <translation type="unfinished"></translation> + <translation>D&DV (Disc dur virtual)</translation> </message> <message> <source>Welcome to the virtual disk creation wizard</source> - <translation type="unfinished"></translation> + <translation>Vos donem la benvinguda a l'auxiliar de creació de disc virtuals</translation> </message> <message> <source><p>This wizard will help you to create a new virtual disk for your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Este auxiliar vos ajudarà a crear un disc virtual nou per a la vostra mà quina virtual.</p></translation> </message> <message> <source><p>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p></source> - <translation type="unfinished"></translation> + <translation><p>Seleccioneu el tipus de fitxer que voleu fer servir per al disc virtual nou. Si no necessiteu fer-lo servir amb cap altre programari de virtualització, podeu deixar este parà metre com està .</p></translation> </message> <message> <source>Virtual disk file type</source> - <translation type="unfinished"></translation> + <translation>Tipus de fitxer de disc virtual</translation> </message> <message> <source>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu el tipus de fitxer que voleu fer servir per al disc virtual nou. Si no necessiteu fer-lo servir amb cap altre programari de virtualització, podeu deixar este parà metre com està .</translation> </message> <message> <source>Virtual disk storage details</source> - <translation type="unfinished"></translation> + <translation>Detalls d'emmagatzematge del disc virtual</translation> </message> <message> <source>Please choose whether the new virtual disk file should be allocated as it is used or if it should be created fully allocated.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu si el fitxer de disc virtual nou s'ha d'ubicar a mesura que es fa servir o si s'hauria de crear completament ubicat.</translation> </message> <message> <source><p>A <b>dynamically allocated</b> virtual disk file will only use space on your physical hard disk as it fills up, although it will not shrink again automatically when space on it is freed.</p></source> - <translation type="unfinished"></translation> + <translation><p>Un disc virtual <b>ubicat de forma dinà mica</b> farà servir espai al disc dur conforme el necessiti. Tot i aixÃ, no s'encongirà quan s'alliberi espai.</p></translation> </message> <message> <source><p>A <b>fixed size</b> virtual disk file may take longer to create on some systems but is often faster to use.</p></source> - <translation type="unfinished"></translation> + <translation><p>Un fitxer de disc virtual de <b>mida fixa</b> trigarà més en crear-s'en alguns sistemes, però és més rà pid de fer servir.</p></translation> </message> <message> <source><p>You can also choose to <b>split</b> the virtual disk into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source> - <translation type="unfinished"></translation> + <translation><p>També podeu seleccionar <b>dividir</b> el disc virtual en molts fitxers fins a 2GB cada un. Això és útil principalment si voleu emmagatzemar la mà quina virtual en dispositius extraïbles o sistemes antics, alguns dels quals no poden gestionar fitxers molt grans.</translation> </message> <message> <source>&Dynamically allocated</source> - <translation type="unfinished"></translation> + <translation>Ubicat de forma &dinà mica</translation> </message> <message> <source>&Fixed size</source> - <translation type="unfinished"></translation> + <translation>Mida &fixa</translation> </message> <message> <source>&Split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>&Divideix en fitxers de menys de 2GB</translation> </message> <message> <source>Virtual disk file location and size</source> - <translation type="unfinished"></translation> + <translation>Ubicació i mida del fitxer de disc virtual</translation> </message> <message> <source>Select the size of the virtual disk in megabytes. This size will be reported to the Guest OS as the maximum size of this virtual disk.</source> - <translation type="unfinished"></translation> + <translation>Seleccioneu la mida del disc virtual en megabytes. Es donarà esta mida al sistema operatiu client com a mida mà xima del disc virtual.</translation> </message> <message> <source>Virtual disk file location</source> - <translation type="unfinished"></translation> + <translation>Ubicació del fitxer de disc virtual</translation> </message> <message> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> - <translation type="unfinished"></translation> + <translation>Introduïu el nom del fitxer de disc virtual nou a la caixa següent o feu clic a la icona de la carpeta per a seleccionar una carpeta diferent on es crearà el fitxer.</translation> </message> <message> <source><nobr>%1 (%2 B)</nobr></source> - <translation type="unfinished"><nobr>%1 (%2 B)</nobr></translation> + <translation><nobr>%1 (%2 B)</nobr></translation> </message> <message> <source>You are going to create a new virtual disk with the following parameters:</source> - <translation type="unfinished"></translation> + <translation>Ara creareu una disc virtual nou amb els parà metres següents:</translation> </message> <message> <source>You are going to create a copied virtual disk with the following parameters:</source> - <translation type="unfinished"></translation> + <translation>Ara creareu un disc virtual copiat amb els parà metres següents:</translation> </message> <message> <source>If the above settings are correct, press the <b>%1</b> button. Once you press it the new virtual disk file will be created.</source> - <translation type="unfinished"></translation> + <translation>Si els parà metres de dalt són correctes, premeu el botó <b>%1</b>. En prémer-lo, es crearà el fitxer de disc virtual nou.</translation> </message> <message> <source>%1 B</source> - <translation type="unfinished">%1 B</translation> + <translation>%1 B</translation> </message> <message> <source>File type</source> <comment>summary</comment> - <translation type="unfinished"></translation> + <translation>Tipus de fitxer</translation> </message> <message> <source>Details</source> <comment>summary</comment> + <translation>Detalls</translation> + </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> <translation type="unfinished"></translation> </message> </context> @@ -6639,25 +6683,25 @@ l'eficiència d'escriptura del disc dur fÃsic.</p></translation <name>UINewHDWizardPageFormat</name> <message> <source>File type</source> - <translation type="unfinished"></translation> + <translation>Tipus de fitxer</translation> </message> </context> <context> <name>UINewHDWizardPageOptions</name> <message> <source>&Location</source> - <translation type="unfinished">&Ubicació</translation> + <translation>&Ubicació</translation> </message> <message> <source>&Size</source> - <translation type="unfinished">&Mida</translation> + <translation>&Mida</translation> </message> </context> <context> <name>UINewHDWizardPageVariant</name> <message> <source>Storage details</source> - <translation type="unfinished"></translation> + <translation>Detalls d'emmagatzematge</translation> </message> </context> <context> @@ -6672,11 +6716,11 @@ l'eficiència d'escriptura del disc dur fÃsic.</p></translation </message> <message> <source>Virtual disk to copy</source> - <translation type="unfinished"></translation> + <translation>Disc virtual que s'ha de copiar</translation> </message> <message> <source>Choose a virtual hard disk file...</source> - <translation type="unfinished">Selecciona un fitxer de disc dur virtual...</translation> + <translation>Trieu un fitxer de disc dur virtual...</translation> </message> </context> <context> @@ -7014,7 +7058,7 @@ pas i connectar discos durs més avant, fent servir el dià leg de configuració </message> <message> <source>Create</source> - <translation type="unfinished"></translation> + <translation>Crea</translation> </message> </context> <context> @@ -7103,11 +7147,11 @@ pas i connectar discos durs més avant, fent servir el dià leg de configuració </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">Arrenca el &disc dur</translation> + <translation>Arrenca el &disc dur</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>Seleccioneu un disc dur virtual que s'utilitzarà com a disc d'arrencada de la mà quina virtual. Podeu crear un disc dur nou o bé seleccionar un d'existent de la llista desplegable o bé prement el botó corresponent (per invocar una finestra per obrir el fitxer).</p><p>Si necessiteu una configuració més avançada, podeu ometre este pas i adjuntar discos durs més tard des del dià leg de parà metres de la mà quina virtual.</p></translation> + <translation><p>Si voleu, ara podeu afegir un disc d'arrencada a la mà quina nova. Podeu crear un disc virtual nou o seleccionar-ne un de la llista o bé des d'una altra ubicació fent servir la icona de carpeta.</p><p>Si necessiteu una configració més complexa de disc virtual, podeu ometre este pas i fer els canvis als parà metres de la mà quina una vegada que s'haja creat.</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -7115,7 +7159,7 @@ pas i connectar discos durs més avant, fent servir el dià leg de configuració </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">La mida recomanada del disc dur d'arrencada és <b>%1</b>.</translation> + <translation>La mida recomanada del disc dur d'arrencada és <b>%1</b>.</translation> </message> </context> <context> @@ -7151,7 +7195,7 @@ pas i connectar discos durs més avant, fent servir el dià leg de configuració <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">Arrenca el disc</translation> + <translation>Disc d'arrencada</translation> </message> <message> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> @@ -7336,7 +7380,7 @@ pas i connectar discos durs més avant, fent servir el dià leg de configuració </message> <message> <source>Proxy</source> - <translation type="unfinished"></translation> + <translation>Servidor intermediari</translation> </message> </context> <context> @@ -7438,6 +7482,109 @@ pas i connectar discos durs més avant, fent servir el dià leg de configuració </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dia</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dies</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dies</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dies</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dies</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dies</translation> + </message> + <message> + <source>1 week</source> + <translation>1 setmana</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 setmanes</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 setmanes</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mes</translation> + </message> + <message> + <source>Never</source> + <translation>Mai</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">S'ha excedit el temps d'espera de la connexió.</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">No es pot localitzar el formulari de registre al servidor (resposta: %1).</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">Com&prova</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">Tan&ca</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Auxiliar d'acutliatzació del VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Comprova si hi ha actualitzacions</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Este assistent connectarà amb el lloc web del VirtualBox i comprovarà si hi ha una versió més nova de VirtualBox.</p> +<p>Feu servir el botó <b>Comprova</b> per comprovar ara si hi ha noves versions o <b>Cancel·la</b> si no voleu comprovar ara si hi ha noves versions.</p> +<p>Podeu iniciar este assistent en qualsevol moment seleccionant <b>Comprova si hi ha actualitzacions...</b> al menú d'<b>Ajuda</b>.</p></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Cancel·la</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Resum</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'este enllaç: </p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>No es pot obtindre informació de noves versions degut a un problema amb la xarxa:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Ja teniu instal·lada la darrera versió del VirtualBox. Proveu novament més tard.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Este auxiliar connectarà amb el lloc web del VirtualBox i comprovarà si hi ha una versió més nova del VirtualBox.<p></p>Feu servir el botó <b>Comprova</b> per comprovar ara si hi ha noves versions o <b>Cancel·la</b> si no voleu comprovar ara si hi ha noves versions. Podeu iniciar este auxiliar en qualsevol moment seleccionant <b>Comprova si hi ha actualitzacions...</b> al menú d'<b>Ajuda</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7994,14 +8141,6 @@ Versió %1</translation> <translation type="obsolete">&Ajuda</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si la funció d'autoredimensió de la pantalla client està activada (<img src=auto_resize_on_16px.png/>) o desactivada (<img src=auto_resize_off_16px.png/>). Tingueu en compte que esta funció requereix tindre les Guest Additions instal·lades en el sistema operatiu client.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si el punter del ratolà de l'ordinador amfitrió és capturat pel sistema operatiu client:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;no captura el punter</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;captura el punter</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;la integració del ratolà (MI) està activada</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI està desactivada, captura el punter</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI està desactivada, no captura el punter</nobr><br>Tingueu en compte que la funció d'integració del ratolà requereix tindre instal·lades les Guest Additions en el sistema operatiu client.</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">Mostra la tecla assignada a l'amfitrió.<br>Quan es prem esta tecla commuta l'estat de captura del teclat i el ratolÃ. També es pot fer servir en combinació amb altres tecles per accedir rà pidament a algunes opcions del menú principal.</translation> </message> @@ -8097,10 +8236,6 @@ Versió %1</translation> <translation type="obsolete">Canvia al mode d'integració de l'escriptori fluid</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indica si el teclat és capturat pel sistema operatiu client (<img src=hostkey_captured_16px.png/>) o no (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Indica l'activitat del disquet:</nobr>%1</qt></translation> @@ -8191,8 +8326,8 @@ Versió %1</translation> <translation type="obsolete"><br><nobr><b>El controlador USB està desactivat</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica si la pantalla remota (servidor VRDP) està activada (<img src=vrdp_16px.png/>) o no (<img src=vrdp_disabled_16px.png/>).</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> + <translation type="obsolete">Indica si la pantalla remota (servidor VRDP) està activada (<img src=:/vrdp_16px.png/>) o no (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> @@ -8251,14 +8386,6 @@ Versió %1</translation> <translation type="obsolete">Indica si el punter de l'ordinador amfitrió és capturat pel sistema operatiu client:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;no captura el punter</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;captura el punter</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;la integració del punter (MI) està activada</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI està desactivada, captura el punter</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI està desactivada, no captura el punter</nobr><br>Tingueu en compte que la funció d'integració del punter requereix tindre instal·lades les Guest Additions en el sistema operatiu client.</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">Indica si el teclat és capturat pel sistema operatiu client (<img src=:/hostkey_captured_16px.png/>) o no (<img src=:/hostkey_16px.png/>).</translation> - </message> - <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica si la pantalla remota (servidor VRDP) està activada (<img src=:/vrdp_16px.png/>) o no (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source>&Logging...</source> <comment>debug action</comment> <translation type="obsolete">&S'està connectant...</translation> @@ -10285,58 +10412,58 @@ Versió %1</translation> </message> <message> <source>Dynamically allocated storage</source> - <translation type="unfinished"></translation> + <translation>Emmagatzematge d'ubicació dinà mica</translation> </message> <message> <source>Fixed size storage</source> - <translation type="unfinished"></translation> + <translation>Emmagatzematge de mida fixa</translation> </message> <message> <source>Dynamically allocated storage split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>L'emmagatzematge d'ubicació dinà mica divideix en fitxers de menys de 2GB</translation> </message> <message> <source>Fixed size storage split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>L'emmagatzematge de mida fixa divideix els fitxers de menys de 2GB</translation> </message> <message> <source>Execution Cap</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>LÃmit d'execució</translation> </message> <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation><nobr>%1</nobr></translation> </message> <message> <source>Generic, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Genèric, «%1»</translation> </message> <message> <source>Generic Driver</source> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>Mòdul genèric</translation> </message> <message> <source>Deny</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Denega</translation> </message> <message> <source>Allow VMs</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Permet mà quines virtuals</translation> </message> <message> <source>Allow All</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Permet-ho tot</translation> </message> <message> <source>Adapter %1</source> - <translation type="unfinished">Adaptador %1</translation> + <translation>Adaptador %1</translation> </message> </context> <context> @@ -11142,43 +11269,43 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati </message> <message> <source>Type:</source> - <translation type="unfinished">Tipus:</translation> + <translation>Tipus:</translation> </message> <message> <source>Location:</source> - <translation type="unfinished">Ubicació:</translation> + <translation>Ubicació:</translation> </message> <message> <source>Format:</source> - <translation type="unfinished"></translation> + <translation>Format:</translation> </message> <message> <source>Storage details:</source> - <translation type="unfinished"></translation> + <translation>Detalls d'emmagatzematge:</translation> </message> <message> <source>Attached to:</source> - <translation type="unfinished"></translation> + <translation>Connectat a:</translation> </message> <message> <source>&Copy...</source> - <translation type="unfinished"></translation> + <translation>&Copia...</translation> </message> <message> <source>&Modify...</source> - <translation type="unfinished"></translation> + <translation>&Modifica...</translation> </message> <message> <source>Copy an existing medium</source> - <translation type="unfinished"></translation> + <translation>Copia un suport existent</translation> </message> <message> <source>Modify the attributes of the selected medium</source> - <translation type="unfinished"></translation> + <translation>Modifica els atributs del suport seleccionat</translation> </message> <message> <source>C&lose</source> - <translation type="unfinished"></translation> + <translation>&Tanca</translation> </message> </context> <context> @@ -11506,7 +11633,7 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati </message> <message> <source>Discard</source> - <translation type="unfinished">Descarta</translation> + <translation>Descarta</translation> </message> <message> <source>D&iscard</source> @@ -11537,10 +11664,6 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati <translation type="obsolete">&Fitxer</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Benvinguts a VirtualBox!</h3><p>A la part esquerra d'esta finestra es mostra un llistat de totes les mà quines virtuals a l'ordinador. Este llistat és buit actualment perquè encara no heu creat cap mà quina virtual.<img src=welcome.png align=right/></p><p>Per crear una nova mà quina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'esta finestra.</p><p>Podeu prémer la tecla <b>%1</b> per obtindre ajuda o bé visitar <a href=http://www.virtualbox.org>www.virtualbox.org</a> per veure altra informació i novetats.</p></translation> - </message> - <message> <source>&Help</source> <translation type="obsolete">&Ajuda</translation> </message> @@ -11819,15 +11942,15 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati </message> <message> <source>Cl&one...</source> - <translation type="unfinished"></translation> + <translation>Cl&ona...</translation> </message> <message> <source>Clone the selected virtual machine</source> - <translation type="unfinished"></translation> + <translation>Clona la mà quina virtual seleccionada</translation> </message> <message> <source>D&iscard Saved State</source> - <translation type="unfinished"></translation> + <translation>D&escarta l'estat alçat</translation> </message> </context> <context> @@ -12233,11 +12356,11 @@ per accedir a ella des d'un sistema Linux. Esta caracterÃstica requereix G </message> <message> <source>&Clone...</source> - <translation type="unfinished"></translation> + <translation>&Clona...</translation> </message> <message> <source>Clone the selected virtual machine</source> - <translation type="unfinished"></translation> + <translation>Clona la mà quina virtual seleccionada</translation> </message> </context> <context> @@ -12482,109 +12605,6 @@ o a ambdòs (<i>Qualsevol</i>).</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dia</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dies</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dies</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dies</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dies</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dies</translation> - </message> - <message> - <source>1 week</source> - <translation>1 setmana</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 setmanes</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 setmanes</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mes</translation> - </message> - <message> - <source>Never</source> - <translation>Mai</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">S'ha excedit el temps d'espera de la connexió.</translation> - </message> - <message> - <source>Could not locate the latest version list on the server (response: %1).</source> - <translation type="obsolete">No es pot localitzar el formulari de registre al servidor (resposta: %1).</translation> - </message> - <message> - <source>Chec&k</source> - <translation>Com&prova</translation> - </message> - <message> - <source>&Close</source> - <translation>Tan&ca</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Auxiliar d'acutliatzació del VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Comprova si hi ha actualitzacions</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>Este assistent connectarà amb el lloc web del VirtualBox i comprovarà si hi ha una versió més nova de VirtualBox.</p> -<p>Feu servir el botó <b>Comprova</b> per comprovar ara si hi ha noves versions o <b>Cancel·la</b> si no voleu comprovar ara si hi ha noves versions.</p> -<p>Podeu iniciar este assistent en qualsevol moment seleccionant <b>Comprova si hi ha actualitzacions...</b> al menú d'<b>Ajuda</b>.</p></translation> - </message> - <message> - <source>Cancel</source> - <translation>Cancel·la</translation> - </message> - <message> - <source>Summary</source> - <translation>Resum</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'este enllaç: </p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>No es pot obtindre informació de noves versions degut a un problema amb la xarxa:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Ja teniu instal·lada la darrera versió del VirtualBox. Proveu novament més tard.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Este auxiliar connectarà amb el lloc web del VirtualBox i comprovarà si hi ha una versió més nova del VirtualBox.<p></p>Feu servir el botó <b>Comprova</b> per comprovar ara si hi ha noves versions o <b>Cancel·la</b> si no voleu comprovar ara si hi ha noves versions. Podeu iniciar este auxiliar en qualsevol moment seleccionant <b>Comprova si hi ha actualitzacions...</b> al menú d'<b>Ajuda</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>Ctrl+E</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts index e1fdc259e..269d89d6c 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts @@ -234,11 +234,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>ZkopÃruje vÅ¡echny chyby do schránky</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation>KopÃrovat</translation> </message> </context> <context> @@ -536,15 +536,15 @@ </message> <message> <source>&Settings...</source> - <translation type="unfinished">Nas&tavenÃ...</translation> + <translation>Nas&tavenÃ...</translation> </message> <message> <source>Manage the virtual machine settings</source> - <translation type="unfinished"></translation> + <translation>Spravuje nastavenà pro virtuálnà poÄÃtaÄ</translation> </message> <message> <source>Session I&nformation...</source> - <translation type="unfinished"></translation> + <translation>&Informace o sezenÃ...</translation> </message> </context> <context> @@ -669,11 +669,11 @@ </message> <message> <source>When checked a new unique MAC address will assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Je-li zatrženo, bude vÅ¡em nastavovaným sÃÅ¥ovým kartám pÅ™idÄ›lena nová unikátnà MAC adresa.</translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&Reinicializovat MAC adresy vÅ¡ech sÃÅ¥ových karet</translation> </message> </context> <context> @@ -691,11 +691,11 @@ <name>UICloneVMWizard</name> <message> <source>Clone a virtual machine</source> - <translation type="unfinished"></translation> + <translation>Klonovánà virtuálnÃho poÄÃtaÄe</translation> </message> <message> <source>Clone</source> - <translation type="unfinished"></translation> + <translation>Naklonovat</translation> </message> <message> <source>Linked Base for %1 and %2</source> @@ -706,85 +706,85 @@ <name>UICloneVMWizardPage1</name> <message> <source><p>This wizard will help you to create a clone of your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Tento průvodce vám pomůže vytvoÅ™it klon virtuálnÃho poÄÃtaÄe.</p></translation> </message> <message> <source><p>Please choose a name for the new virtual machine:</p></source> - <translation type="unfinished"></translation> + <translation><p>ProsÃm zadejte název nového virtálnÃho poÄÃtaÄe:</p></translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&Reinicializovat MAC adresy vÅ¡ech sÃÅ¥ových karet</translation> </message> <message> <source>Welcome to the virtual machine clone wizard</source> - <translation type="unfinished"></translation> + <translation>VÃtejte v průvodci klonovánÃm virtuálnÃho poÄÃtaÄe</translation> </message> <message> <source>%1 Clone</source> - <translation type="unfinished"></translation> + <translation>Klon %1</translation> </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Je-li zatrženo, bude vÅ¡em nastavovaným sÃÅ¥ovým kartám pÅ™idÄ›lena nová unikátnà MAC adresa.</translation> </message> </context> <context> <name>UICloneVMWizardPage2</name> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Konfigurace pro klonovánÃ</translation> </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Plný klon</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Propojený klon</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>Vyberte prosÃm typ klonu.</p><p>Pokud vyberete <b>Plný klon</b> bude vytvoÅ™ena plná kopie (vÄetnÄ› vÅ¡ech virtuálnÃch disků) originálnÃho virtuálnÃho poÄÃtaÄe. Pokud vyberete <b>Propojený klon</b> bude vytvoÅ™en nový virtuálnà poÄÃtaÄ, ale virtuálnà pevné disky budou odkazovat na virtuálnà disky původnÃho virtuálnÃho poÄÃtaÄe.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Pamatujte, že po volbÄ› <b>Projený klon</b> bude vytvoÅ™en nový snÃmek ze zdroje virtuálnÃho poÄÃtaÄe.</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished"></translation> + <translation>Aktuálnà stav poÄÃtaÄe</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished"></translation> + <translation>Aktuálnà stav poÄÃtae vÄetnÄ› vÅ¡ech odvozených stavů</translation> </message> <message> <source>All states</source> - <translation type="unfinished"></translation> + <translation>VÅ¡echny stavy</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Konfigurace klonu</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished"></translation> + <translation>Zvolte prosÃm která Äást virtuálnÃho poÄÃtaÄe bude klonována.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished"></translation> + <translation>Pokud zvolÃte <b>Aktuálnà stav poÄÃtaÄe</b>, bude klonován pouze aktuálnà stav poÄÃtaÄe.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Pokud zvolÃte <b>Aktuálnà stav poÄÃtae vÄetnÄ› vÅ¡ech odvozených stavů</b> bude klonován aktuálnà stav poÄÃtaÄe vÄetnÄ› vÅ¡ech stavů odvozených snÃmků.</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Pokud zvolÃte <b>VÅ¡echny stavy</b>, bude klonován aktuálnà stav vÄetnÄ› vÅ¡ech snÃmků.</translation> </message> </context> <context> @@ -1085,17 +1085,17 @@ <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation><nobr>%1%</nobr></translation> </message> <message> <source>Generic driver, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Obecný ovladaÄ, '%1'</translation> </message> <message> <source>Generic driver, '%1' {&nbsp;%2&nbsp;}</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Obecný ovladaÄ, '%1' {&nbsp;%2&nbsp;}</translation> </message> </context> <context> @@ -1173,6 +1173,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Vyberte složku pro uloženà %1 </translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -1310,7 +1317,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Export</source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> @@ -1648,7 +1655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Start</source> - <translation type="unfinished">Spustit</translation> + <translation>Spustit</translation> </message> </context> <context> @@ -1697,11 +1704,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.</p><p>Please note that when you close the virtual machine, the specified media will be automatically unmounted and the boot device will be set back to the first hard disk.</p><p>Depending on the type of the setup program, you may need to manually 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 <b>Unmount...</b> action in the <b>Devices</b> menu.</p></source> - <translation><p>Pokud jsou výše uvedené údaje správné, stisknÄ›te tlaÄÃtko <b>DokonÄit</b>. Po jeho stisku se vybrané médium doÄasnÄ› pÅ™ipojà k virtuálnÃmu poÄÃtaÄi a ten se spustÃ.</p><p>ProsÃm uvÄ›domte si, že když zavÅ™ete virtuálnà poÄÃtaÄ, bude vybrané medium automaticky odpojeno a bootovacà zaÅ™Ãzenà bude nastaveno zpÄ›t na prvnà pevný disk.</p><p>Podle typu instalaÄnÃho programu budete potÅ™ebovat ruÄnÄ› odpojit (vysunout) médium poté, co instalaÄnà program restartuje virtuálnà poÄÃtaÄ, abyste zabránili opÄ›tovnému spuÅ¡tÄ›nà instalaÄnÃho procesu. Provedete to vybránÃm odpovÃdajÃcà akce <b>Odpojit...</b> z nabÃdky <b>ZaÅ™ÃzenÃ</b>.</p></translation> + <translation><p>Pokud jsou výše uvedené údaje správné, klepnÄ›te na <b>DokonÄit</b>. Po jeho stisku se vybrané médium doÄasnÄ› pÅ™ipojà k virtuálnÃmu poÄÃtaÄi a ten se spustÃ.</p><p>ProsÃm uvÄ›domte si, že když zavÅ™ete virtuálnà poÄÃtaÄ, bude vybrané medium automaticky odpojeno a bootovacà zaÅ™Ãzenà bude nastaveno zpÄ›t na prvnà pevný disk.</p><p>Podle typu instalaÄnÃho programu budete potÅ™ebovat ruÄnÄ› odpojit (vysunout) médium poté, co instalaÄnà program restartuje virtuálnà poÄÃtaÄ, abyste zabránili opÄ›tovnému spuÅ¡tÄ›nà instalaÄnÃho procesu. Provedete to vybránÃm odpovÃdajÃcà akce <b>Odpojit...</b> z nabÃdky <b>ZaÅ™ÃzenÃ</b>.</p></translation> </message> <message> <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be mounted on the virtual machine and the machine will start execution.</p></source> - <translation><p>Pokud je to v pořádku, stisknÄ›te tlaÄÃtko <b>DokonÄit</b>. Po jeho stisku bude vybrané médium pÅ™ipojeno k virtuálnÃmu poÄÃtaÄi a poÄÃtaÄ jej zaÄne naÄÃtat.</p></translation> + <translation><p>Pokud je to v pořádku, klepnÄ›te na tlaÄÃtko <b>DokonÄit</b>. Po jeho stisku bude vybrané médium pÅ™ipojeno k virtuálnÃmu poÄÃtaÄi a poÄÃtaÄ jej zaÄne naÄÃtat.</p></translation> </message> <message> <source>Summary</source> @@ -1762,7 +1769,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Extensions</source> - <translation type="unfinished">RozÅ¡ÃÅ™enÃ</translation> + <translation>RozÅ¡ÃÅ™enÃ</translation> </message> </context> <context> @@ -1852,11 +1859,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Reset host combination</source> - <translation type="unfinished"></translation> + <translation>Resetovat kombinaci pro hostitele</translation> </message> <message> <source>Resets the key combination used as the host combination in the VM window.</source> - <translation type="unfinished"></translation> + <translation>Resetuje kombinaci kláves, použitou v oknÄ› virtuálnÃho poÄÃtaÄe hostitele.</translation> </message> </context> <context> @@ -2064,7 +2071,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Networking</source> - <translation type="unfinished"></translation> + <translation>SÃÅ¥ovánÃ</translation> </message> </context> <context> @@ -2166,51 +2173,51 @@ p, li { white-space: pre-wrap; } <name>UIGlobalSettingsProxy</name> <message> <source>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</source> - <translation type="unfinished"></translation> + <translation>Je-li zatrženo, aplikace Virtualbox bude pro potÅ™eby stahovánà napÅ™. pÅ™Ãdavků pro hosta nebo kontroly nových verzà použÃvat proxy.</translation> </message> <message> <source>&Enable proxy</source> - <translation type="unfinished"></translation> + <translation>&Povolit proxy</translation> </message> <message> <source>Ho&st:</source> - <translation type="unfinished"></translation> + <translation>&Server:</translation> </message> <message> <source>Changes the proxy host.</source> - <translation type="unfinished"></translation> + <translation>ZmÄ›nà port pro proxy.</translation> </message> <message> <source>&Port:</source> - <translation type="unfinished"></translation> + <translation>Po&rt:</translation> </message> <message> <source>Changes the proxy port.</source> - <translation type="unfinished"></translation> + <translation>ZmÄ›nà port pro proxy.</translation> </message> <message> <source>When checked the authentication supplied will be used with the proxy server.</source> - <translation type="unfinished"></translation> + <translation>Je-li zatrženo, budou se pro pÅ™Ãstup k proxy serveru použÃvat pÅ™ihlaÅ¡ovacà údaje.</translation> </message> <message> <source>&Use authentication</source> - <translation type="unfinished"></translation> + <translation>&PoužÃt autentizaci</translation> </message> <message> <source>User &name:</source> - <translation type="unfinished"></translation> + <translation>&Jméno uživatele:</translation> </message> <message> <source>Changes the user name used for authentication.</source> - <translation type="unfinished"></translation> + <translation>ZmÄ›nà uživatelské jméno použité pro autentizaci.</translation> </message> <message> <source>Pass&word:</source> - <translation type="unfinished"></translation> + <translation>&Heslo:</translation> </message> <message> <source>Changes the password used for authentication.</source> - <translation type="unfinished"></translation> + <translation>ZmÄ›nà heslo použité pro autentizaci.</translation> </message> </context> <context> @@ -2283,23 +2290,23 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Left Shift</source> - <translation type="unfinished">Levý Shift</translation> + <translation>Levý Shift</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">Pravý Shift</translation> + <translation>Pravý Shift</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">Levý Ctrl</translation> + <translation>Levý Ctrl</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">Pravý Ctrl</translation> + <translation>Pravý Ctrl</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">Levý Alt</translation> + <translation>Levý Alt</translation> </message> <message> <source>Right Alt</source> @@ -2343,7 +2350,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>None</source> - <translation type="unfinished"></translation> + <translation>Žádná</translation> </message> </context> <context> @@ -2406,7 +2413,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Import</source> - <translation type="unfinished"></translation> + <translation>Import</translation> </message> </context> <context> @@ -2578,7 +2585,7 @@ p, li { white-space: pre-wrap; } <message> <source>Indicates the status of different features used by this virtual machine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></source> <comment>Virtualization Stuff LED</comment> - <translation type="unfinished"></translation> + <translation>Indikuje stav virtualizaÄnÃch rozÅ¡ÃÅ™enà použitých tÃmto virtuálnÃm poÄÃtaÄem:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></translation> </message> </context> <context> @@ -2790,11 +2797,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. For maximal performance set the guest VRAM to at least <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>máte povolenu 3D akceleraci pro operace, které použÃvajà WDDM ovladaÄ pro grafiku. Pro maximálnà propustnost nastavte velikost VRAM pro poÄÃtaÄ minimálnÄ› na <b>%1</b>.</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">máte povolenu 2D akceleraci videa. Protože tato akcelerace je podporována pouze na virtuálnÃch poÄÃtaÄÃch s Windows, bude tato vlastnost zákázána.</translation> + <translation>máte povolenu 2D akceleraci videa. Protože tato akcelerace je podporována pouze na virtuálnÃch poÄÃtaÄÃch s Windows, bude tato vlastnost zákázána.</translation> </message> </context> <context> @@ -3041,7 +3048,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 type="unfinished">zvolili jste 64bitový OS pro tento virtuálnà poÄÃtaÄ. Protože je nutná podpora hardwarové virtualizace (VT-x/AMD-V), byla tato volba automaticky nastavena.</translation> + <translation>zvolili jste 64bitový OS pro tento virtuálnà poÄÃtaÄ. Protože je nutná podpora hardwarové virtualizace (VT-x/AMD-V), byla tato volba automaticky nastavena.</translation> </message> </context> <context> @@ -3252,7 +3259,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Promiscuous Mode:</source> - <translation type="unfinished"></translation> + <translation>&Promiskuitnà režim:</translation> </message> <message> <source>Selects the promiscuous mode policy of the network adapter when attached to an internal network, host only network or a bridge.</source> @@ -3260,31 +3267,31 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Generic Properties:</source> - <translation type="unfinished"></translation> + <translation>Obecné vlastnosti:</translation> </message> <message> <source>Enter any configuration settings here for the network attachment driver you will be using. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source> - <translation type="unfinished"></translation> + <translation>Zde zadejte nastavenà pro sÃÅ¥ový ovladaÄ, který použÃváte. Nastavenà by mÄ›lo být ve formátu <b>název=hodnota</b> a je závislé na použitém ovladaÄi. Pro zadánà dalÅ¡Ã položky použijte <b>shift-enter</>b>.</translation> </message> <message> <source>no generic driver is selected</source> - <translation type="unfinished"></translation> + <translation>nenà vybrán obecný ovladaÄ</translation> </message> <message> <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source> - <translation type="unfinished"></translation> + <translation>Zvolte sÃÅ¥ovou kartu, pÅ™es kterou bude probÃhat komunikace na hostitelském systému.</translation> </message> <message> <source>Enter the name of the internal network that this network card will be connected to. You can create a new internal network by choosing a name which is not used by any other network cards in this virtual machine or others.</source> - <translation type="unfinished"></translation> + <translation>Zadejte název internà sÃtÄ›, ke které je tato sÃÅ¥ová karta pÅ™ipojena. Novou internà sÃÅ¥ můžete vytvoÅ™it zadánÃm názvu, který nenà použit žádnou jinou sÃÅ¥ovou kartou v tomto virtuálnÃm poÄÃtaÄi.</translation> </message> <message> <source>Selects the virtual network adapter on the host system that traffic to and from this network card will go through. You can create and remove adapters using the global network settings in the virtual machine manager window.</source> - <translation type="unfinished"></translation> + <translation>VýbÄ›r virtuálnà sÃÅ¥ové karty pÅ™es kterou bude virtuálnà poÄÃtaÄ komunikovat. Karty můžete pÅ™idávat a odebÃrat v oknÄ› s nastavenÃm globálnÃch sÃÅ¥ových parametrů pro virtuálnà poÄÃtaÄ.</translation> </message> <message> <source>Selects the driver to be used with this network card.</source> - <translation type="unfinished"></translation> + <translation>VýbÄ›r ovladaÄ pro tuto sÃÅ¥ovou kartu.</translation> </message> </context> <context> @@ -4044,11 +4051,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Choose or create a virtual hard disk file. The virtual machine will see the data in the file as the contents of the virtual hard disk.</source> - <translation type="unfinished"></translation> + <translation>VýbÄ›r nebo vytvoÅ™enà virtuálnÃho pevného disku. Virtuálnà poÄÃtaÄ uvidà data v toto souboru jako svůj virtuálnà pevný disk.</translation> </message> <message> <source>Set up the virtual hard disk</source> - <translation type="unfinished"></translation> + <translation>Nastavà virtuálnà pevný disk</translation> </message> <message> <source>CD/DVD &Drive:</source> @@ -4056,11 +4063,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Choose a virtual CD/DVD disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source> - <translation type="unfinished"></translation> + <translation>VýbÄ›r virtuálnÃho CD/DVD disku nebo fyzického zaÅ™Ãzenà pro virtuálnà poÄÃtaÄ. Virtuálnà poÄÃtaÄ uvidà obsah disku vloženého do této fyzické jednotky nebo v tomto souboru jako data a soubory.</translation> </message> <message> <source>Set up the virtual CD/DVD drive</source> - <translation type="unfinished"></translation> + <translation>Nastavà virtuálnà CD/DVD mechaniku</translation> </message> <message> <source>Floppy &Drive:</source> @@ -4068,11 +4075,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Choose a virtual floppy disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source> - <translation type="unfinished"></translation> + <translation>Vyberte a virtuálnà disketovou nebo fyzickou mechaniku. Virtuálnà poÄÃtaÄ uvidà pÅ™ipojený virtuálnà disk nebo vloženou disketu ve fyzické jednotce jako virtuálnà mechaniku a zobrazà jejà obsah.</translation> </message> <message> <source>Set up the virtual floppy drive</source> - <translation type="unfinished"></translation> + <translation>Nastavà virtuálnà disketovou mechaniku</translation> </message> <message> <source>Create a new hard disk...</source> @@ -4084,69 +4091,69 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Choose a virtual CD/DVD disk file...</source> - <translation type="unfinished"></translation> + <translation>Vybrat soubor s obrazem virtuálnÃho CD/DVD...</translation> </message> <message> <source>Remove disk from virtual drive</source> - <translation type="unfinished"></translation> + <translation>Odebere disk z virtuálnà mechaniky</translation> </message> <message> <source>Choose a virtual floppy disk file...</source> - <translation type="unfinished"></translation> + <translation>Vybrat soubor s obrazem virtuálnà diskety...</translation> </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation type="unfinished"></translation> + <translation>Je-li zatrženo, bude virtuálnà disk v pÅ™i vysunutà v hostitelském systému odpojen.</translation> </message> <message> <source>&Live CD/DVD</source> - <translation type="unfinished"></translation> + <translation>&Live CD/DVD</translation> </message> <message> <source>When checked the guest system will see the virtual disk as a solid state device.</source> - <translation type="unfinished"></translation> + <translation>Je-li zatrženo, bude virtuálnà disk v hostitelském operaÄnÃm systému vidÄ›t jako solid state disk.</translation> </message> <message> <source>&Solid-state drive</source> - <translation type="unfinished"></translation> + <translation>&Solid-state disk</translation> </message> <message> <source>Details:</source> - <translation type="unfinished"></translation> + <translation>Detaily:</translation> </message> <message> <source>no name specified for controller at position <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Å™adic na pozici <b>%1</b> nemá specifikován název.</translation> </message> <message> <source>controller at position <b>%1</b> uses the name that is already used by controller at position <b>%2</b>.</source> - <translation type="unfinished"></translation> + <translation>Å™adiÄ na pozici <b>%1</b> má název, který je již použit pro Å™adiÄ na pozici <b>%2</b>.</translation> </message> <message> <source>no hard disk is selected for <i>%1</i>.</source> - <translation type="unfinished"></translation> + <translation>pro <i>%1</i> nenà vybrán pevný disk.</translation> </message> <message> <source>at most one supported</source> <comment>controller</comment> - <translation type="unfinished">minimálnÄ› jedna podporovaná</translation> + <translation>minimálnÄ› jedna podporovaná</translation> </message> <message> <source>up to %1 supported</source> <comment>controllers</comment> - <translation type="unfinished">až %1 podporovaných</translation> + <translation>až %1 podporovaných</translation> </message> <message> <source>you are currently using more storage controllers than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2.</source> - <translation type="unfinished">použÃváte nynà vÃce Å™adiÄů než Äipová sada %1 podporuje. Změňte prosÃm typ Äipové sady na záložce Nastavenà systému nebo zmenÅ¡ete následujÃcà poÄet Å™adiÄů na záložce Nastavenà řadiÄe: %2.</translation> + <translation>použÃváte nynà vÃce Å™adiÄů než Äipová sada %1 podporuje. Změňte prosÃm typ Äipové sady na záložce Nastavenà systému nebo zmenÅ¡ete následujÃcà poÄet Å™adiÄů na záložce Nastavenà řadiÄe: %2.</translation> </message> <message> <source>&Port Count:</source> - <translation type="unfinished"></translation> + <translation>PoÄe&t portů:</translation> </message> <message> <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source> - <translation type="unfinished"></translation> + <translation>Zadejte poÄet portů pro aktuálnÄ› vybraný SATA Å™adiÄ. Hodnota musà být o jednu vyÅ¡Å¡Ã než je poÄet portů, které chcete použÃt.</translation> </message> </context> <context> @@ -4332,7 +4339,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source> - <translation type="unfinished">UrÄuje Äipovou sadu použitou pro virtuálnà poÄÃtaÄ.</translation> + <translation>UrÄuje Äipovou sadu použitou pro emulaci ve virtuálnÃm poÄÃtaÄi. Volba Äipové sady ICH9 je zatÃm experimentálnà a nenà doporuÄena kromÄ› hostovaných systémů (jako je napÅ™. MAc OS X) které ji vyžadujÃ.</translation> </message> <message> <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> @@ -4340,33 +4347,33 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Execution Cap:</source> - <translation type="unfinished"></translation> + <translation>O&mezenà procesoru:</translation> </message> <message> <source>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</source> - <translation type="unfinished"></translation> + <translation>ÄŒasový limit, který má každý virtuálnà CPU povoleno běžet. Každý virtuálnà CPU má umožnÄ›no běžet do daného procenta Äasu jednoho fyzického proceosru. Omezenà se vypne nastavenÃm hodnoty 100%. Nastavenà nižšà hodnoty může zpomalit odezvu virtuálnÃho poÄÃtaÄe.</translation> </message> <message> <source>you have set the processor execution cap to a low value. This can make the machine feel slow to respond.</source> - <translation type="unfinished"></translation> + <translation>nastavili jste omezenà procesoru na nÃzkou hodnotu. To může snÞit odezvu virtuálnÃho poÄÃtaÄe.</translation> </message> <message> <source>you have enabled a USB HID (Human Interface Device). This will not work unless USB emulation is also enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> - <translation type="unfinished">povolili jste USB HID zaÅ™ÃzenÃ. To nebude pracovat pokud nebude také povolena emulace USB. Ta se automaticky aktivuje jakmile akceptujete nastavenà virtuálnÃho poÄÃtaÄe stisknutÃm tlaÄÃtka OK.</translation> + <translation>povolili jste USB HID zaÅ™ÃzenÃ. Nebude ale pracovat pokud nebude také povolena emulace USB. Ta se automaticky aktivuje jakmile akceptujete nastavenà virtuálnÃho poÄÃtaÄe stisknutÃm tlaÄÃtka OK.</translation> </message> <message> <source><qt>%1%</qt></source> <comment>Min CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source><qt>%1%</qt></source> <comment>Max CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>pÅ™iÅ™adili jste tomuto poÄÃtaÄi Äipovou sadu ICH9. Ta nebude správnÄ› fungovat dokud nebude také povolena volba 'IO-APIC'. To se aktivuje automaticky pokud akceptujete nastavenà virtuálnÃho poÄÃtaÄe pomocà tlaÄÃtka OK.</translation> </message> </context> <context> @@ -4494,7 +4501,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</source> - <translation type="unfinished"></translation> + <translation>Pro tento virtuálnà poÄÃtaÄ je povolena podpora USB 2.0. Je ale potÅ™eba doinstalovat <b>%1</b>. ProsÃme doinstalujte rozÅ¡ÃÅ™enà z webových stránek aplikace VirtualBox. Po instalaci bude možno použÃt USB 2.0, která je nynà do zmÄ›ny nastavenà zakázána.</translation> </message> </context> <context> @@ -4610,15 +4617,15 @@ p, li { white-space: pre-wrap; } <name>UIMediumTypeChangeDialog</name> <message> <source>Modify medium attributes</source> - <translation type="unfinished"></translation> + <translation>ZmÄ›na atributů média</translation> </message> <message> <source><p>You are about to change the attributes of the virtual disk located in <b>%1</b>.</p><p>Please choose one of the following medium types and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p></source> - <translation type="unfinished"></translation> + <translation><b>Chystáte se zmÄ›nit atributy virtuálnÃho disku umÃstÄ›ného v <b>%1</b>.</p><p>Zvolte prosÃm jeden z následujÃcÃch typů média a klepnÄ›te na <b>%2</b> pro pokraÄovánà nebo <b>%3</b> v jiném pÅ™ÃpadÄ›.</p></translation> </message> <message> <source>Choose medium type:</source> - <translation type="unfinished"></translation> + <translation>Zvolte typ média:</translation> </message> </context> <context> @@ -4854,18 +4861,6 @@ p, li { white-space: pre-wrap; } <translation>NepodaÅ™ilo se odstranit sdÃlenou složku <b>%1</b> (vede do <nobr><b>%2</b></nobr>) z virtuálnÃho poÄÃtaÄe <b>%3</b>.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p><b>Kliknuli jste myÅ¡Ã</b> uvnitÅ™ obrazovky virtuálnÃho poÄÃtaÄe nebo jste stiskli <b>klávesu hostitele</b>. Virtuálnà poÄÃtaÄ tak <b>odchytne</b> kurzor myÅ¡i hostitele (pouze pokud hostovaným OS nenà integrace kurzoru myÅ¡i právÄ› podporována) a klávesnici, což je znepÅ™Ãstupnà pro dalÅ¡Ã běžÃcà aplikace na hostitelském poÄÃtaÄi.</p><p>Můžete kdykoliv stisknout <b>klávesu hostitele</b> pro <b>propuÅ¡tÄ›nÃ</b> klávesice a myÅ¡i (pokud jsou odchytávány) a vrátit je tak do normálnÃho stavu. PrávÄ› pÅ™iÅ™azená klávesa hostitele je zobrazena ve stavovém řádku na spodnà Äásti okna s virtuálnÃm poÄÃtaÄem vedle ikony&nbsp;<img src=hostkey_16px.png/>. Tato ikona spoleÄnÄ› s vedlejÅ¡Ã ikonou myÅ¡i indikujà aktuálnà stav odchytávánà klávesnice a myÅ¡i.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Máte zapnutou volbu <b>Automaticky odchytávat klávesnici</b>. Virtuálnà poÄÃtaÄ tak bude automaticky <b>odchytávat</b> události klávesnice pokaždé, když je okno VM aktivováno, a znepÅ™Ãstupnà je pro dalÅ¡Ã aplikace běžÃcà na hostitelském poÄÃtaÄi: když je klávesnice odchytávána, jsou vÅ¡echny stisky kláves (vÄetnÄ› systémových jako Alt-Tab) pÅ™esmÄ›rovány do VM.</p><p>Můžete kdykoliv stisknout <b>klávesu hostitele</b> pro <b>propuÅ¡tÄ›nÃ</b> klávesice a myÅ¡i (pokud jsou odchytávány) a vrátit je tak do normálnÃho stavu. PrávÄ› pÅ™iÅ™azená klávesa hostitele je zobrazena ve stavovém řádku ve spodnà Äásti okna s virtuálnÃm poÄÃtaÄem vedle ikony&nbsp;<img src=hostkey_16px.png/>. Tato ikona spoleÄnÄ› s vedlejÅ¡Ã ikonou myÅ¡i indikujà aktuálnà stav odchytávánà klávesnice a myÅ¡i.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>Virtuálnà poÄÃtaÄ hlásÃ, že hostovaný OS podporuje <b>integraci kurzoru myÅ¡i</b>. To znamená, že nepotÅ™ebujete <i>odchytávat</i> kurzor myÅ¡i, abyste ho mohli použÃt v hostovaném OS -- vÅ¡echny akce provádnÄ›né myÅ¡Ã nad obrazovkou virtuálnÃho poÄÃtaÄe jsou posÃlány hostovanému OS. Pokud je myÅ¡ právÄ› odchytávána, bude automaticky uvolnÄ›na.</p><p>Ikona myÅ¡i ve stavovém panelu vypadá jako&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;,aby vás informovala, že integrace kurozru myÅ¡i je podporována hostovaným OS a je právÄ› zapnuta.</p><p><b>Poznámka</b>: NÄ›které aplikace se v režimu integrace kurzoru myÅ¡i mohou chovat nesprávnÄ›. Režim můžete kdykoliv vypnout pro aktuálnà sezenà (nebo znovu zapnout) vybránÃm odpovÃdajÃcà akce z panelu s nabÃdkou.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>Virtuálnà poÄÃtaÄ hlásÃ, že hostovaný OS nepodporuje <b>integraci kurzoru myÅ¡i</b> v aktuálnÃm video režimu. Pro možnost použÃvánà myÅ¡i v hostovaném OS ji (kliknutÃm do obrazovky VM nebo stiskem klávesy hostitele) musÃte odchytávat.</p></translation> </message> @@ -5770,11 +5765,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>You are about to remove the virtual machine <b>%1</b> from the machine list.</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well?</p></source> - <translation type="unfinished"></translation> + <translation><p>Chystáte se odstranit virtuálnà poÄÃtaÄ <b>%1</b> ze seznamu. </p><p>Chcete také zároveň smazat z disku soubory obsahujÃcà virtuálnà poÄÃtaÄe?</p></translation> </message> <message> <source><p>You are about to remove the virtual machine <b>%1</b> from the machine list.</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well? Doing this will also remove the files containing the machine's virtual hard disks if they are not in use by another machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Chystáte se odstranit virtuálnà poÄÃtaÄ <b>%1</b> ze seznamu.</p><p>Chcete také souÄasnÄ› odstranit soubory obsahujÃcà virtuálnà poÄÃtaÄ z pevného disku? OdstranÄ›nÃm se také smažou vÅ¡echny soubory obsahujÃcà virtuálnà pevný disk pokud nejsou použÃvány jiným virtuálnÃm poÄÃtaÄem.</p></translation> </message> <message> <source>Delete all files</source> @@ -5786,7 +5781,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>You are about to remove the inaccessible virtual machine <b>%1</b> from the machine list. Do you wish to proceed?</source> - <translation type="unfinished"></translation> + <translation>Chystáte se odstranit nedostupný virtuálnà poÄÃtaÄ <b>%1</b> ze seznamu. Chcete pokraÄovat?</translation> </message> <message> <source>Remove</source> @@ -5794,7 +5789,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>You are about to add a virtual hard disk to controller <b>%1</b>.</p><p>Would you like to create a new, empty file to hold the disk contents or select an existing one?</p></source> - <translation type="unfinished"></translation> + <translation><p>Chystáte se pÅ™idat virtuálnà pevný disk k Å™adiÄi <b>%1</b>. </p><p>Chcete také vytvoÅ™it nový prázdný soubor pro obsah virtuálnÃho disku nebo použijete již existujÃcÃ?</p></translation> </message> <message> <source>Create &new disk</source> @@ -5808,7 +5803,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>You are about to add a new CD/DVD drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual CD/DVD disk to put in the drive or to leave it empty for now?</p></source> - <translation type="unfinished"></translation> + <translation><p>Chystáte se pÅ™idat CD/DVD mechaniku k Å™adiÄi <b>%1</b>. </p><p>Chcete vybrat virtuálnà CD/DVD disk a vložit ho do mechaniky nebo nechat mechaniku prázdnou?</p></translation> </message> <message> <source>&Choose disk</source> @@ -5822,39 +5817,39 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>You are about to add a new floppy drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual floppy disk to put in the drive or to leave it empty for now?</p></source> - <translation type="unfinished"></translation> + <translation><p>Chystáte se pÅ™idat novou disketovou mechaniku k Å™adiÄi <b>%1</b>. </p><p>Chcete vybrat virtuálnà obraz disku a vložit ho do disketové mechaniky nebo nechat mechaniku prázdnou?</p></translation> </message> <message> <source>Failed to detach the hard disk (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source> - <translation type="unfinished"></translation> + <translation>NepodaÅ™ilo se odpojit obraz pevného disku (<nobr><b>%1</b></nobr>) ze slotu zaÅ™Ãzenà <i>%2</i> poÄÃtaÄe <b>%3</b>.</translation> </message> <message> <source>Failed to detach the CD/DVD device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source> - <translation type="unfinished"></translation> + <translation>NepodaÅ™ilo se odpojit CD/DVD zaÅ™Ãzenà (<nobr><b>%1</b></nobr>) ze slotu zaÅ™Ãzenà <i>%2</i> poÄÃtaÄe <b>%3</b>.</translation> </message> <message> <source>Failed to detach the floppy device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source> - <translation type="unfinished"></translation> + <translation>NepodaÅ™ilo se odpojit disketovou mechaniku (<nobr><b>%1</b></nobr>) ze slotu zaÅ™Ãzenà <i>%2</i> poÄÃtaÄe <b>%3</b>.</translation> </message> <message numerus="yes"> <source><p>The virtual machine(s) <b>%1</b> are currently in a saved state.</p><p>If you continue the runtime state of the exported machine(s) will be discarded. Note that the existing machine(s) are not changed.</p></source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - <numerusform></numerusform> + <translation> + <numerusform><p>Virtuálnà poÄÃtaÄ <b>%1</b> je nynà v uloženém stavu.</p><p>Pokud budete pokraÄovat v exportu virtuálnÃho poÄÃtaÄe, bude aktuálnà stav ztracen. ExistujÃcà virtuálnà poÄÃtaÄ nebude zmÄ›nÄ›n.</p></numerusform> + <numerusform><p>Virtuálnà poÄÃtaÄe <b>%1</b> jsou nynà v uloženém stavu.</p><p>Pokud budete pokraÄovat v exportu virtuálnÃch poÄÃtaÄů, bude aktuálnà stav ztracen. ExistujÃcà virtuálnà poÄÃtaÄe nebudou zmÄ›nÄ›ny.</p></numerusform> + <numerusform><p>Virtuálnà poÄÃtaÄe <b>%1</b> jsou nynà v uloženém stavu.</p><p>Pokud budete pokraÄovat v exportu virtuálnÃch poÄÃtaÄů, bude aktuálnà stav ztracen. ExistujÃcà virtuálnà poÄÃtaÄe nebudou zmÄ›nÄ›ny.</p></numerusform> </translation> </message> <message> <source>Failed to update Guest Additions. The Guest Additions installation image will be mounted to provide a manual installation.</source> - <translation type="unfinished"></translation> + <translation>NepodaÅ™ilo se aktualizovat pÅ™Ãdavky pro hosta. Obraz s instalacà pÅ™Ãdavku pro hosta bude pÅ™ipojen pro možnost ruÄnà instalace.</translation> </message> <message> <source>Failed to install the Extension Pack <b>%1</b>.</source> - <translation type="unfinished">NepodaÅ™ilo se <b>%1</b>.</translation> + <translation>NepodaÅ™ilo se nainstalovat balÃÄek s rozÅ¡ÃÅ™enÃm <b>%1</b>.</translation> </message> <message> <source>Failed to uninstall the Extension Pack <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>NepodaÅ™ilo se odinstalovat balÃÄek s rozÅ¡ÃÅ™enÃm <b>%1</b>.</translation> </message> <message> <source>&Remove</source> @@ -5862,15 +5857,15 @@ p, li { white-space: pre-wrap; } </message> <message> <source>The current port forwarding rules are not valid. None of the host or guest port values may be set to zero.</source> - <translation type="unfinished"></translation> + <translation>Aktuálnà pravidla pro pÅ™edávánà portů nejsou platná. Hodnoty portů pro hosta ani pro hostitele nemohou být nuly.</translation> </message> <message> <source><p>There are unsaved changes in the port forwarding configuration.</p><p>If you proceed your changes will be discarded.</p></source> - <translation type="unfinished"></translation> + <translation><p>V konfiguraci pravidel pro pÅ™edávánà portů jsou neuložené zmÄ›ny.</p><p>Pokud budete pokraÄovat, budou zmÄ›ny ztraceny.</p></translation> </message> <message> <source>Sorry, some generic error happens.</source> - <translation type="unfinished">Omlouváme se, vyskytla se obecná chyba.</translation> + <translation>Omlouváme se, vyskytla se obecná chyba.</translation> </message> <message> <source>Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source> @@ -5886,152 +5881,182 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>Note that the storage unit of this medium will not be deleted and that it will be possible to use it later again.</p></source> - <translation type="unfinished"></translation> + <translation><p>Poznámka: Médium nebude smazáno a proto bude možné jej pozdÄ›ji opÄ›t pÅ™idat do seznamu.</p></translation> </message> <message> <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then shared folders will be available once it is.</p></source> - <translation type="unfinished"></translation> + <translation><p>Pro tento virtuálnà poÄÃtaÄ nejsou dostupné pÅ™Ãdavky pro hosta a sdÃlené složky nelze bez tohoto pÅ™Ãdavku použÃt. Pokud chcete použÃvat sdÃlené složky, nainstalujte pÅ™Ãdavky pro hosta, pÅ™ÃpadnÄ› je reinstalujte pokud nepracujà správnÄ› zvolenÃm položky <b>Instalovat pÅ™Ãdavky pro hosta</b> z nabÃdky <b>ZaÅ™ÃzenÃ</b>. SdÃlené složky budou pÅ™Ãstupné až bude virtuálnà poÄÃtaÄ plnÄ› spuÅ¡tÄ›n.</p></translation> </message> <message> <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Okno virtuálnÃho poÄÃtaÄe bude pÅ™epnuto do režimu <b>celé obrazovky</b>. Můžete jÃt zpÄ›t do režimu okna stiskem <b>%1</b>. Upozorňujeme, že <i>Host</i> klávesa je právÄ› nastavena na <b>%2</b>.</p><p>Upozorňujeme, že panel hlavnà nabÃdky je v režimu celé obrazovky skrytý. Můžete ho zpÅ™Ãstupnit stiskem <b>Host+Home</b>.</p></translation> </message> <message> <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Okno virtuálnÃho poÄÃtaÄe bude pÅ™epnuto do <b>bezeÅ¡vého</b> režimu. ZpÄ›t do režimu okna můžete pÅ™ejÃt stiskem <b>%1</b>. Upozorňujeme, že <i>Host</i> klávesa je právÄ› nastavena na <b>%2</b>.</p><p>Upozorňujeme, že panel hlavnà nabÃdky je v režimu celé obrazovky skrytý. Můžete ho zpÅ™Ãstupnit stiskem <b>Host+Home</b>.</p></translation> </message> <message> <source><p>The virtual machine window will be now switched to <b>Scale</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in scale mode. You can access it by pressing <b>Host+Home</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Okno virtuálnÃho poÄÃtaÄe bude pÅ™epnuto do <b>pÅ™izpůsobivého</b> režimu. ZpÄ›t do režimu okna můžete pÅ™ejÃt stiskem <b>%1</b>. Upozorňujeme, že <i>Host</i> klávesa je právÄ› nastavena na <b>%2</b>.</p><p>Upozorňujeme, že panel hlavnà nabÃdky je v pÅ™izpůsobivém režimu obrazovky skrytý. Můžete ho zpÅ™Ãstupnit stiskem <b>Host+Home</b>.</p></translation> </message> <message> <source>Switch</source> <comment>scale</comment> - <translation type="unfinished">PÅ™epnout</translation> + <translation>PÅ™epnout</translation> </message> <message> <source>Failed to open the Extension Pack <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>NaÄtenà balÃÄku s rozÅ¡ÃÅ™enÃm <b>%1</b> selhalo.</translation> </message> <message> <source><p>You are about to install a VirtualBox extension pack. Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%1</td></tr><tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%3</td></tr></table></p></source> - <translation type="unfinished"></translation> + <translation><p>Chystáte se nainstalovat baliÄek s rozÅ¡ÃÅ™enÃm pro VirtualBox. RozÅ¡ÃÅ™enà pÅ™idává do aplikace dalÅ¡Ã funkce, ale může obsahovat software, který může způsobit problémy se stabilitou operaÄnÃho systému. ProsÃme pÅ™eÄtÄ›te si pozornÄ› popis nÞe a pokraÄujte pouze tehdy, pokud jste rozÅ¡ÃÅ™enà zÃskali z důvÄ›ryhodného zdroje.</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Název:&nbsp;&nbsp;</b></td><td>%1</td></tr><tr><td><b>Verze:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Popis:&nbsp;&nbsp;</b></td><td>%3</td></tr></table></p></translation> </message> <message> <source>&Install</source> - <translation type="unfinished"></translation> + <translation>&Instalovat</translation> </message> <message> <source>Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</source> - <translation type="unfinished"></translation> + <translation>BalÃÄky s rozÅ¡ÃÅ™enÃm dodávajà dalÅ¡Ã funkce pro VirtualBox a mohou být zdrojem problémů pro vás poÄÃtaÄ. ProsÃme pÅ™eÄtÄ›te si pozornÄ› popis uvedený nÞe a pokraÄujte pouze tehdy, pokud jste zÃskali rozÅ¡ÃÅ™enà z důvÄ›ryhodného zdroje.</translation> </message> <message> <source><p>An older version of the extension pack is already installed, would you like to upgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></source> - <translation type="unfinished"></translation> + <translation><p>AktuálnÄ› je již nainstalována starÅ¡Ã verze rozÅ¡ÃÅ™enÃ, chcete jej aktualizovat? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Název:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Nová verze:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Aktuálnà verze:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Popis:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></translation> </message> <message> <source>&Upgrade</source> - <translation type="unfinished"></translation> + <translation>&Aktualizovat</translation> </message> <message> <source><p>An newer version of the extension pack is already installed, would you like to downgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></source> - <translation type="unfinished"></translation> + <translation><p>AktuálnÄ› je již nainstalována novÄ›jÅ¡Ã verze rozÅ¡ÃÅ™enÃ, chcete nainstalovat starÅ¡Ã verzi? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Název:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Nová verze:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Aktuálnà verze:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Popis:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></translation> </message> <message> <source>&Downgrade</source> - <translation type="unfinished"></translation> + <translation>Ins&talovat starÅ¡Ã verzi</translation> </message> <message> <source><p>The extension pack is already installed with the same version, would you like reinstall it? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%4</td></tr></table></p></source> - <translation type="unfinished"></translation> + <translation><p>AktuálnÄ› je již nainstalována stejná verze rozÅ¡ÃÅ™enÃ, chcete jej reinstalovat? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Název:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Aktuálnà verze:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Popis:&nbsp;&nbsp;</b></td><td>%4</td></tr></table></p></translation> </message> <message> <source>&Reinstall</source> - <translation type="unfinished"></translation> + <translation>&Reinstalovat</translation> </message> <message> <source><p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p><p>Are you sure you want to proceed?</p></source> - <translation type="unfinished"></translation> + <translation><p>Chystáte se odinstalovat balÃÄek s rozÅ¡ÃÅ™enÃm <b>%1</b> pro VirtualBox.</p><p>Chcete opravdu pokraÄovat?</p></translation> </message> <message> <source>The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.</source> - <translation type="unfinished"></translation> + <translation>BalÃÄek s rozÅ¡ÃÅ™enÃm <br><nobr><b>%1</b><nobr><br> byl úspěšnÄ› nainstalován.</translation> </message> <message> <source><p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p><p>Please check that the parent really exists and that you have permissions to create the machine folder.</p></source> - <translation type="unfinished"></translation> + <translation><p>Nelze vytvoÅ™it složku <b>%1</b> pro poÄÃtaÄ v nadÅ™azené složce <nobr><b>%2</b>.</nobr></p><p> Zkontrolujte prosÃm, že nadÅ™azená složka existuje a máte práva pro vytvářenà složek.</p></translation> </message> <message> <source>Failed to register the virtual machine <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Registrace virtuálnÃho poÄÃtaÄe <b>%1</b> selhala.</translation> </message> <message> <source><p>The machine settings were changed while you were editing them. You currently have unsaved setting changes.</p><p>Would you like to reload the changed settings or to keep your own changes?</p></source> - <translation type="unfinished"></translation> + <translation><p>Nastavenà virtuálnÃho poÄÃtaÄe bylo bÄ›hem editace zmÄ›nÄ›no. Máte nynà neuložené zmÄ›ny.</p><p>Chcete naÄÃst zmÄ›nÄ›né nastavenà nebo ponechat naÅ¡e zmÄ›ny?</p></translation> </message> <message> <source>Reload settings</source> - <translation type="unfinished"></translation> + <translation>Znovu naÄÃst nastavenÃ</translation> </message> <message> <source>Keep changes</source> - <translation type="unfinished"></translation> + <translation>Ponechat zmÄ›ny</translation> </message> <message> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> - <translation type="unfinished"></translation> + <translation>Virtuálnà poÄÃtaÄ, ve kterém provádÃte zmÄ›ny v nastavenÃ, byl spuÅ¡tÄ›n. Pokud běžà virtuálnà poÄÃtaÄ, mohou být použity pouze nÄ›které zmÄ›ny. VÅ¡echny dalÅ¡Ã zmÄ›ny budou po uzavÅ™enà tohoto okna ztraceny.</translation> </message> <message> <source>Failed to clone the virtual machine <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>NepodaÅ™ilo se vytvoÅ™it klon virtuálnÃho poÄÃtaÄe <b>%1</b>.</translation> </message> <message> <source><p>You are about to restore snapshot <b>%1</b>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source> - <translation type="unfinished"></translation> + <translation><p>Chystáte se obnovit snÃmek <b>%1</b>.</p><p>. SnÃmek aktuálnÃho stavu virtuálnÃho poÄÃtaÄe můžete vytvoÅ™it zaÅ¡krtnutà volby nÞe, jinak bude aktuálnà stav poÄÃtaÄe nenávratnÄ› ztracen. Chcete pokraÄovat?</p></translation> </message> <message> <source>Create a snapshot of the current machine state</source> - <translation type="unfinished"></translation> + <translation>Vytvořà snÃmek z aktuálnà stavu virtuálnÃho poÄÃtaÄe</translation> </message> <message> <source><p>Are you sure you want to restore snapshot <b>%1</b>?</p></source> - <translation type="unfinished"></translation> + <translation><p>Opravdu chcete obnovit snÃmek <b>%1</b>?</p></translation> </message> <message> <source><p>Error changing medium type from <b>%1</b> to <b>%2</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>PÅ™i zmÄ›nÄ› typu média z <b>%1</b> na <b>%2</b> se vyskytla chyba.</p></translation> </message> <message> <source><p>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b><nobr>%1</nobr></b> to be installed.</p><p>Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</p></source> - <translation type="unfinished"></translation> + <translation><p>Pro tento virtuálnà poÄÃtaÄ je povolena podpora USB 2.0. Je ale potÅ™eba doinstalovat <b><nobr>%1</nobr></b>. ProsÃme doinstalujte rozÅ¡ÃÅ™enà z webových stránek aplikace VirtualBox. Po instalaci bude možno použÃt podporu pro USB 2.0, která je nynà do zmÄ›ny nastavenà zakázána.</p></translation> </message> <message> <source>Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer</source> - <translation type="unfinished"></translation> + <translation>Nelze spustit službu USB Proxy (VERR_FILE_NOT_FOUND). ZÅ™ejmÄ› na tomto hostutelském poÄÃtaÄi nenà služba nainstalována</translation> </message> <message> <source>VirtualBox is not currently allowed to access USB devices. You can change this by adding your user to the 'vboxusers' group. Please see the user manual for a more detailed explanation</source> - <translation type="unfinished"></translation> + <translation>Aplikace VirtualBox nemůže nynà pÅ™istupovat k USB zaÅ™ÃzenÃm. Můžete to zmÄ›nit pÅ™idánÃm uživatele do skupiny 'vboxusers'. VÃce informacà najdete v uživatelské pÅ™ÃruÄce</translation> </message> <message> <source>VirtualBox is not currently allowed to access USB devices. You can change this by allowing your user to access the 'usbfs' folder and files. Please see the user manual for a more detailed explanation</source> - <translation type="unfinished"></translation> + <translation>Aplikace VirtualBox nemůže nynà pÅ™istupovat k USB zaÅ™ÃzenÃm. Můžete to zmÄ›nit povolenÃm pÅ™istupu uživatele k souborům a složkám vlastnÃka 'usbfs'. VÃce informacà najdete v uživatelské pÅ™ÃruÄce</translation> </message> <message> <source>The USB Proxy Service has not yet been ported to this host</source> - <translation type="unfinished"></translation> + <translation>USB Proxy služba nebyla zatÃm na tomto hostiteli implementována</translation> </message> <message> <source>Could not load the Host USB Proxy service</source> - <translation type="unfinished"></translation> + <translation>Nelze spustit službu Host USB Proxy</translation> </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>SnÃmek <b>%1</b> nebyl nalezen.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="unfinished"><p>Selhalo ukládánà staženého souboru jako <nobr><b>%1</b>.</nobr></p></translation> + <translation><p>Selhalo uloženà staženého souboru jako <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Máte pro <b><nobr>%2</nobr></b> instalovanou starou verzi (%1). Chcete stáhnout aktuálnà z Internetu?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Stáhnout</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Opravdu chcete stáhnout <b><nobr>%1</nobr></b> z adresy <nobr><a href="%2">%2</a></nobr> (velikost %3 bytů)?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p>Soubor <b><nobr>%1</nobr></b> byl úspěšnÄ› stažen z adresy <nobr><a href="%2">%2</a></nobr> a uložen lokálnÄ› jako <nobr><b>%3</b>.</nobr></p><p>Chcete toto rozÅ¡ÃÅ™enà nainstalovat?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>Instalovat</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p>Soubor <b><nobr>%1</nobr></b> byl úspěšnÄ› stažen z adresy <nobr><a href="%2">%2</a></nobr> ale ne mohl být lokálnÄ› uložen jako <nobr><b>%3</b>.</nobr></p><p>Vyberte prosÃm pro tento soubor jiné umÃstÄ›nÃ.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Staženà souboru <b><nobr>%1</nobr></b> z <nobr><a href="%2">%2</a> selhalo.</nobr></p><p>%3</p></translation> </message> </context> <context> @@ -6072,11 +6097,22 @@ p, li { white-space: pre-wrap; } <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished"></translation> + <translation>ZruÅ¡Ã stahovánà obrazu CD disku s pÅ™Ãdavky pro hosta</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished"></translation> + <translation>Stahovánà CD obrazu disku s pÅ™Ãdavky pro hosta z <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>ZruÅ¡Ã stahovánà <nobr><b>%1</b></nobr></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Stahovánà <nobr><b>%1</b> z <nobr><b>%2</b>...</nobr></translation> </message> </context> <context> @@ -6180,7 +6216,7 @@ jako velikost virtuálnÃho pevného disku.</p></translation> </message> <message> <source>Summary</source> - <translation type="unfinished">ShrnutÃ</translation> + <translation>ShrnutÃ</translation> </message> <message> <source><nobr>%1 Bytes</nobr></source> @@ -6196,7 +6232,7 @@ jako velikost virtuálnÃho pevného disku.</p></translation> </message> <message> <source>Select a file for the new hard disk image file</source> - <translation type="unfinished">Vyberte soubor pro nový obraz pevného disku</translation> + <translation>Vyberte soubor pro nový obraz pevného disku</translation> </message> <message> <source><p>This wizard will help you to create a new virtual hard disk image for your virtual machine.</p><p>Use the <b>Next</b> button to go to the next page of the wizard and the <b>Back</b> button to return to the previous page.</p></source> @@ -6238,12 +6274,12 @@ jako velikost virtuálnÃho pevného disku.</p></translation> <message> <source>Location</source> <comment>summary</comment> - <translation type="unfinished">UmÃstÄ›nÃ</translation> + <translation>UmÃstÄ›nÃ</translation> </message> <message> <source>Size</source> <comment>summary</comment> - <translation type="unfinished">Velikost</translation> + <translation>Velikost</translation> </message> <message> <source>Bytes</source> @@ -6305,166 +6341,178 @@ jako velikost virtuálnÃho pevného disku.</p></translation> <message> <source>%1_copy</source> <comment>copied virtual disk name</comment> - <translation type="unfinished"></translation> + <translation>%1_kopie</translation> </message> <message> <source>Create</source> - <translation type="unfinished"></translation> + <translation>VytvoÅ™it</translation> </message> <message> <source>Copy Virtual Disk</source> - <translation type="unfinished"></translation> + <translation>KopÃrovánà virtuálnÃho disku</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Welcome to the virtual disk copying wizard</source> - <translation type="unfinished"></translation> + <translation>VÃtejte v průvodci kopÃrovánÃm virtuálnÃch disků</translation> </message> <message> <source><p>This wizard will help you to copy a virtual disk.</p></source> - <translation type="unfinished"></translation> + <translation><p>Tento průvodce vás provede kopÃrovánÃm virtuálnÃch disků.</p></translation> </message> <message> <source>Please select the virtual disk which you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select a virtual disk file.</source> - <translation type="unfinished"></translation> + <translation>Vyberte prosÃm virtuálnà disk, který chce zkopÃrovat. Můžete si vybrat se seznamu nebo pomocà ikony vedle seznamu otevÅ™Ãt složku a vybrat soubor s virtuálnÃm pevným diskem.</translation> </message> <message> <source>&VDI (VirtualBox Disk Image)</source> - <translation type="unfinished"></translation> + <translation>&VDI (VirtualBox Disk Image)</translation> </message> <message> <source>V&MDK (Virtual Machine Disk)</source> - <translation type="unfinished"></translation> + <translation>V&MDK (Virtual Machine Disk)</translation> </message> <message> <source>V&HD (Virtual Hard Disk)</source> - <translation type="unfinished"></translation> + <translation>V&HD (Virtual Hard Disk)</translation> </message> <message> <source>Welcome to the virtual disk creation wizard</source> - <translation type="unfinished"></translation> + <translation>VÃtejte v průvodci vytvoÅ™enà nového virtuálnÃho disku</translation> </message> <message> <source><p>This wizard will help you to create a new virtual disk for your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Tento průvodce vám pomůže vytvoÅ™it nový virtuálnà disk pro virtuálnà poÄÃtaÄ.</p></translation> </message> <message> <source><p>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p></source> - <translation type="unfinished"></translation> + <translation><p>Zvolte prosÃm typ souboru pro nový virtuálnà disk. Pokud nepotÅ™ebujete použÃvat jiný virtualizaÄnà software, můžete nechat volby beze zmÄ›ny.</p></translation> </message> <message> <source>Virtual disk file type</source> - <translation type="unfinished"></translation> + <translation>Typ souboru virtuálnÃho disku</translation> </message> <message> <source>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source> - <translation type="unfinished"></translation> + <translation>Zvolte prosÃm typ souboru pro nový virtuálnà disk. Pokud nepotÅ™ebujete použÃvat jiný virtualizaÄnà software, můžete nechat volby beze zmÄ›ny.</translation> </message> <message> <source>Virtual disk storage details</source> - <translation type="unfinished"></translation> + <translation>Detaily virtuálnÃho disku</translation> </message> <message> <source>Please choose whether the new virtual disk file should be allocated as it is used or if it should be created fully allocated.</source> - <translation type="unfinished"></translation> + <translation>Zvolte prosÃm zda má být soubor s novým virtuálnÃm diskem zvÄ›tÅ¡ován postupnÄ› podle potÅ™eby nebo vytvoÅ™en o pevnÄ› dané velikosti.</translation> </message> <message> <source><p>A <b>dynamically allocated</b> virtual disk file will only use space on your physical hard disk as it fills up, although it will not shrink again automatically when space on it is freed.</p></source> - <translation type="unfinished"></translation> + <translation><p><b>Dynamicky alokovaný</b> virtuálnà disk bude zabÃrat na fyzickém disku mÃsto tak jak bude zaplnÄ›n, ale nebude automaticky zmenÅ¡en pokud se v nÄ›m mÃsto uvolnÃ.</p></translation> </message> <message> <source><p>A <b>fixed size</b> virtual disk file may take longer to create on some systems but is often faster to use.</p></source> - <translation type="unfinished"></translation> + <translation><p>VytvoÅ™enà virtuálnÃho disku s <b>pevnou velikostÃ</b> může na nÄ›kterých systémech trvat déle ale použÃvá se ÄastÄ›ji.</p></translation> </message> <message> <source><p>You can also choose to <b>split</b> the virtual disk into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source> - <translation type="unfinished"></translation> + <translation><p>Můžete si zvolit <b>rozdÄ›lenÃ</b> souboru s virtuálnÃm diskem na nÄ›kolik Äástà menÅ¡Ãch než dva gigabajty. To je pÅ™edevÅ¡Ãm vhodné pokud budete ukládat virtuálnà disk na USB zaÅ™Ãzenà nebo starÅ¡Ã systémy, které majà problém s naÄtenÃm tak velkých souborů.</translation> </message> <message> <source>&Dynamically allocated</source> - <translation type="unfinished"></translation> + <translation>&Dynamicky alokované</translation> </message> <message> <source>&Fixed size</source> - <translation type="unfinished"></translation> + <translation>&Pevná velikost</translation> </message> <message> <source>&Split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>&RozdÄ›lit na soubory o velikosti menÅ¡Ã než 2GB</translation> </message> <message> <source>Virtual disk file location and size</source> - <translation type="unfinished"></translation> + <translation>UmÃstÄ›nà a velikost souboru virtuálnÃho disku</translation> </message> <message> <source>Select the size of the virtual disk in megabytes. This size will be reported to the Guest OS as the maximum size of this virtual disk.</source> - <translation type="unfinished"></translation> + <translation>Nastavte velikost virtuálnÃho pevného disku v megabajtech. Velikost bude nahlášena hostovanému OS jako maximálnà velikost pevného disku.</translation> </message> <message> <source>Virtual disk file location</source> - <translation type="unfinished"></translation> + <translation>UmÃstÄ›nà souboru virtuálnÃho disku</translation> </message> <message> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> - <translation type="unfinished"></translation> + <translation>Zadejte prosÃm název nového virtuálnÃho pevného disku do polÃÄka nÞe nebo klepnÄ›te na ikonu a vyberte jinou složku pro uloženà souboru.</translation> </message> <message> <source><nobr>%1 (%2 B)</nobr></source> - <translation type="unfinished"><nobr>%1 (%2 B)</nobr></translation> + <translation><nobr>%1 (%2 B)</nobr></translation> </message> <message> <source>You are going to create a new virtual disk with the following parameters:</source> - <translation type="unfinished"></translation> + <translation>Chystáte se vytvoÅ™it nový virtuálnà pevný disk s následujÃcÃmi parametry:</translation> </message> <message> <source>You are going to create a copied virtual disk with the following parameters:</source> - <translation type="unfinished"></translation> + <translation>Chystáte se vytvoÅ™it kopii virtuálnÃho pevného disku s následujÃcÃmi parametry:</translation> </message> <message> <source>If the above settings are correct, press the <b>%1</b> button. Once you press it the new virtual disk file will be created.</source> - <translation type="unfinished"></translation> + <translation>Pokud jsou výše uvedené údaje v pořádku, stisknÄ›te tlaÄÃtko <b>%1</b>. Po jeho stisknutà bude vytvoÅ™en nový soubor virtuálnÃho pevného disku.</translation> </message> <message> <source>%1 B</source> - <translation type="unfinished">%1 B</translation> + <translation>%1 B</translation> </message> <message> <source>File type</source> <comment>summary</comment> - <translation type="unfinished"></translation> + <translation>Typ souboru</translation> </message> <message> <source>Details</source> <comment>summary</comment> - <translation type="unfinished"></translation> + <translation>Detaily</translation> + </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (Parallels Hard Disk)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (QEMU enhanced disk)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (QEMU Copy-On-Write)</translation> </message> </context> <context> <name>UINewHDWizardPageFormat</name> <message> <source>File type</source> - <translation type="unfinished"></translation> + <translation>Typ souboru</translation> </message> </context> <context> <name>UINewHDWizardPageOptions</name> <message> <source>&Location</source> - <translation type="unfinished">&UmÃstÄ›nÃ</translation> + <translation>&UmÃstÄ›nÃ</translation> </message> <message> <source>&Size</source> - <translation type="unfinished">V&elikost</translation> + <translation>V&elikost</translation> </message> </context> <context> <name>UINewHDWizardPageVariant</name> <message> <source>Storage details</source> - <translation type="unfinished"></translation> + <translation>Detaily o úložiÅ¡ti</translation> </message> </context> <context> @@ -6479,11 +6527,11 @@ jako velikost virtuálnÃho pevného disku.</p></translation> </message> <message> <source>Virtual disk to copy</source> - <translation type="unfinished"></translation> + <translation>KopÃrovánà virtuálnÃho disku</translation> </message> <message> <source>Choose a virtual hard disk file...</source> - <translation type="unfinished"></translation> + <translation>Vybrat soubor s obrazem virtuálnÃho disku...</translation> </message> </context> <context> @@ -6796,7 +6844,7 @@ krok a pÅ™ipojit pevné disky pozdÄ›ji použitÃm dialogu Nastavenà VM.</p&g </message> <message> <source>Create</source> - <translation type="unfinished"></translation> + <translation>VytvoÅ™it</translation> </message> </context> <context> @@ -6885,11 +6933,11 @@ krok a pÅ™ipojit pevné disky pozdÄ›ji použitÃm dialogu Nastavenà VM.</p&g </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">Bootovacà pevný &disk</translation> + <translation>Bootovacà pevný &disk</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>Vyberte obraz pevného disku, který bude použit jako bootovacà pevný disk virtuálnÃho poÄÃtaÄe. Můžete buÄ vytvoÅ™it nový pevný disk nebo vybrat již existujÃcà obraz pevného disku z nabÃdkového seznamu stiskem tlaÄÃtka <b>ExistujÃcÃ</b> (spustà se Správce virtuálnÃch disků)</p><p>Pokud potÅ™ebujete detailnÄ›jÅ¡Ã nastavenà pevného disku, můžete pÅ™eskoÄit tento krok a pÅ™ipojit pevné disky pozdÄ›ji použitÃm dialogu Nastavenà virtuálnÃho poÄÃtaÄe.</p></translation> + <translation><p>Pokud potÅ™ebujete, můžete vybrat virtuálnà disk, který bude použit jako bootovacà pevný disk virtuálnÃho poÄÃtaÄe. Můžete buÄ vytvoÅ™it nový pevný disk nebo vybrat již existujÃcà obraz pevného disku z nabÃdkového seznamu nebo pomocà ikony vyberat jinou složku s diskem.<p>Pokud potÅ™ebujete detailnÄ›jÅ¡Ã nastavenà pevného disku, můžete pÅ™eskoÄit tento krok a pÅ™ipojit pevné disky pozdÄ›ji po vytvoÅ™enà virtuálnÃho poÄÃtaÄe.</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -6897,7 +6945,7 @@ krok a pÅ™ipojit pevné disky pozdÄ›ji použitÃm dialogu Nastavenà VM.</p&g </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">DoporuÄená velikost bootovacÃho pevného disku je <b>%1</b>.</translation> + <translation>DoporuÄená velikost bootovacÃho pevného disku je <b>%1</b>.</translation> </message> </context> <context> @@ -6933,7 +6981,7 @@ krok a pÅ™ipojit pevné disky pozdÄ›ji použitÃm dialogu Nastavenà VM.</p&g <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">Bootovacà pevný disk</translation> + <translation>SopouÅ¡tÄ›cà disk</translation> </message> <message> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> @@ -7118,7 +7166,7 @@ krok a pÅ™ipojit pevné disky pozdÄ›ji použitÃm dialogu Nastavenà VM.</p&g </message> <message> <source>Proxy</source> - <translation type="unfinished"></translation> + <translation>Proxy</translation> </message> </context> <context> @@ -7220,6 +7268,109 @@ krok a pÅ™ipojit pevné disky pozdÄ›ji použitÃm dialogu Nastavenà VM.</p&g </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>den</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dny</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dny</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dny</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dnÃ</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dnÃ</translation> + </message> + <message> + <source>1 week</source> + <translation>týden</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 týdny</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 týdny</translation> + </message> + <message> + <source>1 month</source> + <translation>mÄ›sÃc</translation> + </message> + <message> + <source>Never</source> + <translation>Nikdy</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">Spojenà vyprÅ¡elo.</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">Na serveru nelze nalézt informace o poslednà verzi (odpovÄ›Ä: %1).</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">Z&kontrolovat</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&ZavÅ™Ãt</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Průvodce aktualizacÃ</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Zkontroluje aktualizace</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Průvodce se pÅ™ipojà na web VirtualBoxu a pokusà se zjistit, zda je dostupná nová verze aplikace.</p> +<p>Použijte tlaÄÃtko <b>Zkontrolovat</b> pro kontrolu nové verze nebo klepnÄ›te na tlaÄÃtko <b>ZruÅ¡it</b>. +<p>Tohoto průvodce můžete spustit kdykoliv zvolenÃm <b>Zkontrolovat aktualizace...</b> z nabÃdky <b>NápovÄ›da<b/></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">ZruÅ¡it</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">ShrnutÃ</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Byla vydána nová verze aplikace VirtualBox! Na stránce <a href="http://www.virtualbox.org/">virtualbox.org</a> je verze <b>%1</b>.</p><p>Tuto verzi si můžete stáhnout pÅ™Ãmo zde: </p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Nelze zÃskat informace o nové verzi z důvodu následujÃcà sÃÅ¥ové chyby: </p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Máte nainstalovanou aktuálnà verzi VirtualBoxu. ProsÃm proveÄte kontrolu verze pozdÄ›ji.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Průvodce se pÅ™ipojà na web VirtualBoxu a pokusà se zjistit, zda je dostupná nová verze aplikace.</p><p>Použijte tlaÄÃtko <b>Zkontrolovat</b> pro kontrolu nové verze nebo klepnÄ›te na tlaÄÃtko <b>ZruÅ¡it</b>.<p>Tohoto průvodce můžete spustit kdykoliv zvolenÃm <b>Zkontrolovat aktualizace...</b> z nabÃdky <b>NápovÄ›da<b/></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7763,16 +7914,8 @@ Verze %1</translation> <translation type="obsolete">&NápovÄ›da</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indikuje, zda je funkce pÅ™izpůsobenà hostované obrazovky zapnuta (<img src=auto_resize_on_16px.png/>) nebo vypnuta (<img src=auto_resize_off_16px.png/>). Tato funkce vyžaduje nainstalované PÅ™Ãdavky pro hosta na hostovaném OS.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indikuje, zda je kurzor myÅ¡i odchycen hostovaným OS: <br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;kurzor nenà odchycen</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;kurzor je odchycen</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integrace myÅ¡i (IM) je zapnuta</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM je vypnuta, kurzor je odchycen</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM je vypnuta, kurzor nenà odchycen</nobr><br>Funkce integrace myÅ¡i vyžaduje nainstalované PÅ™Ãdavky pro hosta na hostovaném OS.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">Indikuje, zda je klávesnice odchycena hostovaným OS (<img src=hostkey_captured_16px.png/>) nebo ne (<img src=hostkey_16px.png/>)</translation> + <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Indikuje, zda je kurzor myÅ¡i odchycen hostovaným OS: <br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;kurzor nenà odchycen</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;kurzor je odchycen</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integrace myÅ¡i (IM) je zapnuta</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM je vypnuta, kurzor je odchycen</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM je vypnuta, kurzor nenà odchycen</nobr><br>Funkce integrace myÅ¡i vyžaduje nainstalované PÅ™Ãdavky pro hosta na hostovaném OS.</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -7820,10 +7963,6 @@ Verze %1</translation> <translation type="obsolete"><br>[<b>nepÅ™ipojen</b>]</translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">Indikuje, zda je Vzdálená plocha (VRDP server) povolena (<img src=vrdp_16px.png/>) nebo ne (<img src=vrdp_disabled_16px.png/>)</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>VRDP server poslouchá na portu %1</translation> </message> @@ -7940,10 +8079,6 @@ Verze %1</translation> <translation type="obsolete">PÅ™epne do bezeÅ¡vého režimu integrace plochy</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indikuje, zda je klávesnice odchytávána hostovaným OS (<img src=hostkey_captured_16px.png/>) Äi nikoliv (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Indikuje aktivitu diskety:</nobr>%1</qt></translation> @@ -8034,10 +8169,6 @@ Verze %1</translation> <translation type="obsolete"><br><nobr><b>OvladaÄ USB je zakázán</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indikuje, zda je Vzdálená plocha (VRDP server) povolena (<img src=vrdp_16px.png/>) Äi nikoliv (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>Indikuje aktivitu sdÃlených složek:</nobr>%1</qt></translation> @@ -8082,22 +8213,6 @@ Verze %1</translation> <translation type="obsolete">PÅ™Ãka&zový řádek...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indikuje, zda je funkce pÅ™izpůsobenà hostované obrazovky zapnuta (<img src=:/auto_resize_on_16px.png/>) nebo vypnuta (<img src=:/auto_resize_off_16px.png/>). Tato funkce vyžaduje nainstalované PÅ™Ãdavky pro hosta na hostovaném OS.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indikuje, zda je kurzor myÅ¡i odchycen hostovaným OS: <br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;kurzor nenà odchycen</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;kurzor je odchycen</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integrace myÅ¡i (IM) je zapnuta</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM je vypnuta, kurzor je odchycen</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM je vypnuta, kurzor nenà odchycen</nobr><br>Funkce integrace myÅ¡i vyžaduje nainstalované PÅ™Ãdavky pro hosta na hostovaném OS.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">Indikuje, zda je klávesnice odchytávána hostovaným OS (<img src=:/hostkey_captured_16px.png/>) Äi nikoliv (<img src=:/hostkey_16px.png/>).</translation> - </message> - <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indikuje, zda je Vzdálená plocha (VRDP server) povolena (<img src=:/vrdp_16px.png/>) Äi nikoliv (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source>&Logging...</source> <comment>debug action</comment> <translation type="obsolete">&LogovánÃ...</translation> @@ -9759,7 +9874,7 @@ Verze %1</translation> <message> <source>Some of the media in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these media.</source> <comment>medium</comment> - <translation type="unfinished"></translation> + <translation>NÄ›které Äásti souboru s diskem jsou nedostupné. Použijte prosÃm Správce virtuálnÃch medià v režimu <b>Zobrazenà rozdÃlových disků</b> pro zjiÅ¡tÄ›nà souvislostÃ.</translation> </message> <message> <source>This base hard disk is indirectly attached using the following differencing hard disk:</source> @@ -9944,7 +10059,7 @@ Verze %1</translation> </message> <message> <source>floppy disk</source> - <translation type="unfinished">disketová mechanika</translation> + <translation>disketová mechanika</translation> </message> <message> <source>All %1 images (%2)</source> @@ -10026,7 +10141,7 @@ Verze %1</translation> <message> <source>Readonly</source> <comment>DiskType</comment> - <translation type="unfinished"></translation> + <translation>Pouze pro ÄtenÃ</translation> </message> <message> <source>Multi-attach</source> @@ -10035,58 +10150,58 @@ Verze %1</translation> </message> <message> <source>Dynamically allocated storage</source> - <translation type="unfinished"></translation> + <translation>Dynamicky alokované úložiÅ¡tÄ›</translation> </message> <message> <source>Fixed size storage</source> - <translation type="unfinished"></translation> + <translation>UložiÅ¡tÄ› o pevné velikosti</translation> </message> <message> <source>Dynamically allocated storage split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>Dynamicky pÅ™idÄ›lovaný diskový prostor v souborech o maximálnà velikosti 2GB</translation> </message> <message> <source>Fixed size storage split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>ÚložiÅ¡tÄ› o pevné dané velikosti rozdÄ›lené do souborů s maximálnà velikostà 2GB</translation> </message> <message> <source>Execution Cap</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Omezenà procesoru</translation> </message> <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation><nobr>%1%</nobr></translation> </message> <message> <source>Generic, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Obecný, %1</translation> </message> <message> <source>Generic Driver</source> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>Obecný ovladaÄ</translation> </message> <message> <source>Deny</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Zakázán</translation> </message> <message> <source>Allow VMs</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Povolit virtuálnÃm poÄÃtaÄům</translation> </message> <message> <source>Allow All</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Povoleno vÅ¡e</translation> </message> <message> <source>Adapter %1</source> - <translation type="unfinished">Karta %1</translation> + <translation>Karta %1</translation> </message> </context> <context> @@ -10105,7 +10220,7 @@ Verze %1</translation> </message> <message> <source>'%1' is an invalid host-combination code-sequence.</source> - <translation type="unfinished"></translation> + <translation>'%1 je neplatná kombinace kódů klávesy hostitele.</translation> </message> </context> <context> @@ -10619,43 +10734,43 @@ na výchozà jazyk systému.</qt> </message> <message> <source>Type:</source> - <translation type="unfinished">Typ:</translation> + <translation>Typ:</translation> </message> <message> <source>Location:</source> - <translation type="unfinished">UmÃstÄ›nÃ:</translation> + <translation>UmÃstÄ›nÃ:</translation> </message> <message> <source>Format:</source> - <translation type="unfinished"></translation> + <translation>Formát:</translation> </message> <message> <source>Storage details:</source> - <translation type="unfinished"></translation> + <translation>Detaily o umÃstÄ›nÃ:</translation> </message> <message> <source>Attached to:</source> - <translation type="unfinished"></translation> + <translation>PÅ™ipojen k:</translation> </message> <message> <source>&Copy...</source> - <translation type="unfinished"></translation> + <translation>&KopÃrovat...</translation> </message> <message> <source>&Modify...</source> - <translation type="unfinished"></translation> + <translation>&ZmÄ›nit...</translation> </message> <message> <source>Copy an existing medium</source> - <translation type="unfinished"></translation> + <translation>ZkopÃruje existujÃcà médium</translation> </message> <message> <source>Modify the attributes of the selected medium</source> - <translation type="unfinished"></translation> + <translation>ZmÄ›nà atributy vybraného média</translation> </message> <message> <source>C&lose</source> - <translation type="unfinished"></translation> + <translation>Za&vÅ™Ãt</translation> </message> </context> <context> @@ -10968,7 +11083,7 @@ na výchozà jazyk systému.</qt> </message> <message> <source>Discard</source> - <translation type="unfinished">ZruÅ¡it</translation> + <translation>Zahodit</translation> </message> <message> <source>Discard the saved state of the selected virtual machine</source> @@ -11063,10 +11178,6 @@ na výchozà jazyk systému.</qt> <translation>Spustà vybraný virtuálnà poÄÃtaÄ</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>VÃtejte ve VirtualBoxu!</h3><p>Levá Äást tohoto okna je urÄena pro zobrazenà seznamu vÅ¡ech virtuálnÃch poÄÃtaÄů na vaÅ¡em poÄÃtaÄi. Seznam je teÄ prázdný, protože jste jeÅ¡tÄ› žádný nevytvoÅ™ili.<img src=welcome.png align=right/></p><p>Pro vytvoÅ™enà nového virtuálnÃho poÄÃtaÄe stisknÄ›te tlaÄÃtko <b>Nový</b> v hornà Äásti hlavnÃho okna.</p><p>Můžete stisknout klávesu <b>%1</b> a dostat okamžitou nápovÄ›du, nebo navÅ¡tivte <a href=http://www.virtualbox.org>www.virtualbox.org</a> pro aktuálnà informace a novinky.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&PoÄÃtaÄ</translation> </message> @@ -11172,7 +11283,7 @@ na výchozà jazyk systému.</qt> </message> <message> <source>Add an existing virtual machine</source> - <translation type="unfinished"></translation> + <translation>PÅ™idá existujÃcà virtuálnà poÄÃtaÄ</translation> </message> <message> <source>&Remove</source> @@ -11232,15 +11343,15 @@ na výchozà jazyk systému.</qt> </message> <message> <source>Cl&one...</source> - <translation type="unfinished"></translation> + <translation>&Klonovat...</translation> </message> <message> <source>Clone the selected virtual machine</source> - <translation type="unfinished"></translation> + <translation>Naklonuje vybraný virtuálnà poÄÃtaÄ</translation> </message> <message> <source>D&iscard Saved State</source> - <translation type="unfinished"></translation> + <translation>&Zahodit uložený stav</translation> </message> </context> <context> @@ -11606,11 +11717,11 @@ pro pÅ™Ãstup z Linuxových OS. Tato funkce vyžaduje PÅ™Ãdavky pro hosta.</ </message> <message> <source>&Clone...</source> - <translation type="unfinished"></translation> + <translation>&Klonovat...</translation> </message> <message> <source>Clone the selected virtual machine</source> - <translation type="unfinished"></translation> + <translation>Naklonuje vybraný virtuálnà poÄÃtaÄ</translation> </message> </context> <context> @@ -11835,109 +11946,6 @@ hodnotu.</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>den</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dny</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dny</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dny</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dnÃ</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dnÃ</translation> - </message> - <message> - <source>1 week</source> - <translation>týden</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 týdny</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 týdny</translation> - </message> - <message> - <source>1 month</source> - <translation>mÄ›sÃc</translation> - </message> - <message> - <source>Never</source> - <translation>Nikdy</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">Spojenà vyprÅ¡elo.</translation> - </message> - <message> - <source>Could not locate the latest version list on the server (response: %1).</source> - <translation type="obsolete">Na serveru nelze nalézt informace o poslednà verzi (odpovÄ›Ä: %1).</translation> - </message> - <message> - <source>Chec&k</source> - <translation>Z&kontrolovat</translation> - </message> - <message> - <source>&Close</source> - <translation>&ZavÅ™Ãt</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Průvodce aktualizacÃ</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Zkontroluje aktualizace</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>Průvodce se pÅ™ipojà na web VirtualBoxu a pokusà se zjistit, zda je dostupná nová verze aplikace.</p> -<p>Použijte tlaÄÃtko <b>Zkontrolovat</b> pro kontrolu nové verze nebo klepnÄ›te na tlaÄÃtko <b>ZruÅ¡it</b>. -<p>Tohoto průvodce můžete spustit kdykoliv zvolenÃm <b>Zkontrolovat aktualizace...</b> z nabÃdky <b>NápovÄ›da<b/></translation> - </message> - <message> - <source>Cancel</source> - <translation>ZruÅ¡it</translation> - </message> - <message> - <source>Summary</source> - <translation>ShrnutÃ</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Byla vydána nová verze aplikace VirtualBox! Na stránce <a href="http://www.virtualbox.org/">virtualbox.org</a> je verze <b>%1</b>.</p><p>Tuto verzi si můžete stáhnout pÅ™Ãmo zde: </p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Nelze zÃskat informace o nové verzi z důvodu následujÃcà sÃÅ¥ové chyby: </p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Máte nainstalovanou aktuálnà verzi VirtualBoxu. ProsÃm proveÄte kontrolu verze pozdÄ›ji.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Průvodce se pÅ™ipojà na web VirtualBoxu a pokusà se zjistit, zda je dostupná nová verze aplikace.</p><p>Použijte tlaÄÃtko <b>Zkontrolovat</b> pro kontrolu nové verze nebo klepnÄ›te na tlaÄÃtko <b>ZruÅ¡it</b>.<p>Tohoto průvodce můžete spustit kdykoliv zvolenÃm <b>Zkontrolovat aktualizace...</b> z nabÃdky <b>NápovÄ›da<b/></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts index 8f2d7ed02..9cd78c50a 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts @@ -196,11 +196,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>Kopier alle fejl til klipbordet</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation>Kopier</translation> </message> </context> <context> @@ -540,15 +540,15 @@ </message> <message> <source>&Settings...</source> - <translation type="unfinished">Op&sætning...</translation> + <translation>Op&sætning...</translation> </message> <message> <source>Manage the virtual machine settings</source> - <translation type="unfinished"></translation> + <translation>HÃ¥ndter den valgte virtuelle maskine</translation> </message> <message> <source>Session I&nformation...</source> - <translation type="unfinished"></translation> + <translation>I&nformation om session...</translation> </message> </context> <context> @@ -673,11 +673,11 @@ </message> <message> <source>When checked a new unique MAC address will assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Hvis markeret, vil en ny unik MAC-adresse blive tildelt alle konfigurerede netværkskort.</translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&Reinitialiser MAC-addressen pÃ¥ alle netværkskort</translation> </message> </context> <context> @@ -695,100 +695,100 @@ <name>UICloneVMWizard</name> <message> <source>Clone a virtual machine</source> - <translation type="unfinished"></translation> + <translation>Klon en virtual maskine</translation> </message> <message> <source>Clone</source> - <translation type="unfinished"></translation> + <translation>Klon</translation> </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translation>Koblet basis for %1 og %2</translation> </message> </context> <context> <name>UICloneVMWizardPage1</name> <message> <source><p>This wizard will help you to create a clone of your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Denne guide hjælper dig med at lave en klon af din virtuelle maskine.</p></translation> </message> <message> <source><p>Please choose a name for the new virtual machine:</p></source> - <translation type="unfinished"></translation> + <translation><p>Angiv navnet pÃ¥ den nye virtualle maskine:</p></translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&Reinitialisér MAC-adressen pÃ¥ alle netværkskort</translation> </message> <message> <source>Welcome to the virtual machine clone wizard</source> - <translation type="unfinished"></translation> + <translation>Denne guide hjælper dig med at oprette en klon af en virtuel maskine</translation> </message> <message> <source>%1 Clone</source> - <translation type="unfinished"></translation> + <translation>%1 Klon</translation> </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Hvis markeret, vil en ny unik MAC-adresse blive tildelt alle konfigurerede netværkskort.</translation> </message> </context> <context> <name>UICloneVMWizardPage2</name> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Kloningskonfiguration</translation> </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Komplet klon</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Koblet klon</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>Vælg kloningstypen.</p><p>Vælger du <b>Komplet klon</b> vil en nøjagtigt kopi (inklusiv alle virtuelle diskaftryk) af kilde-VM'en blive lavet. Vælger du <b>Koblet klon</b>, vil en ny VM blive lavet, men de virtuelle diskaftryk vil pege pÃ¥ diskaftrykkene fra kilde-VM'en</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Bemærk at hvis du vælger <b>Koblet klon</b> vil der blive lavet et nyt øjebliksbillede i kilde-VM'en</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished"></translation> + <translation>Aktuel maskintilstand</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished"></translation> + <translation>Aktuel maskintilstand og afledte øjebliksbilleder</translation> </message> <message> <source>All states</source> - <translation type="unfinished"></translation> + <translation>Alle tilstande</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Kloningskonfiguration</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished"></translation> + <translation>Vælg hvilke dele af den virtuelle maskine, der skal klones.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished"></translation> + <translation>Hvis du vælger <b>Aktuel maskintilstand</b>, klones kun den nuværende tilstand af den virtuelle maskine.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Hvis du vælger <b>Aktuel maskintilstand og afledte øjebliksbilleder</b> klones den nuværende tilstand af den virtuelle maskine og alle afledte øjebliksbilleder ("børn").</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Hvis du vælger<b>Alle tilstande</b>, klones den nuværende tilstand af den virtuelle maskine og alle øjebliksbilleder.</translation> </message> </context> <context> @@ -1084,22 +1084,22 @@ <message> <source>Execution Cap</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Ydelsesbegrænsning</translation> </message> <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation><nobr>%1%</nobr></translation> </message> <message> <source>Generic driver, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Generisk driver, '%1'</translation> </message> <message> <source>Generic driver, '%1' {&nbsp;%2&nbsp;}</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Generisk driver, '%1' {&nbsp;%2&nbsp;}</translation> </message> </context> <context> @@ -1137,6 +1137,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Vælg folderen, hvor %1 skal gemmes</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -1279,7 +1286,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Export</source> - <translation type="unfinished"></translation> + <translation>Eksport</translation> </message> </context> <context> @@ -1620,7 +1627,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Start</source> - <translation type="unfinished"></translation> + <translation>Start</translation> </message> </context> <context> @@ -2134,51 +2141,51 @@ p, li { white-space: pre-wrap; } <name>UIGlobalSettingsProxy</name> <message> <source>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</source> - <translation type="unfinished"></translation> + <translation>Hvis markeret, vil VirtualBox bruge proxy-indstillingerne til at hente Gæstetilføjelserne eller kontrollere om en nyere udgave er tilgængelig.</translation> </message> <message> <source>&Enable proxy</source> - <translation type="unfinished"></translation> + <translation>Brug proxy</translation> </message> <message> <source>Ho&st:</source> - <translation type="unfinished"></translation> + <translation>Vært:</translation> </message> <message> <source>Changes the proxy host.</source> - <translation type="unfinished"></translation> + <translation>Ændrer proxy-værten.</translation> </message> <message> <source>&Port:</source> - <translation type="unfinished"></translation> + <translation>&Port:</translation> </message> <message> <source>Changes the proxy port.</source> - <translation type="unfinished"></translation> + <translation>Ændrer proxy-porten.</translation> </message> <message> <source>When checked the authentication supplied will be used with the proxy server.</source> - <translation type="unfinished"></translation> + <translation>Hvis markeret, bruges de angivne oplysninger til godkendelse overfor proxy-værten.</translation> </message> <message> <source>&Use authentication</source> - <translation type="unfinished"></translation> + <translation>Br&ug godkendelse</translation> </message> <message> <source>User &name:</source> - <translation type="unfinished"></translation> + <translation>Bruger&navn:</translation> </message> <message> <source>Changes the user name used for authentication.</source> - <translation type="unfinished"></translation> + <translation>Ændrer brugernavnet, der bruges til godkendelse.</translation> </message> <message> <source>Pass&word:</source> - <translation type="unfinished"></translation> + <translation>Kodeord:</translation> </message> <message> <source>Changes the password used for authentication.</source> - <translation type="unfinished"></translation> + <translation>Ændrer kodeordet, der bruges til godkendelse.</translation> </message> </context> <context> @@ -2251,23 +2258,23 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Left Shift</source> - <translation type="unfinished">Venstre Shift</translation> + <translation>Venstre Shift</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">Højre Shift</translation> + <translation>Højre Shift</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">Venstre Ctrl</translation> + <translation>Venstre Ctrl</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">Højre Ctrl</translation> + <translation>Højre Ctrl</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">Venstre Alt</translation> + <translation>Venstre Alt</translation> </message> <message> <source>Right Alt</source> @@ -2488,7 +2495,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Import</source> - <translation type="unfinished"></translation> + <translation>Import</translation> </message> </context> <context> @@ -2660,7 +2667,7 @@ p, li { white-space: pre-wrap; } <message> <source>Indicates the status of different features used by this virtual machine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></source> <comment>Virtualization Stuff LED</comment> - <translation type="unfinished"></translation> + <translation>Viser status for de forskellige funktioner, der bruges i denne virtuelle maskine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></translation> </message> </context> <context> @@ -2872,11 +2879,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. For maximal performance set the guest VRAM to at least <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>du har 3D-acceleration aktiveret i et operativsystem, der bruger WDDM-skærmdriveren. Sæt gæstens grafikhukommelse til mindst <b>%1</b> for maksimal ydelse.</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">du har 2D-videoacceleration aktiveret. 2D-videoacceleration understøttes kun, nÃ¥r gæsteoperativsystemet er Windows og deaktiveres derfor.</translation> + <translation>du har 2D-videoacceleration aktiveret. 2D-videoacceleration understøttes kun, nÃ¥r gæsteoperativsystemet er Windows og deaktiveres derfor.</translation> </message> </context> <context> @@ -2956,7 +2963,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 type="unfinished">Du har valgt et 64-bit gæsteoperativsystem til denne VM. Da denne type gæst kræver hardware-virtualisering (VT-x/AMD-V) er dette automatisk blevet slÃ¥et til.</translation> + <translation>Du har valgt et 64-bit gæsteoperativsystem til denne VM. Da denne type gæst kræver hardware-virtualisering (VT-x/AMD-V) er dette automatisk blevet slÃ¥et til.</translation> </message> </context> <context> @@ -3052,39 +3059,40 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Promiscuous Mode:</source> - <translation type="unfinished"></translation> + <translatorcomment>Betyder vel at den kigger pÃ¥ alle pakker fremfor kun dem til dens egen IP</translatorcomment> + <translation>O&psamlingstilstand:</translation> </message> <message> <source>Selects the promiscuous mode policy of the network adapter when attached to an internal network, host only network or a bridge.</source> - <translation type="unfinished"></translation> + <translation>Vælger opsamlingstilstand for netværkskortet, nÃ¥r det er forbundet til et internt eller værtsbegrænset netværk eller en bro.</translation> </message> <message> <source>Generic Properties:</source> - <translation type="unfinished"></translation> + <translation>Generisk opsætning:</translation> </message> <message> <source>Enter any configuration settings here for the network attachment driver you will be using. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source> - <translation type="unfinished"></translation> + <translation>Indtast konfigurationsindstillinger for den driver til netværkstilslutning du anvender. Indstillingerne skal have formen <b>navn=værdi</b> og afhænger af driveren. Brug <b>Shift-Enter</b> for at tilføje en ny indstilling.</translation> </message> <message> <source>no generic driver is selected</source> - <translation type="unfinished"></translation> + <translation>Generisk driver ikke valgt</translation> </message> <message> <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source> - <translation type="unfinished"></translation> + <translation>Vælger netværkskortet pÃ¥ værtssystemet som trafik til og fra dette netværkskort sendes igennem.</translation> </message> <message> <source>Enter the name of the internal network that this network card will be connected to. You can create a new internal network by choosing a name which is not used by any other network cards in this virtual machine or others.</source> - <translation type="unfinished"></translation> + <translation>Indtast navnet pÃ¥ det interne netværk som dette netværkskort skal forbindes til. Du kan lave et nyt internt netværk ved at indtaste et navn, som ikke bruges af noget netværkskort i samtlige virtuelle maskiner.</translation> </message> <message> <source>Selects the virtual network adapter on the host system that traffic to and from this network card will go through. You can create and remove adapters using the global network settings in the virtual machine manager window.</source> - <translation type="unfinished"></translation> + <translation>Vælger det virtuelle netværkskort pÃ¥ værtssystemet som trafik til og fra dette netværkskort sendes igennem. Du kan tilføje og fjerne netværkskort under Globale netværksindstillinger i VM-administrationsvinduet.</translation> </message> <message> <source>Selects the driver to be used with this network card.</source> - <translation type="unfinished"></translation> + <translation>Vælger driveren, der bruges til dette netværkskort.</translation> </message> </context> <context> @@ -3806,57 +3814,57 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation type="unfinished"></translation> + <translation>Hvis markeret, vil den virtuelle disk ikke blive fjernet, nÃ¥r gæsten skubber den ud.</translation> </message> <message> <source>&Live CD/DVD</source> - <translation type="unfinished"></translation> + <translation>&Live-CD/DVD</translation> </message> <message> <source>When checked the guest system will see the virtual disk as a solid state device.</source> - <translation type="unfinished"></translation> + <translation>Hvis markeret, vil gæsten se den virtuelle disk som en SSD-disk.</translation> </message> <message> <source>&Solid-state drive</source> - <translation type="unfinished"></translation> + <translation>&SSD-disk</translation> </message> <message> <source>Details:</source> - <translation type="unfinished"></translation> + <translation>Detaljer:</translation> </message> <message> <source>no name specified for controller at position <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Styreenhed pÃ¥ position <b>%1</b> er ikke navngivet.</translation> </message> <message> <source>controller at position <b>%1</b> uses the name that is already used by controller at position <b>%2</b>.</source> - <translation type="unfinished"></translation> + <translation>Styreenheden pÃ¥ position <b>%1</b> bruger samme navn som styreenheden pÃ¥ position <b>%2</b>.</translation> </message> <message> <source>no hard disk is selected for <i>%1</i>.</source> - <translation type="unfinished"></translation> + <translation>Ingen harddisk valgt for <i>%1</i>.</translation> </message> <message> <source>at most one supported</source> <comment>controller</comment> - <translation type="unfinished">højst én understøttet</translation> + <translation>højst én understøttet</translation> </message> <message> <source>up to %1 supported</source> <comment>controllers</comment> - <translation type="unfinished">Op til %1 understøttet</translation> + <translation>Op til %1 understøttet</translation> </message> <message> <source>you are currently using more storage controllers than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2.</source> - <translation type="unfinished">du bruger netop nu flere lager-styreenheder end et %1 chipset understøtter. Tilpas chipset-typen under System-indstillinger eller formindsk antallet af de følgende lager-styreenheder under Lager-indstillinger: %2.</translation> + <translation>du bruger pt flere lager-styreenheder end et %1 chipset understøtter. Tilpas chipset-typen under System-indstillinger eller formindsk antallet af de følgende lager-styreenheder under Lager-indstillinger: %2.</translation> </message> <message> <source>&Port Count:</source> - <translation type="unfinished"></translation> + <translation>&Port-antal:</translation> </message> <message> <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source> - <translation type="unfinished"></translation> + <translation>Vælger port-antal for SATA lagerstyreenheden, der er valgt i Lager-træstrukturen. Antallet skal være mindst en højere end det højeste port-nummer du har brug for.</translation> </message> </context> <context> @@ -4042,7 +4050,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source> - <translation type="unfinished">Sætter chipset-typen i denne VM.</translation> + <translation>Bestemmer hvilket chipsæt, der emuleres i denne VM. Bemærk at emulering af ICH9 er eksperimentel og kun anbefales til gæste-OS'er (sÃ¥som Mac OS X), som kræver dette chipsæt.</translation> </message> <message> <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> @@ -4050,33 +4058,33 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Execution Cap:</source> - <translation type="unfinished"></translation> + <translation>Yd&elsesbegrænsning:</translation> </message> <message> <source>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</source> - <translation type="unfinished"></translation> + <translation>Begrænser den tilladte køretid for hver virtuel CPU. Den virtuelle CPU fÃ¥r lov at bruge op til den fastsatte procentdel af den tilgængelige køretid pÃ¥ en fysisk CPU. Ydelsesbegrænsningen kan slÃ¥s fra ved at sætte den til 100%. En for lav værdi kan fÃ¥ maskinen til at føles langsom.</translation> </message> <message> <source>you have set the processor execution cap to a low value. This can make the machine feel slow to respond.</source> - <translation type="unfinished"></translation> + <translation>Du har sat ydelsesbegrænsningen til en lav værdi. Maskinen vil mÃ¥ske føles langsom.</translation> </message> <message> <source>you have enabled a USB HID (Human Interface Device). This will not work unless USB emulation is also enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> - <translation type="unfinished">du har tilsluttet en USB HID (Human Interface Device). Den vil ikke virke medmindre USB emulering er aktiveret. Dette vil ske automatisk nÃ¥r du accepterer VM-indstillingerne ved at trykke OK.</translation> + <translation>du har tilsluttet en USB HID (Human Interface Device). Den vil ikke virke medmindre USB emulering er aktiveret. Dette vil ske automatisk nÃ¥r du accepterer VM-indstillingerne ved at trykke OK.</translation> </message> <message> <source><qt>%1%</qt></source> <comment>Min CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source><qt>%1%</qt></source> <comment>Max CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>du har valgt et ICH9-chipset i denne VM. Det vil ikke virke korrekt, medmindre IO-APIC aktiveres. Det vil ske automatisk, nÃ¥r du godkender VM-indstillingerne ved at trykke OK.</translation> </message> </context> <context> @@ -4208,7 +4216,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</source> - <translation type="unfinished"></translation> + <translation>USB 2.0 er pt aktiveret i denne virtuelle maskine. Dette kræver at <b>%1</b> installeres - denne udvidelsespakke kan hentes fra VirtualBox' hjemmeside. Derefter kan du reaktivere USB 2.0. USB 2.0 vil blive deaktiveret nu, medmindre du annullerer de nuværende ændringer.</translation> </message> </context> <context> @@ -4325,15 +4333,15 @@ p, li { white-space: pre-wrap; } <name>UIMediumTypeChangeDialog</name> <message> <source>Modify medium attributes</source> - <translation type="unfinished"></translation> + <translation>Ret mediets egenskaber</translation> </message> <message> <source><p>You are about to change the attributes of the virtual disk located in <b>%1</b>.</p><p>Please choose one of the following medium types and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p></source> - <translation type="unfinished"></translation> + <translation><p>Du er ved at ændre egenskaber for den virtuelle disk indsat i <b>%1</b>.</p><p>Vælg en af følgende medie-typer og tryk <b>%2</b> for at fortsætte eller <b>%3</b> hvis ikke.</p></translation> </message> <message> <source>Choose medium type:</source> - <translation type="unfinished"></translation> + <translation>Vælg medie-type:</translation> </message> </context> <context> @@ -5406,7 +5414,7 @@ p, li { white-space: pre-wrap; } <message> <source>Sorry, some generic error happens.</source> <translatorcomment>Huh?</translatorcomment> - <translation type="unfinished">Beklager, der skete en fejl.</translation> + <translation>Beklager, der skete en fejl.</translation> </message> <message> <source>Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source> @@ -5507,75 +5515,105 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Failed to register the virtual machine <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Kunne ikke registrere den virtuelle maskine <b>%1</b>.</translation> </message> <message> <source><p>The machine settings were changed while you were editing them. You currently have unsaved setting changes.</p><p>Would you like to reload the changed settings or to keep your own changes?</p></source> - <translation type="unfinished"></translation> + <translation><p>Maskinens indstillinger blev ændret, mens du rettede dem. Dine ændringer er ikke gemt.</p><p>Vil du indlæse de ændrede indstillinger eller gemme dine egne?</p></translation> </message> <message> <source>Reload settings</source> - <translation type="unfinished"></translation> + <translation>Genindlæs indstillinger</translation> </message> <message> <source>Keep changes</source> - <translation type="unfinished"></translation> + <translation>Behold mine ændringer</translation> </message> <message> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> - <translation type="unfinished"></translation> + <translation>Den virtuelle maskine du er ved at ændre, er aktiv. Kun visse indstillinger kan ændres mens en maskine kører. Alle øvrige ændringer mistes, hvis du lukker vinduet nu.</translation> </message> <message> <source>Failed to clone the virtual machine <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Kunne ikke klone den virtuelle maskine <b>%1</b>.</translation> </message> <message> <source><p>You are about to restore snapshot <b>%1</b>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source> - <translation type="unfinished"></translation> + <translation><p>Du er ved at indlæse øjebliksbilledet <b>%1</b>.</p><p>For ikke at miste maskinens nuværende tilstand, kan du lave et øjebliksbillede af den ved at markere nedenstÃ¥ende afkrydsningsfelt. Vil du fortsætte?</p></translation> </message> <message> <source>Create a snapshot of the current machine state</source> - <translation type="unfinished"></translation> + <translation>Lav øjebliksbillede af den nuværende tilstand</translation> </message> <message> <source><p>Are you sure you want to restore snapshot <b>%1</b>?</p></source> - <translation type="unfinished"></translation> + <translation><p>Bekræft at du vil indlæse øjebliksbillede <b>%1</b>?</p></translation> </message> <message> <source><p>Error changing medium type from <b>%1</b> to <b>%2</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Fejl ved skift af medie-type fra<b>%1</b> til <b>%2</b>.</p></translation> </message> <message> <source><p>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b><nobr>%1</nobr></b> to be installed.</p><p>Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</p></source> - <translation type="unfinished"></translation> + <translation><p>USB 2.0 er pt aktiveret i denne virtuelle maskine. Dette kræver at <b><nobr>%1</nobr></b> installeres.</p><p>Installér udvidelsespakken fra VirtualBox' hjemmeside. Derefter kan du reaktivere USB 2.0. USB 2.0 vil blive deaktiveret, medmindre du annullerer de nuværende ændringer.</p></translation> </message> <message> <source>Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer</source> - <translation type="unfinished"></translation> + <translation>Kunne ikke starte tjenesten Værts-USB Proxy (VERR_FILE_NOT_FOUND). Tjenesten er muligvis ikke installeret pÃ¥ værtsmaskinen</translation> </message> <message> <source>VirtualBox is not currently allowed to access USB devices. You can change this by adding your user to the 'vboxusers' group. Please see the user manual for a more detailed explanation</source> - <translation type="unfinished"></translation> + <translation>VirtualBox har ikke rettigheder til at tilgÃ¥ USB-enheder. Du kan ændre dette ved at tilføje din bruger til gruppen 'vboxusers'. Se dokumentationen for yderligere detaljer</translation> </message> <message> <source>VirtualBox is not currently allowed to access USB devices. You can change this by allowing your user to access the 'usbfs' folder and files. Please see the user manual for a more detailed explanation</source> - <translation type="unfinished"></translation> + <translation>VirtualBox har ikke rettigheder til at tilgÃ¥ USB-enheder. Du kan ændre dette ved at tildele din bruger adgang til usbfs-mappen og filerne deri. Se dokumentationen for yderligere detaljer</translation> </message> <message> <source>The USB Proxy Service has not yet been ported to this host</source> - <translation type="unfinished"></translation> + <translation>Værts-USB Proxy-tjenesten er endnu ikke kompatibel med denne vært</translation> </message> <message> <source>Could not load the Host USB Proxy service</source> - <translation type="unfinished"></translation> + <translation>Kunne ikke starte tjenesten Værts-USB Proxy</translation> </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Kan ikke finde øjebliksbilledet <b>%1</b>.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="unfinished"><p>Kunne ikke gemme den hentede fil som <nobr><b>%1</b>.</nobr></p></translation> + <translation><p>Kunne ikke gemme den hentede fil som <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Du har en gammel version (%1) af <b><nobr>%2</nobr></b> installeret.</p><p>Vil du hente den nyeste version?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Hent</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Er du sikker pÃ¥ at du vil hente <b><nobr>%1</nobr></b> fra <nobr><a href="%2">%2</a></nobr> (størrelse %3 bytes)?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p><b><nobr>%1</nobr></b> er nu blevet hentet fra <nobr><a href="%2">%2</a></nobr> og gemt lokalt som <nobr><b>%3</b>.</nobr></p><p>Ønsker du at installere denne udvidelsespakke?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>Installér</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p><b><nobr>%1</nobr></b> er nu blevet hentet fra <nobr><a href="%2">%2</a></nobr> men kan ikke gemmes lokalt som <nobr><b>%3</b>.</nobr></p><p>Vælg en anden placering til filen.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Kunne ikke hente <b><nobr>%1</nobr></b> fra <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> </message> </context> <context> @@ -5616,11 +5654,22 @@ p, li { white-space: pre-wrap; } <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished">Afbryd hentningen af CD'en med VirtualBox Gæstetilføjelser</translation> + <translation>Afbryd hentningen af CD'en med VirtualBox Gæstetilføjelser</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished">Henter CD'en med VirtualBox Gæstetilføjelser fra <nobr><b>%1</b>...</nobr></translation> + <translation>Henter CD-aftrykket med VirtualBox Gæstetilføjelser fra <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>Afbryd hentningen af <nobr><b>%1</b></nobr></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Henter <nobr><b>%1</b></nobr> fra <nobr><b>%2</b>...</nobr></translation> </message> </context> <context> @@ -5650,7 +5699,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Summary</source> - <translation type="unfinished">Oversigt</translation> + <translation>Sammendrag</translation> </message> <message> <source><nobr>%1 Bytes</nobr></source> @@ -5662,7 +5711,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Select a file for the new hard disk image file</source> - <translation type="unfinished">Vælg et filnavn til det nye harddisk-aftryk</translation> + <translation>Vælg et filnavn til det nye harddisk-aftryk</translation> </message> <message> <source>< &Back</source> @@ -5684,12 +5733,12 @@ p, li { white-space: pre-wrap; } <message> <source>Location</source> <comment>summary</comment> - <translation type="unfinished">Placering</translation> + <translation>Placering</translation> </message> <message> <source>Size</source> <comment>summary</comment> - <translation type="unfinished">Størrelse</translation> + <translation>Størrelse</translation> </message> <message> <source>Bytes</source> @@ -5751,166 +5800,178 @@ p, li { white-space: pre-wrap; } <message> <source>%1_copy</source> <comment>copied virtual disk name</comment> - <translation type="unfinished"></translation> + <translation>%1_kopi</translation> </message> <message> <source>Create</source> - <translation type="unfinished"></translation> + <translation>Opret</translation> </message> <message> <source>Copy Virtual Disk</source> - <translation type="unfinished"></translation> + <translation>Kopier virtuel disk</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation>Kopier</translation> </message> <message> <source>Welcome to the virtual disk copying wizard</source> - <translation type="unfinished"></translation> + <translation>Velkommen til Virtuel disk kopi-guiden</translation> </message> <message> <source><p>This wizard will help you to copy a virtual disk.</p></source> - <translation type="unfinished"></translation> + <translation><p>Denne guide hjælper dig med at kopiere en virtuel disk</p></translation> </message> <message> <source>Please select the virtual disk which you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select a virtual disk file.</source> - <translation type="unfinished"></translation> + <translation>Vælg den virtuelle disk du vil kopiere, hvis den ikke allerede er valgt. Du kan enten vælge fra listen eller bruge mappe-ikonet ved siden af listen til at vælge en virtuel disk-fil.</translation> </message> <message> <source>&VDI (VirtualBox Disk Image)</source> - <translation type="unfinished"></translation> + <translation>&VDI (VirtualBox diskaftryk)</translation> </message> <message> <source>V&MDK (Virtual Machine Disk)</source> - <translation type="unfinished"></translation> + <translation>V&MDK (Virtual Machine Disk)</translation> </message> <message> <source>V&HD (Virtual Hard Disk)</source> - <translation type="unfinished"></translation> + <translation>V&HD (Virtual Hard Disk)</translation> </message> <message> <source>Welcome to the virtual disk creation wizard</source> - <translation type="unfinished"></translation> + <translation>Velkommen til Oprettelse af virtuel disk-guiden</translation> </message> <message> <source><p>This wizard will help you to create a new virtual disk for your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Denne guide hjælper dig med at oprette en ny virtuel disk til din virtuelle maskine.</p></translation> </message> <message> <source><p>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p></source> - <translation type="unfinished"></translation> + <translation><p>Vælg typen af fil, som du vil bruge til den nye virtuelle disk. Skal disken ikke bruges med andre virtualiseringsprogrammer behøver du ikke ændre denne indstilling</p></translation> </message> <message> <source>Virtual disk file type</source> - <translation type="unfinished"></translation> + <translation>Virtuel disk filtype</translation> </message> <message> <source>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source> - <translation type="unfinished"></translation> + <translation>Vælg typen af fil, som du vil bruge til den nye virtuelle disk. Skal disken ikke bruges med andre virtualiseringsprogrammer behøver du ikke ændre denne indstilling.</translation> </message> <message> <source>Virtual disk storage details</source> - <translation type="unfinished"></translation> + <translation>Virtuel disk lagerdetaljer</translation> </message> <message> <source>Please choose whether the new virtual disk file should be allocated as it is used or if it should be created fully allocated.</source> - <translation type="unfinished"></translation> + <translation>Vælg om den nye virtuelle disk allokeres i takt med at den bruges eller om al pladsen allokeres med det samme.</translation> </message> <message> <source><p>A <b>dynamically allocated</b> virtual disk file will only use space on your physical hard disk as it fills up, although it will not shrink again automatically when space on it is freed.</p></source> - <translation type="unfinished"></translation> + <translation><p>En <b>dynamisk allokeret</b> virtuel disk-fil bruger kun plads i takt med at den fyldes op - dog formindskes filen ikke, nÃ¥r der frigives plads pÃ¥ den virtuelle disk.</p></translation> </message> <message> <source><p>A <b>fixed size</b> virtual disk file may take longer to create on some systems but is often faster to use.</p></source> - <translation type="unfinished"></translation> + <translation><p>En <b>fast allokeret</b> virtuel disk-fil kan tage længere tid at oprette, men er ofte hurtigere ved brug.</p></translation> </message> <message> <source><p>You can also choose to <b>split</b> the virtual disk into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source> - <translation type="unfinished"></translation> + <translation><p>Du kan vælge at <b>sprede</b> den virtuelle disk over flere filer pÃ¥ op til 2 GB hver. Det er særlig brugbart, hvis du vil gemme den virtuelle maskine pÃ¥ flytbare USB-enheder eller ældre systemer, som muligvis ikke understøtter filer større end 2 GB.</p></translation> </message> <message> <source>&Dynamically allocated</source> - <translation type="unfinished"></translation> + <translation>&Dynamisk allokeret</translation> </message> <message> <source>&Fixed size</source> - <translation type="unfinished"></translation> + <translation>&Fast allokeret</translation> </message> <message> <source>&Split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>&Spred over flere filer <2 GB</translation> </message> <message> <source>Virtual disk file location and size</source> - <translation type="unfinished"></translation> + <translation>Placering og størrelse af disk-fil</translation> </message> <message> <source>Select the size of the virtual disk in megabytes. This size will be reported to the Guest OS as the maximum size of this virtual disk.</source> - <translation type="unfinished"></translation> + <translation>Fastsætter størrelsen pÃ¥ den virtuelle disk i MB. Størrelsen rapporteres til gæste-OS'et som den maksimale størrelse af disken.</translation> </message> <message> <source>Virtual disk file location</source> - <translation type="unfinished"></translation> + <translation>Placering af virtuel disk-fil</translation> </message> <message> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> - <translation type="unfinished"></translation> + <translation>Indtast navnet pÃ¥ den nye virtuelle disk-fil i tekstfeltet eller tryk pÃ¥ mappe-ikonet for at vælge en anden mappe at oprette filen i.</translation> </message> <message> <source><nobr>%1 (%2 B)</nobr></source> - <translation type="unfinished"><nobr>%1 (%2 B)</nobr></translation> + <translation><nobr>%1 (%2 B)</nobr></translation> </message> <message> <source>You are going to create a new virtual disk with the following parameters:</source> - <translation type="unfinished"></translation> + <translation>Du er ved at oprette en ny virtuel disk med følgende egenskaber:</translation> </message> <message> <source>You are going to create a copied virtual disk with the following parameters:</source> - <translation type="unfinished"></translation> + <translation>Du er ved at oprette en kopi af en virtuel disk med følgende egenskaber:</translation> </message> <message> <source>If the above settings are correct, press the <b>%1</b> button. Once you press it the new virtual disk file will be created.</source> - <translation type="unfinished"></translation> + <translation>Tryk pÃ¥ <b>%1</b>, hvis ovenstÃ¥ende indstillinger er korrekte. Herefter vil den nye virtuelle disk-fil blive oprettet.</translation> </message> <message> <source>%1 B</source> - <translation type="unfinished">%1 B</translation> + <translation>%1 B</translation> </message> <message> <source>File type</source> <comment>summary</comment> - <translation type="unfinished"></translation> + <translation>Filtype</translation> </message> <message> <source>Details</source> <comment>summary</comment> - <translation type="unfinished"></translation> + <translation>Detaljer</translation> + </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (Parallels Hard Disk)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (QEMU enhanced disk)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (QEMU Copy-On-Write)</translation> </message> </context> <context> <name>UINewHDWizardPageFormat</name> <message> <source>File type</source> - <translation type="unfinished"></translation> + <translation>Filtype</translation> </message> </context> <context> <name>UINewHDWizardPageOptions</name> <message> <source>&Location</source> - <translation type="unfinished">P&lacering</translation> + <translation>P&lacering</translation> </message> <message> <source>&Size</source> - <translation type="unfinished">&Størrelse</translation> + <translation>&Størrelse</translation> </message> </context> <context> <name>UINewHDWizardPageVariant</name> <message> <source>Storage details</source> - <translation type="unfinished"></translation> + <translation>Lagerdetaljer</translation> </message> </context> <context> @@ -5925,11 +5986,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Virtual disk to copy</source> - <translation type="unfinished"></translation> + <translation>Virtuel disk, der skal kopieres</translation> </message> <message> <source>Choose a virtual hard disk file...</source> - <translation type="unfinished">Vælg en virtuel harddisk-fil...</translation> + <translation>Vælg en virtuel harddisk-fil...</translation> </message> </context> <context> @@ -6153,7 +6214,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Create</source> - <translation type="unfinished"></translation> + <translation>Opret</translation> </message> </context> <context> @@ -6242,11 +6303,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">Opstarts&disk</translation> + <translation>Opstarts&disk</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>Vælg den virtuelle harddisk, som den virtuelle maskine skal starte fra. Du kan enten oprette en ny harddisk, vælge en eksisterende fra rullegardinlisten eller trykke pÃ¥ den tilhørende knap (viser Ã…bn-fil vinduet).</p><p>Har du brug for en mere avanceret harddisk-konfiguration, kan du springe dette trin over og tilslutte harddiske senere via indstillingerne for den virtuelle maskine.</p></translation> + <translation><p>Du kan nu tilføje en opstartsdisk til den nye maskine. Du kan enten oprette en ny virtuel disk, vælge en pÃ¥ listen eller Ã¥bne en anden placering ved hjælp af mappe-ikonet.</p><p>Har du brug for en mere avanceret virtuel disk-opsætning, kan du springe dette trin over og lave ændringerne i maskinens indstillinger, nÃ¥r den er oprettet.</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -6254,7 +6315,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">Anbefalet størrelse pÃ¥ opstartsharddisken er <b>%1</b>.</translation> + <translation>Anbefalet størrelse pÃ¥ opstartsdisken er <b>%1</b>.</translation> </message> </context> <context> @@ -6290,7 +6351,7 @@ p, li { white-space: pre-wrap; } <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">Opstartsdisk</translation> + <translation>Opstartsdisk</translation> </message> <message> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> @@ -6476,7 +6537,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Proxy</source> - <translation type="unfinished"></translation> + <translation>Proxy</translation> </message> </context> <context> @@ -6579,6 +6640,93 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dag</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dage</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dage</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dage</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dage</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dage</translation> + </message> + <message> + <source>1 week</source> + <translation>1 uge</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 uger</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 uger</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mÃ¥ned</translation> + </message> + <message> + <source>Never</source> + <translation>Aldrig</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Søg</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">Luk</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox opdateringsguide</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Søg efter opdateringer</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Annullér</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Oversigt</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Der er frigivet en ny version af VirtualBox! Version <b>%1</b> er tilgængelig fra <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hente den nye version her:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Kunne ikke søge efter opdateringer pÃ¥ grund af netværksfejlen:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Du har allerede den nyeste version af VirtualBox. Søg efter opdateringer igen en anden dag.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Denne guide vil forbinde sig til VirtualBox' hjemmeside for at søge efter en opdateret udgave af VirtualBox.</p><p>Klik pÃ¥ <b>Søg</b> for at søge efter opdateringer eller <b>Annullér</b> hvis du vil afbryde.</p><p>Du kan starte denne guide nÃ¥r som helst ved at vælge <b>Søg efter opdateringer...</b> fra menuen <b>Hjælp</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -8752,58 +8900,58 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Dynamically allocated storage</source> - <translation type="unfinished"></translation> + <translation>Dynamisk allokeret plads</translation> </message> <message> <source>Fixed size storage</source> - <translation type="unfinished"></translation> + <translation>Fast allokeret plads</translation> </message> <message> <source>Dynamically allocated storage split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>Dynamisk allokeret plads spredt over filer under 2 GB</translation> </message> <message> <source>Fixed size storage split into files of less than 2GB</source> - <translation type="unfinished"></translation> + <translation>Fast allokeret plads spredt over filer under 2 GB</translation> </message> <message> <source>Execution Cap</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Ydelsesbegrænsning</translation> </message> <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation><nobr>%1%</nobr></translation> </message> <message> <source>Generic, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Generisk, '%1'</translation> </message> <message> <source>Generic Driver</source> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>Generisk driver</translation> </message> <message> <source>Deny</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Ikke tilladt</translation> </message> <message> <source>Allow VMs</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Tillad VM'ere</translation> </message> <message> <source>Allow All</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Tillad alle</translation> </message> <message> <source>Adapter %1</source> - <translation type="unfinished">Netværkskort %1</translation> + <translation>Netværkskort %1</translation> </message> </context> <context> @@ -9069,43 +9217,43 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Type:</source> - <translation type="unfinished">Type:</translation> + <translation>Type:</translation> </message> <message> <source>Location:</source> - <translation type="unfinished">Placering:</translation> + <translation>Placering:</translation> </message> <message> <source>Format:</source> - <translation type="unfinished"></translation> + <translation>Format:</translation> </message> <message> <source>Storage details:</source> - <translation type="unfinished"></translation> + <translation>Lagerdetaljer:</translation> </message> <message> <source>Attached to:</source> - <translation type="unfinished"></translation> + <translation>Tilsluttet til:</translation> </message> <message> <source>&Copy...</source> - <translation type="unfinished"></translation> + <translation>Kopier...</translation> </message> <message> <source>&Modify...</source> - <translation type="unfinished"></translation> + <translation>&Tilret...</translation> </message> <message> <source>Copy an existing medium</source> - <translation type="unfinished"></translation> + <translation>Kopier et eksisterende medie</translation> </message> <message> <source>Modify the attributes of the selected medium</source> - <translation type="unfinished"></translation> + <translation>Tilpas egenskaberne for det valgte medie</translation> </message> <message> <source>C&lose</source> - <translation type="unfinished"></translation> + <translation>&Luk</translation> </message> </context> <context> @@ -9515,19 +9663,19 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Cl&one...</source> - <translation type="unfinished"></translation> + <translation>Kl&on...</translation> </message> <message> <source>Clone the selected virtual machine</source> - <translation type="unfinished"></translation> + <translation>Klon den valgte virtuelle maskine</translation> </message> <message> <source>Discard</source> - <translation type="unfinished"></translation> + <translation>Kassér</translation> </message> <message> <source>D&iscard Saved State</source> - <translation type="unfinished"></translation> + <translation>Kassér gemt t&ilstand</translation> </message> </context> <context> @@ -9758,11 +9906,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Clone...</source> - <translation type="unfinished"></translation> + <translation>Klon...</translation> </message> <message> <source>Clone the selected virtual machine</source> - <translation type="unfinished"></translation> + <translation>Klon den valgte virtuelle maskine</translation> </message> </context> <context> @@ -9836,93 +9984,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dag</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dage</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dage</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dage</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dage</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dage</translation> - </message> - <message> - <source>1 week</source> - <translation>1 uge</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 uger</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 uger</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mÃ¥ned</translation> - </message> - <message> - <source>Never</source> - <translation>Aldrig</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Søg</translation> - </message> - <message> - <source>&Close</source> - <translation>Luk</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox opdateringsguide</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Søg efter opdateringer</translation> - </message> - <message> - <source>Cancel</source> - <translation>Annullér</translation> - </message> - <message> - <source>Summary</source> - <translation>Oversigt</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Der er frigivet en ny version af VirtualBox! Version <b>%1</b> er tilgængelig fra <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hente den nye version her:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Kunne ikke søge efter opdateringer pÃ¥ grund af netværksfejlen:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Du har allerede den nyeste version af VirtualBox. Søg efter opdateringer igen en anden dag.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Denne guide vil forbinde sig til VirtualBox' hjemmeside for at søge efter en opdateret udgave af VirtualBox.</p><p>Klik pÃ¥ <b>Søg</b> for at søge efter opdateringer eller <b>Annullér</b> hvis du vil afbryde.</p><p>Du kan starte denne guide nÃ¥r som helst ved at vælge <b>Søg efter opdateringer...</b> fra menuen <b>Hjælp</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts index 072420b6b..726cd6987 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts @@ -949,6 +949,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Wählen Sie einen Zielordner für %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4080,7 +4087,7 @@ </message> <message> <source><p>Are you sure you want to download the VirtualBox User Manual from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source> - <translation><p>Möchten Sie wirklich das VirtualBox-Benutzerhandbuch von <nobr><a href=""%1">%2</a></nobr> (Größe %3 Byte) herunterladen?</p></translation> + <translation><p>Möchten Sie wirklich das VirtualBox-Benutzerhandbuch von <nobr><a href="%1">%2</a></nobr> (Größe %3 Byte) herunterladen?</p></translation> </message> <message> <source><p>Failed to download the VirtualBox User Manual from <nobr><a href="%1">%2</a>.</nobr></p><p>%3</p></source> @@ -4370,6 +4377,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation><p>Die heruntergeladene Datei konnte nicht als <nobr><b>%1</b> gespeichert werden.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Sie haben eine alte Version (%1) des <b><nobr>%2</nobr></b> installiert.</p><p>Möchten Sie die aktuelle Version aus dem Internet herunterladen?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Herunterladen</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Möchten Sie wirklich das <b><nobr>%1</nobr></b> von <nobr><a href="%2">%2</a></nobr> (Größe %3 Byte) herunterladen?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p>Das <b><nobr>%1</nobr></b> wurde erfolgreich von <nobr><a href="%2">%2</a></nobr> heruntergeladen und unter <nobr><b>%3</b></nobr> gespeichert.</p><p>Möchten Sie dieses Zusatzpaket installieren?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>Installieren</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p>Das <b></nobr>%1</nobr></b> wurde erfolgreich von <nobr><a href="%2">%2</a></nobr> heruntergeladen, kann aber nicht lokal unter <nobr><b>%3</b></nobr> gespeichert werden. Bitte wählen Sie ein anderes Verzeichnis.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Das <b><nobr>%1</nobr><b> konnte nicht von <nobr><a href="%2">%2</a></nobr> heruntergeladen werden</p><p>%3</p></translation> + </message> </context> <context> <name>UIMiniProcessWidgetUserManual</name> @@ -4398,6 +4435,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>Bricht das Herunterladen des <nobr><b>%1</b></nobr> ab</translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Herunterladen des <nobr><b>%1</b></nobr> von <nobr><b>%2</b>...</nobr></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -4571,6 +4619,18 @@ <comment>summary</comment> <translation>abgespeichert wie</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (Parallels Festplatte)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (QEMU erweiterte Festplatte)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (QEMU Copy-on-Write)</translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -4938,6 +4998,89 @@ </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 Tag</translation> + </message> + <message> + <source>2 days</source> + <translation>2 Tage</translation> + </message> + <message> + <source>3 days</source> + <translation>3 Tage</translation> + </message> + <message> + <source>4 days</source> + <translation>4 Tage</translation> + </message> + <message> + <source>5 days</source> + <translation>5 Tage</translation> + </message> + <message> + <source>6 days</source> + <translation>6 Tage</translation> + </message> + <message> + <source>1 week</source> + <translation>1 Woche</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 Wochen</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 Wochen</translation> + </message> + <message> + <source>1 month</source> + <translation>1 Monat</translation> + </message> + <message> + <source>Never</source> + <translation>Nie</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Ãœberprüfen</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Schließen</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox aktualisieren</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Auf neue Version überprüfen</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Abbrechen</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Zusammenfassung</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Eine neue Version von VirtualBox ist verfügbar! Version <b>%1</b> ist auf <a href="http://www.virtualbox.org/">virtualbox.org</a> verfügbar.</p><p>Sie können diese Version von der folgenden Adresse herunterladen:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Die Ãœberprüfung auf eine neue Version konnte aufgrund des folgenden Netzwerkfehlers nicht durchgeführt werden:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Sie haben bereits die neueste Version von VirtualBox installiert.</translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -6789,7 +6932,7 @@ </message> <message> <source>Create Shortcut on Desktop</source> - <translation>Verknüpfung auf dem Desktop anlegen</translation> + <translation>Desktop-Verknüpfung</translation> </message> <message> <source>Creates an Shortcut file to the VirtualBox Machine Definition file on your Desktop.</source> @@ -7006,93 +7149,6 @@ </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 Tag</translation> - </message> - <message> - <source>2 days</source> - <translation>2 Tage</translation> - </message> - <message> - <source>3 days</source> - <translation>3 Tage</translation> - </message> - <message> - <source>4 days</source> - <translation>4 Tage</translation> - </message> - <message> - <source>5 days</source> - <translation>5 Tage</translation> - </message> - <message> - <source>6 days</source> - <translation>6 Tage</translation> - </message> - <message> - <source>1 week</source> - <translation>1 Woche</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 Wochen</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 Wochen</translation> - </message> - <message> - <source>1 month</source> - <translation>1 Monat</translation> - </message> - <message> - <source>Never</source> - <translation>Nie</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Ãœberprüfen</translation> - </message> - <message> - <source>&Close</source> - <translation>&Schließen</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox aktualisieren</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Auf neue Version überprüfen</translation> - </message> - <message> - <source>Cancel</source> - <translation>Abbrechen</translation> - </message> - <message> - <source>Summary</source> - <translation>Zusammenfassung</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Eine neue Version von VirtualBox ist verfügbar! Version <b>%1</b> ist auf <a href="http://www.virtualbox.org/">virtualbox.org</a> verfügbar.</p><p>Sie können diese Version von der folgenden Adresse herunterladen:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Die Ãœberprüfung auf eine neue Version konnte aufgrund des folgenden Netzwerkfehlers nicht durchgeführt werden:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Sie haben bereits die neueste Version von VirtualBox installiert.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VBoxVMInformationDlg</name> <message> <source>%1 - Session Information</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts index b43c09d2c..8efb15899 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts @@ -949,6 +949,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4370,6 +4377,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetUserManual</name> @@ -4398,6 +4435,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -4571,6 +4619,18 @@ <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -4938,6 +4998,53 @@ </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>4 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>5 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>6 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 week</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 month</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Never</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7006,93 +7113,6 @@ </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>4 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>5 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>6 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 week</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 month</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Never</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Chec&k</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Close</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Check for Updates</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Cancel</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VBoxVMInformationDlg</name> <message> <source>%1 - Session Information</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts index 8afbf32fa..864362a2c 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts @@ -759,7 +759,7 @@ </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished">Base enlazada for %1 and %2</translation> + <translation>Base enlazada para %1 y %2</translation> </message> </context> <context> @@ -1253,6 +1253,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Seleccionar carpeta en la que guardar %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2764,10 +2771,6 @@ p, li { white-space: pre-wrap; } <translation><br><nobr><b>No hay carpetas compartidas</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica si la pantalla remota (servidor VRDP) está habilitado (<img src=:/vrdp_16px.png/>) o no (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>Servidor VRDP escuchando en el puerto %1</translation> </message> @@ -4843,18 +4846,6 @@ p, li { white-space: pre-wrap; } <translation>Fallo al eliminar la carpeta compartida <b>%1</b> (apuntando a <nobr><b>%2</b></nobr>) de la máquina virtual <b>%3</b>.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Usted hizo <b>click con el ratón/b> dentro de la pantalla de la Máquina Virtual o ha presionado la tecla <b>Tecla Anfitrión</b>. Esto ocasionará que la Máquina Virtual <b>capture</b> el ratón (solo si la "integración del ratón" no está soportada por el OS (sist. op.) huésped) y el teclado de la máquina anfitriona. Lo que hará que estén inaccesibles para las demás applicaciones corriendo en la máquina anfitriona.</p><p>En cualquier momento puede presionar la <b>Tecla Anfitrión</b> para <b>liberar</b> el teclado y el ratón (si están capturados) y retorna a su operación normal. La tecla actual asignada a la Tecla Anfitrión es mostrada en la barra de estado al pie de la ventana de la Máquina Virtual, al lado del Ãcono&nbsp;<img src=hostkey_16px.png/>&nbsp;. Éste Ãcono junto con el Ãcono del ratón aledaño indican el estado de captura del ratón y el teclado.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Ud. tiene la opción de <b>Auto captura del teclado</b> activada. Ésto causará que se <b>capture</b> el teclado automáticamente cada vez que la ventana de la Máquina Virtual (VM) sea activada. Esto inhabilitará el teclado para otras aplicaciones corriendo en la máquina Anfitrión: cuando el teclado es capturado, todas la combinaciones de teclas (incluyendo las de sistema como Alt-Tab) son redirijidas haica la Máquina Virtual.</p><p>Puede presionar la <b>Tecla Anfitrión</b> en cualquier momento para liberar el teclado y el ratón (de estar capturados) y que vuelvan a su operación normal. La tecla anfitrión actual es mostrada en la barra de estado al pie de la ventana de la Máquina Virtual, al lado del Ãcono &nbsp;<img src=hostkey_16px.png/>&nbsp;. Éste Ãcono junto con Ãcono del ratón, colocado al costado, indican el estado actual de captura del teclado y el ratón.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>La Máquina Virtual reporta que el Sist. Operativo (OS) huésped soporta <b>integración del ratón</b>. Esto quiere decir que no se necesita <b>capturar</b> el ratón para poder usarlo en el OS huésped -- todas las acciones que realice cuando el puntero del ratón esté sobre la Máquina Virtual son enviadas directamente al OS huésped. Si el ratón está capturado, será automáticamente liberado al salir de los bordes de la ventana.</p><p>El Ãcono en la barra de estado se verá como &nbsp;<img src=mouse_seamless_16px.png/>&nbsp;para informale que el OS huésped soporta integración del ratón y está habilitada.</p><p><b>Nota</b>: Ciertas aplicaciones pueden comportarse incorrectamente con el modo de integración del ratón. Siempre se puede activar o desactivar para la sesión actual seleccionando la acción correspondiente en la barra de menú.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>La máquina virtual informa que el SO invitado no soporta <b>integración del ratón</b> en el modo de vÃdeo actual. Se necesita capturar el ratón (haciendo clic sobre la pantalla de la máquina virtual o presionando la tecla anfitrión) para poder usarlo dentro de SO invitado.</p></translation> </message> @@ -5809,8 +5800,8 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <source><p>The virtual machine(s) <b>%1</b> are currently in a saved state.</p><p>If you continue the runtime state of the exported machine(s) will be discarded. Note that the existing machine(s) are not changed.</p></source> <translation> - <numerusform><p>La máquina virtual <b>%1</b> está actualmente en un estado guardado.</p><p>Si continua, el estado de ejecución de la máquina exportada será descartado. Esto no afectará las máquina existentes.</p></numerusform> - <numerusform><p>Las máquinas virtuales <b>%1</b> están actualmente en un estado guardado.</p><p>Si continua, los estados de ejecución de las máquinas exportadas serán descartados. Esto no afectará las máquinas existentes.</p></numerusform> + <numerusform><p>La máquina virtual <b>%1</b> está actualmente en un estado guardado.</p><p>Si continua, el estado de ejecución de la máquina exportada será descartado. Esto no afectará a las máquina existentes.</p></numerusform> + <numerusform><p>Las máquinas virtuales <b>%1</b> están actualmente en un estado guardado.</p><p>Si continua, los estados de ejecución de las máquinas exportadas serán descartados. Esto no afectará a las máquinas existentes.</p></numerusform> </translation> </message> <message> @@ -6014,6 +6005,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation><p>No se pudo guardar el archivo descargado como <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Tiene una versión antigua (%1) del <b><nobr>%2</nobr></b> instalada.</p><p>¿Desea descargar la última versión desde Internet?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Descargar</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>¿Está seguro de que desea descargar el <b><nobr>%1</nobr></b> desde <nobr><a href="%2">%2</a></nobr> (tamaño %3 bytes)?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p>El <b><nobr>%1</nobr></b> ha sido descargardo correctamente desde <nobr><a href="%2">%2</a></nobr> y guardado localmente como <nobr><b>%3</b>.</nobr></p><p>¿Desea instalar este paquete de extensión?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>Instalar</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p>El <b><nobr>%1</nobr></b> ha sido descargardo correctamente desde <nobr><a href="%2">%2</a></nobr> pero no puede ser guardado localmente como <nobr><b>%3</b>.</nobr></p><p>Seleccione otra localización para el archivo.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Fallo al descargar el <b><nobr>%1</nobr></b> desde <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -6061,6 +6082,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>Cancelar la descarga <nobr><b>%1</b></nobr></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Descargando el <nobr><b>%1</b></nobr> desde <nobr><b>%2</b>...</nobr></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6373,7 +6405,7 @@ dependiendo del tamaño de la imagen y el rendimiento de su disco duro.</p> </message> <message> <source>Please choose whether the new virtual disk file should be allocated as it is used or if it should be created fully allocated.</source> - <translation>Seleccione si el archivo del disco virtual deberÃa ser reservado según sea usado o si deberÃa reservase completamente en la creación.</translation> + <translation>Seleccione si el archivo del disco virtual deberÃa ser reservado según sea usado o si deberÃa reservarse completamente en la creación.</translation> </message> <message> <source><p>A <b>dynamically allocated</b> virtual disk file will only use space on your physical hard disk as it fills up, although it will not shrink again automatically when space on it is freed.</p></source> @@ -6445,6 +6477,18 @@ dependiendo del tamaño de la imagen y el rendimiento de su disco duro.</p> <comment>summary</comment> <translation>Detalles</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (Disco duro Parallels)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (Disco mejorado QEMU)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (QEMU Copiar-al-Escribir)</translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -7242,6 +7286,93 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dÃa</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dÃas</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dÃas</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dÃas</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dÃas</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dÃas</translation> + </message> + <message> + <source>1 week</source> + <translation>1 semana</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 semanas</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 semanas</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mes</translation> + </message> + <message> + <source>Never</source> + <translation>Nunca</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Comprobar</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Cerrar</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Asistente de Actualización de VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Comprobar actualizaciones</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Cancelar</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Resumen</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>¡Hay una nueva versión de VirtualBox! La versión <b>%1</b> se ecuentra disponible en <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puede descargar dicha versión directamente desde el siguiente enlace:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>No fue posible obtener información sobre la nueva versión debido al siguiente error de red:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Ya tiene instalada la última versión de VirtualBox. Compruebe la versión más tarde.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Este asistente se conectará al sitio web de VirtualBox y comprobará si hay un nueva versión de VirtualBox disponible.</p><p>Utilize el botón <b>Comprobar</b> si desea comprobar ahora o el botón <b>Cancelar</b> si no desea hacer esta comprobación ahora.</p><p>Puede ejecutar este asistente en cualquier momento yendo a <b>Comprobar actualizaciones...</b> desde el menú <b>Ayuda</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7854,16 +7985,8 @@ Versión %1</translation> <translation type="obsolete">Ay&uda</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si la función de autodimensionar está Habilitada (<img src=auto_resize_on_16px.png/>) or Inhabilitada (<img src=auto_resize_off_16px.png/>). Preste atención porque requiere que el Huésped tenga instalado "Guest Additions" (Aplicaciones del Huésped).</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si el puntero del ratón es capturado por el Sistema Huésped:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;puntero no es capturado</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;puntero es capturado</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br> Preste atención ya que esto requiere que el Huésped tenga instalado "Guest Additions" (Aplicaciones del Huésped).</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">Indica si el teclado es capturado por el Sistema Huésped (<img src=hostkey_captured_16px.png/>) o no (<img src=hostkey_16px.png/>)</translation> + <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Indica si el puntero del ratón es capturado por el Sistema Huésped:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;puntero no es capturado</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;puntero es capturado</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br> Preste atención ya que esto requiere que el Huésped tenga instalado "Guest Additions" (Aplicaciones del Huésped).</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -7915,10 +8038,6 @@ Versión %1</translation> <translation type="obsolete"><qt>Indica&nbsp;la&nbsp;actividad&nbsp;de&nbsp;las&nbsp;interfaces&nbsp;de&nbsp;red<br>[<b>%1 adaptador(es)</b>]</qt></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">Indica si la Pantalla Remota (Server VRDP) esta habilitado (<img src=vrdp_16px.png/>) o no (<img src=vrdp_disabled_16px.png/>)</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>Servidor VRDP escuchando en el puerto %1</translation> </message> @@ -8039,10 +8158,6 @@ Versión %1</translation> <translation type="obsolete">Cambiar a modo de integración de escritorio fluÃdo</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indica si el teclado está capturado por el Sist. Operativo huésped (<img src=hostkey_captured_16px.png/>) o no (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Indica la actividad del medio de disquete:</nobr>%1</qt></translation> @@ -8133,10 +8248,6 @@ Versión %1</translation> <translation type="obsolete"><br><nobr><b>El controlador USB se encuentra inhabilitado</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica si el Despliege Remoto (Server VRDP) está habilitado (<img src=vrdp_16px.png/>) o no (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>Indica la actividad de las carpetas compartidas:</nobr>%1</qt></translation> @@ -8190,18 +8301,6 @@ Versión %1</translation> <translation type="obsolete">Generando historia&l...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si la función de autodimensionar está habilitada (<img src=:/auto_resize_on_16px.png/>) or inhabilitada (<img src=:/auto_resize_off_16px.png/>). Esta función requiere instalar las «Guest Additions» en el SO huésped.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica si el puntero del ratón es capturado por el SO huésped:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;puntero no es capturado</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;puntero es capturado</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;Int. del ratón habilitada</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;Int. ratón deshabilitada, el ratón es capturado</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;Int. ratón deshabilitada, el ratón no es capturado</nobr><br> La integración del ratón requiere instalar las «Guest Additions» en el SO huésped.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">Indica si el teclado está capturado por el SO huésped (<img src=:/hostkey_captured_16px.png/>) o no (<img src=:/hostkey_16px.png/>).</translation> - </message> - <message> <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> <translation type="obsolete">Indica si la pantalla remota (servidor VRDP) está habilitado (<img src=:/vrdp_16px.png/>) o no (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> @@ -11602,10 +11701,6 @@ volver al idioma por omisión del sistema.</qt> <translation>Iniciar la máquina virtual seleccionada</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>¡Bienvenido a VirtualBox!</h3><p>En la parte izquierda de la venta está destinada a desplegar la lista de Máquinas Virtuales de su computadora. En este momento esta lista está vacÃa porque todavÃa no se a creado ninguna máquina virtual.<img src=welcome.png align=right/></p><p>Para crear una nueva Máquina Virtual presione el botón <b>Nueva</b> en la barra de herramientas principal.</p><p>Puede utilizar la tecla <b>%1</b> para la ayuda o visitar <a href=http://www.virtualbox.org>www.virtualbox.org</a>(en inglés por ahora) para las útimas novedades e información.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Máquina</translation> </message> @@ -12506,93 +12601,6 @@ cualquier valor.</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dÃa</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dÃas</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dÃas</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dÃas</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dÃas</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dÃas</translation> - </message> - <message> - <source>1 week</source> - <translation>1 semana</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 semanas</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 semanas</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mes</translation> - </message> - <message> - <source>Never</source> - <translation>Nunca</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Comprobar</translation> - </message> - <message> - <source>&Close</source> - <translation>&Cerrar</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Asistente de Actualización de VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Comprobar actualizaciones</translation> - </message> - <message> - <source>Cancel</source> - <translation>Cancelar</translation> - </message> - <message> - <source>Summary</source> - <translation>Resumen</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>¡Hay una nueva versión de VirtualBox! La versión <b>%1</b> se ecuentra disponible en <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puede descargar dicha versión directamente desde el siguiente enlace:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>No fue posible obtener información sobre la nueva versión debido al siguiente error de red:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Ya tiene instalada la última versión de VirtualBox. Compruebe la versión más tarde.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Este asistente se conectará al sitio web de VirtualBox y comprobará si hay un nueva versión de VirtualBox disponible.</p><p>Utilize el botón <b>Comprobar</b> si desea comprobar ahora o el botón <b>Cancelar</b> si no desea hacer esta comprobación ahora.</p><p>Puede ejecutar este asistente en cualquier momento yendo a <b>Comprobar actualizaciones...</b> desde el menú <b>Ayuda</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts index ab00bca59..b8e1b4f9c 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts @@ -1120,6 +1120,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4143,18 +4150,6 @@ <translation>Huts <b>%1</b> partekatutako karpeta (<nobr><b>%2</b></nobr>-ra lotua) <b>%3</b> makina birtualetik kentzerakoan.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Zuk Makina Birtualaren pantailan <b>sagu botoia</b> edo <b>ostalari tekla</b> sakatu duzu. Honek makina birtualak ostalariaren sagu markatzailea (bakarrik sagu markatzaile integrazioa ez badu SE bezeroak onartzen) eta teklatua <b>kapturatzea</b> eragingo du, honekin agian ez dira erabilgarri izango ostalari makinan abiarazirik dauden aplikazio batzuekin .</p><p><b>Ostalari tekla</b> sakatu dezakezu edozein momentutan sagu eta teklatu <b>kaptura kentzeko</b> (kapturaturik badaude) eta portamolde arruntera itzultzeko. Unean ezarritako ostalari tekla Makina Birtual leihoaren behealdeko barran erakusten da, &nbsp;<img src=hostkey_16px.png/>&nbsp;ikono ondoan. Ikono honek eta ondoan kokaturiko sagu ikonoak uneko sagu eta teklatu kaptura egoera erakusten dute.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p><b>Teklatu auto-kapturatzea</b> gaiturik duzu. Honek Makina Birtualak automatikoki teklatua <b>kapturatzea</b> eragingo du MB leihoa aktibatzen den bakoitzean eta ostalari makinan abiarazirik dituzun beste zenbait aplikazioentzat erabiltezina gea liteke: teklatua kapturatzen denean, Tekla zanpatze guztia (Alt-Tab) barne MB-ra bidaliko dira.</p><p> <b>Ostalari tekla</b> sakatu dezakezu edozein momentutan teklatu eta sagu (kapturatua badago) <b>kapura uzteko</b> eta funtzionamendu normalera itzultzeko. Ezarririk dagoen ostalari tekla makina birtualaren beheko eskuinaldean agertzen da&nbsp;<img src=hostkey_16px.png/>&nbsp;ikonoaren ondoan. Ikono honek gertu dagoen saguarenak bezala sagu eta teklatu kaptura egoera erakusten du.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>Makina Birtualak bezero SE-ak <b>sagu markatzaile integrazioa</b> onartzen duela dio. Honekin ez duzu zure sagua <i>kapturatu</i> beharko bezero sistema eragilean erabiltzeko -- markatzailea makina birtualaren leihoaren gainean dagoela egindako ekintzak zuzenean bezero sistema eragilera bidaliko dira. Sagua une honetan kapturatua badago, automatikoki utziko du.</p><p> Egoera barrako sagu ikonoak itsura hau izan beharko luke &nbsp;<img src=mouse_seamless_16px.png/>&nbsp;zuri sagu integrazioa bezeroak onartzen duela eta gaiturik dagoela adierazeko.</p><p><b>Oharra</b>: Zenbait aplikaziok oker funtziona dezake sagu integrazioarekin. Beti saio batetarako ezgaitu dezakezu (eta berriz gaitu) menu-barran dagokion ekintza hautatuaz.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>Makina Birtualak bezero SE-ak bideo modu honetan ez duela <b>sagu integrazioa</b> onartzen erreportatu du. Sagua kapturatu egin beharko duzu (MB leihoan klikatuaz edo ostalari tekla sakatuaz) sagua bezeroko sistema eragilean erabili ahal izateko.</p></translation> </message> @@ -4463,7 +4458,7 @@ </message> <message> <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><p>Zuk Makina Birtualaren pantailan <b>sagu botoia</b> edo <b>ostalari tekla</b> sakatu duzu. Honek makina birtualak ostalariaren sagu markatzailea (bakarrik sagu markatzaile integrazioa ez badu SE bezeroak onartzen) eta teklatua <b>kapturatzea</b> eragingo du, honekin agian ez dira erabilgarri izango ostalari makinan abiarazirik dauden aplikazio batzuekin .</p><p><b>Ostalari tekla</b> sakatu dezakezu edozein momentutan sagu eta teklatu <b>kaptura kentzeko</b> (kapturaturik badaude) eta portamolde arruntera itzultzeko. Unean ezarritako ostalari tekla Makina Birtual leihoaren behealdeko barran erakusten da, &nbsp;<img src=:/hostkey_16px.png/>&nbsp;ikono ondoan. Ikono honek eta ondoan kokaturiko sagu ikonoak uneko sagu eta teklatu kaptura egoera erakusten dute.</p></translation> </message> <message> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> @@ -5125,6 +5120,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Huts deskargatutako fitxategia <nobr><b>%1</b> bezala gordetzerakoan.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5172,6 +5197,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5456,6 +5492,18 @@ disko gogor birtual tamaina bezala</p></translation> <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6060,6 +6108,65 @@ gogorrak erantsi ditzakezu.</p></translation> </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>4 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>5 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>6 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 week</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 month</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Never</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">Konexioa denboraz kanpo.</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Utzi</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Laburpena</translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -6560,12 +6667,12 @@ gogorrak erantsi ditzakezu.</p></translation> <translation type="obsolete">&Laguntza</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Bezero pantaila automatikoki tamainaz aldatzeko funtzioa gaiturik (<img src=auto_resize_on_16px.png/>) edo ezgaiturik (<img src=auto_resize_off_16px.png/>) dagoen erakusten du. Kontutan izan funtzio honek Bezero Gehigarriak sistema eragile bezeroan instalaturik egotea behar duela.</translation> + <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Bezero pantaila automatikoki tamainaz aldatzeko funtzioa gaiturik (<img src=:/auto_resize_on_16px.png/>) edo ezgaiturik (<img src=:/auto_resize_off_16px.png/>) dagoen erakusten du. Kontutan izan funtzio honek Bezero Gehigarriak sistema eragile bezeroan instalaturik egotea behar duela.</translation> </message> <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Bezeroaren sistema eragileak sagu markatzailea kapturatzen duen erakusten du:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;markatzailea ez da kapturatzen</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;markatzailea kapturatzen da</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;sagu integrazioa (MI) gaiturik dago</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI ezgaiturik dago, markatzailea kapturatu egingo da</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI ezgaiturik dago, markatzailea ez da kapturatuko</nobr><br>Kontutan izan sagu integrazio funtzioak Bezero Gehigarriak sistema eragile bezeroan instalaturik egotea behar duela.</translation> + <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Bezeroaren sistema eragileak sagu markatzailea kapturatzen duen erakusten du:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;markatzailea ez da kapturatzen</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;markatzailea kapturatzen da</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;sagu integrazioa (MI) gaiturik dago</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI ezgaiturik dago, markatzailea kapturatu egingo da</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI ezgaiturik dago, markatzailea ez da kapturatuko</nobr><br>Kontutan izan sagu integrazio funtzioak Bezero Gehigarriak sistema eragile bezeroan instalaturik egotea behar duela.</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -6651,10 +6758,6 @@ gogorrak erantsi ditzakezu.</p></translation> <translation type="obsolete">Idazmahai integrazio garden modura aldatu</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Bezeroaren sistema eragileak teklatua kapturatzen duen <img (src=hostkey_captured_16px.png/>) edo ez (<img src=hostkey_16px.png/>) duen erakusten du.</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Diskete medioaren aktibitatea erakusten du:</nobr>%1</qt></translation> @@ -6730,8 +6833,8 @@ gogorrak erantsi ditzakezu.</p></translation> <translation type="obsolete"><br><nobr><b>USB Kontrolatzailea ezgaiturik dago</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Urruneko Pantaila (VRDP Zerbitzaria) gaiturik dagoen (<img src=vrdp_16px.png/>) ala ez (<img src=vrdp_disabled_16px.png/>) erakusten du.</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> + <translation type="obsolete">Urruneko Pantaila (VRDP Zerbitzaria) gaiturik dagoen (<img src=:/vrdp_16px.png/>) ala ez (<img src=:/vrdp_disabled_16px.png/>) erakusten du.</translation> </message> <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> @@ -9505,10 +9608,6 @@ sistemako lehenetsiriko hizkuntza berrezartzeko.</qt> <translation>Hautatutako makina birtuala abiarazi</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Ongietorri VirtualBox-era!</h3><p>Leiho honen ezkerreko zatian ordenagailu honetako makina birtual guztiak daude. Zerrenda orain hutsik dago oraindik ez duzu makina birtualik sortu eta.<img src=welcome.png align=right/></p><p>Makina berri bat sortzeko sakatu <b>Berria</b> botoia leihoaren goialdeko tresna-barran nagusian.</p><p><b>%1</b> tekla sakatu dezakezu laguntza eskuratzeko edo <a href=http://www.virtualbox.org>www.virtualbox.org</a> webgunera joan argibide eta azken berrien bila.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Makina</translation> </message> @@ -9566,7 +9665,7 @@ sistemako lehenetsiriko hizkuntza berrezartzeko.</qt> </message> <message> <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><h3>Ongietorri VirtualBox-era!</h3><p>Leiho honen ezkerreko zatian ordenagailu honetako makina birtual guztiak daude. Zerrenda orain hutsik dago oraindik ez duzu makina birtualik sortu eta.<img src=:/welcome.png align=right/></p><p>Makina berri bat sortzeko sakatu <b>Berria</b> botoia leihoaren goialdeko tresna-barran nagusian.</p><p><b>%1</b> tekla sakatu dezakezu laguntza eskuratzeko edo <a href=http://www.virtualbox.org>www.virtualbox.org</a> webgunera joan argibide eta azken berrien bila.</p></translation> </message> <message> <source>&Virtual Media Manager...</source> @@ -10228,97 +10327,6 @@ Kate hutsak edozein balio bilatuko du.</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>4 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>5 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>6 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 week</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 month</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Never</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">Konexioa denboraz kanpo.</translation> - </message> - <message> - <source>Chec&k</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Close</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Check for Updates</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Cancel</source> - <translation type="unfinished">Utzi</translation> - </message> - <message> - <source>Summary</source> - <translation type="unfinished">Laburpena</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts index fd276db95..584db753e 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts @@ -1113,6 +1113,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -5672,6 +5679,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Noudetun tiedoston tallennus epäonnistui nimellä <nobr><b>%1</b></nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Nouda</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5711,6 +5748,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6032,6 +6080,18 @@ levykuvan sijainnin ja nimen, tai kirjoita tiedostonimi tekstikenttään.</p& <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6688,6 +6748,93 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.</p&g </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 päivä</translation> + </message> + <message> + <source>2 days</source> + <translation>2 päivää</translation> + </message> + <message> + <source>3 days</source> + <translation>3 päivää</translation> + </message> + <message> + <source>4 days</source> + <translation>4 päivää</translation> + </message> + <message> + <source>5 days</source> + <translation>5 päivää</translation> + </message> + <message> + <source>6 days</source> + <translation>6 päivää</translation> + </message> + <message> + <source>1 week</source> + <translation>1 viikko</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 viikkoa</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 viikkoa</translation> + </message> + <message> + <source>1 month</source> + <translation>1 kuukausi</translation> + </message> + <message> + <source>Never</source> + <translation>Ei koskaan</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">Tar&kista</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Sulje</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBoxin päivitysapulainen</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Etsi päivityksiä</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Peru</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Yhteenveto</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Uusi versio VirtualBoxista on julkaistu! Versio <b>%1</b> on saatavilla osoitteesta <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Voit noutaa uuden version seuraavasta linkistä:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Tietoja uudesta versiosta ei voitu hakea seuraavan verkkovirheen takia:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Asentamasi VirtualBoxin versio on viimeisin julkaistu versio. Voit toistaa versiotarkistuksen myöhemmin uudestaan.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Tämä apulainen ottaa yhteyttä VirtualBoxin sivustolle ja tarkistaa, onko ohjelmasta uudempaa versiota saatavilla.</p><p>Käynnistä uuden version tarkistus napista <b>Tarkista</b> tai peru toiminto napista <b>Peru</b>, jos et halua suorittaa tarkistusta.</p><p>Voit suorittaa tämän apulaisen halutessasi valitsemalla <b>Etsi päivityksiä</b> <b>Ohje</b>-valikosta.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -11018,93 +11165,6 @@ to access it from a Linux OS. This feature requires Guest Additions.</qt>< </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 päivä</translation> - </message> - <message> - <source>2 days</source> - <translation>2 päivää</translation> - </message> - <message> - <source>3 days</source> - <translation>3 päivää</translation> - </message> - <message> - <source>4 days</source> - <translation>4 päivää</translation> - </message> - <message> - <source>5 days</source> - <translation>5 päivää</translation> - </message> - <message> - <source>6 days</source> - <translation>6 päivää</translation> - </message> - <message> - <source>1 week</source> - <translation>1 viikko</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 viikkoa</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 viikkoa</translation> - </message> - <message> - <source>1 month</source> - <translation>1 kuukausi</translation> - </message> - <message> - <source>Never</source> - <translation>Ei koskaan</translation> - </message> - <message> - <source>Chec&k</source> - <translation>Tar&kista</translation> - </message> - <message> - <source>&Close</source> - <translation>&Sulje</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBoxin päivitysapulainen</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Etsi päivityksiä</translation> - </message> - <message> - <source>Cancel</source> - <translation>Peru</translation> - </message> - <message> - <source>Summary</source> - <translation>Yhteenveto</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Uusi versio VirtualBoxista on julkaistu! Versio <b>%1</b> on saatavilla osoitteesta <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Voit noutaa uuden version seuraavasta linkistä:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Tietoja uudesta versiosta ei voitu hakea seuraavan verkkovirheen takia:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Asentamasi VirtualBoxin versio on viimeisin julkaistu versio. Voit toistaa versiotarkistuksen myöhemmin uudestaan.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Tämä apulainen ottaa yhteyttä VirtualBoxin sivustolle ja tarkistaa, onko ohjelmasta uudempaa versiota saatavilla.</p><p>Käynnistä uuden version tarkistus napista <b>Tarkista</b> tai peru toiminto napista <b>Peru</b>, jos et halua suorittaa tarkistusta.</p><p>Voit suorittaa tämän apulaisen halutessasi valitsemalla <b>Etsi päivityksiä</b> <b>Ohje</b>-valikosta.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts index 237c43ac5..8b8c6d205 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts @@ -638,7 +638,7 @@ </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translation>Lien de base pour %1 et %2</translation> </message> </context> <context> @@ -688,7 +688,7 @@ </message> <message> <source>Cloning Configuration</source> - <translation>Clonage de la configuration</translation> + <translation>Configuration du clonage</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> @@ -716,7 +716,7 @@ </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation><p>Veuillez choisir le type de clone.</p><p>Le <b>Clone complet</b> crée une copie exacte (disques virtuels inclus) de la machine virtuelle source. Le<b>Clone lié</b>, créé une nouvelle machine virtuelle mais les images des disques virtuels pointent vers les images disques de la machine source.</p></translation> + <translation><p>Veuillez choisir le type de clone.</p><p>Le <b>Clone complet</b> crée une copie exacte (disques virtuels inclus) de la machine virtuelle source. Le <b>Clone lié</b>, créé une nouvelle machine virtuelle mais les images des disques virtuels pointent vers les images disques de la machine source.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> @@ -1088,6 +1088,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Sélectionnez le dossier pour enregistrer %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -1224,7 +1231,7 @@ </message> <message> <source>Please choose a filename to export the OVF/OVA to. If you use an <i>ova</i> file name extension, then all the files will be combined into one Open Virtualization Format Archive. If you use an <i>ovf</i> extension, several files will be written separately. Other extensions are not allowed.</source> - <translation>Choisissez un nom de fichier pour l'exportation. Si vous utilisez l'extension de fichier <i>ova</i> les fichiers seront combinés en use seule archive Open Virtualization Format. Si vous utilisez l'extension <i>ovf</i> plusieurs fichiers séparés seront créés. D'autre extensions ne sont pas permis.</translation> + <translation>Choisissez un nom de fichier pour l'exportation. Si vous utilisez l'extension de fichier <i>ova</i> les fichiers seront combinés en une seule archive Open Virtualization Format. Si vous utilisez l'extension <i>ovf</i> plusieurs fichiers séparés seront créés. D'autres extensions ne sont pas permis.</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> @@ -4846,7 +4853,7 @@ </message> <message> <source><p>You are about to install a VirtualBox extension pack. Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%1</td></tr><tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%3</td></tr></table></p></source> - <translation><p>Vous êtes sur le point d'installer une extension VirtualBox. Les extensions complémentent la fonctionalité de VirtualBox et peuvent contenir des logiciels - eventuellement nuisibles - qui s'intègrent au système d'exploitation. Veuillez revoir la déscription ci-dessous et ne continuez que si vous avez obtenu l'extension d'une source fiable.</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Nom&nbsp;:&nbsp;&nbsp;</b></td><td>%1</td></tr><tr><td><b>Version&nbsp;:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Déscription&nbsp;:&nbsp;&nbsp;</b></td><td>%3</td></tr></table></p></translation> + <translation><p>Vous êtes sur le point d'installer une extension VirtualBox. Les extensions complémentent les fonctionalités de VirtualBox et peuvent contenir des logiciels - éventuellement nuisibles - qui s'intègrent au système d'exploitation. Veuillez revoir la description ci-dessous et ne continuez que si vous avez obtenu l'extension d'une source fiable.</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Nom&nbsp;:&nbsp;&nbsp;</b></td><td>%1</td></tr><tr><td><b>Version&nbsp;:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Description&nbsp;:&nbsp;&nbsp;</b></td><td>%3</td></tr></table></p></translation> </message> <message> <source>&Install</source> @@ -4854,11 +4861,11 @@ </message> <message> <source>Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</source> - <translation>Les extensions complémentent la fonctionalité de VirtualBox et peuvent contenir des logiciels - eventuellement nuisibles - qui s'intègrent au système d'exploitation. Veuillez revoir la déscription ci-dessous et ne continuez que si vous avez obtenu l'extension d'une source fiable.</translation> + <translation>Les extensions complémentent les fonctionalités de VirtualBox et peuvent contenir des logiciels - eventuellement nuisibles - qui s'intègrent au système d'exploitation. Veuillez revoir la description ci-dessous et ne continuez que si vous avez obtenu l'extension d'une source fiable.</translation> </message> <message> <source><p>An older version of the extension pack is already installed, would you like to upgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></source> - <translation><p>Une ancienne version de cette extension est déjà installée. Voulez-vous la mettre à jour ? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Nom&nbsp;:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Nouvelle version&nbsp;:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Version actuelle&nbsp;:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Déscription&nbsp;:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></translation> + <translation><p>Une ancienne version de cette extension est déjà installée. Voulez-vous la mettre à jour ? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Nom&nbsp;:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Nouvelle version&nbsp;:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Version actuelle&nbsp;:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Description&nbsp;:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></translation> </message> <message> <source>&Upgrade</source> @@ -4866,7 +4873,7 @@ </message> <message> <source><p>An newer version of the extension pack is already installed, would you like to downgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></source> - <translation><p>Une version plus récente de cette extension est déjà installée. Voulez-vous la remplacer ? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Nom&nbsp;:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Nouvelle version&nbsp;:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Version actuelle&nbsp;:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Déscription&nbsp;:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></translation> + <translation><p>Une version plus récente de cette extension est déjà installée. Voulez-vous la remplacer ? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Nom&nbsp;:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Nouvelle version&nbsp;:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Version actuelle&nbsp;:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Description&nbsp;:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></translation> </message> <message> <source>&Downgrade</source> @@ -4874,7 +4881,7 @@ </message> <message> <source><p>The extension pack is already installed with the same version, would you like reinstall it? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%4</td></tr></table></p></source> - <translation><p>La même version de cette extension est déjà installée. Voulez-vous la réinstaller ? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Nom&nbsp;:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Version&nbsp;:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Déscription&nbsp;:&nbsp;&nbsp;</b></td><td>%4</td></tr></table></p></translation> + <translation><p>La même version de cette extension est déjà installée. Voulez-vous la réinstaller ? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Nom&nbsp;:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Version&nbsp;:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Description&nbsp;:&nbsp;&nbsp;</b></td><td>%4</td></tr></table></p></translation> </message> <message> <source>&Reinstall</source> @@ -4972,6 +4979,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation><p>Échec de l'enregistrement du fichier téléchargé <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Vous possédez une ancienne version (%1) de <b><nobr>%2</nobr></b>.</p><p>Voulez-vous téléchager la dernière version depuis Internet ?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Téléchargement</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Êtes-vous certain de vouloir télécharger <b><nobr>%1</nobr></b> depuis <nobr><a href="%2">%2</a></nobr> (taille %3 octets) ?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p><b><nobr>%1</nobr></b> a été téléchargé avec succès depuis <nobr><a href="%2">%2</a></nobr> et sauvegardé dans <nobr><b>%3</b>.</nobr></p><p>Voulez-vous installer ce pack d'extension ?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>Installation</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p><b><nobr>%1</nobr></b> a été téléchargé avec succès depuis <nobr><a href="%2">%2</a></nobr> mais ne peut pas être sauvegardé dans <nobr><b>%3</b>.</nobr></p><p>Merci de choisir un autre emplacement pour ce fichier.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Échec lors du téléchargement de <b><nobr>%1</nobr></b> depuis <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5019,6 +5056,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>Annulez le téléchargement de <nobr><b>%1</b></nobr></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Téléchargement de <nobr><b>%1</b></nobr> depuis <nobr><b>%2</b>...</nobr></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5192,6 +5240,18 @@ <comment>summary</comment> <translation>Taille</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -5706,6 +5766,93 @@ And the size is not necessarily "in megabytes", the slider chooses the </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>jours</translation> + </message> + <message> + <source>2 days</source> + <translation>2 jours</translation> + </message> + <message> + <source>3 days</source> + <translation>3 jours</translation> + </message> + <message> + <source>4 days</source> + <translation>4 jours</translation> + </message> + <message> + <source>5 days</source> + <translation>5 jours</translation> + </message> + <message> + <source>6 days</source> + <translation>6 jours</translation> + </message> + <message> + <source>1 week</source> + <translation>7 jours</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 semaines</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 semaines</translation> + </message> + <message> + <source>1 month</source> + <translation>mois</translation> + </message> + <message> + <source>Never</source> + <translation>Jamais</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Rechercher</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Fermer</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Assistant de mise à jour de VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Chercher des mises à jour</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Annuler</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Récapitulatif</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Une nouvelle version de VirtualBox est disponible ! La version <b>%1</b> est disponible sur <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Vous pouvez télécharger cette version en cliquant sur le lien suivant : </p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Impossible de rechercher des mises à jour à cause de l'erreur réseau suivante :</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Vous utilisez déjà la version la plus récente de VirtualBox.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Cet assistant va se connecter au site Internet de VirtualBox et vérifier si une mise à jour est disponible.</p><p>Cliquez sur <b>Rechercher</b> pour vérifier maintenant ou bien sur <b>Annuler</b> si vous ne souhaitez pas effectuer la vérification.</p><p>Vous pouvez lancer cet assistant à tout moment en choisissant <b>Chercher des mises à jour</b> dans le menu <b>Aide</b></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -8140,93 +8287,6 @@ And the size is not necessarily "in megabytes", the slider chooses the </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>jours</translation> - </message> - <message> - <source>2 days</source> - <translation>2 jours</translation> - </message> - <message> - <source>3 days</source> - <translation>3 jours</translation> - </message> - <message> - <source>4 days</source> - <translation>4 jours</translation> - </message> - <message> - <source>5 days</source> - <translation>5 jours</translation> - </message> - <message> - <source>6 days</source> - <translation>6 jours</translation> - </message> - <message> - <source>1 week</source> - <translation>7 jours</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 semaines</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 semaines</translation> - </message> - <message> - <source>1 month</source> - <translation>mois</translation> - </message> - <message> - <source>Never</source> - <translation>Jamais</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Rechercher</translation> - </message> - <message> - <source>&Close</source> - <translation>&Fermer</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Assistant de mise à jour de VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Chercher des mises à jour</translation> - </message> - <message> - <source>Cancel</source> - <translation>Annuler</translation> - </message> - <message> - <source>Summary</source> - <translation>Récapitulatif</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Une nouvelle version de VirtualBox est disponible ! La version <b>%1</b> est disponible sur <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Vous pouvez télécharger cette version en cliquant sur le lien suivant : </p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Impossible de rechercher des mises à jour à cause de l'erreur réseau suivante :</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Vous utilisez déjà la version la plus récente de VirtualBox.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Cet assistant va se connecter au site Internet de VirtualBox et vérifier si une mise à jour est disponible.</p><p>Cliquez sur <b>Rechercher</b> pour vérifier maintenant ou bien sur <b>Annuler</b> si vous ne souhaitez pas effectuer la vérification.</p><p>Vous pouvez lancer cet assistant à tout moment en choisissant <b>Chercher des mises à jour</b> dans le menu <b>Aide</b></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts index 9e847fd1e..20b541ec6 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts @@ -1072,6 +1072,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -5364,6 +5371,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Produciuse un fallo ao gardar o ficheiro descargado como <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Descargar</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5411,6 +5448,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5674,6 +5722,18 @@ p, li { white-space: pre-wrap; } <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6276,6 +6336,93 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dÃa</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dÃas</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dÃas</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dÃas</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dÃas</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dÃas</translation> + </message> + <message> + <source>1 week</source> + <translation>1 semana</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 semanas</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 semanas</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mes</translation> + </message> + <message> + <source>Never</source> + <translation>Nunca</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">Compro&bar</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Cerrar</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Asistente de actualización de VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Comprobar actualizacións</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Cancelar</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Resumo</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Unha nova versión de VirtualBox foi publicada! A versión <b>%1</b> está dispoñÃbel en <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Pode descargar esta versión directamente desde esta ligazón:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Resultou imposÃbel obter información sobre a nova versión debido ao seguinte erro de rede:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Xa está instalada a última versión de VirtualBox. Repita a comprobación de versión máis tarde.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Este asistente conectarao ao sitio web de VirtualBox e comprobará se unha nova versión de VirtualBox está dispoñÃbel.</p><p>Emprega o botón <b>Comprobar</b>para comprobar agora unha nova versión ou o botón <b>Cancelar</b> se non quere realizar esta comprobación.</p><p>Pode executar este asistente en calquera momento escollendo <b>Comprobar actualizacións...</b> desde o menú <b>Axuda</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -9332,93 +9479,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dÃa</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dÃas</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dÃas</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dÃas</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dÃas</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dÃas</translation> - </message> - <message> - <source>1 week</source> - <translation>1 semana</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 semanas</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 semanas</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mes</translation> - </message> - <message> - <source>Never</source> - <translation>Nunca</translation> - </message> - <message> - <source>Chec&k</source> - <translation>Compro&bar</translation> - </message> - <message> - <source>&Close</source> - <translation>&Cerrar</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Asistente de actualización de VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Comprobar actualizacións</translation> - </message> - <message> - <source>Cancel</source> - <translation>Cancelar</translation> - </message> - <message> - <source>Summary</source> - <translation>Resumo</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Unha nova versión de VirtualBox foi publicada! A versión <b>%1</b> está dispoñÃbel en <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Pode descargar esta versión directamente desde esta ligazón:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Resultou imposÃbel obter información sobre a nova versión debido ao seguinte erro de rede:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Xa está instalada a última versión de VirtualBox. Repita a comprobación de versión máis tarde.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Este asistente conectarao ao sitio web de VirtualBox e comprobará se unha nova versión de VirtualBox está dispoñÃbel.</p><p>Emprega o botón <b>Comprobar</b>para comprobar agora unha nova versión ou o botón <b>Cancelar</b> se non quere realizar esta comprobación.</p><p>Pode executar este asistente en calquera momento escollendo <b>Comprobar actualizacións...</b> desde o menú <b>Axuda</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts index 36737c154..4732beae7 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts @@ -484,15 +484,15 @@ </message> <message> <source>Dock Icon</source> - <translation></translation> + <translation>Dock ikon</translation> </message> <message> <source>Show Monitor Preview</source> - <translation></translation> + <translation>Monitor-elÅ‘nézet megjelenÃtése</translation> </message> <message> <source>Show Application Icon</source> - <translation></translation> + <translation>Ikon megjelenÃtése</translation> </message> <message> <source>Enter &Fullscreen Mode</source> @@ -1244,6 +1244,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Válaszd ki a(z) %1 mentési mappáját</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2694,7 +2701,7 @@ p, li { white-space: pre-wrap; } <message> <source><br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr></source> <comment>Network adapters tooltip</comment> - <translation></translation> + <translation><br><nobr><b>Adapter %1 (%2)</b>: %3 kábel %4</nobr></translation> </message> <message> <source>connected</source> @@ -2737,10 +2744,6 @@ p, li { white-space: pre-wrap; } <translation><br><nobr><b>Nincs megosztott mappa</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Jelzi, hogy a Távoli képernyÅ‘ (VRDP szerver) engedélyezett (<img src=:/vrdp_16px.png/>) vagy sem (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>A VRDP szerver az alábbi porton figyel: %1</translation> </message> @@ -2795,11 +2798,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Preview Monitor %1</source> - <translation></translation> + <translation>Monitor-elÅ‘nézet: %1</translation> </message> <message> <source>Snapshot %1</source> - <translation>Pillanatkép %1</translation> + <translation>Pillanatkép: %1</translation> </message> <message> <source>More CD/DVD Images...</source> @@ -2823,7 +2826,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>No CD/DVD devices attached to that VM</source> - <translation></translation> + <translation>A Virtuális géphez nincs CD/DVD csatlakoztatva</translation> </message> <message> <source>No Floppy Devices Attached</source> @@ -2831,11 +2834,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>No floppy devices attached to that VM</source> - <translation></translation> + <translation>A Virtuális géphez nincs floppy csatlakoztatva</translation> </message> <message> <source>No USB Devices Connected</source> - <translation></translation> + <translation>Nincs USB eszköz csatlakoztatva</translation> </message> <message> <source>No supported devices connected to the host PC</source> @@ -4166,7 +4169,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation>Ha engedélyezed,a virtuális lemez nem lesz eltávolÃtva, mikor a vendég rendszer kiadja azt.</translation> + <translation>Ha engedélyezed, a virtuális lemez nem lesz eltávolÃtva, mikor a vendég rendszer kiadja azt.</translation> </message> <message> <source>&Live CD/DVD</source> @@ -4520,7 +4523,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>[filter]</source> - <translation></translation> + <translation>[szűrÅ‘]</translation> </message> <message> <source><nobr>Vendor ID: %1</nobr></source> @@ -5981,6 +5984,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation><p>Nem sikerült elmenteni a letöltött fájlt: <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Régi verziós (%1) <b><nobr>%2</nobr></b> van telepÃtve.</p><p>Le szeretnéd tölteni az internetrÅ‘l a legfrissebbet?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Letöltés</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Biztos le akarod tölteni: <b><nobr>%1</nobr></b> ? Letöltési hely: <nobr><a href="%2">%2</a></nobr> (%3 bájt).</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p><b><nobr>%1</nobr></b> sikeresen letöltve <nobr>(<a href="%2">%2</a>)</nobr> és elmentve: <nobr><b>%3</b>.</nobr></p><p>Szeretnéd telepÃteni a kiterjesztÅ‘ csomagot?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>TelepÃtés</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p><b><nobr>%1</nobr></b> sikeresen letöltve <nobr>(<a href="%2">%2</a>)</nobr>, de nem lehetett elmenteni: <nobr><b>%3</b>.</nobr></p><p>Kérlek válassz másik helyet a fájl számára.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p><b><nobr>%1</nobr></b> letöltése sikertelen a következÅ‘ helyrÅ‘l: <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -6028,6 +6061,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation><nobr><b>%1</b></nobr> letöltésének megszakÃtása</translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation><nobr><b>%1</b></nobr> letöltése <nobr><b>%2</b> helyrÅ‘l...</nobr></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6406,6 +6450,18 @@ a rámásolt adatok függvényében növekszik az általa elfoglalt hely - mÃg <comment>summary</comment> <translation>Részletek</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (Parallels merevlemez)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (QEMU enhanced disk)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (QEMU Copy-On-Write)</translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -7151,6 +7207,109 @@ esetleg a <b>LétezÅ‘</b> gombbal a Virtuális lemezkezelÅ‘bÅ‘l.< </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>Naponta</translation> + </message> + <message> + <source>2 days</source> + <translation>2 naponta</translation> + </message> + <message> + <source>3 days</source> + <translation>3 naponta</translation> + </message> + <message> + <source>4 days</source> + <translation>4 naponta</translation> + </message> + <message> + <source>5 days</source> + <translation>5 naponta</translation> + </message> + <message> + <source>6 days</source> + <translation>6 naponta</translation> + </message> + <message> + <source>1 week</source> + <translation>Hetente</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 hetente</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 hetente</translation> + </message> + <message> + <source>1 month</source> + <translation>Havonta</translation> + </message> + <message> + <source>Never</source> + <translation>Sosem</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">A kapcsolat idÅ‘túllépés miatt megszakadt.</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">Nem találom a legújabb verziók adatainak a fájlját a szerveren (a szerver válasza: %1).</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&EllenÅ‘rzés</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">Be&zárás</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox frissÃtési varázsló</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">FrissÃtések ellenÅ‘rzése</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Ez a varázsló ellenÅ‘rzi a VirtualBox weboldalán, hogy elérhetÅ‘-e újabb verzió a jelenleginél.</p> +<p>Nyomd meg az <b>EllenÅ‘rzés</b> gombot a frissÃtések kereséséhez. A <b>Mégsem</b> gombbal kiléphetsz a varázslóból az ellenÅ‘rzés lefutása nélkül.</p> +<p>Ezt a varázslót bármikor elindÃthatod a <b>Súgó</b menü <b>FrissÃtések ellenÅ‘rzése...</b> menüpontjával.</p></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Mégsem</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Összegzés</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>ElérhetÅ‘ a VirtualBox egy újabb verziója! A(z) <b>%1</b> -s verzió elérhetÅ‘ a <a href="http://www.virtualbox.org/">virtualbox.org</a> weboldalon.</p><p>Közvetlenül pedig errÅ‘l a linkrÅ‘l töltheted le:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Nem lehet letölteni az új verziók információit a következÅ‘ hálózati probléma miatt:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Nincs a jelenleginél újabb VirtualBox verzió. KésÅ‘bb azonban érdemes lenne újra megnézni.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Ez a varázsló ellenÅ‘rizni fogja a VirtualBox weboldalán, hogy elérhetÅ‘-e újabb verzió a VirtualBox-ból.</p><p>Az <b>EllenÅ‘rzés</b> gombbal tudod elindÃtani a folyamatot és a <b>Mégsem</b> gombbal jelezheted, ha nem akarsz ellenÅ‘rizni.</p><p>Bármikor elindÃthatod a varázslót a <b>Súgó</b> menü <b>FrissÃtések ellenÅ‘rzése...</b> pontjával.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7730,16 +7889,8 @@ Verzió %1</translation> <translation type="obsolete">Sú&gó</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Jelzi, hogy a vendég képernyÅ‘jének átméretezése engedélyezett (<img src=auto_resize_on_16px.png/>) vagy sem (<img src=auto_resize_off_16px.png/>). Ez a funkció a Integrációs szolgáltatások telepÃtését igényli a vendég gépen.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Jelzi, hogy az egér a vendég gép fogságában van:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;egér nincs elfogva</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;egér elfogva</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;egér-integráció be</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;egér integtáció ki, egér elfogva</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;egér-integráció ki, egér nincs elfogva</nobr><br>Az egér-integráció csak akkor működik, ha a vendég rendszerre fel vannak telepÃtve az Integrációs szolgáltatások.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">Jelzi,hogy a billentyűzet a vendég fogságában van (<img src=hostkey_captured_16px.png/>) avagy nem (<img src=hostkey_16px.png/>)</translation> + <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Jelzi, hogy az egér a vendég gép fogságában van:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;egér nincs elfogva</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;egér elfogva</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;egér-integráció be</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;egér integtáció ki, egér elfogva</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;egér-integráció ki, egér nincs elfogva</nobr><br>Az egér-integráció csak akkor működik, ha a vendég rendszerre fel vannak telepÃtve az Integrációs szolgáltatások.</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -7791,8 +7942,8 @@ Verzió %1</translation> <translation type="obsolete"><qt>Jelzi&nbsp;a&nbsp;hálózat&nbsp;aktivÃtását<br>[<b>%1</b>]</qt></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">Jelzi, hogy a Távoli képernyÅ‘ (VRDP) szerver engedélyezett (<img src=vrdp_16px.png/>) vagy sem (<img src=vrdp_disabled_16px.png/>)</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>)</source> + <translation type="obsolete">Jelzi, hogy a Távoli képernyÅ‘ (VRDP) szerver engedélyezett (<img src=:/vrdp_16px.png/>) vagy sem (<img src=:/vrdp_disabled_16px.png/>)</translation> </message> <message> <source><hr>The VRDP Server is listening on port %1</source> @@ -7882,10 +8033,6 @@ Verzió %1</translation> <translation type="obsolete">Ãtkapcsolás asztal-integrációs módra</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Jelzi, hogy a billentyűzetet elkapta-e a vendég OS (<img src=hostkey_captured_16px.png/>) vagy nem (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Jelzi a floppy meghajtón az aktivitást:</nobr>%1</qt></translation> @@ -7976,8 +8123,8 @@ Verzió %1</translation> <translation type="obsolete"><br><nobr><b>Az USB vezérlÅ‘ le van tiltva</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Jelzi, hogy a Távoli képernyÅ‘ (VRDP szerver) engedélyezett (<img src=vrdp_16px.png/>) vagy sem (<img src=vrdp_disabled_16px.png/>).</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> + <translation type="obsolete">Jelzi, hogy a Távoli képernyÅ‘ (VRDP szerver) engedélyezett (<img src=:/vrdp_16px.png/>) vagy sem (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> @@ -8028,22 +8175,10 @@ Verzió %1</translation> <translation type="obsolete">Paran&cssor...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Jelzi, hogy a vendég képernyÅ‘jének átméretezése engedélyezett (<img src=:/auto_resize_on_16px.png/>) vagy sem (<img src=:/auto_resize_off_16px.png/>). Ez a funkció az Integrációs szolgáltatások telepÃtését igényli a vendég gépen.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Jelzi, hogy az egér a vendég gép fogságában van:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;egér nincs elfogva</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;egér elfogva</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;egér-integráció be</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;egér-integráció ki, egér elfogva</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;egér-integráció ki, egér nincs elfogva</nobr><br>Az egér-integráció csak akkor működik, ha a vendég rendszerre fel vannak telepÃtve az Integrációs szolgáltatások.</translation> - </message> - <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> <translation type="obsolete">Jelzi, hogy a billentyűzetet elkapta-e a vendég OS (<img src=:/hostkey_captured_16px.png/>) vagy nem (<img src=:/hostkey_16px.png/>).</translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Jelzi, hogy a Távoli képernyÅ‘ (VRDP szerver) engedélyezett (<img src=:/vrdp_16px.png/>) vagy sem (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source>&Logging...</source> <comment>debug action</comment> <translation type="obsolete">Nap&lózás...</translation> @@ -8485,7 +8620,7 @@ Verzió %1</translation> <name>VBoxFilePathSelectorWidget</name> <message> <source><reset to default></source> - <translation></translation> + <translation><alapértelmezettre állÃtás></translation> </message> <message> <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source> @@ -10463,7 +10598,7 @@ to the system default language.</qt> </message> <message> <source>VirtualBox License</source> - <translation></translation> + <translation>VirtualBox licence</translation> </message> </context> <context> @@ -11169,7 +11304,7 @@ to the system default language.</qt> </message> <message> <source>S&how</source> - <translation>M&utat</translation> + <translation type="unfinished">Ã&tváltás</translation> </message> <message> <source>Show</source> @@ -11192,10 +11327,6 @@ to the system default language.</qt> <translation>A kiválasztott virtuális gép elindÃtása</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>A VirtualBox üdvözöl!</h3><p>Az ablak bal oldali részében a virtuális gépeid listáját látod. Ez jelenleg üres, hiszen most indÃtod ezt a programot elÅ‘ször.<img src=welcome.png align=right/></p><p>Új virtuális gép létrehozásához kattints az <b>Új</b> gombra az eszköztáron.</p><p>Az <b>%1</b> billentyű megnyomásával azonnali segÃtséget kérhetsz, vagy látogass el a <a href=http://www.virtualbox.org>www.virtualbox.org</a> cÃmre a legfrissebb információkért és hÃrekért.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Gép</translation> </message> @@ -11241,7 +11372,7 @@ to the system default language.</qt> </message> <message> <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation><h3>Ãœdvözöl a VirtualBox!</h3><p>Az ablak bal oldali részében a virtuális gépeid listáját látod. Ez jelenleg üres, hiszen most indÃtod ezt a programot elÅ‘ször.<img src=welcome.png align=right/></p><p>Új virtuális gép létrehozásához kattints az <b>Új</b> gombra az eszköztáron.</p><p>Az <b>%1</b> billentyű megnyomásával azonnali segÃtséget kérhetsz, vagy látogass el a <a href=http://www.virtualbox.org>www.virtualbox.org</a> cÃmre a legfrissebb információkért és hÃrekért.</p></translation> + <translation><h3>Ãœdvözöl a VirtualBox!</h3><p>Az ablak bal oldali részében a virtuális gépeid listáját látod. Ez jelenleg üres, hiszen most indÃtod ezt a programot elÅ‘ször.<img src=:/welcome.png align=right/></p><p>Új virtuális gép létrehozásához kattints az <b>Új</b> gombra az eszköztáron.</p><p>Az <b>%1</b> billentyű megnyomásával azonnali segÃtséget kérhetsz, vagy látogass el a <a href=http://www.virtualbox.org>www.virtualbox.org</a> cÃmre a legfrissebb információkért és hÃrekért.</p></translation> </message> <message> <source>&Virtual Media Manager...</source> @@ -11967,109 +12098,6 @@ value.</qt></source> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>Naponta</translation> - </message> - <message> - <source>2 days</source> - <translation>2 naponta</translation> - </message> - <message> - <source>3 days</source> - <translation>3 naponta</translation> - </message> - <message> - <source>4 days</source> - <translation>4 naponta</translation> - </message> - <message> - <source>5 days</source> - <translation>5 naponta</translation> - </message> - <message> - <source>6 days</source> - <translation>6 naponta</translation> - </message> - <message> - <source>1 week</source> - <translation>Hetente</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 hetente</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 hetente</translation> - </message> - <message> - <source>1 month</source> - <translation>Havonta</translation> - </message> - <message> - <source>Never</source> - <translation>Sosem</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">A kapcsolat idÅ‘túllépés miatt megszakadt.</translation> - </message> - <message> - <source>Could not locate the latest version list on the server (response: %1).</source> - <translation type="obsolete">Nem találom a legújabb verziók adatainak a fájlját a szerveren (a szerver válasza: %1).</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&EllenÅ‘rzés</translation> - </message> - <message> - <source>&Close</source> - <translation>Be&zárás</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox frissÃtési varázsló</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>FrissÃtések ellenÅ‘rzése</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>Ez a varázsló ellenÅ‘rzi a VirtualBox weboldalán, hogy elérhetÅ‘-e újabb verzió a jelenleginél.</p> -<p>Nyomd meg az <b>EllenÅ‘rzés</b> gombot a frissÃtések kereséséhez. A <b>Mégsem</b> gombbal kiléphetsz a varázslóból az ellenÅ‘rzés lefutása nélkül.</p> -<p>Ezt a varázslót bármikor elindÃthatod a <b>Súgó</b menü <b>FrissÃtések ellenÅ‘rzése...</b> menüpontjával.</p></translation> - </message> - <message> - <source>Cancel</source> - <translation>Mégsem</translation> - </message> - <message> - <source>Summary</source> - <translation>Összegzés</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>ElérhetÅ‘ a VirtualBox egy újabb verziója! A(z) <b>%1</b> -s verzió elérhetÅ‘ a <a href="http://www.virtualbox.org/">virtualbox.org</a> weboldalon.</p><p>Közvetlenül pedig errÅ‘l a linkrÅ‘l töltheted le:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Nem lehet letölteni az új verziók információit a következÅ‘ hálózati probléma miatt:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Nincs a jelenleginél újabb VirtualBox verzió. KésÅ‘bb azonban érdemes lenne újra megnézni.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Ez a varázsló ellenÅ‘rizni fogja a VirtualBox weboldalán, hogy elérhetÅ‘-e újabb verzió a VirtualBox-ból.</p><p>Az <b>EllenÅ‘rzés</b> gombbal tudod elindÃtani a folyamatot és a <b>Mégsem</b> gombbal jelezheted, ha nem akarsz ellenÅ‘rizni.</p><p>Bármikor elindÃthatod a varázslót a <b>Súgó</b> menü <b>FrissÃtések ellenÅ‘rzése...</b> pontjával.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts index aabddb901..6e7d3d628 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts @@ -1133,6 +1133,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4219,18 +4226,6 @@ <translation>Gagal menghapus sebuah folder yang dishare <b>%1</b> (menunjuk pada <nobr><b>%2</b></nobr>) bagi mesin virtual <b>%3</b>.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Anda telah <b>meng-klik mouse</b> dalam tampilan Mesin Virtual Machine atau menekan <b> tombol host </b>. Hal ini akan menyebabkan Mesin Virtual Machine untuk <b>menangkap</b> pointer mouse host (hanya bila integrasi pointer mouse tidak sedang didukung oleh Sistem Operasi guest saat ini) dan keyboard, yang akan membuat mereka tidak tersedia pada aplikasi lain yang berjalan pada mesin host.</p><p>Anda dapat menekan <b>tombol host</b> kapanpun untuk <b>membebaskan</b> keyboard dan mouse (bila tertangkap) dan mengembalikan mereka pada operasi normal. Tombol host yang ditugaskan saat ini ditunjukkan pada status bar di bawah window Mesin Virtual, disebelah ikon&nbsp;<img src=hostkey_16px.png/>&nbsp;. Ikon ini, bersama dengan ikon mouse yang ditempatkan didekatnya, menunjukkan keadaan tangkapan keyboard dan mouse saat ini.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Anda telah menyalakan tombol pilihan <b>Auto capture keyboard</b>. Hal ini akan menyebabkan mesin virtual untuk secara otomatis <b>meng-capture</b> keyboard setiap kali jendela Mesin Virtual diaktifkan dan membuatnya tidak tersedia bagi aplikasi lain yang berjalan pada mesin host anda: Saat keyboard di-capture, semua tombol yang ditekan (termasuk sistem seperti Alt+Tab) akan ditujukan pada Mesin Virtual.</p><p>Anda dapat menekan <b>tombol host</b> kapan saja untuk <b>membebaskan</b> keyboard dan mouse (bila mereka tertangkap) dan mengembalikan mereka pada operasi normal. Tombol host yang sedang ditugaskan saat ini ditunjukkan pada status bar di bawah jendela Mesin Virtual, disebelah ikon&nbsp;<img src=hostkey_16px.png/>&nbsp;. Ikon ini, bersama dengan ikon mouse yang terletak didekatnya, menunjukkan keadaan capture keyboard dan mouse saat ini.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>Mesin Virtual melaporkan bahwa OS guest mendukung <b>integrasi pointer mouse</b>. Hal ini menunjukkan bahwa anda tidak perlu <i>meng-capture</i> pointer mouse untuk dapat menggunakannya pada OS guest -- semua tindakan mouse yang anda lakukan saat pointer mouse berada pada tampilan Mesin Virtual akan langsung dikirim pada OS guest. Bila mouse sedang ter-capture, ia akan secara otomatis terbebas.</p><p>Ikon mouse pada status bar akan terlihat seperti&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;untuk menunjukkan anda bahwa integrasi pointer mouse didukung oleh OS guest dan saat ini sedang menyala.</p><p><b>Catatan</b>: Beberapa aplikasi mungkin berperilaku tidak semestinya pada mode integrasi pointer mouse. Anda dapat selalu mematikannya pada sesi tersebut (dan menyalakannya lagi) dengan memilih tindakan yang sesuai dari menu bar.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>Mesin Virtual melaporkan bahwa OS guest tidak mendukung <b>integrasi pointer mouse</b> dalam mode video saat ini. Anda perlu meng-capture mouse (dengan meng-klik di atas tampilan Mesin Virtual atau menekan tombol host) dengan tujuan untuk menggunakan mouse didalam OS guest.</p></translation> </message> @@ -4580,15 +4575,15 @@ </message> <message> <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><p>Anda telah <b>meng-klik mouse</b> dalam tampilan Mesin Virtual Machine atau menekan <b> tombol host </b>. Hal ini akan menyebabkan Mesin Virtual Machine untuk <b>menangkap</b> pointer mouse host (hanya bila integrasi pointer mouse tidak sedang didukung oleh Sistem Operasi guest saat ini) dan keyboard, yang akan membuat mereka tidak tersedia pada aplikasi lain yang berjalan pada mesin host.</p><p>Anda dapat menekan <b>tombol host</b> kapanpun untuk <b>membebaskan</b> keyboard dan mouse (bila tertangkap) dan mengembalikan mereka pada operasi normal. Tombol host yang ditugaskan saat ini ditunjukkan pada status bar di bawah window Mesin Virtual, disebelah ikon&nbsp;<img src=:/hostkey_16px.png/>&nbsp;. Ikon ini, bersama dengan ikon mouse yang ditempatkan didekatnya, menunjukkan keadaan tangkapan keyboard dan mouse saat ini.</p></translation> </message> <message> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><p>Anda telah menyalakan tombol pilihan <b>Auto capture keyboard</b>. Hal ini akan menyebabkan mesin virtual untuk secara otomatis <b>meng-capture</b> keyboard setiap kali jendela Mesin Virtual diaktifkan dan membuatnya tidak tersedia bagi aplikasi lain yang berjalan pada mesin host anda: Saat keyboard di-capture, semua tombol yang ditekan (termasuk sistem seperti Alt+Tab) akan ditujukan pada Mesin Virtual.</p><p>Anda dapat menekan <b>tombol host</b> kapan saja untuk <b>membebaskan</b> keyboard dan mouse (bila mereka tertangkap) dan mengembalikan mereka pada operasi normal. Tombol host yang sedang ditugaskan saat ini ditunjukkan pada status bar di bawah jendela Mesin Virtual, disebelah ikon&nbsp;<img src=:/hostkey_16px.png/>&nbsp;. Ikon ini, bersama dengan ikon mouse yang terletak didekatnya, menunjukkan keadaan capture keyboard dan mouse saat ini.</p></translation> </message> <message> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><p>Mesin Virtual melaporkan bahwa OS guest mendukung <b>integrasi pointer mouse</b>. Hal ini menunjukkan bahwa anda tidak perlu <i>meng-capture</i> pointer mouse untuk dapat menggunakannya pada OS guest -- semua tindakan mouse yang anda lakukan saat pointer mouse berada pada tampilan Mesin Virtual akan langsung dikirim pada OS guest. Bila mouse sedang ter-capture, ia akan secara otomatis terbebas.</p><p>Ikon mouse pada status bar akan terlihat seperti&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;untuk menunjukkan anda bahwa integrasi pointer mouse didukung oleh OS guest dan saat ini sedang menyala.</p><p><b>Catatan</b>: Beberapa aplikasi mungkin berperilaku tidak semestinya pada mode integrasi pointer mouse. Anda dapat selalu mematikannya pada sesi tersebut (dan menyalakannya lagi) dengan memilih tindakan yang sesuai dari menu bar.</p></translation> </message> <message> <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source> @@ -5279,6 +5274,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Gagal menyimpan file terdownload sebagai <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Download</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5326,6 +5351,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5617,6 +5653,18 @@ bergantung pada ukuran image dan performa tulis harddisk anda.</p></transl <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6222,6 +6270,69 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>4 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>5 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>6 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 week</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 month</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Never</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">Koneksi timed out.</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Tutup</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Batal</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Risalah</translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -6754,12 +6865,12 @@ Versi %1</translation> <translation type="obsolete">&Bantuan</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Mengindikasikan apakah fungsi auto-resize pada display guest Menyala (<img src=auto_resize_on_16px.png/>) atau Mati (<img src=auto_resize_off_16px.png/>). Perhatikan bahwa fungsi ini membutuhkan Guest Additions terinstall pada Sistem Operasi guest.</translation> + <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Mengindikasikan apakah fungsi auto-resize pada display guest Menyala (<img src=:/auto_resize_on_16px.png/>) atau Mati (<img src=:/auto_resize_off_16px.png/>). Perhatikan bahwa fungsi ini membutuhkan Guest Additions terinstall pada Sistem Operasi guest.</translation> </message> <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Mengindikasikan apakah mouse pointer host tertangkap oleh sistem operasi guest:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer tidak tertangkap</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer tertangkap</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integrasi mouse (MI) Menyala</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI Mati, pointer tertangkap</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI Mati, pointer tidak tertangkap</nobr><br>Perhatikan bahwa fitur integrasi mouse membutuhkan Guest Additions terinstall pada Sistem Operasi guest.</translation> + <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Mengindikasikan apakah mouse pointer host tertangkap oleh sistem operasi guest:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer tidak tertangkap</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer tertangkap</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integrasi mouse (MI) Menyala</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI Mati, pointer tertangkap</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI Mati, pointer tidak tertangkap</nobr><br>Perhatikan bahwa fitur integrasi mouse membutuhkan Guest Additions terinstall pada Sistem Operasi guest.</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -6849,8 +6960,8 @@ Versi %1</translation> <translation type="obsolete">Beralih pada mode integrasi desktop seamless</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Mengindikasikan apakah keyboard tertangkap oleh Sistem Operasi guest (<img src=hostkey_captured_16px.png/>) atau tidak (<img src=hostkey_16px.png/>).</translation> + <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> + <translation type="obsolete">Mengindikasikan apakah keyboard tertangkap oleh Sistem Operasi guest (<img src=:/hostkey_captured_16px.png/>) atau tidak (<img src=:/hostkey_16px.png/>).</translation> </message> <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> @@ -6943,8 +7054,8 @@ Versi %1</translation> <translation type="obsolete"><br><nobr><b>Kontroler USB dimatikan</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Mengindikasikan apakah Remote Display (VRDP Server) dinyalakan (<img src=vrdp_16px.png/>) atau tidak (<img src=vrdp_disabled_16px.png/>).</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> + <translation type="obsolete">Mengindikasikan apakah Remote Display (VRDP Server) dinyalakan (<img src=:/vrdp_16px.png/>) atau tidak (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> @@ -9997,10 +10108,6 @@ ke nilai awal bahasa sistem.</qt> <translation>Mulai (nyalakan) mesin virtual terpilih</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Selamat datang di VirtualBox!</h3><p>Bagian kiri dari jendela ini ditujukan untuk menampilkan daftar dari semua mesin virtual dalam komputer anda. Daftar ini saat ini kosong karena anda belum menciptakan mesin virtual apapun.<img src=welcome.png align=right/></p><p>Untuk menciptakan mesin virtual baru, tekan tombol <b>Baru</b> pada toolbar utama yang terletak di bagian atas jendela.</p><p>Anda dapat menekan tombol <b>%1</b> untuk memperoleh bantuan langsung, atau kunjungi <a href=http://www.virtualbox.org>www.virtualbox.org</a> untuk informasi dan berita terbaru.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Mesin</translation> </message> @@ -10058,7 +10165,7 @@ ke nilai awal bahasa sistem.</qt> </message> <message> <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><h3>Selamat datang di VirtualBox!</h3><p>Bagian kiri dari jendela ini ditujukan untuk menampilkan daftar dari semua mesin virtual dalam komputer anda. Daftar ini saat ini kosong karena anda belum menciptakan mesin virtual apapun.<img src=:/welcome.png align=right/></p><p>Untuk menciptakan mesin virtual baru, tekan tombol <b>Baru</b> pada toolbar utama yang terletak di bagian atas jendela.</p><p>Anda dapat menekan tombol <b>%1</b> untuk memperoleh bantuan langsung, atau kunjungi <a href=http://www.virtualbox.org>www.virtualbox.org</a> untuk informasi dan berita terbaru.</p></translation> </message> <message> <source>&Virtual Media Manager...</source> @@ -10773,97 +10880,6 @@ dengan nilai apapun.</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>4 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>5 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>6 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 week</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 month</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Never</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">Koneksi timed out.</translation> - </message> - <message> - <source>Chec&k</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Close</source> - <translation type="unfinished">&Tutup</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Check for Updates</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Cancel</source> - <translation type="unfinished">Batal</translation> - </message> - <message> - <source>Summary</source> - <translation type="unfinished">Risalah</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts index 63ea9acf7..32ff7a51b 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts @@ -1244,6 +1244,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Seleziona la cartella dove salvare %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2731,10 +2738,6 @@ p, li { white-space: pre-wrap; } <translation><b><nobr><b>Nessuna cartella condivisa</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica se lo schermo remoto (Server VRDP) è abilitato (<img src=:/vrdp_16px.png/>) o meno (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>Il server VRDP è in ascolto sulla porta %1</translation> </message> @@ -5036,18 +5039,6 @@ p, li { white-space: pre-wrap; } <translation>Rimozione di una cartella condivisa <b>%1</b> (che punta a <nobr><b>%2</b></nobr>) dalla Macchina Virtuale <b>%3</b> non riuscita.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Hai <b>fatto clic con il mouse</b> nello schermo della Macchina Virtuale o premuto la <b>host key</b>. Questo causerà l'<b>acquisizione</b> del puntatore del mouse da parte della Macchina Virtuale (solo se l'Integrazione Mouse non è supportata dal sistema Guest o è disabilitata) e della tastiera, e li renderà non disponibili ad altre applicazioni sul sistema Host.</p><p>Puoi premere la <b>host key</b> in un qualsiasi momento per <b>rilasciare</b> la tastiera e il mouse (se acquisito) e ritornare alla modalità normale. La host key attuale è mostrata nella barra di stato in fondo alla finestra della Macchina Virtuale, vicino all'icona &nbsp;<img src=hostkey_16px.png/>. Questa icona, assieme all'icona del mouse vicina, indica lo stato di acquisizione attuale di mouse e tastiera.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Hai l'opzione <b>Acquisizione automatica della tastiera</b> attivata. Questo causerà l'<b>acquisizione</b> automatica della tastiera da parte della Macchina Virtuale ogni volta che la finestra della MV viene attivata e la renderà non disponibile ad altre applicazioni sul sistema Host: quando la tastiera viene acquisita, tutte le pressioni di tasti (incluse quelle di sistema come Alt-Tab) saranno dirette alla MV.</p><p>Puoi premere la <b>host key</b> in un qualsiasi momento per <b>rilasciare</b> la tastiera e il mouse (se acquisito) e ritornare alla modalità normale. La host key attuale è mostrata nella barra di stato in fondo alla finestra della Macchina Virtuale, vicino all'icona &nbsp;<img src=hostkey_16px.png/>. Questa icona, assieme all'icona del mouse vicina, indica lo stato di acquisizione attuale di mouse e tastiera.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>La Macchina Virtuale ha rilevato che il sistema Guest supporta l'<b>Integrazione Mouse</b>. Ciò significa che non hai bisogno di <i>acquisire</i> il puntatore del mouse per utilizzarlo nel sistema Guest -- tutte le azioni del mouse che esegui mentre il puntatore è nella finestra della Macchina Virtuale sono inviate direttamente al sistema Guest. Se il mouse è attualmente acquisito, sarà automaticamente rilasciato.</p><p>L'icona del mouse nella barra di stato diverrà simile a&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;per informarti che l'Integrazione Mouse è supportata dal sistema Guest ed è correntemente attiva.</p><p><b>Nota</b>: Alcune applicazioni possono comportarsi non correttamente nella modalità Integrazione Mouse. Puoi sempre disabilitare la modalità per la sessione corrente (e abilitarla nuovamente) selezionando l'azione corrispondente dalla barra del menu.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>La macchina virtuale ha rilevato che il sistema guest non supporta l'<b>integrazione mouse</b> nella modalità video attuale. Devi acquisire il mouse (facendo clic all'interno dello schermo della MV o premendo il tasto host) per utilizzare il mouse all'interno del sistema guest.</p></translation> </message> @@ -6222,6 +6213,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation><p>Impossibile salvare il file scaricato come <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>La versione installata (%1) del <b><nobr>%2</nobr></b> è obsoleta.</p><p>Vuoi scaricare l'ultima da Internet?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Scarica</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Sei sicuro di voler scaricare il <b><nobr>%1</nobr></b> da <nobr><a href="%2">%2</a></nobr> (dimensione %3 byte)?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p>Il <b><nobr>%1</nobr></b> è stato scaricato correttamente da <nobr><a href="%2">%2</a></nobr> e salvato localmente come <nobr><b>%3</b>.</nobr></p><p>Vuoi installare il pacchetto di estensione?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>Installa</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p>Il <b><nobr>%1</nobr></b> è stato scaricato correttamente da <nobr><a href="%2">%2</a></nobr>, ma non può essere salvato localmente come <nobr><b>%3</b>.</nobr></p><p>Scegli un'altra posizione per il file.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Scaricamento del <b><nobr>%1</nobr></b> non riuscita da <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -6269,6 +6290,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>Annulla lo scaricamento di <nobr><b>%1</b></nobr></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Scaricamento di <nobr><b>%1</b></nobr> da <nobr><b>%2</b> in corso...</nobr></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6636,6 +6668,18 @@ alla velocità di scrittura del tuo disco rigido.</p></translation> <comment>summary</comment> <translation>Dettagli</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (Disco fisso di Parallels)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (disco migliorato di QEMU)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (Copy-On-Write di QEMU)</translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -7422,6 +7466,97 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.< </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 giorno</translation> + </message> + <message> + <source>2 days</source> + <translation>2 giorni</translation> + </message> + <message> + <source>3 days</source> + <translation>3 giorni</translation> + </message> + <message> + <source>4 days</source> + <translation>4 giorni</translation> + </message> + <message> + <source>5 days</source> + <translation>5 giorni</translation> + </message> + <message> + <source>6 days</source> + <translation>6 giorni</translation> + </message> + <message> + <source>1 week</source> + <translation>1 settimana</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 settimane</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 settimane</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mese</translation> + </message> + <message> + <source>Never</source> + <translation>Mai</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">Timeout della connessione.</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Controlla</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Chiudi</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Procedura di aggiornamento di VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Controlla aggiornamenti</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Annulla</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Riepilogo</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Una nuova versione di VirtualBox è stata rilasciata! La versione <b>%1</b> è disponibile presso <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puoi scaricare questa versione da questo collegamento diretto:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Impossibile ottenere informazioni sulla nuova versione a causa del seguente errore:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Hai già installato l'ultima versione di VirtualBox. Ripeti il controllo tra qualche tempo.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Questa procedura guidata si collegherà al sito web di VirtualBox e controllerà la disponibilità di una versione di VirtualBox.</p><p>Utilizza il pulsante <b>Controlla</b> per verificare subito la presenza di una nuova versione o il pulsante <b>Annulla</b> se non vuoi eseguire il controllo.</p><p>Puoi eseguire questa procedura guidata in qualunque momento scegliendo <b>Controllo aggiornamenti...</b> dal menu <b>Aiuto</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -8013,18 +8148,6 @@ Versione %1</translation> <translation type="obsolete">&Aiuto</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se la funzione di ridimensionamento automatico dello schermo Guest è attiva (<img src=auto_resize_on_16px.png/>) o disattiva (<img src=auto_resize_off_16px.png/>). Nota che questa funzione richiede che le Guest Additions siano installate sul sistema Guest.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se il puntatore del mouse è acquisito dal sistema Guest:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;il puntatore non è acquisito</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;il puntatore è acquisito</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;l'Integrazione Mouse (MI) è abilitata</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI è disabilitata, il puntatore è acquisito</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI è disabilitata, il puntatore non è acquisito</nobr><br>Nota che la funzionalità di Integrazione Mouse richiede che le Guest Additions siano installate sul sistema Guest.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">Indica se la tastiera è acquisita dal sistema Guest (<img src=hostkey_captured_16px.png/>) o meno (<img src=hostkey_16px.png/>)</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">Mostra la combinazione di tasti Host attuale.<br>Tale combinazione, se premuta da sola, commuta lo stato di acquisizione di mouse e tastiera. Può anche essere usata in combinazione con altri tasti come scorciatoia per le azioni del menu principale.</translation> </message> @@ -8070,10 +8193,6 @@ Versione %1</translation> <translation type="obsolete"><br>[<b>non collegato</b>]</translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">Indica se il Desktop Remoto (Server VRDP) è abilitato (<img src=vrdp_16px.png/>) o meno (<img src=vrdp_disabled_16px.png/>)</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>Il server VRDP è in ascolto sulla porta %1</translation> </message> @@ -8186,10 +8305,6 @@ Versione %1</translation> <translation type="obsolete">Passa alla modalità di integrazione trasparente</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indica se la tastiera è acquisita dal sistema Guest (<img src=hostkey_captured_16px.png/>) o meno (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>indica l'attività del floppy:</nobr>%1</qt></translation> @@ -8280,8 +8395,8 @@ Versione %1</translation> <translation type="obsolete"><br><nobr><b>Il controller USB è disabilitato</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica se il Display Remoto (Server VRDP) è abilitato (<img src=vrdp_16px.png/>) o meno (<img src=vrdp_disabled_16px.png/>).</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> + <translation type="obsolete">Indica se il Display Remoto (Server VRDP) è abilitato (<img src=:/vrdp_16px.png/>) o meno (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> @@ -8337,22 +8452,6 @@ Versione %1</translation> <translation type="obsolete">&Registrazione...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se il ridimensionamento automatico dello schermo guest è Attivo (<img src=:/auto_resize_on_16px.png/>) o Inattivo (<img src=:/auto_resize_off_16px.png/>). Nota che questa funzione richiede che le Guest Additions siano installate sul sistema guest.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se il puntatore del mouse dell'host è acquisito dal sistema guest:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;il puntatore non è acquisito</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;il puntatore è acquisito</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;l'integrazione del mouse (MI) è Attiva</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI è Inattiva, il puntatore è acquisito</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI è Inattiva, il puntatore non è acquisito</nobr><br>Nota che la funzionalità di integrazione del mouse richiede che le Guest Additions siano installate sul sistema guest.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">Indica se la tastiera è acquisita dal sistema guest (<img src=:/hostkey_captured_16px.png/>) o meno (<img src=:/hostkey_16px.png/>).</translation> - </message> - <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica se lo schermo remoto (Server VRDP) è abilitato (<img src=:/vrdp_16px.png/>) o meno (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">Mostra il tasto host attualmente assegnato.<br>Questo tasto, se premuto da solo, commuta lo stato di acquisizione di mouse e tastiera. Può essere utilizzato anche in combinazione con altri tasti per eseguire rapidamente azioni dal menu principale.</translation> </message> @@ -11726,10 +11825,6 @@ la lingua a quella predefinita di sistema.</qt> <translation>Avvia la macchina virtuale selezionata</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Benvenuti su VirtualBox!</h3><p>La parte sinistra della finestra mostra l'elenco di tutte le Macchine Virtuali presenti sul computer. L'elenco è vuoto perché non hai ancora creato alcuna Macchina Virtuale.<img src=welcome.png align=right/></p><p>Per creare una nuova Macchina Virtuale, premi il pulsante <b>Nuovo</b> nella barra degli strumenti principale nella parte alta della finestra.</p><p>Puoi premere il tasto <b>%1</b> per avere l'aiuto in linea, o visitare <a href=http://www.virtualbox.org>www.virtualbox.org</a> per le ultime informazioni e novità .</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Macchina</translation> </message> @@ -12633,97 +12728,6 @@ qualsiasi valore.</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 giorno</translation> - </message> - <message> - <source>2 days</source> - <translation>2 giorni</translation> - </message> - <message> - <source>3 days</source> - <translation>3 giorni</translation> - </message> - <message> - <source>4 days</source> - <translation>4 giorni</translation> - </message> - <message> - <source>5 days</source> - <translation>5 giorni</translation> - </message> - <message> - <source>6 days</source> - <translation>6 giorni</translation> - </message> - <message> - <source>1 week</source> - <translation>1 settimana</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 settimane</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 settimane</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mese</translation> - </message> - <message> - <source>Never</source> - <translation>Mai</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">Timeout della connessione.</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Controlla</translation> - </message> - <message> - <source>&Close</source> - <translation>&Chiudi</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Procedura di aggiornamento di VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Controlla aggiornamenti</translation> - </message> - <message> - <source>Cancel</source> - <translation>Annulla</translation> - </message> - <message> - <source>Summary</source> - <translation>Riepilogo</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Una nuova versione di VirtualBox è stata rilasciata! La versione <b>%1</b> è disponibile presso <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puoi scaricare questa versione da questo collegamento diretto:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Impossibile ottenere informazioni sulla nuova versione a causa del seguente errore:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Hai già installato l'ultima versione di VirtualBox. Ripeti il controllo tra qualche tempo.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Questa procedura guidata si collegherà al sito web di VirtualBox e controllerà la disponibilità di una versione di VirtualBox.</p><p>Utilizza il pulsante <b>Controlla</b> per verificare subito la presenza di una nuova versione o il pulsante <b>Annulla</b> se non vuoi eseguire il controllo.</p><p>Puoi eseguire questa procedura guidata in qualunque momento scegliendo <b>Controllo aggiornamenti...</b> dal menu <b>Aiuto</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts index 4e4fe57bc..4a815bfd4 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts @@ -4,31 +4,31 @@ <context> <name>@@@</name> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2827"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2838"/> <source>English</source> <comment>Native language name</comment> <translation>日本語</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2838"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2849"/> <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="2851"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2862"/> <source>English</source> <comment>Language name, in English</comment> <translation>Japanese</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2862"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2873"/> <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="2875"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2886"/> <source>Oracle Corporation</source> <comment>Comma-separated list of translators</comment> <translation>Toshimitsu Tanaka</translation> @@ -103,12 +103,12 @@ <translation>互æ›æ€§ã®ãªã„Qtライブラリエラー</translation> </message> <message> - <location filename="../src/main.cpp" line="661"/> + <location filename="../src/main.cpp" line="658"/> <source>VirtualBox - Error In %1</source> <translation>VirtualBox - %1 ã®ã‚¨ãƒ©ãƒ¼</translation> </message> <message> - <location filename="../src/main.cpp" line="666"/> + <location filename="../src/main.cpp" line="663"/> <source><html><b>%1 (rc=%2)</b><br/><br/></source> <translation><html><b>%1 (rc=%2)</b><br/><br/></translation> </message> @@ -132,22 +132,22 @@ <translation>カーãƒãƒ« モジュールãŒæ£ã—ããƒãƒ¼ãƒ‰ã•ã‚ŒãŸã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/main.cpp" line="588"/> + <location filename="../src/main.cpp" line="585"/> <source>VirtualBox - Runtime Error</source> <translation>VirtualBox - ランタイムエラー</translation> </message> <message> - <location filename="../src/main.cpp" line="594"/> + <location filename="../src/main.cpp" line="591"/> <source><b>Cannot access the kernel driver!</b><br/><br/></source> <translation><b>カーãƒãƒ«ãƒ‰ãƒ©ã‚¤ãƒã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“ï¼</b><br/><br/></translation> </message> <message> - <location filename="../src/main.cpp" line="618"/> + <location filename="../src/main.cpp" line="615"/> <source>Unknown error %2 during initialization of the Runtime</source> <translation>ランタイムã®åˆæœŸåŒ–ä¸ã«äºˆæœŸã—ãªã„エラー(%2)</translation> </message> <message> - <location filename="../src/main.cpp" line="608"/> + <location filename="../src/main.cpp" line="605"/> <source>Kernel driver not accessible</source> <translation>カーãƒãƒ«ãƒ‰ãƒ©ã‚¤ãƒã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„</translation> </message> @@ -1420,6 +1420,14 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <location filename="../src/net/UIDownloaderExtensionPack.cpp" line="135"/> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <location filename="../src/net/UIDownloaderUserManual.cpp" line="137"/> @@ -3141,10 +3149,6 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">リモートディスプレイ(VRDPサーãƒãƒ¼)機能ãŒæœ‰åŠ¹ãªã¨ã(<img src=:/vrdp_16px.png/>) ã‚’ã€ç„¡åŠ¹ãªã¨ã (<img src=:/vrdp_disabled_16px.png/>)を表示ã—ã¾ã™ã€‚</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>VRDPサーãƒãƒ¼ã¯ãƒãƒ¼ãƒˆ %1 ã‚’å¾…ã¡å—ã‘ã—ã¦ã„ã¾ã™</translation> </message> @@ -3190,12 +3194,12 @@ p, li { white-space: pre-wrap; } <translation>試験的ビルド %1r%2 - %3</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="262"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="261"/> <source>Preview Monitor %1</source> <translation>プレビュー ディスプレイ %1</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="861"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="860"/> <source>Snapshot %1</source> <translation>スナップショット %1</translation> </message> @@ -3216,32 +3220,32 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">フãƒãƒƒãƒ”ー デãƒã‚¤ã‚¹ã®ãƒžã‚¦ãƒ³ãƒˆè§£é™¤</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1163"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1162"/> <source>No CD/DVD Devices Attached</source> <translation>CD/DVD デãƒã‚¤ã‚¹ 未割り当ã¦</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1164"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1163"/> <source>No CD/DVD devices attached to that VM</source> <translation>CD/DVD デãƒã‚¤ã‚¹ 未割り当ã¦</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1167"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1166"/> <source>No Floppy Devices Attached</source> <translation>フãƒãƒƒãƒ”ー デãƒã‚¤ã‚¹ 未割り当ã¦</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1168"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1167"/> <source>No floppy devices attached to that VM</source> <translation>フãƒãƒƒãƒ”ー デãƒã‚¤ã‚¹ 未割り当ã¦</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1347"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1346"/> <source>No USB Devices Connected</source> <translation>USB デãƒã‚¤ã‚¹ 未接続</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1348"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1347"/> <source>No supported devices connected to the host PC</source> <translation>ホストマシンã«æŽ¥ç¶šã•ã‚ŒãŸãƒ‡ãƒã‚¤ã‚¹ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“</translation> </message> @@ -4712,31 +4716,31 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2293"/> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="906"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="909"/> <source>IDE Controller</source> <translation>IDE コントãƒãƒ¼ãƒ©</translation> </message> <message> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2298"/> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="914"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="917"/> <source>SATA Controller</source> <translation>SATA コントãƒãƒ¼ãƒ©</translation> </message> <message> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2303"/> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="922"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="925"/> <source>SCSI Controller</source> <translation>SCSI コントãƒãƒ¼ãƒ©</translation> </message> <message> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2308"/> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="930"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="933"/> <source>Floppy Controller</source> <translation>フãƒãƒƒãƒ”ー コントãƒãƒ¼ãƒ©</translation> </message> <message> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2313"/> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="938"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="941"/> <source>SAS Controller</source> <translation>SAS コントãƒãƒ¼ãƒ©</translation> </message> @@ -4797,21 +4801,21 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2623"/> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1137"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1136"/> <source>Choose a virtual CD/DVD disk file...</source> <translation>仮想CD/DVDディスクファイルã®é¸æŠž...</translation> </message> <message> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2630"/> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2647"/> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1138"/> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1144"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1137"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1143"/> <source>Remove disk from virtual drive</source> <translation>仮想ドライブã‹ã‚‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’除去</translation> </message> <message> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2640"/> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1143"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1142"/> <source>Choose a virtual floppy disk file...</source> <translation>仮想フãƒãƒƒãƒ”ーディスクファイルã®é¸æŠž...</translation> </message> @@ -5274,120 +5278,120 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">ã“ã®ä»®æƒ³ãƒžã‚·ãƒ³ã§USB 2.0を有効化ã™ã‚‹ã«ã¯<b>%1</b>ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå¿…è¦ã§ã™ã€‚VirtualBoxã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã‚µã‚¤ãƒˆã‹ã‚‰æ©Ÿèƒ½æ‹¡å¼µãƒ‘ッケージをダウンãƒãƒ¼ãƒ‰ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。機能拡張パッケージをインストールã™ã‚‹ã¨ã€USB 2.0を有効化ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç¾åœ¨ã®è¨å®šã‚’ã‚ャンセルã—ãªã„å ´åˆã€USB 2.0ã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="473"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="475"/> <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="497"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="499"/> <source>&Add Empty Filter</source> <translation>空ã®ãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ (&A)</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="498"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="500"/> <source>A&dd Filter From Device</source> <translation>デãƒã‚¤ã‚¹ã‹ã‚‰ãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã™ã‚‹(&D)</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="499"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="501"/> <source>&Edit Filter</source> <translation>フィルタを編集ã™ã‚‹(&E)</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="500"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="502"/> <source>&Remove Filter</source> <translation>フィルタを除去ã™ã‚‹(&R)</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="501"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="503"/> <source>&Move Filter Up</source> <translation>フィルタを上ã«ç§»å‹•ã™ã‚‹(&M)</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="502"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="504"/> <source>M&ove Filter Down</source> <translation>フィルタを下ã«ç§»å‹•(&O)</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="517"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="519"/> <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> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="521"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="523"/> <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ãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="524"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="526"/> <source>Edits the selected USB filter.</source> <translation>é¸æŠžã—ãŸUSBフィルタを編集ã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="525"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="527"/> <source>Removes the selected USB filter.</source> <translation>é¸æŠžã—ãŸUSBフィルタを除去ã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="526"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="528"/> <source>Moves the selected USB filter up.</source> <translation>é¸æŠžã—ãŸUSBフィルタを上ã«ç§»å‹•ã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="527"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="529"/> <source>Moves the selected USB filter down.</source> <translation>é¸æŠžã—ãŸUSBフィルタを下ã«ç§»å‹•ã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="529"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="531"/> <source>New Filter %1</source> <comment>usb</comment> <translation>æ–°è¦ãƒ•ã‚£ãƒ«ã‚¿ %1</translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="884"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="886"/> <source><nobr>Vendor ID: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>ベンダID: %1</nobr></translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="888"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="890"/> <source><nobr>Product ID: %2</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>プãƒãƒ€ã‚¯ãƒˆID: %2</nobr></translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="892"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="894"/> <source><nobr>Revision: %3</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>リビジョン: %3</nobr></translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="896"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="898"/> <source><nobr>Product: %4</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>製å“: %4</nobr></translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="900"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="902"/> <source><nobr>Manufacturer: %5</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>メーカー: %5</nobr></translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="904"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="906"/> <source><nobr>Serial No.: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>シリアルNo.: %1</nobr></translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="908"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="910"/> <source><nobr>Port: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>ãƒãƒ¼ãƒˆ: %1</nobr></translation> </message> <message> - <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="913"/> + <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="915"/> <source><nobr>State: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>状態: %1</nobr></translation> @@ -5557,7 +5561,7 @@ p, li { white-space: pre-wrap; } <context> <name>UIMachineWindowNormal</name> <message> - <location filename="../src/runtime/normal/UIMachineWindowNormal.cpp" line="278"/> + <location filename="../src/runtime/normal/UIMachineWindowNormal.cpp" line="287"/> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation>ç¾åœ¨å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„るホストã‚ーを表示ã—ã¾ã™ã€‚<br>ホストã‚ーをå˜ç‹¬ã§æŠ¼ã™ã¨ã€ã‚ーボートã¨ãƒžã‚¦ã‚¹ã®åˆ¶å¾¡ãŒåˆ‡ã‚Šæ›¿ã‚ã‚Šã¾ã™ã€‚ã¾ãŸã€ä»–ã®ã‚ーã¨åˆã‚ã›ã¦ã‚ーボード ショートカットã®æ“作ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</translation> </message> @@ -5583,42 +5587,42 @@ p, li { white-space: pre-wrap; } <context> <name>UIMessageCenter</name> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="174"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="282"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="175"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="283"/> <source>VirtualBox - Information</source> <comment>msg box title</comment> <translation>VirtualBox - æƒ…å ±</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="178"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="286"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="179"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="287"/> <source>VirtualBox - Question</source> <comment>msg box title</comment> <translation>VirtualBox - 質å•</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="182"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="290"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="183"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="291"/> <source>VirtualBox - Warning</source> <comment>msg box title</comment> <translation>VirtualBox - è¦å‘Š</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="186"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="294"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="187"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="295"/> <source>VirtualBox - Error</source> <comment>msg box title</comment> <translation>VirtualBox - エラー</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="190"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="298"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="191"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="299"/> <source>VirtualBox - Critical Error</source> <comment>msg box title</comment> <translation>VirtualBox - é‡å¤§ãªã‚¨ãƒ©ãƒ¼</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="215"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="216"/> <source>Do not show this message again</source> <comment>msg box flag</comment> <translation>次回ã‹ã‚‰ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã—ãªã„</translation> @@ -5628,128 +5632,128 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">クラッシュを防ããŸã‚ã€Windows/x64ã§ã¯ä»®æƒ³ãƒžã‚·ãƒ³ã«å«ã¾ã‚Œã‚‹ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å‰Šé™¤ã¯ç¾åœ¨ã§ãã¾ã›ã‚“。ã“ã‚Œã¯æ¬¡å›žã®ãƒªãƒªãƒ¼ã‚¹ã§ä¿®æ£ã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="541"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="542"/> <source>Failed to open <tt>%1</tt>. Make sure your desktop environment can properly handle URLs of this type.</source> <translation><tt>%1</tt>ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚デスクトップ環境ãŒé©åˆ‡ã«URLを扱ãˆã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="574"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="575"/> <source><p>Failed to initialize COM or to find the VirtualBox COM server. Most likely, the VirtualBox server is not running or failed to start.</p><p>The application will now terminate.</p></source> <translation><p>COMã®åˆæœŸåŒ–ã«å¤±æ•—ã—ãŸã‹ã€ã¾ãŸã¯VirtualBox COMサーãƒãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚VirtualBoxサーãƒãŒèµ·å‹•ã—ã¦ã„ãªã„ã‹ã€ã¾ãŸã¯èµ·å‹•ã«å¤±æ•—ã—ã¦ã„ã¾ã™ã€‚</p><p>アプリケーションを終了ã—ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="584"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="585"/> <source><p>Failed to create the VirtualBox COM object.</p><p>The application will now terminate.</p></source> <translation><p>VirtualBox COMオブジェクトã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p><p>アプリケーションを終了ã—ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="619"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="620"/> <source>Failed to set global VirtualBox properties.</source> <translation>ã‚°ãƒãƒ¼ãƒãƒ«ãªVirtualBoxã®ãƒ—ãƒãƒ‘ティã®è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="633"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="634"/> <source>Failed to access the USB subsystem.</source> <translation>USBサブシステムã®ã‚¢ã‚¯ã‚»ã‚¹ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="643"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="644"/> <source>Failed to create a new virtual machine.</source> <translation>æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="655"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="656"/> <source>Failed to create a new virtual machine <b>%1</b>.</source> <translation>æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³<b>"%1"</b>ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="665"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="666"/> <source>Failed to open virtual machine located in %1.</source> <translation>仮想マシン<b>"%1"</b>ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="676"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="677"/> <source>Failed to register the virtual machine <b>%1</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="685"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="686"/> <source>Failed to add virtual machine <b>%1</b> located in <i>%2</i> because its already present.</source> <translation>仮想マシン<b>"%1"</b>(<i>"%2"</i>)ã®è¿½åŠ ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="694"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="695"/> <source>Failed to apply the settings to the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®è¨å®šã®é©ç”¨ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="737"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="738"/> <source><p>The machine settings were changed while you were editing them. You currently have unsaved setting changes.</p><p>Would you like to reload the changed settings or to keep your own changes?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="741"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="742"/> <source>Reload settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="741"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="742"/> <source>Keep changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="752"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="753"/> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="765"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="779"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="766"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="780"/> <source>Failed to start the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®èµ·å‹•ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="791"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="792"/> <source>Failed to pause the execution of the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®ä¸€æ™‚åœæ¢ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="802"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="803"/> <source>Failed to resume the execution of the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®å†é–‹ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="825"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="839"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="826"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="840"/> <source>Failed to save the state of the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®çŠ¶æ…‹ã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="851"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="865"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="852"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="866"/> <source>Failed to clone the virtual machine <b>%1</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="877"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="891"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="878"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="892"/> <source>Failed to create a snapshot of the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®ã‚¹ãƒŠãƒƒãƒ—ショット作æˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="903"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="915"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="904"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="916"/> <source>Failed to stop the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®åœæ¢ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="927"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="935"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="928"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="936"/> <source>Failed to remove the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®é™¤åŽ»ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="945"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="946"/> <source>Failed to discard the saved state of the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®ä¿å˜ã•ã‚ŒãŸçŠ¶æ…‹ã®ç ´æ£„ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> @@ -5766,7 +5770,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">仮想マシン<b>"%1"</b>ã®æœ€æ–°ã®ã‚¹ãƒŠãƒƒãƒ—ショットã¨çŠ¶æ…‹ã®ç ´æ£„ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1110"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1111"/> <source>There is no virtual machine named <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ãŒã‚ã‚Šã¾ã›ã‚“。</translation> </message> @@ -5780,7 +5784,7 @@ p, li { white-space: pre-wrap; } </translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1255"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1256"/> <source><p>Are you sure you want to discard the saved state of the virtual machine <b>%1</b>?</p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source> <translation><p>仮想マシン<b>"%1"</b>ã®ä¿å˜ã•ã‚ŒãŸçŠ¶æ…‹ã‚’ç ´æ£„ã—ã¾ã™ã‹ï¼Ÿ</p><p>ã“ã®æ“作ã¯ã‚²ã‚¹ãƒˆOSã‚’é©åˆ‡ã«ã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³ã›ãšã«ãƒªã‚»ãƒƒãƒˆã¾ãŸã¯é›»æºã‚’オフã«ã™ã‚‹ã“ã¨ã¨åŒç‰ã§ã™ã€‚</p></translation> </message> @@ -5826,12 +5830,12 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">%1 <nobr><b>%2</b></nobr>ã®ç™»éŒ²è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1554"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1555"/> <source>Failed to create a new session.</source> <translation>æ–°è¦ã‚»ãƒƒã‚·ãƒ§ãƒ³ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1572"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1573"/> <source>Failed to open a session for the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’é–‹ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> @@ -5844,73 +5848,61 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">ホスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェース<b>"%1"</b>ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2892"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="2900"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2945"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2953"/> <source>Failed to remove the host network interface <b>%1</b>.</source> <translation>ホスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェース<b>"%1"</b>ã‚’å–り除ã‘ã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1612"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1624"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1613"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1625"/> <source>Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.</source> <translation>USB デãƒã‚¤ã‚¹<b>"%1"</b>ã®ä»®æƒ³ãƒžã‚·ãƒ³<b>"%2"</b>ã¸ã®å‰²ã‚Šå½“ã¦ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1638"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1650"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1639"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1651"/> <source>Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.</source> <translation>USB デãƒã‚¤ã‚¹<b>"%1"</b>ã®ä»®æƒ³ãƒžã‚·ãƒ³<b>"%2"</b>ã‹ã‚‰ã®å‰²ã‚Šå½“ã¦è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2940"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="2966"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2993"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3019"/> <source>Failed to create the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.</source> <translation>仮想マシン<b>"%3"</b>ã®å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€<b>"%1"</b>(å‚照先 <nobr><b>%2</b></nobr>)ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2953"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3006"/> <source>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</source> <translation>仮想マシン<b>"%3"</b>ã®å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€<b>"%1"</b>(å‚照先 <nobr><b>%2</b></nobr>)ã®é™¤åŽ»ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>仮想マシンã®ç”»é¢ã‚’<b>マウスクリック</b>ã™ã‚‹ã‹ã€ã¾ãŸã¯<b>ホストã‚ー</b>を押ã™ã¨ã€ä»®æƒ³ãƒžã‚·ãƒ³ã¯ãƒžã‚¦ã‚¹ãƒã‚¤ãƒ³ã‚¿(マウス統åˆæ©Ÿèƒ½ãŒã‚²ã‚¹ãƒˆOSã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ã¨ãã ã‘)ã¨ã‚ーボードを<b>ã‚ャプãƒãƒ£</b>ã—ã¾ã™ã€‚仮想マシンã«ã‚ーボードã¨ãƒžã‚¦ã‚¹ãŒã‚ャプãƒãƒ£ã•ã‚Œã‚‹ã¨ãƒ›ã‚¹ãƒˆãƒžã‚·ãƒ³ã§å‹•ä½œã™ã‚‹ä»–ã®ã‚¢ãƒ—リケーションã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。</p><p></p><p><b>ホストã‚ー</b>を押ã™ã¨ã€ã‚ーボードã¨ãƒžã‚¦ã‚¹(ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã‚‹ã¨ã)ã¯<b>ã‚ャプãƒãƒ£è§£é™¤</b>ã•ã‚Œã€é€šå¸¸ã®æ“作ã«æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç¾åœ¨å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„るホストã‚ーã¯ä»®æƒ³ãƒžã‚·ãƒ³ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä¸‹éƒ¨ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ã«&nbsp;<img src=hostkey_16px.png/>&nbsp;アイコンã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã“ã®ã‚¢ã‚¤ã‚³ãƒ³ã¯ãƒžã‚¦ã‚¹ã‚¢ã‚¤ã‚³ãƒ³ã¨å…±ã«ç¾åœ¨ã®ã‚ーボ−ドã¨ãƒžã‚¦ã‚¹ã®ã‚ャプãƒãƒ£çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p><b>ã‚ーボードã®è‡ªå‹•ã‚ャプãƒãƒ£</b>機能ãŒæœ‰åŠ¹ã§ã™ã€‚仮想マシンã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã®ã¨ãã€ä»®æƒ³ãƒžã‚·ãƒ³ã¯ã‚ーボードを自動的ã«<b>ã‚ャプãƒãƒ£</b>ã—ã¾ã™ã€‚ã‚ーボードãŒã‚ャプãƒãƒ£ã•ã‚Œã‚‹ã¨ã€ã™ã¹ã¦ã®ã‚ーストãƒãƒ¼ã‚¯(Alt-Tabãªã©ã‚’å«ã‚€)ãŒä»®æƒ³ãƒžã‚·ãƒ³ã«é€ã‚‰ã‚Œã‚‹ãŸã‚ã€ãƒ›ã‚¹ãƒˆãƒžã‚·ãƒ³ã§å‹•ä½œã™ã‚‹ä»–ã®ã‚¢ãƒ—リケーションã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。</p><p><b>ホストã‚ー</b>を押ã™ã¨ã€ã‚ーボードã¨ãƒžã‚¦ã‚¹(ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã‚‹ã¨ã)ã¯<b>ã‚ャプãƒãƒ£è§£é™¤</b>ã•ã‚Œã€é€šå¸¸ã®æ“作ã«æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç¾åœ¨å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„るホストã‚ーã¯ä»®æƒ³ãƒžã‚·ãƒ³ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä¸‹éƒ¨ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ã«&nbsp;<img src=hostkey_16px.png/>&nbsp;アイコンã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã“ã®ã‚¢ã‚¤ã‚³ãƒ³ã¯ãƒžã‚¦ã‚¹ã‚¢ã‚¤ã‚³ãƒ³ã¨å…±ã«ç¾åœ¨ã®ã‚ーボ−ドã¨ãƒžã‚¦ã‚¹ã®ã‚ャプãƒãƒ£çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚</translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>ゲストOSã§<b>マウス統åˆ</b>機能ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚ゲストOSã§ãƒžã‚¦ã‚¹ãƒã‚¤ãƒ³ã‚¿ã‚’<i>ã‚ャプãƒãƒ£</i>ã™ã‚‹ã“ã¨ãªã使用ã§ãã¾ã™ã€‚仮想マシンã®ç”»é¢ä¸Šã«ãƒžã‚¦ã‚¹ãƒã‚¤ãƒ³ã‚¿ãŒã‚ã‚‹ã¨ãã€ã™ã¹ã¦ã®ãƒžã‚¦ã‚¹ã®å‹•ä½œã¯ç›´æŽ¥ã‚²ã‚¹ãƒˆOSã«é€ã‚‰ã‚Œã¾ã™ã€‚ç¾åœ¨ãƒžã‚¦ã‚¹ãŒã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã‚‹ã¨ãã¯ã€è‡ªå‹•çš„ã«ã‚ャプãƒãƒ£è§£é™¤ã•ã‚Œã¾ã™ã€‚ステータスãƒãƒ¼ã®ãƒžã‚¦ã‚¹ã‚¢ã‚¤ã‚³ãƒ³ã¯ã€ãƒžã‚¦ã‚¹çµ±åˆæ©Ÿèƒ½ãŒã‚²ã‚¹ãƒˆOSã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã€ç¾åœ¨æœ‰åŠ¹ã§ã‚ã‚‹ã“ã¨ã‚’示ã™ãŸã‚&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;ã®ã‚ˆã†ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ </p><p><b>注</b>: マウス統åˆæ©Ÿèƒ½ãŒæœ‰åŠ¹ãªã¨ãã€ã„ãã¤ã‹ã®ã‚¢ãƒ—リケーションã®å‹•ä½œãŒä¸æ£ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。メニューãƒãƒ¼ã‹ã‚‰å¯¾å¿œã™ã‚‹å‹•ä½œã‚’é¸æŠžã—ã¦ç¾åœ¨ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã®ãƒžã‚¦ã‚¹çµ±åˆæ©Ÿèƒ½ã‚’無効化(ã¾ãŸã¯æœ‰åŠ¹åŒ–)ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p></translation> - </message> - <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1968"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2021"/> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>ç¾åœ¨ã®ãƒ“デオモードã§ã¯ã‚²ã‚¹ãƒˆOSã§<b>マウス統åˆ</b>機能ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“。ゲストOSã§ãƒžã‚¦ã‚¹ã‚’使用ã™ã‚‹ãŸã‚ã«ã¯ãƒžã‚¦ã‚¹ã‚’ã‚ャプãƒãƒ£(仮想マシンã®ç”»é¢ã‚’クリックã™ã‚‹ã‹ã€ã¾ãŸã¯ãƒ›ã‚¹ãƒˆã‚ーを押ã™)ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1988"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2041"/> <source><p>The Virtual Machine is currently in the <b>Paused</b> state and not able to see any keyboard or mouse input. If you want to continue to work inside the VM, you need to resume it by selecting the corresponding action from the menu bar.</p></source> <translation><p>仮想マシンã¯ç¾åœ¨<b>"一時åœæ¢"</b>状態ã®ãŸã‚ã€ã‚ーボードã¨ãƒžã‚¦ã‚¹æ“作をå—ã‘付ã‘ã¾ã›ã‚“。仮想マシンã§ã®ä½œæ¥ã‚’続ã‘ãŸã„å ´åˆã¯ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒãƒ¼ã‹ã‚‰å¯¾å¿œã™ã‚‹å‹•ä½œã‚’é¸æŠžã—ã¦ã€ä»®æƒ³ãƒžã‚·ãƒ³ã‚’å†é–‹ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2207"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2260"/> <source><p>Cannot run VirtualBox in <i>VM Selector</i> mode due to local restrictions.</p><p>The application will now terminate.</p></source> <translation><p>ãƒãƒ¼ã‚«ãƒ«ã®åˆ¶é™ã®ãŸã‚〠<i>VM Selector</i>モードã§VirtualBoxを実行ã§ãã¾ã›ã‚“。</p><p>アプリケーションを終了ã—ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2346"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2399"/> <source>Failed to update Guest Additions. The Guest Additions installation image will be mounted to provide a manual installation.</source> <translation>Guest Additionsã®æ›´æ–°ã«å¤±æ•—ã—ã¾ã—ãŸã€‚Guest Additionsã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚¤ãƒ¡ãƒ¼ã‚¸ã¯æ‰‹å‹•ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®ãŸã‚マウントã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2381"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2434"/> <source>Failed to install the Extension Pack <b>%1</b>.</source> <translation>機能拡張パッケージ<b>"%1"</b>ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2394"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2447"/> <source>Failed to uninstall the Extension Pack <b>%1</b>.</source> <translation>機能拡張パッケージ<b>"%1"</b>ã®ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> @@ -5919,82 +5911,82 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">機能拡張パッケージ<b>"%1"</b>を除去ã—ã¾ã™ã€‚本当ã«é™¤åŽ»ã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2485"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2538"/> <source>&Remove</source> <translation>除去(&R)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2498"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2551"/> <source>The current port forwarding rules are not valid. None of the host or guest port values may be set to zero.</source> <translation>ç¾åœ¨ã®ãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ãƒ«ãƒ¼ãƒ«ã¯ç„¡åŠ¹ã§ã™ã€‚ ホストã¾ãŸã¯ã‚²ã‚¹ãƒˆãƒãƒ¼ãƒˆã®å€¤ã«ã‚¼ãƒãŒè¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2505"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2558"/> <source><p>There are unsaved changes in the port forwarding configuration.</p><p>If you proceed your changes will be discarded.</p></source> <translation><p>ãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°è¨å®šã®å¤‰æ›´ãŒä¿å˜ã•ã‚Œã¦ã„ã¾ã›ã‚“。</p><p>続行ã™ã‚‹ã¨å¤‰æ›´ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2534"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2587"/> <source><nobr>Fatal Error</nobr></source> <comment>runtime error info</comment> <translation><nobr>致命的ãªã‚¨ãƒ©ãƒ¼</nobr></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2540"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2593"/> <source><nobr>Non-Fatal Error</nobr></source> <comment>runtime error info</comment> <translation><nobr>致命的ã§ãªã„エラー</nobr></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2546"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2599"/> <source><nobr>Warning</nobr></source> <comment>runtime error info</comment> <translation><nobr>è¦å‘Š</nobr></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2563"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2616"/> <source><nobr>Error ID: </nobr></source> <comment>runtime error info</comment> <translation><nobr>エラーID: </nobr></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2565"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2618"/> <source>Severity: </source> <comment>runtime error info</comment> <translation>é‡è¦åº¦:</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2576"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2629"/> <source><p>A fatal error has occurred during virtual machine execution! The virtual machine will be powered off. Please copy the following error message using the clipboard to help diagnose the problem:</p></source> <translation><p>仮想マシンã®å®Ÿè¡Œä¸ã«è‡´å‘½çš„ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸï¼ä»®æƒ³ãƒžã‚·ãƒ³ã®é›»æºã‚’オフã«ã—ã¾ã™ã€‚調査ã®ãŸã‚ã«ä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’クリップボードã«ã‚³ãƒ”ーã—ã¦ä½¿ç”¨ã—ã¦ãã ã•ã„:</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2588"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2641"/> <source><p>An error has occurred during virtual machine execution! The error details are shown below. You may try to correct the error and resume the virtual machine execution.</p></source> <translation><p>仮想マシンã®å®Ÿè¡Œä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸï¼ã‚¨ãƒ©ãƒ¼ã®è©³ç´°ã‚’以下ã«ç¤ºã—ã¾ã™ã€‚説明ã•ã‚ŒãŸã‚¨ãƒ©ãƒ¼ã‚’ä¿®æ£ã—ã€ä»®æƒ³ãƒžã‚·ãƒ³ã®å†å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2597"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2650"/> <source><p>The virtual machine execution may run into an error condition as described below. We suggest that you take an appropriate action to avert the error.</p></source> <translation><p>仮想マシンã®å®Ÿè¡Œä¸ã€ä»¥ä¸‹ã§èª¬æ˜Žã•ã‚Œã‚‹ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ç„¡è¦–ã§ãã¾ã™ãŒã€å‹•ä½œã‚’確実ã«ã™ã‚‹ãŸã‚ã«ã€èª¬æ˜Žã•ã‚ŒãŸèª¤ã‚Šã‚’対ç–ã™ã‚‹ã“ã¨ãŒæŽ¨å¥¨ã•ã‚Œã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2779"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2832"/> <source>Sorry, some generic error happens.</source> <translation type="unfinished">申ã—訳ã‚ã‚Šã¾ã›ã‚“。ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2914"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2967"/> <source>Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source> <translation>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯(<nobr><b>%1</b></nobr>)ã®ã€ä»®æƒ³ãƒžã‚·ãƒ³<b>"%3"</b>ã®ã‚¹ãƒãƒƒãƒˆ<i>"%2"</i> ã¸ã®å‰²ã‚Šå½“ã¦ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2920"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2973"/> <source>Failed to attach the CD/DVD device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source> <translation>CD/DVDデãƒã‚¤ã‚¹(<nobr><b>%1</b></nobr>)ã®ã€ä»®æƒ³ãƒžã‚·ãƒ³<b>"%3"</b>ã®ã‚¹ãƒãƒƒãƒˆ<i>"%2"</i> ã¸ã®å‰²ã‚Šå½“ã¦ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2926"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2979"/> <source>Failed to attach the floppy device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source> <translation>フãƒãƒƒãƒ”ーデãƒã‚¤ã‚¹(<nobr><b>%1</b></nobr>)ã®ã€ä»®æƒ³ãƒžã‚·ãƒ³<b>"%3"</b>ã®ã‚¹ãƒãƒƒãƒˆ<i>"%2"</i> ã¸ã®å‰²ã‚Šå½“ã¦ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> @@ -6003,42 +5995,42 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>ã“ã®ä»®æƒ³ãƒžã‚·ãƒ³ã§USB 2.0を有効化ã™ã‚‹ã«ã¯<b><nobr>%1</nobr></b>ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå¿…è¦ã§ã™ã€‚VirtualBoxã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã‚µã‚¤ãƒˆã‹ã‚‰æ©Ÿèƒ½æ‹¡å¼µãƒ‘ッケージをダウンãƒãƒ¼ãƒ‰ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。機能拡張パッケージをインストールã™ã‚‹ã¨ã€USB 2.0を有効化ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç¾åœ¨ã®è¨å®šã‚’ã‚ャンセルã—ãªã„å ´åˆã€USB 2.0ã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3136"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3189"/> <source>Result&nbsp;Code: </source> <comment>error info</comment> <translation>終了コード&nbsp;: </translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3142"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3195"/> <source>Component: </source> <comment>error info</comment> <translation>コンãƒãƒ¼ãƒãƒ³ãƒˆ: </translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3150"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3203"/> <source>Interface: </source> <comment>error info</comment> <translation>インターフェース: </translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3159"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3212"/> <source>Callee: </source> <comment>error info</comment> <translation>呼ã³å‡ºã—å…ˆ: </translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3167"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3220"/> <source>Callee&nbsp;RC: </source> <comment>error info</comment> <translation>呼ã³å‡ºã—å…ˆ&nbsp;RC: </translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="549"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="550"/> <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source> <translation><p>言語ファイル<b>"%1"</b>ãŒ<b><nobr>%2</nobr></b>ディレクトリä¸ã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</p><p>言語ã¯ä¸€æ™‚çš„ã«ã‚·ã‚¹ãƒ†ãƒ ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨€èªžã«è¨å®šã•ã‚Œã¾ã™ã€‚VirtualBoxメインウィンドウã®<b>[ファイル]</b>メニューã‹ã‚‰<b>[環境è¨å®š]</b>ダイアãƒã‚°ã‚’é–‹ãã€<b>[言語]</b>ページã§è¡¨ç¤ºã•ã‚Œã¦ã„る言語をé¸æŠžã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="562"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="563"/> <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source> <translation><p>言語ファイル<b><nobr>"%1"</nobr></b>ãŒèªã¿è¾¼ã‚ã¾ã›ã‚“。</p><p>言語ã¯ä¸€æ™‚çš„ã«English(内蔵)ã«è¨å®šã•ã‚Œã¾ã™ã€‚VirtualBoxメインウィンドウã®<b>[ファイル]</b>メニューã‹ã‚‰<b>[環境è¨å®š]</b>ダイアãƒã‚°ã‚’é–‹ãã€<b>[言語]</b>ページã§è¡¨ç¤ºã•ã‚Œã¦ã„る言語をé¸æŠžã—ã¦ãã ã•ã„。</p></translation> </message> @@ -6059,27 +6051,27 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">仮想マシン<b>%1<b>ã®ã‚¹ãƒŠãƒƒãƒ—ショットä¿å˜ãƒ•ã‚©ãƒ«ãƒ€ã®ãƒ‘スを<nobr><b>%2</b></nobr>ã«å¤‰æ›´ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2979"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3032"/> <source><p>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</p><p>Please close all programs in the guest OS that may be using this shared folder and try again.</p></source> <translation><p>仮想マシン<b>%3</b>ã®å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€<b>%1</b>(å‚照先:<nobr><b>%2</b></nobr>)ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p><p>ã“ã®å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€ã‚’使用ã—ã¦ã„るゲストOSã®ã™ã¹ã¦ã®ãƒ—ãƒã‚°ãƒ©ãƒ を終了ã—ã€å†å®Ÿè¡Œã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1676"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1677"/> <source><p>Could not find the VirtualBox Guest Additions CD image file <nobr><b>%1</b></nobr> or <nobr><b>%2</b>.</nobr></p><p>Do you wish to download this CD image from the Internet?</p></source> <translation><p>VirtualBox Guest Additions CDイメージファイル<nobr><b>%1</b></nobr>ã¾ãŸã¯<nobr><b>%2</b>ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</nobr></p><p>インターãƒãƒƒãƒˆã‹ã‚‰CDイメージをダウンãƒãƒ¼ãƒ‰ã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1690"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1691"/> <source><p>Failed to download the VirtualBox Guest Additions CD image from <nobr><a href="%1">%2</a>.</nobr></p><p>%3</p></source> <translation><p><nobr><a href="%1">%2</a>ã‹ã‚‰VirtualBox Guest Additions CDイメージをダウンãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。</nobr></p><p>%3</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1709"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1710"/> <source><p>Are you sure you want to download the VirtualBox Guest Additions CD image from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source> <translation><p>VirtualBox Guest Additions CDイメージを<nobr><a href="%1">%2</a></nobr> (サイズ %3ãƒã‚¤ãƒˆ)ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1721"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1722"/> <source><p>The VirtualBox Guest Additions CD image has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to register this CD image and mount it on the virtual CD/DVD drive?</p></source> <translation><p>VirtualBox Guest Additions CDイメージを<nobr><a href="%1">%2</a></nobr>ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã€<nobr><b>%3</b>ã«ä¿å˜ã—ã¾ã—ãŸã€‚</nobr></p><p>CDイメージを登録ã—ã€ä»®æƒ³CD/DVDドライブã«ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> @@ -6093,7 +6085,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>仮想マシンã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’"シームレス"モードã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚<b>%1</b>ã‚ーを押ã™ã¨ã„ã¤ã§ã‚‚ウィンドウ表示ã«æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚注：ホストã‚ーã¯ç¾åœ¨<b>%2</b>ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚</p><p>注：シームレスモードã§ã¯ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒãƒ¼ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。メニューãƒãƒ¼ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã«ã¯ <b>Host+Home</b>ã‚ーを押ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3003"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3056"/> <source><p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode but the virtual display is currently set to <b>%2&nbsp;bit</b>.</p><p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, if it is available, for best possible performance of the virtual video subsystem.</p><p><b>Note</b>. Some operating systems, like OS/2, may actually work in 32&nbsp;bit mode but report it as 24&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&nbsp;bit) is not available in the guest OS.</p></source> <translation><p>仮想マシンウィンドウã¯<b>%1&nbsp;ビット</b>カラーモードã«æœ€é©åŒ–ã•ã‚Œã¾ã™ãŒã€ç¾åœ¨ä»®æƒ³ãƒ‡ã‚£ã‚¹ãƒ—レイã¯<b>%2&nbsp;ビット</b>ã«è¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚</p><p>最良ã®ä»®æƒ³ãƒ“デオサブシステム性能を得るãŸã‚ã€åˆ©ç”¨å¯èƒ½ã§ã‚ã‚‹ãªã‚‰ã°ã‚²ã‚¹ãƒˆOSã®ç”»é¢è¨å®šãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’é–‹ãã€<b>%3&nbsp;ビット</b>カラーモードをé¸æŠžã—ã¦ãã ã•ã„。</p><p><b>注：OS/2ãªã©ã€ã„ãã¤ã‹ã®ã‚ªãƒšãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°ã‚·ã‚¹ãƒ†ãƒ ã¯32&nbsp;ビットモードã®å‹•ä½œã‚’24&nbsp;ビット(ç´„1600万色)ã¨ã—ã¦å ±å‘Šã—ã¾ã™ã€‚ ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒæ¶ˆãˆã‚‹ã‹ã€ã¾ãŸã¯ã‚²ã‚¹ãƒˆOSã§å¿…è¦ãªè‰²æ·±åº¦(%4&nbsp;ビット) ãŒåˆ©ç”¨ã§ããªã„ã“ã¨ãŒåˆ†ã‹ã£ã¦ã„ã‚‹ãªã‚‰ã°ã€å˜ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’無効ã«ã§ãã‚‹ã‹ç¢ºèªã™ã‚‹ãŸã‚ã«ç•°ãªã£ãŸè‰²æ·±åº¦ã‚’é¸æŠžã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p></translation> </message> @@ -6102,22 +6094,22 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>仮想マシン実行ä¸ã«é‡å¤§ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸãŸã‚ã€ä»®æƒ³ãƒžã‚·ãƒ³ã¯åœæ¢ã—ã¾ã—ãŸã€‚</p><p>å•é¡Œã®è§£æ±ºã®ãŸã‚ã€<a href=http://www.virtualbox.org>http://www.virtualbox.org</a>ã®Communityセクションをå‚ç…§ã™ã‚‹ã‹ã€ã‚µãƒãƒ¼ãƒˆå¥‘ç´„ã‚’ç· çµã—ã¦ãã ã•ã„。ã‚ãªãŸãŒã‚¨ãƒ©ãƒ¼ç™ºç”Ÿæ™‚ã«è¡Œã£ãŸæ“作ã¨å…±ã«ã€<nobr><b>%1</b></nobr>ディレクトリã«æ ¼ç´ã•ã‚Œã¦ã„ã‚‹ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«(<tt>VBox.log</tt>)ã¨ã‚¤ãƒ¡ãƒ¼ã‚¸ãƒ•ã‚¡ã‚¤ãƒ«(<tt>VBox.png</tt>)ã‚’æä¾›ã—ã¦ãã ã•ã„。注：VirualBoxメインウィンドウã®<b>[仮想マシン]</b>メニューã‹ã‚‰[ãƒã‚°ã‚’å‚ç…§]ã‚’é¸æŠžã—ã¦ã€ä¸Šè¨˜ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p><p>仮想マシンを電æºã‚ªãƒ•ã™ã‚‹ã«ã¯<b>[OK]</b>ボタンをクリックã—ã¦ãã ã•ã„。ã“ã®ã¾ã¾ãƒ‡ãƒãƒƒã‚°ã‚’è¡Œã†ã«ã¯<b>[無視]</b>ボタンをクリックã—ã¦ãã ã•ã„。デãƒãƒƒã‚°ã«ã¯ç‰¹åˆ¥ãªçŸ¥è˜ã¨ãƒ„ールを必è¦ã¨ã™ã‚‹ãŸã‚ã€<b>[OK]</b>ボタンをクリックã™ã‚‹ã“ã¨ã‚’推奨ã—ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2191"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2244"/> <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings dialog or the First Run Wizard.</p><p>Do you wish to continue?</p></source> <translation><p>æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ã«ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã›ã‚“。仮想マシンè¨å®šãƒ€ã‚¤ã‚¢ãƒã‚°ã‹åˆå›žèµ·å‹•ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã‚’使用ã—ã¦ã‚²ã‚¹ãƒˆOSをインストールã—ãŸãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã¾ãŸã¯ä»–ã®èµ·å‹•å¯èƒ½ãªãƒ¡ãƒ‡ã‚£ã‚¢ã‚’割り当ã¦ãªã„ã¨ä»®æƒ³ãƒžã‚·ãƒ³ã¯èµ·å‹•ã—ã¾ã›ã‚“。</p><p>続行ã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="522"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="523"/> <source>Failed to find license files in <nobr><b>%1</b></nobr>.</source> <translation><nobr><b>"%1"</b></nobr>ã«ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="532"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="533"/> <source>Failed to open the license file <nobr><b>%1</b></nobr>. Check file permissions.</source> <translation>ライセンスファイル<nobr><b>"%1"</b></nobr>ãŒé–‹ã‘ã¾ã›ã‚“。ファイルã®ãƒ‘ーミッションを確èªã—ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="813"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="814"/> <source>Failed to send the ACPI Power Button press event to the virtual machine <b>%1</b>.</source> <translation>仮想マシン<b>"%1"</b>ã¸ã®é›»æºãƒœã‚¿ãƒ³ オフã®ACPIイベントé€ä¿¡ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> @@ -6126,7 +6118,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>VirtualBox オンライン登録サービスã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p><p>%1</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1811"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1864"/> <source><p>Congratulations! You have been successfully registered as a user of VirtualBox.</p><p>Thank you for finding time to fill out the registration form!</p></source> <translation><p>VirtualBox ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ç™»éŒ²ãŒå®Œäº†ã—ã¾ã—ãŸã€‚</p><p>登録フォームã«æ›¸ã込む時間を割ã„ã¦ãã ã•ã‚Šã€ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã—ãŸï¼</p></translation> </message> @@ -6139,24 +6131,24 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>ã‚°ãƒãƒ¼ãƒãƒ«ãªVirtualBoxè¨å®šã®<b><nobr>"%1"</nobr></b>ã¸ã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="595"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="596"/> <source><p>Failed to load the global GUI configuration from <b><nobr>%1</nobr></b>.</p><p>The application will now terminate.</p></source> <translation><p>ã‚°ãƒãƒ¼ãƒãƒ«ãªGUI構æˆã®<b><nobr>"%1"</nobr></b>ã‹ã‚‰ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p> <p>アプリケーションを終了ã—ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="609"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="610"/> <source><p>Failed to save the global GUI configuration to <b><nobr>%1</nobr></b>.</p><p>The application will now terminate.</p></source> <translation><p>ã‚°ãƒãƒ¼ãƒãƒ«ãªGUI構æˆã®<b><nobr>"%1"</nobr></b>ã¸ã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p> <p>アプリケーションを終了ã—ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="706"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="707"/> <source>Failed to save the settings of the virtual machine <b>%1</b> to <b><nobr>%2</nobr></b>.</source> <translation>仮想マシン<b>"%1"</b>ã®è¨å®šã®<b><nobr>"%2"</nobr></b>ã¸ã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="728"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="729"/> <source>Failed to load the settings of the virtual machine <b>%1</b> from <b><nobr>%2</nobr></b>.</source> <translation>仮想マシン<b>"%1"</b>ã®è¨å®šã®<b><nobr>"%2â€</nobr></b>ã‹ã‚‰ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> @@ -6171,7 +6163,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">登録解除</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1262"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1263"/> <source>Discard</source> <comment>saved state</comment> <translation>ç ´æ£„</translation> @@ -6216,28 +6208,28 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚¤ãƒ¡ãƒ¼ã‚¸ã®ã€ä»®æƒ³ãƒžã‚·ãƒ³<b>"%4"</b>ã®ãƒã‚¹ %3 ã®ãƒãƒ£ãƒ³ãƒãƒ« %2 ã®ãƒ‡ãƒã‚¤ã‚¹ã‚¹ãƒãƒƒãƒˆ %1 ã‹ã‚‰ã®å‰²ã‚Šå½“ã¦è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1714"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1747"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1758"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1715"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1748"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1760"/> <source>Download</source> <comment>additions</comment> <translation>ダウンãƒãƒ¼ãƒ‰</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1729"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1730"/> <source>Mount</source> <comment>additions</comment> <translation>マウント</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1880"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1913"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1933"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1966"/> <source><p>The host key is currently defined as <b>%1</b>.</p></source> <comment>additional message box paragraph</comment> <translation><p>ç¾åœ¨ãƒ›ã‚¹ãƒˆã‚ーã¯<b>%1</b>ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1887"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1940"/> <source>Capture</source> <comment>do input capture</comment> <translation>ã‚ャプãƒãƒ£</translation> @@ -6248,7 +6240,7 @@ p, li { white-space: pre-wrap; } <p><b>[確èª]</b>ボタンをクリックã—ã¦ä»®æƒ³ãƒ‡ã‚£ã‚¹ã‚¯ãƒžãƒãƒ¼ã‚¸ãƒ£ã‚’èµ·å‹•ã—ã€ã©ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„ã®ã‹ç¢ºèªã—ã¦ãã ã•ã„。ã¾ãŸã¯<b>[無視]</b>ボタンをクリックã—ã¦ã€ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’無視ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2012"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2065"/> <source>Check</source> <comment>inaccessible media message box</comment> <translation>確èª</translation> @@ -6278,36 +6270,36 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">ã‚ャンセル</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2083"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2136"/> <source>Switch</source> <comment>fullscreen</comment> <translation>切り替ãˆ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2103"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2156"/> <source>Switch</source> <comment>seamless</comment> <translation>切り替ãˆ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2168"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2221"/> <source><p>Do you really want to reset the virtual machine?</p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source> <translation><p>仮想マシンを本当ã«ãƒªã‚»ãƒƒãƒˆã—ã¾ã™ã‹ï¼Ÿ</p><p>仮想マシンをリセットã™ã‚‹ã¨ã€ãã®ä¸ã§ç¨¼å‹•ä¸ã®ã™ã¹ã¦ã®ã‚¢ãƒ—リケーションã®ä¿å˜ã•ã‚Œã¦ã„ãªã„データã¯å¤±ã‚ã‚Œã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2172"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2225"/> <source>Reset</source> <comment>machine</comment> <translation>リセット</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2200"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2253"/> <source>Continue</source> <comment>no hard disk attached</comment> <translation>続ã‘ã‚‹</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2201"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2254"/> <source>Go Back</source> <comment>no hard disk attached</comment> <translation>戻る</translation> @@ -6332,12 +6324,12 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">é¸æŠž</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1122"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1123"/> <source><p>Could not enter seamless mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source> <translation><p>ゲストOSã®ãƒ“デオメモリä¸è¶³ã®ãŸã‚ã€ã‚·ãƒ¼ãƒ レスモードã«åˆ‡ã‚Šæ›¿ãˆã§ãã¾ã›ã‚“。</p><p>仮想マシンã®è¨å®šã§ãƒ“デオメモリを <b>%1</b>以上ã«è¨å®šã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1135"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1136"/> <source><p>Could not switch the guest display to fullscreen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to fullscreen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source> <translation><p>ゲストOSã®ãƒ“デオメモリä¸è¶³ã®ãŸã‚ã€ã‚²ã‚¹ãƒˆç”»é¢ã‚’フルスクリーンモードã«åˆ‡ã‚Šæ›¿ãˆã§ãã¾ã›ã‚“。</p><p>仮想マシンã®è¨å®šã§ãƒ“デオメモリを <b>%1</b>以上ã«è¨å®šã—ã¦ãã ã•ã„。</p><p><b>[無視]</b>ボタンをクリックã—ã¦ãƒ•ãƒ«ã‚¹ã‚¯ãƒªãƒ¼ãƒ³ãƒ¢ãƒ¼ãƒ‰ã«åˆ‡ã‚Šæ›ãˆã‚‹ã‹ã€<b>[ã‚ャンセル]</b>ボタンをクリックã—ã¦æ“作をå–り消ã—ã¦ãã ã•ã„。</p></translation> </message> @@ -6346,22 +6338,22 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’å–å¾—ã§ãã¾ã›ã‚“:</p><p><b>%1</b></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1853"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1906"/> <source>You are already running the most recent version of VirtualBox.</source> <translation>最新ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®VirtualBoxãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚ 後ã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç¢ºèªã‚’è¡Œã£ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1865"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1918"/> <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> <translation><p>仮想マシンã®ç”»é¢ã‚’<b>マウスクリック</b>ã™ã‚‹ã‹ã€ã¾ãŸã¯<b>ホストã‚ー</b>を押ã™ã¨ã€ä»®æƒ³ãƒžã‚·ãƒ³ã¯ãƒžã‚¦ã‚¹ãƒã‚¤ãƒ³ã‚¿(マウス統åˆæ©Ÿèƒ½ãŒã‚²ã‚¹ãƒˆOSã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ã¨ãã ã‘)ã¨ã‚ーボードを<b>ã‚ャプãƒãƒ£</b>ã—ã¾ã™ã€‚仮想マシンã«ã‚ーボードã¨ãƒžã‚¦ã‚¹ãŒã‚ャプãƒãƒ£ã•ã‚Œã‚‹ã¨ãƒ›ã‚¹ãƒˆãƒžã‚·ãƒ³ã§å‹•ä½œã™ã‚‹ä»–ã®ã‚¢ãƒ—リケーションã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。</p><p></p><p><b>ホストã‚ー</b>を押ã™ã¨ã€ã‚ーボードã¨ãƒžã‚¦ã‚¹(ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã‚‹ã¨ã)ã¯<b>ã‚ャプãƒãƒ£è§£é™¤</b>ã•ã‚Œã€é€šå¸¸ã®æ“作ã«æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç¾åœ¨å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„るホストã‚ーã¯ä»®æƒ³ãƒžã‚·ãƒ³ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä¸‹éƒ¨ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ã«&nbsp;<img src=:/hostkey_16px.png/>&nbsp;アイコンã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã“ã®ã‚¢ã‚¤ã‚³ãƒ³ã¯ãƒžã‚¦ã‚¹ã‚¢ã‚¤ã‚³ãƒ³ã¨å…±ã«ç¾åœ¨ã®ã‚ーボ−ドã¨ãƒžã‚¦ã‚¹ã®ã‚ャプãƒãƒ£çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1898"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1951"/> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> <translation><p><b>ã‚ーボードã®è‡ªå‹•ã‚ャプãƒãƒ£</b>機能ãŒæœ‰åŠ¹ã§ã™ã€‚仮想マシンã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã®ã¨ãã€ä»®æƒ³ãƒžã‚·ãƒ³ã¯ã‚ーボードを自動的ã«<b>ã‚ャプãƒãƒ£</b>ã—ã¾ã™ã€‚ã‚ーボードãŒã‚ャプãƒãƒ£ã•ã‚Œã‚‹ã¨ã€ã™ã¹ã¦ã®ã‚ーストãƒãƒ¼ã‚¯(Alt-Tabãªã©ã‚’å«ã‚€)ãŒä»®æƒ³ãƒžã‚·ãƒ³ã«é€ã‚‰ã‚Œã‚‹ãŸã‚ã€ãƒ›ã‚¹ãƒˆãƒžã‚·ãƒ³ã§å‹•ä½œã™ã‚‹ä»–ã®ã‚¢ãƒ—リケーションã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。</p><p><b>ホストã‚ー</b>を押ã™ã¨ã€ã‚ーボードã¨ãƒžã‚¦ã‚¹(ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã‚‹ã¨ã)ã¯<b>ã‚ャプãƒãƒ£è§£é™¤</b>ã•ã‚Œã€é€šå¸¸ã®æ“作ã«æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç¾åœ¨å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„るホストã‚ーã¯ä»®æƒ³ãƒžã‚·ãƒ³ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä¸‹éƒ¨ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ã«&nbsp;<img src=:/hostkey_16px.png/>&nbsp;アイコンã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã“ã®ã‚¢ã‚¤ã‚³ãƒ³ã¯ãƒžã‚¦ã‚¹ã‚¢ã‚¤ã‚³ãƒ³ã¨å…±ã«ç¾åœ¨ã®ã‚ーボ−ドã¨ãƒžã‚¦ã‚¹ã®ã‚ャプãƒãƒ£çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1944"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1997"/> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> <translation><p>ゲストOSã§<b>マウス統åˆ</b>機能ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚ゲストOSã§ãƒžã‚¦ã‚¹ãƒã‚¤ãƒ³ã‚¿ã‚’<i>ã‚ャプãƒãƒ£</i>ã™ã‚‹ã“ã¨ãªã使用ã§ãã¾ã™ã€‚仮想マシンã®ç”»é¢ä¸Šã«ãƒžã‚¦ã‚¹ãƒã‚¤ãƒ³ã‚¿ãŒã‚ã‚‹ã¨ãã€ã™ã¹ã¦ã®ãƒžã‚¦ã‚¹ã®å‹•ä½œã¯ç›´æŽ¥ã‚²ã‚¹ãƒˆOSã«é€ã‚‰ã‚Œã¾ã™ã€‚ç¾åœ¨ãƒžã‚¦ã‚¹ãŒã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã‚‹ã¨ãã¯ã€è‡ªå‹•çš„ã«ã‚ャプãƒãƒ£è§£é™¤ã•ã‚Œã¾ã™ã€‚ステータスãƒãƒ¼ã®ãƒžã‚¦ã‚¹ã‚¢ã‚¤ã‚³ãƒ³ã¯ã€ãƒžã‚¦ã‚¹çµ±åˆæ©Ÿèƒ½ãŒã‚²ã‚¹ãƒˆOSã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã€ç¾åœ¨æœ‰åŠ¹ã§ã‚ã‚‹ã“ã¨ã‚’示ã™ãŸã‚&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;ã®ã‚ˆã†ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ </p><p><b>注</b>: マウス統åˆæ©Ÿèƒ½ãŒæœ‰åŠ¹ãªã¨ãã€ã„ãã¤ã‹ã®ã‚¢ãƒ—リケーションã®å‹•ä½œãŒä¸æ£ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。メニューãƒãƒ¼ã‹ã‚‰å¯¾å¿œã™ã‚‹å‹•ä½œã‚’é¸æŠžã—ã¦ç¾åœ¨ã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ã®ãƒžã‚¦ã‚¹çµ±åˆæ©Ÿèƒ½ã‚’無効化(ã¾ãŸã¯æœ‰åŠ¹åŒ–)ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p></translation> </message> @@ -6434,63 +6426,63 @@ p, li { white-space: pre-wrap; } <translation>製å“æƒ…å ±ãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1835"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1888"/> <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> <translation><p>VirtualBoxã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¾ã—ãŸï¼ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ <b>%1</b>ã¯<a href="http://www.virtualbox.org/">virtualbox.org</a>ã‹ã‚‰å…¥æ‰‹ã§ãã¾ã™ã€‚</p><p>ã“ã®ãƒªãƒ³ã‚¯ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚: </p><p><a href=%2>%3</a></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1283"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1284"/> <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source> <translation><p>"%1 <nobr><b>%2</b></nobr>"を解放ã—ã¾ã™ã‹ï¼Ÿ</p><p>以下ã®ä»®æƒ³ãƒžã‚·ãƒ³ã‹ã‚‰è§£æ”¾ã•ã‚Œã¾ã™: <b>%3</b></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1215"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1216"/> <source><p>You are about to remove the virtual machine <b>%1</b> from the machine list.</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well?</p></source> <translation><p>仮想マシン<b>"%1"</b>をリストã‹ã‚‰é™¤åŽ»ã—ã¾ã™ã€‚</p><p>仮想マシンを構æˆã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1218"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1219"/> <source><p>You are about to remove the virtual machine <b>%1</b> from the machine list.</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well? Doing this will also remove the files containing the machine's virtual hard disks if they are not in use by another machine.</p></source> <translation><p>仮想マシン<b>"%1"</b>をリストã‹ã‚‰é™¤åŽ»ã—ã¾ã™ã€‚</p><p>仮想マシンを構æˆã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿä»–ã®ä»®æƒ³ãƒžã‚·ãƒ³ã§ä½¿ç”¨ã•ã‚Œã¦ã„ãªã„仮想ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã¯å‰Šé™¤ã•ã‚Œã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1230"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1231"/> <source>Delete all files</source> <translation>ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1231"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1232"/> <source>Remove only</source> <translation>除去ã®ã¿</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1238"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1239"/> <source>You are about to remove the inaccessible virtual machine <b>%1</b> from the machine list. Do you wish to proceed?</source> <translation>アクセスã§ããªã„仮想マシン<b>"%1"</b>をリストã‹ã‚‰é™¤åŽ»ã—ã¾ã™ã€‚続行ã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1248"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1249"/> <source>Remove</source> <translation>除去</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1291"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1292"/> <source>Release</source> <comment>detach medium</comment> <translation>解放</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1300"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1301"/> <source><p>Are you sure you want to remove the %1 <nobr><b>%2</b></nobr> from the list of known media?</p></source> <translation><p>メディアã®ãƒªã‚¹ãƒˆã‹ã‚‰"%1 <nobr><b>%2</b></nobr>"を除去ã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1310"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1311"/> <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/UIMessageCenter.cpp" line="1314"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1315"/> <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> @@ -6499,35 +6491,35 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>注：ã“ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸è£…ç½®ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“。後ã§ãƒªã‚¹ãƒˆã«å†åº¦è¿½åŠ ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1325"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1326"/> <source>Remove</source> <comment>medium</comment> <translation>除去</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1332"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1333"/> <source><p>The hard disk storage unit at location <b>%1</b> already exists. You cannot create a new virtual hard disk that uses this location because it can be already used by another virtual hard disk.</p><p>Please specify a different location.</p></source> <translation><p>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ ストレージ装置ã®å ´æ‰€ <b>"%1"</b>ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚別ã®ä»®æƒ³ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ãŒä½¿ç”¨ã—ã¦ã„ã‚‹ãŸã‚ã€ã“ã®å ´æ‰€ã«æ–°è¦ä»®æƒ³ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’作æˆã§ãã¾ã›ã‚“。</p><p>別ã®å ´æ‰€ã‚’指定ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1343"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1344"/> <source><p>Do you want to delete the storage unit of the hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which makes it possible to add this hard disk to the list later again.</p></source> <translation><p>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯<nobr><b>"%1"</b></nobr>ã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸è£…置を削除ã—ã¾ã™ã‹ï¼Ÿ</p><p><b>[削除]</b>ã‚’é¸æŠžã™ã‚‹ã¨ã€æŒ‡å®šã•ã‚ŒãŸã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸è£…ç½®ã¯æ°¸ä¹…ã«å‰Šé™¤ã•ã‚Œã¾ã™ã€‚ã“ã®æ“作ã¯<b>å…ƒã«æˆ»ã›ã¾ã›ã‚“</b>。</p><p><b>[ä¿æŒ]</b>ã‚’é¸æŠžã™ã‚‹ã¨ã€ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã¯ãƒªã‚¹ãƒˆã‹ã‚‰å–り除ã‹ã‚Œã¾ã™ãŒã€ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸è£…ç½®ã¯å¾Œã§ãƒªã‚¹ãƒˆã«å†åº¦è¿½åŠ ã§ãるよã†ã«ã€ãã®ã¾ã¾ç½®ã‹ã‚Œã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1357"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1358"/> <source>Delete</source> <comment>hard disk storage</comment> <translation>削除</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1358"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1359"/> <source>Keep</source> <comment>hard disk storage</comment> <translation>ä¿æŒ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1369"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1370"/> <source>Failed to delete the storage unit of the hard disk <b>%1</b>.</source> <translation>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ ストレージ装置<b>"%1"</b>ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> @@ -6536,7 +6528,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>æ–°è¦ã®å‰²ã‚Šå½“ã¦ã«åˆ©ç”¨ã§ãる未使用ã®ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ãŒã‚ã‚Šã¾ã›ã‚“。</p><p><b>[作æˆ]</b>ボタンをクリックã—ã€<i>æ–°è¦ä»®æƒ³ãƒ‡ã‚£ã‚¹ã‚¯ä½œæˆã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰</i>ã‚’èµ·å‹•ã—ã¦æ–°è¦ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’作æˆã™ã‚‹ã‹ã€<b>[é¸æŠž]</b>ボタンをクリックã—ã¦ã€<i>仮想メディアマãƒãƒ¼ã‚¸ãƒ£</i>ã‚’é–‹ãã€å‹•ä½œã‚’é¸æŠžã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1440"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1441"/> <source>Failed to create the hard disk storage <nobr><b>%1</b>.</nobr></source> <translation>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ ストレージ<nobr><b>"%1"</b>ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</nobr></translation> </message> @@ -6557,32 +6549,32 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">"%1 <nobr><b>%2</b></nobr>"ã®ã€ä»®æƒ³ãƒžã‚·ãƒ³<b>"%3"</b>ã‹ã‚‰ã®ãƒžã‚¦ãƒ³ãƒˆè§£é™¤ã«å¤±æ•—ã—ã‹ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1528"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1529"/> <source>Failed to open the %1 <nobr><b>%2</b></nobr>.</source> <translation>"%1 <nobr><b>%2</b></nobr>"ã®ã‚ªãƒ¼ãƒ—ンã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1541"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1542"/> <source>Failed to close the %1 <nobr><b>%2</b></nobr>.</source> <translation>"%1 <nobr><b>%2</b></nobr>"ã®ã‚¯ãƒãƒ¼ã‚ºã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1582"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1583"/> <source>Failed to determine the accessibility state of the medium <nobr><b>%1</b></nobr>.</source> <translation>メディア<nobr><b>"%1"</b></nobr>ã®ã‚¢ã‚¯ã‚»ã‚¹å¯å¦çŠ¶æ…‹ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1799"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1852"/> <source><p>Failed to connect to the VirtualBox online registration service due to the following error:</p><p><b>%1</b></p></source> <translation><p>VirtualBoxã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç™»éŒ²ã‚µãƒ¼ãƒ“スã«æŽ¥ç¶šã§ãã¾ã›ã‚“。エラー:</p><p><b>%1</b></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1845"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1898"/> <source><p>Unable to obtain the new version information due to the following error:</p><p><b>%1</b></p></source> <translation><p>æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æƒ…å ±ã‚’å–å¾—ã§ãã¾ã›ã‚“。エラー:</p><p><b>%1</b></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2001"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2054"/> <source><p>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.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see what media are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source> <translation><p>一ã¤ä»¥ä¸Šã®ä»®æƒ³ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã€CD/DVDã¾ãŸã¯ãƒ•ãƒãƒƒãƒ”ーメディアã®ã«ç¾åœ¨ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。アクセスå¯èƒ½ã«ãªã‚‹ã¾ã§ã“れらã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’使用ã™ã‚‹ä»®æƒ³ãƒžã‚·ãƒ³ã‚’æ“作ã§ãã¾ã›ã‚“。</p><p><b>[確èª]</b>ボタンをクリックã—ã¦ä»®æƒ³ãƒ¡ãƒ‡ã‚£ã‚¢ãƒžãƒãƒ¼ã‚¸ãƒ£ã‚’èµ·å‹•ã—ã€ã©ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„ã®ã‹ç¢ºèªã—ã¦ãã ã•ã„。ã¾ãŸã¯<b>[無視]</b>ボタンをクリックã—ã¦ã€ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’無視ã—ã¦ãã ã•ã„。</p></translation> </message> @@ -6614,7 +6606,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">上書ã(&V)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2135"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2188"/> <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr> 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 <b>Show Log</b> from the <b>Machine</b> menu of the main VirtualBox window.</p><p>Press <b>OK</b> if you want to power off the machine or press <b>Ignore</b> 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 <b>OK</b> now.</p></source> <translation><p>仮想マシン実行ä¸ã«é‡å¤§ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸãŸã‚ã€ä»®æƒ³ãƒžã‚·ãƒ³ã¯åœæ¢ã—ã¾ã—ãŸã€‚</p><p>å•é¡Œã®è§£æ±ºã®ãŸã‚ã€<a href=http://www.virtualbox.org>http://www.virtualbox.org</a>ã®Communityセクションをå‚ç…§ã™ã‚‹ã‹ã€ã‚µãƒãƒ¼ãƒˆã«é€£çµ¡ã—ã¦ãã ã•ã„。ã‚ãªãŸãŒã‚¨ãƒ©ãƒ¼ç™ºç”Ÿæ™‚ã«è¡Œã£ãŸæ“作ã¨å…±ã«ã€<nobr><b>%1</b></nobr>ディレクトリã«æ ¼ç´ã•ã‚Œã¦ã„ã‚‹ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«(<tt>VBox.log</tt>)ã¨ã‚¤ãƒ¡ãƒ¼ã‚¸ãƒ•ã‚¡ã‚¤ãƒ«(<tt>VBox.png</tt>)ã‚’æä¾›ã—ã¦ãã ã•ã„。注：VirualBoxメインウィンドウã®<b>[仮想マシン]</b>メニューã‹ã‚‰[ãƒã‚°ã‚’å‚ç…§]ã‚’é¸æŠžã—ã¦ã€ä¸Šè¨˜ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p><p>仮想マシンを電æºã‚ªãƒ•ã™ã‚‹ã«ã¯<b>[OK]</b>ボタンをクリックã—ã¦ãã ã•ã„。ã“ã®ã¾ã¾ãƒ‡ãƒãƒƒã‚°ã‚’è¡Œã†ã«ã¯<b>[無視]</b>ボタンをクリックã—ã¦ãã ã•ã„。デãƒãƒƒã‚°ã«ã¯ç‰¹åˆ¥ãªçŸ¥è˜ã¨ãƒ„ールを必è¦ã¨ã™ã‚‹ãŸã‚ã€<b>[OK]</b>ボタンをクリックã™ã‚‹ã“ã¨ã‚’推奨ã—ã¾ã™ã€‚</p></translation> </message> @@ -6638,7 +6630,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">ファイルå<b>"%1"</b>ã¯ã™ã§ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™ã€‚ファイルを置ãæ›ãˆã¾ã™ã‹ï¼Ÿ<br /><br />ファイルã¯"%2"ã«å˜åœ¨ã—ã¾ã™ã€‚ファイルã®å†…容ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="443"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="444"/> <source>The following files already exist:<br /><br />%1<br /><br />Are you sure you want to replace them? Replacing them will overwrite their contents.</source> <translation>以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã™ã§ã«å˜åœ¨ã—ã¦ã„ã¾ã™:<br /><br />%1<br /><br />ファイルを置ãæ›ãˆã¾ã™ã‹ï¼Ÿãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚</translation> </message> @@ -6647,7 +6639,7 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><b>"%1"</b>ã®é™¤åŽ»ã«å¤±æ•—ã—ã¾ã—ãŸã€‚<br /><br />手作æ¥ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–り除ãã€å†å®Ÿè¡Œã—ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="505"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="506"/> <source>You are running a prerelease version of VirtualBox. This version is not suitable for production use.</source> <translation>ã“ã‚Œã¯VirtualBoxã®ãƒ—レリリースãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™ã€‚ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯å®Ÿå‹™ä½œæ¥ã«ã¯é©ã—ã¦ã„ã¾ã›ã‚“。</translation> </message> @@ -6656,29 +6648,29 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">USBファイルシステム(usbfs)ã‚‚DBusã¨halサービスも利用ã§ããªã„ãŸã‚ã€ãƒ›ã‚¹ãƒˆã‚·ã‚¹ãƒ†ãƒ ã§USBã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ ゲストOSã§ãƒ›ã‚¹ãƒˆUSB デãƒã‚¤ã‚¹ã‚’使用ã™ã‚‹ã«ã¯ã€ã“れを修æ£ã—ã¦VirtualBoxã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="953"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="954"/> <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/UIMessageCenter.cpp" line="962"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="963"/> <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source> <translation><p>仮想化支æ´æ©Ÿèƒ½(VT-x/AMD-V)を有効化ã§ãã¾ã›ã‚“。64ビット ゲストOSã¯64ビットCPUを検出ã§ããšã€èµ·å‹•ã§ãã¾ã›ã‚“。</p><p>ホストマシンã®BIOSè¨å®šã§VT-x/AMD-Vを有効化ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="968"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="975"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="988"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="995"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="969"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="976"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="989"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="996"/> <source>Close VM</source> <translation>仮想マシンを閉ã˜ã‚‹</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="968"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="975"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="988"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="995"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="2285"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="969"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="976"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="989"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="996"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2338"/> <source>Continue</source> <translation>続ã‘ã‚‹</translation> </message> @@ -6691,11 +6683,11 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">ç ´æ£„</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1010"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1015"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1027"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1046"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="2285"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1011"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1016"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1028"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1047"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2338"/> <source>Cancel</source> <translation>ã‚ャンセル</translation> </message> @@ -6717,99 +6709,99 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>é¸æŠžã—ãŸãƒ›ã‚¹ãƒˆ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェース ;<nobr><b>"%1"</b>を除去ã—ã¾ã™ã‹ï¼Ÿ</nobr></p><p><b>注：</b> ã“ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã¯è¤‡æ•°ã®ä»®æƒ³ãƒžã‚·ãƒ³ã®1ã¤ä»¥ä¸Šã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ アタプタã§ä½¿ç”¨ä¸ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。除去ã™ã‚‹ã¨ã€ä»–ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹åã‚’é¸ã¶ã‹ã€åˆ¥ã®å‰²ã‚Šå½“ã¦æ–¹æ³•ã‚’æ£ã—ãè¨å®šã™ã‚‹ã¾ã§ãれらã®ã‚¢ãƒ€ãƒ—ã‚¿ã¯å‹•ä½œã—ã¾ã›ã‚“。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2878"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="2885"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2931"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2938"/> <source>Failed to create the host-only network interface.</source> <translation>ホストオンリー ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェースã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2033"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2086"/> <source><p>Your existing VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.</p><p>Press <b>OK</b> to start VirtualBox now or press <b>Exit</b> if you want to terminate the VirtualBox application without any further actions.</p></source> <translation><p>æ—¢å˜ã®VirtualBoxè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯å¤ã„å½¢å¼ã‹ã‚‰VirtualBoxã®æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«å¿…è¦ãªå½¢å¼ã«è‡ªå‹•å¤‰æ›ã•ã‚Œã¾ã™ã€‚</p><p>ã™ãã«VirtualBoxã‚’èµ·å‹•ã™ã‚‹ã«ã¯<b>[OK]</b>ボタンをクリックã—ã¦ãã ã•ã„。変æ›çµæžœã‚’ä¿å˜ã›ãšã«VirtualBoxアプリケーションを終了ã™ã‚‹ã«ã¯<b>[終了]</b>ボタンをクリックã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1002"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1003"/> <source><p>You are about to restore snapshot <b>%1</b>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1006"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1007"/> <source>Create a snapshot of the current machine state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1012"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1013"/> <source><p>Are you sure you want to restore snapshot <b>%1</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1098"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1099"/> <source>Can't find snapshot named <b>%1</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1271"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1272"/> <source><p>Error changing medium type from <b>%1</b> to <b>%2</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1320"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1321"/> <source><p>Note that the storage unit of this medium will not be deleted and that it will be possible to use it later again.</p></source> <translation><p>注：ã“ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã®è¨˜æ†¶è£…ç½®ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“。å†åº¦åˆ©ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1380"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1381"/> <source><p>You are about to add a virtual hard disk to controller <b>%1</b>.</p><p>Would you like to create a new, empty file to hold the disk contents or select an existing one?</p></source> <translation><p>仮想ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’コントãƒãƒ¼ãƒ©<b>"%1"</b>ã«è¿½åŠ ã—ã¾ã™ã€‚</p><p>空ã®ä»®æƒ³ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’æ–°è¦ä½œæˆã—ã¾ã™ã‹ï¼Ÿæ—¢å˜ã®ä»®æƒ³ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’é¸æŠžã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1387"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1388"/> <source>Create &new disk</source> <comment>add attachment routine</comment> <translation>æ–°è¦ãƒ‡ã‚£ã‚¹ã‚¯ã®ä½œæˆ(&N)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1388"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1389"/> <source>&Choose existing disk</source> <comment>add attachment routine</comment> <translation>æ—¢å˜ã®ãƒ‡ã‚£ã‚¹ã‚¯ã‚’é¸æŠž(&C)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1395"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1396"/> <source><p>You are about to add a new CD/DVD drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual CD/DVD disk to put in the drive or to leave it empty for now?</p></source> <translation><p>CD/DVDドライブをコントãƒãƒ¼ãƒ©<b>"%1"</b>ã«è¿½åŠ ã—ã¾ã™ã€‚</p><p>仮想CD/DVDディスクをドライブã«å‰²ã‚Šå½“ã¦ã¾ã™ã‹ï¼Ÿç©ºã®ãƒ‰ãƒ©ã‚¤ãƒ–ã ã‘割り当ã¦ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1403"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1419"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1404"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1420"/> <source>&Choose disk</source> <comment>add attachment routine</comment> <translation>ディスクをé¸æŠž(&C)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1404"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1420"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1405"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1421"/> <source>Leave &empty</source> <comment>add attachment routine</comment> <translation>空ã®ãƒ‰ãƒ©ã‚¤ãƒ–(&E)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1411"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1412"/> <source><p>You are about to add a new floppy drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual floppy disk to put in the drive or to leave it empty for now?</p></source> <translation><p>フãƒãƒƒãƒ”ードライブをコントãƒãƒ¼ãƒ©<b>"%1"</b>ã«è¿½åŠ ã—ã¾ã™ã€‚</p><p>仮想フãƒãƒƒãƒ”ーディスクをドライブã«å‰²ã‚Šå½“ã¦ã¾ã™ã‹ï¼Ÿç©ºã®ãƒ‰ãƒ©ã‚¤ãƒ–ã ã‘割り当ã¦ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1459"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1460"/> <source>Failed to detach the hard disk (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source> <translation>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯(<nobr><b>%1</b></nobr>)ã®ã€ä»®æƒ³ãƒžã‚·ãƒ³<b>"%3"</b>ã®ã‚¹ãƒãƒƒãƒˆ<i>"%2"</i> ã¸ã®å‰²ã‚Šå½“ã¦è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1465"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1466"/> <source>Failed to detach the CD/DVD device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source> <translation>CD/DVDデãƒã‚¤ã‚¹(<nobr><b>%1</b></nobr>)ã®ã€ä»®æƒ³ãƒžã‚·ãƒ³<b>"%3"</b>ã®ã‚¹ãƒãƒƒãƒˆ<i>"%2"</i> ã¸ã®å‰²ã‚Šå½“ã¦è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1471"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1472"/> <source>Failed to detach the floppy device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source> <translation>フãƒãƒƒãƒ”ーデãƒã‚¤ã‚¹(<nobr><b>%1</b></nobr>)ã®ã€ä»®æƒ³ãƒžã‚·ãƒ³<b>"%3"</b>ã®ã‚¹ãƒãƒƒãƒˆ<i>"%2"</i> ã¸ã®å‰²ã‚Šå½“ã¦è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> @@ -6818,105 +6810,105 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>VirtualBox Guest AdditionsãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„ãŸã‚ã€å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€ã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。共有フォルダを使用ã™ã‚‹ã«ã¯<b>[デãƒã‚¤ã‚¹]</b>メニューã‹ã‚‰<b>[Guest Additions ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«]</b>ã‚’é¸ã³Guest Additionsをインストールã¾ãŸã¯å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。インストール後ã€ä»®æƒ³ãƒžã‚·ãƒ³ã‚’å†èµ·å‹•ã™ã‚‹ã¨å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€ãŒåˆ©ç”¨ã§ãã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2219"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2272"/> <source>Failed to open appliance.</source> <translation>仮想アプライアンスã®ã‚ªãƒ¼ãƒ—ンã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2235"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2288"/> <source>Failed to open/interpret appliance <b>%1</b>.</source> <translation>仮想アプライアンス<b>"%1"</b>ã®ã‚ªãƒ¼ãƒ—ンã¾ãŸã¯è§£æžã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2249"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2302"/> <source>Failed to import appliance <b>%1</b>.</source> <translation>仮想アプライアンス<b>"%1"</b>ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message numerus="yes"> - <location filename="../src/globals/UIMessageCenter.cpp" line="2279"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2332"/> <source><p>The virtual machine(s) <b>%1</b> are currently in a saved state.</p><p>If you continue the runtime state of the exported machine(s) will be discarded. Note that the existing machine(s) are not changed.</p></source> <translation> <numerusform><p>仮想マシン<b>"%1"</b>ã¯çŠ¶æ…‹ã®ä¿å˜ä¸ã§ã™ã€‚</p><p>続行ã™ã‚‹ã¨ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã®ãƒ©ãƒ³ã‚¿ã‚¤ãƒ 状態ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚注：既å˜ã®ä»®æƒ³ãƒžã‚·ãƒ³ã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“。</p></numerusform> </translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2295"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2348"/> <source>Failed to create appliance.</source> <translation>仮想アプライアンスã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2303"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="2322"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2356"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2375"/> <source>Failed to prepare the export of the appliance <b>%1</b>.</source> <translation>仮想アプライアンス<b>"%1"</b>ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã®å‰å‡¦ç†ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2317"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2370"/> <source>Failed to create an appliance.</source> <translation>仮想アプライアンスã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2335"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2388"/> <source>Failed to export appliance <b>%1</b>.</source> <translation>仮想アプライアンス<b>"%1"</b>ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1592"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1593"/> <source><p>Deleting this host-only network will remove the host-only interface this network is based on. Do you want to remove the (host-only network) interface <nobr><b>%1</b>?</nobr></p><p><b>Note:</b> this interface may be in use by one or more virtual network adapters belonging to one of your VMs. After it is removed, these adapters will no longer be usable until you correct their settings by either choosing a different interface name or a different adapter attachment type.</p></source> <translation><p>ã“ã®ã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ã‚’削除ã™ã‚‹ã¨ã€ã“ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ãŒåŸºã¥ã„ã¦ã„るホストオンリー ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インタフェースãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚ホストオンリー ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インタフェース<nobr><b>%1</b></nobr>を削除ã—ã¾ã™ã‹ï¼Ÿ</p><p><b>注：</b>ã“ã®ã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ã¯ä»–ã®ä»®æƒ³ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ アダプタã§ä½¿ç”¨ã—ã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。削除ã—ãŸå ´åˆã€ãれらã®ã‚¢ãƒ€ãƒ—ã‚¿ã¯ã€ä»–ã®ã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹åã‚’é¸ã¶ã‹ã€åˆ¥ã®ã‚¢ãƒ€ãƒ—ã‚¿ タイプをé¸ã‚“ã§è¨å®šã‚’変更ã™ã‚‹ã¾ã§ä½¿ç”¨ã§ãã¾ã›ã‚“。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="434"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="435"/> <source>A file named <b>%1</b> already exists. Are you sure you want to replace it?<br /><br />Replacing it will overwrite its contents.</source> <translation>ファイルå<b>"%1"</b>ã¯ã™ã§ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™ã€‚ファイルを置ãæ›ãˆã¾ã™ã‹ï¼Ÿ<br /><br />ファイルã®å†…容ã¯ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="982"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="983"/> <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Certain guests (e.g. OS/2 and QNX) require this feature.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source> <translation><p>仮想化支æ´æ©Ÿèƒ½(VT-x/AMD-V)ãŒæœ‰åŠ¹åŒ–ã•ã‚Œã¾ã—ãŸãŒä½¿ç”¨ã§ãã¾ã›ã‚“。ã„ãã¤ã‹ã®ã‚²ã‚¹ãƒˆOS(OS/2ã‚„QNXãªã©))ã¯æœ¬æ©Ÿèƒ½ã‚’å¿…è¦ã¨ã—ã¾ã™ã€‚</p><p>ホストマシンã®BIOSè¨å®šã§VT-x/AMD-Vを有効化ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1660"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1661"/> <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then shared folders will be available once it is.</p></source> <translation><p>VirtualBox Guest AdditionsãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„ãŸã‚ã€å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€ã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。共有フォルダを使用ã™ã‚‹ã«ã¯<b>[デãƒã‚¤ã‚¹]</b>メニューã‹ã‚‰<b>[Guest Additions ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«]</b>ã‚’é¸ã³Guest Additionsをインストールã¾ãŸã¯å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„。インストール後ã€ä»®æƒ³ãƒžã‚·ãƒ³ã‚’å†èµ·å‹•ã™ã‚‹ã¨å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€ãŒåˆ©ç”¨ã§ãã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1822"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1875"/> <source><p>Invalid e-mail address or password specified.</p></source> <translation><p>無効ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¾ãŸã¯ãƒ‘スワードãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1825"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1878"/> <source><p>Failed to register the VirtualBox product.</p><p>%1</p></source> <translation><p>VirtualBoxã®ç™»éŒ²ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p><p>%1</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2260"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2313"/> <source>Failed to check files.</source> <translation>ファイルã®ç¢ºèªã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2271"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2324"/> <source>Failed to remove file.</source> <translation>ファイルã®é™¤åŽ»ä¸ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="493"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="494"/> <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/UIMessageCenter.cpp" line="513"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="514"/> <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/UIMessageCenter.cpp" line="971"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="972"/> <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</source> <translation><p>ホストマシンã®ä»®æƒ³åŒ–支æ´æ©Ÿèƒ½(VT-x/AMD-V)ãŒä½¿ç”¨ã§ãã¾ã›ã‚“。64ビット ゲストOSã¯64ビットCPUを検出ã§ããšã€èµ·å‹•ã§ãã¾ã›ã‚“。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="991"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="992"/> <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Certain guests (e.g. OS/2 and QNX) require this feature and will fail to boot without it.</p></source> <translation><p>ホストマシンã®ä»®æƒ³åŒ–支æ´æ©Ÿèƒ½(VT-x/AMD-V)ãŒä½¿ç”¨ã§ãã¾ã›ã‚“。本機能を必è¦ã¨ã™ã‚‹ã„ãã¤ã‹ã®ã‚²ã‚¹ãƒˆOS(OS/2ã‚„QNXãªã©)ã¯èµ·å‹•ã§ãã¾ã›ã‚“。</p></translation> </message> @@ -6925,56 +6917,56 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>スナップショット<b>"%1"</b>ã«å¾©å…ƒã—ã¾ã™ã‹ï¼Ÿç¾åœ¨ã®ä»®æƒ³ãƒžã‚·ãƒ³ã®çŠ¶æ…‹ã¯å¤±ã‚ã‚Œã€ãれを回復ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1010"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1015"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1011"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1016"/> <source>Restore</source> <translation>復元</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1021"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1022"/> <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and disk data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source> <translation><p>スナップショットを削除ã™ã‚‹ã¨ã€ã‚¹ãƒŠãƒƒãƒ—ショットã«æ ¼ç´ã•ã‚Œã¦ã„ã‚‹æƒ…å ±ã¯å¤±ã‚ã‚Œã€VirtualBoxãŒã‚¹ãƒŠãƒƒãƒ—ショットã¨å…±ã«ä½œæˆã—ãŸè¤‡æ•°ã®ãƒ‡ã‚£ã‚¹ã‚¯ データã¯ã²ã¨ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ãƒžãƒ¼ã‚¸ã•ã‚Œã¾ã™ã€‚ã“ã‚Œã«ã¯é•·ã„時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ãã—ã¦ã‚¹ãƒŠãƒƒãƒ—ショットã®æƒ…å ±ã‚’å›žå¾©ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。</p><p>スナップショット<b>"%1"</b>を削除ã—ã¾ã™ã‹ï¼Ÿã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1027"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1046"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1028"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1047"/> <source>Delete</source> <translation>削除</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1036"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1037"/> <source><p>Deleting the snapshot %1 will temporarily need more disk space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of disk space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source> <translation><p>スナップショット %1ã®å‰Šé™¤ã«ã¯å¤šãã®ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ã‚’å¿…è¦ã¨ã—ã¾ã™ã€‚ディスクイメージファイル %2ã®ã‚µã‚¤ã‚ºã¯æœ€å¤§ã§%3ã¾ã§å¢—åŠ ã—ã¾ã™ã€‚ã—ã‹ã—ã€ãƒ‡ã‚£ã‚¹ã‚¯ã®ç©ºã容é‡ã¯%4ã—ã‹ã‚ã‚Šã¾ã›ã‚“。</p><p>マージ作æ¥ä¸ã«ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ãŒä¸è¶³ã™ã‚‹ã¨ã€ä»®æƒ³ãƒžã‚·ãƒ³ã®ãƒ‡ãƒ¼ã‚¿ã‚’失ã†å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚</p><p>スナップショットã®å‰Šé™¤ã‚’自己責任ã§ç¶šè¡Œã§ãã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1053"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1065"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1054"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1066"/> <source>Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source> <translation>仮想マシン<b>"%2"</b>ã®ã‚¹ãƒŠãƒƒãƒ—ショット<b>"%1"</b>ã¸ã®å¾©å…ƒã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1075"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="1087"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1076"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1088"/> <source>Failed to delete the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source> <translation>仮想マシン<b>"%2"</b>ã®ã‚¹ãƒŠãƒƒãƒ—ショット<b>"%1"</b>ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1150"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1151"/> <source><p>Could not change the guest screen to this host screen due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source> <translation><p>ビデオメモリä¸è¶³ã®ãŸã‚ã€ã‚²ã‚¹ãƒˆ スクリーンをã“ã®ãƒ›ã‚¹ãƒˆ スクリーンã«å¤‰æ›´ã§ãã¾ã›ã‚“。</p><p>仮想マシンã®æ§‹æˆã§<b>%1</b>以上ã®ãƒ“デオメモリを指定ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1160"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1161"/> <source><p>Could not change the guest screen to this host screen due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch the screen anyway or press <b>Cancel</b> to cancel the operation.</p></source> <translation><p>ビデオメモリä¸è¶³ã®ãŸã‚ã€ã‚²ã‚¹ãƒˆ スクリーンをã“ã®ãƒ›ã‚¹ãƒˆ スクリーンã«å¤‰æ›´ã§ãã¾ã›ã‚“。</p><p>仮想マシンã®æ§‹æˆã§<b>%1</b>以上ã®ãƒ“デオメモリを指定ã—ã¦ãã ã•ã„。</p><p><b>[無視]</b>ボタンをクリックã—ã™ã‚‹ã¨ã‚¹ã‚¯ãƒªãƒ¼ãƒ³ã‚’強制的ã«åˆ‡ã‚Šæ›ãˆã¾ã™ã€‚<b>[ã‚ャンセル]</b>ボタンをクリックã™ã‚‹ã¨æ“作ã¯å–り消ã•ã‚Œã¾ã™ã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1175"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1176"/> <source><p>Can not switch the guest display to fullscreen mode. You have more virtual screens configured than physical screens are attached to your host.</p><p>Please either lower the virtual screens in your VM configuration or attach additional screens to your host.</p></source> <translation><p>ゲスト ディスプレイをフルスクリーンモードã«å¤‰æ›´ã§ãã¾ã›ã‚“。ホストマシンã«æŽ¥ç¶šã•ã‚Œã¦ã„る実ディスプレイよりも多ãã®ä»®æƒ³ãƒ‡ã‚£ã‚¹ãƒ—レイãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚</p><p>仮想ディスプレイã®æ•°ã‚’減らã™ã‹ã€ãƒ›ã‚¹ãƒˆãƒžã‚·ãƒ³ã«ãƒ‡ã‚£ã‚¹ãƒ—ãƒ¬ã‚¤ã‚’è¿½åŠ ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1187"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1188"/> <source><p>Can not switch the guest display to seamless mode. You have more virtual screens configured than physical screens are attached to your host.</p><p>Please either lower the virtual screens in your VM configuration or attach additional screens to your host.</p></source> <translation><p>ゲスト ディスプレイをシームレスモードã«å¤‰æ›´ã§ãã¾ã›ã‚“。ホストマシンã«æŽ¥ç¶šã•ã‚Œã¦ã„る実ディスプレイよりも多ãã®ä»®æƒ³ãƒ‡ã‚£ã‚¹ãƒ—レイãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚</p><p>仮想ディスプレイã®æ•°ã‚’減らã™ã‹ã€ãƒ›ã‚¹ãƒˆãƒžã‚·ãƒ³ã«ãƒ‡ã‚£ã‚¹ãƒ—ãƒ¬ã‚¤ã‚’è¿½åŠ ã—ã¦ãã ã•ã„。</p></translation> </message> @@ -6997,12 +6989,12 @@ p, li { white-space: pre-wrap; } <translation type="obsolete"><p>æ–°è¦ã®å‰²ã‚Šå½“ã¦ã«åˆ©ç”¨ã§ãる未使用ã®ãƒ¡ãƒ‡ã‚£ã‚¢ãŒã‚ã‚Šã¾ã›ã‚“。</p><p><b>[é¸æŠž]</b>ボタンをクリックã—ã¦ã€<i>仮想メディアマãƒãƒ¼ã‚¸ãƒ£</i>ã‚’é–‹ã„ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1426"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1427"/> <source><p>Are you sure you want to delete the CD/DVD-ROM device?</p><p>You will not be able to mount any CDs or ISO images or install the Guest Additions without it!</p></source> <translation><p>CD/DVD-ROM デãƒã‚¤ã‚¹ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ</p><p>デãƒã‚¤ã‚¹ãŒãªã„å ´åˆã€CD/DVDメディアやISOイメージファイルã®ãƒžã‚¦ãƒ³ãƒˆãŠã‚ˆã³Guest Additions ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯ã§ãã¾ã›ã‚“ï¼</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1430"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1431"/> <source>&Remove</source> <comment>medium</comment> <translation>除去(&R)</translation> @@ -7016,27 +7008,27 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">"%1"ã®ä»®æƒ³ãƒžã‚·ãƒ³<b>"%3"</b>ã®ã‚¹ãƒãƒƒãƒˆ<i>"%2"</i>ã¸ã®å‰²ã‚Šå½“ã¦è§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1492"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1493"/> <source>Unable to mount the %1 <nobr><b>%2</b></nobr> on the machine <b>%3</b>.</source> <translation>%1 <nobr><b>%2</b></nobr>を仮想マシン<b>"%3"</b>ã«ãƒžã‚¦ãƒ³ãƒˆã§ãã¾ã›ã‚“。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1493"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1494"/> <source> Would you like to force mounting of this medium?</source> <translation>メディアを強制マウントã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1497"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1498"/> <source>Unable to unmount the %1 <nobr><b>%2</b></nobr> from the machine <b>%3</b>.</source> <translation>%1 <nobr><b>%2</b></nobr>を仮想マシン<b>"%3"</b>ã‹ã‚‰ãƒžã‚¦ãƒ³ãƒˆè§£é™¤ã§ãã¾ã›ã‚“。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1498"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1499"/> <source> Would you like to force unmounting of this medium?</source> <translation>メディアを強制マウント解除ã—ã¾ã™ã‹ï¼Ÿ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1508"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1509"/> <source>Force Unmount</source> <translation>強制マウント解除</translation> </message> @@ -7045,196 +7037,234 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">仮想ドライブã®ãƒ‡ã‚£ã‚¹ã‚¯ã®å–り出ã—ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“ã®ãƒ‰ãƒ©ã‚¤ãƒ–ã¯ã‚²ã‚¹ãƒˆOSã«ã‚ˆã£ã¦ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚確èªå¾Œã€å†å®Ÿè¡Œã—ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1698"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1699"/> <source><p>Could not insert the VirtualBox Guest Additions installer CD image into the virtual machine <b>%1</b>, as the machine has no CD/DVD-ROM drives. Please add a drive using the storage page of the virtual machine settings dialog.</p></source> <translation><p>仮想マシン<b>"%1"</b>ãŒCD/DVD-ROMドライブをæŒãŸãªã„ãŸã‚ã€VirtualBox Guest Additionsã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«CDイメージを仮想マシンã«ã‚¤ãƒ³ã‚µãƒ¼ãƒˆã§ãã¾ã›ã‚“。 仮想マシンè¨å®šãƒ€ã‚¤ã‚¢ãƒã‚°ã®[ストレージ]ページã§ãƒ‰ãƒ©ã‚¤ãƒ–ã‚’è¿½åŠ ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1735"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1736"/> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>ダウンãƒãƒ¼ãƒ‰ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«(<nobr><b>%1</b></nobr>)ã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1742"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1743"/> <source><p>Could not find the VirtualBox User Manual <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source> <translation><p>VirtualBox ユーザーマニュアル <nobr><b>%1</b></nobr>ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。</p><p>ユーザーマニュアルをダウンãƒãƒ¼ãƒ‰ã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1753"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1755"/> <source><p>Are you sure you want to download the VirtualBox User Manual from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source> <translation><p>VirtualBox ユーザーマニュアルを<nobr><a href="%1">%2</a></nobr> (サイズ %3ãƒã‚¤ãƒˆ)ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1764"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1766"/> <source><p>Failed to download the VirtualBox User Manual from <nobr><a href="%1">%2</a>.</nobr></p><p>%3</p></source> <translation><p><nobr><a href="%1">%2</a>ã‹ã‚‰VirtualBox ユーザーマニュアルをダウンãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。</nobr></p><p>%3</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1772"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1774"/> <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p></source> <translation><p>VirtualBox ユーザーマニュアルを<nobr><a href="%1">%2</a></nobr>ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã€<nobr><b>%3</b></nobr>ã«ä¿å˜ã—ã¾ã—ãŸã€‚</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="1782"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1784"/> <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> <translation><p>VirtualBox ユーザーマニュアルを<nobr><a href="%1">%2</a></nobr>ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸãŒã€<nobr><b>%3</b></nobr>ã«ä¿å˜ã§ãã¾ã›ã‚“。</p><p>ä»–ã®ä¿å˜å ´æ‰€ã‚’é¸æŠžã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2044"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="2062"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1795"/> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/globals/UIMessageCenter.cpp" line="1799"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="1810"/> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">ダウンãƒãƒ¼ãƒ‰</translation> + </message> + <message> + <location filename="../src/globals/UIMessageCenter.cpp" line="1806"/> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/globals/UIMessageCenter.cpp" line="1816"/> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/globals/UIMessageCenter.cpp" line="1822"/> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">インストール</translation> + </message> + <message> + <location filename="../src/globals/UIMessageCenter.cpp" line="1828"/> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/globals/UIMessageCenter.cpp" line="1838"/> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/globals/UIMessageCenter.cpp" line="2097"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2115"/> <source>E&xit</source> <comment>warnAboutSettingsAutoConversion message box</comment> <translation>終了(&X)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2050"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2103"/> <source><p>The following VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.</p><p>Press <b>OK</b> to start VirtualBox now or press <b>Exit</b> if you want to terminate the VirtualBox application without any further actions.</p></source> <translation><p>次ã®VirtualBoxè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯å¤ã„å½¢å¼ã‹ã‚‰æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®VirtualBoxBoxãŒå¿…è¦ã¨ã™ã‚‹æ–°ã—ã„å½¢å¼ã«è‡ªå‹•çš„ã«å¤‰æ›´ã•ã‚Œã¾ã™ã€‚</p><p><b>[OK]</b>ボタンをクリックã—ã¦VirtualBoxã‚’èµ·å‹•ã™ã‚‹ã‹ã€è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã‚’è¡Œã‚ãšã«VirtualBoxアプリケーションを終了ã•ã›ãŸã„ãªã‚‰<b>[終了]</b>ボタンをクリックã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2075"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2128"/> <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source> <translation><p>仮想マシンã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’"フルスクリーン"モードã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚<b>%1</b>ã‚ーを押ã™ã¨ã„ã¤ã§ã‚‚ウィンドウモードã«æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p><p>注：<i>ホスト</i>ã‚ーã¯ç¾åœ¨<b>%2</b>ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚</p><p>注：フルスクリーンモードã§ã¯ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒãƒ¼ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。メニューãƒãƒ¼ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã«ã¯ <b>ホスト+Home</b>ã‚ーを押ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2095"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2148"/> <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source> <translation><p>仮想マシンã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’"シームレス"モードã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚<b>%1</b>ã‚ーを押ã™ã¨ã„ã¤ã§ã‚‚ウィンドウ表示ã«æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p><p>注：<i>ホスト</i>ã‚ーã¯ç¾åœ¨<b>%2</b>ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚</p><p>注：シームレスモードã§ã¯ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒãƒ¼ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。メニューãƒãƒ¼ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã«ã¯ <b>ホスト+Home</b>ã‚ーを押ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2115"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2168"/> <source><p>The virtual machine window will be now switched to <b>Scale</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in scale mode. You can access it by pressing <b>Host+Home</b>.</p></source> <translation><p>仮想マシンã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’"スケール"モードã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚<b>%1</b>ã‚ーを押ã™ã¨ã„ã¤ã§ã‚‚ウィンドウ表示ã«æˆ»ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p><p>注：<i>ホスト</i>ã‚ーã¯ç¾åœ¨<b>%2</b>ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚</p><p>注：スケールモードã§ã¯ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒãƒ¼ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。メニューãƒãƒ¼ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã«ã¯ <b>ホスト+Home</b>ã‚ーを押ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2123"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2176"/> <source>Switch</source> <comment>scale</comment> <translation>切り替ãˆ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2179"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2232"/> <source><p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p><p>Please check that the parent really exists and that you have permissions to create the machine folder.</p></source> <translation><p>仮想マシン フォルダ<b>%1</b>を親フォルダ<nobr><b>%2</b>ã«ä½œæˆã§ãã¾ã›ã‚“。</nobr></p><p>親フォルダã®å˜åœ¨ã¨ã€ãƒ•ã‚©ãƒ«ãƒ€ä½œæˆã«å¿…è¦ãªæ¨©é™ã®æœ‰ç„¡ã‚’確èªã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2356"/> - <location filename="../src/globals/UIMessageCenter.cpp" line="2366"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2409"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2419"/> <source>Failed to open the Extension Pack <b>%1</b>.</source> <translation>機能拡張パッケージ<b>"%1"</b>ã®ã‚ªãƒ¼ãƒ—ンã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2403"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2456"/> <source><p>You are about to install a VirtualBox extension pack. Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%1</td></tr><tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%3</td></tr></table></p></source> <translation><p>VirtualBox 機能拡張パッケージをインストールã—ã¾ã™ã€‚機能拡張パッケージã¯VirtualBoxã«æ©Ÿèƒ½ã‚’è¿½åŠ ã—ã¾ã™ãŒã€ã‚·ã‚¹ãƒ†ãƒ ã«å±å®³ã‚’与ãˆã‚‹ã‚·ã‚¹ãƒ†ãƒ レベルã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚’å«ã‚€ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ä¿¡é ¼ã§ãる発行元ã‹ã‚‰æ©Ÿèƒ½æ‹¡å¼µãƒ‘ッケージを入手ã—ãŸå ´åˆã«é™ã‚Šã€ä»¥ä¸‹ã®å†…容を確èªã—ã¦ã€å‡¦ç†ã‚’続行ã—ã¦ãã ã•ã„。</p><p><table cellpadding=0 cellspacing=0><tr><td><b>åå‰:&nbsp;&nbsp;</b></td><td>%1</td></tr><tr><td><b>ãƒãƒ¼ã‚¸ãƒ§ãƒ³:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>説明:&nbsp;&nbsp;</b></td><td>%3</td></tr></table></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2414"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2467"/> <source>&Install</source> <translation>インストール(&I)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2424"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2477"/> <source>Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</source> <translation>機能拡張パッケージã¯VirtualBoxã«æ©Ÿèƒ½ã‚’è¿½åŠ ã—ã¾ã™ãŒã€ã‚·ã‚¹ãƒ†ãƒ ã«å±å®³ã‚’与ãˆã‚‹ã‚·ã‚¹ãƒ†ãƒ レベルã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚’å«ã‚€ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ä¿¡é ¼ã§ãる発行元ã‹ã‚‰æ©Ÿèƒ½æ‹¡å¼µãƒ‘ッケージを入手ã—ãŸå ´åˆã«é™ã‚Šã€ä»¥ä¸‹ã®å†…容を確èªã—ã¦ã€å‡¦ç†ã‚’続行ã—ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2437"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2490"/> <source><p>An older version of the extension pack is already installed, would you like to upgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></source> <translation><p>å¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ©Ÿèƒ½æ‹¡å¼µãƒ‘ッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚アップグレードã—ã¾ã™ã‹ï¼Ÿ<p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>åå‰:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>ãƒãƒ¼ã‚¸ãƒ§ãƒ³:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>説明:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2447"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2500"/> <source>&Upgrade</source> <translation>アップグレード(&U)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2451"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2504"/> <source><p>An newer version of the extension pack is already installed, would you like to downgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></source> <translation><p>æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ©Ÿèƒ½æ‹¡å¼µãƒ‘ッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚ダウングレードã—ã¾ã™ã‹ï¼Ÿ<p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>åå‰:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>ãƒãƒ¼ã‚¸ãƒ§ãƒ³:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³:&nbsp;&nbsp;</b></td><td>%4</td></tr><tr><td><b>説明:&nbsp;&nbsp;</b></td><td>%5</td></tr></table></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2461"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2514"/> <source>&Downgrade</source> <translation>ダウングレード(&D)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2465"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2518"/> <source><p>The extension pack is already installed with the same version, would you like reinstall it? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td><td>%4</td></tr></table></p></source> <translation><p>åŒã˜ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ©Ÿèƒ½æ‹¡å¼µãƒ‘ッケージãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¾ã™ã‹ï¼Ÿ<p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>åå‰:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>ãƒãƒ¼ã‚¸ãƒ§ãƒ³:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>説明:&nbsp;&nbsp;</b></td><td>%4</td></tr></table></p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2474"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2527"/> <source>&Reinstall</source> <translation>å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«(&R)</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2482"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2535"/> <source><p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p><p>Are you sure you want to proceed?</p></source> <translation><p> VirtualBox 機能拡張パッケージ"<b>%1</b>"を除去ã—ã¾ã™ã€‚</p><p>続行ã—ã¾ã™ã‹ï¼Ÿ</p></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2492"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2545"/> <source>The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.</source> <translation>機能拡張パッケージ<br><nobr><b>%1</b><nobr><br>ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã«æˆåŠŸã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2613"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2666"/> <source>hard disk</source> <comment>failed to mount ...</comment> <translation>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2615"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2668"/> <source>CD/DVD</source> <comment>failed to mount ... host-drive</comment> <translation>CD/DVD</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2617"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2670"/> <source>CD/DVD image</source> <comment>failed to mount ...</comment> <translation>CD/DVD イメージ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2619"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2672"/> <source>floppy</source> <comment>failed to mount ... host-drive</comment> <translation>フãƒãƒƒãƒ”ー</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="2621"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="2674"/> <source>floppy image</source> <comment>failed to mount ...</comment> <translation>フãƒãƒƒãƒ”ー イメージ</translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3026"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3079"/> <source><p>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b><nobr>%1</nobr></b> to be installed.</p><p>Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3082"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3135"/> <source>Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3083"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3136"/> <source>VirtualBox is not currently allowed to access USB devices. You can change this by adding your user to the 'vboxusers' group. Please see the user manual for a more detailed explanation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3084"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3137"/> <source>VirtualBox is not currently allowed to access USB devices. You can change this by allowing your user to access the 'usbfs' folder and files. Please see the user manual for a more detailed explanation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3085"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3138"/> <source>The USB Proxy Service has not yet been ported to this host</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/UIMessageCenter.cpp" line="3086"/> + <location filename="../src/globals/UIMessageCenter.cpp" line="3139"/> <source>Could not load the Host USB Proxy service</source> <translation type="unfinished"></translation> </message> @@ -7305,6 +7335,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <location filename="../src/net/UIDownloaderExtensionPack.cpp" line="45"/> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/net/UIDownloaderExtensionPack.cpp" line="46"/> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <location filename="../src/runtime/UIMultiScreenLayout.cpp" line="65"/> @@ -7389,7 +7432,7 @@ as the size of the virtual hard disk.</p></source> <translation type="obsolete">上記ã®è¨å®šãŒæ£ã—ã‘ã‚Œã°ã€<b>[完了]</b>ボタンをクリックã—ã¦ãã ã•ã„。 æ–°è¦ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚¤ãƒ¡ãƒ¼ã‚¸ãŒä½œæˆã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="935"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="961"/> <source>Summary</source> <translation type="unfinished">概è¦</translation> </message> @@ -7406,7 +7449,7 @@ as the size of the virtual hard disk.</p></source> <translation type="obsolete">ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚¤ãƒ¡ãƒ¼ã‚¸(*.vdi)</translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="783"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="809"/> <source>Select a file for the new hard disk image file</source> <translation type="unfinished">æ–°è¦ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ãã ã•ã„</translation> </message> @@ -7507,135 +7550,150 @@ time depending on the image size and the write performance of your harddisk.< <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="402"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="375"/> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="377"/> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="379"/> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="408"/> <source>Welcome to the virtual disk creation wizard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="403"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="409"/> <source><p>This wizard will help you to create a new virtual disk for your virtual machine.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="405"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="411"/> <source><p>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="409"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="415"/> <source>Virtual disk file type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="410"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="416"/> <source>Please choose the type of file that you would like to use for the new virtual disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="532"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="558"/> <source>Virtual disk storage details</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="533"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="559"/> <source>Please choose whether the new virtual disk file should be allocated as it is used or if it should be created fully allocated.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="539"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="565"/> <source><p>A <b>dynamically allocated</b> virtual disk file will only use space on your physical hard disk as it fills up, although it will not shrink again automatically when space on it is freed.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="542"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="568"/> <source><p>A <b>fixed size</b> virtual disk file may take longer to create on some systems but is often faster to use.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="544"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="570"/> <source><p>You can also choose to <b>split</b> the virtual disk into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="550"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="576"/> <source>&Dynamically allocated</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="551"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="577"/> <source>&Fixed size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="552"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="578"/> <source>&Split into files of less than 2GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="649"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="675"/> <source>Virtual disk file location and size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="650"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="676"/> <source>Select the size of the virtual disk in megabytes. This size will be reported to the Guest OS as the maximum size of this virtual disk.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="653"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="679"/> <source>Virtual disk file location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="659"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="685"/> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="909"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="935"/> <source><nobr>%1 (%2 B)</nobr></source> <translation type="unfinished"><nobr>%1 (%2 B)</nobr></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="939"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="965"/> <source>You are going to create a new virtual disk with the following parameters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="942"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="968"/> <source>You are going to create a copied virtual disk with the following parameters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="947"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="973"/> <source>If the above settings are correct, press the <b>%1</b> button. Once you press it the new virtual disk file will be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="958"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="984"/> <source>%1 B</source> <translation type="unfinished">%1 B</translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="967"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="993"/> <source>File type</source> <comment>summary</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="968"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="994"/> <source>Details</source> <comment>summary</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="969"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="995"/> <source>Location</source> <comment>summary</comment> <translation type="unfinished">å ´æ‰€</translation> </message> <message> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="970"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="996"/> <source>Size</source> <comment>summary</comment> <translation type="unfinished">サイズ</translation> @@ -7699,7 +7757,7 @@ time depending on the image size and the write performance of your harddisk.< </message> <message> <location filename="../src/VBoxMediaManagerDlg.cpp" line="1067"/> - <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="687"/> + <location filename="../src/wizards/newhd/UINewHDWizard.cpp" line="713"/> <source>%1_copy</source> <comment>copied virtual disk name</comment> <translation type="unfinished"></translation> @@ -7850,12 +7908,12 @@ time depending on the image size and the write performance of your harddisk.< <context> <name>UINewVMWzd</name> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="168"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="172"/> <source>Create New Virtual Machine</source> <translation>æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ã®ä½œæˆ</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="170"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="174"/> <source>Create</source> <translation type="unfinished"></translation> </message> @@ -8077,12 +8135,12 @@ step and attach hard disks later using the VM Settings dialog.</p></source <context> <name>UINewVMWzdPage1</name> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="185"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="189"/> <source>Welcome to the New Virtual Machine Wizard!</source> <translation>よã†ã“ãæ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ä½œæˆã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¸ï¼</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="187"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="191"/> <source><p>This wizard will guide you through the steps that are necessary to create a new virtual machine for VirtualBox.</p><p>%1</p></source> <translation><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯VirtualBox用ã®æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ã‚’作æˆã™ã‚‹ãŸã‚ã«å¿…è¦ãªã‚¹ãƒ†ãƒƒãƒ—を案内ã—ã¾ã™ã€‚</p><p>%1</p></translation> </message> @@ -8105,7 +8163,7 @@ step and attach hard disks later using the VM Settings dialog.</p></source <translation>OSタイプ(&T)</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="245"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="249"/> <source>VM Name and OS Type</source> <translation>仮想マシンåã¨OSタイプ</translation> </message> @@ -8128,12 +8186,12 @@ step and attach hard disks later using the VM Settings dialog.</p></source <translation>MB</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="351"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="355"/> <source>Memory</source> <translation>メモリ</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="356"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="360"/> <source>The recommended base memory size is <b>%1</b> MB.</source> <translation>推奨ã•ã‚Œã‚‹ãƒ¡ã‚¤ãƒ³ãƒ¡ãƒ¢ãƒªã®ã‚µã‚¤ã‚ºã¯<b>%1</b>MBã§ã™ã€‚</translation> </message> @@ -8179,12 +8237,12 @@ step and attach hard disks later using the VM Settings dialog.</p></source <translation>仮想ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž...</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="445"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="449"/> <source>Virtual Hard Disk</source> <translation>仮想ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="450"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="454"/> <source>The recommended size of the start-up disk is <b>%1</b>.</source> <translation type="unfinished">推奨ã•ã‚Œã‚‹èµ·å‹•ãƒ‡ã‚£ã‚¹ã‚¯ã®ã‚µã‚¤ã‚ºã¯<b>%1</b>ã§ã™ã€‚</translation> </message> @@ -8201,24 +8259,24 @@ step and attach hard disks later using the VM Settings dialog.</p></source <translation><p>æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ã¯ä»¥ä¸‹ã®è¨å®šã§ä½œæˆã•ã‚Œã¾ã™:</p></translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="646"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="650"/> <source>Summary</source> <translation>概è¦</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="662"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="666"/> <source>Name</source> <comment>summary</comment> <translation>åå‰</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="663"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="667"/> <source>OS Type</source> <comment>summary</comment> <translation>OSタイプ</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="664"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="668"/> <source>Base Memory</source> <comment>summary</comment> <translation>メインメモリ</translation> @@ -8229,13 +8287,13 @@ step and attach hard disks later using the VM Settings dialog.</p></source <translation type="obsolete">MB</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="674"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="678"/> <source>Start-up Disk</source> <comment>summary</comment> <translation type="unfinished">èµ·å‹• ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="681"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="685"/> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> <translation><p>上記ã®è¨å®šãŒæ£ã—ã‘ã‚Œã°ã€<b>[%1]</b>ボタンをクリックã—ã¦ãã ã•ã„。新è¦ä»®æƒ³ãƒžã‚·ãƒ³ãŒä½œæˆã•ã‚Œã¾ã™ã€‚ </p><p>注：メインウィンドウã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã§ãã‚‹ <b>[è¨å®š]</b>ダイアãƒã‚°ã‚’使用ã—ã¦ã€ä½œæˆã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã®è¨å®šã‚’変更ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p></translation> </message> @@ -8403,42 +8461,42 @@ step and attach hard disks later using the VM Settings dialog.</p></source <context> <name>UISettingsDialogGlobal</name> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="479"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="473"/> <source>General</source> <translation>一般</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="482"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="476"/> <source>Input</source> <translation>入力</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="485"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="479"/> <source>Update</source> <translation>アップデート</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="488"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="482"/> <source>Language</source> <translation>言語</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="491"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="485"/> <source>USB</source> <translation>USB</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="494"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="488"/> <source>Network</source> <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="497"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="491"/> <source>Extensions</source> <translation>機能拡張</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="500"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="494"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> @@ -8451,57 +8509,57 @@ step and attach hard disks later using the VM Settings dialog.</p></source <context> <name>UISettingsDialogMachine</name> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="874"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="868"/> <source>General</source> <translation>一般</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="877"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="871"/> <source>System</source> <translation>システム</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="880"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="874"/> <source>Display</source> <translation>ディスプレイ</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="883"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="877"/> <source>Storage</source> <translation>ストレージ</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="886"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="880"/> <source>Audio</source> <translation>オーディオ</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="889"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="883"/> <source>Network</source> <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="892"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="886"/> <source>Ports</source> <translation>ãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="895"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="889"/> <source>Serial Ports</source> <translation>シリアルãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="898"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="892"/> <source>Parallel Ports</source> <translation>パラレルãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="901"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="895"/> <source>USB</source> <translation>USB</translation> </message> <message> - <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="904"/> + <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="898"/> <source>Shared Folders</source> <translation>共有フォルダ</translation> </message> @@ -8564,6 +8622,118 @@ step and attach hard disks later using the VM Settings dialog.</p></source </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="40"/> + <source>1 day</source> + <translation>1æ—¥</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="41"/> + <source>2 days</source> + <translation>2æ—¥</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="42"/> + <source>3 days</source> + <translation>3æ—¥</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="43"/> + <source>4 days</source> + <translation>4æ—¥</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="44"/> + <source>5 days</source> + <translation>5æ—¥</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="45"/> + <source>6 days</source> + <translation>6æ—¥</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="48"/> + <source>1 week</source> + <translation>1週間</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="49"/> + <source>2 weeks</source> + <translation>2週間</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="50"/> + <source>3 weeks</source> + <translation>3週間</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="53"/> + <source>1 month</source> + <translation>1月</translation> + </message> + <message> + <location filename="../src/net/UIUpdateDefs.cpp" line="103"/> + <source>Never</source> + <translation>確èªã—ãªã„</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">接続ãŒã‚¿ã‚¤ãƒ アウトã«ãªã‚Šã¾ã—ãŸã€‚</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">サーãƒãƒ¼ä¸Šã«æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ(å¿œç”: %1)。</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">確èª(&K)</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">é–‰ã˜ã‚‹(&C)</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox アップデート ウィザード</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">アップデートを確èª</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ã€VirtualBox Webサイトã«æŽ¥ç¶šã—ã¦ã€VirtualBoxã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒåˆ©ç”¨å¯èƒ½ã‹ã©ã†ã‹ç¢ºèªã—ã¾ã™ã€‚</p><p><b>[確èª]</b>ボタンをクリックã—ã¦æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’今ã™ã確èªã—ã¦ãã ã•ã„。確èªã—ãªã„å ´åˆã¯<b>[ã‚ャンセル]</b>ボタンをクリックã—ã¦ãã ã•ã„。</p><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯<b>[ヘルプ]</b>メニューã‹ã‚‰<b>[アップデートを確èª...]</b>ã‚’é¸ã¶ã“ã¨ã§ã€ã„ã¤ã§ã‚‚実行ã§ãã¾ã™ã€‚</p></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">ã‚ャンセル</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">概è¦</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>VirtualBoxã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¾ã—ãŸï¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ <b>%1</b>ã¯<a href="http://www.virtualbox.org/">virtualbox.org</a>ã‹ã‚‰å…¥æ‰‹ã§ãã¾ã™ã€‚</p><p>ã“ã®ãƒªãƒ³ã‚¯ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚: </p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’å–å¾—ã§ãã¾ã›ã‚“:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">最新ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®VirtualBoxãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚ 後ã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç¢ºèªã‚’è¡Œã£ã¦ãã ã•ã„。</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ã€VirtualBox Webサイトã«æŽ¥ç¶šã—ã¦ã€VirtualBoxã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒåˆ©ç”¨å¯èƒ½ã‹ã©ã†ã‹ç¢ºèªã—ã¾ã™ã€‚</p><p><b>[確èª]</b>ボタンをクリックã—ã¦æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’今ã™ã確èªã—ã¦ãã ã•ã„。確èªã—ãªã„å ´åˆã¯<b>[ã‚ャンセル]</b>ボタンをクリックã—ã¦ãã ã•ã„。</p><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯<b>[ヘルプ]</b>メニューã‹ã‚‰<b>[アップデートを確èª...]</b>ã‚’é¸ã¶ã“ã¨ã§ã€ã„ã¤ã§ã‚‚実行ã§ãã¾ã™ã€‚</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <location filename="../src/runtime/UIVMCloseDialog.ui" line="26"/> @@ -9134,16 +9304,6 @@ Version %1</source> <translation type="obsolete">ヘルプ(&H)</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">ゲストOSã®ç”»é¢ã®è‡ªå‹•ãƒªã‚µã‚¤ã‚ºæ©Ÿèƒ½ãŒæœ‰åŠ¹ãªã¨ã(<img src=auto_resize_on_16px.png/>)ã‚’ã€ç„¡åŠ¹ãªã¨ã(<img src=auto_resize_off_16px.png/>)を表示ã—ã¾ã™ã€‚注：本機能ã®åˆ©ç”¨ã«ã¯ã‚²ã‚¹ãƒˆOSã« Guest Additions ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå¿…è¦ã§ã™ã€‚ -</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">ホスト マウスãƒã‚¤ãƒ³ã‚¿ã®ã‚ャプãƒãƒ£çŠ¶æ…‹ã‚’表示:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã¾ã›ã‚“</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã¾ã™</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;マウス統åˆã¯æœ‰åŠ¹ã§ã™</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;マウス統åˆã¯ç„¡åŠ¹ã€ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã¾ã™</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;マウス統åˆã¯ç„¡åŠ¹ã€ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã¾ã›ã‚“</nobr><br> 注：マウス統åˆæ©Ÿèƒ½ã®åˆ©ç”¨ã«ã¯ã‚²ã‚¹ãƒˆOSã« Guest Additions ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå¿…è¦ã§ã™ã€‚ -</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">ç¾åœ¨å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„るホストã‚ーを表示ã—ã¾ã™ã€‚<br>ホストã‚ーをå˜ç‹¬ã§æŠ¼ã™ã¨ã€ã‚ーボートã¨ãƒžã‚¦ã‚¹ã®åˆ¶å¾¡ãŒåˆ‡ã‚Šæ›¿ã‚ã‚Šã¾ã™ã€‚ã¾ãŸã€ä»–ã®ã‚ーã¨åˆã‚ã›ã¦ã‚ーボード ショートカットã®æ“作ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</translation> </message> @@ -9231,10 +9391,6 @@ Version %1</source> <translation type="obsolete">シームレスモードã«åˆ‡ã‚Šæ›¿ãˆã‚‹</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">ã‚ーボードãŒã‚²ã‚¹ãƒˆOSã«ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã‚‹ã¨ã(<img src=hostkey_captured_16px.png/>)ã‚’ã€ç„¡åŠ¹ãªã¨ã(<img src=hostkey_16px.png/>)を表示ã—ã¾ã™ã€‚</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>フãƒãƒƒãƒ”ーメディアã®çŠ¶æ…‹ã‚’表示:</nobr>%1</qt></translation> @@ -9325,10 +9481,6 @@ Version %1</source> <translation type="obsolete"><br><nobr><b>USB コントãƒãƒ¼ãƒ©ãŒç„¡åŠ¹</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">リモートディスプレイ(VRDPサーãƒ)機能ãŒæœ‰åŠ¹ãªã¨ã(<img src=vrdp_16px.png/>) ã‚’ã€ç„¡åŠ¹ãªã¨ã (<img src=vrdp_disabled_16px.png/>)を表示ã—ã¾ã™ã€‚</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>共有フォルダã®çŠ¶æ…‹ã‚’表示:</nobr>%1</qt></translation> @@ -9378,18 +9530,6 @@ Version %1</source> <translation type="obsolete">ãƒã‚°å–å¾—(&L)...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">ゲストOSã®ç”»é¢ã®è‡ªå‹•ãƒªã‚µã‚¤ã‚ºæ©Ÿèƒ½ãŒæœ‰åŠ¹ãªã¨ã(<img src=:/auto_resize_on_16px.png/>)ã‚’ã€ç„¡åŠ¹ãªã¨ã(<img src=:/auto_resize_off_16px.png/>)を表示ã—ã¾ã™ã€‚注：本機能ã®åˆ©ç”¨ã«ã¯ã‚²ã‚¹ãƒˆOSã« Guest Additions ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå¿…è¦ã§ã™ã€‚</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">ホスト マウスãƒã‚¤ãƒ³ã‚¿ã®ã‚ャプãƒãƒ£çŠ¶æ…‹ã‚’表示:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã¾ã›ã‚“</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã¾ã™</nobr><br><nobr><<img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;マウス統åˆã¯æœ‰åŠ¹ã§ã™</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;マウス統åˆã¯ç„¡åŠ¹ã€ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã¾ã™</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;マウス統åˆã¯ç„¡åŠ¹ã€ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã¾ã›ã‚“</nobr><br> 注：マウス統åˆæ©Ÿèƒ½ã®åˆ©ç”¨ã«ã¯ã‚²ã‚¹ãƒˆOSã« Guest Additions ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒå¿…è¦ã§ã™ã€‚</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">ã‚ーボードãŒã‚²ã‚¹ãƒˆOSã«ã‚ャプãƒãƒ£ã•ã‚Œã¦ã„ã‚‹ã¨ã(<img src=:/hostkey_captured_16px.png/>ã‚’ã€ç„¡åŠ¹ãªã¨ã(<img src=:/hostkey_16px.png/>)を表示ã—ã¾ã™ã€‚</translation> - </message> - <message> <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> <translation type="obsolete">リモートディスプレイ(VRDPサーãƒãƒ¼)機能ãŒæœ‰åŠ¹ãªã¨ã(<img src=:/vrdp_16px.png/>) ã‚’ã€ç„¡åŠ¹ãªã¨ã (<img src=:/vrdp_disabled_16px.png/>)を表示ã—ã¾ã™ã€‚</translation> </message> @@ -9977,43 +10117,43 @@ Version %1</source> <translation type="obsolete">差分</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1445"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1456"/> <source>Unknown device %1:%2</source> <comment>USB device details</comment> <translation>ä¸æ˜Žãªãƒ‡ãƒã‚¤ã‚¹ %1:%2</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1470"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1481"/> <source><nobr>Vendor ID: %1</nobr><br><nobr>Product ID: %2</nobr><br><nobr>Revision: %3</nobr></source> <comment>USB device tooltip</comment> <translation><nobr>ベンダID: %1</nobr><br><nobr>プãƒãƒ€ã‚¯ãƒˆID: %2</nobr><br><nobr>リビジョン: %3</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1479"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1490"/> <source><br><nobr>Serial No. %1</nobr></source> <comment>USB device tooltip</comment> <translation><br><nobr>シリアルNo. %1</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1486"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1497"/> <source><br><nobr>State: %1</nobr></source> <comment>USB device tooltip</comment> <translation><br><nobr>状態: %1</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1581"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1592"/> <source>Name</source> <comment>details report</comment> <translation>åå‰</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1583"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1594"/> <source>OS Type</source> <comment>details report</comment> <translation>OSタイプ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1653"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1664"/> <source>Base Memory</source> <comment>details report</comment> <translation>メインメモリ</translation> @@ -10024,13 +10164,13 @@ Version %1</source> <translation type="obsolete"><nobr>%3 MB</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1590"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1601"/> <source>General</source> <comment>details report</comment> <translation>一般</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1689"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1700"/> <source>Video Memory</source> <comment>details report</comment> <translation>ビデオメモリ</translation> @@ -10041,19 +10181,19 @@ Version %1</source> <translation type="obsolete"><nobr>%4 MB</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1662"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1673"/> <source>Boot Order</source> <comment>details report</comment> <translation>èµ·å‹•é †åº</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1664"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1675"/> <source>ACPI</source> <comment>details report</comment> <translation>ACPI</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1665"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1676"/> <source>IO APIC</source> <comment>details report</comment> <translation>IO APIC</translation> @@ -10069,25 +10209,25 @@ Version %1</source> <translation type="obsolete">ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1621"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1632"/> <source>Enabled</source> <comment>details report (ACPI)</comment> <translation>有効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1622"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1633"/> <source>Disabled</source> <comment>details report (ACPI)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1626"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1637"/> <source>Enabled</source> <comment>details report (IO APIC)</comment> <translation>有効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1627"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1638"/> <source>Disabled</source> <comment>details report (IO APIC)</comment> <translation>無効</translation> @@ -10133,50 +10273,50 @@ Version %1</source> <translation type="obsolete">CD/DVD-ROM</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1830"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1841"/> <source>Disabled</source> <comment>details report (audio)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1836"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1847"/> <source>Audio</source> <comment>details report</comment> <translation>オーディオ</translation> </message> <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="653"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1873"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1884"/> <source>Adapter %1</source> <comment>details report (network)</comment> <translation>アダプタ %1</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1882"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1893"/> <source>Disabled</source> <comment>details report (network)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1890"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1901"/> <source>Network</source> <comment>details report</comment> <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1997"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2008"/> <source>Device Filters</source> <comment>details report (USB)</comment> <translation>デãƒã‚¤ã‚¹ フィルタ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1998"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2009"/> <source>%1 (%2 active)</source> <comment>details report (USB)</comment> <translation>%1 (%2 アクティブ)</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2003"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2014"/> <source>Disabled</source> <comment>details report (USB)</comment> <translation>無効</translation> @@ -10206,55 +10346,55 @@ Version %1</source> <translation type="obsolete">"URLã‚’é–‹ã"ã¯ã¾ã 実装ã•ã‚Œã¦ã„ã¾ã›ã‚“。</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2885"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2896"/> <source>Powered Off</source> <comment>MachineState</comment> <translation>é›»æºã‚ªãƒ•</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2886"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2897"/> <source>Saved</source> <comment>MachineState</comment> <translation>ä¿å˜</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2888"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2899"/> <source>Aborted</source> <comment>MachineState</comment> <translation>ä¸æ–</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2889"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2900"/> <source>Running</source> <comment>MachineState</comment> <translation>実行ä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2890"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2901"/> <source>Paused</source> <comment>MachineState</comment> <translation>一時åœæ¢</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2894"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2905"/> <source>Starting</source> <comment>MachineState</comment> <translation>èµ·å‹•ä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2895"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2906"/> <source>Stopping</source> <comment>MachineState</comment> <translation>åœæ¢ä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2896"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2907"/> <source>Saving</source> <comment>MachineState</comment> <translation>ä¿å˜ä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2897"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2908"/> <source>Restoring</source> <comment>MachineState</comment> <translation>復元ä¸</translation> @@ -10275,7 +10415,7 @@ Version %1</source> <translation type="obsolete">オープン</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2909"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2920"/> <source>Spawning</source> <comment>SessionState</comment> <translation>生æˆä¸</translation> @@ -10286,49 +10426,49 @@ Version %1</source> <translation type="obsolete">閉鎖ä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2912"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2923"/> <source>None</source> <comment>DeviceType</comment> <translation>ãªã—</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2913"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2924"/> <source>Floppy</source> <comment>DeviceType</comment> <translation>フãƒãƒƒãƒ”ー</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2914"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2925"/> <source>CD/DVD-ROM</source> <comment>DeviceType</comment> <translation>CD/DVD-ROM</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2915"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2926"/> <source>Hard Disk</source> <comment>DeviceType</comment> <translation>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2916"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2927"/> <source>Network</source> <comment>DeviceType</comment> <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2943"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2954"/> <source>Normal</source> <comment>DiskType</comment> <translation>標準</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2944"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2955"/> <source>Immutable</source> <comment>DiskType</comment> <translation>変更ä¸å¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2945"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2956"/> <source>Writethrough</source> <comment>DiskType</comment> <translation>ライトスルー</translation> @@ -10364,61 +10504,61 @@ Version %1</source> <translation type="obsolete">ゲスト</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2961"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2972"/> <source>Ignore</source> <comment>USBFilterActionType</comment> <translation>無視</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2963"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2974"/> <source>Hold</source> <comment>USBFilterActionType</comment> <translation>ä¿æŒ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2966"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2977"/> <source>Null Audio Driver</source> <comment>AudioDriverType</comment> <translation>Null Audio Driver</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2968"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2979"/> <source>Windows Multimedia</source> <comment>AudioDriverType</comment> <translation>Windows マルãƒãƒ¡ãƒ‡ã‚£ã‚¢</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2972"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2983"/> <source>OSS Audio Driver</source> <comment>AudioDriverType</comment> <translation>OSS オーディオ ドライãƒ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2974"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2985"/> <source>ALSA Audio Driver</source> <comment>AudioDriverType</comment> <translation>ALSA オーディオ ドライãƒ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2976"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2987"/> <source>Windows DirectSound</source> <comment>AudioDriverType</comment> <translation>Windows DirectSound</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2978"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2989"/> <source>CoreAudio</source> <comment>AudioDriverType</comment> <translation>CoreAudio</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3005"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3016"/> <source>Not attached</source> <comment>NetworkAttachmentType</comment> <translation>未割り当ã¦</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3007"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3018"/> <source>NAT</source> <comment>NetworkAttachmentType</comment> <translation>NAT</translation> @@ -10429,73 +10569,73 @@ Version %1</source> <translation type="obsolete">ホスト インターフェース</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3011"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3022"/> <source>Internal Network</source> <comment>NetworkAttachmentType</comment> <translation>内部ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3015"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3026"/> <source>Generic Driver</source> <comment>NetworkAttachmentType</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3018"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3029"/> <source>Deny</source> <comment>NetworkAdapterPromiscModePolicyType</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3020"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3031"/> <source>Allow VMs</source> <comment>NetworkAdapterPromiscModePolicyType</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3022"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3033"/> <source>Allow All</source> <comment>NetworkAdapterPromiscModePolicyType</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3053"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3064"/> <source>LsiLogic SAS</source> <comment>StorageControllerType</comment> <translation>LsiLogic SAS</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3056"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3067"/> <source>Not supported</source> <comment>USBDeviceState</comment> <translation>未サãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3058"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3069"/> <source>Unavailable</source> <comment>USBDeviceState</comment> <translation>利用ä¸å¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3060"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3071"/> <source>Busy</source> <comment>USBDeviceState</comment> <translation>ビジー</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3062"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3073"/> <source>Available</source> <comment>USBDeviceState</comment> <translation>利用å¯èƒ½</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3064"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3075"/> <source>Held</source> <comment>USBDeviceState</comment> <translation>ä¿æŒ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3066"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3077"/> <source>Captured</source> <comment>USBDeviceState</comment> <translation>ã‚ャプãƒãƒ£</translation> @@ -10511,25 +10651,25 @@ Version %1</source> <translation type="obsolete"><i>アクセスä¸å¯</i></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3030"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3041"/> <source>Disabled</source> <comment>ClipboardType</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3032"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3043"/> <source>Host To Guest</source> <comment>ClipboardType</comment> <translation>ホストOSã‹ã‚‰ã‚²ã‚¹ãƒˆOSã¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3034"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3045"/> <source>Guest To Host</source> <comment>ClipboardType</comment> <translation>ゲストOSã‹ã‚‰ãƒ›ã‚¹ãƒˆOSã¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3036"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3047"/> <source>Bidirectional</source> <comment>ClipboardType</comment> <translation>åŒæ–¹å‘</translation> @@ -10543,31 +10683,31 @@ Version %1</source> <translation type="obsolete">ファイルをé¸æŠž</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1918"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1929"/> <source>Port %1</source> <comment>details report (serial ports)</comment> <translation>ãƒãƒ¼ãƒˆ %1</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1927"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1938"/> <source>Disabled</source> <comment>details report (serial ports)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1935"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1946"/> <source>Serial Ports</source> <comment>details report</comment> <translation>シリアルãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2009"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2020"/> <source>USB</source> <comment>details report</comment> <translation>USB</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2022"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2033"/> <source>Shared Folders</source> <comment>details report (shared folders)</comment> <translation>共有フォルダ</translation> @@ -10578,13 +10718,13 @@ Version %1</source> <translation type="obsolete">%1</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2027"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2038"/> <source>None</source> <comment>details report (shared folders)</comment> <translation>ãªã—</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2033"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2044"/> <source>Shared Folders</source> <comment>details report</comment> <translation>共有フォルダ</translation> @@ -10595,37 +10735,37 @@ Version %1</source> <translation type="obsolete">スタック</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2955"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2966"/> <source>Disconnected</source> <comment>PortMode</comment> <translation>切æ–</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2956"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2967"/> <source>Host Pipe</source> <comment>PortMode</comment> <translation>ホストã«ãƒ‘イプ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2957"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2968"/> <source>Host Device</source> <comment>PortMode</comment> <translation>ホスト デãƒã‚¤ã‚¹</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3069"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3080"/> <source>PIIX3</source> <comment>ChipsetType</comment> <translation>PIIX3</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3071"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3082"/> <source>ICH9</source> <comment>ChipsetType</comment> <translation>ICH9</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3073"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3084"/> <source>User-defined</source> <comment>serial port</comment> <translation>ユーザー定義</translation> @@ -10637,21 +10777,21 @@ Version %1</source> </message> <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="492"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1671"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1682"/> <location filename="../src/runtime/UIIndicatorsPool.cpp" line="577"/> <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="1666"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1677"/> <source>PAE/NX</source> <comment>details report</comment> <translation>PAE/NX</translation> </message> <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="464"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1639"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1650"/> <location filename="../src/runtime/UIIndicatorsPool.cpp" line="560"/> <source>Enabled</source> <comment>details report (VT-x/AMD-V)</comment> @@ -10659,7 +10799,7 @@ Version %1</source> </message> <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="465"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1640"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1651"/> <location filename="../src/runtime/UIIndicatorsPool.cpp" line="561"/> <source>Disabled</source> <comment>details report (VT-x/AMD-V)</comment> @@ -10667,122 +10807,122 @@ Version %1</source> </message> <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="496"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1727"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1738"/> <source>Remote Desktop Server Port</source> <comment>details report (VRDE Server)</comment> <translation>リモートデスクトップ サーãƒãƒ¼ ãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1631"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1642"/> <source>Enabled</source> <comment>details report (PAE/NX)</comment> <translation>有効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1632"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1643"/> <source>Disabled</source> <comment>details report (PAE/NX)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1659"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1670"/> <location filename="../src/runtime/UIIndicatorsPool.cpp" line="579"/> <source>Execution Cap</source> <comment>details report</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1660"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1671"/> <source><nobr>%1%</nobr></source> <comment>details report</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1823"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1834"/> <source>Host Driver</source> <comment>details report (audio)</comment> <translation>ホスト ドライãƒ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1826"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1837"/> <source>Controller</source> <comment>details report (audio)</comment> <translation>コントãƒãƒ¼ãƒ©</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1867"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1878"/> <source>Generic, '%1'</source> <comment>details report (network)</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1956"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1967"/> <source>Port %1</source> <comment>details report (parallel ports)</comment> <translation>ãƒãƒ¼ãƒˆ %1</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1965"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1976"/> <source>Disabled</source> <comment>details report (parallel ports)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1974"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1985"/> <source>Parallel Ports</source> <comment>details report</comment> <translation>パラレルãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2917"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2928"/> <source>USB</source> <comment>DeviceType</comment> <translation>USB</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2918"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2929"/> <source>Shared Folder</source> <comment>DeviceType</comment> <translation>共有フォルダ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2920"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2931"/> <source>IDE</source> <comment>StorageBus</comment> <translation>IDE</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2921"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2932"/> <source>SATA</source> <comment>StorageBus</comment> <translation>SATA</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2926"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2937"/> <source>Primary</source> <comment>StorageBusChannel</comment> <translation>プライマリ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2927"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2938"/> <source>Secondary</source> <comment>StorageBusChannel</comment> <translation>セカンダリ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2930"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2941"/> <source>Master</source> <comment>StorageBusDevice</comment> <translation>マスター</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2931"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2942"/> <source>Slave</source> <comment>StorageBusDevice</comment> <translation>スレーブ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2928"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2939"/> <source>Port %1</source> <comment>StorageBusChannel</comment> <translation>ãƒãƒ¼ãƒˆ %1</translation> @@ -10793,43 +10933,43 @@ Version %1</source> <translation type="obsolete">VHDイメージ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2970"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2981"/> <source>Solaris Audio</source> <comment>AudioDriverType</comment> <translation>Solaris オーディオ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2980"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2991"/> <source>PulseAudio</source> <comment>AudioDriverType</comment> <translation>PulseAudio</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2983"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2994"/> <source>ICH AC97</source> <comment>AudioControllerType</comment> <translation>ICH AC97</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2985"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2996"/> <source>SoundBlaster 16</source> <comment>AudioControllerType</comment> <translation>SoundBlaster 16</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2990"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3001"/> <source>PCnet-PCI II (Am79C970A)</source> <comment>NetworkAdapterType</comment> <translation>PCnet-PCI II (Am79C970A)</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2992"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3003"/> <source>PCnet-FAST III (Am79C973)</source> <comment>NetworkAdapterType</comment> <translation>PCnet-FAST III (Am79C973)</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2994"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3005"/> <source>Intel PRO/1000 MT Desktop (82540EM)</source> <comment>NetworkAdapterType</comment> <translation>Intel PRO/1000 MT Desktop (82540EM)</translation> @@ -10845,55 +10985,55 @@ Version %1</source> <translation type="obsolete">PIIX4</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2996"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3007"/> <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="1502"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1513"/> <source><nobr>Vendor ID: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>ベンダID: %1</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1507"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1518"/> <source><nobr>Product ID: %2</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>プãƒãƒ€ã‚¯ãƒˆID: %2</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1512"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1523"/> <source><nobr>Revision: %3</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>リビジョン: %3</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1517"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1528"/> <source><nobr>Product: %4</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>製å“: %4</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1522"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1533"/> <source><nobr>Manufacturer: %5</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>メーカー: %5</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1527"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1538"/> <source><nobr>Serial No.: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>シリアルNo.: %1</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1532"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1543"/> <source><nobr>Port: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>ãƒãƒ¼ãƒˆ: %1</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1539"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1550"/> <source><nobr>State: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>状態: %1</nobr></translation> @@ -10964,52 +11104,52 @@ Version %1</source> <translation type="obsolete">%1<hr>ã“ã®ãƒ™ãƒ¼ã‚¹ ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã¯ä»¥ä¸‹ã®å·®åˆ†ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’使用ã—ã¦é–“接的ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¾ã™:<br>%2%3</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1708"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1719"/> <source>3D Acceleration</source> <comment>details report</comment> <translation>3Dアクセラレーション</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1704"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1715"/> <source>Enabled</source> <comment>details report (3D Acceleration)</comment> <translation>有効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1705"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1716"/> <source>Disabled</source> <comment>details report (3D Acceleration)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2904"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2915"/> <source>Setting Up</source> <comment>MachineState</comment> <translation>セットアップ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2949"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2960"/> <source>Differencing</source> <comment>DiskType</comment> <translation>差分</translation> </message> <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="493"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1672"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1683"/> <source>Nested Paging</source> <comment>details report</comment> <translation>ãƒã‚¹ãƒ†ãƒƒãƒ‰ãƒšãƒ¼ã‚¸ãƒ³ã‚°</translation> </message> <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="467"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1644"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1655"/> <source>Enabled</source> <comment>details report (Nested Paging)</comment> <translation>有効</translation> </message> <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="468"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1645"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1656"/> <source>Disabled</source> <comment>details report (Nested Paging)</comment> <translation>無効</translation> @@ -11020,7 +11160,7 @@ Version %1</source> <translation type="obsolete">ブリッジ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯, '%1'</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1861"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1872"/> <source>Internal network, '%1'</source> <comment>details report (network)</comment> <translation>内部ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯, '%1'</translation> @@ -11031,7 +11171,7 @@ Version %1</source> <translation type="obsolete">ホストオンリー ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯, '%1'</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2922"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2933"/> <source>SCSI</source> <comment>StorageBus</comment> <translation>SCSI</translation> @@ -11047,93 +11187,93 @@ Version %1</source> <translation type="obsolete">ホストオンリー ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3039"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3050"/> <source>PIIX3</source> <comment>StorageControllerType</comment> <translation>PIIX3</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3041"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3052"/> <source>PIIX4</source> <comment>StorageControllerType</comment> <translation>PIIX4</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3043"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3054"/> <source>ICH6</source> <comment>StorageControllerType</comment> <translation>ICH6</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3045"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3056"/> <source>AHCI</source> <comment>StorageControllerType</comment> <translation>AHCI</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3047"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3058"/> <source>Lsilogic</source> <comment>StorageControllerType</comment> <translation>Lsilogic</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3049"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3060"/> <source>BusLogic</source> <comment>StorageControllerType</comment> <translation>BusLogic</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1858"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1869"/> <source>Bridged adapter, %1</source> <comment>details report (network)</comment> <translation>ブリッジ アダプタ, '%1'</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1864"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1875"/> <source>Host-only adapter, '%1'</source> <comment>details report (network)</comment> <translation>ホストオンリー アダプタ, '%1'</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2998"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3009"/> <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="3009"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3020"/> <source>Bridged Adapter</source> <comment>NetworkAttachmentType</comment> <translation>ブリッジ アダプタ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3013"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3024"/> <source>Host-only Adapter</source> <comment>NetworkAttachmentType</comment> <translation>ホストオンリー アダプタ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1654"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="1690"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1665"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1701"/> <source><nobr>%1 MB</nobr></source> <comment>details report</comment> <translation><nobr>%1 MB</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1656"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1667"/> <location filename="../src/runtime/UIIndicatorsPool.cpp" line="584"/> <source>Processor(s)</source> <comment>details report</comment> <translation>プãƒã‚»ãƒƒã‚µæ•°</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1657"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1668"/> <source><nobr>%1</nobr></source> <comment>details report</comment> <translation><nobr>%1</nobr></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1678"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1689"/> <source>System</source> <comment>details report</comment> <translation>システム</translation> @@ -11154,92 +11294,92 @@ Version %1</source> <translation type="obsolete">無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1740"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1751"/> <source>Display</source> <comment>details report</comment> <translation>ディスプレイ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2958"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2969"/> <source>Raw File</source> <comment>PortMode</comment> <translation>Rawファイル</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1713"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1724"/> <source>Enabled</source> <comment>details report (2D Video Acceleration)</comment> <translation>有効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1253"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1264"/> <source>Dynamically allocated storage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1255"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1266"/> <source>Fixed size storage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1257"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1268"/> <source>Dynamically allocated storage split into files of less than 2GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1259"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1270"/> <source>Fixed size storage split into files of less than 2GB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1436"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1447"/> <source>Unknown device</source> <comment>USB device details</comment> <translation></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1698"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1709"/> <source>Screens</source> <comment>details report</comment> <translation>スクリーン</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1714"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1725"/> <source>Disabled</source> <comment>details report (2D Video Acceleration)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1717"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1728"/> <source>2D Video Acceleration</source> <comment>details report</comment> <translation>2Dビデオ アクセラレーション</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1731"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1742"/> <source>Remote Desktop Server</source> <comment>details report (VRDE Server)</comment> <translation>リモートデスクトップ サーãƒãƒ¼</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1732"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1743"/> <source>Disabled</source> <comment>details report (VRDE Server)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1771"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1782"/> <source>(CD/DVD)</source> <translation>(CD/DVD)</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1803"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1814"/> <source>Not Attached</source> <comment>details report (Storage)</comment> <translation>未割り当ã¦</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="1811"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="1822"/> <source>Storage</source> <comment>details report</comment> <translation>ストレージ</translation> @@ -11250,224 +11390,224 @@ Version %1</source> <translation type="obsolete">VDE ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯, '%1'</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2691"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2702"/> <source>Choose a virtual hard disk file</source> <translation>仮想ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ãƒ•ã‚¡ã‚¤ãƒ«ã®é¸æŠž</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2692"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2703"/> <source>hard disk</source> <translation>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2703"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2714"/> <source>Choose a virtual CD/DVD disk file</source> <translation>仮想CD/DVDディスクファイルã®é¸æŠž</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2704"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2715"/> <source>CD/DVD-ROM disk</source> <translation>CD/DVD-ROMディスク</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2715"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2726"/> <source>Choose a virtual floppy disk file</source> <translation>仮想フãƒãƒƒãƒ”ーディスクファイルã®é¸æŠž</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2716"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2727"/> <source>floppy disk</source> <translation>フãƒãƒƒãƒ”ーディスク</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2741"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2752"/> <source>All %1 images (%2)</source> <translation>ã™ã¹ã¦ã®%1イメージ(%2)</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2742"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2753"/> <source>All files (*)</source> <translation>ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*)</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2887"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2898"/> <source>Teleported</source> <comment>MachineState</comment> <translation>テレãƒãƒ¼ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2891"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2902"/> <source>Guru Meditation</source> <comment>MachineState</comment> <translation>瞑想ä¸(システムエラー)</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2892"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="2899"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2903"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2910"/> <source>Teleporting</source> <comment>MachineState</comment> <translation>テレãƒãƒ¼ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2893"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2904"/> <source>Taking Live Snapshot</source> <comment>MachineState</comment> <translation>スナップショットã®ä½œæˆä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2898"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2909"/> <source>Teleporting Paused VM</source> <comment>MachineState</comment> <translation>仮想マシンã®ãƒ†ãƒ¬ãƒãƒ¼ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ä¸æ–</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2900"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2911"/> <source>Restoring Snapshot</source> <comment>MachineState</comment> <translation>スナップショットã«å¾©å…ƒä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2901"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="2902"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="2903"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2912"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2913"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2914"/> <source>Deleting Snapshot</source> <comment>MachineState</comment> <translation>スナップショットを削除ä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2905"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2916"/> <source>Fault Tolerant Syncing</source> <comment>MachineState</comment> <translation>フォールトトレラントã®åŒæœŸä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2907"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2918"/> <source>Unlocked</source> <comment>SessionState</comment> <translation>アンãƒãƒƒã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2908"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2919"/> <source>Locked</source> <comment>SessionState</comment> <translation>ãƒãƒƒã‚¯</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2910"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2921"/> <source>Unlocking</source> <comment>SessionState</comment> <translation>アンãƒãƒƒã‚¯ä¸</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2923"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2934"/> <source>Floppy</source> <comment>StorageBus</comment> <translation>フãƒãƒƒãƒ”ー</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2924"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2935"/> <source>SAS</source> <comment>StorageBus</comment> <translation>SAS</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2932"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2943"/> <source>Device %1</source> <comment>StorageBusDevice</comment> <translation>デãƒã‚¤ã‚¹ %1</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2934"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2945"/> <source>IDE Primary Master</source> <comment>New Storage UI : Slot Name</comment> <translation>IDE プライマリ マスター</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2935"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2946"/> <source>IDE Primary Slave</source> <comment>New Storage UI : Slot Name</comment> <translation>IDE プライマリ スレーブ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2936"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2947"/> <source>IDE Secondary Master</source> <comment>New Storage UI : Slot Name</comment> <translation>IDE セカンダリ マスター</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2937"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2948"/> <source>IDE Secondary Slave</source> <comment>New Storage UI : Slot Name</comment> <translation>IDE セカンダリ スレーブ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2938"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2949"/> <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="2939"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2950"/> <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="2940"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2951"/> <source>SAS Port %1</source> <comment>New Storage UI : Slot Name</comment> <translation>SAS ãƒãƒ¼ãƒˆ %1</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2941"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2952"/> <source>Floppy Device %1</source> <comment>New Storage UI : Slot Name</comment> <translation>フãƒãƒƒãƒ”ー デãƒã‚¤ã‚¹ %1</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2946"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2957"/> <source>Shareable</source> <comment>DiskType</comment> <translation>共有å¯èƒ½</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2947"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2958"/> <source>Readonly</source> <comment>DiskType</comment> <translation>èªã¿è¾¼ã¿å°‚用</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2948"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2959"/> <source>Multi-attach</source> <comment>DiskType</comment> <translation>複数割り当ã¦</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2951"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2962"/> <source>Null</source> <comment>AuthType</comment> <translation>Null</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2952"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2963"/> <source>External</source> <comment>AuthType</comment> <translation>外部</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2953"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2964"/> <source>Guest</source> <comment>AuthType</comment> <translation>ゲスト</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="2987"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="2998"/> <source>Intel HD Audio</source> <comment>AudioControllerType</comment> <translation>Intel HD オーディオ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3001"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3012"/> <source>Paravirtualized Network (virtio-net)</source> <comment>NetworkAdapterType</comment> <translation>準仮想化ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ (virtio-net)</translation> @@ -11478,25 +11618,25 @@ Version %1</source> <translation type="obsolete">VDE アダプタ</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3025"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3036"/> <source>UDP</source> <comment>NATProtocolType</comment> <translation>UDP</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3027"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3038"/> <source>TCP</source> <comment>NATProtocolType</comment> <translation>TCP</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3051"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3062"/> <source>I82078</source> <comment>StorageControllerType</comment> <translation>I82078</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3673"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3684"/> <source>and</source> <translation>and</translation> </message> @@ -11506,27 +11646,27 @@ Version %1</source> <translation type="obsolete">^(?:(?:(\d+)(?:\s?(B|KB|MB|GB|TB|PB))?)|(?:(\d*)%1(\d{1,2})(?:\s?(KB|MB|GB|TB|PB))))$</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3650"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3701"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3761"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3661"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3712"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3772"/> <source>B</source> <comment>size suffix Bytes</comment> <translation>B</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3651"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3703"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3762"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3662"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3714"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3773"/> <source>KB</source> <comment>size suffix KBytes=1024 Bytes</comment> <translation>KB</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3652"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3705"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3763"/> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="359"/> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="360"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3663"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3716"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3774"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="363"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="364"/> <location filename="../src/widgets/UIApplianceEditorWidget.cpp" line="236"/> <location filename="../src/widgets/UIApplianceEditorWidget.cpp" line="427"/> <source>MB</source> @@ -11534,25 +11674,25 @@ Version %1</source> <translation>MB</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3653"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3707"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3764"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3664"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3718"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3775"/> <source>GB</source> <comment>size suffix GBytes=1024 MBytes</comment> <translation>GB</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3654"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3709"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3765"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3665"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3720"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3776"/> <source>TB</source> <comment>size suffix TBytes=1024 GBytes</comment> <translation>TB</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="3655"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3711"/> - <location filename="../src/globals/VBoxGlobal.cpp" line="3766"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3666"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3722"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="3777"/> <source>PB</source> <comment>size suffix PBytes=1024 TBytes</comment> <translation>PB</translation> @@ -11646,42 +11786,42 @@ Version %1</source> <translation>ã“ã®ãƒ™ãƒ¼ã‚¹ ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã¯ä»¥ä¸‹ã®å·®åˆ†ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’使用ã—ã¦é–“接的ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¾ã™:</translation> </message> <message numerus="yes"> - <location filename="../src/globals/VBoxGlobal.h" line="219"/> + <location filename="../src/globals/VBoxGlobal.h" line="222"/> <source>%n year(s)</source> <translation> <numerusform>%n å¹´</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../src/globals/VBoxGlobal.h" line="224"/> + <location filename="../src/globals/VBoxGlobal.h" line="227"/> <source>%n month(s)</source> <translation> <numerusform>%n 月</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../src/globals/VBoxGlobal.h" line="229"/> + <location filename="../src/globals/VBoxGlobal.h" line="232"/> <source>%n day(s)</source> <translation> <numerusform>%n æ—¥</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../src/globals/VBoxGlobal.h" line="234"/> + <location filename="../src/globals/VBoxGlobal.h" line="237"/> <source>%n hour(s)</source> <translation> <numerusform>%n 時間</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../src/globals/VBoxGlobal.h" line="239"/> + <location filename="../src/globals/VBoxGlobal.h" line="242"/> <source>%n minute(s)</source> <translation> <numerusform>%n 分</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../src/globals/VBoxGlobal.h" line="244"/> + <location filename="../src/globals/VBoxGlobal.h" line="247"/> <source>%n second(s)</source> <translation> <numerusform>%n 秒</numerusform> @@ -11705,7 +11845,7 @@ Version %1</source> <translation>ãƒã‚¹ãƒ†ãƒƒãƒ‰ãƒšãƒ¼ã‚¸ãƒ³ã‚°</translation> </message> <message> - <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="664"/> + <location filename="../src/wizards/newvm/UINewVMWzd.cpp" line="668"/> <source>MB</source> <comment>size suffix MBytes=1024KBytes</comment> <translation>MB</translation> @@ -12820,7 +12960,7 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">仮想ディスクマãƒãƒ¼ã‚¸ãƒ£ ダイアãƒã‚°ã‚’表示</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1223"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1220"/> <source>&Preferences...</source> <comment>global settings</comment> <translation>環境è¨å®š(&P)...</translation> @@ -12830,12 +12970,12 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">Ctrl+G</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1225"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1222"/> <source>Display the global settings dialog</source> <translation>環境è¨å®šãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’表示</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1227"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1224"/> <source>E&xit</source> <translation>終了(&X)</translation> </message> @@ -12844,12 +12984,12 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">Ctrl+Q</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1229"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1226"/> <source>Close application</source> <translation>アプリケーションを閉ã˜ã‚‹</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1231"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1228"/> <source>&New...</source> <translation>æ–°è¦(&N)...</translation> </message> @@ -12862,12 +13002,12 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">Ctrl+N</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1233"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1230"/> <source>Create a new virtual machine</source> <translation>æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ã®ä½œæˆ</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1241"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1238"/> <source>&Settings...</source> <translation>è¨å®š(&S)...</translation> </message> @@ -12880,7 +13020,7 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">Ctrl+S</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1243"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1240"/> <source>Configure the selected virtual machine</source> <translation>é¸æŠžã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã‚’è¨å®š</translation> </message> @@ -12901,12 +13041,12 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">ç ´æ£„(&I)</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1257"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1254"/> <source>Discard</source> <translation type="unfinished">ç ´æ£„</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1261"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1258"/> <source>Discard the saved state of the selected virtual machine</source> <translation>é¸æŠžã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã‚’ç ´æ£„</translation> </message> @@ -12923,7 +13063,7 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">Ctrl+R</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1272"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1269"/> <source>Refresh the accessibility state of the selected virtual machine</source> <translation>é¸æŠžã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã®ã‚¢ã‚¯ã‚»ã‚¹å¯å¦çŠ¶æ…‹ã‚’最新ã®æƒ…å ±ã«æ›´æ–°ã™ã‚‹</translation> </message> @@ -12984,7 +13124,7 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">説明(&E) *</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1390"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1387"/> <source>S&how</source> <translation>表示(&H)</translation> </message> @@ -12993,13 +13133,13 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">表示</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1402"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1399"/> <source>Switch to the window of the selected virtual machine</source> <translation>é¸æŠžã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«åˆ‡ã‚Šæ›¿ãˆ</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1372"/> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1492"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1369"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1489"/> <source>S&tart</source> <translation>èµ·å‹•(&T)</translation> </message> @@ -13008,22 +13148,18 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">èµ·å‹•</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1384"/> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1494"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1381"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1491"/> <source>Start the selected virtual machine</source> <translation>é¸æŠžã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã‚’èµ·å‹•</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>よã†ã“ãVirtualBoxã¸ï¼</h3><p>ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å·¦å´ã«ã‚³ãƒ³ãƒ”ュータ上ã®ã™ã¹ã¦ã®ä»®æƒ³ãƒžã‚·ãƒ³ãŒãƒªã‚¹ãƒˆè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã¾ã 仮想マシンãŒä½œæˆã•ã‚Œã¦ã„ãªã„ãŸã‚ã€ãƒªã‚¹ãƒˆã¯ç©ºã§ã™ã€‚<img src=welcome.png align=right/></p><p>æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ã‚’作æˆã™ã‚‹ã«ã¯ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä¸Šéƒ¨ã«ã‚るメインツールãƒãƒ¼ã®<b>[æ–°è¦]</b>ボタンをクリックã—ã¦ãã ã•ã„。</p><p><b>%1</b>ã‚ーã§ãƒ˜ãƒ«ãƒ—を表示ã§ãã¾ã™ã€‚ã¾ãŸã¯æœ€æ–°ã®æƒ…å ±ã¨ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚’å–å¾—ã™ã‚‹ãŸã‚ <a href=http://www.virtualbox.org>www.virtualbox.org</a> を訪å•ã—ã¦ãã ã•ã„。</p></translation> - </message> - <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1304"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1301"/> <source>&Machine</source> <translation>仮想マシン(&M)</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1274"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1271"/> <source>Show &Log...</source> <translation>ãƒã‚°ã‚’å‚ç…§(&L)...</translation> </message> @@ -13036,7 +13172,7 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">Ctrl+L</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1278"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1275"/> <source>Show the log files of the selected virtual machine</source> <translation>é¸æŠžã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã®ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‚ç…§ã™ã‚‹</translation> </message> @@ -13061,12 +13197,12 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">Ctrl+P</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1414"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1411"/> <source>Resume the execution of the virtual machine</source> <translation>仮想マシンã®å®Ÿè¡Œã‚’å†é–‹ã™ã‚‹</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1265"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1262"/> <source>&Pause</source> <translation>一時åœæ¢(&P)</translation> </message> @@ -13075,153 +13211,153 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">一時åœæ¢</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1267"/> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1423"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1264"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1420"/> <source>Suspend the execution of the virtual machine</source> <translation>仮想マシンã®å®Ÿè¡Œã‚’一時åœæ¢ã™ã‚‹</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1281"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1278"/> <source>Show in Finder</source> <translation>Finderã«è¡¨ç¤º</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1282"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1279"/> <source>Show the VirtualBox Machine Definition file in Finder.</source> <translation>仮想マシン定義ファイルをFinderã«è¡¨ç¤ºã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1283"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1280"/> <source>Create Alias on Desktop</source> <translation>エイリアスをデスクトップã«ä½œæˆ</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1284"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1281"/> <source>Creates an Alias file to the VirtualBox Machine Definition file on your Desktop.</source> <translation>仮想マシン定義ファイルã®ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã‚’デスクトップã«ä½œæˆã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1286"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1283"/> <source>Show in Explorer</source> <translation>エクスプãƒãƒ¼ãƒ©ãƒ¼ã«è¡¨ç¤º</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1287"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1284"/> <source>Show the VirtualBox Machine Definition file in Explorer.</source> <translation>仮想マシン定義ファイルをエクスプãƒãƒ¼ãƒ©ãƒ¼ã«è¡¨ç¤ºã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1288"/> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1293"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1285"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1290"/> <source>Create Shortcut on Desktop</source> <translation>ショートカットをデスクトップã«ä½œæˆ</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1289"/> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1294"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1286"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1291"/> <source>Creates an Shortcut file to the VirtualBox Machine Definition file on your Desktop.</source> <translation>仮想マシン定義ファイルã®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã‚’デスクトップã«ä½œæˆã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1291"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1288"/> <source>Show in File Manager</source> <translation>ファイルマãƒãƒ¼ã‚¸ãƒ£ã«è¡¨ç¤º</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1292"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1289"/> <source>Show the VirtualBox Machine Definition file in the File Manager</source> <translation>仮想マシン定義ファイルをファイルマãƒãƒ¼ã‚¸ãƒ£ã«è¡¨ç¤ºã—ã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1300"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1297"/> <source>&File</source> <comment>Mac OS X version</comment> <translation>ファイル(&F)</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1302"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1299"/> <source>&File</source> <comment>Non Mac OS X version</comment> <translation>ファイル(&F)</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1463"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1460"/> <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> <translation><h3>よã†ã“ãVirtualBoxã¸ï¼</h3><p>ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å·¦å´ã«ã‚³ãƒ³ãƒ”ュータ上ã®ã™ã¹ã¦ã®ä»®æƒ³ãƒžã‚·ãƒ³ãŒãƒªã‚¹ãƒˆè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã¾ã 仮想マシンãŒä½œæˆã•ã‚Œã¦ã„ãªã„ãŸã‚ã€ãƒªã‚¹ãƒˆã¯ç©ºã§ã™ã€‚<img src=:/welcome.png align=right/></p><p>æ–°è¦ä»®æƒ³ãƒžã‚·ãƒ³ã‚’作æˆã™ã‚‹ã«ã¯ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä¸Šéƒ¨ã«ã‚るメインツールãƒãƒ¼ã®<b>[æ–°è¦]</b>ボタンをクリックã—ã¦ãã ã•ã„。</p><p><b>%1</b>ã‚ーã§ãƒ˜ãƒ«ãƒ—を表示ã§ãã¾ã™ã€‚ã¾ãŸã¯æœ€æ–°ã®æƒ…å ±ã¨ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚’å–å¾—ã™ã‚‹ãŸã‚ <a href=http://www.virtualbox.org>www.virtualbox.org</a> を訪å•ã—ã¦ãã ã•ã„。</p></translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1681"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1685"/> <source>Show Toolbar</source> <translation>ツールãƒãƒ¼ã‚’表示</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1685"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1689"/> <source>Show Statusbar</source> <translation>ステータスãƒãƒ¼ã‚’表示</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1211"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1208"/> <source>&Virtual Media Manager...</source> <translation>仮想メディアマãƒãƒ¼ã‚¸ãƒ£(&V)...</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="668"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="665"/> <source>Select a virtual machine file</source> <translation>仮想マシンファイルをé¸æŠž</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="672"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="669"/> <source>Virtual machine files (%1)</source> <translation>仮想マシンファイル(%1)</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1196"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1193"/> <source>Manager</source> <comment>Note: main window title which is pretended by the product name.</comment> <translation>マãƒãƒ¼ã‚¸ãƒ£ãƒ¼</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1213"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1210"/> <source>Display the Virtual Media Manager dialog</source> <translation>仮想メディアマãƒãƒ¼ã‚¸ãƒ£ ダイアãƒã‚°ã‚’表示</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1237"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1234"/> <source>&Add...</source> <translation>è¿½åŠ (&A)...</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1239"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1236"/> <source>Add an existing virtual machine</source> <translation>æ—¢å˜ã®ä»®æƒ³ãƒžã‚·ãƒ³ã‚’è¿½åŠ </translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1247"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1244"/> <source>Cl&one...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1249"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1246"/> <source>Clone the selected virtual machine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1251"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1248"/> <source>&Remove</source> <translation>除去(&R)</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1253"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1250"/> <source>Remove the selected virtual machine</source> <translation>é¸æŠžã—ãŸä»®æƒ³ãƒžã‚·ãƒ³ã‚’除去</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1258"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1255"/> <source>D&iscard Saved State</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1275"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1272"/> <source>Log</source> <comment>icon text</comment> <translation>ãƒã‚°</translation> @@ -13231,27 +13367,27 @@ USBãƒ•ã‚£ãƒ«ã‚¿ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹ã«ã¯ã‚³ãƒ³ãƒ†ã‚ストメニュム<translation type="obsolete">Sun VirtualBox</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1215"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1212"/> <source>&Import Appliance...</source> <translation>仮想アプライアンスã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆ(&I)...</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1217"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1214"/> <source>Import an appliance into VirtualBox</source> <translation>仮想アプライアンスをVirtualBoxã«ã‚¤ãƒ³ãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1219"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1216"/> <source>&Export Appliance...</source> <translation>仮想アプライアンスã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ(&E)...</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1221"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1218"/> <source>Export one or more VirtualBox virtual machines as an appliance</source> <translation>VirtualBoxã®ä»®æƒ³ãƒžã‚·ãƒ³ã‚’仮想アプライアンスã«ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1269"/> + <location filename="../src/selector/VBoxSelectorWnd.cpp" line="1266"/> <source>Re&fresh</source> <translation>最新ã®æƒ…å ±ã«æ›´æ–°(&F)</translation> </message> @@ -13677,12 +13813,12 @@ DOS系ゲストOSã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹å ´åˆã¯ <tt>net use x:¥¥vboxs <context> <name>VBoxSwitchMenu</name> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="5553"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="5521"/> <source>Disable</source> <translation>無効</translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="5553"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="5521"/> <source>Enable</source> <translation>有効</translation> </message> @@ -13900,141 +14036,19 @@ value.</qt></source> <context> <name>VBoxUSBMenu</name> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="5483"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="5451"/> <source><no devices available></source> <comment>USB devices</comment> <translation><利用ã§ãるデãƒã‚¤ã‚¹ãŒã‚ã‚Šã¾ã›ã‚“></translation> </message> <message> - <location filename="../src/globals/VBoxGlobal.cpp" line="5485"/> + <location filename="../src/globals/VBoxGlobal.cpp" line="5453"/> <source>No supported devices connected to the host PC</source> <comment>USB device tooltip</comment> <translation>ホストマシンã«æŽ¥ç¶šã•ã‚ŒãŸãƒ‡ãƒã‚¤ã‚¹ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“</translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="82"/> - <source>1 day</source> - <translation>1æ—¥</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="83"/> - <source>2 days</source> - <translation>2æ—¥</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="84"/> - <source>3 days</source> - <translation>3æ—¥</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="85"/> - <source>4 days</source> - <translation>4æ—¥</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="86"/> - <source>5 days</source> - <translation>5æ—¥</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="87"/> - <source>6 days</source> - <translation>6æ—¥</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="90"/> - <source>1 week</source> - <translation>1週間</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="91"/> - <source>2 weeks</source> - <translation>2週間</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="92"/> - <source>3 weeks</source> - <translation>3週間</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="95"/> - <source>1 month</source> - <translation>1月</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="144"/> - <source>Never</source> - <translation>確èªã—ãªã„</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">接続ãŒã‚¿ã‚¤ãƒ アウトã«ãªã‚Šã¾ã—ãŸã€‚</translation> - </message> - <message> - <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="296"/> - <source>Chec&k</source> - <translation>確èª(&K)</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="300"/> - <source>&Close</source> - <translation>é–‰ã˜ã‚‹(&C)</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="293"/> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox アップデート ウィザード</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="295"/> - <source>Check for Updates</source> - <translation>アップデートを確èª</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ã€VirtualBox Webサイトã«æŽ¥ç¶šã—ã¦ã€VirtualBoxã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒåˆ©ç”¨å¯èƒ½ã‹ã©ã†ã‹ç¢ºèªã—ã¾ã™ã€‚</p><p><b>[確èª]</b>ボタンをクリックã—ã¦æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’今ã™ã確èªã—ã¦ãã ã•ã„。確èªã—ãªã„å ´åˆã¯<b>[ã‚ャンセル]</b>ボタンをクリックã—ã¦ãã ã•ã„。</p><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯<b>[ヘルプ]</b>メニューã‹ã‚‰<b>[アップデートを確èª...]</b>ã‚’é¸ã¶ã“ã¨ã§ã€ã„ã¤ã§ã‚‚実行ã§ãã¾ã™ã€‚</p></translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="297"/> - <source>Cancel</source> - <translation>ã‚ャンセル</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="299"/> - <source>Summary</source> - <translation>概è¦</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="311"/> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>VirtualBoxã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¾ã—ãŸï¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ <b>%1</b>ã¯<a href="http://www.virtualbox.org/">virtualbox.org</a>ã‹ã‚‰å…¥æ‰‹ã§ãã¾ã™ã€‚</p><p>ã“ã®ãƒªãƒ³ã‚¯ã‹ã‚‰æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ダウンãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚: </p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="317"/> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã€æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’å–å¾—ã§ãã¾ã›ã‚“:</p><p><b>%1</b></p></translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="320"/> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>最新ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®VirtualBoxãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™ã€‚ 後ã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç¢ºèªã‚’è¡Œã£ã¦ãã ã•ã„。</translation> - </message> - <message> - <location filename="../src/VBoxUpdateDlg.cpp" line="302"/> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯ã€VirtualBox Webサイトã«æŽ¥ç¶šã—ã¦ã€VirtualBoxã®æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒåˆ©ç”¨å¯èƒ½ã‹ã©ã†ã‹ç¢ºèªã—ã¾ã™ã€‚</p><p><b>[確èª]</b>ボタンをクリックã—ã¦æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’今ã™ã確èªã—ã¦ãã ã•ã„。確èªã—ãªã„å ´åˆã¯<b>[ã‚ャンセル]</b>ボタンをクリックã—ã¦ãã ã•ã„。</p><p>ã“ã®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã¯<b>[ヘルプ]</b>メニューã‹ã‚‰<b>[アップデートを確èª...]</b>ã‚’é¸ã¶ã“ã¨ã§ã€ã„ã¤ã§ã‚‚実行ã§ãã¾ã™ã€‚</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts index 53dd18b03..aca163b75 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts @@ -1031,6 +1031,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -5386,6 +5393,36 @@ medium</comment> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>បាន​បរាជáŸáž™â€‹áž€áŸ’នុងកា​ររក្សាទុក​ឯកសារ​ដែលបាន​ទាញ​យក​ជា <nobr><b>%1</b> ។</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">ទាញយក</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5425,6 +5462,17 @@ medium</comment> </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5688,6 +5736,18 @@ medium</comment> <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6306,6 +6366,93 @@ You may wish to translate this more like "Time remaining: %1"</comment </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>១ ážáŸ’ងៃ</translation> + </message> + <message> + <source>2 days</source> + <translation>២ ážáŸ’ងៃ</translation> + </message> + <message> + <source>3 days</source> + <translation>៣ ážáŸ’ងៃ</translation> + </message> + <message> + <source>4 days</source> + <translation>៤ ážáŸ’ងៃ</translation> + </message> + <message> + <source>5 days</source> + <translation>៥ ážáŸ’ងៃ</translation> + </message> + <message> + <source>6 days</source> + <translation>៦ ážáŸ’ងៃ</translation> + </message> + <message> + <source>1 week</source> + <translation>១ សប្ដាហáŸ</translation> + </message> + <message> + <source>2 weeks</source> + <translation>២ សប្ដាហáŸ</translation> + </message> + <message> + <source>3 weeks</source> + <translation>៣ សប្ដាហáŸ</translation> + </message> + <message> + <source>1 month</source> + <translation>១ ážáŸ‚</translation> + </message> + <message> + <source>Never</source> + <translation>កុំ</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">áž–áž·áž“áž·ážáŸ’យមើល</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">បិទ</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">អ្នកជំនួយការ​ធ្វើ​ឲ្យ​ទាន់សមáŸáž™â€‹ážšáž”ស់ VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">áž–áž·áž“áž·ážáŸ’យ​មើល​ភាព​ទាន់សមáŸáž™</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">បោះបង់</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">សáŸáž…ក្ដី​សង្ážáŸáž”</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>កំណែ​ážáŸ’មី​របស់ VirtualBox ážáŸ’រូ​វបាន​ចáŸáž‰â€‹áž•áŸ’សាយ​ហើយ ! គឺ​កំណែ <b>%1</b> ដែល​អាច​រក​បាននៅ <a href="http://www.virtualbox.org/">virtualbox.org</a>។</p><p>អ្នកអាច​ទាញ​យក​កំណែ​នáŸáŸ‡â€‹â€‹ážŠáŸ„យ​ផ្ទាល់ពី​ážáŸ†ážŽÂ ៖</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>មិនអាច​យក​ពáŸážáŸŒáž˜áž¶áž“កំណែ​ážáŸ’មី​បានទ០ដោយសារ​ážáŸ‚​កំហុស​បណ្ដាញ​ដូច​ážáž¶áž„ក្រោម ៖</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">អ្នក​បាន​ដំឡើង​កំណែ​របស់ VirtualBox ចុងក្រោយ​រួច​ហើយ ។ សូម​ធ្វើ​ការ​ពិនិážáŸ’យ​ពáŸáž›áž€áŸ’រោយ​ម្ដង​ទៀážÂ ។</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>អ្នក​ជំនួយ​ការ​នáŸáŸ‡â€‹áž“ឹង​ážáž—្ជាប់​ទៅ​កាន់​ážáŸ†áž”ន់​បណ្ដាញ​របស់ VirtualBox ហើយ​ពិនិážáŸ’យ​មើល​ប្រសិនបើ​មានកំណែ​ážáŸ’មី​របស់​ VirtualBox ។</p><p>ប្រើ​ប៊ូážáž»áž„ <b>áž–áž·áž“áž·ážáŸ’យ​មើល</b> ដើម្បី​ពិនិážáŸ’យ​មើល​កំណែ​ážáŸ’មី​ឥឡូវ ឬ​ប៊ូážáž»áž„ <b>បោះបង់</b> ប្រសិនបើ​អ្នក​មិន​ចង់​អនុវážáŸ’ážâ€‹áž€áž¶ážšâ€‹ážáŸ’ážšáž½ážáž–áž·áž“áž·ážáŸ’យ​នáŸáŸ‡â€‹áž‘áŸÂ ។</p><p>អ្នក​អាច​រážáŸ‹â€‹áž¢áŸ’នក​ជំនួយការ​នáŸáŸ‡â€‹áž“ៅពáŸáž›â€‹ážŽáž¶áž˜áž½áž™ ដោយ​​ជ្រើស <b>áž–áž·áž“áž·ážáŸ’យ​រកមើល​ភាព​ទាន់សមáŸáž™...</b> ពី​ម៉ឺនុយ <b>ជំនួយ</b> ។</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -9790,93 +9937,6 @@ VMM: Floppy Image</comment> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>១ ážáŸ’ងៃ</translation> - </message> - <message> - <source>2 days</source> - <translation>២ ážáŸ’ងៃ</translation> - </message> - <message> - <source>3 days</source> - <translation>៣ ážáŸ’ងៃ</translation> - </message> - <message> - <source>4 days</source> - <translation>៤ ážáŸ’ងៃ</translation> - </message> - <message> - <source>5 days</source> - <translation>៥ ážáŸ’ងៃ</translation> - </message> - <message> - <source>6 days</source> - <translation>៦ ážáŸ’ងៃ</translation> - </message> - <message> - <source>1 week</source> - <translation>១ សប្ដាហáŸ</translation> - </message> - <message> - <source>2 weeks</source> - <translation>២ សប្ដាហáŸ</translation> - </message> - <message> - <source>3 weeks</source> - <translation>៣ សប្ដាហáŸ</translation> - </message> - <message> - <source>1 month</source> - <translation>១ ážáŸ‚</translation> - </message> - <message> - <source>Never</source> - <translation>កុំ</translation> - </message> - <message> - <source>Chec&k</source> - <translation>áž–áž·áž“áž·ážáŸ’យមើល</translation> - </message> - <message> - <source>&Close</source> - <translation>បិទ</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>អ្នកជំនួយការ​ធ្វើ​ឲ្យ​ទាន់សមáŸáž™â€‹ážšáž”ស់ VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>áž–áž·áž“áž·ážáŸ’យ​មើល​ភាព​ទាន់សមáŸáž™</translation> - </message> - <message> - <source>Cancel</source> - <translation>បោះបង់</translation> - </message> - <message> - <source>Summary</source> - <translation>សáŸáž…ក្ដី​សង្ážáŸáž”</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>កំណែ​ážáŸ’មី​របស់ VirtualBox ážáŸ’រូ​វបាន​ចáŸáž‰â€‹áž•áŸ’សាយ​ហើយ ! គឺ​កំណែ <b>%1</b> ដែល​អាច​រក​បាននៅ <a href="http://www.virtualbox.org/">virtualbox.org</a>។</p><p>អ្នកអាច​ទាញ​យក​កំណែ​នáŸáŸ‡â€‹â€‹ážŠáŸ„យ​ផ្ទាល់ពី​ážáŸ†ážŽÂ ៖</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>មិនអាច​យក​ពáŸážáŸŒáž˜áž¶áž“កំណែ​ážáŸ’មី​បានទ០ដោយសារ​ážáŸ‚​កំហុស​បណ្ដាញ​ដូច​ážáž¶áž„ក្រោម ៖</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>អ្នក​បាន​ដំឡើង​កំណែ​របស់ VirtualBox ចុងក្រោយ​រួច​ហើយ ។ សូម​ធ្វើ​ការ​ពិនិážáŸ’យ​ពáŸáž›áž€áŸ’រោយ​ម្ដង​ទៀážÂ ។</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>អ្នក​ជំនួយ​ការ​នáŸáŸ‡â€‹áž“ឹង​ážáž—្ជាប់​ទៅ​កាន់​ážáŸ†áž”ន់​បណ្ដាញ​របស់ VirtualBox ហើយ​ពិនិážáŸ’យ​មើល​ប្រសិនបើ​មានកំណែ​ážáŸ’មី​របស់​ VirtualBox ។</p><p>ប្រើ​ប៊ូážáž»áž„ <b>áž–áž·áž“áž·ážáŸ’យ​មើល</b> ដើម្បី​ពិនិážáŸ’យ​មើល​កំណែ​ážáŸ’មី​ឥឡូវ ឬ​ប៊ូážáž»áž„ <b>បោះបង់</b> ប្រសិនបើ​អ្នក​មិន​ចង់​អនុវážáŸ’ážâ€‹áž€áž¶ážšâ€‹ážáŸ’ážšáž½ážáž–áž·áž“áž·ážáŸ’យ​នáŸáŸ‡â€‹áž‘áŸÂ ។</p><p>អ្នក​អាច​រážáŸ‹â€‹áž¢áŸ’នក​ជំនួយការ​នáŸáŸ‡â€‹áž“ៅពáŸáž›â€‹ážŽáž¶áž˜áž½áž™ ដោយ​​ជ្រើស <b>áž–áž·áž“áž·ážáŸ’យ​រកមើល​ភាព​ទាន់សមáŸáž™...</b> ពី​ម៉ឺនុយ <b>ជំនួយ</b> ។</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts index 2acb53cac..6810dcc45 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts @@ -1117,6 +1117,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -5825,6 +5832,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p><nobr><b>%1</b></nobr>ì— ë‹¤ìš´ë¡œë“œí•œ 파ì¼ì„ ì €ìž¥í• ìˆ˜ ì—†ìŒ.</p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">다운로드</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">설치</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5872,6 +5909,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6135,6 +6183,18 @@ p, li { white-space: pre-wrap; } <comment>summary</comment> <translation>ì •ë³´</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6773,6 +6833,93 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>하루</translation> + </message> + <message> + <source>2 days</source> + <translation>ì´í‹€</translation> + </message> + <message> + <source>3 days</source> + <translation>사í˜</translation> + </message> + <message> + <source>4 days</source> + <translation>나í˜</translation> + </message> + <message> + <source>5 days</source> + <translation>닷새</translation> + </message> + <message> + <source>6 days</source> + <translation>엿새</translation> + </message> + <message> + <source>1 week</source> + <translation>1주</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2주</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3주</translation> + </message> + <message> + <source>1 month</source> + <translation>1개월</translation> + </message> + <message> + <source>Never</source> + <translation>하지 ì•ŠìŒ</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">찾기(&K)</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">닫기(&C)</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox ì—…ë°ì´íŠ¸ 마법사</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">ì—…ë°ì´íŠ¸ 찾기</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">취소</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">요약</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>ì´ ë§ˆë²•ì‚¬ëŠ” VirtualBox 웹 사ì´íŠ¸ì— ì ‘ì†í•´ì„œ 새 ë²„ì „ì´ ìžˆëŠ”ì§€ 확ì¸í•©ë‹ˆë‹¤.</p><p>새 ë²„ì „ì„ ì§€ê¸ˆ 확ì¸í•˜ë ¤ë©´ <b>검사하기</b> 단추를 ëˆ„ë¥´ê³ , ë‚˜ì¤‘ì— í™•ì¸í•˜ë ¤ë©´ <b>취소</b> 단추를 누르ì‹ì‹œì˜¤.</p><p><b>ë„움ë§</b> 메뉴ì—ì„œ <b>ì—…ë°ì´íŠ¸ 찾기...</b> í•ëª©ì„ ì„ íƒí•´ì„œ ì–¸ì œë“ ì§€ ì´ ë§ˆë²•ì‚¬ë¥¼ ì‹¤í–‰í• ìˆ˜ 있습니다.</p></translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>VirtualBox 새 ë²„ì „ì´ ì¶œì‹œë˜ì—ˆìŠµë‹ˆë‹¤! <a href="http://www.virtualbox.org/">virtualbox.org</a> 웹 사ì´íŠ¸ì— 새 ë²„ì „ <b>%1</b>ì´(ê°€) 올ë¼ì™€ 있습니다.</p><p>ì´ ë§í¬ë¥¼ 사용해서 새 ë²„ì „ì„ ë‹¤ìš´ë¡œë“œí•˜ì‹ì‹œì˜¤:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>ë‹¤ìŒ ë„¤íŠ¸ì›Œí¬ ì˜¤ë¥˜ë¡œ ì¸í•˜ì—¬ 새 ë²„ì „ ì •ë³´ë¥¼ ì°¾ì„ ìˆ˜ 없습니다:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">ìµœì‹ ë²„ì „ì˜ VirtualBox를 ì‚¬ìš©í•˜ê³ ìžˆìŠµë‹ˆë‹¤. ë‚˜ì¤‘ì— ë‹¤ì‹œ 확ì¸í•˜ì‹ì‹œì˜¤.</translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -10094,93 +10241,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>하루</translation> - </message> - <message> - <source>2 days</source> - <translation>ì´í‹€</translation> - </message> - <message> - <source>3 days</source> - <translation>사í˜</translation> - </message> - <message> - <source>4 days</source> - <translation>나í˜</translation> - </message> - <message> - <source>5 days</source> - <translation>닷새</translation> - </message> - <message> - <source>6 days</source> - <translation>엿새</translation> - </message> - <message> - <source>1 week</source> - <translation>1주</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2주</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3주</translation> - </message> - <message> - <source>1 month</source> - <translation>1개월</translation> - </message> - <message> - <source>Never</source> - <translation>하지 ì•ŠìŒ</translation> - </message> - <message> - <source>Chec&k</source> - <translation>찾기(&K)</translation> - </message> - <message> - <source>&Close</source> - <translation>닫기(&C)</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox ì—…ë°ì´íŠ¸ 마법사</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>ì—…ë°ì´íŠ¸ 찾기</translation> - </message> - <message> - <source>Cancel</source> - <translation>취소</translation> - </message> - <message> - <source>Summary</source> - <translation>요약</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>ì´ ë§ˆë²•ì‚¬ëŠ” VirtualBox 웹 사ì´íŠ¸ì— ì ‘ì†í•´ì„œ 새 ë²„ì „ì´ ìžˆëŠ”ì§€ 확ì¸í•©ë‹ˆë‹¤.</p><p>새 ë²„ì „ì„ ì§€ê¸ˆ 확ì¸í•˜ë ¤ë©´ <b>검사하기</b> 단추를 ëˆ„ë¥´ê³ , ë‚˜ì¤‘ì— í™•ì¸í•˜ë ¤ë©´ <b>취소</b> 단추를 누르ì‹ì‹œì˜¤.</p><p><b>ë„움ë§</b> 메뉴ì—ì„œ <b>ì—…ë°ì´íŠ¸ 찾기...</b> í•ëª©ì„ ì„ íƒí•´ì„œ ì–¸ì œë“ ì§€ ì´ ë§ˆë²•ì‚¬ë¥¼ ì‹¤í–‰í• ìˆ˜ 있습니다.</p></translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>VirtualBox 새 ë²„ì „ì´ ì¶œì‹œë˜ì—ˆìŠµë‹ˆë‹¤! <a href="http://www.virtualbox.org/">virtualbox.org</a> 웹 사ì´íŠ¸ì— 새 ë²„ì „ <b>%1</b>ì´(ê°€) 올ë¼ì™€ 있습니다.</p><p>ì´ ë§í¬ë¥¼ 사용해서 새 ë²„ì „ì„ ë‹¤ìš´ë¡œë“œí•˜ì‹ì‹œì˜¤:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>ë‹¤ìŒ ë„¤íŠ¸ì›Œí¬ ì˜¤ë¥˜ë¡œ ì¸í•˜ì—¬ 새 ë²„ì „ ì •ë³´ë¥¼ ì°¾ì„ ìˆ˜ 없습니다:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>ìµœì‹ ë²„ì „ì˜ VirtualBox를 ì‚¬ìš©í•˜ê³ ìžˆìŠµë‹ˆë‹¤. ë‚˜ì¤‘ì— ë‹¤ì‹œ 확ì¸í•˜ì‹ì‹œì˜¤.</translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts index 2dc9dc124..59a53e6a0 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts @@ -160,11 +160,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>Visas klaidas kopijuoti į iÅ¡karpinÄ™</translation> </message> <message> <source>Copy</source> - <translation type="unfinished">Kopijuoti</translation> + <translation>Kopijuoti</translation> </message> </context> <context> @@ -693,7 +693,7 @@ </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>PažymÄ—jus, nauji MAC adresai bus priskirti visoms tinklo plokÅ¡tÄ—ms.</translation> </message> </context> <context> @@ -720,11 +720,11 @@ </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>VisiÅ¡kas klonas</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Susietas klonas</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> @@ -739,23 +739,23 @@ <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished">DabartinÄ— maÅ¡inos bÅ«sena</translation> + <translation>DabartinÄ— maÅ¡inos bÅ«sena</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished">DabartinÄ— bÅ«sena ir paveldÄ—tos bÅ«senos</translation> + <translation>DabartinÄ— bÅ«sena ir paveldÄ—tos bÅ«senos</translation> </message> <message> <source>All states</source> - <translation type="unfinished">Visos bÅ«senos</translation> + <translation>Visos bÅ«senos</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished">Klonavimo konfigÅ«racija</translation> + <translation>Klonavimo konfigÅ«racija</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished">Pasirinkite virtualios maÅ¡inos klonuotinas dalis.</translation> + <translation>Pasirinkite virtualios maÅ¡inos klonuotinas dalis.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> @@ -1100,6 +1100,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Pasirinkite aplankÄ…, į kurį įraÅ¡yti %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -1930,23 +1937,23 @@ </message> <message> <source>Left Shift</source> - <translation type="unfinished">Kairysis Lyg2</translation> + <translation>Kairysis Lyg2</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">DeÅ¡inysis Lyg2</translation> + <translation>DeÅ¡inysis Lyg2</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">Kairysis Vald</translation> + <translation>Kairysis Vald</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">DeÅ¡inysis Vald</translation> + <translation>DeÅ¡inysis Vald</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">Kairysis Alt</translation> + <translation>Kairysis Alt</translation> </message> <message> <source>Right Alt</source> @@ -3599,7 +3606,7 @@ </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>Å¡iai VM priskyrÄ—te ICH9 lustų rinkinį. Å i savybÄ— neveiktų, jei neįgalinsite IO-ACPI. TodÄ—l Å¡iÄ… savybÄ— bus automatiÅ¡kai įgalinta nuspausdus mygtukÄ… „Gerai“.</translation> </message> </context> <context> @@ -4934,8 +4941,6 @@ <source><p>The virtual machine(s) <b>%1</b> are currently in a saved state.</p><p>If you continue the runtime state of the exported machine(s) will be discarded. Note that the existing machine(s) are not changed.</p></source> <translation type="unfinished"> <numerusform></numerusform> - <numerusform></numerusform> - <numerusform></numerusform> </translation> </message> <message> @@ -5198,11 +5203,41 @@ </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Nepavyksta rasti momentinio bÅ«vio <b>%1</b>.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="unfinished"><p>Nepavyko įraÅ¡yti parsiųstos rinkmenos kaip <nobr><b>%1</b>.</nobr></p></translation> + <translation><p>Nepavyko įraÅ¡yti parsiųstos rinkmenos kaip <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Parsiųsti</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>Ä®diegti</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Nepavyko parsiųsti <b><nobr>%1</nobr></b> iÅ¡ <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> </message> </context> <context> @@ -5243,11 +5278,22 @@ <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished">AtÅ¡aukti „VirtualBox sveÄio papildinių“ CD atvaizdžio parsiuntimÄ…</translation> + <translation>AtÅ¡aukti „VirtualBox sveÄio papildinių“ CD atvaizdžio parsiuntimÄ…</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished">ParsiunÄiamas „VirtualBox sveÄio papildinių“ CD atvaizdis iÅ¡ <nobr><b>%1</b>...</nobr></translation> + <translation>ParsiunÄiamas „VirtualBox sveÄio papildinių“ CD atvaizdis iÅ¡ <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>AtÅ¡aukti <nobr><b>%1</b></nobr> parsiuntimÄ…</translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation><nobr><b>%1</b></nobr> parsiunÄiamas iÅ¡ <nobr><b>%2</b>...</nobr></translation> </message> </context> <context> @@ -5424,6 +5470,18 @@ <comment>summary</comment> <translation>Dydis</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -5673,11 +5731,11 @@ </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">Ä®kraunamas standusis &diskas</translation> + <translation>Paleidimo &diskas</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>Pasirinkite virtualų standųjį diskÄ…, iÅ¡ kurio bus paleidžiama virtuali maÅ¡ina. Galite arba sukurti naujÄ… diskÄ…, arba pasirinkite jau sukurtÄ…jį iÅ¡ iÅ¡skleidžiamojo meniu nuspaudÄ™ atitinkamÄ… mygtukÄ….</p><p>Jei norite sudÄ—tingesnÄ—s disko konfigÅ«racijos, galite praleisti šį etapÄ… – standųjį diskÄ… pridÄ—site vÄ—liau per Å¡ios virtualios maÅ¡inos nuostatas.</p></translation> + <translation><p>Pasirinkite virtualų paleidimo diskÄ…, iÅ¡ kurio bus paleidžiama virtuali maÅ¡ina. Galite arba sukurti naujÄ… diskÄ…, arba pasirinkite jau sukurtÄ…jį iÅ¡ iÅ¡skleidžiamojo meniu nuspaudÄ™ atitinkamÄ… mygtukÄ….</p><p>Jei norite sudÄ—tingesnÄ—s disko konfigÅ«racijos, galite praleisti šį etapÄ… – konfigÅ«ruosite vÄ—liau per Å¡ios virtualios maÅ¡inos nuostatas.</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -5685,7 +5743,7 @@ </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">Rekomenduojamas standžiojo disko dydis yra <b>%1</b>.</translation> + <translation>Rekomenduojamas paleidimo disko dydis yra <b>%1</b>.</translation> </message> </context> <context> @@ -5750,7 +5808,7 @@ <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">Standusis diskas, iÅ¡ kurio paleidžiama</translation> + <translation>Paleidimo diskas</translation> </message> </context> <context> @@ -5977,6 +6035,93 @@ </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dienÄ…</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dienas</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dienas</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dienas</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dienas</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dienas</translation> + </message> + <message> + <source>1 week</source> + <translation>1 savaitÄ™</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 savaites</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 savaites</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mÄ—nesį</translation> + </message> + <message> + <source>Never</source> + <translation>Niekada</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Tikrinti</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Užverti</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox atnaujinimo vediklis</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Tikrinti, ar yra atnaujinimų</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">AtÅ¡aukti</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Santrauka</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>PasirodÄ— nauja VirtualBox versija! Versija <b>%1</b> pasiekiama <a href="http://www.virtualbox.org/">virtualbox.org</a> svetainÄ—je.</p><p>Å iÄ… versijÄ… galite atsisiųsti spustelÄ—jÄ™ Å¡iÄ… nuorodÄ…: </p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Nepavyksta gauti informacijos apie naujas versijas dÄ—l tinklo ryÅ¡io klaidos: </p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Jau naudotÄ—s naujausia VirtualBox versija.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Å is vediklis prisijungs prie VirtualBox svetainÄ—s ir patikrins, ar yra naujesnių VirtualBox versijų.</p><p>TikrinimÄ… pradÄ—site iÅ¡ karto nuspaudÄ™ <b>Tikrinti</b>; o jei nenorite ieÅ¡koti galimų atnaujinimų, spauskite <b>AtÅ¡aukti</b>.</p><p>Šį vediklį galite paleisti ir bet kada vÄ—liau iÅ¡ <b>Pagalbos</b> meniu pasirinkÄ™ <b>Tikrinti, ar yra atnaujinimų...</b></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -8931,12 +9076,12 @@ IPv6.</translation> <message> <source>Allow VMs</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Leisti VM</translation> </message> <message> <source>Allow All</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>Leisti visus</translation> </message> <message> <source>Adapter %1</source> @@ -9227,7 +9372,7 @@ IPv6.</translation> </message> <message> <source>Format:</source> - <translation type="unfinished"></translation> + <translation>Formatas:</translation> </message> <message> <source>Storage details:</source> @@ -9579,11 +9724,11 @@ IPv6.</translation> </message> <message> <source>Create Alias on Desktop</source> - <translation type="unfinished"></translation> + <translation>Sukurti nuorodÄ… darbalaukyje</translation> </message> <message> <source>Creates an Alias file to the VirtualBox Machine Definition file on your Desktop.</source> - <translation type="unfinished"></translation> + <translation>Darbalaukyje sukuriama nuorodos rinkmena į VirtualBox maÅ¡inos apibrėžties rinkmenÄ….</translation> </message> <message> <source>Show in Explorer</source> @@ -9935,93 +10080,6 @@ konkreÄių nuostatų, matysite paaiÅ¡kinimus<i>.</translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dienÄ…</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dienas</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dienas</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dienas</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dienas</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dienas</translation> - </message> - <message> - <source>1 week</source> - <translation>1 savaitÄ™</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 savaites</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 savaites</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mÄ—nesį</translation> - </message> - <message> - <source>Never</source> - <translation>Niekada</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Tikrinti</translation> - </message> - <message> - <source>&Close</source> - <translation>&Užverti</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox atnaujinimo vediklis</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Tikrinti, ar yra atnaujinimų</translation> - </message> - <message> - <source>Cancel</source> - <translation>AtÅ¡aukti</translation> - </message> - <message> - <source>Summary</source> - <translation>Santrauka</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>PasirodÄ— nauja VirtualBox versija! Versija <b>%1</b> pasiekiama <a href="http://www.virtualbox.org/">virtualbox.org</a> svetainÄ—je.</p><p>Å iÄ… versijÄ… galite atsisiųsti spustelÄ—jÄ™ Å¡iÄ… nuorodÄ…: </p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Nepavyksta gauti informacijos apie naujas versijas dÄ—l tinklo ryÅ¡io klaidos: </p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Jau naudotÄ—s naujausia VirtualBox versija.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Å is vediklis prisijungs prie VirtualBox svetainÄ—s ir patikrins, ar yra naujesnių VirtualBox versijų.</p><p>TikrinimÄ… pradÄ—site iÅ¡ karto nuspaudÄ™ <b>Tikrinti</b>; o jei nenorite ieÅ¡koti galimų atnaujinimų, spauskite <b>AtÅ¡aukti</b>.</p><p>Šį vediklį galite paleisti ir bet kada vÄ—liau iÅ¡ <b>Pagalbos</b> meniu pasirinkÄ™ <b>Tikrinti, ar yra atnaujinimų...</b></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts index 6406706c3..4dfbedd1a 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts @@ -1131,6 +1131,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -5568,6 +5575,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Het is niet gelukt het gedownloade bestand als <nobr><b>%1</b> op te slaan.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Download</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">Installeer</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5615,6 +5652,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5878,6 +5926,18 @@ p, li { white-space: pre-wrap; } <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6559,6 +6619,93 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dag</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dagen</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dagen</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dagen</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dagen</translation> + </message> + <message> + <source>6 days</source> + <translation>6 Tage</translation> + </message> + <message> + <source>1 week</source> + <translation>1 week</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 weken</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 weken</translation> + </message> + <message> + <source>1 month</source> + <translation>1 maand</translation> + </message> + <message> + <source>Never</source> + <translation>Nooit</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Controleer</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Sluiten</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox bijwerken</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Controleer op nieuwe versies</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Annuleren</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Samenvatting</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Een nieuwe versie van VirtualBox is vrijgegeven! Versie <b>%1</b> is beschikbaar via <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>U kunt deze versie direkt downloaden via deze link:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Het is niet mogelijk de nieuwe versie op te halen vanwege de volgende netwerkfout:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">U heeft al de nieuwste versie van VirtualBox geïnstalleerd.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Deze assistent maakt verbinding met de VirtualBox website en controleert of een nieuwere versie van VirtualBox beschikbaar is.</p><p>Gebruik de knop <b>Controleer</b> om nu te controloren op een nieuwere versie of de knop <b>Annuleren</b> als u deze controle niet wilt uitvoeren.</p><p>U kunt deze assistent op ieder moment uitvoeren. door te kiezen voor <b>Controleer op nieuwe versie...</b> uit het <b>Help</b> menu.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -9822,93 +9969,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dag</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dagen</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dagen</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dagen</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dagen</translation> - </message> - <message> - <source>6 days</source> - <translation>6 Tage</translation> - </message> - <message> - <source>1 week</source> - <translation>1 week</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 weken</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 weken</translation> - </message> - <message> - <source>1 month</source> - <translation>1 maand</translation> - </message> - <message> - <source>Never</source> - <translation>Nooit</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Controleer</translation> - </message> - <message> - <source>&Close</source> - <translation>&Sluiten</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox bijwerken</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Controleer op nieuwe versies</translation> - </message> - <message> - <source>Cancel</source> - <translation>Annuleren</translation> - </message> - <message> - <source>Summary</source> - <translation>Samenvatting</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Een nieuwe versie van VirtualBox is vrijgegeven! Versie <b>%1</b> is beschikbaar via <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>U kunt deze versie direkt downloaden via deze link:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Het is niet mogelijk de nieuwe versie op te halen vanwege de volgende netwerkfout:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>U heeft al de nieuwste versie van VirtualBox geïnstalleerd.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Deze assistent maakt verbinding met de VirtualBox website en controleert of een nieuwere versie van VirtualBox beschikbaar is.</p><p>Gebruik de knop <b>Controleer</b> om nu te controloren op een nieuwere versie of de knop <b>Annuleren</b> als u deze controle niet wilt uitvoeren.</p><p>U kunt deze assistent op ieder moment uitvoeren. door te kiezen voor <b>Controleer op nieuwe versie...</b> uit het <b>Help</b> menu.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts index f9e4300d2..67f831aa5 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts @@ -1218,6 +1218,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4961,18 +4968,6 @@ p, li { white-space: pre-wrap; } <translation>Nie udaÅ‚o siÄ™ usunąć współdzielonego katalogu <b>%1</b> (wskazujÄ…cego na <nobr><b>%2</b></nobr>) z maszyny wirtualnej <b>%3</b>.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>ZostaÅ‚ wciÅ›niÄ™ty <b>przycisk myszy</b> wewnÄ…trz okna maszyny wirtualnej lub wciÅ›niÄ™to <b>klawisz gospodarza</b>. W wyniku maszyna wirtualna <b>przechwyci</b> kursor myszy gospodarza (jednak tylko, jeÅ›li funkcja integracji kursora myszy nie jest obsÅ‚ugiwana przez goszczony system operacyjny) oraz klawiaturÄ™, co z kolei sprawi, że bÄ™dÄ… one niedostÄ™pne dla innych aplikacji uruchomionych na komputerze.</p><p>W każdej chwili można wcisnąć <b>klawisz gospodarza</b>, aby <b>uwolnić</b> klawiaturÄ™ oraz mysz (jeÅ›li sÄ… przechwycone) i powrócić do normalnej pracy z innymi aplikacjami. Nazwa aktualnie ustawionego klawisza gospodarza jest wyÅ›wietlona na pasku statusu, na dole okna maszyny wirtualnej, zaraz obok ikony&nbsp;<img src=hostkey_16px.png/>. Ikona ta, wraz z umieszczonÄ… obok niej ikonÄ… myszy, wskazuje aktualny stan przechwycenia klawiatury i myszy.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Opcja <b>Automatycznego przechwytywania klawiatury</b> jest wÅ‚Ä…czona. Maszyna wirtualna automatycznie <b>przechwyci</b> klawiaturÄ™ za każdym razem, gdy okno maszyny wirtualnej zostanie aktywowane i sprawi, że bÄ™dzie ona niedostÄ™pna dla innych aplikacji uruchomionych na komputerze. Po przechwyceniu klawiatury wszystkie kombinacje klawiszowe (wÅ‚Ä…cznie z systemowymi, jak np. Alt-Tab) bedÄ… przekierowywane do maszyny wirtualnej.</p><p>W każdej chwili można wcisnąć <b>klawisz gospodarza</b>, aby <b>uwolnić</b> klawiaturÄ™ oraz mysz (jeÅ›li sÄ… przechwycone) i powrócić do normalnej pracy z innymi aplikacjami. Nazwa aktualnie ustawionego klawisza gospodarza jest wyÅ›wietlona na pasku statusu, na dole okna maszyny wirtualnej, zaraz obok ikony&nbsp;<img src=hostkey_16px.png/>. Ikona ta, wraz z umieszczonÄ… obok niej ikonÄ… myszy, wskazuje aktualny stan przechwycenia klawiatury i myszy.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>Maszyna wirtualna informuje, że goszczony system operacyjny obsÅ‚uguje funkcjÄ™ <b>integracji kursora myszy</b>. Oznacza to, że nie trzeba rÄ™cznie <i>przechwytywać</i> kursora myszy aby móc go używać w goszczonym systemie operacyjnym - wszystkie czynnoÅ›ci myszy wykonywane nad oknem maszyny wirtualnej bÄ™dÄ… przekazywane bezpoÅ›rednio do goszczonego systemu operacyjnego.</p><p>Ponadto ikona myszy na pasku statusu okna maszyny wirtualnej wyglÄ…dać bÄ™dzie nastÄ™pujÄ…co:&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;, aby poinformować, że funkcja integracji kursora myszy jest obsÅ‚ugiwana przez goszczony system operacyjny i jest w tej chwili wÅ‚Ä…czona.</p><p><b>Uwaga</b>: niektóre aplikacje mogÄ… zachowywać siÄ™ niepoprawnie, jeÅ›li funkcja integracji kursora myszy jest wÅ‚Ä…czona. W każdej chwili można jÄ… jednak wyÅ‚Ä…czyć (lub wÅ‚Ä…czyć ponownie) w ramach bieżącej sesji, poprzez wybranie odpowiedniej opcji z menu <i>Maszyna</i> w oknie maszyny.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>Maszyna wirtualna informuje, że goszczony system operacyjny nie obsÅ‚uguje funkcji <b>integracji kursora myszy</b> w bieżącym trybie graficznym. Trzeba rÄ™cznie przechwycić kursor myszy (klikajÄ…c przyciskiem myszy nad oknem maszyny wirtualnej lub wciskajÄ…c klawisz gospodarza), aby móc używać myszy w goszczonym systemie operacyjnym.</p></translation> </message> @@ -6136,6 +6131,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Nie udaÅ‚o siÄ™ zapisać pobranego pliku jako <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Pobierz</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -6183,6 +6208,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6563,6 +6599,18 @@ oraz wydajnoÅ›ci zapisu dysku twardego w komputerze.</p></translation> <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -7291,6 +7339,97 @@ BÄ™dzie ona używana przez wszystkie moduÅ‚y VirtualBox, aby móc rozróżnić t </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dzieÅ„</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dni</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dni</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dni</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dni</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dni</translation> + </message> + <message> + <source>1 week</source> + <translation>1 tydzieÅ„</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 tygodnie</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 tygodnie</translation> + </message> + <message> + <source>1 month</source> + <translation>1 miesiÄ…c</translation> + </message> + <message> + <source>Never</source> + <translation>Nigdy</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">UpÅ‚ynÄ…Å‚ limit czasu odpowiedzi.</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Sprawdź</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">Z&amknij</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Asystent aktualizacji VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Sprawdzanie dostÄ™pnoÅ›ci aktualizacji</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Anuluj</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Podsumowanie</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>ZostaÅ‚a wydana nowa wersja VirtualBox! Wersja <b>%1</b> jest dostÄ™pna na <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Można pobrać tÄ™ wersjÄ™ bezpoÅ›rednio spod adresu:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Nie udaÅ‚o siÄ™ uzyskać informacji o nowej wersji programu z powodu nastÄ™pujÄ…cego bÅ‚Ä™du sieci:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Najnowsza wersja VirtualBox jest już zainstalowana. ProszÄ™ powtórzyć sprawdzanie wersji później.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Ten asystent Å‚Ä…czy siÄ™ ze stronÄ… internetowÄ… VirtualBox w celu sprawdzenia, czy jest dostÄ™pna nowa wersja VirtualBox.</p><p>ProszÄ™ wcisnąć przycisk <b>Sprawdź</b>, aby teraz wykonać sprawdzenie lub przycisk <b>Anuluj</b>, aby odwoÅ‚ać sprawdzanie.</p<p>Można uruchomić tego asystenta w dowolnym momencie, wybierajÄ…c <b>Sprawdź dostÄ™pność aktualizacji...</b> w menu <b>Pomoc</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7882,18 +8021,6 @@ Wersja %1</translation> <translation type="obsolete">Pomo&c</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Wskazuje, czy funkcja automatycznego skalowania ekranu goÅ›cia jest wÅ‚Ä…czona (<img src=auto_resize_on_16px.png/>) czy wyÅ‚Ä…czona (<img src=auto_resize_off_16px.png/>). Uwaga: funkcja ta wymaga zainstalowania Dodatków (Guest Additions) w goszczonym systemie operacyjnym.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Wskazuje, czy kursor myszy gospodarza jest przechwycony przez system goszczony operacyjny:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;kursor nie jest przechwycony</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;kursor jest przechwycony</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integracja myszy (IM) jest wÅ‚Ä…czona</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM wyÅ‚Ä…czona, kursor przechwycony</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM wyÅ‚Ä…czona, kursor nie jest przechwycony</nobr><br>Uwaga: funkcja integracji kursora myszy wymaga zainstalowania Dodatków (Guest Additions) w goszczonym systemie operacyjnym.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">Wskazuje, czy klawiatura jest przechwycona przez goszczony system operacyjny (<img src=hostkey_captured_16px.png/>) czy nie (<img src=hostkey_16px.png/>)</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">OkreÅ›la aktualnie zdefiniowany klawisz gospodarza.<br>Klawisz ten, wciÅ›niÄ™ty pojedynczo, przeÅ‚Ä…cza przechwytywanie klawiatury i myszy. Użyty razem z innymi klawiszami pozwala na szybkie wywoÅ‚anie akcji dostÄ™pnych w menu głównym.</translation> </message> @@ -7939,10 +8066,6 @@ Wersja %1</translation> <translation type="obsolete"><br>[<b>niepodÅ‚Ä…czony</b>]</translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">Wskazuje, czy serwer zdalnego pulpitu (VRDP) jest wÅ‚Ä…czony (<img src=vrdp_16px.png/>) czy nie (<img src=vrdp_disabled_16px.png/>)</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>Serwer VRDP nasÅ‚uchuje na porcie %1</translation> </message> @@ -8059,8 +8182,8 @@ Wersja %1</translation> <translation type="obsolete">PrzeÅ‚Ä…cza w tryb zintegrowanego pulpitu</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Wskazuje, czy klawiatura jest przechwycona przez goszczony system operacyjny (<img src=hostkey_captured_16px.png/>) czy nie (<img src=hostkey_16px.png/>).</translation> + <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> + <translation type="obsolete">Wskazuje, czy klawiatura jest przechwycona przez goszczony system operacyjny (<img src=:/hostkey_captured_16px.png/>) czy nie (<img src=:/hostkey_16px.png/>).</translation> </message> <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> @@ -8153,10 +8276,6 @@ Wersja %1</translation> <translation type="obsolete"><br><nobr><b>Kontroler USB jest wyÅ‚Ä…czony</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Wskazuje, czy serwer zdalnego pulpitu (VRDP) jest wÅ‚Ä…czony (<img src=vrdp_16px.png/>) czy nie (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>Wskaźnik aktywnoÅ›ci współdzielonych katalogów:</nobr>%1</qt></translation> @@ -8201,18 +8320,10 @@ Wersja %1</translation> <translation type="obsolete">Wiersz pole&ceÅ„...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Wskazuje, czy funkcja automatycznego skalowania ekranu goÅ›cia jest wÅ‚Ä…czona (<img src=:/auto_resize_on_16px.png/>) czy wyÅ‚Ä…czona (<img src=:/auto_resize_off_16px.png/>). Uwaga: funkcja ta wymaga zainstalowania Dodatków (Guest Additions) w goszczonym systemie operacyjnym.</translation> - </message> - <message> <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> <translation type="obsolete">Wskazuje, czy kursor myszy gospodarza jest przechwycony przez goszczony system operacyjny:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;kursor nie jest przechwycony</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;kursor jest przechwycony</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integracja myszy (IM) jest wÅ‚Ä…czona</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM wyÅ‚Ä…czona, kursor przechwycony</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM wyÅ‚Ä…czona, kursor nie jest przechwycony</nobr><br>Uwaga: funkcja integracji kursora myszy wymaga zainstalowania Dodatków (Guest Additions) w goszczonym systemie operacyjnym.</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">Wskazuje, czy klawiatura jest przechwycona przez goszczony system operacyjny (<img src=:/hostkey_captured_16px.png/>) czy nie (<img src=:/hostkey_16px.png/>).</translation> - </message> - <message> <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> <translation type="obsolete">Wskazuje, czy serwer zdalnego pulpitu (VRDP) jest wÅ‚Ä…czony (<img src=:/vrdp_16px.png/>) czy nie (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> @@ -11478,10 +11589,6 @@ jÄ™zyka ustawiony jako domyÅ›lny dla systemu.</qt> <translation>Uruchamia wybranÄ… maszynÄ™ wirtualnÄ…</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Witamy w VirtualBox!</h3><p>Lewa część tego okna przeznaczona jest do wyÅ›wietlania listy maszyn wirtualnych dostÄ™pnych na tym komputerze. Lista jest teraz pusta, ponieważ nie utworzono jeszcze żadnej maszyny.<img src=welcome.png align=right/></p><p>Aby utworzyć nowÄ… wirtualnÄ… maszynÄ™, proszÄ™ wcisnąć przycisk <b>Nowa</b> na głównym pasku narzÄ™dziowym, umieszczonym na górze okna.</p><p>Można także wcisnąć klawisz <b>%1</b>, aby uzyskać natychmiastowÄ… pomoc lub odwiedzić stronÄ™ <a href=http://www.virtualbox.org>www.virtualbox.org</a>, aby uzyskać wiÄ™cej informacji i wiadomoÅ›ci.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Maszyna</translation> </message> @@ -12276,97 +12383,6 @@ Puste pole sprawi, że filtr zadziaÅ‚a dla jakiejkolwiek wartoÅ›ci.</qt></ </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dzieÅ„</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dni</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dni</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dni</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dni</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dni</translation> - </message> - <message> - <source>1 week</source> - <translation>1 tydzieÅ„</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 tygodnie</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 tygodnie</translation> - </message> - <message> - <source>1 month</source> - <translation>1 miesiÄ…c</translation> - </message> - <message> - <source>Never</source> - <translation>Nigdy</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">UpÅ‚ynÄ…Å‚ limit czasu odpowiedzi.</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Sprawdź</translation> - </message> - <message> - <source>&Close</source> - <translation>Z&amknij</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Asystent aktualizacji VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Sprawdzanie dostÄ™pnoÅ›ci aktualizacji</translation> - </message> - <message> - <source>Cancel</source> - <translation>Anuluj</translation> - </message> - <message> - <source>Summary</source> - <translation>Podsumowanie</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>ZostaÅ‚a wydana nowa wersja VirtualBox! Wersja <b>%1</b> jest dostÄ™pna na <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Można pobrać tÄ™ wersjÄ™ bezpoÅ›rednio spod adresu:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Nie udaÅ‚o siÄ™ uzyskać informacji o nowej wersji programu z powodu nastÄ™pujÄ…cego bÅ‚Ä™du sieci:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Najnowsza wersja VirtualBox jest już zainstalowana. ProszÄ™ powtórzyć sprawdzanie wersji później.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Ten asystent Å‚Ä…czy siÄ™ ze stronÄ… internetowÄ… VirtualBox w celu sprawdzenia, czy jest dostÄ™pna nowa wersja VirtualBox.</p><p>ProszÄ™ wcisnąć przycisk <b>Sprawdź</b>, aby teraz wykonać sprawdzenie lub przycisk <b>Anuluj</b>, aby odwoÅ‚ać sprawdzanie.</p<p>Można uruchomić tego asystenta w dowolnym momencie, wybierajÄ…c <b>Sprawdź dostÄ™pność aktualizacji...</b> w menu <b>Pomoc</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts index fda9efff3..03df661d7 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts @@ -1160,6 +1160,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4453,18 +4460,6 @@ <translation>Falha ao remover a pasta partilhada <b>%1</b> (a apontar para <nobr><b>%2</b></nobr>) da máquina virtual <b>%3</b>.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p><b>Clicou no rato</b> dentro do ecrã da Máquina Virtual ou premiu a <b>tecla de hospedeiro</b>. Isto fará com que a Máquina Virtual <b>capture</b> o ponteiro do rato do computador hospedeiro (apenas se a integração de ponteiro do rato não for suportada pelo sistema operativo convidado) e o teclado, tornando-os indisponÃveis para outras aplicações que estejam a ser executadas no computador hospedeiro.</p><p>Pode premir a <b>tecla de hospedeiro</b> em qualquer momento para <b>libertar</b> o teclado e o rato (se estiverem capturados). A tecla de hospedeiro actualmente definida é mostrada na barra de estado na parte de baixo da janela da Máquina Virtual, próxima do Ãcone&nbsp;<img src=hostkey_16px.png/>&nbsp;. Este Ãcone, juntamente com o Ãcone do rato próximo deste, indica o estado de captura do teclado e do rato.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Tem a opção <b>Auto-capturar teclado</b> ligada. Isto fará com que a Máquina Virtual (MV) <b>capture</b> automaticamente o teclado sempre que a janela da MV fique activa, tornando-o indisponÃvel para outras aplicações que estejam a ser executadas no computador hospedeiro: quando o teclado é capturado, todas as teclas (incluindo teclas de sistema como Alt-Tab) serão direccionadas para a MV.</p><p>Pode premir a <b>tecla de hospedeiro</b> quando quiser para <b>libertar</b> o teclado e o rato (se estiver capturado também) e continuar a usá-los normalmente. A tecla de hospedeiro actual é mostrada na barra de estado na parte de baixo da janela da Máquina Virtual, próximo ao Ãcone&nbsp;<img src=hostkey_16px.png/>&nbsp;. Este Ãcone, juntamente com o Ãcone do rato próximo a este, indicam o estado de captura actual do teclado e do rato.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>A Máquina Virtual informa que o sistema operativo convidado suporta o recurso de <b>integração de ponteiro do rato</b>. Isto significa que não precisa de <i>capturar</i> o ponteiro do rato para o poder usar no sistema operativo convidado -- todas as acções do rato que executar quando o ponteiro estiver em cima da janela da Máquina Virtual serão enviadas diretamente para o sistema operativo convidado. Se o rato estiver capturado, será automaticamente libertado.</p><p>O Ãcone do rato na barra de estado irá ficar assim:&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;para o informar que a integração de ponteiro de rato é suportada pelo sistema operativo convidado e que este recurso está activo.</p><p><b>Nota</b>: Algumas aplicações poderão comportar-se de forma estranha no modo de integração do ponteiro do rato. Se necessário, pode desactivar o recurso para a sessão actual (e activá-lo novamente) seleccionando a acção correspondente na barra de menu.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>A Máquina Virtual (MV) informa que o sistema operatico convidado não suporta o recurso de <b>integração do ponteiro do rato</b> no modo de vÃdeo actual. Precisa capturar o rato (clicando na janela da MV ou pressionando a tecla de hospedeiro) para poder usar o rato dentro do sistema operativo convidado.</p></translation> </message> @@ -4826,7 +4821,7 @@ </message> <message> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><p>A Máquina Virtual informa que o sistema operativo convidado suporta o recurso de <b>integração de ponteiro do rato</b>. Isto significa que não precisa de <i>capturar</i> o ponteiro do rato para o poder usar no sistema operativo convidado -- todas as acções do rato que executar quando o ponteiro estiver em cima da janela da Máquina Virtual serão enviadas diretamente para o sistema operativo convidado. Se o rato estiver capturado, será automaticamente libertado.</p><p>O Ãcone do rato na barra de estado irá ficar assim:&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;para o informar que a integração de ponteiro de rato é suportada pelo sistema operativo convidado e que este recurso está activo.</p><p><b>Nota</b>: Algumas aplicações poderão comportar-se de forma estranha no modo de integração do ponteiro do rato. Se necessário, pode desactivar o recurso para a sessão actual (e activá-lo novamente) seleccionando a acção correspondente na barra de menu.</p></translation> </message> <message> <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source> @@ -5536,6 +5531,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Falha ao gravar o ficheiro transferido como <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Transferir</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">Instalar</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5583,6 +5608,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5919,6 +5955,18 @@ demorar algum tempo dependendo do tamanho da imagem e do desempenho do seu disco <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6615,6 +6663,93 @@ diálogo de Configurações da MV.</p></translation> </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dia</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dias</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dias</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dias</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dias</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dias</translation> + </message> + <message> + <source>1 week</source> + <translation>1 semana</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 semanas</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 semanas</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mês</translation> + </message> + <message> + <source>Never</source> + <translation>Nunca</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Verificar</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Fechar</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Assitente de Actualização VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Procurar por Actualizações</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Cancelar</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Resumo</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Uma nova versão do VirtualBox está disponÃvel! A version <b>%1</b> está disponÃvel em <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Poderá fazer a transferência desta versão utilizando este atalho directo:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Não é possÃvel obter informação acerca da nova versões devido ao seguinte erro da rede:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Já tem instalada a última versão do VirtualBox. Por favor procure por novas versões mais tarde.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Este assistente conectará ao sÃtio 'web' VirtualBox e verifica se está disponÃvel uma nova versão.</p><p>Use o botão <b>Verificar</b> para verificar agora acerca de uma nova versão ou o botão <b>Cancelar</b> se não deseja executar esta verificação.</p><p>Pode correr este assistente em qualquer altura ao escolher <b>Verificar Actualizações...</b> no menu <b>Ajuda</b></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7183,18 +7318,6 @@ Versão %1</translation> <translation type="obsolete">A&juda</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se a função de auto-redimensionar o ecrã do sistema convidado está Activa (<img src=auto_resize_on_16px.png/>) ou Desligada (<img src=auto_resize_off_16px.png/>). Note que esta função requer que as Adições de Convidado estejam instaladas no sistema convidado.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se o ponteiro do rato do sistema hospedeiro foi capturado pelo sistema convidado:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;o ponteiro não foi capturado</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;o ponteiro foi capturado</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integração do rato (IR) está Activa</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IR está Desligada, o ponteiro foi capturado</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IR está Desligada, o ponteiro não está capturado</nobr><br>Repare que o recurso de integração do rato requer que as Adições de Convidado estejam instaladas no sistema convidado.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">Indica se o teclado foi capturado pelo sistema convidado (<img src=hostkey_captured_16px.png/>) ou não (<img src=hostkey_16px.png/>)</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">Mostra a tecla actualmente definida como Tecla do Hospedeiro.<br>Esta tecla, quando pressionada, alterna o estado de captura do teclado e rato. Também pode ser utilizada em combinação com outras teclas para executar de forma rápidas algumas das opções do menu principal.</translation> </message> @@ -7240,10 +7363,6 @@ Versão %1</translation> <translation type="obsolete"><br>[<b>não conectado</b>]</translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">Indica se a Tela Remota (servidor VRDP) está habilitada (<img src=vrdp_16px.png/>) ou não (<img src=vrdp_disabled_16px.png/>)</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>O Servidor VRDP está a escutar na porta %1</translation> </message> @@ -7356,10 +7475,6 @@ Versão %1</translation> <translation type="obsolete">Muda para modo de integração de ecrã 'seamless'</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indica se o teclado foi capturado pelo SO convidado (<img src=hostkey_captured_16px.png/>) ou não (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Indica a actividade do dispositivo de disquetes:</nobr>%1</qt></translation> @@ -7450,10 +7565,6 @@ Versão %1</translation> <translation type="obsolete"><br><nobr><b>Controlador USB desactivado</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica se o servidor de Ecrã Remoto (Servidor VRDP) está activo (<img src=vrdp_16px.png/>) ou não (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>Indica a actividade das pastas partilhadas:</nobr>%1</qt></translation> @@ -7502,10 +7613,6 @@ Versão %1</translation> <translation type="obsolete">Linha de &Comandos...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se a função de ajustar o tamanho do écrã do sistema convidado automaticamente está Activa (<img src=:/auto_resize_on_16px.png/>) ou Desactivada (<img src=:/auto_resize_off_16px.png/>). Esta função requere que as Adições de Convidado estão instaladas no sistema operativo convidado.</translation> - </message> - <message> <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> <translation type="obsolete">Indica se o ponteiro do rato foi capturado pelo sistema operativo convidado:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;ponteiro não foi capturado</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;ponteiro está capturado</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integração do rato está ligada</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;integração está desligada, o ponteiro está capturado</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;integração do rato está desligada, o ponteiro não está capturado</nobr><br>A integração do rato requere a instalação das Adições de Convidados ao sistema operativo convidado.</translation> </message> @@ -10614,10 +10721,6 @@ para ligar ao encaixe actualmente destacado.</qt> <translation>Iniciar a máquina virtual seleccionada</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Bem-vindo ao VirtualBox!</h3><p>A parte esquerda desta janela mostra uma lista de todas as máquinas virtuais disponÃveis no seu computador. A lista está vazia agora porque ainda não foi criada nenhuma máquina virtual.<img src=welcome.png align=right/></p><p>Para criar uma nova máquina virtual, prima o botão <b>Novo</b> na barra de ferramentas principal, localizado no topo da janela.</p><p>Pode premir <b>%1</b> para obter ajuda de forma instantânea, ou visitar <a href=http://www.virtualbox.org>www.virtualbox.org</a> para obter informações e notÃcias acerca do VirtualBox.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Máquina</translation> </message> @@ -11480,93 +11583,6 @@ corresponder a qualquer valor.</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dia</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dias</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dias</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dias</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dias</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dias</translation> - </message> - <message> - <source>1 week</source> - <translation>1 semana</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 semanas</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 semanas</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mês</translation> - </message> - <message> - <source>Never</source> - <translation>Nunca</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Verificar</translation> - </message> - <message> - <source>&Close</source> - <translation>&Fechar</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Assitente de Actualização VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Procurar por Actualizações</translation> - </message> - <message> - <source>Cancel</source> - <translation>Cancelar</translation> - </message> - <message> - <source>Summary</source> - <translation>Resumo</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Uma nova versão do VirtualBox está disponÃvel! A version <b>%1</b> está disponÃvel em <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Poderá fazer a transferência desta versão utilizando este atalho directo:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Não é possÃvel obter informação acerca da nova versões devido ao seguinte erro da rede:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Já tem instalada a última versão do VirtualBox. Por favor procure por novas versões mais tarde.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Este assistente conectará ao sÃtio 'web' VirtualBox e verifica se está disponÃvel uma nova versão.</p><p>Use o botão <b>Verificar</b> para verificar agora acerca de uma nova versão ou o botão <b>Cancelar</b> se não deseja executar esta verificação.</p><p>Pode correr este assistente em qualquer altura ao escolher <b>Verificar Actualizações...</b> no menu <b>Ajuda</b></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts index 266897896..8e64ff5ed 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.0" language="pt_BR"> <context> <name>@@@</name> <message> @@ -234,11 +234,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>Copiar todos os erros para a área de transferência</translation> </message> <message> <source>Copy</source> - <translation type="unfinished">Copiar</translation> + <translation>Copiar</translation> </message> </context> <context> @@ -748,7 +748,8 @@ </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translatorcomment>Decidi deixar o termo "linkada" por ser mais fácil de assimilar</translatorcomment> + <translation>Base Linkada para %1 e %2</translation> </message> </context> <context> @@ -779,7 +780,7 @@ </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Quando selecionado, define um endereço MAC único para todas as placas de rede configuradas.</translation> </message> </context> <context> @@ -818,54 +819,55 @@ </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Clone Completo</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translatorcomment>Decidi deixar o termo "linkado" por ser mais comum no meio</translatorcomment> + <translation>Clone Linkado</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>Selecione o tipo de clone.</p><p>Se você escolher <b>Clone Completo</b>, uma cópia exata da VM original (incluindo todas as imagens de discos virtuais) será criada. Se você selecionar <b>Clone Linkado</b>, uma nova VM será criada, mas as imagens de discos virtuais irão apontar para as imagens de discos da VM original.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Atenção: um novo snapshot será criado na VM original caso você selecione <b>Clone Linkado</b>.</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished">Estado atual da máquina</translation> + <translation>Estado atual da máquina</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished">Estado atual da máquina e todos os estados-filhos</translation> + <translation>Estado atual da máquina e todos os estados-filhos</translation> </message> <message> <source>All states</source> - <translation type="unfinished">Todos os estados</translation> + <translation>Todos os estados</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished">Configuração de Clonagem</translation> + <translation>Configuração de Clonagem</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished">Escolha quais partes da máquina virtual deverão ser clonadas.</translation> + <translation>Escolha quais partes da máquina virtual deverão ser clonadas.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished">Se você selecionar <b>estado atual da máquina</b>, apenas o estado atual da máquina virtual será clonado.</translation> + <translation>Se você selecionar <b>estado atual da máquina</b>, apenas o estado atual da máquina virtual será clonado.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished">Se você selecionar <b>Estado atual da máquina e de todos os estados-filho</b>, o estado atual da máquina virtual e todos os estados de snapshots serão clonados.</translation> + <translation>Se você selecionar <b>Estado atual da máquina e de todos os estados-filho</b>, o estado atual da máquina virtual e todos os estados de snapshots serão clonados.</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished">Se você selecionar <b>Todos os estados</b>, o estado atual da máquina e todos os snapshots serão clonados.</translation> + <translation>Se você selecionar <b>Todos os estados</b>, o estado atual da máquina e todos os snapshots serão clonados.</translation> </message> </context> <context> @@ -1254,6 +1256,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Selecione uma pasta para salvar %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2398,23 +2407,23 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Left Shift</source> - <translation type="unfinished">Shift Esquerdo</translation> + <translation>Shift Esquerdo</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">Shift Direito</translation> + <translation>Shift Direito</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">Ctrl Esquerdo</translation> + <translation>Ctrl Esquerdo</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">Ctrl Direito</translation> + <translation>Ctrl Direito</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">Alt Esquerdo</translation> + <translation>Alt Esquerdo</translation> </message> <message> <source>Right Alt</source> @@ -2769,10 +2778,6 @@ p, li { white-space: pre-wrap; } <translation><br><nobr><b>Nenhuma pasta compartilhada</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica se o servidor de Tela Remota (VRDP) está habilitado (<img src=vrdp_16px.png/>) ou não (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>O Servidor VRDP está ouvindo na porta %1</translation> </message> @@ -2788,15 +2793,15 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation>Indica se o ponteiro do mouse do sistema hospedeiro foi capturado pelo sistema convidado:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;o ponteiro não foi capturado</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;o ponteiro foi capturado</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integração de mouse (IM) está Ligada</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM está Desligada, o ponteiro foi capturado</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM está Desligada, o ponteiro não está capturado</nobr><br>Note que o recurso de integração do mouse requer que os Adicionais Para Convidado sejam instalados no sistema convidado.</translation> + <translation>Indica se o ponteiro do mouse do sistema hospedeiro foi capturado pelo sistema convidado:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;o ponteiro não foi capturado</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;o ponteiro foi capturado</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integração de mouse (IM) está Ligada</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM está Desligada, o ponteiro foi capturado</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM está Desligada, o ponteiro não está capturado</nobr><br>Note que o recurso de integração do mouse requer que os Adicionais Para Convidado sejam instalados no sistema convidado.</translation> </message> <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation>Indica se o teclado foi capturad pelo sistema operacional Convidado (<img src=hostkey_captured_16px.png/>) ou não (<img src=hostkey_16px.png/>).</translation> + <translation>Indica se o teclado foi capturad pelo sistema operacional Convidado (<img src=:/hostkey_captured_16px.png/>) ou não (<img src=:/hostkey_16px.png/>).</translation> </message> <message> <source>Indicates whether the Remote Desktop Server is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation>Indica se a Tela Remota (servidor VRDP) está habilitada (<img src=vrdp_16px.png/>) ou não (<img src=vrdp_disabled_16px.png/>).</translation> + <translation>Indica se a Tela Remota (servidor VRDP) está habilitada (<img src=:/vrdp_16px.png/>) ou não (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> <message> <source><hr>The Remote Desktop Server is listening on port %1</source> @@ -4323,7 +4328,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation type="unfinished">Quando selecionado, evita a desmontagem da mÃdia quando o sistema convidado solicitar a ejeção.</translation> + <translation>Quando selecionado, evita a desmontagem da mÃdia quando o sistema convidado solicitar a ejeção.</translation> </message> <message> <source>&Live CD/DVD</source> @@ -4331,7 +4336,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the guest system will see the virtual disk as a solid state device.</source> - <translation type="unfinished">Quando selecionado, define a mÃdia como de estado sólido (SSD).</translation> + <translation>Quando selecionado, define a mÃdia como sendo de estado sólido (SSD).</translation> </message> <message> <source>&Solid-state drive</source> @@ -4373,7 +4378,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source> - <translation type="unfinished">Seleciona a quantidade de portas da controladora SATA escolhida na Ãrvore de Armazenamento. Este valor não pode ser menor que o número máximo de portas utilizadas + 1.</translation> + <translation>Seleciona a quantidade de portas da controladora SATA escolhida na Ãrvore de Armazenamento. Este valor não pode ser menor que o número máximo de portas utilizadas + 1.</translation> </message> </context> <context> @@ -4559,7 +4564,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source> - <translation type="unfinished">Define o tipo de chipset usado por esta VM.</translation> + <translation>Define o tipo de chipset usado por esta VM. Atenção: a emulação do chipset ICH9 é experimental e não é recomendado o seu uso, exceto em sistemas Convidades que o exigem (como o Mac OS X, por exemplo).</translation> </message> <message> <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> @@ -4593,7 +4598,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>você definiu o tipo de chipset desta VM como ICH9. Este chipset não funcionará corretamente a menos que o recurso de IO APIC também esteja habilitado. Isto será feito automaticamente assim que clicar no botão OK.</translation> </message> </context> <context> @@ -5085,18 +5090,6 @@ p, li { white-space: pre-wrap; } <translation>Falha ao remover a pasta compartilhada <b>%1</b> (apontando para <nobr><b>%2</b></nobr>) da máquina virtual <b>%3</b>.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Você <b>clicou o mouse</b> dentro da tela da Máquina Virtual ou pressionou a <b>tecla de hospedeiro</b>. Isto fará com que a Máquina Virtual <b>capture</b> o ponteiro do mouse do computador hospedeiro (apenas se a integração de ponteiro de mouse não for suportada pelo sistema operacional convidado) e o teclado, tornando-os indisponÃveis para outras aplicações que estejam rodando no computador hospedeiro.</p><p>Você pode pressionar a <b>tecla de hospedeiro</b> a qualquer momento para <b>liberar</b> o teclado e o mouse (se estiverem capturados) e retorná-los à sua operação normal. A tecla de hospedeiro atualmente definida é mostrada na barra de status na parte de baixo da janela da Máquina Virtual, próxima ao Ãcone&nbsp;<img src=hostkey_16px.png/>&nbsp;. Este Ãcone, juntamente com o Ãcone do mouse próximo a ele, indica o estado de captura do teclado e do mouse.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Você tem a opção <b>Auto-capturar teclado</b> ligada. Isto fará com que a Máquina Virtual automaticamente <b>capture</b> o teclado todas as vezes em que a janela da MV seja ativada, tornando-o indisponÃvel para outras aplicações que estejam rodando em seu computador hospedeiro: quando o teclado é capturado, todas as teclas (incluindo teclas de sistema como Alt-Tab) serão direcionadas para a MV.</p><p>Você pode pressionar a <b>tecla de hospedeiro</b> a qualquer hora para <b>liberar</b> o teclado e o mouse (se estiver capturado também) e retorná-los a sua operação normal. A tecla de hospedeiro atual é mostrada na barra de status na parte de baixo da janela da Máquina Virtual, próximo ao Ãcone&nbsp;<img src=hostkey_16px.png/>&nbsp;. Este Ãcone, juntamente com o Ãcone de mouse próximo a ele, indicam o estado de captura atual do teclado e do mouse.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>A Máquina Virtual informa que o sistema operacional convidado suporta o recurso de <b>integração de ponteiro de mouse</b>. Isto significa que você não precisa <i>capturar</i> o ponteiro do mouse para poder usá-lo em seu sistema operacional convidado -- todas as ações de mouse que você executar quando o ponteiro estiver em cima da janela da Máquina Virtual serão enviadas diretamente para o sistema operacional convidado. Se o mouse estiver capturado, ele será automaticamente liberado.</p><p>O Ãcone de mouse na barra de status irá ficar assim:&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;para informálo que a integração de ponteiro de mouse é suportada pelo sistema operacional convidado e que este recurso está ativo.</p><p><b>Nota</b>: Algumas aplicações podem se comportar de forma errônea no modo de integração de ponteiro de mouse. Se necessário, você pode desabilitar o recurso para a sessão atual (e habilitá-lo de novo) selecionando a ação correspondente na barra de menu.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>A Máquina Virtual informa que o sistema operacional convidado não suporta o recurso de <b>integração de ponteiro de mouse</b> no modo de vÃdeo atual. Você precisa capturar o mouse (clicando na janela da MV ou pressionando a tecla de hospedeiro) para poder utilizar o mouse dentro do sistema operacional convidado.</p></translation> </message> @@ -5454,15 +5447,15 @@ p, li { white-space: pre-wrap; } </message> <message> <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation><p>Você <b>clicou o mouse</b> dentro da tela da Máquina Virtual ou pressionou a <b>tecla de hospedeiro</b>. Isto fará com que a Máquina Virtual <b>capture</b> o ponteiro do mouse do computador hospedeiro (apenas se a integração de ponteiro de mouse não for suportada pelo sistema operacional convidado) e o teclado, tornando-os indisponÃveis para outras aplicações que estejam rodando no computador hospedeiro.</p><p>Você pode pressionar a <b>tecla de hospedeiro</b> a qualquer momento para <b>liberar</b> o teclado e o mouse (se estiverem capturados) e retorná-los à sua operação normal. A tecla de hospedeiro atualmente definida é mostrada na barra de status na parte de baixo da janela da Máquina Virtual, próxima ao Ãcone&nbsp;<img src=hostkey_16px.png/>&nbsp;. Este Ãcone, juntamente com o Ãcone do mouse próximo a ele, indica o estado de captura do teclado e do mouse.</p></translation> + <translation><p>Você <b>clicou o mouse</b> dentro da tela da Máquina Virtual ou pressionou a <b>tecla de hospedeiro</b>. Isto fará com que a Máquina Virtual <b>capture</b> o ponteiro do mouse do computador hospedeiro (apenas se a integração de ponteiro de mouse não for suportada pelo sistema operacional convidado) e o teclado, tornando-os indisponÃveis para outras aplicações que estejam rodando no computador hospedeiro.</p><p>Você pode pressionar a <b>tecla de hospedeiro</b> a qualquer momento para <b>liberar</b> o teclado e o mouse (se estiverem capturados) e retorná-los à sua operação normal. A tecla de hospedeiro atualmente definida é mostrada na barra de status na parte de baixo da janela da Máquina Virtual, próxima ao Ãcone&nbsp;<img src=:/hostkey_16px.png/>&nbsp;. Este Ãcone, juntamente com o Ãcone do mouse próximo a ele, indica o estado de captura do teclado e do mouse.</p></translation> </message> <message> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation><p>Você tem a opção <b>Auto-capturar teclado</b> ligada. Isto fará com que a Máquina Virtual automaticamente <b>capture</b> o teclado todas as vezes em que a janela da MV seja ativada, tornando-o indisponÃvel para outras aplicações que estejam rodando em seu computador hospedeiro: quando o teclado é capturado, todas as teclas (incluindo teclas de sistema como Alt-Tab) serão direcionadas para a MV.</p><p>Você pode pressionar a <b>tecla de hospedeiro</b> a qualquer hora para <b>liberar</b> o teclado e o mouse (se estiver capturado também) e retorná-los a sua operação normal. A tecla de hospedeiro atual é mostrada na barra de status na parte de baixo da janela da Máquina Virtual, próximo ao Ãcone&nbsp;<img src=hostkey_16px.png/>&nbsp;. Este Ãcone, juntamente com o Ãcone de mouse próximo a ele, indicam o estado de captura atual do teclado e do mouse.</p></translation> + <translation><p>Você tem a opção <b>Auto-capturar teclado</b> ligada. Isto fará com que a Máquina Virtual automaticamente <b>capture</b> o teclado todas as vezes em que a janela da MV seja ativada, tornando-o indisponÃvel para outras aplicações que estejam rodando em seu computador hospedeiro: quando o teclado é capturado, todas as teclas (incluindo teclas de sistema como Alt-Tab) serão direcionadas para a MV.</p><p>Você pode pressionar a <b>tecla de hospedeiro</b> a qualquer hora para <b>liberar</b> o teclado e o mouse (se estiver capturado também) e retorná-los a sua operação normal. A tecla de hospedeiro atual é mostrada na barra de status na parte de baixo da janela da Máquina Virtual, próximo ao Ãcone&nbsp;<img src=:/hostkey_16px.png/>&nbsp;. Este Ãcone, juntamente com o Ãcone de mouse próximo a ele, indicam o estado de captura atual do teclado e do mouse.</p></translation> </message> <message> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation><p>A Máquina Virtual informa que o sistema operacional convidado suporta o recurso de <b>integração de ponteiro de mouse</b>. Isto significa que você não precisa <i>capturar</i> o ponteiro do mouse para poder usá-lo em seu sistema operacional convidado -- todas as ações de mouse que você executar quando o ponteiro estiver em cima da janela da Máquina Virtual serão enviadas diretamente para o sistema operacional convidado. Se o mouse estiver capturado, ele será automaticamente liberado.</p><p>O Ãcone de mouse na barra de status irá ficar assim:&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;para informálo que a integração de ponteiro de mouse é suportada pelo sistema operacional convidado e que este recurso está ativo.</p><p><b>Nota</b>: Algumas aplicações podem se comportar de forma errônea no modo de integração de ponteiro de mouse. Se necessário, você pode desabilitar o recurso para a sessão atual (e habilitá-lo de novo) selecionando a ação correspondente na barra de menu.</p></translation> + <translation><p>A Máquina Virtual informa que o sistema operacional convidado suporta o recurso de <b>integração de ponteiro de mouse</b>. Isto significa que você não precisa <i>capturar</i> o ponteiro do mouse para poder usá-lo em seu sistema operacional convidado -- todas as ações de mouse que você executar quando o ponteiro estiver em cima da janela da Máquina Virtual serão enviadas diretamente para o sistema operacional convidado. Se o mouse estiver capturado, ele será automaticamente liberado.</p><p>O Ãcone de mouse na barra de status irá ficar assim:&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;para informálo que a integração de ponteiro de mouse é suportada pelo sistema operacional convidado e que este recurso está ativo.</p><p><b>Nota</b>: Algumas aplicações podem se comportar de forma errônea no modo de integração de ponteiro de mouse. Se necessário, você pode desabilitar o recurso para a sessão atual (e habilitá-lo de novo) selecionando a ação correspondente na barra de menu.</p></translation> </message> <message> <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source> @@ -6073,10 +6066,9 @@ p, li { white-space: pre-wrap; } </message> <message numerus="yes"> <source><p>The virtual machine(s) <b>%1</b> are currently in a saved state.</p><p>If you continue the runtime state of the exported machine(s) will be discarded. Note that the existing machine(s) are not changed.</p></source> - <translation type="unfinished"> - <numerusform><p>As máquinas virtuais <b>%1</b> possuem estado de execução salvo. </p><p>Se você continuar, o estado atual de execução destas máquinas será descartado. As máquinas existentes não serão afetadas.</p> - - </numerusform> + <translation> + <numerusform><p>As máquinas virtuais <b>%1</b> possuem estado de execução salvo. </p><p>Se você continuar, o estado atual de execução destas máquinas será descartado. As máquinas existentes não serão afetadas.</p></numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -6222,7 +6214,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> - <translation type="unfinished">O estado da máquina virtual que você está editando foi alterado. Apenas as configurações que são editáveis em tempo de execução serão salvas quando clicar em OK. Todas as outras mudanças serão perdidas.</translation> + <translation>O estado da máquina virtual que você está editando foi alterado. Apenas as configurações que são editáveis em tempo de execução serão salvas quando clicar em OK. Todas as outras mudanças serão perdidas.</translation> </message> <message> <source>Failed to clone the virtual machine <b>%1</b>.</source> @@ -6270,11 +6262,41 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Não foi possÃvel encontrar um snapshot com o nome <b>%1</b>.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="unfinished"><p>Falha ao salvar o arquivo baixado como <nobr><b>%1</b>.</nobr></p></translation> + <translation><p>Falha ao salvar o arquivo baixado como <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Você possui uma versão antiga (%1) de <b><nobr>%2</nobr></b> instalado.</p><p>Deseja baixar a versão mais recente a partir da Internet?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Baixar</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Você tem certeza de que deseja baixar <b><nobr>%1</nobr></b> de <nobr><a href="%2">%2</a></nobr> (tamanho %3 bytes)?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p>O arquivo <b><nobr>%1</nobr></b> foi baixado com sucesso de <nobr><a href="%2">%2</a></nobr> e gravado localmente em <nobr><b>%3</b>.</nobr></p><p>Você deseja instalar este pacote de extensões?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>Instalar</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p>O arquivo <b><nobr>%1</nobr></b> foi baixado com sucesso de <nobr><a href="%2">%2</a></nobr> mas não pode ser gravado localmente como <nobr><b>%3</b>.</nobr></p><p>Por favor escolha outro local para gravar este arquivo.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Falha ao baixar o arquivo <b><nobr>%1</nobr></b> de <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> </message> </context> <context> @@ -6315,11 +6337,22 @@ p, li { white-space: pre-wrap; } <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished"></translation> + <translation>Cancelar o download da imagem de CD dos Adicionais para Convidado do VirtualBox</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished"></translation> + <translation>Baixando a imagem de CD dos Adicionais para Convidado do VirtualBox a partir de <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>Cancelar o download de <nobr><b>%1</b></nobr></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Baixando o arquivo <nobr><b>%1</b></nobr> de <nobr><b>%2</b>...</nobr></translation> </message> </context> <context> @@ -6676,7 +6709,7 @@ demorar bastante tempo, dependendo do tamanho escolhido e da velocidade de seu d </message> <message> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> - <translation type="unfinished">Pressione o botão <b>Selecionar</b> para selecionar a localização do arquivo que irá armazenar os dados do disco virtual, ou digite o nome de um arquivo no campo.</translation> + <translation>Informe o nome do arquivo em disco que conterá o disco virtual no campo abaixo ou clique no Ãcone da pasta para selecionar uma localização diferente para o arquivo.</translation> </message> <message> <source><nobr>%1 (%2 B)</nobr></source> @@ -6708,6 +6741,18 @@ demorar bastante tempo, dependendo do tamanho escolhido e da velocidade de seu d <comment>summary</comment> <translation>Detalhes</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (Disco RÃgido do Parallels)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (Disco do QEMU)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (QEMU Copy-On-Write)</translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -7179,11 +7224,11 @@ utilizando o diálogo de Configurações da MV.</p></translation> </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">&Disco RÃgido de Boot</translation> + <translation>&Disco de Boot</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>Selecione uma imagem de disco rÃgido virtual para ser utilizada como disco rÃgido de boot da máquina virtual. Você pode criar um novo disco rÃgido virtual ou selecionar uma imagem existente pressionando o botão correspondente.</p><p>Se você precisa de uma configuração mais complexa de discos rÃgidos, você pode pular este passo e conectar os discos rÃgidos posteriormente utilizando o diálogo de Configurações da VM.</p></translation> + <translation><p>Caso deseje, você poderá escolher um disco de inicialização para a nova máquina. Você pode selecionar uma imagem de disco rÃgido virtual da lista ou selecionar outro local utilizando o Ãcone de pasta.</p><p>Caso necessite de uma configuração de discos virtuais mais complexa, você pode pular este passo e fazer as mudanças manualmente na configuração da máquina virtual assim que o processo de criação for completado.</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -7191,7 +7236,7 @@ utilizando o diálogo de Configurações da MV.</p></translation> </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">O tamanho recomendado para o disco rÃgido de boot é de <b>%1</b>.</translation> + <translation>O tamanho recomendado para o disco rÃgido de boot é de <b>%1</b>.</translation> </message> </context> <context> @@ -7227,7 +7272,7 @@ utilizando o diálogo de Configurações da MV.</p></translation> <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">Disco RÃgido de Boot</translation> + <translation>Disco de Boot</translation> </message> <message> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> @@ -7514,6 +7559,109 @@ utilizando o diálogo de Configurações da MV.</p></translation> </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dia</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dias</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dias</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dias</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dias</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dias</translation> + </message> + <message> + <source>1 week</source> + <translation>1 semana</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 semanas</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 semanas</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mês</translation> + </message> + <message> + <source>Never</source> + <translation>Nunca</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">Tempo para conexão excedido.</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">Não foi possÃvel localizar a lista com as últimas versões no servidor (resposta: %1).</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">Verificar (&k)</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">Fe&char</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Assistente de Atualização do VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Verificar por atualizações</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Este assistente irá conectar ao site na web do VirtualBox e verificar se uma versão mais recente do VirtualBox está disponÃvel.</p> +<p>Utilize o botão <b>Verificar</b> para verificar se uma nova versão agora ou o botão <b>Cancelar</b> se você não deseja realizar esta verificação.</p> +<p>Você pode executar este assistente a qualquer momento escolhendo a opção <b>Verificar por Atualizações...</b> no menu de <b>Ajuda</b>.</p></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Cancelar</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Sumário</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Uma nova versão do VirtualBox foi lançada! A versão <b>%1</b> está disponÃvel em <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Você pode baixá-la diretamente através deste link:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Não foi possÃvel obter informações de versão devido ao seguinte erro de rede:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Você já possui a versão mais recente do VirtualBox. Por favor verifique mais tarde.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Este assistente irá conectar-se ao site na web do VirtualBox e verificar se uma versão mais recente do VirtualBox está disponÃvel.</p><p>Utilize o botão <b>Verificar</b> para verificar se uma nova versão agora ou o botão <b>Cancelar</b> se você não deseja realizar esta verificação.</p><p>Você pode executar este assistente a qualquer momento escolhendo a opção <b>Verificar por Atualizações...</b> no menu de <b>Ajuda</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -8109,16 +8257,8 @@ Versão %1</translation> <translation type="obsolete">Ajuda (&H)</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se a função de auto-redimensionar a tela do sistema convidado está Ligada (<img src=auto_resize_on_16px.png/>) ou Desligada (<img src=auto_resize_off_16px.png/>). Note que esta função requer que os Adicionais Para Convidado estejam instalados no sistema convidado.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se o ponteiro do mouse do sistema hospedeiro foi capturado pelo sistema convidado:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;o ponteiro não foi capturado</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;o ponteiro foi capturado</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integração de mouse (IM) está Ligada</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM está Desligada, o ponteiro foi capturado</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM está Desligada, o ponteiro não está capturado</nobr><br>Note que o recurso de integração do mouse requer que os Adicionais Para Convidado sejam instalados no sistema convidado.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">Indica se o teclado foi capturado pelo sistema convidado (<img src=hostkey_captured_16px.png/>) ou não (<img src=hostkey_16px.png/>)</translation> + <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Indica se a função de auto-redimensionar a tela do sistema convidado está Ligada (<img src=:/auto_resize_on_16px.png/>) ou Desligada (<img src=:/auto_resize_off_16px.png/>). Note que esta função requer que os Adicionais Para Convidado estejam instalados no sistema convidado.</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -8166,8 +8306,8 @@ Versão %1</translation> <translation type="obsolete"><br>[<b>não conectado</b>]</translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">Indica se a Tela Remota (servidor VRDP) está habilitada (<img src=vrdp_16px.png/>) ou não (<img src=vrdp_disabled_16px.png/>)</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>)</source> + <translation type="obsolete">Indica se a Tela Remota (servidor VRDP) está habilitada (<img src=:/vrdp_16px.png/>) ou não (<img src=:/vrdp_disabled_16px.png/>)</translation> </message> <message> <source><hr>The VRDP Server is listening on port %1</source> @@ -8282,10 +8422,6 @@ Versão %1</translation> <translation type="obsolete">Alterna para o modo "seamless" de integração com o desktop</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indica se o teclado foi capturad pelo sistema operacional Convidado (<img src=hostkey_captured_16px.png/>) ou não (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Indica a atividade na mÃdia de disquete:</nobr>%1</qt></translation> @@ -8376,10 +8512,6 @@ Versão %1</translation> <translation type="obsolete"><br><nobr><b>Controladora USB desabilitada</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica se o servidor de Display Remoto (VRDP) está habilitado (<img src=vrdp_16px.png/>) ou não (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>Indica a atividade em pastas compartilhadas:</nobr>%1</qt></translation> @@ -8433,22 +8565,6 @@ Versão %1</translation> <translation type="obsolete">Opções de &Log...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se a função de auto-redimensionar a tela do sistema convidado está Ligada (<img src=auto_resize_on_16px.png/>) ou Desligada (<img src=auto_resize_off_16px.png/>). Note que esta função requer que os Adicionais Para Convidado estejam instalados no sistema convidado.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indica se o ponteiro do mouse do sistema hospedeiro foi capturado pelo sistema convidado:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;o ponteiro não foi capturado</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;o ponteiro foi capturado</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integração de mouse (IM) está Ligada</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM está Desligada, o ponteiro foi capturado</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM está Desligada, o ponteiro não está capturado</nobr><br>Note que o recurso de integração do mouse requer que os Adicionais Para Convidado sejam instalados no sistema convidado.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">Indica se o teclado foi capturad pelo sistema operacional Convidado (<img src=hostkey_captured_16px.png/>) ou não (<img src=hostkey_16px.png/>).</translation> - </message> - <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indica se o servidor de Tela Remota (VRDP) está habilitado (<img src=vrdp_16px.png/>) ou não (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">Mostra a tecla atualmente definida como Tecla do Hospedeiro.<br>Esta tecla, quando pressionada sozinha, alterna o estado de captura do teclado e mouse. Ela também pode ser utilizada em combinação com outras teclas para executar rapidamente as ações definidas no menu principal.</translation> </message> @@ -10228,50 +10344,44 @@ Versão %1</translation> </message> <message numerus="yes"> <source>%n year(s)</source> - <translation type="unfinished"> - <numerusform>%n ano(s) - - </numerusform> + <translation> + <numerusform>%n ano(s)</numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> <source>%n month(s)</source> - <translation type="unfinished"> - <numerusform>%n mes(es) - - </numerusform> + <translation> + <numerusform>%n mes(es)</numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> <source>%n day(s)</source> - <translation type="unfinished"> - <numerusform>%n dia(s) - - </numerusform> + <translation> + <numerusform>%n dia(s)</numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> <source>%n hour(s)</source> - <translation type="unfinished"> - <numerusform>%n hora(s) - - </numerusform> + <translation> + <numerusform>%n hora(s)</numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> <source>%n minute(s)</source> - <translation type="unfinished"> - <numerusform>%n minuto(s) - - </numerusform> + <translation> + <numerusform>%n minuto(s)</numerusform> + <numerusform></numerusform> </translation> </message> <message numerus="yes"> <source>%n second(s)</source> - <translation type="unfinished"> - <numerusform>%n segundo(s) - - </numerusform> + <translation> + <numerusform>%n segundo(s)</numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -11874,10 +11984,6 @@ to the system default language.</qt> <translation>Iniciar a máquina virtual selecionada</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Bem-Vindo ao VirtualBox!</h3><p>A parte esquerda desta janela mostra uma lista de todas as máquinas virtuais disponÃveis em seu computador. A lista está vazia agora porque você ainda não criou nenhuma máquina virtual ainda.<img src=welcome.png align=right/></p><p>Para criar uma nova máquina virtual, pressione o botão <b>Novo</b> na barra de ferramentas principal, localizada no topo da janela.</p><p>Você pode pressionar <b>%1</b> para obter ajuda instantânea, ou visitar <a href=http://www.virtualbox.org>www.virtualbox.org</a> para obter informações e notÃcias sobre o VirtualBox.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Máquina</translation> </message> @@ -11935,7 +12041,7 @@ to the system default language.</qt> </message> <message> <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation><h3>Bem-Vindo ao VirtualBox!</h3><p>A parte esquerda desta janela mostra uma lista de todas as máquinas virtuais disponÃveis em seu computador. A lista está vazia agora porque você ainda não criou nenhuma máquina virtual ainda.<img src=welcome.png align=right/></p><p>Para criar uma nova máquina virtual, pressione o botão <b>Novo</b> na barra de ferramentas principal, localizada no topo da janela.</p><p>Você pode pressionar <b>%1</b> para obter ajuda instantânea, ou visitar <a href=http://www.virtualbox.org>www.virtualbox.org</a> para obter informações e notÃcias sobre o VirtualBox.</p></translation> + <translation><h3>Bem-Vindo ao VirtualBox!</h3><p>A parte esquerda desta janela mostra uma lista de todas as máquinas virtuais disponÃveis em seu computador. A lista está vazia agora porque você ainda não criou nenhuma máquina virtual ainda.<img src=:/welcome.png align=right/></p><p>Para criar uma nova máquina virtual, pressione o botão <b>Novo</b> na barra de ferramentas principal, localizada no topo da janela.</p><p>Você pode pressionar <b>%1</b> para obter ajuda instantânea, ou visitar <a href=http://www.virtualbox.org>www.virtualbox.org</a> para obter informações e notÃcias sobre o VirtualBox.</p></translation> </message> <message> <source>&Virtual Media Manager...</source> @@ -12573,10 +12679,9 @@ para acessá-lo de um sistema operacional Linux. Este recurso requer a instalaç </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>Aviso: Você está criando um snapshot de uma máquina em execução que possui %n imagens imutáveis associadas a ela. Enquanto você estiver trabalhando a partir deste snapshot, as imagens imutáveis não serão reestabelecidas para evitar perda de dados. - - </numerusform> + <translation> + <numerusform>Aviso: Você está criando um snapshot de uma máquina em execução que possui %n imagens imutáveis associadas a ela. Enquanto você estiver trabalhando a partir deste snapshot, as imagens imutáveis não serão reestabelecidas para evitar perda de dados.</numerusform> + <numerusform></numerusform> </translation> </message> </context> @@ -12769,109 +12874,6 @@ qualquer valor.</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dia</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dias</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dias</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dias</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dias</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dias</translation> - </message> - <message> - <source>1 week</source> - <translation>1 semana</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 semanas</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 semanas</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mês</translation> - </message> - <message> - <source>Never</source> - <translation>Nunca</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">Tempo para conexão excedido.</translation> - </message> - <message> - <source>Could not locate the latest version list on the server (response: %1).</source> - <translation type="obsolete">Não foi possÃvel localizar a lista com as últimas versões no servidor (resposta: %1).</translation> - </message> - <message> - <source>Chec&k</source> - <translation>Verificar (&k)</translation> - </message> - <message> - <source>&Close</source> - <translation>Fe&char</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Assistente de Atualização do VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Verificar por atualizações</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>Este assistente irá conectar ao site na web do VirtualBox e verificar se uma versão mais recente do VirtualBox está disponÃvel.</p> -<p>Utilize o botão <b>Verificar</b> para verificar se uma nova versão agora ou o botão <b>Cancelar</b> se você não deseja realizar esta verificação.</p> -<p>Você pode executar este assistente a qualquer momento escolhendo a opção <b>Verificar por Atualizações...</b> no menu de <b>Ajuda</b>.</p></translation> - </message> - <message> - <source>Cancel</source> - <translation>Cancelar</translation> - </message> - <message> - <source>Summary</source> - <translation>Sumário</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Uma nova versão do VirtualBox foi lançada! A versão <b>%1</b> está disponÃvel em <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Você pode baixá-la diretamente através deste link:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Não foi possÃvel obter informações de versão devido ao seguinte erro de rede:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Você já possui a versão mais recente do VirtualBox. Por favor verifique mais tarde.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Este assistente irá conectar-se ao site na web do VirtualBox e verificar se uma versão mais recente do VirtualBox está disponÃvel.</p><p>Utilize o botão <b>Verificar</b> para verificar se uma nova versão agora ou o botão <b>Cancelar</b> se você não deseja realizar esta verificação.</p><p>Você pode executar este assistente a qualquer momento escolhendo a opção <b>Verificar por Atualizações...</b> no menu de <b>Ajuda</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts index 20193578e..1c20abb32 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts @@ -1171,6 +1171,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2609,10 +2616,6 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci cà <translation><br><nobr><b>Nici un dosar partajat</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indică dacă Remote Display (Server VRDP) este activat (<img src=vrdp_16px.png/>) sau nu (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><hr>The VRDP Server is listening on port %1</source> <translation type="obsolete"><hr>Serverul VRDP ascultă pe portul %1</translation> </message> @@ -2628,11 +2631,11 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci cà </message> <message> <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation>Inidică dacă cursorul mouse sistemului gazdă este capturat de către SO musafir:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;cursorul nu este capturat</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;cursorul este capturat</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integrare mouse (IM) este Activată</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul este capturat</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul nu este capturat.</nobr><br>Notă: funcÈ›ia integrare mouse necesită instalarea pe SO musafir a Guest Additions.</translation> + <translation>Inidică dacă cursorul mouse sistemului gazdă este capturat de către SO musafir:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;cursorul nu este capturat</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;cursorul este capturat</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integrare mouse (IM) este Activată</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul este capturat</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul nu este capturat.</nobr><br>Notă: funcÈ›ia integrare mouse necesită instalarea pe SO musafir a Guest Additions.</translation> </message> <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation>Indică dacă tastatura este capturată de SO musafir (<img src=hostkey_captured_16px.png/>) sau nu (<img src=hostkey_16px.png/>).</translation> + <translation>Indică dacă tastatura este capturată de SO musafir (<img src=:/hostkey_captured_16px.png/>) sau nu (<img src=:/hostkey_16px.png/>).</translation> </message> <message> <source>Indicates whether the Remote Desktop Server is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> @@ -4744,18 +4747,6 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci cà <translation>Nu am putut È™terge directorul partajat <b>%1</b> (<nobr><b>%2</b></nobr>) din maÈ™ina virtuală <b>%3</b>.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>AÈ›i <b>dat clic</b> în interiorul ecranului maÈ™inii virtuale sau aÈ›i apăsat <b>tasta gazdă</b>. Acest lucru va cauza <b>capturarea</b> de către maÈ™ina virtuală a cursorului mouse (numai dacă integrarea mouse nu este suportată de către SO musafir) È™i a tastaturi, ceea ce o va face indisponibilă celorlate aplicaÈ›ii rulând pe maÈ™ina dvs gazdă.</p><p>PuteÈ›i oricând apăsa <b>tasta gazdă</b> pentru a <b>opri capturarea</b> mouse È™i tastaturii È™i a le întoarce la operare normală. Tasta gazdă asociată în prezent este afiÈ™ată în bara de stare, în partea de jos a ferestrei maÈ™inii virtuale, lângă iconul&nbsp;<img src=hostkey_16px.png/>. Acest icon, împreună cu iconul mouse alăturat, indică starea curentă a capturării mouse È™i tastaturii.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>OpÈ›iunea <b>Captură automată tastatură</b> este pornită. Acest lucru va face ca maÈ™ina virtuală să <b>captureze</b> automat tastatura de fiecare dată când fereastra MV este activată È™i să facă tastatura indisponibilă celorlate aplicaÈ›ii rulând pe maÈ™ina gazđă.</p><p>PuteÈ›i apăsa <b>tasta gazdă</b> în orice moment pentru a <b>opri captura</b> tastaturii È™i a mouse (dacă este capturat) È™i a le readuce la modul normal de funcÈ›ionare. Tasta gazdă asociată în prezent este afiÈ™ată în bara de stare, în partea de jos a ferestrei maÈ™inii virtuale, lângă iconul&nbsp;<img src=hostkey_16px.png/>. Acest icon, împreună cu iconul mouse alăturat, indică starea curentă a capturării mouse È™i tastaturii.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>MaÈ™ina virtuală a detectat că SO musafir suportă <b>integrare cursor mouse</b>. Aceasta însemnă că nu trebuie să <i>capturaÈ›i</i> cursorul mouse pentru a-l putea folosi în SO musafir -- toate acÈ›iunile cu mouse pe care le faceÈ›i când cursorul este deasupra ecranului MV sunt trimise direct către SO musafir. Dacă mouse este capturat, va fi automat eliberat.</p><p>Iconul mouse din bara de stare va arăta&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;pentru a vă informa că integrarea mouse este suportată È™i pornită.,/p><p><b>Notă</b>: Unele aplicaÈ›ii se pot comporta incorect în modul integrare cursor mouse. PuteÈ›i oricând să o dezactivaÈ›i în sesiunea curentă (È™i să o reactivaÈ›i) selectând acÈ›iunea corespunzătoare din bara meniu.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>MaÈ™ina virtuală raportează că SO musafir nu suportă <b>integrarea cursorului mouse</b> în modul video curent. Va trebui să capturaÈ›i mouse (dând click pe ecranul MV sau apăsând tasta gazdă) pentru a-l putea folosi în SO musafir.</P></translation> </message> @@ -5127,15 +5118,15 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci cà </message> <message> <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation><p>AÈ›i <b>dat clic</b> în interiorul ecranului maÈ™inii virtuale sau aÈ›i apăsat <b>tasta gazdă</b>. Acest lucru va cauza <b>capturarea</b> de către maÈ™ina virtuală a cursorului mouse (numai dacă integrarea mouse nu este suportată de către SO musafir) È™i a tastaturi, ceea ce o va face indisponibilă celorlate aplicaÈ›ii rulând pe maÈ™ina dvs gazdă.</p><p>PuteÈ›i oricând apăsa <b>tasta gazdă</b> pentru a <b>opri capturarea</b> mouse È™i tastaturii È™i a le întoarce la operare normală. Tasta gazdă asociată în prezent este afiÈ™ată în bara de stare, în partea de jos a ferestrei maÈ™inii virtuale, lângă iconul&nbsp;<img src=hostkey_16px.png/>. Acest icon, împreună cu iconul mouse alăturat, indică starea curentă a capturării mouse È™i tastaturii.</p></translation> + <translation><p>AÈ›i <b>dat clic</b> în interiorul ecranului maÈ™inii virtuale sau aÈ›i apăsat <b>tasta gazdă</b>. Acest lucru va cauza <b>capturarea</b> de către maÈ™ina virtuală a cursorului mouse (numai dacă integrarea mouse nu este suportată de către SO musafir) È™i a tastaturi, ceea ce o va face indisponibilă celorlate aplicaÈ›ii rulând pe maÈ™ina dvs gazdă.</p><p>PuteÈ›i oricând apăsa <b>tasta gazdă</b> pentru a <b>opri capturarea</b> mouse È™i tastaturii È™i a le întoarce la operare normală. Tasta gazdă asociată în prezent este afiÈ™ată în bara de stare, în partea de jos a ferestrei maÈ™inii virtuale, lângă iconul&nbsp;<img src=:/hostkey_16px.png/>. Acest icon, împreună cu iconul mouse alăturat, indică starea curentă a capturării mouse È™i tastaturii.</p></translation> </message> <message> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation><p>OpÈ›iunea <b>Captură automată tastatură</b> este activă. Acest lucru va face ca maÈ™ina virtuală să <b>captureze</b> automat tastatura de fiecare dată când fereastra MV este activată È™i să facă tastatura indisponibilă celorlate aplicaÈ›ii rulând pe maÈ™ina gazđă.</p><p>PuteÈ›i apăsa <b>tasta gazdă</b> în orice moment pentru a <b>opri captura</b> tastaturii È™i a mouse (dacă este capturat) È™i a le readuce la modul normal de funcÈ›ionare. Tasta gazdă asociată în prezent este afiÈ™ată în bara de stare, în partea de jos a ferestrei maÈ™inii virtuale, lângă iconul&nbsp;<img src=hostkey_16px.png/>. Acest icon, împreună cu iconul mouse alăturat, indică starea curentă a capturării mouse È™i tastaturii.</p></translation> + <translation><p>OpÈ›iunea <b>Captură automată tastatură</b> este activă. Acest lucru va face ca maÈ™ina virtuală să <b>captureze</b> automat tastatura de fiecare dată când fereastra MV este activată È™i să facă tastatura indisponibilă celorlate aplicaÈ›ii rulând pe maÈ™ina gazđă.</p><p>PuteÈ›i apăsa <b>tasta gazdă</b> în orice moment pentru a <b>opri captura</b> tastaturii È™i a mouse (dacă este capturat) È™i a le readuce la modul normal de funcÈ›ionare. Tasta gazdă asociată în prezent este afiÈ™ată în bara de stare, în partea de jos a ferestrei maÈ™inii virtuale, lângă iconul&nbsp;<img src=:/hostkey_16px.png/>. Acest icon, împreună cu iconul mouse alăturat, indică starea curentă a capturării mouse È™i tastaturii.</p></translation> </message> <message> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation><p>MaÈ™ina virtuală a detectat că SO musafir suportă <b>integrare cursor mouse</b>. Aceasta însemnă că nu trebuie să <i>capturaÈ›i</i> cursorul mouse pentru a-l putea folosi în SO musafir -- toate acÈ›iunile cu mouse pe care le faceÈ›i când cursorul este deasupra ecranului MV sunt trimise direct către SO musafir. Dacă mouse este capturat, va fi automat eliberat.</p><p>Iconul mouse din bara de stare va arăta&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;pentru a vă informa că integrarea mouse este suportată È™i pornită.,/p><p><b>Notă</b>: Unele aplicaÈ›ii se pot comporta incorect în modul integrare cursor mouse. PuteÈ›i oricând să o dezactivaÈ›i în sesiunea curentă (È™i să o reactivaÈ›i) selectând acÈ›iunea corespunzătoare din bara de meniu.</p></translation> + <translation><p>MaÈ™ina virtuală a detectat că SO musafir suportă <b>integrare cursor mouse</b>. Aceasta însemnă că nu trebuie să <i>capturaÈ›i</i> cursorul mouse pentru a-l putea folosi în SO musafir -- toate acÈ›iunile cu mouse pe care le faceÈ›i când cursorul este deasupra ecranului MV sunt trimise direct către SO musafir. Dacă mouse este capturat, va fi automat eliberat.</p><p>Iconul mouse din bara de stare va arăta&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;pentru a vă informa că integrarea mouse este suportată È™i pornită.,/p><p><b>Notă</b>: Unele aplicaÈ›ii se pot comporta incorect în modul integrare cursor mouse. PuteÈ›i oricând să o dezactivaÈ›i în sesiunea curentă (È™i să o reactivaÈ›i) selectând acÈ›iunea corespunzătoare din bara de meniu.</p></translation> </message> <message> <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source> @@ -5861,6 +5852,36 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci cà <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Descarcă</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5908,6 +5929,17 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci cà </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6291,6 +6323,18 @@ time depending on the image size and the write performance of your harddisk.< <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -7025,6 +7069,142 @@ din listă apăsând butonul <b>Existent</b> (pentru a invoca dialog </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 zi</translation> + </message> + <message> + <source>2 days</source> + <translation>2 zile</translation> + </message> + <message> + <source>3 days</source> + <translation>3 zile</translation> + </message> + <message> + <source>4 days</source> + <translation>4 zile</translation> + </message> + <message> + <source>5 days</source> + <translation>5 zile</translation> + </message> + <message> + <source>6 days</source> + <translation>6 zile</translation> + </message> + <message> + <source>1 week</source> + <translation>1 săptămână</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 săptămâni</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 săptămâni</translation> + </message> + <message> + <source>1 month</source> + <translation>1 lună</translation> + </message> + <message> + <source>Never</source> + <translation>Niciodată</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">Conexiunea a expirat.</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">Nu am putut localiza ultima versiune pe server (răspuns: %1).</translation> + </message> + <message> + <source>VirtualBox New Version Notifier</source> + <translation type="obsolete">Agent versiune nouă VirtualBox</translation> + </message> + <message> + <source>Check for a new version</source> + <translation type="obsolete">Caută o versiune mai nouă</translation> + </message> + <message> + <source><p>VirtualBox can check the latest version available for downloading. Will you let VirtualBox to do this now?</p><p>You can make VirtualBox look for the newer version now by pressing <b>Check</b> button or postpone it for then next time by pressing <b>Cancel</b>.</p><p>You can run VirtualBox New Version Notifier anytime from the application Help menu by activating <b>'Check for a new version...'</b> action.</p></source> + <translation type="obsolete"><p>VirtualBox poate verifica după ultima versiune disponibilă spre descărcare. DoriÈ›i ca VirtualBox să facă asta acum?</p></p>PuteÈ›i face asta apăsând butonul <b>Verifică</b> sau puteÈ›i amâna acÈ›iunea pentru data viitoare, apăsând <b>Revocare</b>.</p><p>PuteÈ›i rula Agentul versiune nouă VirtualBox oricând, din meniul Ajutor al aplicaÈ›iei prin acÈ›iunea <b>'Caută o versiune nouă...'</b>.</p></translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Verifică</translation> + </message> + <message> + <source>&Cancel</source> + <translation type="obsolete">&Revocare</translation> + </message> + <message> + <source>Check Results</source> + <translation type="obsolete">Rezultate căutare</translation> + </message> + <message> + <source><p>New VirtualBox %1 version available to download from:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Noul VirtualBox versiunea %1 este disponibil pentru descărcare la:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain new version information due to network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Nu am putut obÈ›ine informaÈ›ii despre ultima versiune, datorită unei erori din reÈ›ea:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.version, there is no newer version currently available.</source> + <translation type="obsolete">AveÈ›i instalată ultima versiune a VirtualBox, momentan nu există o versiune mai nouă.</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">ÃŽn&chide</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Asistent actualizare VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Verifică după actualizări</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Acest asistent se va conecta la site-ul VirtualBox È™i va verifica dacă o versiune mai nouă este disponibilă.</p> +<p>FolosiÈ›i butonul <b>Verifică</b> pentru a verifica aacum dacă există o nouă versiune, sau butonul <b>Renunță</b> dacă nu doriÈ›i să faceÈ›i această verificare.</p> +<p>PuteÈ›i rula acest asistent oricând alegănd din meniul <b>Ajutor</b> comanda <b>Verifică după actualizări...</b></p></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Renunță</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Rezumat</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>O versiune mai nouă a VirtualBox a fost lansată! Versiunea <b>%1</b> este disponibilă la <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>PuteÈ›i descărca această versiune direct de la:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Nu am putut obÈ›ine informaÈ›ii despre ultima versiune datorită unei erori din reÈ›ea:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">AveÈ›i instalată ultima versiune a VirtualBox. Vă rog repetaÈ›i verificarea actualizărilor mai târziu.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Acest asistent se va conecta la site-ul VirtualBox È™i va verifica dacă o versiune mai nouă este disponibilă.</p><p>FolosiÈ›i butonul <b>Verifică</b> pentru a verifica acum dacă există o nouă versiune, sau butonul <b>Renunță</b> dacă nu doriÈ›i să faceÈ›i această verificare.</p> +<p>PuteÈ›i rula acest asistent oricând alegănd din meniul <b>Ajutor</b> comanda <b>Verifică după actualizări...</b></p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7640,16 +7820,8 @@ Versiunea %1</translation> <translation type="obsolete">&Ajutor</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indică dacă funcÈ›ia de autoredimnsionare a ecranului musafir este Activă (<img src=auto_resize_on_16px.png/>) sau Inactivă (<Img src=auto_resize_off_16px.png/>). Notă: această funcÈ›ie necesită Guest Addition instalat pe SO musafir.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Inidică dacă cursorul mouse sistemului gazdă este capturat de către SO musafir:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;cursorul nu este capturat</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;cursorul este capturat</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integrare mouse (IM) este Activată</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul este capturat</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul nu este capturat.</nobr><br>Notă: funcÈ›ia integrare mouse necesită instalarea pe SO musafir a Guest Additions.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">Indică dacă tastatura este capturată de către SO musafir (<img src=hostkey_captured_16px.png/>) sau nu (<img src=hostkey_16px.png/>)</translation> + <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Inidică dacă cursorul mouse sistemului gazdă este capturat de către SO musafir:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;cursorul nu este capturat</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;cursorul este capturat</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integrare mouse (IM) este Activată</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul este capturat</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul nu este capturat.</nobr><br>Notă: funcÈ›ia integrare mouse necesită instalarea pe SO musafir a Guest Additions.</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -7701,8 +7873,8 @@ Versiunea %1</translation> <translation type="obsolete"><qt>Indică&nbsp;activitatea&nbsp;interfeÈ›elor&nbsp;de&nbsp;reÈ›ea<br>[<b>%1 dispozitiv(e)</b>]</qt></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">Indică dacă Remote Display (Server VRDP) este activat (<img src=vrdp_16px.png/>) sau nu (<img src=vrdp_disabled_16px.png/>)</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>)</source> + <translation type="obsolete">Indică dacă Remote Display (Server VRDP) este activat (<img src=:/vrdp_16px.png/>) sau nu (<img src=:/vrdp_disabled_16px.png/>)</translation> </message> <message> <source><hr>The VRDP Server is listening on port %1</source> @@ -7829,10 +8001,6 @@ Versiunea %1</translation> <translation type="obsolete">Schimbă în modul continuu de integrare cu spaÈ›iul de lucru</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indică dacă tastatura este capturată de SO musafir (<img src=hostkey_captured_16px.png/>) sau nu (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Indică activitatea dischetei:</nobr>%1</qt></translation> @@ -7923,8 +8091,8 @@ Versiunea %1</translation> <translation type="obsolete"><br><nobr><b>Controlorul USB este dezactivat</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indică dacă Remote Display (Server VRDP) este activat (<img src=vrdp_16px.png/>) sau nu (<img src=vrdp_disabled_16px.png/>).</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> + <translation type="obsolete">Indică dacă Remote Display (Server VRDP) este activat (<img src=:/vrdp_16px.png/>) sau nu (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> @@ -7984,19 +8152,11 @@ Versiunea %1</translation> </message> <message> <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indică dacă funcÈ›ia de autoredimnsionare a ecranului musafir este Activă (<img src=auto_resize_on_16px.png/>) sau Inactivă (<Img src=auto_resize_off_16px.png/>). Notă: această funcÈ›ie necesită Guest Addition instalat pe SO musafir.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Inidică dacă cursorul mouse sistemului gazdă este capturat de către SO musafir:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;cursorul nu este capturat</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;cursorul este capturat</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integrare mouse (IM) este Activată</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul este capturat</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;IM este Inactivă, cursorul nu este capturat.</nobr><br>Notă: funcÈ›ia integrare mouse necesită instalarea pe SO musafir a Guest Additions.</translation> + <translation type="obsolete">Indică dacă funcÈ›ia de autoredimnsionare a ecranului musafir este Activă (<img src=:/auto_resize_on_16px.png/>) sau Inactivă (<img src=:/auto_resize_off_16px.png/>). Notă: această funcÈ›ie necesită Guest Addition instalat pe SO musafir.</translation> </message> <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">Indică dacă tastatura este capturată de SO musafir (<img src=hostkey_captured_16px.png/>) sau nu (<img src=hostkey_16px.png/>).</translation> - </message> - <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indică dacă Remote Display (Server VRDP) este activat (<img src=vrdp_16px.png/>) sau nu (<img src=vrdp_disabled_16px.png/>).</translation> + <translation type="obsolete">Indică dacă tastatura este capturată de SO musafir (<img src=:/hostkey_captured_16px.png/>) sau nu (<img src=:/hostkey_16px.png/>).</translation> </message> <message> <source>&Logging...</source> @@ -11362,10 +11522,6 @@ FolosiÈ›i meniul contextual sau butaonele din dreapta pentru a adâuga sau È™ter <translation>PorneÈ™te maÈ™ina virtuală selectată</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>Bun venit în VirtualBox!</h3><p>Partea din stânga a ferestrei arată lista tuturor maÈ™inilor virtuale din computerul dvs. Lista este goală acum deoarece nu a fost creată nici o maÈ™ină virtuală până acum.<img src=welcome.png align=right/></p><p>Pentru a crea o maÈ™ină virtuală nouă apăsaÈ›i butonul <b>Nouă</b> în bara de unelte principală localizată în partea de sus a ferestrei.</p><p>PuteÈ›i apăsa tasta <b>%1</b> pentru a obÈ›ine ajutor instantaneu, sau puteÈ›i vizita <a href=http://www.virtualbox.org>www.virtualbox.org</a> pentru ultimele È™tiri È™i informaÈ›ii.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&MaÈ™ină</translation> </message> @@ -11431,7 +11587,7 @@ FolosiÈ›i meniul contextual sau butaonele din dreapta pentru a adâuga sau È™ter </message> <message> <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation><h3>Bun venit în VirtualBox!</h3><p>Partea din stânga a ferestrei arată lista tuturor maÈ™inilor virtuale din computerul dvs. Lista este goală acum deoarece nu a fost creată nici o maÈ™ină virtuală până acum.<img src=welcome.png align=right/></p><p>Pentru a crea o maÈ™ină virtuală nouă apăsaÈ›i butonul <b>Nouă</b> în bara de unelte principală localizată în partea de sus a ferestrei.</p><p>PuteÈ›i apăsa tasta <b>%1</b> pentru a obÈ›ine ajutor instantaneu, sau puteÈ›i vizita <a href=http://www.virtualbox.org>www.virtualbox.org</a> pentru ultimele È™tiri È™i informaÈ›ii.</p></translation> + <translation><h3>Bun venit în VirtualBox!</h3><p>Partea din stânga a ferestrei arată lista tuturor maÈ™inilor virtuale din computerul dvs. Lista este goală acum deoarece nu a fost creată nici o maÈ™ină virtuală până acum.<img src=:/welcome.png align=right/></p><p>Pentru a crea o maÈ™ină virtuală nouă apăsaÈ›i butonul <b>Nouă</b> în bara de unelte principală localizată în partea de sus a ferestrei.</p><p>PuteÈ›i apăsa tasta <b>%1</b> pentru a obÈ›ine ajutor instantaneu, sau puteÈ›i vizita <a href=http://www.virtualbox.org>www.virtualbox.org</a> pentru ultimele È™tiri È™i informaÈ›ii.</p></translation> </message> <message> <source>&Virtual Media Manager...</source> @@ -12314,142 +12470,6 @@ value.</qt></source> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 zi</translation> - </message> - <message> - <source>2 days</source> - <translation>2 zile</translation> - </message> - <message> - <source>3 days</source> - <translation>3 zile</translation> - </message> - <message> - <source>4 days</source> - <translation>4 zile</translation> - </message> - <message> - <source>5 days</source> - <translation>5 zile</translation> - </message> - <message> - <source>6 days</source> - <translation>6 zile</translation> - </message> - <message> - <source>1 week</source> - <translation>1 săptămână</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 săptămâni</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 săptămâni</translation> - </message> - <message> - <source>1 month</source> - <translation>1 lună</translation> - </message> - <message> - <source>Never</source> - <translation>Niciodată</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">Conexiunea a expirat.</translation> - </message> - <message> - <source>Could not locate the latest version list on the server (response: %1).</source> - <translation type="obsolete">Nu am putut localiza ultima versiune pe server (răspuns: %1).</translation> - </message> - <message> - <source>VirtualBox New Version Notifier</source> - <translation type="obsolete">Agent versiune nouă VirtualBox</translation> - </message> - <message> - <source>Check for a new version</source> - <translation type="obsolete">Caută o versiune mai nouă</translation> - </message> - <message> - <source><p>VirtualBox can check the latest version available for downloading. Will you let VirtualBox to do this now?</p><p>You can make VirtualBox look for the newer version now by pressing <b>Check</b> button or postpone it for then next time by pressing <b>Cancel</b>.</p><p>You can run VirtualBox New Version Notifier anytime from the application Help menu by activating <b>'Check for a new version...'</b> action.</p></source> - <translation type="obsolete"><p>VirtualBox poate verifica după ultima versiune disponibilă spre descărcare. DoriÈ›i ca VirtualBox să facă asta acum?</p></p>PuteÈ›i face asta apăsând butonul <b>Verifică</b> sau puteÈ›i amâna acÈ›iunea pentru data viitoare, apăsând <b>Revocare</b>.</p><p>PuteÈ›i rula Agentul versiune nouă VirtualBox oricând, din meniul Ajutor al aplicaÈ›iei prin acÈ›iunea <b>'Caută o versiune nouă...'</b>.</p></translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Verifică</translation> - </message> - <message> - <source>&Cancel</source> - <translation type="obsolete">&Revocare</translation> - </message> - <message> - <source>Check Results</source> - <translation type="obsolete">Rezultate căutare</translation> - </message> - <message> - <source><p>New VirtualBox %1 version available to download from:</p><p><a href=%2>%3</a></p></source> - <translation type="obsolete"><p>Noul VirtualBox versiunea %1 este disponibil pentru descărcare la:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain new version information due to network error:</p><p><b>%1</b></p></source> - <translation type="obsolete"><p>Nu am putut obÈ›ine informaÈ›ii despre ultima versiune, datorită unei erori din reÈ›ea:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.version, there is no newer version currently available.</source> - <translation type="obsolete">AveÈ›i instalată ultima versiune a VirtualBox, momentan nu există o versiune mai nouă.</translation> - </message> - <message> - <source>&Close</source> - <translation>ÃŽn&chide</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Asistent actualizare VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Verifică după actualizări</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>Acest asistent se va conecta la site-ul VirtualBox È™i va verifica dacă o versiune mai nouă este disponibilă.</p> -<p>FolosiÈ›i butonul <b>Verifică</b> pentru a verifica aacum dacă există o nouă versiune, sau butonul <b>Renunță</b> dacă nu doriÈ›i să faceÈ›i această verificare.</p> -<p>PuteÈ›i rula acest asistent oricând alegănd din meniul <b>Ajutor</b> comanda <b>Verifică după actualizări...</b></p></translation> - </message> - <message> - <source>Cancel</source> - <translation>Renunță</translation> - </message> - <message> - <source>Summary</source> - <translation>Rezumat</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>O versiune mai nouă a VirtualBox a fost lansată! Versiunea <b>%1</b> este disponibilă la <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>PuteÈ›i descărca această versiune direct de la:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Nu am putut obÈ›ine informaÈ›ii despre ultima versiune datorită unei erori din reÈ›ea:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>AveÈ›i instalată ultima versiune a VirtualBox. Vă rog repetaÈ›i verificarea actualizărilor mai târziu.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Acest asistent se va conecta la site-ul VirtualBox È™i va verifica dacă o versiune mai nouă este disponibilă.</p><p>FolosiÈ›i butonul <b>Verifică</b> pentru a verifica acum dacă există o nouă versiune, sau butonul <b>Renunță</b> dacă nu doriÈ›i să faceÈ›i această verificare.</p> -<p>PuteÈ›i rula acest asistent oricând alegănd din meniul <b>Ajutor</b> comanda <b>Verifică după actualizări...</b></p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts index eb8951b12..fa07f10a1 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts @@ -1162,6 +1162,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -5120,7 +5127,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>You are already running the most recent version of VirtualBox.</source> - <translation>Ð’Ñ‹ уже уÑтановили поÑледнюю верÑию программы VirtualBox. Повторите проверку обновлений позже.</translation> + <translation>У Ð’Ð°Ñ ÑƒÐ¶Ðµ уÑтановлена поÑледнÑÑ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ VirtualBox. Повторите проверку обновлений позже.</translation> </message> <message> <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> @@ -5942,6 +5949,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation><p>Ðе удалоÑÑŒ Ñохранить Ñкачанный файл как <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Скачать</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">УÑтановка</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5989,6 +6026,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6252,6 +6300,18 @@ p, li { white-space: pre-wrap; } <comment>summary</comment> <translation>Дополнительно</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6946,6 +7006,93 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 день</translation> + </message> + <message> + <source>2 days</source> + <translation>2 днÑ</translation> + </message> + <message> + <source>3 days</source> + <translation>3 днÑ</translation> + </message> + <message> + <source>4 days</source> + <translation>4 днÑ</translation> + </message> + <message> + <source>5 days</source> + <translation>5 дней</translation> + </message> + <message> + <source>6 days</source> + <translation>6 дней</translation> + </message> + <message> + <source>1 week</source> + <translation>1 неделю</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 недели</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 недели</translation> + </message> + <message> + <source>1 month</source> + <translation>1 меÑÑц</translation> + </message> + <message> + <source>Never</source> + <translation>Ðикогда</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Проверить</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Закрыть</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">МаÑтер Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Проверить обновлениÑ</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Отмена</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Итог</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Выпущена Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ VirtualBox! ВерÑÐ¸Ñ <b>%1</b> доÑтупна на Ñайте <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Ð’Ñ‹ можете Ñкачать Ñту верÑию, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñледующую прÑмую ÑÑылку: </p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Ðевозможно получить информацию о верÑии из-за Ñледующей Ñетевой ошибки: </p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Ð’Ñ‹ уже уÑтановили поÑледнюю верÑию программы VirtualBox. Повторите проверку обновлений позже.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Ðтот маÑтер попробует ÑоединитьÑÑ Ñ Ð²ÐµÐ±-Ñайтом VirtualBox и проверить, не выпущена ли Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ VirtualBox.</p><p>ИÑпользуйте кнопку <b>Проверить</b> Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ прÑмо ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸Ð»Ð¸ кнопку <b>Отмена</b>, еÑли Ð’Ñ‹ не хотите выполнÑÑ‚ÑŒ проверку.</p><p>Ð’Ñ‹ можете вызвать маÑтера обновлений в любое Ð²Ñ€ÐµÐ¼Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ пункта <b>Проверить обновлениÑ...</b> в меню <b>Справка</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -10377,93 +10524,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 день</translation> - </message> - <message> - <source>2 days</source> - <translation>2 днÑ</translation> - </message> - <message> - <source>3 days</source> - <translation>3 днÑ</translation> - </message> - <message> - <source>4 days</source> - <translation>4 днÑ</translation> - </message> - <message> - <source>5 days</source> - <translation>5 дней</translation> - </message> - <message> - <source>6 days</source> - <translation>6 дней</translation> - </message> - <message> - <source>1 week</source> - <translation>1 неделю</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 недели</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 недели</translation> - </message> - <message> - <source>1 month</source> - <translation>1 меÑÑц</translation> - </message> - <message> - <source>Never</source> - <translation>Ðикогда</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Проверить</translation> - </message> - <message> - <source>&Close</source> - <translation>&Закрыть</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>МаÑтер Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Проверить обновлениÑ</translation> - </message> - <message> - <source>Cancel</source> - <translation>Отмена</translation> - </message> - <message> - <source>Summary</source> - <translation>Итог</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Выпущена Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ VirtualBox! ВерÑÐ¸Ñ <b>%1</b> доÑтупна на Ñайте <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Ð’Ñ‹ можете Ñкачать Ñту верÑию, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñледующую прÑмую ÑÑылку: </p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Ðевозможно получить информацию о верÑии из-за Ñледующей Ñетевой ошибки: </p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Ð’Ñ‹ уже уÑтановили поÑледнюю верÑию программы VirtualBox. Повторите проверку обновлений позже.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Ðтот маÑтер попробует ÑоединитьÑÑ Ñ Ð²ÐµÐ±-Ñайтом VirtualBox и проверить, не выпущена ли Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ VirtualBox.</p><p>ИÑпользуйте кнопку <b>Проверить</b> Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ прÑмо ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸Ð»Ð¸ кнопку <b>Отмена</b>, еÑли Ð’Ñ‹ не хотите выполнÑÑ‚ÑŒ проверку.</p><p>Ð’Ñ‹ можете вызвать маÑтера обновлений в любое Ð²Ñ€ÐµÐ¼Ñ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ пункта <b>Проверить обновлениÑ...</b> в меню <b>Справка</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts index e4c196a0c..c4bdb13bd 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts @@ -109,7 +109,7 @@ </message> <message> <source>The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the kernel module by executing<br/><br/> <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>as root. 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>OvládaÄ Linuxového jadra pre VirtualBox (vboxdrv) buÄ nie je naÄÃtaný alebo je problém s právami na /dev/vboxdrv. ProsÃm, preinÅ¡talujte modul jadra spustenÃm<br/><br/> <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>ako užÃvateľ root. UžÃvatelia Ubuntu, Fedory alebo Mandrivy by mali najprv nainÅ¡talovaÅ¥ balÃÄek DKMS. Tento balÃÄek sleduje zmeny Linuxového jadra a prekompiluje modul jadra vboxdrv, ak je to potrebné.</translation> </message> <message> <source>Make sure the kernel module has been loaded successfully.</source> @@ -137,7 +137,7 @@ </message> <message> <source>The VirtualBox kernel modules do not match this version of VirtualBox. The installation of VirtualBox was apparently not successful. Executing<br/><br/> <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>may correct this. Make sure that you do not mix the OSE version and the PUEL version of VirtualBox.</source> - <translation type="unfinished"></translation> + <translation>Moduly jadra VirtualBoxu nekoreÅ¡pondujú s touto verziou VirtualBoxu. InÅ¡talácia VirtualBoxu pravdepodobne nebola úspeÅ¡ná. Spustenie<br/><br/> <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>by to malo napraviÅ¥. Uistite sa, že nemieÅ¡ate OSE verziu a PUEL verziu VirtualBoxu.</translation> </message> <message> <source>This error means that the kernel driver was either not able to allocate enough memory or that some mapping operation failed.</source> @@ -230,11 +230,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>SkopÃrovaÅ¥ vÅ¡etky chyby do schránky</translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation>SkopÃrovaÅ¥</translation> </message> </context> <context> @@ -296,7 +296,7 @@ </message> <message> <source>Auto-resize &Guest Display</source> - <translation type="unfinished">Automatická zmena veľkosti &hosÅ¥ovskej obrazovky</translation> + <translation>Automatická zmena veľkosti &obrazovky hosÅ¥a</translation> </message> <message> <source>Automatically resize the guest display when the window is resized (requires Guest Additions)</source> @@ -487,52 +487,52 @@ </message> <message> <source>Enable remote desktop (RDP) connections to this machine</source> - <translation type="unfinished"></translation> + <translation>PovoliÅ¥ vzdialené pripojenie k desktopu (RDP) tohto stroja</translation> </message> <message> <source>Enable &Logging...</source> <comment>debug action</comment> - <translation type="unfinished"></translation> + <translation>PovoliÅ¥ &logovanie...</translation> </message> <message> <source>Switch to &Fullscreen</source> - <translation type="unfinished"></translation> + <translation>P&repnúť na celú obrazovku</translation> </message> <message> <source>Switch between normal and fullscreen mode</source> - <translation type="unfinished"></translation> + <translation>Prepnúť medzi normálnym zobrazenÃm a celou obrazovkou</translation> </message> <message> <source>Switch to Seam&less Mode</source> - <translation type="unfinished"></translation> + <translation>Prepnúť do &bezoÅ¡vého režimu</translation> </message> <message> <source>Switch between normal and seamless desktop integration mode</source> - <translation type="unfinished"></translation> + <translation>PrepÃnaÅ¥ medzi normálnym zobrazenÃm a režimom bezoÅ¡vej integrácie desktopu</translation> </message> <message> <source>Switch to &Scale Mode</source> - <translation type="unfinished"></translation> + <translation>Prepnúť do rež&imu Å¡kálovania</translation> </message> <message> <source>Switch between normal and scale mode</source> - <translation type="unfinished"></translation> + <translation>Prepnúť medzi normálnym režimom a režimom Å¡kálovania</translation> </message> <message> <source>Enable R&emote Display</source> - <translation type="unfinished"></translation> + <translation>Po&voliÅ¥ vzdialené zobrazenie</translation> </message> <message> <source>&Settings...</source> - <translation type="unfinished">&Nastavenia...</translation> + <translation>&Nastavenia...</translation> </message> <message> <source>Manage the virtual machine settings</source> - <translation type="unfinished"></translation> + <translation>RiadiÅ¥ nastavenia virtuálneho stroja</translation> </message> <message> <source>Session I&nformation...</source> - <translation type="unfinished"></translation> + <translation>I&nformácie o sedenÃ...</translation> </message> </context> <context> @@ -653,37 +653,37 @@ </message> <message> <source>Hard Disk Controller (SAS)</source> - <translation type="unfinished"></translation> + <translation>OvládaÄ pevného disku (SAS)</translation> </message> <message> <source>When checked a new unique MAC address will assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>KeÄ je zaÅ¡krtnuté, vÅ¡etkým nakonfigurovaným sieÅ¥ovým kartám bude priradená unikátna MAC adresa.</translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&ReinicializovaÅ¥ MAC adresu vÅ¡etkých sieÅ¥ových kariet</translation> </message> </context> <context> <name>UIApplianceImportEditorWidget</name> <message> <source>Importing Appliance ...</source> - <translation type="unfinished"></translation> + <translation>Importujem appliance...</translation> </message> <message> <source>Reading Appliance ...</source> - <translation type="unfinished"></translation> + <translation>ÄŒÃtam appliance...</translation> </message> </context> <context> <name>UICloneVMWizard</name> <message> <source>Clone a virtual machine</source> - <translation type="unfinished"></translation> + <translation>KlonovaÅ¥ virtuálny stroj</translation> </message> <message> <source>Clone</source> - <translation type="unfinished"></translation> + <translation>KlonovaÅ¥</translation> </message> <message> <source>Linked Base for %1 and %2</source> @@ -694,46 +694,46 @@ <name>UICloneVMWizardPage1</name> <message> <source><p>This wizard will help you to create a clone of your virtual machine.</p></source> - <translation type="unfinished"></translation> + <translation><p>Tento sprievodca vám pomôže pri klonovanà virtuálenho stroja.</p></translation> </message> <message> <source><p>Please choose a name for the new virtual machine:</p></source> - <translation type="unfinished"></translation> + <translation><p>Zadajte prosÃm meno nového virtuálneho stroja:</p></translation> </message> <message> <source>&Reinitialize the MAC address of all network cards</source> - <translation type="unfinished"></translation> + <translation>&ReinicializovaÅ¥ MAC adresu vÅ¡etkých sieÅ¥ových kariet</translation> </message> <message> <source>Welcome to the virtual machine clone wizard</source> - <translation type="unfinished"></translation> + <translation>Vitajte v sprievodcovi klonovania virtuálneho stroja</translation> </message> <message> <source>%1 Clone</source> - <translation type="unfinished"></translation> + <translation>%1 klonovaÅ¥</translation> </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>KeÄ je zaÅ¡krtnuté, vÅ¡etkým nakonfigurovaným sieÅ¥ovým kartám bude priradená unikátna MAC adresa.</translation> </message> </context> <context> <name>UICloneVMWizardPage2</name> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Konfigurácia klonovania</translation> </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Plný klon</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Prepojený klon</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>Vyberte, prosÃm, typ klonu.</p><p>Ak vyberiete <p>Plný klon</b> bude vytvorená presná kópia pôvodného virtuálneho stroja (vrátane vÅ¡etkých obrazov virtuálnych diskov). Ak vyberiete <b>Prepojený klon</b>, bude vytvorený nový virtuálny stroj, ale obrazy virtuálnych diskov budú odkazovaÅ¥ na pôvodný virtuálny stroj.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> @@ -744,50 +744,50 @@ <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished"></translation> + <translation>Aktuálny stav stroja</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished"></translation> + <translation>Aktuálny stav stroja a vÅ¡etkých jeho potomkov</translation> </message> <message> <source>All states</source> - <translation type="unfinished"></translation> + <translation>VÅ¡etky stavy</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished"></translation> + <translation>Konfigurácia klonovania</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished"></translation> + <translation>ProsÃm, vyberte ktoré Äasti virtuálneho stroja majú byÅ¥ naklonované.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished"></translation> + <translation>Ak vyberiete <b>Aktuálny stav stroja</b>, bude naklonovaný len aktuálny stav virtuálneho stroja.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Ak vyberiete <b>Aktuálny stav stroja a vÅ¡etkých jeho potomkov</b>, bude naklonovaný aktuálny stav virtuálneho stroja a akékoľvek stavy snÃmkov jeho potomkov.</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished"></translation> + <translation>Ak vyberiete <b>VÅ¡etky stavy</b>, bude naklonovaný aktuálny stav virtuálneho stroja a vÅ¡etky jeho snÃmky.</translation> </message> </context> <context> <name>UIDescriptionPagePrivate</name> <message> <source>No description. Press the Edit button below to add it.</source> - <translation type="unfinished">Bez popisu. StlaÄte tlaÄidlo UpraviÅ¥ a pridajte ho.</translation> + <translation>Bez popisu. StlaÄte tlaÄidlo UpraviÅ¥ a pridajte ho.</translation> </message> <message> <source>Edit</source> - <translation type="unfinished">UpraviÅ¥</translation> + <translation>UpraviÅ¥</translation> </message> <message> <source>Edit (Ctrl+E)</source> - <translation type="unfinished">UpraviÅ¥ (Ctrl+E)</translation> + <translation>UpraviÅ¥ (Ctrl+E)</translation> </message> </context> <context> @@ -795,270 +795,270 @@ <message> <source>Name</source> <comment>details report</comment> - <translation type="unfinished">Názov</translation> + <translation>Názov</translation> </message> <message> <source>OS Type</source> <comment>details report</comment> - <translation type="unfinished">Typ OS</translation> + <translation>Typ OS</translation> </message> <message> <source>Base Memory</source> <comment>details report</comment> - <translation type="unfinished">Základná pamäť</translation> + <translation>Základná pamäť</translation> </message> <message> <source><nobr>%1 MB</nobr></source> <comment>details report</comment> - <translation type="unfinished"><nobr>%1 MB</nobr></translation> + <translation><nobr>%1 MB</nobr></translation> </message> <message> <source>Processors</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Procesory</translation> </message> <message> <source><nobr>%1</nobr></source> <comment>details report</comment> - <translation type="unfinished"><nobr>%1</nobr></translation> + <translation><nobr>%1</nobr></translation> </message> <message> <source>Boot Order</source> <comment>details report</comment> - <translation type="unfinished">Poradie bootovania</translation> + <translation>Poradie bootovania</translation> </message> <message> <source>ACPI</source> <comment>details report</comment> - <translation type="unfinished">ACPI</translation> + <translation>ACPI</translation> </message> <message> <source>IO APIC</source> <comment>details report</comment> - <translation type="unfinished">IO APIC</translation> + <translation>IO APIC</translation> </message> <message> <source>BIOS</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>VT-x/AMD-V</source> <comment>details report</comment> - <translation type="unfinished">VT-x/AMD-V</translation> + <translation>VT-x/AMD-V</translation> </message> <message> <source>Nested Paging</source> <comment>details report</comment> - <translation type="unfinished">Priamy prÃstup k hardware</translation> + <translation>Priamy prÃstup k hardware</translation> </message> <message> <source>PAE/NX</source> <comment>details report</comment> - <translation type="unfinished">PAE/NX</translation> + <translation>PAE/NX</translation> </message> <message> <source>Acceleration</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Akcelerácia</translation> </message> <message> <source>Video Memory</source> <comment>details report</comment> - <translation type="unfinished">Videopamäť</translation> + <translation>Videopamäť</translation> </message> <message> <source>Screens</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Obrazovky</translation> </message> <message> <source>2D Video</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>2D video</translation> </message> <message> <source>3D</source> <comment>details report</comment> - <translation type="unfinished">3D</translation> + <translation>3D</translation> </message> <message> <source>Remote Desktop Server Port</source> <comment>details report (VRDE Server)</comment> - <translation type="unfinished"></translation> + <translation>Port pre RDS (Remote Display Server)</translation> </message> <message> <source>Remote Desktop Server</source> <comment>details report (VRDE Server)</comment> - <translation type="unfinished"></translation> + <translation>Server Vzdialenej plochy (RDP)</translation> </message> <message> <source>Disabled</source> <comment>details report (VRDE Server)</comment> - <translation type="unfinished"></translation> + <translation>Vypnuté</translation> </message> <message> <source>(CD/DVD)</source> - <translation type="unfinished">(CD/DVD)</translation> + <translation>(CD/DVD)</translation> </message> <message> <source>Not Attached</source> <comment>details report (Storage)</comment> - <translation type="unfinished"></translation> + <translation>Nepripojený</translation> </message> <message> <source>Host Driver</source> <comment>details report (audio)</comment> - <translation type="unfinished">Zariadenie hostiteľa</translation> + <translation>OvládaÄ hostiteľa</translation> </message> <message> <source>Controller</source> <comment>details report (audio)</comment> - <translation type="unfinished">RadiÄ</translation> + <translation>RadiÄ</translation> </message> <message> <source>Disabled</source> <comment>details report (audio)</comment> - <translation type="unfinished"></translation> + <translation>Vypnutý</translation> </message> <message> <source>Bridged adapter, %1</source> <comment>details report (network)</comment> - <translation type="unfinished">Karta použÃtá v sieÅ¥ovom moste, %1</translation> + <translation>Karta použitá v sieÅ¥ovom moste, %1</translation> </message> <message> <source>Internal network, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished">Interná sieÅ¥, '%1'</translation> + <translation>Interná sieÅ¥, '%1'</translation> </message> <message> <source>Host-only adapter, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished">Karta pre sieÅ¥ iba medzi hostiteľom a hosÅ¥om, '%1'</translation> + <translation>Karta pre sieÅ¥ iba medzi hostiteľom a hosÅ¥om, '%1'</translation> </message> <message> <source>Adapter %1</source> <comment>details report (network)</comment> - <translation type="unfinished">Adaptér %1</translation> + <translation>Adaptér %1</translation> </message> <message> <source>Disabled</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Vypnutá</translation> </message> <message> <source>Port %1</source> <comment>details report (serial ports)</comment> - <translation type="unfinished">Port %1</translation> + <translation>Port %1</translation> </message> <message> <source>Disabled</source> <comment>details report (serial ports)</comment> - <translation type="unfinished"></translation> + <translation>Vypnuté</translation> </message> <message> <source>Port %1</source> <comment>details report (parallel ports)</comment> - <translation type="unfinished">Port %1</translation> + <translation>Port %1</translation> </message> <message> <source>Disabled</source> <comment>details report (parallel ports)</comment> - <translation type="unfinished"></translation> + <translation>Vypnuté</translation> </message> <message> <source>Device Filters</source> <comment>details report (USB)</comment> - <translation type="unfinished">Filtre zariadenÃ</translation> + <translation>Filtre zariadenÃ</translation> </message> <message> <source>%1 (%2 active)</source> <comment>details report (USB)</comment> - <translation type="unfinished">%1 (%2 aktÃvnych)</translation> + <translation>%1 (%2 aktÃvnych)</translation> </message> <message> <source>Disabled</source> <comment>details report (USB)</comment> - <translation type="unfinished"></translation> + <translation>Vypnuté</translation> </message> <message> <source>Shared Folders</source> <comment>details report (shared folders)</comment> - <translation type="unfinished">Zdieľané prieÄinky</translation> + <translation>Zdieľané prieÄinky</translation> </message> <message> <source>None</source> <comment>details report (shared folders)</comment> - <translation type="unfinished">Žiadne</translation> + <translation>Žiadne</translation> </message> <message> <source>None</source> <comment>details report (description)</comment> - <translation type="unfinished">Žiadne</translation> + <translation>Žiadne</translation> </message> <message> <source>The selected virtual machine is <i>inaccessible</i>. Please inspect the error message shown below and press the <b>Refresh</b> button if you want to repeat the accessibility check:</source> - <translation type="unfinished">Vybraný virtuálny stroj nie je <i>dostupný</i>. ProsÃm, preÄÃtajte si chybovú hlášku nižšie a stlaÄte tlaÄidlo <b>ObnoviÅ¥</b>, ak chcete znovu spustiÅ¥ kontrolu dostupnosti:</translation> + <translation>Vybraný virtuálny stroj je <i>nedostupný</i>. ProsÃm, preÄÃtajte si chybovú hlášku zobrazenú nižšie a stlaÄte tlaÄidlo <b>ObnoviÅ¥</b>, ak chcete znovu spustiÅ¥ kontrolu dostupnosti:</translation> </message> <message> <source>General</source> <comment>details report</comment> - <translation type="unfinished">VÅ¡eobecné</translation> + <translation>VÅ¡eobecné</translation> </message> <message> <source>System</source> <comment>details report</comment> - <translation type="unfinished">Systém</translation> + <translation>Systém</translation> </message> <message> <source>Preview</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Náhľad</translation> </message> <message> <source>Display</source> <comment>details report</comment> - <translation type="unfinished">Displej</translation> + <translation>Displej</translation> </message> <message> <source>Storage</source> <comment>details report</comment> - <translation type="unfinished">Úložisko</translation> + <translation>Úložisko</translation> </message> <message> <source>Audio</source> <comment>details report</comment> - <translation type="unfinished">Audio</translation> + <translation>Audio</translation> </message> <message> <source>Network</source> <comment>details report</comment> - <translation type="unfinished">SieÅ¥</translation> + <translation>SieÅ¥</translation> </message> <message> <source>Serial Ports</source> <comment>details report</comment> - <translation type="unfinished">Sériové porty</translation> + <translation>Sériové porty</translation> </message> <message> <source>Parallel Ports</source> <comment>details report</comment> - <translation type="unfinished">Paralelné porty</translation> + <translation>Paralelné porty</translation> </message> <message> <source>USB</source> <comment>details report</comment> - <translation type="unfinished">USB</translation> + <translation>USB</translation> </message> <message> <source>Shared Folders</source> <comment>details report</comment> - <translation type="unfinished">Zdieľané prieÄinky</translation> + <translation>Zdieľané prieÄinky</translation> </message> <message> <source>Description</source> <comment>details report</comment> - <translation type="unfinished">Popis</translation> + <translation>Popis</translation> </message> <message> <source>Execution Cap</source> @@ -1068,7 +1068,7 @@ <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation><nobr>%1%</nobr></translation> </message> <message> <source>Generic driver, '%1'</source> @@ -1156,6 +1156,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -1242,7 +1249,7 @@ </message> <message> <source>Export</source> - <translation type="unfinished"></translation> + <translation>ExportovaÅ¥</translation> </message> </context> <context> @@ -1268,19 +1275,19 @@ </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">Zadajte, prosÃm, cieľ pre export OVF. Môžete si vybraÅ¥ medzi lokálnym súborovým systémom, nahranÃm OVF na Sun Cloud alebo použitÃm služby S3 pre ukladanie.</translation> + <translation>Zadajte, prosÃm, cieľ pre export OVF. Môžete si vybraÅ¥ medzi lokálnym súborovým systémom, nahranÃm OVF do služby Sun Cloud alebo použitÃm služby S3 pre ukladanie.</translation> </message> <message> <source>&Local Filesystem </source> - <translation type="unfinished">&Miestny súborový systém </translation> + <translation>&Miestny súborový systém </translation> </message> <message> <source>Sun &Cloud</source> - <translation type="unfinished">Sun &Cloud</translation> + <translation>Sun &Cloud</translation> </message> <message> <source>&Simple Storage System (S3)</source> - <translation type="unfinished">&Jednoduchý systém na ukladanie (S3)</translation> + <translation>&Jednoduchý systém na ukladanie (S3)</translation> </message> </context> <context> @@ -1307,55 +1314,55 @@ </message> <message> <source>&Username:</source> - <translation type="unfinished"></translation> + <translation>&Meno použÃvateľa:</translation> </message> <message> <source>&Password:</source> - <translation type="unfinished">&Heslo:</translation> + <translation>&Heslo:</translation> </message> <message> <source>&Hostname:</source> - <translation type="unfinished"></translation> + <translation>&Hostiteľ:</translation> </message> <message> <source>&Bucket:</source> - <translation type="unfinished">&Sektor:</translation> + <translation>&Sektor:</translation> </message> <message> <source>&File:</source> - <translation type="unfinished">&Súbor:</translation> + <translation>&Súbor:</translation> </message> <message> <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source> - <translation type="unfinished">UložiÅ¥ v starÅ¡om formáte OVF 0.9 kvôli kompatibilite so starÅ¡Ãmi virtualizaÄnými produktami.</translation> + <translation>UložiÅ¥ v starÅ¡om formáte OVF 0.9 kvôli kompatibilite so starÅ¡Ãmi virtualizaÄnými produktami.</translation> </message> <message> <source>&Write legacy OVF 0.9</source> - <translation type="unfinished">&UložiÅ¥ vo formáte OVF 0.9</translation> + <translation>&UložiÅ¥ vo formáte OVF 0.9</translation> </message> <message> <source>Create a Manifest file for automatic data integrity checks on import.</source> - <translation type="unfinished"></translation> + <translation>VytvoriÅ¥ súbor manifest pre automatickú kontrolu integrity pri importe.</translation> </message> <message> <source>Write &Manifest file</source> - <translation type="unfinished"></translation> + <translation>ZapÃsaÅ¥ súbor &manifest</translation> </message> <message> <source>Appliance</source> - <translation type="unfinished">Appliance</translation> + <translation>Appliance</translation> </message> <message> <source>Select a file to export into</source> - <translation type="unfinished">Vyberte súbor pre export</translation> + <translation>Vyberte súbor pre export</translation> </message> <message> <source>Open Virtualization Format Archive (%1)</source> - <translation type="unfinished"></translation> + <translation>Open Virtualization Format Archive (%1)</translation> </message> <message> <source>Open Virtualization Format (%1)</source> - <translation type="unfinished">Formát Open Virtualization Format (%1)</translation> + <translation>Formát Open Virtualization Format (%1)</translation> </message> <message> <source>Please choose a filename to export the OVF/OVA to. If you use an <i>ova</i> file name extension, then all the files will be combined into one Open Virtualization Format Archive. If you use an <i>ovf</i> extension, several files will be written separately. Other extensions are not allowed.</source> @@ -1567,7 +1574,7 @@ </message> <message> <source>Start</source> - <translation type="unfinished">SpustiÅ¥</translation> + <translation>SpustiÅ¥</translation> </message> </context> <context> @@ -1645,43 +1652,43 @@ <name>UIGlobalSettingsExtension</name> <message> <source>&Extension Packages:</source> - <translation type="unfinished"></translation> + <translation>&BalÃÄky s rozÅ¡Ãreniami:</translation> </message> <message> <source>Lists all installed packages.</source> - <translation type="unfinished"></translation> + <translation>Zobrazà vÅ¡etky nainÅ¡talované balÃÄky.</translation> </message> <message> <source>Active</source> - <translation type="unfinished"></translation> + <translation>AktÃvne</translation> </message> <message> <source>Name</source> - <translation type="unfinished">Názov</translation> + <translation>Názov</translation> </message> <message> <source>Version</source> - <translation type="unfinished">Verzia</translation> + <translation>Verzia</translation> </message> <message> <source>Add package</source> - <translation type="unfinished"></translation> + <translation>PridaÅ¥ balÃÄek</translation> </message> <message> <source>Remove package</source> - <translation type="unfinished"></translation> + <translation>OdstrániÅ¥ balÃÄek</translation> </message> <message> <source>Select an extension package file</source> - <translation type="unfinished"></translation> + <translation>Vyberte balÃÄek s rozÅ¡Ãreniami</translation> </message> <message> <source>Extension package files (%1)</source> - <translation type="unfinished"></translation> + <translation>Súbory balÃÄkov s rozÅ¡Ãreniami (%1)</translation> </message> <message> <source>Extensions</source> - <translation type="unfinished"></translation> + <translation>RozÅ¡Ãrenia</translation> </message> </context> <context> @@ -1732,42 +1739,42 @@ </message> <message> <source>&Auto show Dock and Menubar in fullscreen</source> - <translation type="unfinished"></translation> + <translation>&Automaticky zobraziÅ¥ spodnú liÅ¡tu a menu v režime na celú obrazovku</translation> </message> <message> <source>When checked, the host screen saver will be disabled whenever a virtual machine is running.</source> - <translation type="unfinished"></translation> + <translation>KeÄ je zaÅ¡krtnuté, Å¡etriÅ¡ obrazovky hostiteľa bude vypnutý vždy, ak bežà virtuálny stroj.</translation> </message> <message> <source>Disable Host &ScreenSaver</source> - <translation type="unfinished"></translation> + <translation>Vypnúť Å¡&etriÄ obrazovky hostiteľa</translation> </message> </context> <context> <name>UIGlobalSettingsInput</name> <message> <source>Host &Key:</source> - <translation type="unfinished">Hostiteľský &kláves:</translation> + <translation>Hostiteľský &kláves:</translation> </message> <message> <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="unfinished"></translation> + <translation>Zobrazà kláves, ktorý sa použÃva ako Hostiteľský kláves v okne VS. Aktivujte pole a stlaÄte nový Hostiteľský kláves. VÅ¡imnite si, že alfanumerické znaky, klávesy na pohyb kurzora a na úpravu sa nedajú použiÅ¥ ako Hostiteľské klávesy.</translation> </message> <message> <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source> - <translation type="unfinished"></translation> + <translation>Ak je voľba zaÅ¡krtnutá, klávesnica bude automaticky zachytená pri aktivácii okna virtuálneho stroja. KeÄ je klávesnica zachytená, vÅ¡etky klávesy (vrátane systémových ako je Alt-Tab) sú presmerované do virtuálneho stroja.</translation> </message> <message> <source>&Auto Capture Keyboard</source> - <translation type="unfinished">&Automaticky zachytávaÅ¥ klávesnicu</translation> + <translation>&Automaticky zachytávaÅ¥ klávesnicu</translation> </message> <message> <source>Reset host combination</source> - <translation type="unfinished"></translation> + <translation>ResetovaÅ¥ klávesovú kombináciu hostiteľa</translation> </message> <message> <source>Resets the key combination used as the host combination in the VM window.</source> - <translation type="unfinished"></translation> + <translation>Resetuje klávesovú kombináciu použÃvanú ako hostiteľskú kombináciu v okne virtuálneho stroja.</translation> </message> </context> <context> @@ -1971,7 +1978,7 @@ </message> <message> <source>Networking</source> - <translation type="unfinished"></translation> + <translation>SieÅ¥</translation> </message> </context> <context> @@ -2054,70 +2061,70 @@ </message> <message> <source>&Lower Address Bound:</source> - <translation>&Spodná hranica pre adresu:</translation> + <translation>&Spodná hranica pre adresy:</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>Zobrazà spodnú hranicu pre adresy obsluhované DHCP serverom v sieti, ktoré sú priradené pre tento adaptér v sieti hostiteľa.</translation> </message> <message> <source>&Upper Address Bound:</source> - <translation>&Horná hranica pre adresu:</translation> + <translation>&Horná hranica pre adresy:</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>Zobrazà hornú hranicu pre adresy obsluhované DHCP serverom v sieti, ktoré sú priradené pre tento adaptér v sieti hostiteľa.</translation> </message> </context> <context> <name>UIGlobalSettingsProxy</name> <message> <source>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</source> - <translation type="unfinished"></translation> + <translation>KeÄ je voľba zaÅ¡krtnutá, VirtualBox použije zadané nastavenia proxy pre úlohy ako naprÃklad sÅ¥ahovanie HosÅ¥ovských doplnkov alebo kontrolu aktualizácii.</translation> </message> <message> <source>&Enable proxy</source> - <translation type="unfinished"></translation> + <translation>&PovoliÅ¥ proxy</translation> </message> <message> <source>Ho&st:</source> - <translation type="unfinished"></translation> + <translation>&Hostiteľ:</translation> </message> <message> <source>Changes the proxy host.</source> - <translation type="unfinished"></translation> + <translation>Zmenà hostiteľa proxy.</translation> </message> <message> <source>&Port:</source> - <translation type="unfinished"></translation> + <translation>&Port:</translation> </message> <message> <source>Changes the proxy port.</source> - <translation type="unfinished"></translation> + <translation>Zmenà port proxy.</translation> </message> <message> <source>When checked the authentication supplied will be used with the proxy server.</source> - <translation type="unfinished"></translation> + <translation>KeÄ je zaÅ¡krtnuté, pre proxy server sa použijú nastavenia autentizácie.</translation> </message> <message> <source>&Use authentication</source> - <translation type="unfinished"></translation> + <translation>PoužiÅ¥ &autentizáciu</translation> </message> <message> <source>User &name:</source> - <translation type="unfinished"></translation> + <translation>&Meno použÃvateľa:</translation> </message> <message> <source>Changes the user name used for authentication.</source> - <translation type="unfinished"></translation> + <translation>Zmenà meno použÃvateľa pre autentizáciu.</translation> </message> <message> <source>Pass&word:</source> - <translation type="unfinished"></translation> + <translation>&Heslo:</translation> </message> <message> <source>Changes the password used for authentication.</source> - <translation type="unfinished"></translation> + <translation>Zmenà heslo použÃte pre autentizáciu.</translation> </message> </context> <context> @@ -2175,7 +2182,7 @@ <name>UIHelpButton</name> <message> <source>&Help</source> - <translation type="unfinished">&PomocnÃk</translation> + <translation>&PomocnÃk</translation> </message> </context> <context> @@ -2190,23 +2197,23 @@ </message> <message> <source>Left Shift</source> - <translation type="unfinished">ľavý shift</translation> + <translation>Ľavý shift</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">pravý shift</translation> + <translation>Pravý shift</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">ľavý ctrl</translation> + <translation>Ľavý ctrl</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">pravý ctrl</translation> + <translation>Pravý ctrl</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">ľavý alt</translation> + <translation>Ľavý alt</translation> </message> <message> <source>Right Alt</source> @@ -2358,7 +2365,7 @@ </message> <message> <source>None</source> - <translation type="unfinished">Žiadne</translation> + <translation>Žiadne</translation> </message> </context> <context> @@ -2393,7 +2400,7 @@ </message> <message> <source>Import</source> - <translation type="unfinished"></translation> + <translation>ImportovaÅ¥</translation> </message> </context> <context> @@ -2555,7 +2562,7 @@ </message> <message> <source><hr>The Remote Desktop Server is listening on port %1</source> - <translation type="unfinished"></translation> + <translation><hr>Vzdialený desktopový server (RDS) poÄúva na porte %1</translation> </message> <message> <source>Indicates the status of different features used by this virtual machine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6%</nobr></source> @@ -2744,15 +2751,15 @@ </message> <message> <source>Mo&nitor Count:</source> - <translation type="unfinished"></translation> + <translation>P&oÄet monitorov:</translation> </message> <message> <source>Controls the amount of virtual monitors provided to the virtual machine.</source> - <translation type="unfinished"></translation> + <translation>UrÄuje poÄet virtuálnych monitorov poskytnutých virtuálnemu stroju.</translation> </message> <message> <source><qt>%1</qt></source> - <translation type="unfinished"></translation> + <translation><qt>%1</qt></translation> </message> <message> <source>Specifies whether multiple simultaneous connections to the VM are permitted.</source> @@ -2760,15 +2767,15 @@ </message> <message> <source>&Allow Multiple Connections</source> - <translation type="unfinished"></translation> + <translation>&PovoliÅ¥ viacnásobné spojenia</translation> </message> <message> <source>you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. For maximal performance set the guest VRAM to at least <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>povolili ste 3D akceleráciu pre operaÄný systém, ktorý použÃva WDDM ovládaÄ videa. Pre maximálny výkon nastavte veľkosÅ¥ VRAM hosÅ¥a aspoň na hodnotu <b>%1</b>.</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">povolili ste 2D akceleráciu videa. Pretože 2D akcelerácia videa je podporovaná iba pre hosÅ¥ovské systémy s Windows, táto vlastnosÅ¥ bude vypnutá.</translation> + <translation>povolili ste 2D akceleráciu videa. Pretože 2D akcelerácia videa je podporovaná iba pre hosÅ¥ovské systémy s Windows, táto vlastnosÅ¥ bude vypnutá.</translation> </message> </context> <context> @@ -2934,7 +2941,7 @@ </message> <message> <source>When checked, plugs this virtual network adapter into the virtual machine.</source> - <translation type="unfinished"></translation> + <translation>KeÄ je zaÅ¡krtnuté, znamená to, že tento virtuálny sieÅ¥ový adaptér je pripojený k virtuálnemu stroju.</translation> </message> <message> <source>&Enable Network Adapter</source> @@ -2962,7 +2969,7 @@ </message> <message> <source>Generates a new random MAC address.</source> - <translation type="unfinished">Vygeneruje novú náhodnú MAC adresu.</translation> + <translation>Vygeneruje novú náhodnú MAC adresu.</translation> </message> <message> <source>&Generate</source> @@ -3008,15 +3015,15 @@ </message> <message> <source>Adapter &Type:</source> - <translation type="unfinished"></translation> + <translation>&Typ adaptéra:</translation> </message> <message> <source>no bridged network adapter is selected</source> - <translation type="unfinished"></translation> + <translation>nie je vybraný žiaden sieÅ¥ový adaptér v moste (bridge)</translation> </message> <message> <source>no internal network name is specified</source> - <translation type="unfinished"></translation> + <translation>nie je zadaný názov pre sieÅ¥</translation> </message> <message> <source>no host-only network adapter is selected</source> @@ -3025,15 +3032,15 @@ <message> <source>Not selected</source> <comment>network adapter name</comment> - <translation type="unfinished"></translation> + <translation>Nevybraný</translation> </message> <message> <source>&Name:</source> - <translation type="unfinished">&Názov:</translation> + <translation>&Názov:</translation> </message> <message> <source>A&dvanced</source> - <translation type="unfinished"></translation> + <translation>&PokroÄilé</translation> </message> <message> <source>Shows or hides additional network adapter options.</source> @@ -3041,7 +3048,7 @@ </message> <message> <source>&Mac Address:</source> - <translation type="unfinished"></translation> + <translation>&Mac adresa:</translation> </message> <message> <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source> @@ -3049,7 +3056,7 @@ </message> <message> <source>&Cable connected</source> - <translation type="unfinished"></translation> + <translation>&Kábel pripojený</translation> </message> <message> <source>Opens dialog to manage port forwarding rules.</source> @@ -3057,11 +3064,11 @@ </message> <message> <source>&Port Forwarding</source> - <translation type="unfinished"></translation> + <translation>P&resmerovanie portov</translation> </message> <message> <source>&Promiscuous Mode:</source> - <translation type="unfinished"></translation> + <translation>&Promiskuitný režim:</translation> </message> <message> <source>Selects the promiscuous mode policy of the network adapter when attached to an internal network, host only network or a bridge.</source> @@ -3069,7 +3076,7 @@ </message> <message> <source>Generic Properties:</source> - <translation type="unfinished"></translation> + <translation>VÅ¡eobecné vlastnosti:</translation> </message> <message> <source>Enter any configuration settings here for the network attachment driver you will be using. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source> @@ -3123,19 +3130,19 @@ <message> <source>Port %1</source> <comment>parallel ports</comment> - <translation type="unfinished">Port %1</translation> + <translation>Port %1</translation> </message> <message> <source>When checked, enables the given parallel port of the virtual machine.</source> - <translation type="unfinished">KeÄ je zaÅ¡rktnuté, povolà virtuálnemu stroju použÃvaÅ¥ vybraný paralelný port.</translation> + <translation>KeÄ je zaÅ¡rktnuté, povolà virtuálnemu stroju použÃvaÅ¥ vybraný paralelný port.</translation> </message> <message> <source>&Enable Parallel Port</source> - <translation type="unfinished">&PovoliÅ¥ paralelný port</translation> + <translation>&PovoliÅ¥ paralelný port</translation> </message> <message> <source>Port &Number:</source> - <translation type="unfinished">ÄŒÃ&slo portu:</translation> + <translation>ÄŒÃ&slo portu:</translation> </message> <message> <source>Displays the parallel port number. You can choose one of the standard parallel ports or select <b>User-defined</b> and specify port parameters manually.</source> @@ -3143,19 +3150,19 @@ </message> <message> <source>&IRQ:</source> - <translation type="unfinished">&IRQ:</translation> + <translation>&IRQ:</translation> </message> <message> <source>I/O Po&rt:</source> - <translation type="unfinished">I/O Po&rt:</translation> + <translation>I/O Po&rt:</translation> </message> <message> <source>Port &Path:</source> - <translation type="unfinished"></translation> + <translation>Ces&ta k portu:</translation> </message> <message> <source>Displays the host parallel device name.</source> - <translation type="unfinished">Zobrazà názov paralelného zariadenia hostiteľa.</translation> + <translation>Zobrazà názov paralelného zariadenia hostiteľa.</translation> </message> <message> <source>Displays the IRQ number of this parallel port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>IO APIC</b> setting is enabled for this virtual machine.</source> @@ -3244,7 +3251,7 @@ </message> <message> <source>Lists all shared folders accessible to this machine. Use 'net use x: \\vboxsvr\share' to access a shared folder named <i>share</i> from a DOS-like OS, or 'mount -t vboxsf share mount_point' to access it from a Linux OS. This feature requires Guest Additions.</source> - <translation>Zobrazà vÅ¡etky zdieľané prieÄinky dostupné pre tento poÄÃtaÅ¥. Použite 'net use x: \\vboxsrv\share' pre prÃstup k zdieľanému prieÄinku s názvom <i>share</i> pre operaÄný systém na báze DOSu alebo 'mount -t vboxsf share mount_point' pre prÃstup k prieÄinku z operaÄného systému Linux. Táto vlastnosÅ¥ vyžaduje inÅ¡taláciu HosÅ¥ovských doplnkov.</translation> + <translation>Zobrazà vÅ¡etky zdieľané prieÄinky dostupné pre tento poÄÃtaÄ. Použite 'net use x: \\vboxsrv\share' pre prÃstup k zdieľanému prieÄinku s názvom <i>share</i> pre operaÄný systém na báze DOSu alebo 'mount -t vboxsf share mount_point' pre prÃstup k prieÄinku z operaÄného systému Linux. Táto vlastnosÅ¥ vyžaduje inÅ¡taláciu HosÅ¥ovských doplnkov.</translation> </message> <message> <source>Name</source> @@ -3280,11 +3287,11 @@ </message> <message> <source>Auto-Mount</source> - <translation type="unfinished"></translation> + <translation>Automatické pripojenie</translation> </message> <message> <source>Yes</source> - <translation type="unfinished">Ãno</translation> + <translation>Ãno</translation> </message> </context> <context> @@ -3327,15 +3334,15 @@ </message> <message> <source>When checked, the guest OS will try to automatically mount the shared folder on startup.</source> - <translation type="unfinished"></translation> + <translation>KeÄ je zaÅ¡krtnuté, hosÅ¥ovský operaÄný systém sa pokúsi automaticky pripojiÅ¥ zdieľaný prieÄinok poÄas Å¡tartu.</translation> </message> <message> <source>&Auto-mount</source> - <translation type="unfinished"></translation> + <translation>&Automatické pripojenie</translation> </message> <message> <source>If checked, this shared folder will be permanent.</source> - <translation type="unfinished"></translation> + <translation>KeÄ je zaÅ¡krtnuté, zdieľaný prieÄinok bude permanentným.</translation> </message> </context> <context> @@ -3379,11 +3386,11 @@ </message> <message> <source>If checked, the pipe specified in the <b>Port Path</b> field will be created by the virtual machine when it starts. Otherwise, the virtual machine will assume that the pipe exists and try to use it.</source> - <translation type="unfinished">Ak je zaÅ¡krtnuté, rúra uvedená v poli <b>Cesta portu</b> bude vytvorená virtuálnym strojom pri spustenÃ. Inak sa virtuálny poÄÃtaÄ pokúsi použiÅ¥ existujúcu rúru.</translation> + <translation>Ak je zaÅ¡krtnuté, rúra uvedená v poli <b>Cesta k portu</b> bude vytvorená virtuálnym strojom pri spustenÃ. Inak virtuálny stroj bude predpokladaÅ¥, že rúra existuje a pokúsi sa ju použiÅ¥.</translation> </message> <message> <source>&Create Pipe</source> - <translation type="unfinished">&VytvoriÅ¥ rúru (pipe)</translation> + <translation>&VytvoriÅ¥ rúru (pipe)</translation> </message> <message> <source>Displays the path to the serial port's pipe on the host when the port is working in <b>Host Pipe</b> mode, or the host serial device name when the port is working in <b>Host Device</b> mode.</source> @@ -3637,7 +3644,7 @@ </message> <message> <source>Type:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Typ:</translation> </message> <message> <source>Host Drive</source> @@ -5409,6 +5416,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Nepodarilo sa uložiÅ¥ stiahnutý súbor ako <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">StiahnuÅ¥</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">InÅ¡talovaÅ¥</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5456,6 +5493,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5681,7 +5729,7 @@ ako veľkosÅ¥ virtuálneho pevného disku.</p></translation> </message> <message> <source>Copy</source> - <translation type="unfinished"></translation> + <translation type="unfinished">SkopÃrovaÅ¥</translation> </message> <message> <source>Welcome to the virtual disk copying wizard</source> @@ -5805,6 +5853,18 @@ ako veľkosÅ¥ virtuálneho pevného disku.</p></translation> <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6384,7 +6444,7 @@ preskoÄiÅ¥ a pripojiÅ¥ pevné disky neskôr pomocou dialógu Nastavenia virtuá <name>UISession</name> <message> <source>Install</source> - <translation type="unfinished"></translation> + <translation>InÅ¡talovaÅ¥</translation> </message> </context> <context> @@ -6395,109 +6455,109 @@ preskoÄiÅ¥ a pripojiÅ¥ pevné disky neskôr pomocou dialógu Nastavenia virtuá </message> <message> <source>On the <b>%1</b> page, %2</source> - <translation type="unfinished">Na strane <b>%1</b>, %2</translation> + <translation>Na strane <b>%1</b>, %2</translation> </message> <message> <source>Invalid settings detected</source> - <translation type="unfinished"></translation> + <translation>Zistené neplatné nastavenia</translation> </message> <message> <source>Non-optimal settings detected</source> - <translation type="unfinished">Zistené neoptimálne nastavenia</translation> + <translation>Zistené neoptimálne nastavenia</translation> </message> <message> <source>Settings</source> - <translation type="unfinished">Nastavenia</translation> + <translation>Nastavenia</translation> </message> </context> <context> <name>UISettingsDialogGlobal</name> <message> <source>General</source> - <translation type="unfinished">VÅ¡eobecné</translation> + <translation>VÅ¡eobecné</translation> </message> <message> <source>Input</source> - <translation type="unfinished">Vstup</translation> + <translation>Vstup</translation> </message> <message> <source>Update</source> - <translation type="unfinished">Aktualizácia</translation> + <translation>Aktualizácia</translation> </message> <message> <source>Language</source> - <translation type="unfinished">Jazyk</translation> + <translation>Jazyk</translation> </message> <message> <source>USB</source> - <translation type="unfinished">USB</translation> + <translation>USB</translation> </message> <message> <source>Network</source> - <translation type="unfinished">SieÅ¥</translation> + <translation>SieÅ¥</translation> </message> <message> <source>Extensions</source> - <translation type="unfinished"></translation> + <translation>RozÅ¡Ãrenia</translation> </message> <message> <source>VirtualBox - %1</source> - <translation type="unfinished">VirtualBox - %1</translation> + <translation>VirtualBox - %1</translation> </message> <message> <source>Proxy</source> - <translation type="unfinished"></translation> + <translation>Proxy</translation> </message> </context> <context> <name>UISettingsDialogMachine</name> <message> <source>General</source> - <translation type="unfinished">VÅ¡eobecné</translation> + <translation>VÅ¡eobecné</translation> </message> <message> <source>System</source> - <translation type="unfinished">Systém</translation> + <translation>Systém</translation> </message> <message> <source>Display</source> - <translation type="unfinished">Displej</translation> + <translation>Displej</translation> </message> <message> <source>Storage</source> - <translation type="unfinished">Úložisko</translation> + <translation>Úložisko</translation> </message> <message> <source>Audio</source> - <translation type="unfinished">Audio</translation> + <translation>Audio</translation> </message> <message> <source>Network</source> - <translation type="unfinished">SieÅ¥</translation> + <translation>SieÅ¥</translation> </message> <message> <source>Ports</source> - <translation type="unfinished">Porty</translation> + <translation>Porty</translation> </message> <message> <source>Serial Ports</source> - <translation type="unfinished">Sériové porty</translation> + <translation>Sériové porty</translation> </message> <message> <source>Parallel Ports</source> - <translation type="unfinished">Paralelné porty</translation> + <translation>Paralelné porty</translation> </message> <message> <source>USB</source> - <translation type="unfinished">USB</translation> + <translation>USB</translation> </message> <message> <source>Shared Folders</source> - <translation type="unfinished">Zdieľané prieÄinky</translation> + <translation>Zdieľané prieÄinky</translation> </message> <message> <source>%1 - %2</source> - <translation type="unfinished">%1 - %2</translation> + <translation>%1 - %2</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> @@ -6528,14 +6588,93 @@ preskoÄiÅ¥ a pripojiÅ¥ pevné disky neskôr pomocou dialógu Nastavenia virtuá </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 deň</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dni</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dni</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dni</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dnÃ</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dnÃ</translation> + </message> + <message> + <source>1 week</source> + <translation>1 týždeň</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 týždne</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 týždne</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mesiac</translation> + </message> + <message> + <source>Never</source> + <translation>Nikdy</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">ÄŒas spojenia vyprÅ¡al.</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&SkontrolovaÅ¥</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&ZatvoriÅ¥</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Sprievodca aktualizáciou VirtualBoxu</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">KontrolovaÅ¥ aktualizácie</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">ZruÅ¡iÅ¥</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Zhrnutie</translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">PoužÃvate najnovÅ¡iu verziu VirtualBoxu.</translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> - <translation type="unfinished">ZatvoriÅ¥ Virtuálny stroj</translation> + <translation>ZatvoriÅ¥ Virtuálny stroj</translation> </message> <message> <source>You want to:</source> - <translation type="unfinished">Chcete:</translation> + <translation>Chcete:</translation> </message> <message> <source><p>Saves the current execution state of the virtual machine to the physical hard disk of the host PC.</p><p>Next time this machine is started, it will be restored from the saved state and continue execution from the same place you saved it at, which will let you continue your work immediately.</p><p>Note that saving the machine state may take a long time, depending on the guest operating system type and the amount of memory you assigned to the virtual machine.</p></source> @@ -6543,15 +6682,15 @@ preskoÄiÅ¥ a pripojiÅ¥ pevné disky neskôr pomocou dialógu Nastavenia virtuá </message> <message> <source>&Save the machine state</source> - <translation type="unfinished">&UložiÅ¥ stav virtuálneho stroja</translation> + <translation>&UložiÅ¥ stav virtuálneho stroja</translation> </message> <message> <source><p>Sends the ACPI Power Button press event to the virtual machine.</p><p>Normally, the guest operating system running inside the virtual machine will detect this event and perform a clean shutdown procedure. This is a recommended way to turn off the virtual machine because all applications running inside it will get a chance to save their data and state.</p><p>If the machine doesn't respond to this action then the guest operating system may be misconfigured or doesn't understand ACPI Power Button events at all. In this case you should select the <b>Power off the machine</b> action to stop virtual machine execution.</p></source> - <translation type="unfinished"><p>PoÅ¡le ACPI udalosÅ¥ stlaÄenie zapÃnacieho tlaÄidla virtuálnemu poÄÃtaÄu.</p><p>Za bežných okolnostà hosÅ¥ovaný operaÄný systém, ktorý bežà vnútri virtuálneho poÄÃtaÄa, deteguje túto udalosÅ¥ a vykoná korektnú ukonÄovaciu procedúru. Toto je odporúÄaný spôsob vypÃnania, pretože vÅ¡etky aplikácia bežiace vnútri dostanú Å¡ancu uložiÅ¥ svoje dáta a stav.</p><p>Ak poÄÃtaÄ neodpovedá na túto akciu, potom je buÄ zle nakonfigurovaný alebo vôbec nerozumie ACPI udalosti stlaÄenia zapÃnacieho tlaÄidla. V tomto prÃpade by ste mali zvoliÅ¥ akciu <b>Vypnúť poÄÃtaÄ</b> pre zastavenie poÄÃtaÄa.</p></translation> + <translation><p>PoÅ¡le ACPI udalosÅ¥ stlaÄenie zapÃnacieho tlaÄidla virtuálnemu poÄÃtaÄu.</p><p>Za bežných okolnostà operaÄný systém hosÅ¥a, ktorý bežà vnútri virtuálneho poÄÃtaÄa, deteguje túto udalosÅ¥ a vykoná korektnú ukonÄovaciu procedúru. Toto je odporúÄaný spôsob vypÃnania, pretože vÅ¡etky aplikácie bežiace vnútri dostanú Å¡ancu uložiÅ¥ svoje dáta a stav.</p><p>Ak poÄÃtaÄ neodpovedá na túto akciu, potom je buÄ zle nakonfigurovaný alebo vôbec nerozumie ACPI udalosti stlaÄenia zapÃnacieho tlaÄidla. V tomto prÃpade by ste mali zvoliÅ¥ akciu <b>Vypnúť poÄÃtaÄ</b> pre zastavenie poÄÃtaÄa.</p></translation> </message> <message> <source>S&end the shutdown signal</source> - <translation type="unfinished">&PoÅ¡le signál na vypnutie</translation> + <translation>&PoÅ¡le signál na vypnutie</translation> </message> <message> <source><p>Turns off the virtual machine.</p><p>Note that this action will stop machine execution immediately so that the guest operating system running inside it will not be able to perform a clean shutdown procedure which may result in <i>data loss</i> inside the virtual machine. Selecting this action is recommended only if the virtual machine does not respond to the <b>Send the shutdown signal</b> action.</p></source> @@ -6559,11 +6698,11 @@ preskoÄiÅ¥ a pripojiÅ¥ pevné disky neskôr pomocou dialógu Nastavenia virtuá </message> <message> <source>&Power off the machine</source> - <translation type="unfinished">&Vypnúť virtuálny stroj</translation> + <translation>&Vypnúť virtuálny stroj</translation> </message> <message> <source>Restore the machine state stored in the current snapshot</source> - <translation type="unfinished">ObnoviÅ¥ stav stroja uložený v aktuálnej snÃmke</translation> + <translation>ObnoviÅ¥ stav stroja uložený v aktuálnej snÃmke</translation> </message> <message> <source><p>When checked, the machine will be returned to the state stored in the current snapshot after it is turned off. This is useful if you are sure that you want to discard the results of your last sessions and start again at that snapshot.</p></source> @@ -6571,18 +6710,18 @@ preskoÄiÅ¥ a pripojiÅ¥ pevné disky neskôr pomocou dialógu Nastavenia virtuá </message> <message> <source>&Restore current snapshot '%1'</source> - <translation type="unfinished">&ObnoviÅ¥ aktuálnu snÃmku '%1'</translation> + <translation>&ObnoviÅ¥ aktuálnu snÃmku '%1'</translation> </message> </context> <context> <name>UIVMDesktop</name> <message> <source>&Details</source> - <translation type="unfinished">&Podrobnosti</translation> + <translation>&Podrobnosti</translation> </message> <message> <source>&Snapshots</source> - <translation type="unfinished">&SnÃmky</translation> + <translation>&SnÃmky</translation> </message> </context> <context> @@ -6638,31 +6777,31 @@ preskoÄiÅ¥ a pripojiÅ¥ pevné disky neskôr pomocou dialógu Nastavenia virtuá <name>UIVMPreviewWindow</name> <message> <source>Update Disabled</source> - <translation type="unfinished"></translation> + <translation>Aktualizácie vypnuté</translation> </message> <message> <source>Every 0.5 s</source> - <translation type="unfinished"></translation> + <translation>Každých 0.5 s</translation> </message> <message> <source>Every 1 s</source> - <translation type="unfinished"></translation> + <translation>Každú sekundu</translation> </message> <message> <source>Every 2 s</source> - <translation type="unfinished"></translation> + <translation>Každé 2 s</translation> </message> <message> <source>Every 5 s</source> - <translation type="unfinished"></translation> + <translation>Každých 5 s</translation> </message> <message> <source>Every 10 s</source> - <translation type="unfinished"></translation> + <translation>Každých 10 s</translation> </message> <message> <source>No Preview</source> - <translation type="unfinished"></translation> + <translation>Bez náhľadu</translation> </message> </context> <context> @@ -7074,12 +7213,12 @@ verzia %1</translation> <translation type="obsolete">&PomocnÃk</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indikuje, Äi je funkcia automatickej zmeny veľkosti hosÅ¥ovskej obrazovky Zapnutá (<img src=auto_resize_on_16px.png/>) alebo Vypnutá (<img src=auto_resize_off_16px.png/>). Pamätajte, že táto funkcia vyžaduje nainÅ¡talovanie HosÅ¥ovských doplnkov v hosÅ¥ovskom OS.</translation> + <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Indikuje, Äi je funkcia automatickej zmeny veľkosti hosÅ¥ovskej obrazovky Zapnutá (<img src=:/auto_resize_on_16px.png/>) alebo Vypnutá (<img src=:/auto_resize_off_16px.png/>). Pamätajte, že táto funkcia vyžaduje nainÅ¡talovanie HosÅ¥ovských doplnkov v hosÅ¥ovskom OS.</translation> </message> <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Indikuje, Äi hosÅ¥ovský OS zachytáva hostiteľský ukazovateľ myÅ¡i.<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;ukazovateľ sa nezachytáva</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;ukazovateľ sa zachytáva</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;integrácia myÅ¡ (MI) je Zapnutá</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI je vypnutá, ukazovateľ sa zachytáva</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI je vypnutá, ukazovateľ sa nezachytáva</nobr><br>Pamätajte, že integrácia myÅ¡i vyžaduje nainÅ¡talovanie HosÅ¥ovských doplnkov v hosÅ¥ovskom OS.</translation> + <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> + <translation type="obsolete">Indikuje, Äi hosÅ¥ovský OS zachytáva hostiteľský ukazovateľ myÅ¡i.<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;ukazovateľ sa nezachytáva</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;ukazovateľ sa zachytáva</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integrácia myÅ¡ (MI) je Zapnutá</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI je vypnutá, ukazovateľ sa zachytáva</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI je vypnutá, ukazovateľ sa nezachytáva</nobr><br>Pamätajte, že integrácia myÅ¡i vyžaduje nainÅ¡talovanie HosÅ¥ovských doplnkov v hosÅ¥ovskom OS.</translation> </message> <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> @@ -7169,10 +7308,6 @@ verzia %1</translation> <translation type="obsolete">Prepnúť do režimu plynulého prechodu medzi plochami</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Indikuje, Äi klávesnicu zachytáva hosÅ¥ovský OS (<img src=hostkey_captured_16px.png/>) alebo nie (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Indikuje aktivitu disketovej mechaniky:</nobr>%1</qt></translation> @@ -7263,10 +7398,6 @@ verzia %1</translation> <translation type="obsolete"><br><nobr><b>USB ovládaÄ je vypnutý</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Indikuje, Äi je Vzdialený displej (VRDP server) zapnutý (<img src=vrdp_16px.png/>) alebo nie (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>Indikuje aktivitu zdieľaných prieÄinkov:</nobr>%1</qt></translation> @@ -7320,10 +7451,6 @@ verzia %1</translation> <translation type="obsolete">&Logovanie...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Inidkuje, Äi je funkcia prispôsobenia hosÅ¥ovanej obrazovky zapnutá (<img src=:/auto_resize_on_16px.png/>) alebo vypnutá (<img src=:/auto_resize_off_16px.png/>). Táto funkcia vyžaduje nainÅ¡talované HosÅ¥ovské doplnky na hosÅ¥ovanom OS.</translation> - </message> - <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> <translation type="obsolete">Indikuje, Äi je klávesnica odchytávaná hosÅ¥ovaným OS (<img src=:/hostkey_captured_16px.png/>) alebo nie (<img src=:/hostkey_16px.png/>).</translation> </message> @@ -8048,7 +8175,7 @@ verzia %1</translation> <message> <source>Running</source> <comment>MachineState</comment> - <translation>Bežiaci</translation> + <translation>BežÃ</translation> </message> <message> <source>Paused</source> @@ -8734,7 +8861,7 @@ verzia %1</translation> <message> <source>Bridged adapter, %1</source> <comment>details report (network)</comment> - <translation>Karta použÃtá v sieÅ¥ovom moste, %1</translation> + <translation>Karta použitá v sieÅ¥ovom moste, %1</translation> </message> <message> <source>Host-only adapter, '%1'</source> @@ -8744,17 +8871,17 @@ verzia %1</translation> <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> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>Adaptér v moste (bridge)</translation> </message> <message> <source>Host-only Adapter</source> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>Adaptér len pre hostiteľa</translation> </message> <message> <source><nobr>%1 MB</nobr></source> @@ -8799,22 +8926,22 @@ verzia %1</translation> <message> <source>Raw File</source> <comment>PortMode</comment> - <translation type="unfinished"></translation> + <translation>Surový (raw) súbor</translation> </message> <message> <source>Enabled</source> <comment>details report (2D Video Acceleration)</comment> - <translation type="unfinished"></translation> + <translation>Povolená</translation> </message> <message> <source>Disabled</source> <comment>details report (2D Video Acceleration)</comment> - <translation type="unfinished"></translation> + <translation>Vypnutá</translation> </message> <message> <source>2D Video Acceleration</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>2D akcelerácia videa</translation> </message> <message> <source>Not Attached</source> @@ -8829,17 +8956,17 @@ verzia %1</translation> <message> <source>Teleported</source> <comment>MachineState</comment> - <translation type="unfinished"></translation> + <translation>Teleportovaný</translation> </message> <message> <source>Guru Meditation</source> <comment>MachineState</comment> - <translation type="unfinished"></translation> + <translation>Meditácia guru</translation> </message> <message> <source>Teleporting</source> <comment>MachineState</comment> - <translation type="unfinished"></translation> + <translation>Teleportujem</translation> </message> <message> <source>Taking Live Snapshot</source> @@ -8849,7 +8976,7 @@ verzia %1</translation> <message> <source>Teleporting Paused VM</source> <comment>MachineState</comment> - <translation type="unfinished"></translation> + <translation>Teleportujúci sa pozastavený virtuálny stroj</translation> </message> <message> <source>Restoring Snapshot</source> @@ -9044,123 +9171,123 @@ verzia %1</translation> <message> <source>Screens</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Obrazovky</translation> </message> <message> <source>SAS</source> <comment>StorageBus</comment> - <translation type="unfinished"></translation> + <translation>SAS</translation> </message> <message> <source>LsiLogic SAS</source> <comment>StorageControllerType</comment> - <translation type="unfinished"></translation> + <translation>LsiLogic SAS</translation> </message> <message> <source>B</source> <comment>size suffix Bytes</comment> - <translation type="unfinished"></translation> + <translation>B</translation> </message> <message> <source>KB</source> <comment>size suffix KBytes=1024 Bytes</comment> - <translation type="unfinished"></translation> + <translation>KB</translation> </message> <message> <source>MB</source> <comment>size suffix MBytes=1024 KBytes</comment> - <translation type="unfinished">MB</translation> + <translation>MB</translation> </message> <message> <source>GB</source> <comment>size suffix GBytes=1024 MBytes</comment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>TB</source> <comment>size suffix TBytes=1024 GBytes</comment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>PB</source> <comment>size suffix PBytes=1024 TBytes</comment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <source>Enabled</source> <comment>nested paging</comment> - <translation type="unfinished"></translation> + <translation>Povolené</translation> </message> <message> <source>Disabled</source> <comment>nested paging</comment> - <translation type="unfinished"></translation> + <translation>Vypnuté</translation> </message> <message> <source>Nested Paging</source> - <translation type="unfinished">Priamy prÃstup k hardware</translation> + <translation>Priamy prÃstup k hardware</translation> </message> <message> <source>Shareable</source> <comment>DiskType</comment> - <translation type="unfinished"></translation> + <translation>Zdielateľný</translation> </message> <message> <source>Unknown device</source> <comment>USB device details</comment> - <translation type="unfinished"></translation> + <translation>Neznáme zariadenie</translation> </message> <message> <source>SAS Port %1</source> <comment>New Storage UI : Slot Name</comment> - <translation type="unfinished"></translation> + <translation>SAS Port %1</translation> </message> <message> <source>Remote Desktop Server Port</source> <comment>details report (VRDE Server)</comment> - <translation type="unfinished"></translation> + <translation>Port pre RDS (Remote Display Server)</translation> </message> <message> <source>Remote Desktop Server</source> <comment>details report (VRDE Server)</comment> - <translation type="unfinished"></translation> + <translation>Vzdialený desktop (RDS)</translation> </message> <message> <source>Disabled</source> <comment>details report (VRDE Server)</comment> - <translation type="unfinished"></translation> + <translation>Vypnutý</translation> </message> <message> <source>Choose a virtual hard disk file</source> - <translation type="unfinished"></translation> + <translation>Vyberte súbor s virtuálnym pevným diskom</translation> </message> <message> <source>hard disk</source> - <translation type="unfinished">pevný disk</translation> + <translation>pevný disk</translation> </message> <message> <source>Choose a virtual CD/DVD disk file</source> - <translation type="unfinished"></translation> + <translation>Vyberte súbor s virtuálnym CD/DVD diskom</translation> </message> <message> <source>CD/DVD-ROM disk</source> - <translation type="unfinished"></translation> + <translation>Disk CD/DVD-ROM</translation> </message> <message> <source>Choose a virtual floppy disk file</source> - <translation type="unfinished"></translation> + <translation>Vyberte súbor s virtuálnym diskom diskety</translation> </message> <message> <source>floppy disk</source> - <translation type="unfinished"></translation> + <translation>disketa</translation> </message> <message> <source>All %1 images (%2)</source> - <translation type="unfinished"></translation> + <translation>VÅ¡etky %1 obrazy (%2)</translation> </message> <message> <source>All files (*)</source> - <translation type="unfinished">VÅ¡etky súbory (*)</translation> + <translation>VÅ¡etky súbory (*)</translation> </message> <message> <source>Fault Tolerant Syncing</source> @@ -9170,71 +9297,71 @@ verzia %1</translation> <message> <source>Unlocked</source> <comment>SessionState</comment> - <translation type="unfinished"></translation> + <translation>Odomknuté</translation> </message> <message> <source>Locked</source> <comment>SessionState</comment> - <translation type="unfinished"></translation> + <translation>Uzamknuté</translation> </message> <message> <source>Unlocking</source> <comment>SessionState</comment> - <translation type="unfinished"></translation> + <translation>Odomykám</translation> </message> <message> <source>Null</source> <comment>AuthType</comment> - <translation type="unfinished">žiadna</translation> + <translation>Null</translation> </message> <message> <source>External</source> <comment>AuthType</comment> - <translation type="unfinished">externý</translation> + <translation>Externá</translation> </message> <message> <source>Guest</source> <comment>AuthType</comment> - <translation type="unfinished">hosÅ¥</translation> + <translation>HosÅ¥</translation> </message> <message> <source>Intel HD Audio</source> <comment>AudioControllerType</comment> - <translation type="unfinished"></translation> + <translation>Intel HD Audio</translation> </message> <message> <source>UDP</source> <comment>NATProtocolType</comment> - <translation type="unfinished"></translation> + <translation>UDP</translation> </message> <message> <source>TCP</source> <comment>NATProtocolType</comment> - <translation type="unfinished"></translation> + <translation>TCP</translation> </message> <message> <source>PIIX3</source> <comment>ChipsetType</comment> - <translation type="unfinished">PIIX3</translation> + <translation>PIIX3</translation> </message> <message> <source>ICH9</source> <comment>ChipsetType</comment> - <translation type="unfinished"></translation> + <translation>ICH9</translation> </message> <message> <source>and</source> - <translation type="unfinished"></translation> + <translation>a</translation> </message> <message> <source>MB</source> <comment>size suffix MBytes=1024KBytes</comment> - <translation type="unfinished">MB</translation> + <translation>MB</translation> </message> <message> <source>Readonly</source> <comment>DiskType</comment> - <translation type="unfinished"></translation> + <translation>Iba na ÄÃtanie</translation> </message> <message> <source>Multi-attach</source> @@ -9243,11 +9370,11 @@ verzia %1</translation> </message> <message> <source>Dynamically allocated storage</source> - <translation type="unfinished"></translation> + <translation>Dynamicky expandujúce úložisko</translation> </message> <message> <source>Fixed size storage</source> - <translation type="unfinished"></translation> + <translation>Úložisko s pevnou veľkosÅ¥ou</translation> </message> <message> <source>Dynamically allocated storage split into files of less than 2GB</source> @@ -9265,7 +9392,7 @@ verzia %1</translation> <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation><nobr>%1%</nobr></translation> </message> <message> <source>Generic, '%1'</source> @@ -9290,11 +9417,11 @@ verzia %1</translation> <message> <source>Allow All</source> <comment>NetworkAdapterPromiscModePolicyType</comment> - <translation type="unfinished"></translation> + <translation>PovoliÅ¥ vÅ¡etky</translation> </message> <message> <source>Adapter %1</source> - <translation type="unfinished">Adaptér %1</translation> + <translation>Adaptér %1</translation> </message> </context> <context> @@ -9967,59 +10094,59 @@ je zobrazený <b>tuÄným</b> pÃsmom. Voľbou <i>Å tandardný </message> <message> <source>CD/DVD-ROM disk</source> - <translation type="unfinished"></translation> + <translation>Disk CD/DVD-ROM</translation> </message> <message> <source>hard disk</source> - <translation type="unfinished">pevný disk</translation> + <translation>pevný disk</translation> </message> <message> <source>floppy disk</source> - <translation type="unfinished"></translation> + <translation>disketa</translation> </message> <message> <source>All %1 images (%2)</source> - <translation type="unfinished"></translation> + <translation>VÅ¡etky %1 obrazy (%2)</translation> </message> <message> <source>Type:</source> - <translation type="unfinished"></translation> + <translation>Typ:</translation> </message> <message> <source>Location:</source> - <translation type="unfinished">Umiestnenie:</translation> + <translation>Umiestnenie:</translation> </message> <message> <source>Format:</source> - <translation type="unfinished"></translation> + <translation>Formát:</translation> </message> <message> <source>Storage details:</source> - <translation type="unfinished"></translation> + <translation>Detaily o úložisku:</translation> </message> <message> <source>Attached to:</source> - <translation type="unfinished"></translation> + <translation>Pripojený k:</translation> </message> <message> <source>&Copy...</source> - <translation type="unfinished"></translation> + <translation>&KopÃrovaÅ¥...</translation> </message> <message> <source>&Modify...</source> - <translation type="unfinished"></translation> + <translation>&ZmeniÅ¥...</translation> </message> <message> <source>Copy an existing medium</source> - <translation type="unfinished"></translation> + <translation>KopÃrovaÅ¥ existujúce médium</translation> </message> <message> <source>Modify the attributes of the selected medium</source> - <translation type="unfinished"></translation> + <translation>ZmeniÅ¥ atribúty vybraného média</translation> </message> <message> <source>C&lose</source> - <translation type="unfinished"></translation> + <translation>&ZavrieÅ¥</translation> </message> </context> <context> @@ -10038,7 +10165,7 @@ je zobrazený <b>tuÄným</b> pÃsmom. Voľbou <i>Å tandardný </message> <message> <source>Minimize Window</source> - <translation type="unfinished"></translation> + <translation>MinimalizovaÅ¥ okno</translation> </message> </context> <context> @@ -10324,7 +10451,7 @@ je zobrazený <b>tuÄným</b> pÃsmom. Voľbou <i>Å tandardný </message> <message> <source>Discard</source> - <translation type="unfinished">ZahodiÅ¥</translation> + <translation>ZahodiÅ¥</translation> </message> <message> <source>Discard the saved state of the selected virtual machine</source> @@ -11155,97 +11282,6 @@ je zobrazený <b>tuÄným</b> pÃsmom. Voľbou <i>Å tandardný </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 deň</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dni</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dni</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dni</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dnÃ</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dnÃ</translation> - </message> - <message> - <source>1 week</source> - <translation>1 týždeň</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 týždne</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 týždne</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mesiac</translation> - </message> - <message> - <source>Never</source> - <translation>Nikdy</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">ÄŒas spojenia vyprÅ¡al.</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&SkontrolovaÅ¥</translation> - </message> - <message> - <source>&Close</source> - <translation>&ZatvoriÅ¥</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Sprievodca aktualizáciou VirtualBoxu</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>KontrolovaÅ¥ aktualizácie</translation> - </message> - <message> - <source>Cancel</source> - <translation>ZruÅ¡iÅ¥</translation> - </message> - <message> - <source>Summary</source> - <translation>Zhrnutie</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>PoužÃvate najnovÅ¡iu verziu VirtualBoxu.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> @@ -11311,7 +11347,7 @@ je zobrazený <b>tuÄným</b> pÃsmom. Voľbou <i>Å tandardný </message> <message> <source>Data Transmitted</source> - <translation>Prenesená dáta</translation> + <translation>Prenesené dáta</translation> </message> <message> <source>Data Received</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts index 4c0d7f0ef..197708919 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts @@ -193,11 +193,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>Копирати Ñве грешке у оÑтави</translation> </message> <message> <source>Copy</source> - <translation type="unfinished">Копирај</translation> + <translation>Копирај</translation> </message> </context> <context> @@ -639,7 +639,7 @@ </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translation>Линкована база за %1 и %2</translation> </message> </context> <context> @@ -670,7 +670,7 @@ </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Ðко унето, нова MAC адреÑа ће бити поÑтављена Ñвим картицама.</translation> </message> </context> <context> @@ -709,54 +709,54 @@ </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Цео клон</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Линкован клон</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>Одабрати тип клона.</p><p>Ðко изаберете <b>Цео клон</b> додатна копија (и вируалне Ñлике) оригиналне машине ће бити креирана. Ðко одаберете <b>Линкован клон</b>, нова машина ће бити креирана, али виртуалне Ñлике ће показивати на Ñлике оригиналне машине.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Ðова Ñлика у изворној машини ће бити креирана ако одаберете <b>Линкован клон</b>.</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished">Ðктуелни ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¼Ð°ÑˆÐ¸Ð½Ðµ</translation> + <translation>Ðктуелни ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¼Ð°ÑˆÐ¸Ð½Ðµ</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished">Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð°ÐºÑ‚ÑƒÐµÐ»Ð½Ðµ машине и деце</translation> + <translation>Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð°ÐºÑ‚ÑƒÐµÐ»Ð½Ðµ машине и деце</translation> </message> <message> <source>All states</source> - <translation type="unfinished">Сви ÑтатуÑи</translation> + <translation>Сви ÑтатуÑи</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished">Подешавање клонирања</translation> + <translation>Подешавање клонирања</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished">Одаберите шта треба да Ñе клонира.</translation> + <translation>Одаберите шта треба да Ñе клонира.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished">Ðко одаберете <b>Ðктуелни ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¼Ð°ÑˆÐ¸Ð½Ðµ</b>, Ñамо ће актуелни ÑÑ‚Ð°Ñ‚ÑƒÑ Ð´Ð° буде клониран.</translation> + <translation>Ðко одаберете <b>Ðктуелни ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¼Ð°ÑˆÐ¸Ð½Ðµ</b>, Ñамо ће актуелни ÑÑ‚Ð°Ñ‚ÑƒÑ Ð´Ð° буде клониран.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished">Ðко одаберете <b>Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð°ÐºÑ‚ÑƒÐµÐ»Ð½Ðµ машине и деце</b> клонирано је актуелни ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¼Ð°ÑˆÐ¸Ð½Ðµ и ÑÑ‚Ð°Ñ‚ÑƒÑ Ñнимака деце.</translation> + <translation>Ðко одаберете <b>Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð°ÐºÑ‚ÑƒÐµÐ»Ð½Ðµ машине и деце</b> клонирано је актуелни ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¼Ð°ÑˆÐ¸Ð½Ðµ и ÑÑ‚Ð°Ñ‚ÑƒÑ Ñнимака деце.</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished">Ðко одаберете <b>Сви ÑтатуÑи</b>,актуелна машина и Ñве Ñлике Ñу клониране.</translation> + <translation>Ðко одаберете <b>Сви ÑтатуÑи</b>,актуелна машина и Ñве Ñлике Ñу клониране.</translation> </message> </context> <context> @@ -1100,6 +1100,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Одабрати фаÑциклу где да Ñе Ñачува %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2194,23 +2201,23 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Left Shift</source> - <translation type="unfinished">Леви шифт</translation> + <translation>Леви шифт</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">ДеÑни шифт</translation> + <translation>ДеÑни шифт</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">Леви Ctrl</translation> + <translation>Леви Ctrl</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">ДеÑни Ctrl</translation> + <translation>ДеÑни Ctrl</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">Леви Alt</translation> + <translation>Леви Alt</translation> </message> <message> <source>Right Alt</source> @@ -2485,7 +2492,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation>Показује да ли је хоÑÑ‚ курÑор интегриÑан од Ñтране гоÑта:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;курÑор није интегриÑан</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;курÑор је интегриÑан</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;интеграција миша (ИМ) је On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;ИМ је Off, курÑор је интегриÑан</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;ИМ је Off, курÑор није интегриÑан</nobr><br>За интеграцији миша је потребно да 'додатци гоÑта' буду инÑталирани.</translation> + <translation>Показује да ли је хоÑÑ‚ курÑор интегриÑан од Ñтране гоÑта:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;курÑор није интегриÑан</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;курÑор је интегриÑан</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;интеграција миша (ИМ) је On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;ИМ је Off, курÑор је интегриÑан</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;ИМ је Off, курÑор није интегриÑан</nobr><br>За интеграцији миша је потребно да 'додатци гоÑта' буду инÑталирани.</translation> </message> <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> @@ -4160,7 +4167,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>поÑтавили Ñте ICH9 чипÑет овој машини. Ðеће лепо радити док Ñе не упали IO-APIC ÑпоÑобноÑÑ‚. То ће аутоматÑко да Ñе уради када прихватите подешавања преко дугмета У реду.</translation> </message> </context> <context> @@ -5653,11 +5660,41 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Ðе могу да нађен Ñнимак <b>%1</b>.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="unfinished"><p>ÐеуÑпешно Ñачувавање датотеке као <nobr><b>%1</b>.</nobr></p></translation> + <translation><p>ÐеуÑпешно Ñачувавање датотеке као <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Имате инÑталирану Ñтару верзију (%1) од <b><nobr>%2</nobr></b>.</p><p>Да ли да Ñе преузме поÑледња Ñа Инетрнета?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Преузми</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Сигурно да Ñе преузме <b><nobr>%1</nobr></b> од <nobr><a href="%2">%2</a></nobr> (%3 бајтова)?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p><b><nobr>%1</nobr></b> је уÑпешно преузето од <nobr><a href="%2">%2</a></nobr> и Ñачувано као <nobr><b>%3</b>.</nobr></p><p>Да ли да Ñе инÑталира тај пакет?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>ИнÑталирај</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p><b><nobr>%1</nobr></b> је преузето од <nobr><a href="%2">%2</a></nobr> али не ноже да Ñе локално Ñачува као <nobr><b>%3</b>.</nobr></p><p>Одабрити други Ñмештај за датотеку.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>ÐеуÑпешно преузимање <b><nobr>%1</nobr></b> од <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> </message> </context> <context> @@ -5698,11 +5735,22 @@ p, li { white-space: pre-wrap; } <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished"></translation> + <translation>ЗауÑтавити преузимање 'додатка гоÑта'</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished"></translation> + <translation>Преузимање 'додатка гоÑта' од <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>Поништи <nobr><b>%1</b></nobr> преузимање</translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Преузимање <nobr><b>%1</b></nobr> од <nobr><b>%2</b>...</nobr></translation> </message> </context> <context> @@ -5969,6 +6017,18 @@ p, li { white-space: pre-wrap; } <comment>summary</comment> <translation>Детаљи</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>HDD (Паралелни ахрд диÑк)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>QED (QEMU напредни диÑк)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>QCOW (QEMU цопирај-на-пиÑање)</translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6635,6 +6695,93 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 дан</translation> + </message> + <message> + <source>2 days</source> + <translation>2 дана</translation> + </message> + <message> + <source>3 days</source> + <translation>3 дана</translation> + </message> + <message> + <source>4 days</source> + <translation>4 дана</translation> + </message> + <message> + <source>5 days</source> + <translation>5 дана</translation> + </message> + <message> + <source>6 days</source> + <translation>6 дана</translation> + </message> + <message> + <source>1 week</source> + <translation>1 недеља</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 недеље</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 недеље</translation> + </message> + <message> + <source>1 month</source> + <translation>1 меÑец</translation> + </message> + <message> + <source>Never</source> + <translation>Ðикада</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">Провери</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">Затвори</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">ÐÑиÑтент ажурирања VirtualBox-а</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Проверити ажурирања</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Поништи</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Резиме</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Ðађена новија верзија VirtualBox-а! Верзија <b>%1</b> је доÑтупна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Можете преузети ову верзију Ñа овим линком:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Ðемогуће добијање верзије због ове грешке:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Већ кориÑтите задњу верзију VirtualBox-а.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>ÐÑиÑтент ће Ñе привезати на Ñајту VirtualBox-а и проверити да ли има новија верзија.</p><p>КориÑтити <b>Провери</b> за проверу новије верзије или <b>Ðнулирај</b> ако нећете да проверите.</p><p>Можете покренути овај аÑиÑтент када год пожелите преко <b>Провери ажурирања...</b> Ñа менија <b>Помоћ</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7240,7 +7387,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Показује да ли је хоÑÑ‚ курÑор интегриÑан од Ñтране гоÑта:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;курÑор није интегриÑан</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;курÑор је интегриÑан</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;интеграција миша (ИМ) је On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;ИМ је Off, курÑор је интегриÑан</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;ИМ је Off, курÑор није интегриÑан</nobr><br>За интеграцији миша је потребно да 'додатци гоÑта' буду инÑталирани.</translation> + <translation type="obsolete">Показује да ли је хоÑÑ‚ курÑор интегриÑан од Ñтране гоÑта:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;курÑор није интегриÑан</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;курÑор је интегриÑан</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;интеграција миша (ИМ) је On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;ИМ је Off, курÑор је интегриÑан</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;ИМ је Off, курÑор није интегриÑан</nobr><br>За интеграцији миша је потребно да 'додатци гоÑта' буду инÑталирани.</translation> </message> <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> @@ -9548,7 +9695,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation><h3>Добродошли у VirtualBox!</h3><p>Леви део прозор показује ÑпиÑак виртуелне машине Ñа рачунара. СпиÑак је празан пошто ниÑте још креирали виртуелну машину.<img src=welcome.png align=right/></p><p>За креацију нове виртуелне машине, ÑтиÑнути <b>Ðово</b> Ñа главне траке која је на горњи део прозора.</p><p>Можете да ÑтиÑнете <b>F1</b> за инÑтантни помоћ, или ићи на <a href=http://www.virtualbox.org>www.virtualbox.org</a> за задње информације и новоÑти.</p></translation> + <translation><h3>Добродошли у VirtualBox!</h3><p>Леви део прозор показује ÑпиÑак виртуелне машине Ñа рачунара. СпиÑак је празан пошто ниÑте још креирали виртуелну машину.<img src=:/welcome.png align=right/></p><p>За креацију нове виртуелне машине, ÑтиÑнути <b>Ðово</b> Ñа главне траке која је на горњи део прозора.</p><p>Можете да ÑтиÑнете <b>F1</b> за инÑтантни помоћ, или ићи на <a href=http://www.virtualbox.org>www.virtualbox.org</a> за задње информације и новоÑти.</p></translation> </message> <message> <source>&Virtual Media Manager...</source> @@ -9968,93 +10115,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 дан</translation> - </message> - <message> - <source>2 days</source> - <translation>2 дана</translation> - </message> - <message> - <source>3 days</source> - <translation>3 дана</translation> - </message> - <message> - <source>4 days</source> - <translation>4 дана</translation> - </message> - <message> - <source>5 days</source> - <translation>5 дана</translation> - </message> - <message> - <source>6 days</source> - <translation>6 дана</translation> - </message> - <message> - <source>1 week</source> - <translation>1 недеља</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 недеље</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 недеље</translation> - </message> - <message> - <source>1 month</source> - <translation>1 меÑец</translation> - </message> - <message> - <source>Never</source> - <translation>Ðикада</translation> - </message> - <message> - <source>Chec&k</source> - <translation>Провери</translation> - </message> - <message> - <source>&Close</source> - <translation>Затвори</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>ÐÑиÑтент ажурирања VirtualBox-а</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Проверити ажурирања</translation> - </message> - <message> - <source>Cancel</source> - <translation>Поништи</translation> - </message> - <message> - <source>Summary</source> - <translation>Резиме</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Ðађена новија верзија VirtualBox-а! Верзија <b>%1</b> је доÑтупна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Можете преузети ову верзију Ñа овим линком:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Ðемогуће добијање верзије због ове грешке:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Већ кориÑтите задњу верзију VirtualBox-а.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>ÐÑиÑтент ће Ñе привезати на Ñајту VirtualBox-а и проверити да ли има новија верзија.</p><p>КориÑтити <b>Провери</b> за проверу новије верзије или <b>Ðнулирај</b> ако нећете да проверите.</p><p>Можете покренути овај аÑиÑтент када год пожелите преко <b>Провери ажурирања...</b> Ñа менија <b>Помоћ</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts index 1a1b047f0..3c659de6c 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts @@ -1209,6 +1209,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -6162,6 +6169,36 @@ serial ports</comment> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Misslyckades med att spara den hämtade filen som <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Hämta</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">Installera</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -6209,6 +6246,17 @@ serial ports</comment> </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6524,6 +6572,18 @@ serial ports</comment> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -7247,6 +7307,109 @@ serial ports</comment> </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 dag</translation> + </message> + <message> + <source>2 days</source> + <translation>2 dagar</translation> + </message> + <message> + <source>3 days</source> + <translation>3 dagar</translation> + </message> + <message> + <source>4 days</source> + <translation>4 dagar</translation> + </message> + <message> + <source>5 days</source> + <translation>5 dagar</translation> + </message> + <message> + <source>6 days</source> + <translation>6 dagar</translation> + </message> + <message> + <source>1 week</source> + <translation>1 vecka</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 veckor</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 veckor</translation> + </message> + <message> + <source>1 month</source> + <translation>1 mÃ¥nad</translation> + </message> + <message> + <source>Never</source> + <translation>Aldrig</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">Tidsgräns för anslutningen överstegs.</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">Kunde inte hitta den senaste versionslistan pÃ¥ servern (svar: %1).</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Kontrollera</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">S&täng</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">Uppdateringsguide för VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Leta efter uppdateringar</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Denna guide kommer att ansluta till VirtualBox webbplats och kontrollera om det finns en nyare version av VirtualBox tillgänglig.</p> +<p>Använd knappen <b>Kontrollera</b> för att kontrollera om det finns en nyare version nu eller <b>Avbryt</b> om du inte vill genomföra denna kontroll.</p> +<p>Du kan köra denna guide när som helst genom att välja <b>Leta efter uppdateringar...</b> frÃ¥n menyn <b>Hjälp</b>.</p></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Avbryt</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Sammandrag</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>En ny version av VirtualBox har släppts! Version <b>%1</b> finns tillgänglig pÃ¥ <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hämta ner denna version frÃ¥n denna direktlänk:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Kunde inte hämta information om ny version pÃ¥ grund av följande nätverksfel:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Du har redan installerat den senaste versionen av VirtualBox. Repetera denna versionskontroll vid ett senare tillfälle.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Denna guide kommer att ansluta till VirtualBox webbplats och kontrollera om en nyare version av VirtualBox finns tillgänglig.</p><p>Använd knappen <b>Kontrollera</b> för att leta efter en ny version nu eller knappen <b>Avbryt</b> om du inte vill genomföra denna kontroll.</p><p>Du kan köra denna guide när som helst genom att välja <b>Leta efter uppdateringar...</b> frÃ¥n menyn <b>Hjälp</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -10931,109 +11094,6 @@ Version %1</translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 dag</translation> - </message> - <message> - <source>2 days</source> - <translation>2 dagar</translation> - </message> - <message> - <source>3 days</source> - <translation>3 dagar</translation> - </message> - <message> - <source>4 days</source> - <translation>4 dagar</translation> - </message> - <message> - <source>5 days</source> - <translation>5 dagar</translation> - </message> - <message> - <source>6 days</source> - <translation>6 dagar</translation> - </message> - <message> - <source>1 week</source> - <translation>1 vecka</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 veckor</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 veckor</translation> - </message> - <message> - <source>1 month</source> - <translation>1 mÃ¥nad</translation> - </message> - <message> - <source>Never</source> - <translation>Aldrig</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">Tidsgräns för anslutningen överstegs.</translation> - </message> - <message> - <source>Could not locate the latest version list on the server (response: %1).</source> - <translation type="obsolete">Kunde inte hitta den senaste versionslistan pÃ¥ servern (svar: %1).</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Kontrollera</translation> - </message> - <message> - <source>&Close</source> - <translation>S&täng</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>Uppdateringsguide för VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Leta efter uppdateringar</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>Denna guide kommer att ansluta till VirtualBox webbplats och kontrollera om det finns en nyare version av VirtualBox tillgänglig.</p> -<p>Använd knappen <b>Kontrollera</b> för att kontrollera om det finns en nyare version nu eller <b>Avbryt</b> om du inte vill genomföra denna kontroll.</p> -<p>Du kan köra denna guide när som helst genom att välja <b>Leta efter uppdateringar...</b> frÃ¥n menyn <b>Hjälp</b>.</p></translation> - </message> - <message> - <source>Cancel</source> - <translation>Avbryt</translation> - </message> - <message> - <source>Summary</source> - <translation>Sammandrag</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>En ny version av VirtualBox har släppts! Version <b>%1</b> finns tillgänglig pÃ¥ <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hämta ner denna version frÃ¥n denna direktlänk:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Kunde inte hämta information om ny version pÃ¥ grund av följande nätverksfel:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Du har redan installerat den senaste versionen av VirtualBox. Repetera denna versionskontroll vid ett senare tillfälle.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Denna guide kommer att ansluta till VirtualBox webbplats och kontrollera om en nyare version av VirtualBox finns tillgänglig.</p><p>Använd knappen <b>Kontrollera</b> för att leta efter en ny version nu eller knappen <b>Avbryt</b> om du inte vill genomföra denna kontroll.</p><p>Du kan köra denna guide när som helst genom att välja <b>Leta efter uppdateringar...</b> frÃ¥n menyn <b>Hjälp</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts index 51ddd0d12..29f430d67 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts @@ -1140,6 +1140,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2360,7 +2367,7 @@ </message> <message> <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Uzak Masaüstünün (VRDP Sunucu) etkin olup olmadığını gösterir (<img src=vrdp_16px.png/>) ya da (<img src=vrdp_disabled_16px.png/>).</translation> + <translation type="obsolete">Uzak Masaüstünün (VRDP Sunucu) etkin olup olmadığını gösterir (<img src=:/vrdp_16px.png/>) ya da (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> <message> <source><hr>The VRDP Server is listening on port %1</source> @@ -2373,11 +2380,11 @@ </message> <message> <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation>Misafir iÅŸletim sistemi tarafından sunucunun fare iÅŸaretçisinin yakalanıp yakalanmadığını gösterir: <br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;iÅŸaretçi yakalandı</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;iÅŸaretçi yakalandı</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;fare uyumu (MI) açık</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;fare uyumu (MI) kapalı, iÅŸaretçi yakalndı</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;fare uyumu (MI) kapalı, iÅŸaretçi yakalanmadı</nobr><br> Bu fonksiyonu kullanabilmeniz için Guest Additions yüklü olmalıdır.</translation> + <translation>Misafir iÅŸletim sistemi tarafından sunucunun fare iÅŸaretçisinin yakalanıp yakalanmadığını gösterir: <br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;iÅŸaretçi yakalandı</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;iÅŸaretçi yakalandı</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;fare uyumu (MI) açık</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;fare uyumu (MI) kapalı, iÅŸaretçi yakalndı</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;fare uyumu (MI) kapalı, iÅŸaretçi yakalanmadı</nobr><br> Bu fonksiyonu kullanabilmeniz için Guest Additions yüklü olmalıdır.</translation> </message> <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation>Misafir iÅŸletim sistemi tarafından klavyenin yakalanıp yakalanmadığını gösterir (<img src=hostkey_captured_16px.png/>) ya da (<img src=hostkey_16px.png/>).</translation> + <translation>Misafir iÅŸletim sistemi tarafından klavyenin yakalanıp yakalanmadığını gösterir (<img src=:/hostkey_captured_16px.png/>) ya da (<img src=:/hostkey_16px.png/>).</translation> </message> <message> <source>Indicates whether the Remote Desktop Server is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> @@ -4341,15 +4348,6 @@ <translation><b>%3</b>sanal makinesi için <b>%1</b> paylaşılan dizini kaldırılamadı (<nobr><b>%2</b></nobr> dizinine iÅŸaret eden).</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>Sanal Makine ekranına <b>fare ile</b> tıkladınız ya da <b>Sunucu anahtarına</b> bastınız. -Bu Sanal Makinenin fare iÅŸaretçinizi ve klavyenizi <b>yakalamasına</b> ve sunucu makinenizdeki diÄŸer uygulamalarınızın fare ve klavyenizi kullanamamasına neden olur (sadece fare iÅŸaretçisi uyumu misafir iÅŸletim sistemi tarafından desteklenmiyorsa)</p><p>Ä°stediÄŸiniz zaman <b>Sunucu anahtarına</b> basarak klavye ve fare iÅŸaretçinizi (eÄŸer yakalandıysa) <i>serbest</i> bırakabilir ve normal iÅŸlevine döndürebilirsiniz. Åžu anda kullanılan Sunucu anahtarı Sanal Makine ekranının altındaki durum çubuÄŸunda _&nbsp;<img src=hostkey_16px.png/>&nbsp; simgesinden hemen sonraki_ gösteriliyor. Bu simge ve fare simgesinin yanındaki simge, fare ve klavyenin ÅŸimdiki yakalanma durumunu gösterir.</translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p><b>Klavyeyi otomatik yakala</b> seçeneÄŸiniz etkinleÅŸtirilmiÅŸ. Bu sanal makinenin Sanal Makine ekranı etkinleÅŸtirildiÄŸinde klavyenizi otomatik olarak <b>yakalamasına</b> neden olur; klavyeniz yakalandığında tüm klavye kısayollarınız (sistem kısayollarınız da dahil, Alt-Tab gibi) sanal makineye yönlendirilir.</p><p><b>Sunucu anahtarına</b> basarak klavyenizi ve fare iÅŸaretçinizi (eÄŸer yakalandıysa) <i>serbest</i> bırakabilir ve normal iÅŸlevine döndürebilirsiniz. Åžu anda kullanılan Sunucu anahtarı Sanal Makine ekranının altındaki durum çubuÄŸunda _&nbsp;<img src=hostkey_16px.png/>&nbsp; simgesinden hemen sonraki_ gösteriliyor. Bu simge ve fare simgesinin yanındaki simge, fare ve klavyenin ÅŸimdiki yakalanma durumunu gösterir.</translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>Sanal makine misafir iÅŸletim sisteminin bu video kipinde <b>fare iÅŸaretçisi uyumunu</b> desteklemediÄŸini belirtiyor. Misafir iÅŸletim sistemi içerisinde farenizi kullanabilmeniz için farenizin misafir iÅŸletim sistemi tarafından yakalanması (Sanal Makine ekranına tıklayın ya da sunucu anahtarına basın) gerekir.</p></translation> </message> @@ -4657,11 +4655,12 @@ Bu Sanal Makinenin fare iÅŸaretçinizi ve klavyenizi <b>yakalamasına</ </message> <message> <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><p>Sanal Makine ekranına <b>fare ile</b> tıkladınız ya da <b>Sunucu anahtarına</b> bastınız. +Bu Sanal Makinenin fare iÅŸaretçinizi ve klavyenizi <b>yakalamasına</b> ve sunucu makinenizdeki diÄŸer uygulamalarınızın fare ve klavyenizi kullanamamasına neden olur (sadece fare iÅŸaretçisi uyumu misafir iÅŸletim sistemi tarafından desteklenmiyorsa)</p><p>Ä°stediÄŸiniz zaman <b>Sunucu anahtarına</b> basarak klavye ve fare iÅŸaretçinizi (eÄŸer yakalandıysa) <i>serbest</i> bırakabilir ve normal iÅŸlevine döndürebilirsiniz. Åžu anda kullanılan Sunucu anahtarı Sanal Makine ekranının altındaki durum çubuÄŸunda _&nbsp;<img src=:/hostkey_16px.png/>&nbsp; simgesinden hemen sonraki_ gösteriliyor. Bu simge ve fare simgesinin yanındaki simge, fare ve klavyenin ÅŸimdiki yakalanma durumunu gösterir.</translation> </message> <message> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><p><b>Klavyeyi otomatik yakala</b> seçeneÄŸiniz etkinleÅŸtirilmiÅŸ. Bu sanal makinenin Sanal Makine ekranı etkinleÅŸtirildiÄŸinde klavyenizi otomatik olarak <b>yakalamasına</b> neden olur; klavyeniz yakalandığında tüm klavye kısayollarınız (sistem kısayollarınız da dahil, Alt-Tab gibi) sanal makineye yönlendirilir.</p><p><b>Sunucu anahtarına</b> basarak klavyenizi ve fare iÅŸaretçinizi (eÄŸer yakalandıysa) <i>serbest</i> bırakabilir ve normal iÅŸlevine döndürebilirsiniz. Åžu anda kullanılan Sunucu anahtarı Sanal Makine ekranının altındaki durum çubuÄŸunda _&nbsp;<img src=:/hostkey_16px.png/>&nbsp; simgesinden hemen sonraki_ gösteriliyor. Bu simge ve fare simgesinin yanındaki simge, fare ve klavyenin ÅŸimdiki yakalanma durumunu gösterir.</translation> </message> <message> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> @@ -5366,6 +5365,36 @@ Bu Sanal Makinenin fare iÅŸaretçinizi ve klavyenizi <b>yakalamasına</ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>Ä°ndirilen dosyalar <nobr><b>%1</b> olarak kaydedilemedi.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">Ä°ndir</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -5405,6 +5434,17 @@ Bu Sanal Makinenin fare iÅŸaretçinizi ve klavyenizi <b>yakalamasına</ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -5738,6 +5778,18 @@ sanal sabit disk boyutu olarak rapor edilecektir.</p> </translation> <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6421,6 +6473,85 @@ bu basamağı atlayarak sabit diskleri Sanal Makine Ayarları penceresinden ekle </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 gün</translation> + </message> + <message> + <source>2 days</source> + <translation>2 gün</translation> + </message> + <message> + <source>3 days</source> + <translation>3 gün</translation> + </message> + <message> + <source>4 days</source> + <translation>4 gün</translation> + </message> + <message> + <source>5 days</source> + <translation>5 gün</translation> + </message> + <message> + <source>6 days</source> + <translation>6 gün</translation> + </message> + <message> + <source>1 week</source> + <translation>1 hafta</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 hafta</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 hafta</translation> + </message> + <message> + <source>1 month</source> + <translation>1 ay</translation> + </message> + <message> + <source>Never</source> + <translation>Asla</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">BaÄŸlantıda zaman aşımı oluÅŸtu.</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">Kontrol &Et</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Kapat</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox Güncelleme Sihirbazı</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Güncellemeleri Kontrol Et</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">Ä°ptal</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">Özet</translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">Zaten son sürüm VirtualBox kullanıyorsunuz. Lütfen daha sonra yeni sürüm kontrolü yapın.</translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -6964,14 +7095,6 @@ Version %1</source> <translation type="obsolete">&Yardım</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Misafir ekranını otomatik olarak boyutlandırma fonksiyonunun Açık (<img src=auto_resize_on_16px.png/>) yada Kapalı (<img src=auto_resize_off_16px.png/>) olduÄŸunu gösterir. Bu fonksiyonu kullanabilmeniz için Guest Additions yüklü olmalıdır.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Misafir iÅŸletim sistemi tarafından sunucunun fare iÅŸaretçisinin yakalanıp yakalanmadığını gösterir: <br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;iÅŸaretçi yakalandı</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;iÅŸaretçi yakalandı</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;fare uyumu (MI) açık</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;fare uyumu (MI) kapalı, iÅŸaretçi yakalndı</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;fare uyumu (MI) kapalı, iÅŸaretçi yakalanmadı</nobr><br> Bu fonksiyonu kullanabilmeniz için Guest Additions yüklü olmalıdır.</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">Atanmış sunucu anahtarını gösterir.<br> Sunucu anahtarına yanlız basıldığında klavye ve farenin yakalanma durumunu deÄŸiÅŸtirir. Ä°ÅŸlemlerinizi daha hızlı yapmak için ana menüden diÄŸer kullanılabilir tuÅŸ kombinasyonlarını görebilirsiniz.</translation> </message> @@ -7059,10 +7182,6 @@ Version %1</source> <translation type="obsolete">Tam masaüstü uyumu kipine geç</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">Misafir iÅŸletim sistemi tarafından klavyenin yakalanıp yakalanmadığını gösterir (<img src=hostkey_captured_16px.png/>) ya da (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>Disket sürücüsü için etkinlikleri gösterir:</nobr>%1</qt></translation> @@ -7153,10 +7272,6 @@ Version %1</source> <translation type="obsolete"><br><nobr><b>USB Denetleyici pasifleÅŸtirilmiÅŸ</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Uzak Masaüstünün (VRDP Sunucu) etkin olup olmadığını gösterir (<img src=vrdp_16px.png/>) ya da (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>Paylaşılan dizinler için etkinlikleri gösterir:</nobr>%1</qt></translation> @@ -7210,22 +7325,6 @@ Version %1</source> <translation type="obsolete">Gün&lük Kayıtları...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Misafir ekranını otomatik olarak boyutlandırma fonksiyonunun Açık (<img src=auto_resize_on_16px.png/>) yada Kapalı (<img src=auto_resize_off_16px.png/>) olduÄŸunu gösterir. Bu fonksiyonu kullanabilmeniz için Guest Additions yüklü olmalıdır.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">Misafir iÅŸletim sistemi tarafından sunucunun fare iÅŸaretçisinin yakalanıp yakalanmadığını gösterir: <br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;iÅŸaretçi yakalandı</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;iÅŸaretçi yakalandı</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;fare uyumu (MI) açık</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;fare uyumu (MI) kapalı, iÅŸaretçi yakalndı</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;fare uyumu (MI) kapalı, iÅŸaretçi yakalanmadı</nobr><br> Bu fonksiyonu kullanabilmeniz için Guest Additions yüklü olmalıdır.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> - <translation type="obsolete">Misafir iÅŸletim sistemi tarafından klavyenin yakalanıp yakalanmadığını gösterir (<img src=hostkey_captured_16px.png/>) ya da (<img src=hostkey_16px.png/>).</translation> - </message> - <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">Uzak Masaüstünün (VRDP Sunucu) etkin olup olmadığını gösterir (<img src=vrdp_16px.png/>) ya da (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">Atanmış sunucu anahtarını gösterir.<br> Sunucu anahtarına yanlız basıldığında klavye ve farenin yakalanma durumunu deÄŸiÅŸtirir. Ä°ÅŸlemlerinizi daha hızlı yapmak için ana menüden diÄŸer kullanılabilir tuÅŸ kombinasyonlarını görebilirsiniz.</translation> </message> @@ -10249,10 +10348,6 @@ to the system default language.</qt> <translation>Seçili sanal makineyi baÅŸlat</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>VirtualBox Uygulamasına HoÅŸgeldiniz!</h3><p>Bu pencerenin sol tarafı bilgisayarınızdaki sanal iÅŸletim sistemlerinin tümünün listesini gösterir. Liste ÅŸimdi boÅŸ çünkü henüz bir sanal makine oluÅŸturmadınız.<img src=welcome.png align=right/></p><p>Yeni bir sanal makine oluÅŸturmak için pencerenin yukarısındaki ana araç çubuÄŸunda bulunan <b>Yeni</b> düğmesine tıklayın.</p><p>Ayrıca <b>%1</b> tuÅŸuna basarak yardım alabilirsiniz ya da en yeni bilgileri ve haberleri almak için <a href=http://www.virtualbox.org>www.virtualbox.org</a> adresini ziyaret edebilirsiniz.</p></translation> - </message> - <message> <source>&Machine</source> <translation>&Makine</translation> </message> @@ -10310,7 +10405,7 @@ to the system default language.</qt> </message> <message> <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation></translation> + <translation type="unfinished"><h3>VirtualBox Uygulamasına HoÅŸgeldiniz!</h3><p>Bu pencerenin sol tarafı bilgisayarınızdaki sanal iÅŸletim sistemlerinin tümünün listesini gösterir. Liste ÅŸimdi boÅŸ çünkü henüz bir sanal makine oluÅŸturmadınız.<img src=:/welcome.png align=right/></p><p>Yeni bir sanal makine oluÅŸturmak için pencerenin yukarısındaki ana araç çubuÄŸunda bulunan <b>Yeni</b> düğmesine tıklayın.</p><p>Ayrıca <b>%1</b> tuÅŸuna basarak yardım alabilirsiniz ya da en yeni bilgileri ve haberleri almak için <a href=http://www.virtualbox.org>www.virtualbox.org</a> adresini ziyaret edebilirsiniz.</p></translation> </message> <message> <source>&Virtual Media Manager...</source> @@ -11012,97 +11107,6 @@ eÅŸleÅŸebilir.</qt></translation> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 gün</translation> - </message> - <message> - <source>2 days</source> - <translation>2 gün</translation> - </message> - <message> - <source>3 days</source> - <translation>3 gün</translation> - </message> - <message> - <source>4 days</source> - <translation>4 gün</translation> - </message> - <message> - <source>5 days</source> - <translation>5 gün</translation> - </message> - <message> - <source>6 days</source> - <translation>6 gün</translation> - </message> - <message> - <source>1 week</source> - <translation>1 hafta</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 hafta</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 hafta</translation> - </message> - <message> - <source>1 month</source> - <translation>1 ay</translation> - </message> - <message> - <source>Never</source> - <translation>Asla</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">BaÄŸlantıda zaman aşımı oluÅŸtu.</translation> - </message> - <message> - <source>Chec&k</source> - <translation>Kontrol &Et</translation> - </message> - <message> - <source>&Close</source> - <translation>&Kapat</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox Güncelleme Sihirbazı</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Güncellemeleri Kontrol Et</translation> - </message> - <message> - <source>Cancel</source> - <translation>Ä°ptal</translation> - </message> - <message> - <source>Summary</source> - <translation>Özet</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>Zaten son sürüm VirtualBox kullanıyorsunuz. Lütfen daha sonra yeni sürüm kontrolü yapın.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts index 7f0e92a12..be67b51d1 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts @@ -193,11 +193,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>Скопіювати вÑÑ– помилки до буфера</translation> </message> <message> <source>Copy</source> - <translation type="unfinished">Скопіювати</translation> + <translation>Скопіювати</translation> </message> </context> <context> @@ -688,7 +688,7 @@ </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translation>Сполучені бази Ð´Ð»Ñ %1 Ñ– %2</translation> </message> </context> <context> @@ -719,7 +719,7 @@ </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>Якщо позначено, нову унікальну адреÑу MAC буде призначено Ð´Ð»Ñ Ð²ÑÑ–Ñ… налаштованих мережевих плат.</translation> </message> </context> <context> @@ -758,54 +758,54 @@ </message> <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>Повний клон</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>Сполучений клон</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>Будь лаÑка, виберіть тип клонуваннÑ.</p><p>Якщо вибрати <b>Повний клон</b>, буде Ñтворено точну копію (зокрема вÑÑ– образи віртуальних диÑків) первинної віртуальної машиниof. Якщо вибрати <b>Сполучений клон</b>, буде Ñтворено нову віртуальну машину, але образи віртуального диÑка будуть ÑпрÑмовані на образи з первинної віртуальної машини.</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>Завважте, нові зрізи у джерелі віртуальної машини Ñтворено внаÑлідок вибору <b>Сполучений клон</b>.</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished">Поточний Ñтан машини</translation> + <translation>Поточний Ñтан машини</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished">Стани поточної машини Ñ– Ñ—Ñ— підпорÑдованих</translation> + <translation>Стани поточної машини Ñ– Ñ—Ñ— підпорÑдованих</translation> </message> <message> <source>All states</source> - <translation type="unfinished">УÑÑ– Ñтани</translation> + <translation>УÑÑ– Ñтани</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished">ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ</translation> + <translation>ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished">Будь лаÑка, виберіть, Ñкі чаÑтини віртуальної машини Ñлід клонувати.</translation> + <translation>Будь лаÑка, виберіть, Ñкі чаÑтини віртуальної машини Ñлід клонувати.</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished">Якщо вибрати <b>Поточний Ñтан машини</b>, клонуєтьÑÑ Ð»Ð¸ÑˆÐµ поточний Ñтан віртуальної машини.</translation> + <translation>Якщо вибрати <b>Поточний Ñтан машини</b>, клонуєтьÑÑ Ð»Ð¸ÑˆÐµ поточний Ñтан віртуальної машини.</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished">Якщо вибрати <b>Стани поточної машини Ñ– Ñ—Ñ— підпорÑдованих</b>, клонуєтьÑÑ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ñтан віртуальної машини Ñ– певні зрізи.</translation> + <translation>Якщо вибрати <b>Стани поточної машини Ñ– Ñ—Ñ— підпорÑдованих</b>, клонуєтьÑÑ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ñтан віртуальної машини Ñ– певні зрізи.</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished">Якщо вибрати <b>УÑÑ– Ñтани</b>, клонуєтьÑÑ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ñтан машини Ñ– вÑÑ– зрізи.</translation> + <translation>Якщо вибрати <b>УÑÑ– Ñтани</b>, клонуєтьÑÑ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ñтан машини Ñ– вÑÑ– зрізи.</translation> </message> </context> <context> @@ -1154,6 +1154,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation>Вибрати теку Ð´Ð»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ñ Ð² неї %1</translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -2261,23 +2268,23 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Left Shift</source> - <translation type="unfinished">Лівий Shift</translation> + <translation>Лівий Shift</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished">Правий Shift</translation> + <translation>Правий Shift</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished">Лівий Ctrl</translation> + <translation>Лівий Ctrl</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished">Правий Ctrl</translation> + <translation>Правий Ctrl</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished">Лівий Alt</translation> + <translation>Лівий Alt</translation> </message> <message> <source>Right Alt</source> @@ -4047,7 +4054,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation type="unfinished">Якщо позначено, це Ñтримувати Ð´ÐµÐ¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð¾ÑÑ–Ñ, коли гоÑьова ÑиÑтема виштовхуватиме його.</translation> + <translation>Якщо позначено, віртуальний диÑк не буде вилучено, коли його витÑгнуто з гоÑтьової ÑиÑтеми.</translation> </message> <message> <source>&Live CD/DVD</source> @@ -4055,7 +4062,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>When checked the guest system will see the virtual disk as a solid state device.</source> - <translation type="unfinished">Якщо позначено, це залишить ноÑій Ñк необертову пам'ÑÑ‚ÑŒ (SSD).</translation> + <translation>Якщо позначено, гоÑтьова ÑиÑтема бачитиме віртуальні диÑк Ñк твердотільний приÑтрій.</translation> </message> <message> <source>&Solid-state drive</source> @@ -4093,11 +4100,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Port Count:</source> - <translation type="unfinished"></translation> + <translation>КількіÑÑ‚ÑŒ &портів:</translation> </message> <message> <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source> - <translation type="unfinished"></translation> + <translation>Вибирає кількіÑÑ‚ÑŒ портів контролера пам'ÑÑ‚Ñ– SATA, Ñк5Ñ– поточно вибрано в дереві пам'ÑÑ‚Ñ–. Потрібно вказати щонайменше на один більше за найвищу кількіÑÑ‚ÑŒ можливих у викориÑтанні потрів.</translation> </message> </context> <context> @@ -4283,7 +4290,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source> - <translation type="unfinished">Визначає тип комплекту мікроÑхем, Ñкі викориÑтовуєтьÑÑ Ñƒ віртуальній машині.</translation> + <translation>Вибирає ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ Ð¼Ñ–ÐºÑ€Ð¾Ñхем, що емулюватимутьÑÑ Ñƒ віртуальній машині. Зауважте, ÐµÐ¼ÑƒÐ»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¼Ñ–ÐºÑ€Ð¾Ñхеми ICH9 Ñ” екÑперементальною й не рекомендуєтьÑÑ, крім гоÑтьових ÑиÑтем (наприклад, Mac OS X), Ñкі потребують цього.</translation> </message> <message> <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> @@ -4317,7 +4324,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>ви вакзали ти комплекÑу мікроÑхем ICH9 Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— віртуальної машини. Це не буде працювати коректно, поки паралельно увімкнено IO-APIC. Це буде здійÑнено автоматично, коли натиÑнете «Гаразд» у налаштуваннÑÑ… віртуальної машини.</translation> </message> </context> <context> @@ -5777,7 +5784,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> - <translation type="unfinished">Стан віртуальної машиний, Ñку ви зараз редагуєте, змінено. Щоб зберегти лише Ñ‚Ñ– налаштуваннÑ, Ñкі можна редагувати при роботі машини, натиÑніть «Гаразд». УÑÑ– інші зміни буде втрачено.</translation> + <translation>Віртуальну машину, що ви змінюєте, запущено. Лише певні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° змінити протÑгом роботи машини. УÑÑ– зміни буде втрачено, Ñкщо закрити вікно зараз.</translation> </message> <message> <source>Failed to clone the virtual machine <b>%1</b>.</source> @@ -5825,11 +5832,41 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>Ðеможливо знайти зіріз з назвою <b>%1</b>.</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="unfinished"><p>Ðе вдалоÑÑŒ зберегти звантажений файл Ñк <nobr><b>%1</b>.</nobr></p></translation> + <translation><p>Ðе вдалоÑÑŒ зберегти звантажений файл Ñк <nobr><b>%1</b>.</nobr></p></translation> + </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation><p>Стару верÑÑ–ÑŽ (%1) <b><nobr>%2</nobr></b> вÑтановлено.</p><p>Звантажити найновішу через інтернет?</p></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation>Звантажити</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation><p>Звантажити <b><nobr>%1</nobr></b> з <nobr><a href="%2">%2</a></nobr> (розміром %3 байтів)?</p></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation><p><b><nobr>%1</nobr></b> уÑпішно звантажено з <nobr><a href="%2">%2</a></nobr> Ñ– збережено локально Ñк <nobr><b>%3</b>.</nobr></p><p>УÑтановити пакунок розширеннÑ?</p></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation>УÑтановити</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation><p><b><nobr>%1</nobr></b> уÑпішно звантажено з <nobr><a href="%2">%2</a></nobr>, однак неможливо зберегти локально Ñк <nobr><b>%3</b>.</nobr></p><p>Будь лаÑка, виберіть іншу адреÑу Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð°.</p></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation><p>Ðе вдалоÑÑŒ звантажити <b><nobr>%1</nobr></b> з <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></translation> </message> </context> <context> @@ -5870,11 +5907,22 @@ p, li { white-space: pre-wrap; } <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished">СкаÑувати Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð·Ñƒ CD гоÑтьових доповнень VirtualBox</translation> + <translation>СкаÑувати Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð·Ñƒ CD гоÑтьових доповнень VirtualBox</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished">Ð—Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð·Ñƒ CD віртуальних доповнень VirtualBox з <nobr><b>%1</b>...</nobr></translation> + <translation>Ð—Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð·Ñƒ CD віртуальних доповнень VirtualBox з <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation>СкаÑувати Ð·Ð²Ð°Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ <nobr><b>%1</b></nobr></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation>Ð—Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ <nobr><b>%1</b></nobr> з <nobr><b>%2</b>…</nobr></translation> </message> </context> <context> @@ -6110,7 +6158,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> - <translation type="unfinished">ÐатиÑніть кнопку <b>Вибрати</b>, щоб вибрати адреÑу файла Ð´Ð»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… віртуального диÑка, або введіть назву файла в полі.</translation> + <translation>Будь лаÑка, введіть назву нового файла віртуального диÑка в коробку, що нижче, або натиніть на піктограму теки, щоб вибрати іншу теку Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° в ній.</translation> </message> <message> <source><nobr>%1 (%2 B)</nobr></source> @@ -6142,6 +6190,18 @@ p, li { white-space: pre-wrap; } <comment>summary</comment> <translation>Подробиці</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation>H&DD (паралельний жорÑткий диÑк)</translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation>Q&ED (розширений диÑк QEMU)</translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation>&QCOW (ÐºÐ¾Ð¿Ñ–Ñ Ð½Ð° Ð·Ð°Ð¿Ð¸Ñ QEMU)</translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -6505,11 +6565,11 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">З&авантажувальний жорÑткий диÑк</translation> + <translation>За&пуÑкальний диÑк</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>Виберіть жорÑткий диÑк, Ñкий буде завантажувальним Ð´Ð»Ñ Ð²Ñ–Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ñ— машини. Ви можете або Ñтворити новий жорÑткий диÑк, або вибрати наÑвний зі Ñпадного ÑпиÑку або натиÑнувши відповідну кнопку (щоб викликати потрібне вікно).</p><p>Якщо вам потрібно Ñкладніші Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¶Ð¾Ñ€Ñткого диÑка, можна також пропуÑтити цей крок Ñ– під'єднати жорÑткі диÑки викориÑтовуючи діалог налаштувань віртуальної машини.</p></translation> + <translation><p>Якщо бажаєте, можете зараз додати запуÑкальний диÑк до нової машини. Можете Ñк Ñтворити новий віртуальний диÑк, так Ñ– вибрати його зі ÑпиÑку або з іншої міÑцÑ, викориÑтовуючи піктограму теки.</p><p>Якщо потрібно більше налаштувань віртуального диÑка, можете пропуÑтити цей крок Ñ– зробити зміни у налаштуваннÑÑ… опіÑÐ»Ñ Ñ—Ñ— ÑтвореннÑ.</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -6517,7 +6577,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">Рекомендований розмір завантажувального жорÑткого диÑка — <b>%1</b>.</translation> + <translation>Рекомендований розмір запуÑкального диÑка — <b>%1</b>.</translation> </message> </context> <context> @@ -6553,7 +6613,7 @@ p, li { white-space: pre-wrap; } <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">Завантажувальний жорÑткий диÑк</translation> + <translation>ЗапуÑкальний диÑк</translation> </message> <message> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> @@ -6840,6 +6900,93 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 день</translation> + </message> + <message> + <source>2 days</source> + <translation>2 дні</translation> + </message> + <message> + <source>3 days</source> + <translation>3 дні</translation> + </message> + <message> + <source>4 days</source> + <translation>4 дні</translation> + </message> + <message> + <source>5 days</source> + <translation>5 днів</translation> + </message> + <message> + <source>6 days</source> + <translation>6 днів</translation> + </message> + <message> + <source>1 week</source> + <translation>1 тиждень</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 тижні</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 тижні</translation> + </message> + <message> + <source>1 month</source> + <translation>1 міÑÑць</translation> + </message> + <message> + <source>Never</source> + <translation>Ðіколи</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">&Перевірити</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">&Закрити</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">МайÑтер оновлень VirtualBox</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">Перевірити на оновленнÑ</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">СкаÑувати</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">ПідÑумок</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>Вийшла нова верÑÑ–Ñ VirtualBox! ВерÑÑ–Ñ <b>%1</b> доÑтупна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Ви можете звантажити цю верÑÑ–ÑŽ прÑмим поÑиланнÑм:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>Ðеможливо отримати інформацію про нову верÑÑ–ÑŽ через таку мережеву помилку:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">У Ð²Ð°Ñ ÑƒÐ¶Ðµ вÑтановлена оÑÑ‚Ð°Ð½Ð½Ñ Ð²ÐµÑ€ÑÑ–Ñ VirtualBox. Будь лаÑка, Ñпробуйте перевірити верÑÑ–ÑŽ пізніше.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>Цей майÑтер з'єднаєтьÑÑ Ð· Ñайтом VirtualBox Ñ– перевірить, чи доÑтупна найновіша верÑÑ–Ñ VirtualBox.</p><p>ВикориÑтайте кнопку <b>Перевірити</b>, щоб перевірити на нову верÑÑ–ÑŽ зараз або кнопку <b>СкаÑувати</b>, Ñкщо ви не бажаєте здійÑнювати цю перевірку.</p><p>Ви можете запуÑтити цього майÑтра в будь-Ñкий Ñ‡Ð°Ñ Ð²Ð¸Ð±Ð¸Ñ€Ð°ÑŽÑ‡Ð¸ <b>Перевірити на оновленнÑ...</b> з меню <b>Довідка</b>.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -10236,93 +10383,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 день</translation> - </message> - <message> - <source>2 days</source> - <translation>2 дні</translation> - </message> - <message> - <source>3 days</source> - <translation>3 дні</translation> - </message> - <message> - <source>4 days</source> - <translation>4 дні</translation> - </message> - <message> - <source>5 days</source> - <translation>5 днів</translation> - </message> - <message> - <source>6 days</source> - <translation>6 днів</translation> - </message> - <message> - <source>1 week</source> - <translation>1 тиждень</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 тижні</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 тижні</translation> - </message> - <message> - <source>1 month</source> - <translation>1 міÑÑць</translation> - </message> - <message> - <source>Never</source> - <translation>Ðіколи</translation> - </message> - <message> - <source>Chec&k</source> - <translation>&Перевірити</translation> - </message> - <message> - <source>&Close</source> - <translation>&Закрити</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>МайÑтер оновлень VirtualBox</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>Перевірити на оновленнÑ</translation> - </message> - <message> - <source>Cancel</source> - <translation>СкаÑувати</translation> - </message> - <message> - <source>Summary</source> - <translation>ПідÑумок</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>Вийшла нова верÑÑ–Ñ VirtualBox! ВерÑÑ–Ñ <b>%1</b> доÑтупна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Ви можете звантажити цю верÑÑ–ÑŽ прÑмим поÑиланнÑм:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>Ðеможливо отримати інформацію про нову верÑÑ–ÑŽ через таку мережеву помилку:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>У Ð²Ð°Ñ ÑƒÐ¶Ðµ вÑтановлена оÑÑ‚Ð°Ð½Ð½Ñ Ð²ÐµÑ€ÑÑ–Ñ VirtualBox. Будь лаÑка, Ñпробуйте перевірити верÑÑ–ÑŽ пізніше.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>Цей майÑтер з'єднаєтьÑÑ Ð· Ñайтом VirtualBox Ñ– перевірить, чи доÑтупна найновіша верÑÑ–Ñ VirtualBox.</p><p>ВикориÑтайте кнопку <b>Перевірити</b>, щоб перевірити на нову верÑÑ–ÑŽ зараз або кнопку <b>СкаÑувати</b>, Ñкщо ви не бажаєте здійÑнювати цю перевірку.</p><p>Ви можете запуÑтити цього майÑтра в будь-Ñкий Ñ‡Ð°Ñ Ð²Ð¸Ð±Ð¸Ñ€Ð°ÑŽÑ‡Ð¸ <b>Перевірити на оновленнÑ...</b> з меню <b>Довідка</b>.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts index 19ba741db..c98d0a55e 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts @@ -949,6 +949,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4369,6 +4376,36 @@ <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetUserManual</name> @@ -4397,6 +4434,17 @@ </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -4570,6 +4618,18 @@ <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -4937,6 +4997,53 @@ </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>4 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>5 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>6 days</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 week</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>2 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>3 weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>1 month</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Never</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -6998,93 +7105,6 @@ </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>4 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>5 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>6 days</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 week</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>2 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>3 weeks</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>1 month</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Never</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Chec&k</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>&Close</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Check for Updates</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Cancel</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation type="unfinished"></translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>VBoxVMInformationDlg</name> <message> <source>%1 - Session Information</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts index dc531a08c..7aca4a55d 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts @@ -1167,6 +1167,13 @@ </message> </context> <context> + <name>UIDownloaderExtensionPack</name> + <message> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> @@ -4939,18 +4946,6 @@ p, li { white-space: pre-wrap; } <translation>从虚拟电脑 <b>%3</b> åˆ é™¤æ•°æ®ç©ºé—´ <b>%1</b> (æŒ‡å‘ <nobr><b>%2</b></nobr>) 失败.</translation> </message> <message> - <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>é¼ æ ‡å’Œé”®ç›˜å·²è¢«æœ¬è™šæ‹Ÿç”µè„‘æ•èŽ·ï¼ŒæŒ‰<b>host key</b>å¯é‡Šæ”¾å®ƒä»¬ï¼Œè¯¥é”®æ˜¾ç¤ºåœ¨&nbsp;<img src=hostkey_16px.png/>&nbsp;å›¾æ ‡è¾¹ä¸Š.</p></translation> - </message> - <message> - <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> 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&nbsp;<img src=hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> - <translation type="obsolete"><p>é¼ æ ‡å’Œé”®ç›˜å·²è¢«æœ¬è™šæ‹Ÿç”µè„‘æ•èŽ·ï¼ŒæŒ‰<b>host key</b>å¯é‡Šæ”¾å®ƒä»¬ï¼Œè¯¥é”®æ˜¾ç¤ºåœ¨&nbsp;<img src=hostkey_16px.png/>&nbsp;å›¾æ ‡è¾¹ä¸Š.</p></translation> - </message> - <message> - <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: 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.</p></source> - <translation type="obsolete"><p>é¼ æ ‡å’Œé”®ç›˜å·²è¢«æœ¬è™šæ‹Ÿç”µè„‘æ•èŽ·ï¼ŒæŒ‰<b>host key</b>å¯é‡Šæ”¾å®ƒä»¬ï¼Œè¯¥é”®æ˜¾ç¤ºåœ¨&nbsp;<img src=hostkey_16px.png/>&nbsp;å›¾æ ‡è¾¹ä¸Š.</p></translation> - </message> - <message> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>当å‰è™šæ‹Ÿç”µè„‘ä¸çš„系统ä¸æ”¯æŒé¼ æ ‡è‡ªåŠ¨åˆ‡æ¢ï¼Œéœ€è¦é€šè¿‡<b>host key</b>手动切æ¢.</p></translation> </message> @@ -6120,6 +6115,36 @@ p, li { white-space: pre-wrap; } <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> <translation type="unfinished"><p>æ— æ³•å°†ä¸‹è½½çš„æ–‡ä»¶ä¿å˜ä¸º <nobr><b>%1</b>.</nobr></p></translation> </message> + <message> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">下载</translation> + </message> + <message> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UIMiniProcessWidgetAdditions</name> @@ -6163,6 +6188,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> @@ -6539,6 +6575,18 @@ time depending on the image size and the write performance of your harddisk.< <comment>summary</comment> <translation type="unfinished"></translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -7233,6 +7281,109 @@ step and attach hard disks later using the VM Settings dialog.</p></source </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 天</translation> + </message> + <message> + <source>2 days</source> + <translation>2 天</translation> + </message> + <message> + <source>3 days</source> + <translation>3 天</translation> + </message> + <message> + <source>4 days</source> + <translation>4 天</translation> + </message> + <message> + <source>5 days</source> + <translation>5 天</translation> + </message> + <message> + <source>6 days</source> + <translation>6 天</translation> + </message> + <message> + <source>1 week</source> + <translation>1 星期</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 星期</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 星期</translation> + </message> + <message> + <source>1 month</source> + <translation>1 个月</translation> + </message> + <message> + <source>Never</source> + <translation>从ä¸</translation> + </message> + <message> + <source>Connection timed out.</source> + <translation type="obsolete">连接超时.</translation> + </message> + <message> + <source>Could not locate the latest version list on the server (response: %1).</source> + <translation type="obsolete">æ— æ³•åœ¨æœåŠ¡å™¨ä¸Šæ‰¾åˆ°æœ€æ–°çš„版本列表 (回å¤: %1).</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">检测(&k)</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">å…³é—(&C)</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox å‡çº§å‘导</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">查找å‡çº§ä¿¡æ¯</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> +<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> +<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>该å‘导将连接到VirtualBoxæœåŠ¡å™¨ï¼Œä»¥æ£€æµ‹æ˜¯å¦æœ‰æ–°ç‰ˆæœ¬ã€‚</p> +<p>按 <b>检测</b> 按钮以查看现在是å¦æœ‰æ–°çš„版本，或者按 <b>å–消</b> æŒ‰é’®ï¼Œå¦‚æžœä½ çŽ°åœ¨ä¸æƒ³æ‰§è¡Œè¯¥æ£€æµ‹ã€‚</p> +<p>åœ¨ä»»ä½•æ—¶å€™ä½ éƒ½å¯ä»¥é€šè¿‡æŒ‰ <b>帮助</b> èœå•ä¸çš„ <b>检测更新...</b> æ¥è¿è¡Œæœ¬å‘导.</p></translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">å–消</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">摘è¦</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>一个新版的VirtualBoxå·²å‘布! 版本 <b>%1</b> ä½äºŽ <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>ä½ å¯ä»¥ä»Žè¿™ä¸ªè¿žä½ç½®ç›´æŽ¥ä¸‹è½½:</p><p><a href=%2>%3</a></p></translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>æ— æ³•èŽ·å–有关新版本的信æ¯ï¼Œå› 为如下网络错误:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">当å‰ç‰ˆæœ¬å³ä¸ºæœ€æ–°ç‰ˆï¼Œè¯·ä»¥åŽå†æ¥æ£€æŸ¥.</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>该å‘导将连接到虚拟电脑控制å°çš„主站点，以检测是å¦æœ‰æ–°ç‰ˆæœ¬ã€‚</p><p>按 <b>检测</b> 按钮以查看现在是å¦æœ‰æ–°çš„版本，或者按 <b>å–消</b> æŒ‰é’®ï¼Œå¦‚æžœä½ çŽ°åœ¨ä¸æƒ³æ‰§è¡Œè¯¥æ£€æµ‹ã€‚</p><p>åœ¨ä»»ä½•æ—¶å€™ä½ éƒ½å¯ä»¥é€šè¿‡æŒ‰ <b>帮助</b> èœå•ä¸çš„ <b>检测更新...</b> æ¥è¿è¡Œæœ¬å‘导.</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -7839,18 +7990,6 @@ Version %1</translation> <translation type="obsolete">帮助(&H)</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=auto_resize_on_16px.png/>) or Off (<img src=auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">指示自动调整显示尺寸功能已 å¯ç”¨ (<img src=auto_resize_on_16px.png/>) 或ç¦ç”¨ (<img src=auto_resize_off_16px.png/>).</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">指示当å‰é¼ æ ‡çŠ¶æ€:<br><nobr><img src=mouse_disabled_16px.png/>&nbsp;&nbsp;é¼ æ ‡æœªè¢«æ•èŽ·</nobr><br><nobr><img src=mouse_16px.png/>&nbsp;&nbsp;é¼ æ ‡å·²è¢«æ•èŽ·</nobr><br><nobr><img src=mouse_seamless_16px.png/>&nbsp;&nbsp;é¼ æ ‡é›†æˆå·²å¼€å¯</nobr><br><nobr><img src=mouse_can_seamless_16px.png/>&nbsp;&nbsp;é¼ æ ‡è‡ªåŠ¨æ•èŽ·å·²å…³é—ï¼Œé¼ æ ‡å·²è¢«æ•èŽ·</nobr><br><nobr><img src=mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;é¼ æ ‡è‡ªåŠ¨æ•èŽ·å·²å…³é—ï¼Œé¼ æ ‡æœªè¢«æ•èŽ·</nobr><br>.</translation> - </message> - <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)</source> - <translation type="obsolete">指示键盘已被虚拟电脑æ•èŽ· (<img src=hostkey_captured_16px.png/>) 或未被æ•èŽ· (<img src=hostkey_16px.png/>)</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">当å‰ç»„åˆé”®.</translation> </message> @@ -7864,8 +8003,8 @@ Version %1</translation> <translation type="obsolete"><br>[<b>没有分é…</b>]</translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>)</source> - <translation type="obsolete">指示远程桌é¢æœåŠ¡ (VRDP Server) å·²å¯ç”¨ (<img src=vrdp_16px.png/>) 或被ç¦ç”¨ (<img src=vrdp_disabled_16px.png/>)</translation> + <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>)</source> + <translation type="obsolete">指示远程桌é¢æœåŠ¡ (VRDP Server) å·²å¯ç”¨ (<img src=:/vrdp_16px.png/>) 或被ç¦ç”¨ (<img src=:/vrdp_disabled_16px.png/>)</translation> </message> <message> <source><hr>The VRDP Server is listening on port %1</source> @@ -7970,10 +8109,6 @@ Version %1</translation> <translation type="obsolete">切æ¢åˆ°æ— ç¼æ¨¡å¼</translation> </message> <message> - <source>Indicates whether the keyboard is captured by the guest OS (<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>).</source> - <translation type="obsolete">指示键盘å¯ç”¨ (<img src=hostkey_captured_16px.png/>) æˆ–é”®ç›˜æ— æ•ˆ (<img src=hostkey_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation type="obsolete"><qt><nobr>指示软驱活动状æ€:</nobr>%1</qt></translation> @@ -8064,10 +8199,6 @@ Version %1</translation> <translation type="obsolete"><br><nobr><b>USB控制器已被ç¦ç”¨</b></nobr></translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=vrdp_16px.png/>) or not (<img src=vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">æŒ‡ç¤ºè¿œç¨‹æ¡Œé¢ (VRDP Server) å·²å¯ç”¨ (<img src=vrdp_16px.png/>) 或未å¯ç”¨ (<img src=vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation type="obsolete"><qt><nobr>指示数æ®ç©ºé—´æ´»åŠ¨çŠ¶æ€:</nobr>%1</qt></translation> @@ -8125,22 +8256,10 @@ Version %1</translation> <translation type="obsolete">ä¿å˜æ—¥å¿—(&L)...</translation> </message> <message> - <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">指示自动调整显示尺寸功能是å¦å·² å¯ç”¨ (<img src=:/auto_resize_on_16px.png/>) 或 ç¦ç”¨ (<img src=:/auto_resize_off_16px.png/>).请注æ„该功能需è¦åœ¨è™šæ‹Ÿç”µè„‘çš„æ“作系统内安装增强功能包.</translation> - </message> - <message> - <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> - <translation type="obsolete">æŒ‡ç¤ºé¼ æ ‡è¢«æ“作系统æ•èŽ·çš„情况:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;é¼ æ ‡æœªè¢«æ•èŽ·</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;é¼ æ ‡å·²è¢«æ•èŽ·</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;é¼ æ ‡é›†æˆåŠŸèƒ½å·²å¯ç”¨</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;é¼ æ ‡é›†æˆåŠŸèƒ½å·²å…³é—ï¼Œé¼ æ ‡å·²è¢«æ•èŽ·</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;é¼ æ ‡é›†æˆåŠŸèƒ½å·²å…³é—ï¼Œé¼ æ ‡æœªè¢«æ•èŽ·</nobr><br>请注æ„è¦ä½¿ç”¨é¼ æ ‡é›†æˆåŠŸèƒ½å¿…须在虚拟电脑的æ“作系统内安装增强功能包.</translation> - </message> - <message> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> <translation type="obsolete">指示键盘已被虚拟电脑æ•èŽ· (<img src=:/hostkey_captured_16px.png/>) 或未被æ•èŽ· (<img src=:/hostkey_16px.png/>).</translation> </message> <message> - <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> - <translation type="obsolete">指示远程桌é¢æœåŠ¡ (VRDP Server) å·²å¯ç”¨ (<img src=:/vrdp_16px.png/>) 或被ç¦ç”¨ (<img src=:/vrdp_disabled_16px.png/>).</translation> - </message> - <message> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation type="obsolete">显示当å‰åˆ†é…的组åˆé”®.<br>å•ç‹¬ä½¿ç”¨è¯¥é”®ï¼Œå¯ç”¨äºŽåˆ‡æ¢è™šæ‹Ÿç”µè„‘å†…é”®ç›˜å’Œé¼ æ ‡çš„æ•èŽ·çŠ¶æ€. 与其它键è”åˆä½¿ç”¨ï¼Œå¯å¿«é€Ÿæ‰§è¡Œä¸€äº›å¸¸ç”¨æ“作.</translation> </message> @@ -11511,10 +11630,6 @@ to the system default language.</qt> <translation>å¯åŠ¨æ‰€é€‰çš„虚拟电脑</translation> </message> <message> - <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>F1</b> key to get instant help, or visit <a href=http://www.virtualbox.org>www.virtualbox.org</a> for the latest information and news.</p></source> - <translation type="obsolete"><h3>欢迎使用虚拟电脑控制å°!</h3><p>窗å£çš„左边用æ¥æ˜¾ç¤ºå·²ç”Ÿæˆçš„虚拟电脑列表. çŽ°åœ¨åˆ—è¡¨æ˜¯ç©ºçš„ï¼Œå› ä¸ºä½ è¿˜æ²¡æœ‰æ–°å»ºä»»ä½•è™šæ‹Ÿç”µè„‘.<img src=welcome.png align=right/></p><p>è¦æ–°å»ºä¸€ä¸ªè™šæ‹Ÿç”µè„‘, 请按 <b>新建</b> 按钮， 它ä½äºŽçª—å£é¡¶éƒ¨çš„主工具æ .</p></translation> - </message> - <message> <source>&Machine</source> <translation>控制(&M)</translation> </message> @@ -12368,109 +12483,6 @@ value.</qt></source> </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 天</translation> - </message> - <message> - <source>2 days</source> - <translation>2 天</translation> - </message> - <message> - <source>3 days</source> - <translation>3 天</translation> - </message> - <message> - <source>4 days</source> - <translation>4 天</translation> - </message> - <message> - <source>5 days</source> - <translation>5 天</translation> - </message> - <message> - <source>6 days</source> - <translation>6 天</translation> - </message> - <message> - <source>1 week</source> - <translation>1 星期</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 星期</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 星期</translation> - </message> - <message> - <source>1 month</source> - <translation>1 个月</translation> - </message> - <message> - <source>Never</source> - <translation>从ä¸</translation> - </message> - <message> - <source>Connection timed out.</source> - <translation type="obsolete">连接超时.</translation> - </message> - <message> - <source>Could not locate the latest version list on the server (response: %1).</source> - <translation type="obsolete">æ— æ³•åœ¨æœåŠ¡å™¨ä¸Šæ‰¾åˆ°æœ€æ–°çš„版本列表 (回å¤: %1).</translation> - </message> - <message> - <source>Chec&k</source> - <translation>检测(&k)</translation> - </message> - <message> - <source>&Close</source> - <translation>å…³é—(&C)</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox å‡çº§å‘导</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>查找å‡çº§ä¿¡æ¯</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p> -<p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p> -<p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation type="obsolete"><p>该å‘导将连接到VirtualBoxæœåŠ¡å™¨ï¼Œä»¥æ£€æµ‹æ˜¯å¦æœ‰æ–°ç‰ˆæœ¬ã€‚</p> -<p>按 <b>检测</b> 按钮以查看现在是å¦æœ‰æ–°çš„版本，或者按 <b>å–消</b> æŒ‰é’®ï¼Œå¦‚æžœä½ çŽ°åœ¨ä¸æƒ³æ‰§è¡Œè¯¥æ£€æµ‹ã€‚</p> -<p>åœ¨ä»»ä½•æ—¶å€™ä½ éƒ½å¯ä»¥é€šè¿‡æŒ‰ <b>帮助</b> èœå•ä¸çš„ <b>检测更新...</b> æ¥è¿è¡Œæœ¬å‘导.</p></translation> - </message> - <message> - <source>Cancel</source> - <translation>å–消</translation> - </message> - <message> - <source>Summary</source> - <translation>摘è¦</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>一个新版的VirtualBoxå·²å‘布! 版本 <b>%1</b> ä½äºŽ <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>ä½ å¯ä»¥ä»Žè¿™ä¸ªè¿žä½ç½®ç›´æŽ¥ä¸‹è½½:</p><p><a href=%2>%3</a></p></translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>æ— æ³•èŽ·å–有关新版本的信æ¯ï¼Œå› 为如下网络错误:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>当å‰ç‰ˆæœ¬å³ä¸ºæœ€æ–°ç‰ˆï¼Œè¯·ä»¥åŽå†æ¥æ£€æŸ¥.</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>该å‘导将连接到虚拟电脑控制å°çš„主站点，以检测是å¦æœ‰æ–°ç‰ˆæœ¬ã€‚</p><p>按 <b>检测</b> 按钮以查看现在是å¦æœ‰æ–°çš„版本，或者按 <b>å–消</b> æŒ‰é’®ï¼Œå¦‚æžœä½ çŽ°åœ¨ä¸æƒ³æ‰§è¡Œè¯¥æ£€æµ‹ã€‚</p><p>åœ¨ä»»ä½•æ—¶å€™ä½ éƒ½å¯ä»¥é€šè¿‡æŒ‰ <b>帮助</b> èœå•ä¸çš„ <b>检测更新...</b> æ¥è¿è¡Œæœ¬å‘导.</p></translation> - </message> -</context> -<context> <name>VBoxVMDescriptionPage</name> <message> <source>No description. Press the Edit button below to add it.</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts index 1ba98e690..0963a8da7 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts @@ -53,7 +53,7 @@ </message> <message> <source>The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the kernel module by executing<br/><br/> <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>as root. 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 執行 <br/><br/> <font color=blue>'/etc/init.d/vboxdrv setup' 來é‡æ–°å®‰è£æ ¸å¿ƒæ¨¡çµ„。 Ubuntu, Fedora 或 Mandriva çš„ä½¿ç”¨è€…æ‡‰å…ˆå®‰è£ DKMS å°è£ã€‚ 這個å°è£ä¿ç•™ Linux æ ¸å¿ƒè®Šæ›´çš„è¿½è¹¤ä¸¦åœ¨éœ€è¦æ™‚é‡æ–°ç·¨è¯ vboxdrv æ ¸å¿ƒæ¨¡çµ„ã€‚</translation> + <translation>未載入 VirtualBox Linux æ ¸å¿ƒé©…å‹•ç¨‹å¼ (vboxdrv) 或是 /dev/vboxdrv 的權é™å•é¡Œã€‚ 請以 root 執行 <br/><br/> <font color=blue>'/etc/init.d/vboxdrv setup' 來é‡æ–°å®‰è£æ ¸å¿ƒæ¨¡çµ„。 Ubuntu, Fedora 或 Mandriva çš„ä½¿ç”¨è€…æ‡‰å…ˆå®‰è£ DKMS 套件。 這個套件ä¿ç•™ Linux æ ¸å¿ƒè®Šæ›´çš„è¿½è¹¤ä¸¦åœ¨éœ€è¦æ™‚é‡æ–°ç·¨è¯ vboxdrv æ ¸å¿ƒæ¨¡çµ„ã€‚</translation> </message> <message> <source>Make sure the kernel module has been loaded successfully.</source> @@ -160,11 +160,11 @@ </message> <message> <source>Copy all errors to the clipboard</source> - <translation type="unfinished"></translation> + <translation>複製所有錯誤到剪貼簿</translation> </message> <message> <source>Copy</source> - <translation type="unfinished">複製</translation> + <translation>複製</translation> </message> </context> <context> @@ -192,7 +192,7 @@ <name>QIWizardPage</name> <message> <source>Use the <b>%1</b> button to go to the next page of the wizard and the <b>%2</b> button to return to the previous page. You can also press <b>%3</b> if you want to cancel the execution of this wizard.</p></source> - <translation>使用 [<b>%1</b>] 按鈕å‰å¾€ç²¾éˆçš„下一é åŠ [<b>%2</b>] 按鈕返回上一é 。 如果您è¦å–消這個精éˆçš„執行，您也å¯ä»¥æŒ‰ä¸‹ [<b>%3</b>] 。</p></translation> + <translation>使用 [<b>%1</b>] 按鈕移至精éˆçš„下一é åŠ [<b>%2</b>] 按鈕返回上一é 。 如果您è¦å–消這個精éˆçš„執行，您也å¯ä»¥æŒ‰ä¸‹ [<b>%3</b>] 。</p></translation> </message> </context> <context> @@ -223,7 +223,7 @@ </message> <message> <source>&Insert Ctrl-Alt-Del</source> - <translation>æ’å…¥ Ctrl-Alt-Del (&I)</translation> + <translation>æ’å…¥ Ctrl-Alt-Del éµ(&I)</translation> </message> <message> <source>Send the Ctrl-Alt-Del sequence to the virtual machine</source> @@ -231,7 +231,7 @@ </message> <message> <source>&Insert Ctrl-Alt-Backspace</source> - <translation>æ’å…¥ Ctrl-Alt-Backspace (&I)</translation> + <translation>æ’å…¥ Ctrl-Alt-Backspace éµ(&I)</translation> </message> <message> <source>Send the Ctrl-Alt-Backspace sequence to the virtual machine</source> @@ -271,7 +271,7 @@ </message> <message> <source>Send the ACPI Power Button press event to the virtual machine</source> - <translation>傳é€æŒ‰ä¸‹ ACPI é›»æºé–‹é—œæŒ‰éˆ•çš„事件到虛擬機器</translation> + <translation>傳é€æŒ‰ä¸‹ ACPI é›»æºé–‹é—œæŒ‰éˆ•äº‹ä»¶åˆ°è™›æ“¬æ©Ÿå™¨</translation> </message> <message> <source>&Close...</source> @@ -319,7 +319,7 @@ </message> <message> <source>&Install Guest Additions...</source> - <translation>å®‰è£ Guest Additions (&I)...</translation> + <translation>å®‰è£ Guest Additions(&I)...</translation> </message> <message> <source>Mount the Guest Additions installation image</source> @@ -547,7 +547,7 @@ </message> <message> <source>Linked Base for %1 and %2</source> - <translation type="unfinished"></translation> + <translation>%1 å’Œ %2 連çµçš„基礎</translation> </message> </context> <context> @@ -561,10 +561,6 @@ <translation><p>è«‹é¸æ“‡æ–°è™›æ“¬æ©Ÿå™¨çš„å稱:</p></translation> </message> <message> - <source>When checked a new unique MAC address will assigned to all configured network cards.</source> - <translation type="obsolete">勾é¸æ™‚，將指派新的唯一 MAC ä½å€åˆ°æ‰€æœ‰å·²çµ„態的網路å¡ã€‚</translation> - </message> - <message> <source>&Reinitialize the MAC address of all network cards</source> <translation>é‡æ–°åˆå§‹åŒ–所有網路å¡çš„ MAC ä½å€(&R)</translation> </message> @@ -578,93 +574,65 @@ </message> <message> <source>When checked a new unique MAC address will be assigned to all configured network cards.</source> - <translation type="unfinished"></translation> + <translation>勾é¸æ™‚，將指派新的唯一 MAC ä½å€åˆ°æ‰€æœ‰å·²çµ„態的網路å¡ã€‚</translation> </message> </context> <context> <name>UICloneVMWizardPage2</name> <message> - <source>Current machine state</source> - <translation type="obsolete">ç›®å‰æ©Ÿå™¨ç‹€æ…‹</translation> - </message> - <message> - <source>Current machine and all child states</source> - <translation type="obsolete">ç›®å‰æ©Ÿå™¨å’Œæ‰€æœ‰å狀態</translation> - </message> - <message> - <source>All states</source> - <translation type="obsolete">所有狀態</translation> - </message> - <message> <source>Cloning Configuration</source> <translation>å†è£½çµ„æ…‹</translation> </message> <message> - <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="obsolete">è«‹é¸æ“‡è™›æ“¬æ©Ÿå™¨æ‡‰å†è£½çš„部分。</translation> - </message> - <message> - <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="obsolete">如果您é¸å– [<b>ç›®å‰æ©Ÿå™¨ç‹€æ…‹</b>]，åªå†è£½è™›æ“¬æ©Ÿå™¨çš„ç›®å‰ç‹€æ…‹ã€‚</translation> - </message> - <message> - <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="obsolete">如果您é¸å– [<b>ç›®å‰æ©Ÿå™¨å’Œæ‰€æœ‰å狀態</b>]，將å†è£½è™›æ“¬æ©Ÿå™¨çš„ç›®å‰ç‹€æ…‹å’Œå快照的任何狀態。</translation> - </message> - <message> - <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="obsolete">如果您é¸å– [<b>所有狀態</b>]，將å†è£½ç›®å‰æ©Ÿå™¨ç‹€æ…‹å’Œæ‰€æœ‰å¿«ç…§ã€‚</translation> - </message> - <message> <source>Full Clone</source> - <translation type="unfinished"></translation> + <translation>完整複製</translation> </message> <message> <source>Linked Clone</source> - <translation type="unfinished"></translation> + <translation>連çµçš„å†è£½</translation> </message> <message> <source><p>Please select the type of the clone.</p><p>If you choose <b>Full Clone</b> an exact copy (including all virtual disk images) of the original VM will be created. If you select <b>Linked Clone</b>, a new VM will be created, but the virtual disk images will point to the virtual disk images of original VM.</p></source> - <translation type="unfinished"></translation> + <translation><p>è«‹é¸å–å†è£½çš„類型。</p><p>如果您é¸æ“‡<b>完整å†è£½</b>，將建立原始 VM 的精確複製 (包å«æ‰€æœ‰è™›æ“¬ç£ç¢Ÿ)。 如果您é¸å–<b>連çµçš„å†è£½</b>，將建立新的 VM，但虛擬ç£ç¢Ÿæ˜ åƒå°‡æŒ‡åˆ°åŽŸå§‹ VM 的虛擬ç£ç¢Ÿæ˜ åƒã€‚</p></translation> </message> <message> <source><p>Note that a new snapshot within the source VM is created in case you select <b>Linked Clone</b>.</p></source> - <translation type="unfinished"></translation> + <translation><p>請注æ„ï¼Œå·²åœ¨ä¾†æº VM ä¸å»ºç«‹æ–°çš„快照，以防您é¸å–<b>連çµçš„å¿«ç…§</b>。</p></translation> </message> </context> <context> <name>UICloneVMWizardPage3</name> <message> <source>Current machine state</source> - <translation type="unfinished">ç›®å‰æ©Ÿå™¨ç‹€æ…‹</translation> + <translation>ç›®å‰æ©Ÿå™¨ç‹€æ…‹</translation> </message> <message> <source>Current machine and all child states</source> - <translation type="unfinished">ç›®å‰æ©Ÿå™¨å’Œæ‰€æœ‰å狀態</translation> + <translation>ç›®å‰æ©Ÿå™¨å’Œæ‰€æœ‰å狀態</translation> </message> <message> <source>All states</source> - <translation type="unfinished">所有狀態</translation> + <translation>所有狀態</translation> </message> <message> <source>Cloning Configuration</source> - <translation type="unfinished">å†è£½çµ„æ…‹</translation> + <translation>å†è£½çµ„æ…‹</translation> </message> <message> <source>Please choose which parts of the virtual machine should be cloned.</source> - <translation type="unfinished">è«‹é¸æ“‡è™›æ“¬æ©Ÿå™¨æ‡‰å†è£½çš„部分。</translation> + <translation>è«‹é¸æ“‡è™›æ“¬æ©Ÿå™¨æ‡‰å†è£½çš„部分。</translation> </message> <message> <source>If you select <b>Current machine state</b>, only the current state of the virtual machine is cloned.</source> - <translation type="unfinished">如果您é¸å– [<b>ç›®å‰æ©Ÿå™¨ç‹€æ…‹</b>]，åªå†è£½è™›æ“¬æ©Ÿå™¨çš„ç›®å‰ç‹€æ…‹ã€‚</translation> + <translation>如果您é¸å–[<b>ç›®å‰æ©Ÿå™¨ç‹€æ…‹</b>]，åªå†è£½è™›æ“¬æ©Ÿå™¨çš„ç›®å‰ç‹€æ…‹ã€‚</translation> </message> <message> <source>If you select <b>Current machine and all child states</b> the current state of the virtual machine and any states of child snapshots are cloned.</source> - <translation type="unfinished">如果您é¸å– [<b>ç›®å‰æ©Ÿå™¨å’Œæ‰€æœ‰å狀態</b>]，將å†è£½è™›æ“¬æ©Ÿå™¨çš„ç›®å‰ç‹€æ…‹å’Œå快照的任何狀態。</translation> + <translation>如果您é¸å–[<b>ç›®å‰æ©Ÿå™¨å’Œæ‰€æœ‰å狀態</b>]，將å†è£½è™›æ“¬æ©Ÿå™¨çš„ç›®å‰ç‹€æ…‹å’Œå快照的任何狀態。</translation> </message> <message> <source>If you select <b>All states</b>, the current machine state and all snapshots are cloned.</source> - <translation type="unfinished">如果您é¸å– [<b>所有狀態</b>]，將å†è£½ç›®å‰æ©Ÿå™¨ç‹€æ…‹å’Œæ‰€æœ‰å¿«ç…§ã€‚</translation> + <translation>如果您é¸å–[<b>所有狀態</b>]，將å†è£½ç›®å‰æ©Ÿå™¨ç‹€æ…‹å’Œæ‰€æœ‰å¿«ç…§ã€‚</translation> </message> </context> <context> @@ -742,7 +710,7 @@ <message> <source>Nested Paging</source> <comment>details report</comment> - <translation>巢狀分é </translation> + <translation>å·¢å¼åˆ†é </translation> </message> <message> <source>PAE/NX</source> @@ -960,35 +928,31 @@ <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"><nobr>%1%</nobr></translation> + <translation><nobr>%1%</nobr></translation> </message> <message> <source>Generic driver, '%1'</source> <comment>details report (network)</comment> - <translation>一般驅動程å¼ï¼Œã€Œ%1ã€</translation> + <translation>通用驅動程å¼ï¼Œã€Œ%1ã€</translation> </message> <message> <source>Generic driver, '%1' {&nbsp;%2&nbsp;}</source> <comment>details report (network)</comment> - <translation>一般驅動程å¼ï¼Œã€Œ%1ã€{&nbsp;%2&nbsp;}</translation> + <translation>通用驅動程å¼ï¼Œã€Œ%1ã€{&nbsp;%2&nbsp;}</translation> </message> </context> <context> - <name>UIDownloader</name> + <name>UIDownloaderAdditions</name> <message> - <source>The download process has been canceled by the user.</source> - <translation type="obsolete">使用者已å–消下載處ç†ç¨‹åºã€‚</translation> + <source>Select folder to save Guest Additions image to</source> + <translation>é¸å–è¦å„²å˜ Guest Additions æ˜ åƒçš„資料夾</translation> </message> </context> <context> - <name>UIDownloaderAdditions</name> - <message> - <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="obsolete"><p>儲å˜å·²ä¸‹è¼‰æª”案為 <nobr><b>%1</b> 失敗。</nobr></p></translation> - </message> + <name>UIDownloaderExtensionPack</name> <message> - <source>Select folder to save Guest Additions image to</source> - <translation>é¸å–è¦å„²å˜ Guest Additions æ˜ åƒçš„資料夾</translation> + <source>Select folder to save %1 to</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1036,7 +1000,7 @@ </message> <message> <source>&Local Filesystem </source> - <translation>本機檔案系統(&L)</translation> + <translation>本機檔案系統(&L) </translation> </message> <message> <source>Sun &Cloud</source> @@ -1126,15 +1090,15 @@ </message> <message> <source>Checking files ...</source> - <translation>æ£åœ¨æª¢æŸ¥æª”案...</translation> + <translation>æ£åœ¨æª¢æŸ¥æª”案 ...</translation> </message> <message> <source>Removing files ...</source> - <translation>æ£åœ¨ç§»é™¤æª”案...</translation> + <translation>æ£åœ¨ç§»é™¤æª”案 ...</translation> </message> <message> <source>Exporting Appliance ...</source> - <translation>æ£åœ¨åŒ¯å‡ºæ‡‰ç”¨è£ç½®...</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> @@ -1231,7 +1195,7 @@ </message> <message> <source>Lists all installed packages.</source> - <translation>列出所有已安è£çš„套件。</translation> + <translation>列出所有已安è£çš„擴充包。</translation> </message> <message> <source>Active</source> @@ -1247,11 +1211,11 @@ </message> <message> <source>Add package</source> - <translation>åŠ å…¥å¥—ä»¶</translation> + <translation>åŠ å…¥æ“´å……åŒ…</translation> </message> <message> <source>Remove package</source> - <translation>移除套件</translation> + <translation>移除擴充包</translation> </message> <message> <source>Select an extension package file</source> @@ -1317,7 +1281,7 @@ </message> <message> <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source> - <translation>勾é¸æ™‚，æ¯æ¬¡è™›æ“¬æ©Ÿå™¨è¦–窗啟動時，éµç›¤æœƒè‡ªå‹•æ“·å–。 當擷å–éµç›¤æ™‚，所有的按éµå‹•ä½œ (包括系統，如 Alt-Tab) 都會直接å°è™›æ“¬æ©Ÿå™¨ã€‚</translation> + <translation>勾é¸æ™‚，æ¯æ¬¡è™›æ“¬æ©Ÿå™¨è¦–窗啟動時，éµç›¤æœƒè‡ªå‹•æ“·å–。 當擷å–éµç›¤æ™‚，所有的按éµå‹•ä½œ (包括系統，如 Alt-Tab éµ) 都會直接å°è™›æ“¬æ©Ÿå™¨ã€‚</translation> </message> <message> <source>&Auto Capture Keyboard</source> @@ -1337,7 +1301,7 @@ <message> <source> (built-in)</source> <comment>Language</comment> - <translation>(內建)</translation> + <translation> (內建)</translation> </message> <message> <source><unavailable></source> @@ -1424,12 +1388,12 @@ <message> <source>Automatically configured</source> <comment>interface</comment> - <translation>自動組態</translation> + <translation>已自動組態</translation> </message> <message> <source>Manually configured</source> <comment>interface</comment> - <translation>手動組態</translation> + <translation>已手動組態</translation> </message> <message> <source>IPv4 Address</source> @@ -1629,7 +1593,7 @@ </message> <message> <source>&Enable proxy</source> - <translation>啟用 Proxy (&E)</translation> + <translation>啟用 Proxy(&E)</translation> </message> <message> <source>Ho&st:</source> @@ -1734,23 +1698,23 @@ <name>UIHotKeyEditor</name> <message> <source>Left </source> - <translation>â†</translation> + <translation>↠</translation> </message> <message> <source>Right </source> - <translation>→</translation> + <translation>→ </translation> </message> <message> <source>Right Alt</source> - <translation>å³å´ Alt</translation> + <translation>å³å´ Alt éµ</translation> </message> <message> <source>Left WinKey</source> - <translation>å·¦å´ WinKey</translation> + <translation>å·¦å´ WinKey éµ</translation> </message> <message> <source>Right WinKey</source> - <translation>å³å´ WinKey</translation> + <translation>å³å´ WinKey éµ</translation> </message> <message> <source>Menu key</source> @@ -1778,23 +1742,23 @@ </message> <message> <source>Left Shift</source> - <translation type="unfinished"></translation> + <translation>å·¦å´ Shift éµ</translation> </message> <message> <source>Right Shift</source> - <translation type="unfinished"></translation> + <translation>å³å´ Shift éµ</translation> </message> <message> <source>Left Ctrl</source> - <translation type="unfinished"></translation> + <translation>å·¦å´ Ctrl éµ</translation> </message> <message> <source>Right Ctrl</source> - <translation type="unfinished"></translation> + <translation>å³å´ Ctrl éµ</translation> </message> <message> <source>Left Alt</source> - <translation type="unfinished"></translation> + <translation>å·¦å´ Alt éµ</translation> </message> </context> <context> @@ -1982,7 +1946,7 @@ <name>UIMachineLogic</name> <message> <source> EXPERIMENTAL build %1r%2 - %3</source> - <translation>EXPERIMENTAL 組建 %1r%2 - %3</translation> + <translation> EXPERIMENTAL 組建 %1r%2 - %3</translation> </message> <message> <source>Preview Monitor %1</source> @@ -2014,7 +1978,7 @@ </message> <message> <source>No supported devices connected to the host PC</source> - <translation>主機 PC 未連接已支æ´çš„è£ç½®</translation> + <translation>沒有已支æ´çš„è£ç½®é€£æŽ¥åˆ°ä¸»æ©Ÿ PC</translation> </message> </context> <context> @@ -2235,7 +2199,7 @@ </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>您已é‡å°é€™éƒ¨ VM é¸å– 64 ä½å…ƒçš„客體作æ¥ç³»çµ±é¡žåž‹ã€‚ 如æ¤çš„客體需è¦ç¡¬é«”虛擬化 (VT-x/AMD-V)，這個功能將會自動啟用。</translation> + <translation>您已é¸å–這部 VM çš„ 64 ä½å…ƒå®¢é«”作æ¥ç³»çµ±é¡žåž‹ã€‚ 如æ¤çš„客體需è¦ç¡¬é«”虛擬化 (VT-x/AMD-V)，這個功能將會自動啟用。</translation> </message> </context> <context> @@ -2331,7 +2295,7 @@ </message> <message> <source>Generic Properties:</source> - <translation>一般內容:</translation> + <translation>通用內容:</translation> </message> <message> <source>Enter any configuration settings here for the network attachment driver you will be using. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source> @@ -2339,7 +2303,7 @@ </message> <message> <source>no generic driver is selected</source> - <translation>未é¸å–一般驅動程å¼</translation> + <translation>未é¸å–通用驅動程å¼</translation> </message> <message> <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source> @@ -2410,15 +2374,15 @@ <name>UIMachineSettingsParallelPage</name> <message> <source>Duplicate port number selected </source> - <translation>é¸å–é‡è¤‡çš„é€£æŽ¥åŸ è™Ÿ</translation> + <translation>é¸å–é‡è¤‡çš„é€£æŽ¥åŸ è™Ÿ </translation> </message> <message> <source>Port path not specified </source> - <translation>æœªæŒ‡å®šé€£æŽ¥åŸ è·¯å¾‘</translation> + <translation>æœªæŒ‡å®šé€£æŽ¥åŸ è·¯å¾‘ </translation> </message> <message> <source>Duplicate port path entered </source> - <translation>輸入é‡è¤‡çš„é€£æŽ¥åŸ è·¯å¾‘</translation> + <translation>輸入é‡è¤‡çš„é€£æŽ¥åŸ è·¯å¾‘ </translation> </message> </context> <context> @@ -2468,11 +2432,11 @@ </message> <message> <source> Machine Folders</source> - <translation>機器資料夾</translation> + <translation> 機器資料夾</translation> </message> <message> <source> Transient Folders</source> - <translation>暫時性資料夾</translation> + <translation> 暫時性資料夾</translation> </message> <message> <source>Full</source> @@ -2484,7 +2448,7 @@ </message> <message> <source>Lists all shared folders accessible to this machine. Use 'net use x: \\vboxsvr\share' to access a shared folder named <i>share</i> from a DOS-like OS, or 'mount -t vboxsf share mount_point' to access it from a Linux OS. This feature requires Guest Additions.</source> - <translation>列出所有å¯å˜å–這部機器的共用資料夾。 從類似 DOS 的作æ¥ç³»çµ±ä½¿ç”¨ [net use x: \\vboxsvr\share] å˜å–å為 <i> share </i> 的共用資料夾，或從 Linux 作æ¥ç³»çµ± [mount -t vboxsf share mount_point] 來å˜å–它。 é€™å€‹åŠŸèƒ½éœ€è¦ Guest Additions 。</translation> + <translation>列出所有å¯å˜å–這部機器的共用資料夾。 從類似 DOS 的作æ¥ç³»çµ±ä½¿ç”¨ [net use x: \\vboxsvr\share] å˜å–å為 <i>share</i> 的共用資料夾，或從 Linux 作æ¥ç³»çµ± [mount -t vboxsf share mount_point] 來å˜å–它。 é€™å€‹åŠŸèƒ½éœ€è¦ Guest Additions 。</translation> </message> <message> <source>Name</source> @@ -2615,15 +2579,15 @@ </message> <message> <source>If checked, the pipe specified in the <b>Port Path</b> field will be created by the virtual machine when it starts. Otherwise, the virtual machine will assume that the pipe exists and try to use it.</source> - <translation>如果勾é¸ï¼Œåœ¨<b>é€£æŽ¥åŸ è·¯å¾‘</b>欄ä½ä¸æŒ‡å®šçš„管é“將由虛擬機器於啟動時建立。 å¦å‰‡ï¼Œè™›æ“¬æ©Ÿå™¨å°‡å‡è¨ç®¡é“å˜åœ¨ä¸¦å˜—試使用它。</translation> + <translation>如果勾é¸ï¼Œåœ¨<b>é€£æŽ¥åŸ è·¯å¾‘</b>欄ä½ä¸æŒ‡å®šçš„管線將由虛擬機器於啟動時建立。 å¦å‰‡ï¼Œè™›æ“¬æ©Ÿå™¨å°‡å‡è¨ç®¡ç·šå˜åœ¨ä¸¦å˜—試使用它。</translation> </message> <message> <source>&Create Pipe</source> - <translation>建立管é“(&C)</translation> + <translation>建立管線(&C)</translation> </message> <message> <source>Displays the path to the serial port's pipe on the host when the port is working in <b>Host Pipe</b> mode, or the host serial device name when the port is working in <b>Host Device</b> mode.</source> - <translation>ç•¶é€£æŽ¥åŸ å·¥ä½œåœ¨<b>主機管é“</b>模å¼æ™‚顯示主機ä¸åºåˆ—åŸ ç®¡é“çš„è·¯å¾‘ï¼Œæˆ–è€…ç•¶é€£æŽ¥åŸ å·¥ä½œåœ¨<b>主機è£ç½®</b>模å¼æ™‚顯示主機åºåˆ—è£ç½®å稱。</translation> + <translation>ç•¶é€£æŽ¥åŸ å·¥ä½œåœ¨<b>主機管線</b>模å¼æ™‚顯示主機ä¸åºåˆ—åŸ ç®¡ç·šçš„è·¯å¾‘ï¼Œæˆ–è€…ç•¶é€£æŽ¥åŸ å·¥ä½œåœ¨<b>主機è£ç½®</b>模å¼æ™‚顯示主機åºåˆ—è£ç½®å稱。</translation> </message> <message> <source>Port/File &Path:</source> @@ -2642,15 +2606,15 @@ <name>UIMachineSettingsSerialPage</name> <message> <source>Duplicate port number selected </source> - <translation>é¸å–é‡è¤‡çš„é€£æŽ¥åŸ è™Ÿ</translation> + <translation>é¸å–é‡è¤‡çš„é€£æŽ¥åŸ è™Ÿ </translation> </message> <message> <source>Port path not specified </source> - <translation>æœªæŒ‡å®šé€£æŽ¥åŸ è·¯å¾‘</translation> + <translation>æœªæŒ‡å®šé€£æŽ¥åŸ è·¯å¾‘ </translation> </message> <message> <source>Duplicate port path entered </source> - <translation>輸入é‡è¤‡çš„é€£æŽ¥åŸ è·¯å¾‘</translation> + <translation>輸入é‡è¤‡çš„é€£æŽ¥åŸ è·¯å¾‘ </translation> </message> </context> <context> @@ -2913,7 +2877,7 @@ </message> <message> <source>When checked the virtual disk will not be removed when the guest system ejects it.</source> - <translation type="unfinished">勾é¸æ™‚，略éŽå®¢é«”作æ¥ç³»çµ±é€€å‡ºçš„未掛載媒體。</translation> + <translation>勾é¸æ™‚，ä¸æœƒç§»é™¤è™›æ“¬ç£ç¢Ÿåœ¨å®¢é«”系統將其退出時。</translation> </message> <message> <source>&Live CD/DVD</source> @@ -2921,7 +2885,7 @@ </message> <message> <source>When checked the guest system will see the virtual disk as a solid state device.</source> - <translation type="unfinished">勾é¸æ™‚，標記媒體為固態硬碟 (SSD)。</translation> + <translation>勾é¸æ™‚，客體系統會將虛擬ç£ç¢Ÿè¦–為固態è£ç½®ã€‚</translation> </message> <message> <source>&Solid-state drive</source> @@ -2933,7 +2897,7 @@ </message> <message> <source>no name specified for controller at position <b>%1</b>.</source> - <translation>未指定ä½ç½® <b>%1</b> 控制器的å稱。</translation> + <translation>未指定ä½æ–¼ <b>%1</b> 控制器的å稱。</translation> </message> <message> <source>controller at position <b>%1</b> uses the name that is already used by controller at position <b>%2</b>.</source> @@ -2955,7 +2919,7 @@ </message> <message> <source>you are currently using more storage controllers than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2.</source> - <translation>您目å‰ä½¿ç”¨è¶…éŽ %1 晶片組所支æ´çš„å˜æ”¾æŽ§åˆ¶å™¨ã€‚ 請在系統è¨å®šé ä¸è®Šæ›´æ™¶ç‰‡çµ„類型或在å˜æ”¾è¨å®šé ä¸æ¸›å°‘以下å˜æ”¾æŽ§åˆ¶å™¨çš„數é‡: %2。</translation> + <translation>您目å‰ä½¿ç”¨è¶…éŽ %1 晶片組所支æ´çš„å˜æ”¾æŽ§åˆ¶å™¨ã€‚ 請在 [系統] è¨å®šé ä¸è®Šæ›´æ™¶ç‰‡çµ„類型或在 [å˜æ”¾] è¨å®šé ä¸æ¸›å°‘以下å˜æ”¾æŽ§åˆ¶å™¨çš„數é‡: %2。</translation> </message> <message> <source>&Port Count:</source> @@ -2963,7 +2927,7 @@ </message> <message> <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source> - <translation type="unfinished">é¸å–ç›®å‰åœ¨ [å˜æ”¾è£ç½®æ¨¹] é¸å–çš„ SATA å˜æ”¾è£ç½®æŽ§åˆ¶å™¨ä¹‹é€£æŽ¥åŸ 數。 這個值ä¸èƒ½å°æ–¼æ‰€ç”¨çš„æœ€å¤§é€£æŽ¥åŸ è™Ÿ + 1。</translation> + <translation>é¸å–ç›®å‰åœ¨ [å˜æ”¾è£ç½®æ¨¹] é¸å–çš„ SATA å˜æ”¾è£ç½®æŽ§åˆ¶å™¨ä¹‹é€£æŽ¥åŸ 數。 é€™å¿…é ˆè‡³å°‘æ¯”æ‚¨éœ€è¦ä½¿ç”¨çš„æœ€å¤§é€£æŽ¥åŸ è™Ÿé‚„å¤§ã€‚</translation> </message> </context> <context> @@ -2978,7 +2942,7 @@ </message> <message> <source>for performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source> - <translation>ç”±æ–¼æ•ˆèƒ½åŽŸå› ï¼Œé™„åŠ åˆ°è™›æ“¬æ©Ÿå™¨çš„è™›æ“¬ CPU 數ä¸å¯å¤šæ–¼ä¸»æ©Ÿä¸å¯¦é«” CPU 數 (<b>%1</b> 個) çš„å…©å€ã€‚ è«‹é™ä½Žè™›æ“¬ CPU 數。</translation> + <translation>ç”±æ–¼æ•ˆèƒ½åŽŸå› ï¼Œé™„åŠ åˆ°è™›æ“¬æ©Ÿå™¨çš„è™›æ“¬ CPU 數ä¸å¯å¤šæ–¼ä¸»æ©Ÿä¸å¯¦é«” CPU 數 (<b>%1</b> 顆) çš„å…©å€ã€‚ è«‹é™ä½Žè™›æ“¬ CPU 數。</translation> </message> <message> <source>you have assigned more virtual CPUs to the virtual machine than the number of physical CPUs on your host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source> @@ -3087,7 +3051,7 @@ </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&ging</source> @@ -3100,7 +3064,7 @@ </message> <message> <source>When checked, the guest will support the Extended Firmware Interface (EFI), which is required to boot certain guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</source> - <translation>勾é¸æ™‚，客體將支æ´Extended Firmware Interface (EFI)，æŸç¨®å®¢é«”作æ¥ç³»çµ±é–‹æ©Ÿæ˜¯éœ€è¦çš„。 éž EFI 感知的作æ¥ç³»çµ±å°‡ç„¡æ³•é–‹æ©Ÿï¼Œå¦‚果啟用這個é¸é …。</translation> + <translation>勾é¸æ™‚，客體將支æ´Extended Firmware Interface (EFI)，æŸç¨®å®¢é«”作æ¥ç³»çµ±é–‹æ©Ÿæ˜¯éœ€è¦çš„。 éž EFI 感知的作æ¥ç³»çµ±å¦‚果啟用這個é¸é …將無法開機。</translation> </message> <message> <source>Enable &EFI (special OSes only)</source> @@ -3132,11 +3096,7 @@ </message> <message> <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source> - <translation type="unfinished">定義在這部 VM ä¸ä½¿ç”¨çš„晶片組類型。</translation> - </message> - <message> - <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source> - <translation type="obsolete">您已指派 ICH9 æ™¶ç‰‡çµ„é¡žåž‹åˆ°æ¤ VM。 除éžåŒæ™‚啟用 IO-APIC 功能å¦å‰‡å°‡ä¸æœƒå‹•ä½œã€‚ 當您按下 [確定] æŒ‰éˆ•æŽ¥å— VM è¨å®šå€¼å°‡æœƒè‡ªå‹•å®Œæˆã€‚</translation> + <translation>é¸å–è¦åœ¨æ¤è™›æ“¬æ©Ÿå™¨æ¨¡æ“¬çš„晶片組。 請注æ„，ICH9 晶片組模擬是實驗性且ä¸å»ºè°ï¼Œé™¤äº†æ˜¯éœ€è¦å®ƒçš„客體系統 (比如 Mac OS X)。</translation> </message> <message> <source>&Execution Cap:</source> @@ -3157,16 +3117,16 @@ <message> <source><qt>%1%</qt></source> <comment>Min CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source><qt>%1%</qt></source> <comment>Max CPU execution cap in %</comment> - <translation type="unfinished"></translation> + <translation><qt>%1%</qt></translation> </message> <message> <source>you have assigned ICH9 chipset type to this VM. It will not work properly 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>您已指派 ICH9 æ™¶ç‰‡çµ„é¡žåž‹åˆ°æ¤ VM。 除éžåŒæ™‚啟用 IO-APIC 功能å¦å‰‡å°‡ä¸æœƒå‹•ä½œã€‚ 當您按下 [確定] æŒ‰éˆ•æŽ¥å— VM è¨å®šå€¼å°‡æœƒè‡ªå‹•å®Œæˆã€‚</translation> </message> </context> <context> @@ -3459,7 +3419,7 @@ </message> <message> <source><p>Failed to initialize COM or to find the VirtualBox COM server. Most likely, the VirtualBox server is not running or failed to start.</p><p>The application will now terminate.</p></source> - <translation><p>åˆå§‹åŒ– COM 或尋找 VirtualBox COM 伺æœå™¨æ™‚失敗。很有å¯èƒ½ï¼ŒVirtualBox 伺æœå™¨æœªåŸ·ä½œæˆ–是啟動失敗。</p><p>應用程å¼ç¾åœ¨å°‡çµ‚æ¢ã€‚</p></translation> + <translation><p>åˆå§‹åŒ– COM 或尋找 VirtualBox COM 伺æœå™¨æ™‚失敗。 很有å¯èƒ½ï¼ŒVirtualBox 伺æœå™¨æœªåŸ·ä½œæˆ–是啟動失敗。</p><p>應用程å¼ç¾åœ¨å°‡çµ‚æ¢ã€‚</p></translation> </message> <message> <source><p>Failed to create the VirtualBox COM object.</p><p>The application will now terminate.</p></source> @@ -3539,7 +3499,7 @@ </message> <message> <source>Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.</source> - <translation>é™„åŠ USB è£ç½® <b>%1</b> 到虛擬機器 <b>%2</b> 時失敗。</translation> + <translation>在虛擬機器 <b>%2</b> é™„åŠ USB è£ç½® <b>%1</b> 時失敗。</translation> </message> <message> <source>Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.</source> @@ -3588,7 +3548,7 @@ <message> <source>Severity: </source> <comment>runtime error info</comment> - <translation>åš´é‡æ€§:</translation> + <translation>åš´é‡æ€§: </translation> </message> <message> <source><p>A fatal error has occurred during virtual machine execution! The virtual machine will be powered off. Please copy the following error message using the clipboard to help diagnose the problem:</p></source> @@ -3605,35 +3565,35 @@ <message> <source>Result&nbsp;Code: </source> <comment>error info</comment> - <translation>çµæžœç¢¼:</translation> + <translation>çµæžœç¢¼(&N): </translation> </message> <message> <source>Component: </source> <comment>error info</comment> - <translation>元件:</translation> + <translation>元件: </translation> </message> <message> <source>Interface: </source> <comment>error info</comment> - <translation>介é¢:</translation> + <translation>介é¢: </translation> </message> <message> <source>Callee: </source> <comment>error info</comment> - <translation>被呼å«ç«¯:</translation> + <translation>被呼å«ç«¯: </translation> </message> <message> <source>Callee&nbsp;RC: </source> <comment>error info</comment> - <translation>被呼å«ç«¯&nbsp;RC:</translation> + <translation>被呼å«ç«¯&nbsp;RC: </translation> </message> <message> <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source> - <translation><p>目錄 <b><nobr>%2</nobr></b> ä¸æ‰¾ä¸åˆ°èªžè¨€ <b>%1</b> 的語言檔案。</p><p>語言將會暫時é‡è¨ç‚ºç³»çµ±çš„é è¨èªžè¨€ã€‚ è«‹å‰å¾€ VirtualBox 主視窗 <b>檔案</b> 功能表開啟 <b>喜好è¨å®š</b> å°è©±æ–¹å¡Šï¼Œä¸¦ä¸”在 <b>語言</b> é é¢é¸å–ç¾æœ‰çš„語言之一。</p></translation> + <translation><p>目錄 <b><nobr>%2</nobr></b> ä¸æ‰¾ä¸åˆ°èªžè¨€ <b>%1</b> 的語言檔案。</p><p>語言將會暫時é‡è¨ç‚ºç³»çµ±çš„é è¨èªžè¨€ã€‚ 請移至 VirtualBox 主視窗 [<b>檔案</b>] 功能表開啟 [<b>喜好è¨å®š</b>] å°è©±æ–¹å¡Šï¼Œä¸¦ä¸”在 [<b>語言</b>] é é¢é¸å–ç¾æœ‰çš„語言之一。</p></translation> </message> <message> <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source> - <translation><p>無法載入語言檔 <b><nobr>%1</nobr></b>。 <p>語言將會暫時é‡è¨ç‚ºè‹±æ–‡ (內建)。 è«‹å‰å¾€ VirtualBox 主視窗 <b>檔案</b> 功能表開啟 <b>喜好è¨å®š</b> å°è©±æ–¹å¡Šï¼Œä¸¦ä¸”在 <b>語言</b> é é¢é¸å–ç¾æœ‰çš„語言之一。</p></translation> + <translation><p>無法載入語言檔 <b><nobr>%1</nobr></b>。 <p>語言將會暫時é‡è¨ç‚ºè‹±æ–‡ (內建)。 請移至 VirtualBox 主視窗 [<b>檔案</b>] 功能表開啟 [<b>喜好è¨å®š</b>] å°è©±æ–¹å¡Šï¼Œä¸¦ä¸”在 [<b>語言</b>] é é¢é¸å–ç¾æœ‰çš„語言之一。</p></translation> </message> <message> <source><p>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</p><p>Please close all programs in the guest OS that may be using this shared folder and try again.</p></source> @@ -3673,7 +3633,7 @@ </message> <message> <source>Failed to send the ACPI Power Button press event to the virtual machine <b>%1</b>.</source> - <translation>傳é€å‡º ACPI 關關按鈕的按下事件到虛擬機器 <b>%1</b> 失敗。</translation> + <translation>傳é€æŒ‰ä¸‹ ACPI é›»æºæŒ‰éˆ•äº‹ä»¶åˆ°è™›æ“¬æ©Ÿå™¨ <b>%1</b> 失敗。</translation> </message> <message> <source><p>Congratulations! You have been successfully registered as a user of VirtualBox.</p><p>Thank you for finding time to fill out the registration form!</p></source> @@ -3723,7 +3683,7 @@ <message> <source>Check</source> <comment>inaccessible media message box</comment> - <translation>檢查</translation> + <translation>勾é¸</translation> </message> <message> <source>Switch</source> @@ -3737,7 +3697,7 @@ </message> <message> <source><p>Do you really want to reset the virtual machine?</p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source> - <translation><p>您確定è¦é‡è¨è™›æ“¬æ©Ÿå™¨å—Ž?</p><p>這將導致在虛擬機器執行ä¸æ‡‰ç”¨ç¨‹å¼çš„任何未儲å˜è³‡æ–™éºå¤±ã€‚</p></translation> + <translation><p>您確定è¦é‡è¨è™›æ“¬æ©Ÿå™¨å—Ž?</p><p>é€™å°‡é€ æˆåœ¨è™›æ“¬æ©Ÿå™¨åŸ·è¡Œä¸æ‡‰ç”¨ç¨‹å¼çš„任何未儲å˜è³‡æ–™éºå¤±ã€‚</p></translation> </message> <message> <source>Reset</source> @@ -3760,7 +3720,7 @@ </message> <message> <source><p>Could not switch the guest display to fullscreen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to fullscreen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source> - <translation><p>由於客體視訊記憶體ä¸è¶³ç„¡æ³•åˆ‡æ›å®¢é«”顯示為全螢幕模å¼ã€‚</p><p>您應組態虛擬機器至少 <b>%1</b> 的視訊記憶體。</p><p>按下 [<b>忽略</b>] 無論如何切æ›ç‚ºå…¨èž¢å¹•æˆ–按下 [<b>å–消</b>] 來å–消æ“作。</p></translation> + <translation><p>由於客體視訊記憶體ä¸è¶³ç„¡æ³•åˆ‡æ›å®¢é«”顯示為全螢幕模å¼ã€‚</p><p>您應組態虛擬機器至少 <b>%1</b> 的視訊記憶體。</p><p>按下 [<b>忽略</b>] ä»è¦åˆ‡æ›ç‚ºå…¨èž¢å¹•æˆ–按下 [<b>å–消</b>] 以å–消æ“作。</p></translation> </message> <message> <source>You are already running the most recent version of VirtualBox.</source> @@ -3792,7 +3752,7 @@ </message> <message> <source>Open the browser and go to the VirtualBox product web site</source> - <translation>é–‹å•Ÿç€è¦½å™¨ä¸¦å‰å¾€ VirtualBox 產å“網站</translation> + <translation>é–‹å•Ÿç€è¦½å™¨ä¸¦ç§»è‡³ VirtualBox 產å“網站</translation> </message> <message> <source>&Reset All Warnings</source> @@ -3858,7 +3818,7 @@ </message> <message> <source><p>The hard disk storage unit at location <b>%1</b> already exists. You cannot create a new virtual hard disk that uses this location because it can be already used by another virtual hard disk.</p><p>Please specify a different location.</p></source> - <translation><p>硬碟å˜æ”¾å–®å…ƒæ–¼ä½ç½® <b>%1</b> 已經å˜åœ¨ã€‚ 您ä¸èƒ½ä½¿ç”¨é€™å€‹ä½ç½®æ–°å»ºè™›æ“¬ç¡¬ç¢Ÿå› 為å¦ä¸€å€‹è™›æ“¬ç¡¬ç¢Ÿå·²ç¶“使用ä¸ã€‚</p><p>請指定ä¸åŒçš„ä½ç½®ã€‚</p></translation> + <translation><p>硬碟å˜æ”¾å–®å…ƒä½æ–¼ <b>%1</b> 已經å˜åœ¨ã€‚ 您ä¸èƒ½ä½¿ç”¨é€™å€‹ä½ç½®æ–°å»ºè™›æ“¬ç¡¬ç¢Ÿå› 為å¦ä¸€å€‹è™›æ“¬ç¡¬ç¢Ÿå·²ç¶“使用ä¸ã€‚</p><p>請指定ä¸åŒçš„ä½ç½®ã€‚</p></translation> </message> <message> <source><p>Do you want to delete the storage unit of the hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which makes it possible to add this hard disk to the list later again.</p></source> @@ -3904,7 +3864,7 @@ </message> <message> <source><p>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.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see what media are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source> - <translation><p>一或多個虛擬硬碟ã€CD/DVD 或軟碟媒體目å‰ä¸å¯å˜å–。 å› æ¤æ‚¨å°‡ç„¡æ³•æ“作使用這些媒體的虛擬機器，直至它們ç¨å¾Œæˆç‚ºå¯å˜å–。</p><p>按下 [<b>檢查</b>] 來開啟虛擬媒體管ç†å“¡è¦–窗並查看哪些媒體ä¸å¯å˜å–或按下 [<b>忽略</b>] 來忽略這個訊æ¯ã€‚</p></translation> + <translation><p>一或多個虛擬硬碟ã€CD/DVD 或軟碟媒體目å‰ä¸å¯å˜å–。 å› æ¤æ‚¨å°‡ç„¡æ³•æ“作使用這些媒體的虛擬機器，直至它們ç¨å¾Œæˆç‚ºå¯å˜å–。</p><p>按下 [<b>檢查</b>] 來開啟虛擬媒體管ç†å“¡è¦–窗並查看哪些媒體ä¸å¯å˜å–或按下 [<b>忽略</b>] 以忽略這個訊æ¯ã€‚</p></translation> </message> <message> <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr> 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 <b>Show Log</b> from the <b>Machine</b> menu of the main VirtualBox window.</p><p>Press <b>OK</b> if you want to power off the machine or press <b>Ignore</b> 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 <b>OK</b> now.</p></source> @@ -3916,7 +3876,7 @@ </message> <message> <source>You are running a prerelease version of VirtualBox. This version is not suitable for production use.</source> - <translation>您æ£åœ¨åŸ·è¡Œé 先發佈的 VirtualBox 版本。 這個版本ä¸é©åˆç”Ÿç”¢ä½¿ç”¨ã€‚</translation> + <translation>您æ£åœ¨åŸ·è¡Œé 先發佈的 VirtualBox 版本。 這個版本ä¸é©åˆåœ¨ç”Ÿç”¢ä½¿ç”¨ã€‚</translation> </message> <message> <source>You are 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> @@ -3976,7 +3936,7 @@ </message> <message> <source><p>Deleting this host-only network will remove the host-only interface this network is based on. Do you want to remove the (host-only network) interface <nobr><b>%1</b>?</nobr></p><p><b>Note:</b> this interface may be in use by one or more virtual network adapters belonging to one of your VMs. After it is removed, these adapters will no longer be usable until you correct their settings by either choosing a different interface name or a different adapter attachment type.</p></source> - <translation><p>刪除這個「僅é™ä¸»æ©Ÿã€ç¶²è·¯å°‡ç§»é™¤åŸºæ–¼é€™å€‹ç¶²è·¯çš„「僅é™ä¸»æ©Ÿã€ä»‹é¢ã€‚ 您è¦è¦ç§»é™¤ (åªæœ‰ä¸»æ©Ÿç¶²è·¯) ä»‹é¢ <nobr><b>%1</b> å—Ž?</nobr></p><p><b>注æ„:</b>這個介é¢å¯èƒ½ç”±ä¸€æˆ–多個虛擬網路å¡ä½¿ç”¨ä¸å±¬æ–¼æ‚¨çš„虛擬機器之一。 移除後，這些介é¢å¡å°‡ä¸å†å¯ç”¨ï¼Œç›´åˆ°æ‚¨é¸æ“‡ä¸åŒä»‹é¢å稱或ä¸åŒä»‹é¢å¡é™„件類型來修æ£å®ƒå€‘çš„è¨å®šã€‚</p></translation> + <translation><p>刪除這個「僅é™ä¸»æ©Ÿã€ç¶²è·¯å°‡ç§»é™¤åŸºæ–¼é€™å€‹ç¶²è·¯çš„「僅é™ä¸»æ©Ÿã€ä»‹é¢ã€‚ 您è¦ç§»é™¤ (僅é™ä¸»æ©Ÿç¶²è·¯) ä»‹é¢ <nobr><b>%1</b> å—Ž?</nobr></p><p><b>注æ„:</b>這個介é¢å¯èƒ½ç”±ä¸€æˆ–多個虛擬網路å¡ä½¿ç”¨ä¸å±¬æ–¼æ‚¨çš„虛擬機器之一。 移除後，這些介é¢å¡å°‡ä¸å†å¯ç”¨ï¼Œç›´åˆ°æ‚¨é¸æ“‡ä¸åŒä»‹é¢å稱或ä¸åŒä»‹é¢å¡é™„件類型來修æ£å®ƒå€‘çš„è¨å®šã€‚</p></translation> </message> <message> <source>A file named <b>%1</b> already exists. Are you sure you want to replace it?<br /><br />Replacing it will overwrite its contents.</source> @@ -3988,7 +3948,7 @@ </message> <message> <source><p>Invalid e-mail address or password specified.</p></source> - <translation><p>指定無效的電å郵件或密碼。</p></translation> + <translation><p>指定無效的電å郵件ä½å€æˆ–密碼。</p></translation> </message> <message> <source><p>Failed to register the VirtualBox product.</p><p>%1</p></source> @@ -4004,7 +3964,7 @@ </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>您似乎在 /sys/bus/usb/drivers 掛載 USBFS 檔案系統。 我們強烈建è°æ‚¨è®Šæ›´æ¤ï¼Œç”±æ–¼å®ƒæ˜¯ä¸€å€‹åš´é‡çš„錯誤組態您的系統，這å¯èƒ½å°Žè‡´ USB è£ç½®ä»¥æ„想ä¸åˆ°çš„æ–¹å¼å¤±æ•—。</translation> + <translation>您似乎在 /sys/bus/usb/drivers 掛載 USBFS 檔案系統。 我們強烈建è°æ‚¨è®Šæ›´æ¤ï¼Œç”±æ–¼å®ƒæ˜¯ä¸€å€‹åš´é‡éŒ¯èª¤çµ„態您的系統，這å¯èƒ½é€ æˆ USB è£ç½®ä»¥æ„想ä¸åˆ°çš„æ–¹å¼å¤±æ•—。</translation> </message> <message> <source>You are running an EXPERIMENTAL build of VirtualBox. This version is not suitable for production use.</source> @@ -4016,7 +3976,7 @@ </message> <message> <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and disk data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source> - <translation><p>刪除快照將導致它儲å˜çš„狀態資訊éºå¤±ï¼Œä¸” VirtualBox 與快照一起建立分布在數個ç£ç¢Ÿè³‡æ–™çš„æ˜ åƒæª”案將åˆä½µç‚ºä¸€å€‹æª”案。 這å¯èƒ½æ˜¯ä¸€å€‹æ¼«é•·çš„éŽç¨‹ï¼Œä¸”å¿«ç…§ä¸è³‡è¨Šç„¡æ³•æ¢å¾©ã€‚</p></p>您確定è¦åˆªé™¤é¸å–çš„å¿«ç…§ <b>%1</b> å—Ž?</p></translation> + <translation><p>åˆªé™¤å¿«ç…§å°‡é€ æˆå…¶å„²å˜çš„狀態資訊éºå¤±ï¼Œä¸” VirtualBox 與快照一起建立分布在數個ç£ç¢Ÿè³‡æ–™çš„æ˜ åƒæª”案將åˆä½µç‚ºä¸€å€‹æª”案。 這å¯èƒ½æ˜¯ä¸€å€‹æ¼«é•·çš„éŽç¨‹ï¼Œä¸”å¿«ç…§ä¸è³‡è¨Šç„¡æ³•æ¢å¾©ã€‚</p></p>您確定è¦åˆªé™¤é¸å–çš„å¿«ç…§ <b>%1</b> å—Ž?</p></translation> </message> <message> <source>Delete</source> @@ -4036,7 +3996,7 @@ </message> <message> <source> Would you like to force mounting of this medium?</source> - <translation>您è¦å¼·åˆ¶æŽ›è¼‰é€™å€‹åª’體嗎?</translation> + <translation> 您希望強制掛載這個媒體嗎?</translation> </message> <message> <source>Unable to unmount the %1 <nobr><b>%2</b></nobr> from the machine <b>%3</b>.</source> @@ -4044,7 +4004,7 @@ </message> <message> <source> Would you like to force unmounting of this medium?</source> - <translation>您è¦å¼·åˆ¶å¸è¼‰é€™å€‹åª’體嗎?</translation> + <translation> 您希望強制å¸è¼‰é€™å€‹åª’體嗎?</translation> </message> <message> <source>Force Unmount</source> @@ -4107,7 +4067,7 @@ </message> <message> <source><p>Deleting the snapshot %1 will temporarily need more disk space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of disk space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source> - <translation><p>刪除快照 %1 將暫時需è¦æ›´å¤šç£ç¢Ÿç©ºé–“。 åœ¨æœ€ç³Ÿæƒ…å½¢ä¸‹ï¼Œæ˜ åƒ %2 的大å°å°‡æˆé•·ç‚º %3，然而在這個檔案系統ä¸åªæœ‰ %4 çš„å¯ç”¨ç©ºé–“。</p><p>åœ¨æ˜ åƒæ“作期間執行超éŽç£ç¢Ÿç©ºé–“ï¼Œæœƒé€ æˆæ˜ åƒå’Œ VM 組態æ毀，例如éºå¤± VM 和它的資料。</p><p>您å¯ä»¥ç¹¼çºŒåˆªé™¤å¿«ç…§ï¼Œé¢¨éšªè‡ªè² 。</p></translation> + <translation><p>刪除快照 %1 將暫時需è¦æ›´å¤šç£ç¢Ÿç©ºé–“。 åœ¨æœ€ç³Ÿæƒ…å½¢ä¸‹ï¼Œæ˜ åƒ %2 的大å°å°‡æˆé•·ç‚º %3，然而在這個檔案系統ä¸åªæœ‰ %4 çš„å¯ç”¨ç©ºé–“。</p><p>在åˆä½µæ“作期間執行超éŽç£ç¢Ÿç©ºé–“ï¼Œæœƒé€ æˆæ˜ åƒå’Œ VM 組態æ毀，例如éºå¤± VM 和它的資料。</p><p>您å¯ä»¥ç¹¼çºŒåˆªé™¤å¿«ç…§ï¼Œé¢¨éšªè‡ªè² 。</p></translation> </message> <message> <source><p>Could not change the guest screen to this host screen due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source> @@ -4245,7 +4205,7 @@ </message> <message> <source>The current port forwarding rules are not valid. None of the host or guest port values may be set to zero.</source> - <translation>ç›®å‰çš„é€£æŽ¥åŸ è½‰é€è¦å‰‡ç„¡æ•ˆã€‚ æ²’æœ‰ä¸»æ©Ÿæˆ–å®¢é«”é€£æŽ¥åŸ çš„å€¼å¯èƒ½è¨å®šç‚º 0 。</translation> + <translation>ç›®å‰çš„é€£æŽ¥åŸ è½‰é€è¦å‰‡ç„¡æ•ˆã€‚ æ²’æœ‰ä¸»æ©Ÿæˆ–å®¢é«”é€£æŽ¥åŸ çš„å€¼å¯èƒ½è¨å®šç‚º 0。</translation> </message> <message> <source><p>There are unsaved changes in the port forwarding configuration.</p><p>If you proceed your changes will be discarded.</p></source> @@ -4358,7 +4318,7 @@ </message> <message> <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source> - <translation type="unfinished">您目å‰ç·¨è¼¯çš„虛擬機器狀態已變更。 在您按下 [確定] 時åªæœƒå„²å˜åŸ·è¡ŒéšŽæ®µå¯ç·¨è¼¯çš„è¨å®šã€‚ 所有其它變更的è¨å®šå°‡å¤±åŽ»ã€‚</translation> + <translation>您æ£åœ¨è®Šæ›´çš„虛擬機器已經啟動。 機器執行時åªèƒ½è®Šæ›´é‡è¦è¨å®šã€‚ 如果您ç¾åœ¨é—œé–‰æ¤è¦–窗，所有其它變更將失去。</translation> </message> <message> <source>Failed to clone the virtual machine <b>%1</b>.</source> @@ -4382,7 +4342,7 @@ </message> <message> <source>Sorry, some generic error happens.</source> - <translation>抱æ‰ï¼Œç™¼ç”ŸæŸäº›ä¸€èˆ¬éŒ¯èª¤ã€‚</translation> + <translation>抱æ‰ï¼Œç™¼ç”ŸæŸäº›é€šç”¨éŒ¯èª¤ã€‚</translation> </message> <message> <source><p>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b><nobr>%1</nobr></b> to be installed.</p><p>Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</p></source> @@ -4410,35 +4370,46 @@ </message> <message> <source>Can't find snapshot named <b>%1</b>.</source> - <translation type="unfinished"></translation> + <translation>找ä¸åˆ°å為 <b>%1</b> 的快照。</translation> </message> <message> <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source> - <translation type="unfinished"><p>儲å˜å·²ä¸‹è¼‰æª”案為 <nobr><b>%1</b> 失敗。</nobr></p></translation> + <translation><p>儲å˜å·²ä¸‹è¼‰æª”案為 <nobr><b>%1</b> 失敗。</nobr></p></translation> </message> -</context> -<context> - <name>UIMiniProcessWidgetAdditions</name> <message> - <source>Cancel</source> - <translation type="obsolete">å–消</translation> + <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source> + <translation type="unfinished"></translation> </message> <message> - <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="obsolete">å–消 VirtualBox Guest Additions CD æ˜ åƒä¸‹è¼‰</translation> + <source>Download</source> + <comment>extension pack</comment> + <translation type="unfinished">下載</translation> </message> <message> - <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="obsolete">æ£åœ¨ä¸‹è¼‰ VirtualBox Guest Additions CD æ˜ åƒå¾ž <nobr><b>%1</b>...</nobr></translation> + <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Install</source> + <comment>extension pack</comment> + <translation type="unfinished">安è£</translation> + </message> + <message> + <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <source><p>Failed to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a>.</nobr></p><p>%3</p></source> + <translation type="unfinished"></translation> </message> </context> <context> <name>UIMiniProcessWidgetUserManual</name> <message> - <source>Cancel</source> - <translation type="obsolete">å–消</translation> - </message> - <message> <source>Cancel the VirtualBox User Manual download</source> <translation>å–消 VirtualBox 使用者手冊下載</translation> </message> @@ -4455,11 +4426,22 @@ <name>UIMiniProgressWidgetAdditions</name> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished">å–消 VirtualBox Guest Additions CD æ˜ åƒä¸‹è¼‰</translation> + <translation>å–消 VirtualBox Guest Additions CD æ˜ åƒä¸‹è¼‰</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished">æ£åœ¨ä¸‹è¼‰ VirtualBox Guest Additions CD æ˜ åƒå¾ž <nobr><b>%1</b>...</nobr></translation> + <translation>æ£åœ¨ä¸‹è¼‰ VirtualBox Guest Additions CD æ˜ åƒå¾ž <nobr><b>%1</b>...</nobr></translation> + </message> +</context> +<context> + <name>UIMiniProgressWidgetExtension</name> + <message> + <source>Cancel the <nobr><b>%1</b></nobr> download</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr></source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -4482,7 +4464,7 @@ <message> <source>%1_copy</source> <comment>copied virtual disk name</comment> - <translation>%1_複製</translation> + <translation>%1_複本</translation> </message> <message> <source>Create</source> @@ -4586,7 +4568,7 @@ </message> <message> <source>Please type the name of the new virtual disk file into the box below or click on the folder icon to select a different folder to create the file in.</source> - <translation type="unfinished">按下 [<b>é¸å–</b>] 按鈕é¸å–è¦å˜æ”¾è™›æ“¬ç£ç¢Ÿè³‡æ–™çš„檔案ä½ç½®æˆ–在欄ä½è¼¸å…¥æª”案å稱。</translation> + <translation>請在以下方塊輸入新虛擬ç£ç¢Ÿçš„å稱或按一下資料夾圖示é¸å–ä¸åŒçš„資料夾以在該ä½ç½®å»ºç«‹æª”案。</translation> </message> <message> <source>Select a file for the new hard disk image file</source> @@ -4636,6 +4618,18 @@ <comment>summary</comment> <translation>大å°</translation> </message> + <message> + <source>H&DD (Parallels Hard Disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Q&ED (QEMU enhanced disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>&QCOW (QEMU Copy-On-Write)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UINewHDWizardPageFormat</name> @@ -4753,11 +4747,11 @@ </message> <message> <source>Start-up &Disk</source> - <translation type="unfinished">開機硬碟(&D)</translation> + <translation>å•Ÿå‹•ç£ç¢Ÿ(&D)</translation> </message> <message> <source><p>If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.</p></source> - <translation type="unfinished"><p>é¸å–用來作為虛擬機器開機硬碟的虛擬硬碟。 您å¯ä»¥å»ºç«‹æ–°çš„硬碟或從下拉清單é¸å–ç¾æœ‰çš„一個或按下相應的按鈕 (調用 [開啟檔案] 視窗)。</p><p>如果您需è¦æ›´è¤‡é›œçš„硬碟è¨å®šï¼Œæ‚¨ä¹Ÿå¯ä»¥ç•¥éŽé€™å€‹æ¥é©Ÿä¸¦ç¨å¾Œä½¿ç”¨ VM è¨å®šå°è©±æ–¹å¡Šé™„åŠ ç¡¬ç¢Ÿã€‚</p></translation> + <translation><p>如果您希望您å¯ä»¥ç«‹å³åŠ 入啟動ç£ç¢Ÿåˆ°æ–°çš„機器。 您å¯ä»¥å»ºç«‹æ–°çš„虛擬ç£ç¢Ÿæˆ–從清單或使用資料夾圖示從å¦ä¸€å€‹ä½ç½®é¸å–一個。</p><p>如果您需è¦æ›´å¤šè¤‡é›œè™›æ“¬ç£ç¢Ÿè¨å®šï¼Œæ‚¨å¯ä»¥ç•¥éŽæ¤è¨å®šï¼Œä¸¦åœ¨æ©Ÿå™¨å»ºç«‹å¾Œé€²è¡Œè®Šæ›´æ©Ÿå™¨è¨å®šã€‚</p></translation> </message> <message> <source>Choose a virtual hard disk file...</source> @@ -4765,7 +4759,7 @@ </message> <message> <source>The recommended size of the start-up disk is <b>%1</b>.</source> - <translation type="unfinished">開機硬碟的建è°å¤§å°ç‚º <b>%1</b>。</translation> + <translation>å•Ÿå‹•ç£ç¢Ÿçš„建è°å¤§å°ç‚º <b>%1</b>。</translation> </message> </context> <context> @@ -4796,7 +4790,7 @@ <message> <source>Start-up Disk</source> <comment>summary</comment> - <translation type="unfinished">開機硬碟</translation> + <translation>å•Ÿå‹•ç£ç¢Ÿ</translation> </message> <message> <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source> @@ -4925,7 +4919,7 @@ </message> <message> <source>Proxy</source> - <translation type="unfinished">Proxy</translation> + <translation>Proxy</translation> </message> </context> <context> @@ -5003,6 +4997,93 @@ </message> </context> <context> + <name>UIUpdateManager</name> + <message> + <source>1 day</source> + <translation>1 天</translation> + </message> + <message> + <source>2 days</source> + <translation>2 天</translation> + </message> + <message> + <source>3 days</source> + <translation>3 天</translation> + </message> + <message> + <source>4 days</source> + <translation>4 天</translation> + </message> + <message> + <source>5 days</source> + <translation>5 天</translation> + </message> + <message> + <source>6 days</source> + <translation>6 天</translation> + </message> + <message> + <source>1 week</source> + <translation>1 星期</translation> + </message> + <message> + <source>2 weeks</source> + <translation>2 星期</translation> + </message> + <message> + <source>3 weeks</source> + <translation>3 星期</translation> + </message> + <message> + <source>1 month</source> + <translation>1 個月</translation> + </message> + <message> + <source>Never</source> + <translation>æ°¸ä¸</translation> + </message> + <message> + <source>Chec&k</source> + <translation type="obsolete">檢查(&K)</translation> + </message> + <message> + <source>&Close</source> + <translation type="obsolete">關閉(&C)</translation> + </message> + <message> + <source>VirtualBox Update Wizard</source> + <translation type="obsolete">VirtualBox æ›´æ–°ç²¾éˆ</translation> + </message> + <message> + <source>Check for Updates</source> + <translation type="obsolete">檢查更新</translation> + </message> + <message> + <source>Cancel</source> + <translation type="obsolete">å–消</translation> + </message> + <message> + <source>Summary</source> + <translation type="obsolete">摘è¦</translation> + </message> + <message> + <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> + <translation type="obsolete"><p>VirtualBox 的新版本已發佈! 版本 <b>%1</b> 在 <a href="http://www.virtualbox.org/">virtualbox.org</a>å¯ç”¨ã€‚</p><p>您å¯ä»¥ä½¿ç”¨é€£çµ:</p><p><a href=%2>%3</a></p>下載這個版本</translation> + </message> + <message> + <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> + <translation type="obsolete"><p>無法ç²å–新版本資訊由於以下網路錯誤:</p><p><b>%1</b></p></translation> + </message> + <message> + <source>You are already running the most recent version of VirtualBox.</source> + <translation type="obsolete">您已經使用 VirtualBox 的最新版本。</translation> + </message> + <message> + <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> + <translation type="obsolete"><p>這個精éˆå°‡é€£æŽ¥åˆ° VirtualBox 網站並檢查是å¦æœ‰å¯ç”¨çš„ VirtualBox 更新版本。</p><p>使用 [<b>檢查</b>] 按鈕立å³æª¢æŸ¥æ–°ç‰ˆæœ¬æˆ– [<b>å–消</b>] 按鈕如果您ä¸æƒ³åŸ·è¡Œé€™å€‹æª¢æŸ¥ã€‚</p><p>您å¯ä»¥åœ¨ä»»ä½•æ™‚候從 [<b>說明</b>] 功能表é¸æ“‡ [<b>檢查更新...</b>] 執行這個精éˆã€‚</p></translation> + </message> +</context> +<context> <name>UIVMCloseDialog</name> <message> <source>Close Virtual Machine</source> @@ -5545,7 +5626,7 @@ <message> <source>Host Pipe</source> <comment>PortMode</comment> - <translation>主機管é“</translation> + <translation>主機管線</translation> </message> <message> <source>Host Device</source> @@ -5775,7 +5856,7 @@ <message> <source>Nested Paging</source> <comment>details report</comment> - <translation>巢狀分é </translation> + <translation>å·¢å¼åˆ†é </translation> </message> <message> <source>Enabled</source> @@ -5935,7 +6016,7 @@ <message> <source>Restoring Snapshot</source> <comment>MachineState</comment> - <translation>還原快照</translation> + <translation>æ£åœ¨é‚„原快照</translation> </message> <message> <source>Deleting Snapshot</source> @@ -6167,7 +6248,7 @@ </message> <message> <source>Nested Paging</source> - <translation>巢狀分é </translation> + <translation>å·¢å¼åˆ†é </translation> </message> <message> <source>Shareable</source> @@ -6334,17 +6415,17 @@ <message> <source><nobr>%1%</nobr></source> <comment>details report</comment> - <translation type="unfinished"><nobr>%1%</nobr></translation> + <translation><nobr>%1%</nobr></translation> </message> <message> <source>Generic, '%1'</source> <comment>details report (network)</comment> - <translation>一般，「%1ã€</translation> + <translation>通用，「%1ã€</translation> </message> <message> <source>Generic Driver</source> <comment>NetworkAttachmentType</comment> - <translation>一般驅動程å¼</translation> + <translation>通用驅動程å¼</translation> </message> <message> <source>Deny</source> @@ -6404,7 +6485,7 @@ </message> <message> <source>Find </source> - <translation>尋找</translation> + <translation>尋找 </translation> </message> <message> <source>Enter a search string here</source> @@ -6487,7 +6568,7 @@ </message> <message> <source>Checking accessibility</source> - <translation>檢查å¯å˜å–性</translation> + <translation>æ£åœ¨æª¢æŸ¥å¯å˜å–性</translation> </message> <message> <source>&Select</source> @@ -6704,10 +6785,6 @@ <translation>é‡æ–°æ•´ç†é¸å–虛擬機器的å¯å˜å–能力狀態</translation> </message> <message> - <source>&Help</source> - <translation type="obsolete">說明(&H)</translation> - </message> - <message> <source>S&how</source> <translation>顯示(&H)</translation> </message> @@ -6942,7 +7019,7 @@ <message> <source> (current, </source> <comment>Snapshot details</comment> - <translation>(ç›®å‰ï¼Œ</translation> + <translation> (ç›®å‰ï¼Œ </translation> </message> <message> <source>online)</source> @@ -6991,7 +7068,7 @@ </message> <message> <source> (%1)</source> - <translation>(%1)</translation> + <translation> (%1)</translation> </message> <message> <source>&Restore Snapshot</source> @@ -7011,7 +7088,7 @@ </message> <message> <source> (%1 ago)</source> - <translation>(%1 之å‰)</translation> + <translation> (%1 之å‰)</translation> </message> <message> <source>&Clone...</source> @@ -7068,93 +7145,6 @@ </message> </context> <context> - <name>VBoxUpdateDlg</name> - <message> - <source>1 day</source> - <translation>1 天</translation> - </message> - <message> - <source>2 days</source> - <translation>2 天</translation> - </message> - <message> - <source>3 days</source> - <translation>3 天</translation> - </message> - <message> - <source>4 days</source> - <translation>4 天</translation> - </message> - <message> - <source>5 days</source> - <translation>5 天</translation> - </message> - <message> - <source>6 days</source> - <translation>6 天</translation> - </message> - <message> - <source>1 week</source> - <translation>1 星期</translation> - </message> - <message> - <source>2 weeks</source> - <translation>2 星期</translation> - </message> - <message> - <source>3 weeks</source> - <translation>3 星期</translation> - </message> - <message> - <source>1 month</source> - <translation>1 個月</translation> - </message> - <message> - <source>Never</source> - <translation>æ°¸ä¸</translation> - </message> - <message> - <source>Chec&k</source> - <translation>檢查(&K)</translation> - </message> - <message> - <source>&Close</source> - <translation>關閉(&C)</translation> - </message> - <message> - <source>VirtualBox Update Wizard</source> - <translation>VirtualBox æ›´æ–°ç²¾éˆ</translation> - </message> - <message> - <source>Check for Updates</source> - <translation>檢查更新</translation> - </message> - <message> - <source>Cancel</source> - <translation>å–消</translation> - </message> - <message> - <source>Summary</source> - <translation>摘è¦</translation> - </message> - <message> - <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source> - <translation><p>VirtualBox 的新版本已發佈! 版本 <b>%1</b> 在 <a href="http://www.virtualbox.org/">virtualbox.org</a>å¯ç”¨ã€‚</p><p>您å¯ä»¥ä½¿ç”¨é€£çµ:</p><p><a href=%2>%3</a></p>下載這個版本</translation> - </message> - <message> - <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source> - <translation><p>無法ç²å–新版本資訊由於以下網路錯誤:</p><p><b>%1</b></p></translation> - </message> - <message> - <source>You are already running the most recent version of VirtualBox.</source> - <translation>您已經使用 VirtualBox 的最新版本。</translation> - </message> - <message> - <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source> - <translation><p>這個精éˆå°‡é€£æŽ¥åˆ° VirtualBox 網站並檢查是å¦æœ‰å¯ç”¨çš„ VirtualBox 更新版本。</p><p>使用 [<b>檢查</b>] 按鈕立å³æª¢æŸ¥æ–°ç‰ˆæœ¬æˆ– [<b>å–消</b>] 按鈕如果您ä¸æƒ³åŸ·è¡Œé€™å€‹æª¢æŸ¥ã€‚</p><p>您å¯ä»¥åœ¨ä»»ä½•æ™‚候從 [<b>說明</b>] 功能表é¸æ“‡ [<b>檢查更新...</b>] 執行這個精éˆã€‚</p></translation> - </message> -</context> -<context> <name>VBoxVMInformationDlg</name> <message> <source>%1 - Session Information</source> @@ -7236,7 +7226,7 @@ </message> <message> <source>Network Statistics</source> - <translation>網路狀態</translation> + <translation>網路統計</translation> </message> <message> <source>Not Available</source> @@ -7268,7 +7258,7 @@ </message> <message> <source>Save VirtualBox Log As</source> - <translation>å„²å˜ VirtualBox 記錄為</translation> + <translation>å¦å˜ VirtualBox 記錄</translation> </message> <message> <source>&Find</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/qt_bg.ts b/src/VBox/Frontends/VirtualBox/nls/qt_bg.ts index 796d8b093..d29ed8b97 100644 --- a/src/VBox/Frontends/VirtualBox/nls/qt_bg.ts +++ b/src/VBox/Frontends/VirtualBox/nls/qt_bg.ts @@ -105,7 +105,7 @@ have libgstreamer-plugins-base installed.</source> <source>A required codec is missing. You need to install the following codec(s) to play this content: %0</source> <translation> <numerusform>ЛипÑва необходим кодек. Ðужно е да инÑталирате ÑÐ»ÐµÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÐµÐº, за да изпълните това Ñъдържание: %0</numerusform> - <numerusform>ЛипÑва необходим кодек. Ðужно е да инÑталирате Ñледните кодеци, за да изпълните това Ñъдържание: %0</numerusform> + <numerusform>ЛипÑват необходими кодеци. Ðужно е да инÑталирате Ñледните кодеци, за да изпълните това Ñъдържание: %0</numerusform> </translation> </message> <message> diff --git a/src/VBox/Frontends/VirtualBox/nls/qt_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/qt_zh_TW.ts index 80cc68a37..0dcac35fb 100644 --- a/src/VBox/Frontends/VirtualBox/nls/qt_zh_TW.ts +++ b/src/VBox/Frontends/VirtualBox/nls/qt_zh_TW.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> <TS version="2.0" language="zh_TW"> <context> @@ -79,13 +79,13 @@ <message> <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled.</source> - <translation>è¦å‘Š: 您似乎沒有安è£å°è£ gstreamer0.10-plugins-good 。 + <translation>è¦å‘Š: æ‚¨ä¼¼ä¹Žæ²’æœ‰å®‰è£ gstreamer0.10-plugins-good 套件。 æŸäº›è¦–訊功能已åœç”¨ã€‚</translation> </message> <message> <source>Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled</source> - <translation>è¦å‘Š: 您沒有安è£åŸºç¤Ž GStreamer 外掛。 + <translation>è¦å‘Š: 您似乎沒有安è£åŸºç¤Ž GStreamer 外掛。 所有音訊與視訊支æ´å·²åœç”¨</translation> </message> </context> @@ -117,7 +117,7 @@ have libgstreamer-plugins-base installed.</source> </message> <message> <source>Could not locate media source.</source> - <translation>無法找到媒體來æºã€‚</translation> + <translation>找ä¸åˆ°åª’體來æºã€‚</translation> </message> <message> <source>Could not open audio device. The device is already in use.</source> @@ -125,7 +125,7 @@ have libgstreamer-plugins-base installed.</source> </message> <message> <source>Could not decode media source.</source> - <translation>無法åµæ¸¬è§£ç¢¼åª’體來æºã€‚</translation> + <translation>無法解碼媒體來æºã€‚</translation> </message> </context> <context> @@ -147,7 +147,7 @@ have libgstreamer-plugins-base installed.</source> </message> <message> <source>Ambiguous %1 not handled</source> - <translation>ä¸æ˜Žç¢º %1 ä¸è™•ç†</translation> + <translation>ä¸æ˜Žç¢ºçš„ %1 ä¸è™•ç†</translation> </message> </context> <context> @@ -249,7 +249,7 @@ have libgstreamer-plugins-base installed.</source> </message> <message> <source>Detail View</source> - <translation>詳細資料檢視</translation> + <translation>詳細檢視</translation> </message> <message> <source>Preview File Info</source> @@ -305,7 +305,7 @@ have libgstreamer-plugins-base installed.</source> </message> <message> <source>Save As</source> - <translation>儲å˜ç‚º</translation> + <translation>å¦å˜æ–°æª”</translation> </message> <message> <source>&Open</source> @@ -570,7 +570,7 @@ to </message> <message> <source>Puts a minimized back to normal</source> - <translation>將最å°åŒ–放回æ£å¸¸</translation> + <translation>將最å°åŒ–æ¢å¾©æ¨™æº–</translation> </message> <message> <source>Moves the window out of the way</source> @@ -578,7 +578,7 @@ to </message> <message> <source>Puts a maximized window back to normal</source> - <translation>將最大化的視窗放回æ£å¸¸</translation> + <translation>將最大化的視窗æ¢å¾©æ¨™æº–</translation> </message> <message> <source>Makes the window full screen</source> @@ -1162,7 +1162,7 @@ Please verify the correct file name was given.</source> </message> <message> <source>Detail View</source> - <translation>詳細資料檢視</translation> + <translation>詳細檢視</translation> </message> <message> <source>Files of type:</source> @@ -1196,7 +1196,7 @@ Do you want to delete it anyway?</source> </message> <message> <source>Save As</source> - <translation>儲å˜ç‚º</translation> + <translation>å¦å˜æ–°æª”</translation> </message> <message> <source>Drive</source> @@ -1216,7 +1216,7 @@ Do you want to delete it anyway?</source> </message> <message> <source>Show </source> - <translation>顯示</translation> + <translation>顯示 </translation> </message> <message> <source>Forward</source> @@ -1507,7 +1507,7 @@ Do you want to delete it anyway?</source> </message> <message> <source>Sample</source> - <translation>ç°¡å–®</translation> + <translation>範例</translation> </message> <message> <source>Wr&iting System</source> @@ -1649,11 +1649,11 @@ Do you want to delete it anyway?</source> </message> <message> <source>Request aborted</source> - <translation>å·²ä¸æ¢è¦æ±‚</translation> + <translation>請求已ä¸æ¢</translation> </message> <message> <source>No server set to connect to</source> - <translation>沒有伺æœå™¨è¨å®šé€£æŽ¥åˆ°</translation> + <translation>沒有è¨å®šè¦é€£æŽ¥çš„伺æœå™¨</translation> </message> <message> <source>Wrong content length</source> @@ -1709,7 +1709,7 @@ Do you want to delete it anyway?</source> </message> <message> <source>Proxy authentication required</source> - <translation>ä¸æ”¯æ´ Proxy é©—è‰</translation> + <translation>Proxy é©—è‰è¦æ±‚</translation> </message> <message> <source>Authentication required</source> @@ -1729,7 +1729,7 @@ Do you want to delete it anyway?</source> </message> <message> <source>Data corrupted</source> - <translation>資料æ毀</translation> + <translation>資料已æ毀</translation> </message> <message> <source>Unknown protocol specified</source> @@ -1872,11 +1872,11 @@ Do you want to delete it anyway?</source> </message> <message> <source>XIM input method</source> - <translation>XIM 輸入方法</translation> + <translation>XIM 輸入法</translation> </message> <message> <source>Windows input method</source> - <translation>Windows 輸入方法</translation> + <translation>Windows 輸入法</translation> </message> <message> <source>Mac OS X input method</source> @@ -2031,7 +2031,7 @@ Do you want to delete it anyway?</source> <name>QMYSQLDriver</name> <message> <source>Unable to open database '</source> - <translation>無法開啟資料庫</translation> + <translation>無法開啟資料庫 '</translation> </message> <message> <source>Unable to connect</source> @@ -2267,7 +2267,7 @@ Do you want to delete it anyway?</source> </message> <message> <source>Protocol type not supported</source> - <translation>ä¸æ”¯æ´å”定類型</translation> + <translation>å”定類型ä¸æ”¯æ´</translation> </message> <message> <source>Invalid socket descriptor</source> @@ -2389,11 +2389,11 @@ Do you want to delete it anyway?</source> </message> <message> <source>Error while downloading %1: %2</source> - <translation>在下載 %1 時錯誤: %2</translation> + <translation>下載 %1 時錯誤: %2</translation> </message> <message> <source>Error while uploading %1: %2</source> - <translation>在上傳 %1 時錯誤: %2</translation> + <translation>上傳 %1 時錯誤: %2</translation> </message> </context> <context> @@ -2404,7 +2404,7 @@ Do you want to delete it anyway?</source> </message> <message> <source>Protocol "%1" is unknown</source> - <translation>å”è° "%1" 未知</translation> + <translation>å”定 "%1" 未知</translation> </message> </context> <context> @@ -2567,7 +2567,7 @@ Do you want to delete it anyway?</source> </message> <message> <source>Protocol error: packet of size 0 received</source> - <translation>å”è°éŒ¯èª¤: æ”¶åˆ°å¤§å° 0 çš„å°åŒ…</translation> + <translation>å”定錯誤: æ”¶åˆ°å¤§å° 0 çš„å°åŒ…</translation> </message> </context> <context> @@ -3044,7 +3044,7 @@ Please choose a different file name.</source> </message> <message> <source>Color Mode</source> - <translation>色彩模å¼</translation> + <translation>彩色模å¼</translation> </message> <message> <source>Color</source> @@ -3508,7 +3508,7 @@ Please choose a different file name.</source> </message> <message> <source>Volume Up</source> - <translation>å¢žåŠ éŸ³é‡</translation> + <translation>æ高音é‡</translation> </message> <message> <source>Bass Boost</source> @@ -3847,7 +3847,7 @@ Please choose a different file name.</source> </message> <message> <source>Error while reading: %1</source> - <translation>讀å–時的錯誤: %1</translation> + <translation>讀å–時錯誤: %1</translation> </message> <message> <source>Error during SSL handshake: %1</source> @@ -4041,11 +4041,11 @@ Please choose a different file name.</source> <name>QWebFrame</name> <message> <source>Request cancelled</source> - <translation>å–消è¦æ±‚</translation> + <translation>請求已å–消</translation> </message> <message> <source>Request blocked</source> - <translation>å°éŽ–è¦æ±‚</translation> + <translation>請求已å°éŽ–</translation> </message> <message> <source>Cannot show URL</source> @@ -4088,7 +4088,7 @@ Please choose a different file name.</source> <message> <source>This is a searchable index. Enter search keywords: </source> <comment>text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index'</comment> - <translation>這是å¯æœå°‹çš„索引。 輸入æœå°‹é—œéµå—:</translation> + <translation>這是å¯æœå°‹çš„索引。 輸入æœå°‹é—œéµå—: </translation> </message> <message> <source>Choose File</source> @@ -4193,7 +4193,7 @@ Please choose a different file name.</source> <message> <source>Look Up In Dictionary</source> <comment>Look Up in Dictionary context menu item</comment> - <translation>翻閱å—å…¸</translation> + <translation>查詢å—å…¸</translation> </message> <message> <source>Open Link</source> @@ -4341,7 +4341,7 @@ Please choose a different file name.</source> </message> <message> <source>Commit</source> - <translation>註解</translation> + <translation>èªå¯</translation> </message> <message> <source>Done</source> @@ -4475,7 +4475,7 @@ Please choose a different file name.</source> </message> <message> <source>version expected while reading the XML declaration</source> - <translation>é æœŸè®€å– XML 宣告時的版本</translation> + <translation>åœ¨è®€å– XML 宣告時é 期的版本</translation> </message> <message> <source>wrong value for standalone declaration</source> @@ -4495,7 +4495,7 @@ Please choose a different file name.</source> </message> <message> <source>letter is expected</source> - <translation>å—æ¯é 計</translation> + <translation>é 期å—æ¯</translation> </message> <message> <source>error occurred while parsing comment</source> @@ -4546,7 +4546,7 @@ Please choose a different file name.</source> </message> <message> <source>Sequence ']]>' not allowed in content.</source> - <translation>內容ä¸ä¸å…許åºåˆ— &apos;]]&gt;&apos; 。</translation> + <translation>內容ä¸ä¸å…許åºåˆ— ']]>'。</translation> </message> <message> <source>Namespace prefix '%1' not declared</source> @@ -4594,7 +4594,7 @@ Please choose a different file name.</source> </message> <message> <source>Expected </source> - <translation>é 期的</translation> + <translation>é 期的 </translation> </message> <message> <source>, but got '</source> @@ -4602,7 +4602,7 @@ Please choose a different file name.</source> </message> <message> <source>Unexpected '</source> - <translation>未é 期 '</translation> + <translation>未é 期的 '</translation> </message> <message> <source>Expected character data.</source> @@ -4697,7 +4697,7 @@ Please choose a different file name.</source> </message> <message> <source>Day %1 is outside the range %2..%3.</source> - <translation>天 %1 è¶…å‡ºç¯„åœ %2..%3 。</translation> + <translation>天 %1 超出 %2..%3 範åœã€‚</translation> </message> <message> <source>Month %1 is outside the range %2..%3.</source> @@ -4709,15 +4709,15 @@ Please choose a different file name.</source> </message> <message> <source>Day %1 is invalid for month %2.</source> - <translation>å°æ–¼æœˆ %2 天 %1 是無效的。</translation> + <translation>%2 月的 %1 天無效。</translation> </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> - <translation>時間 %1:%2:%3.%4 無效。</translation> + <translation>時間 %1:%2:%3。 %4 無效。</translation> </message> <message> <source>Overflow: Date can't be represented.</source> @@ -4733,7 +4733,7 @@ Please choose a different file name.</source> </message> <message> <source>No operand in an integer division, %1, can be %2.</source> - <translation>沒有é‹ç®—元在整數除法, %1, å¯ä»¥æ˜¯ %2。</translation> + <translation>沒有é‹ç®—元在整數除法, %1，å¯ä»¥æ˜¯ %2。</translation> </message> <message> <source>The first operand in an integer division, %1, cannot be infinity (%2).</source> @@ -4765,11 +4765,11 @@ Please choose a different file name.</source> </message> <message> <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source> - <translation>ä¸å…許類型 %1 的值除以 %2 (ä¸æ˜¯æ•¸å—) 。</translation> + <translation>ä¸å…許類型 %1 的值除以 %2 (ä¸æ˜¯æ•¸å—)。</translation> </message> <message> <source>Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.</source> - <translation>ä¸å…許類型 %1 的值除以 %2 或 %3 (åŠ ä¸Šæˆ–æ¸›åŽ»é›¶) 。</translation> + <translation>ä¸å…許類型 %1 的值除以 %2 或 %3 (åŠ ä¸Šæˆ–æ¸›åŽ»é›¶)。</translation> </message> <message> <source>Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.</source> @@ -4801,7 +4801,7 @@ Please choose a different file name.</source> </message> <message> <source>Operator %1 cannot be used on type %2.</source> - <translation>%1 é‹ç®—åä¸èƒ½ä½¿ç”¨åœ¨é¡žåž‹ %2。</translation> + <translation>%1 é‹ç®—åä¸èƒ½ç”¨åœ¨é¡žåž‹ %2。</translation> </message> <message> <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source> @@ -5061,11 +5061,11 @@ Please choose a different file name.</source> </message> <message> <source>Module imports must occur before function, variable, and option declarations.</source> - <translation>æ¨¡çµ„å°Žå…¥å¿…é ˆå‡ºç¾åœ¨å‡½æ•¸ã€ 變數和é¸é …çš„è²æ˜Žã€‚</translation> + <translation>æ¨¡çµ„åŒ¯å…¥å¿…é ˆå‡ºç¾åœ¨å‡½æ•¸ã€ 變數和é¸é …è²æ˜Žä¹‹å‰ã€‚</translation> </message> <message> <source>It is not possible to redeclare prefix %1.</source> - <translation>ä¸èƒ½ redeclare 首碼 %1。</translation> + <translation>無法é‡æ–°å®£å‘Šå—首 %1。</translation> </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> @@ -5185,7 +5185,7 @@ Please choose a different file name.</source> </message> <message> <source>%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.</source> - <translation>%1 是一個複雜類型。 轉æ›ç‚ºè¤‡é›œé¡žåž‹æ˜¯ä¸å¯èƒ½çš„。 然而，能轉æ›ç‚ºåŽŸå類型如 %2 。</translation> + <translation>%1 是一個複雜類型。 轉æ›ç‚ºè¤‡é›œé¡žåž‹æ˜¯ä¸å¯èƒ½çš„。 然而，能轉æ›ç‚ºåŽŸå類型如 %2。</translation> </message> <message> <source>%1 is not an atomic type. Casting is only possible to atomic types.</source> @@ -5229,7 +5229,7 @@ Please choose a different file name.</source> </message> <message> <source>Promoting %1 to %2 may cause loss of precision.</source> - <translation>æ昇 %1 為 %2 å¯èƒ½é€ æˆéºå¤±ç²¾ç¢ºåº¦ã€‚</translation> + <translation>æ昇 %1 為 %2 å¯èƒ½é€ æˆç²¾ç¢ºåº¦éºå¤±ã€‚</translation> </message> <message> <source>The focus is undefined.</source> diff --git a/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp b/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp index f1fdbf071..af9b02a6d 100644 --- a/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMediumTypeChangeDialog.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIMediumTypeChangeDialog.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp index d1a9c7915..543bb3595 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxAboutDlg.cpp 37762 2011-07-04 12:55:46Z vboxsync $ */ +/* $Id: VBoxAboutDlg.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp index 0e35a5fd4..654a9ed99 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxFBOverlay.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: VBoxFBOverlay.cpp $ */ /** @file * VBoxFBOverlay implementation */ diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp index d449a70b9..793e3854e 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxFBQGL.cpp 29794 2010-05-25 16:06:59Z vboxsync $ */ +/* $Id: VBoxFBQGL.cpp $ */ /** @file * VBoxFBQGL Opengl-based FrameBuffer implementation */ diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp index fcded7777..67d603d5b 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGLSupportInfo.cpp 36386 2011-03-24 06:51:19Z vboxsync $ */ +/* $Id: VBoxGLSupportInfo.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp index 0c661da47..e46ad71d1 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGlobalSettings.cpp 37544 2011-06-17 13:54:47Z vboxsync $ */ +/* $Id: VBoxGlobalSettings.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp index 41823d738..1e6d537dc 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxLicenseViewer.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: VBoxLicenseViewer.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp index ff11788b7..8763837f2 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxMediaManagerDlg.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: VBoxMediaManagerDlg.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxMedium.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxMedium.cpp index 1e8d38f94..8963715e3 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxMedium.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxMedium.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxMedium.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: VBoxMedium.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp index 0d7071dea..75264e300 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxSnapshotDetailsDlg.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: VBoxSnapshotDetailsDlg.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp index bf621c3c2..430341b67 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxTakeSnapshotDlg.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: VBoxTakeSnapshotDlg.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp deleted file mode 100644 index f135c261b..000000000 --- a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp +++ /dev/null @@ -1,465 +0,0 @@ -/** @file - * - * VBox frontends: Qt4 GUI ("VirtualBox"): - * VBoxUpdateDlg class implementation - */ - -/* - * Copyright (C) 2006-2011 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -#ifdef VBOX_WITH_PRECOMPILED_HEADERS -#include "precomp.h" -#else /* !VBOX_WITH_PRECOMPILED_HEADERS */ -/* Global includes */ -#include <QNetworkAccessManager> -#include <QNetworkReply> -/* Local includes */ -#include "VBoxUpdateDlg.h" -#include "VBoxGlobal.h" -#include "UIMessageCenter.h" -#include "UIIconPool.h" -#include "VBoxUtils.h" -#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */ - -/** - * This class is used to store VBox version data. - */ -class VBoxVersion -{ -public: - - VBoxVersion(const QString &strVersion) - : x(0), y(0), z(0) - { - QStringList versionStack = strVersion.split('.'); - if (versionStack.size() > 0) - x = versionStack[0].toInt(); - if (versionStack.size() > 1) - y = versionStack[1].toInt(); - if (versionStack.size() > 2) - z = versionStack[2].toInt(); - } - - bool operator<(const VBoxVersion &other) const - { - return (x < other.x) || - (x == other.x && y < other.y) || - (x == other.x && y == other.y && z < other.z); - } - - QString toString() const - { - return QString("%1.%2.%3").arg(x).arg(y).arg(z); - } - -private: - - int x; - int y; - int z; -}; - -/* VBoxUpdateData stuff: */ -QList<UpdateDay> VBoxUpdateData::m_dayList = QList<UpdateDay>(); - -void VBoxUpdateData::populate() -{ - m_dayList.clear(); - - /* To avoid re-translation complexity all - * have to be retranslated separately: */ - - /* Separately retranslate each day: */ - m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 day"), "1 d"); - m_dayList << UpdateDay(VBoxUpdateDlg::tr("2 days"), "2 d"); - m_dayList << UpdateDay(VBoxUpdateDlg::tr("3 days"), "3 d"); - m_dayList << UpdateDay(VBoxUpdateDlg::tr("4 days"), "4 d"); - m_dayList << UpdateDay(VBoxUpdateDlg::tr("5 days"), "5 d"); - m_dayList << UpdateDay(VBoxUpdateDlg::tr("6 days"), "6 d"); - - /* Separately retranslate each week */ - m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 week"), "1 w"); - m_dayList << UpdateDay(VBoxUpdateDlg::tr("2 weeks"), "2 w"); - m_dayList << UpdateDay(VBoxUpdateDlg::tr("3 weeks"), "3 w"); - - /* Separately retranslate each month */ - m_dayList << UpdateDay(VBoxUpdateDlg::tr("1 month"), "1 m"); -} - -QStringList VBoxUpdateData::list() -{ - QStringList result; - for (int i = 0; i < m_dayList.size(); ++i) - result << m_dayList[i].val; - return result; -} - -VBoxUpdateData::VBoxUpdateData(const QString &strData) - : m_strData(strData) - , m_periodIndex(Period1Day) - , m_branchIndex(BranchStable) -{ - decode(); -} - -VBoxUpdateData::VBoxUpdateData(PeriodType periodIndex, BranchType branchIndex) - : m_strData(QString()) - , m_periodIndex(periodIndex) - , m_branchIndex(branchIndex) -{ - encode(); -} - -bool VBoxUpdateData::isNecessary() -{ - return m_periodIndex != PeriodNever && QDate::currentDate() >= m_date; -} - -bool VBoxUpdateData::isNoNeedToCheck() -{ - return m_periodIndex == PeriodNever; -} - -QString VBoxUpdateData::data() const -{ - return m_strData; -} - -VBoxUpdateData::PeriodType VBoxUpdateData::periodIndex() const -{ - return m_periodIndex; -} - -QString VBoxUpdateData::date() const -{ - return m_periodIndex == PeriodNever ? VBoxUpdateDlg::tr("Never") - : m_date.toString(Qt::LocaleDate); -} - -VBoxUpdateData::BranchType VBoxUpdateData::branchIndex() const -{ - return m_branchIndex; -} - -QString VBoxUpdateData::branchName() const -{ - switch (m_branchIndex) - { - case BranchStable: - return "stable"; - case BranchAllRelease: - return "allrelease"; - case BranchWithBetas: - return "withbetas"; - } - return QString(); -} - -void VBoxUpdateData::decode() -{ - /* Parse standard values: */ - if (m_strData == "never") - m_periodIndex = PeriodNever; - /* Parse other values: */ - else - { - QStringList parser(m_strData.split(", ", QString::SkipEmptyParts)); - - /* Parse 'period' value: */ - if (parser.size() > 0) - { - if (m_dayList.isEmpty()) - populate(); - PeriodType index = (PeriodType)m_dayList.indexOf(UpdateDay(QString(), parser[0])); - m_periodIndex = index == PeriodUndefined ? Period1Day : index; - } - - /* Parse 'date' value: */ - if (parser.size() > 1) - { - QDate date = QDate::fromString(parser[1], Qt::ISODate); - m_date = date.isValid() ? date : QDate::currentDate(); - } - - /* Parse 'branch' value: */ - if (parser.size() > 2) - { - QString branch(parser[2]); - m_branchIndex = branch == "withbetas" ? BranchWithBetas : - branch == "allrelease" ? BranchAllRelease : BranchStable; - } - } -} - -void VBoxUpdateData::encode() -{ - /* Encode standard values: */ - if (m_periodIndex == PeriodNever) - m_strData = "never"; - /* Encode other values: */ - else - { - /* Encode 'period' value: */ - if (m_dayList.isEmpty()) - populate(); - QString remindPeriod = m_dayList[m_periodIndex].key; - - /* Encode 'date' value: */ - m_date = QDate::currentDate(); - QStringList parser(remindPeriod.split(' ')); - if (parser[1] == "d") - m_date = m_date.addDays(parser[0].toInt()); - else if (parser[1] == "w") - m_date = m_date.addDays(parser[0].toInt() * 7); - else if (parser[1] == "m") - m_date = m_date.addMonths(parser[0].toInt()); - QString remindDate = m_date.toString(Qt::ISODate); - - /* Encode 'branch' value: */ - QString branchValue = m_branchIndex == BranchWithBetas ? "withbetas" : - m_branchIndex == BranchAllRelease ? "allrelease" : "stable"; - - /* Composite m_strData: */ - m_strData = QString("%1, %2, %3").arg(remindPeriod, remindDate, branchValue); - } -} - -/* VBoxUpdateDlg stuff: */ -bool VBoxUpdateDlg::isNecessary() -{ - VBoxUpdateData data(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)); - return data.isNecessary(); -} - -VBoxUpdateDlg::VBoxUpdateDlg(VBoxUpdateDlg **ppSelf, bool fForceRun, QWidget *pParent) - : QIWithRetranslateUI<QDialog>(pParent) - , m_ppSelf(ppSelf) - , m_pNetworkManager(new QNetworkAccessManager(this)) - , m_url("http://update.virtualbox.org/query.php") - , m_fForceRun(fForceRun) -{ - /* Store external pointer to this dialog: */ - *m_ppSelf = this; - - /* Apply UI decorations: */ - Ui::VBoxUpdateDlg::setupUi(this); - - /* Apply window icons: */ - setWindowIcon(UIIconPool::iconSetFull(QSize(32, 32), QSize(16, 16), - ":/refresh_32px.png", ":/refresh_16px.png")); - - /* Setup other connections: */ - connect(mBtnCheck, SIGNAL(clicked()), this, SLOT(search())); - connect(mBtnFinish, SIGNAL(clicked()), this, SLOT(accept())); - connect(this, SIGNAL(sigDelayedAcception()), this, SLOT(accept()), Qt::QueuedConnection); - - /* Setup initial condition: */ - mPbCheck->setMinimumWidth(mLogoUpdate->width() + mLogoUpdate->frameWidth() * 2); - mPbCheck->hide(); - mTextSuccessInfo->hide(); - mTextFailureInfo->hide(); - mTextNotFoundInfo->hide(); - - /* Retranslate string constants: */ - retranslateUi(); -} - -VBoxUpdateDlg::~VBoxUpdateDlg() -{ - /* Erase dialog handle in config file: */ - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDlgWinID, QString()); - - /* Erase external pointer to this dialog: */ - *m_ppSelf = 0; -} - -void VBoxUpdateDlg::retranslateUi() -{ - /* Translate uic generated strings: */ - Ui::VBoxUpdateDlg::retranslateUi(this); - - /* For wizard update: */ - if (!isHidden()) - { - setWindowTitle(tr("VirtualBox Update Wizard")); - - mPageUpdateHdr->setText(tr("Check for Updates")); - mBtnCheck->setText(tr("Chec&k")); - mBtnCancel->setText(tr("Cancel")); - - mPageFinishHdr->setText(tr("Summary")); - mBtnFinish->setText(tr("&Close")); - - mTextUpdateInfo->setText(tr("<p>This wizard will connect to the VirtualBox " - "web-site and check if a newer version of " - "VirtualBox is available.</p><p>Use the " - "<b>Check</b> button to check for a new version " - "now or the <b>Cancel</b> button if you do not " - "want to perform this check.</p><p>You can run " - "this wizard at any time by choosing <b>Check " - "for Updates...</b> from the <b>Help</b> menu.</p>")); - - mTextSuccessInfo->setText(tr("<p>A new version of VirtualBox has been released! " - "Version <b>%1</b> is available at " - "<a href=\"http://www.virtualbox.org/\">virtualbox.org</a>.</p>" - "<p>You can download this version using the link:</p>" - "<p><a href=%2>%3</a></p>")); - - mTextFailureInfo->setText(tr("<p>Unable to obtain the new version information " - "due to the following network error:</p><p><b>%1</b></p>")); - - mTextNotFoundInfo->setText(tr("You are already running the most recent version of VirtualBox.")); - } -} - -void VBoxUpdateDlg::accept() -{ - /* Recalculate new update data: */ - VBoxUpdateData oldData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)); - VBoxUpdateData newData(oldData.periodIndex(), oldData.branchIndex()); - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data()); - /* Call to base-class: */ - QDialog::accept(); -} - -void VBoxUpdateDlg::search() -{ - /* Calculate the count of checks left: */ - int cCount = 1; - QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount); - if (!strCount.isEmpty()) - { - bool ok = false; - int c = strCount.toLongLong(&ok); - if (ok) cCount = c; - } - - /* Compose query: */ - QUrl url(m_url); - url.addQueryItem("platform", vboxGlobal().virtualBox().GetPackageType()); - /* Branding: Check whether we have a local branding file which tells us our version suffix "FOO" - (e.g. 3.06.54321_FOO) to identify this installation */ - if (vboxGlobal().brandingIsActive()) - { - url.addQueryItem("version", QString("%1_%2_%3").arg(vboxGlobal().virtualBox().GetVersion()) - .arg(vboxGlobal().virtualBox().GetRevision()) - .arg(vboxGlobal().brandingGetKey("VerSuffix"))); - } - else - { - /* Use hard coded version set by VBOX_VERSION_STRING: */ - url.addQueryItem("version", QString("%1_%2").arg(vboxGlobal().virtualBox().GetVersion()) - .arg(vboxGlobal().virtualBox().GetRevision())); - } - url.addQueryItem("count", QString::number(cCount)); - url.addQueryItem("branch", VBoxUpdateData(vboxGlobal().virtualBox(). - GetExtraData(VBoxDefs::GUI_UpdateDate)).branchName()); - QString strUserAgent(QString("VirtualBox %1 <%2>") - .arg(vboxGlobal().virtualBox().GetVersion()) - .arg(vboxGlobal().platformInfo())); - - /* Show progress bar: */ - mPbCheck->show(); - - /* Setup GET request: */ - QNetworkRequest request; - request.setUrl(url); - request.setRawHeader("User-Agent", strUserAgent.toAscii()); - QNetworkReply *pReply = m_pNetworkManager->get(request); - connect(pReply, SIGNAL(finished()), this, SLOT(sltHandleReply())); - connect(pReply, SIGNAL(sslErrors(QList<QSslError>)), pReply, SLOT(ignoreSslErrors())); -} - -void VBoxUpdateDlg::sltHandleReply() -{ - /* Get corresponding network reply object: */ - QNetworkReply *pReply = qobject_cast<QNetworkReply*>(sender()); - /* And ask it for suicide: */ - pReply->deleteLater(); - - /* Hide progress bar: */ - mPbCheck->hide(); - - /* Handle normal result: */ - if (pReply->error() == QNetworkReply::NoError) - { - /* Deserialize incoming data: */ - QString strResponseData(pReply->readAll()); - - /* Newer version of necessary package found: */ - if (strResponseData.indexOf(QRegExp("^\\d+\\.\\d+\\.\\d+ \\S+$")) == 0) - { - QStringList response = strResponseData.split(" ", QString::SkipEmptyParts); - - /* For background update: */ - if (isHidden()) - { - msgCenter().showUpdateSuccess(vboxGlobal().mainWindow(), response[0], response[1]); - acceptLater(); - } - /* For wizard update: */ - else - { - mTextSuccessInfo->setText(mTextSuccessInfo->text().arg(response[0], response[1], response[1])); - mTextSuccessInfo->show(); - mPageStack->setCurrentIndex(1); - } - } - /* No newer version of necessary package found: */ - else - { - /* For background update: */ - if (isHidden()) - { - if (m_fForceRun) - msgCenter().showUpdateNotFound(vboxGlobal().mainWindow()); - acceptLater(); - } - /* For wizard update: */ - else - { - mTextNotFoundInfo->show(); - mPageStack->setCurrentIndex(1); - } - } - - /* Save left count of checks: */ - int cCount = 1; - QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount); - if (!strCount.isEmpty()) - { - bool ok = false; - int c = strCount.toLongLong(&ok); - if (ok) cCount = c; - } - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateCheckCount, QString("%1").arg((qulonglong)cCount + 1)); - } - /* Handle errors: */ - else - { - /* For background update: */ - if (isHidden()) - { - if (m_fForceRun) - msgCenter().showUpdateFailure(vboxGlobal().mainWindow(), pReply->errorString()); - acceptLater(); - } - /* For wizard update: */ - else - { - mTextFailureInfo->setText(mTextFailureInfo->text().arg(pReply->errorString())); - mTextFailureInfo->show(); - mPageStack->setCurrentIndex(1); - } - } -} - diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp index 80c249bb3..dfa5be24d 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxVMInformationDlg.cpp 35761 2011-01-28 13:19:26Z vboxsync $ */ +/* $Id: VBoxVMInformationDlg.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp index 8c17ea424..448e026d5 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxVMLogViewer.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: VBoxVMLogViewer.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp index d4f9bee6b..5a69aeac6 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp @@ -1,4 +1,4 @@ -/* $Id: QIAdvancedSlider.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QIAdvancedSlider.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp index 987ad299d..773adb8c6 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp @@ -1,4 +1,4 @@ -/* $Id: QIArrowButtonPress.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: QIArrowButtonPress.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp index 4075a22ee..062cefb99 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp @@ -1,4 +1,4 @@ -/* $Id: QIArrowButtonSwitch.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: QIArrowButtonSwitch.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp index 64bf62196..b55758ff9 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp @@ -1,4 +1,4 @@ -/* $Id: QIArrowSplitter.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QIArrowSplitter.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp index 527bda80d..46f10cb1c 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp @@ -1,4 +1,4 @@ -/* $Id: QIDialog.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QIDialog.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp index b372a1283..84cfca887 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp @@ -1,4 +1,4 @@ -/* $Id: QIDialogButtonBox.cpp 30356 2010-06-22 08:42:22Z vboxsync $ */ +/* $Id: QIDialogButtonBox.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp index ace6753bd..9ff1008bd 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp @@ -1,4 +1,4 @@ -/* $Id: QIFileDialog.cpp 37629 2011-06-24 12:46:48Z vboxsync $ */ +/* $Id: QIFileDialog.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp index 4e51505e5..3898d7d63 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp @@ -1,4 +1,4 @@ -/* $Id: QILabel.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: QILabel.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp index 2f1fc1de9..a0ebcfb7f 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp @@ -1,4 +1,4 @@ -/* $Id: QILabelSeparator.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QILabelSeparator.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp index fc5c311c2..42eaf8e20 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp @@ -1,4 +1,4 @@ -/* $Id: QILineEdit.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QILineEdit.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp index 6e4023e25..54ff879f1 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp @@ -1,4 +1,4 @@ -/* $Id: QIListView.cpp 34064 2010-11-15 11:12:37Z vboxsync $ */ +/* $Id: QIListView.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp index c1b5ead58..8f8355028 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp @@ -1,4 +1,4 @@ -/* $Id: QIMainDialog.cpp 35131 2010-12-15 13:19:00Z vboxsync $ */ +/* $Id: QIMainDialog.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp index 7846abcee..10df2e2d7 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp @@ -1,4 +1,4 @@ -/* $Id: QIMessageBox.cpp 38373 2011-08-09 10:25:57Z vboxsync $ */ +/* $Id: QIMessageBox.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp index 5f41fd837..fe776077d 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp @@ -1,4 +1,4 @@ -/* $Id: QIRichToolButton.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QIRichToolButton.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp index 9af79a277..4ebdf9b29 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp @@ -1,4 +1,4 @@ -/* $Id: QISplitter.cpp 30868 2010-07-16 09:42:12Z vboxsync $ */ +/* $Id: QISplitter.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.cpp index 15ea3531b..5cbb21073 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.cpp @@ -1,4 +1,4 @@ -/* $Id: QIStateIndicator.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: QIStateIndicator.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp index 42cea93de..6aa7bde06 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp @@ -1,4 +1,4 @@ -/* $Id: QIStatusBar.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QIStatusBar.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp index fb51a5b79..964cf5d1f 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp @@ -1,4 +1,4 @@ -/* $Id: QITableView.cpp 31533 2010-08-10 13:08:56Z vboxsync $ */ +/* $Id: QITableView.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp index 2ab67624b..7c42e72bf 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp @@ -1,4 +1,4 @@ -/* $Id: QITreeView.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QITreeView.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp index af057d911..e03966a78 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp @@ -1,4 +1,4 @@ -/* $Id: QITreeWidget.cpp 37610 2011-06-23 12:26:14Z vboxsync $ */ +/* $Id: QITreeWidget.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp index e8d54ec65..012c4aa75 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp @@ -1,4 +1,4 @@ -/* $Id: QIWidgetValidator.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: QIWidgetValidator.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp index 85ebfeade..d2bfaa7f0 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp @@ -1,4 +1,4 @@ -/* $Id: QIWizard.cpp 35234 2010-12-20 09:40:31Z vboxsync $ */ +/* $Id: QIWizard.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp b/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp index 3543defcf..3eee51917 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp @@ -1,4 +1,4 @@ -/* $Id: COMDefs.cpp 37015 2011-05-09 14:11:00Z vboxsync $ */ +/* $Id: COMDefs.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp index 322765f04..910c6b0dd 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp @@ -1,4 +1,4 @@ -/* $Id: UIActionPool.cpp 38355 2011-08-08 15:27:10Z vboxsync $ */ +/* $Id: UIActionPool.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp index 936d27425..24d7763bb 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: UIExtraDataEventHandler.cpp 35722 2011-01-26 16:37:16Z vboxsync $ */ +/* $Id: UIExtraDataEventHandler.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp index 1ce6a6bf8..7caaf05d5 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp @@ -1,4 +1,4 @@ -/* $Id: UIIconPool.cpp 30206 2010-06-15 15:41:05Z vboxsync $ */ +/* $Id: UIIconPool.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp index fa4e996f1..5a94870b5 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp @@ -1,4 +1,4 @@ -/* $Id: UIImageTools.cpp 35424 2011-01-07 13:05:41Z vboxsync $ */ +/* $Id: UIImageTools.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp index 90e27ec8a..b6356c483 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMainEventListener.cpp 37712 2011-06-30 14:11:14Z vboxsync $ */ +/* $Id: UIMainEventListener.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp index 622cf89b0..fe5dc163f 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMessageCenter.cpp 38337 2011-08-08 09:05:36Z vboxsync $ */ +/* $Id: UIMessageCenter.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -21,6 +21,7 @@ #include <QDir> #include <QDesktopWidget> #include <QFileInfo> +#include <QLocale> #include <QThread> #ifdef Q_WS_MAC # include <QPushButton> @@ -1702,14 +1703,14 @@ void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) .arg(strMachineName)); } -bool UIMessageCenter::confirmDownloadAdditions(const QString &strUrl, - ulong uSize) +bool UIMessageCenter::confirmDownloadAdditions(const QString &strUrl, qulonglong uSize) { + QLocale loc(VBoxGlobal::languageId()); return messageOkCancel(mainMachineWindowShown(), Question, tr("<p>Are you sure you want to download the VirtualBox " "Guest Additions CD image from " "<nobr><a href=\"%1\">%2</a></nobr> " - "(size %3 bytes)?</p>").arg(strUrl).arg(strUrl).arg(uSize), + "(size %3 bytes)?</p>").arg(strUrl).arg(strUrl).arg(loc.toString(uSize)), 0, /* pcszAutoConfirmId */ tr("Download", "additions")); } @@ -1747,13 +1748,14 @@ bool UIMessageCenter::askAboutUserManualDownload(const QString &strMissedLocatio tr("Download", "additions")); } -bool UIMessageCenter::confirmUserManualDownload(const QString &strURL, ulong uSize) +bool UIMessageCenter::confirmUserManualDownload(const QString &strURL, qulonglong uSize) { + QLocale loc(VBoxGlobal::languageId()); return messageOkCancel(mainWindowShown(), Question, tr("<p>Are you sure you want to download the VirtualBox " "User Manual from " "<nobr><a href=\"%1\">%2</a></nobr> " - "(size %3 bytes)?</p>").arg(strURL).arg(strURL).arg(uSize), + "(size %3 bytes)?</p>").arg(strURL).arg(strURL).arg(loc.toString(uSize)), 0, /* Auto-confirm Id */ tr("Download", "additions")); } @@ -1787,6 +1789,57 @@ void UIMessageCenter::warnAboutUserManualCantBeSaved(const QString &strURL, cons .arg(strURL).arg(strURL).arg(strTarget)); } +bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) +{ + return messageOkCancel(mainWindowShown(), Question, + tr("<p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p>" + "<p>Do you wish to download latest one from the Internet?</p>") + .arg(strExtPackVersion).arg(strExtPackName), + 0, /* Auto-confirm Id */ + tr("Download", "extension pack")); +} + +bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) +{ + QLocale loc(VBoxGlobal::languageId()); + return messageOkCancel(mainWindowShown(), Question, + tr("<p>Are you sure you want to download the <b><nobr>%1</nobr></b> " + "from <nobr><a href=\"%2\">%2</a></nobr> (size %3 bytes)?</p>") + .arg(strExtPackName, strURL, loc.toString(uSize)), + 0, /* Auto-confirm Id */ + tr("Download", "extension pack")); +} + +bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) +{ + return messageOkCancel(mainWindowShown(), Question, + tr("<p>The <b><nobr>%1</nobr></b> has been " + "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> " + "and saved locally as <nobr><b>%3</b>.</nobr></p>" + "<p>Do you wish to install this extension pack?</p>") + .arg(strExtPackName, strFrom, strTo), + 0, /* Auto-confirm Id */ + tr ("Install", "extension pack")); +} + +void UIMessageCenter::warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo) +{ + message(mainWindowShown(), Error, + tr("<p>The <b><nobr>%1</nobr></b> has been " + "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> " + "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>" + "<p>Please choose another location for that file.</p>") + .arg(strExtPackName, strFrom, strTo)); +} + +void UIMessageCenter::cannotDownloadExtensionPack(const QString &strExtPackName, const QString &strFrom, const QString &strError) +{ + message(mainWindowShown(), Error, + tr("<p>Failed to download the <b><nobr>%1</nobr></b> " + "from <nobr><a href=\"%2\">%2</a>.</nobr></p><p>%3</p>") + .arg(strExtPackName, strFrom, strError)); +} + void UIMessageCenter::cannotConnectRegister(QWidget *pParent, const QString &strUrl, const QString &strReason) @@ -2833,7 +2886,7 @@ void UIMessageCenter::sltShowHelpHelpDialog() UIDownloaderUserManual *pDl = UIDownloaderUserManual::create(); /* Configure User Manual downloader: */ CVirtualBox vbox = vboxGlobal().virtualBox(); - pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_OSE")) + strShortFileName); + pDl->addSource(QString("http://download.virtualbox.org/virtualbox/%1/").arg(vboxGlobal().vboxVersionStringNormalized()) + strShortFileName); pDl->addSource(QString("http://download.virtualbox.org/virtualbox/") + strShortFileName); pDl->setTarget(strUserManualFileName2); pDl->setParentWidget(mainWindowShown()); diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h b/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h index bf1ad991a..602b54812 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h @@ -299,16 +299,22 @@ public: int cannotFindGuestAdditions(const QString &strSrc1, const QString &strSrc2); void cannotDownloadGuestAdditions(const QString &strUrl, const QString &strReason); void cannotMountGuestAdditions(const QString &strMachineName); - bool confirmDownloadAdditions(const QString &strUrl, ulong uSize); + bool confirmDownloadAdditions(const QString &strUrl, qulonglong uSize); bool confirmMountAdditions(const QString &strUrl, const QString &strSrc); void warnAboutAdditionsCantBeSaved(const QString &strTarget); bool askAboutUserManualDownload(const QString &strMissedLocation); - bool confirmUserManualDownload(const QString &strURL, ulong uSize); + bool confirmUserManualDownload(const QString &strURL, qulonglong uSize); void warnAboutUserManualCantBeDownloaded(const QString &strURL, const QString &strReason); void warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget); void warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget); + bool proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion); + bool confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize); + bool proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo); + void warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo); + void cannotDownloadExtensionPack(const QString &strExtPackName, const QString &strFrom, const QString &strError); + void cannotConnectRegister(QWidget *pParent, const QString &strUrl, const QString &strReason); diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp index 134ccb80f..5b775ede0 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDefs.cpp 35897 2011-02-08 13:25:30Z vboxsync $ */ +/* $Id: VBoxDefs.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -23,6 +23,10 @@ /* Global includes */ #include <QStringList> +/* VBoxGlobalDefs stuff: */ +const char* VBoxGlobalDefs::UI_ExtPackName = "Oracle VM VirtualBox Extension Pack"; + +/* VBoxDefs stuff: */ const char* VBoxDefs::GUI_LastWindowPosition = "GUI/LastWindowPosition"; const char* VBoxDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition"; const char* VBoxDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition"; @@ -43,6 +47,7 @@ const char* VBoxDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment"; const char* VBoxDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide"; const char* VBoxDefs::GUI_LastCloseAction = "GUI/LastCloseAction"; const char* VBoxDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions"; +const char* VBoxDefs::GUI_CloseActionHook = "GUI/CloseActionHook"; const char* VBoxDefs::GUI_SuppressMessages = "GUI/SuppressMessages"; const char* VBoxDefs::GUI_PermanentSharedFoldersAtRuntime = "GUI/PermanentSharedFoldersAtRuntime"; const char* VBoxDefs::GUI_LanguageId = "GUI/LanguageID"; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h b/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h index 8c9932814..87e2c145c 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h @@ -47,6 +47,15 @@ #define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0])) #endif +/** + * Common global VBox namespace. + * Later it will replace VBoxDefs struct used as global VBox namespace. + */ +namespace VBoxGlobalDefs +{ + extern const char *UI_ExtPackName; +} + /** Common namespace for all enums */ struct VBoxDefs { @@ -118,6 +127,7 @@ struct VBoxDefs static const char* GUI_MiniToolBarAutoHide; static const char* GUI_LastCloseAction; static const char* GUI_RestrictedCloseActions; + static const char* GUI_CloseActionHook; static const char* GUI_SuppressMessages; static const char* GUI_PermanentSharedFoldersAtRuntime; static const char* GUI_LanguageId; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp index 478353086..f446d9bcd 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGlobal.cpp 38421 2011-08-11 14:55:02Z vboxsync $ */ +/* $Id: VBoxGlobal.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -28,16 +28,18 @@ #include "QIMessageBox.h" #include "QIDialogButtonBox.h" #include "UIIconPool.h" +#include "UIActionPoolSelector.h" +#include "UIActionPoolRuntime.h" #include "UIExtraDataEventHandler.h" #include "QIFileDialog.h" #include "UINetworkManager.h" +#include "UIUpdateManager.h" #include "UIMachine.h" #include "UISession.h" #ifdef VBOX_WITH_REGISTRATION # include "UIRegistrationWzd.h" #endif -#include "VBoxUpdateDlg.h" #ifdef VBOX_WITH_VIDEOHWACCEL # include "VBoxFBOverlay.h" #endif /* VBOX_WITH_VIDEOHWACCEL */ @@ -270,7 +272,6 @@ VBoxGlobal::VBoxGlobal() #ifdef VBOX_WITH_REGISTRATION , mRegDlg (NULL) #endif - , mUpdDlg (NULL) #ifdef VBOX_GUI_WITH_SYSTRAY , mIsTrayMenu (false) , mIncreasedWindowCounter (false) @@ -374,6 +375,16 @@ uint VBoxGlobal::qtCTVersion() ct_ver_str.section ('.', 2, 2).toInt(); } +QString VBoxGlobal::vboxVersionString() const +{ + return mVBox.GetVersion(); +} + +QString VBoxGlobal::vboxVersionStringNormalized() const +{ + return vboxVersionString().remove(VBOX_BUILD_PUBLISHER); +} + bool VBoxGlobal::isBeta() const { return mVBox.GetVersion().contains("BETA", Qt::CaseInsensitive); @@ -4466,7 +4477,10 @@ quint64 VBoxGlobal::required3DWddmOffscreenVideoMemory(const QString &strGuestOS /* static */ bool VBoxGlobal::isWddmCompatibleOsType(const QString &strGuestOSTypeId) { - return strGuestOSTypeId.startsWith("WindowsVista") || strGuestOSTypeId.startsWith("Windows7") || strGuestOSTypeId.startsWith("Windows2008"); + return strGuestOSTypeId.startsWith("WindowsVista") + || strGuestOSTypeId.startsWith("Windows7") + || strGuestOSTypeId.startsWith("Windows8") + || strGuestOSTypeId.startsWith("Windows2008"); } #endif /* VBOX_WITH_CRHGSMI */ @@ -4612,67 +4626,6 @@ void VBoxGlobal::showRegistrationDialog (bool aForce) #endif } -/** - * Shows the VirtualBox version check & update dialog. - * - * @note that this method is not part of UIMessageCenter (like e.g. - * UIMessageCenter::sltShowHelpAboutDialog()) because it is tied to - * VBoxCallback::OnExtraDataChange() handling performed by VBoxGlobal. - * - * @param aForce - */ -void VBoxGlobal::showUpdateDialog (bool aForce) -{ - /* Silently check in one day after current time-stamp */ - QTimer::singleShot (24 /* hours */ * 60 /* minutes */ * - 60 /* seconds */ * 1000 /* milliseconds */, - this, SLOT (perDayNewVersionNotifier())); - - bool isNecessary = VBoxUpdateDlg::isNecessary(); - - if (!aForce && !isNecessary) - return; - - if (mUpdDlg) - { - if (!mUpdDlg->isHidden()) - { - mUpdDlg->setWindowState (mUpdDlg->windowState() & ~Qt::WindowMinimized); - mUpdDlg->raise(); - mUpdDlg->activateWindow(); - } - } - else - { - /* Store the ID of the main window to ensure that only one - * update dialog is shown at a time. Due to manipulations with - * OnExtraDataCanChange() and OnExtraDataChange() signals, this extra - * data item acts like an inter-process mutex, so the first process - * that attempts to set it will win, the rest will get a failure from - * the SetExtraData() call. */ - mVBox.SetExtraData (VBoxDefs::GUI_UpdateDlgWinID, - QString ("%1").arg ((qulonglong) mMainWindow->winId())); - - if (mVBox.isOk()) - { - /* We've got the "mutex", create a new update dialog */ - VBoxUpdateDlg *dlg = new VBoxUpdateDlg (&mUpdDlg, aForce, 0); - dlg->setAttribute (Qt::WA_DeleteOnClose); - Assert (dlg == mUpdDlg); - - /* Update dialog always in background mode for now. - * if (!aForce && isAutomatic) */ - mUpdDlg->search(); - /* else mUpdDlg->show(); */ - } - } -} - -void VBoxGlobal::perDayNewVersionNotifier() -{ - showUpdateDialog (false /* force show? */); -} - void VBoxGlobal::sltGUILanguageChange(QString strLang) { loadLanguage(strLang); @@ -4930,6 +4883,8 @@ void VBoxGlobal::init() {"Windows2008_64", ":/os_win2k8_64.png"}, {"Windows7", ":/os_win7.png"}, {"Windows7_64", ":/os_win7_64.png"}, + {"Windows8", ":/os_win8.png"}, + {"Windows8_64", ":/os_win8_64.png"}, {"WindowsNT", ":/os_win_other.png"}, {"OS2Warp3", ":/os_os2warp3.png"}, {"OS2Warp4", ":/os_os2warp4.png"}, @@ -5243,8 +5198,17 @@ void VBoxGlobal::init() /* Handle global settings change for the first time: */ sltProcessGlobalSettingChange(); + /* Create action pool: */ + if (isVMConsoleProcess()) + UIActionPoolRuntime::create(); + else + UIActionPoolSelector::create(); + /* Create network manager: */ UINetworkManager::create(); + + /* Schedule update manager: */ + UIUpdateManager::schedule(); } @@ -5255,9 +5219,18 @@ void VBoxGlobal::init() */ void VBoxGlobal::cleanup() { + /* Shutdown update manager: */ + UIUpdateManager::shutdown(); + /* Destroy network manager: */ UINetworkManager::destroy(); + /* Destroy action pool: */ + if (isVMConsoleProcess()) + UIActionPoolRuntime::destroy(); + else + UIActionPoolSelector::destroy(); + /* sanity check */ if (!sVBoxGlobalInCleanup) { diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h index f38690052..258b4e949 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h @@ -127,6 +127,9 @@ public: static QString qtCTVersionString(); static uint qtCTVersion(); + QString vboxVersionString() const; + QString vboxVersionStringNormalized() const; + QString versionString() const { return mVerString; } bool isBeta() const; @@ -770,8 +773,6 @@ public slots: bool openURL (const QString &aURL); void showRegistrationDialog (bool aForce = true); - void showUpdateDialog (bool aForce = true); - void perDayNewVersionNotifier(); void sltGUILanguageChange(QString strLang); void sltProcessGlobalSettingChange(); @@ -805,7 +806,6 @@ private: #ifdef VBOX_WITH_REGISTRATION UIRegistrationWzd *mRegDlg; #endif - VBoxUpdateDlg *mUpdDlg; QString vmUuid; QList<QUrl> m_ArgUrlList; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h b/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h index f4b99586f..138f8d013 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h @@ -194,6 +194,58 @@ private: QString m_strAuthPassword; }; +/** + * VBoxVersion represents VirtualBox version parser + */ +class VBoxVersion +{ +public: + + VBoxVersion(const QString &strVersion) + : m_x(0), m_y(0), m_z(0) + { + QStringList versionStack = strVersion.split('.'); + if (versionStack.size() > 0) + m_x = versionStack[0].toInt(); + if (versionStack.size() > 1) + m_y = versionStack[1].toInt(); + if (versionStack.size() > 2) + m_z = versionStack[2].toInt(); + } + + bool equal(const VBoxVersion &other) const { return (m_x == other.m_x) && (m_y == other.m_y) && (m_z == other.m_z); } + bool operator==(const VBoxVersion &other) const { return equal(other); } + bool operator!=(const VBoxVersion &other) const { return !equal(other); } + + bool operator<(const VBoxVersion &other) const + { + return (m_x < other.m_x) || + (m_x == other.m_x && m_y < other.m_y) || + (m_x == other.m_x && m_y == other.m_y && m_z < other.m_z); + } + bool operator>(const VBoxVersion &other) const + { + return (m_x > other.m_x) || + (m_x == other.m_x && m_y > other.m_y) || + (m_x == other.m_x && m_y == other.m_y && m_z > other.m_z); + } + + QString toString() const + { + return QString("%1.%2.%3").arg(m_x).arg(m_y).arg(m_z); + } + + int x() const { return m_x; } + int y() const { return m_y; } + int z() const { return m_z; } + +private: + + int m_x; + int m_y; + int m_z; +}; + #ifdef Q_WS_MAC # include "VBoxUtils-darwin.h" #endif /* Q_WS_MAC */ diff --git a/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp b/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp index b7468f1d8..a36825f96 100644 --- a/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp +++ b/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp @@ -1,4 +1,4 @@ -/* $Id: hardenedmain.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: hardenedmain.cpp $ */ /** @file * VirtualBox - Hardened main(). */ diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/VirtualBox/src/main.cpp index 80acfd89e..a26fe221e 100644 --- a/src/VBox/Frontends/VirtualBox/src/main.cpp +++ b/src/VBox/Frontends/VirtualBox/src/main.cpp @@ -1,4 +1,4 @@ -/* $Id: main.cpp 38324 2011-08-05 14:02:53Z vboxsync $ */ +/* $Id: main.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -525,9 +525,6 @@ extern "C" DECLEXPORT(int) TrustedMain (int argc, char **argv, char ** /*envp*/) #ifdef VBOX_WITH_REGISTRATION_REQUEST vboxGlobal().showRegistrationDialog (false /* aForce */); #endif -#ifdef VBOX_WITH_UPDATE_REQUEST - vboxGlobal().showUpdateDialog (false /* aForce */); -#endif #ifdef VBOX_GUI_WITH_SYSTRAY } diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp index 31ae18b8b..42f235afc 100644 --- a/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp +++ b/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp @@ -1,4 +1,4 @@ -/* $Id: UIDownloader.cpp 38421 2011-08-11 14:55:02Z vboxsync $ */ +/* $Id: UIDownloader.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp index 83c39603c..2697f83be 100644 --- a/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp +++ b/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp @@ -1,4 +1,4 @@ -/* $Id: UIDownloaderAdditions.cpp 38421 2011-08-11 14:55:02Z vboxsync $ */ +/* $Id: UIDownloaderAdditions.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp new file mode 100644 index 000000000..d61e29c3d --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp @@ -0,0 +1,149 @@ +/* $Id: UIDownloaderExtensionPack.cpp $ */ +/** @file + * + * VBox frontends: Qt GUI ("VirtualBox"): + * UIDownloader for extension pack + */ + +/* + * Copyright (C) 2011 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +/* Global includes: */ +#include <QDir> +#include <QFile> +#include <QNetworkReply> + +/* Local includes: */ +#include "UIDownloaderExtensionPack.h" +#include "VBoxGlobal.h" +#include "UIMessageCenter.h" +#include "QIFileDialog.h" +#include "VBoxDefs.h" + +/* Using declarations: */ +using namespace VBoxGlobalDefs; + +/* UIMiniProgressWidget stuff: */ +UIMiniProgressWidgetExtension::UIMiniProgressWidgetExtension(const QString &strSource, QWidget *pParent /* = 0 */) + : QIWithRetranslateUI<UIMiniProgressWidget>(pParent) +{ + sltSetSource(strSource); + retranslateUi(); +} + +void UIMiniProgressWidgetExtension::retranslateUi() +{ + setCancelButtonToolTip(tr("Cancel the <nobr><b>%1</b></nobr> download").arg(UI_ExtPackName)); + setProgressBarToolTip(tr("Downloading the <nobr><b>%1</b></nobr> from <nobr><b>%2</b>...</nobr>") + .arg(UI_ExtPackName, source())); +} + +/* UIDownloaderExtensionPack stuff: */ +UIDownloaderExtensionPack* UIDownloaderExtensionPack::m_pInstance = 0; + +/* static */ +void UIDownloaderExtensionPack::download(QObject *pListener) +{ + /* Create downloader instance: */ + UIDownloaderExtensionPack *pDownloader = new UIDownloaderExtensionPack; + pDownloader->setParentWidget(msgCenter().mainWindowShown()); + + /* Configure connections for the passed listener: */ + connect(pDownloader, SIGNAL(sigToStartAcknowledging()), + pListener, SIGNAL(sigDownloaderCreatedForExtensionPack())); + connect(pDownloader, SIGNAL(sigNotifyAboutExtensionPackDownloaded(const QString &, const QString &)), + pListener, SLOT(sltHandleDownloadedExtensionPack(const QString &, const QString &))); +} + +UIDownloaderExtensionPack::UIDownloaderExtensionPack() +{ + /* Prepare instance: */ + if (!m_pInstance) + m_pInstance = this; + + /* Prepare source/target: */ + QString strExtPackUnderscoredName(QString(UI_ExtPackName).replace(' ', '_')); + QString strTemplateSourcePath("http://download.virtualbox.org/virtualbox/%1/"); + QString strTemplateSourceName(QString("%1-%2.vbox-extpack").arg(strExtPackUnderscoredName)); + QString strSourcePath(strTemplateSourcePath.arg(vboxGlobal().vboxVersionStringNormalized())); + QString strSourceName(strTemplateSourceName.arg(vboxGlobal().vboxVersionStringNormalized())); + QString strSource(strSourcePath + strSourceName); + QString strTargetPath(vboxGlobal().virtualBox().GetHomeFolder()); + QString strTargetName(strSourceName); + QString strTarget(QDir(strTargetPath).absoluteFilePath(strTargetName)); + + /* Set source/target: */ + setSource(strSource); + setTarget(strTarget); + + /* Start downloading: */ + start(); +} + +UIDownloaderExtensionPack::~UIDownloaderExtensionPack() +{ + /* Cleanup instance: */ + if (m_pInstance == this) + m_pInstance = 0; +} + +UIMiniProgressWidget* UIDownloaderExtensionPack::createProgressWidgetFor(QWidget *pParent) const +{ + return new UIMiniProgressWidgetExtension(source(), pParent); +} + +bool UIDownloaderExtensionPack::askForDownloadingConfirmation(QNetworkReply *pReply) +{ + return msgCenter().confirmDownloadExtensionPack(UI_ExtPackName, source(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt()); +} + +void UIDownloaderExtensionPack::handleDownloadedObject(QNetworkReply *pReply) +{ + /* Read received data into buffer: */ + QByteArray receivedData(pReply->readAll()); + /* Serialize the incoming buffer into the file: */ + while (true) + { + /* Try to open file for writing: */ + QFile file(target()); + if (file.open(QIODevice::WriteOnly)) + { + /* Write incoming buffer into the file: */ + file.write(receivedData); + file.close(); + /* Notify listener about extension pack was downloaded: */ + emit sigNotifyAboutExtensionPackDownloaded(source(), target()); + break; + } + else + { + /* Warn the user about extension pack was downloaded but was NOT saved, explain it: */ + msgCenter().warnAboutExtentionPackCantBeSaved(UI_ExtPackName, source(), QDir::toNativeSeparators(target())); + } + + /* Ask the user for another location for the extension pack file: */ + QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(), parentWidget(), + tr("Select folder to save %1 to").arg(UI_ExtPackName), true); + + /* Check if user had really set a new target: */ + if (!strTarget.isNull()) + setTarget(QDir(strTarget).absoluteFilePath(QFileInfo(target()).fileName())); + else + break; + } +} + +void UIDownloaderExtensionPack::warnAboutNetworkError(const QString &strError) +{ + return msgCenter().cannotDownloadExtensionPack(UI_ExtPackName, source(), strError); +} + diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.h b/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.h new file mode 100644 index 000000000..8798a5fee --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.h @@ -0,0 +1,75 @@ +/** @file + * + * VBox frontends: Qt GUI ("VirtualBox"): + * UIDownloader for extension pack + */ + +/* + * Copyright (C) 2011 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifndef __UIDownloaderExtensionPack_h__ +#define __UIDownloaderExtensionPack_h__ + +/* Local includes: */ +#include "QIWithRetranslateUI.h" +#include "UIDownloader.h" + +/* UIMiniProgressWidget reimplementation for the VirtualBox extension pack downloading: */ +class UIMiniProgressWidgetExtension : public QIWithRetranslateUI<UIMiniProgressWidget> +{ + Q_OBJECT; + +public: + + /* Constructor: */ + UIMiniProgressWidgetExtension(const QString &strSource, QWidget *pParent = 0); + +private: + + /* Translating stuff: */ + void retranslateUi(); +}; + +/* UIDownloader reimplementation for the VirtualBox Extension Pack updating: */ +class UIDownloaderExtensionPack : public UIDownloader +{ + Q_OBJECT; + +public: + + /* Returns updater if exists: */ + static UIDownloaderExtensionPack* current() { return m_pInstance; } + /* Start downloading: */ + static void download(QObject *pListener); + +signals: + + /* Notify listeners about extension pack downloaded: */ + void sigNotifyAboutExtensionPackDownloaded(const QString &strSource, const QString &strTarget); + +private: + + /* Constructor/destructor: */ + UIDownloaderExtensionPack(); + ~UIDownloaderExtensionPack(); + + /* Virtual methods reimplementations: */ + UIMiniProgressWidget* createProgressWidgetFor(QWidget *pParent) const; + bool askForDownloadingConfirmation(QNetworkReply *pReply); + void handleDownloadedObject(QNetworkReply *pReply); + void warnAboutNetworkError(const QString &strError); + + /* Variables: */ + static UIDownloaderExtensionPack *m_pInstance; +}; + +#endif // __UIDownloaderExtensionPack_h__ diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp index 579831681..05d2eb42e 100644 --- a/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp +++ b/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp @@ -1,4 +1,4 @@ -/* $Id: UIDownloaderUserManual.cpp 38421 2011-08-11 14:55:02Z vboxsync $ */ +/* $Id: UIDownloaderUserManual.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp index 8c50862e9..d73e100eb 100644 --- a/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp +++ b/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp @@ -1,4 +1,4 @@ -/* $Id: UINetworkManager.cpp 38421 2011-08-11 14:55:02Z vboxsync $ */ +/* $Id: UINetworkManager.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp new file mode 100644 index 000000000..212ede8e4 --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp @@ -0,0 +1,193 @@ +/* $Id: UIUpdateDefs.cpp $ */ +/** @file + * + * VBox frontends: Qt4 GUI ("VirtualBox"): + * Update routine related implementations + */ + +/* + * Copyright (C) 2006-2011 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +/* Global includes: */ +#include <QCoreApplication> +#include <QStringList> + +/* Local includes: */ +#include "UIUpdateDefs.h" + +/* static: */ +VBoxUpdateDayList VBoxUpdateData::m_dayList = VBoxUpdateDayList(); + +/* static */ +void VBoxUpdateData::populate() +{ + /* Clear list initially: */ + m_dayList.clear(); + + /* To avoid re-translation complexity + * all values will be retranslated separately: */ + + /* Separately retranslate each day: */ + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "1 day"), "1 d"); + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "2 days"), "2 d"); + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "3 days"), "3 d"); + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "4 days"), "4 d"); + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "5 days"), "5 d"); + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "6 days"), "6 d"); + + /* Separately retranslate each week: */ + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "1 week"), "1 w"); + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "2 weeks"), "2 w"); + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "3 weeks"), "3 w"); + + /* Separately retranslate each month: */ + m_dayList << VBoxUpdateDay(QCoreApplication::translate("UIUpdateManager", "1 month"), "1 m"); +} + +/* static */ +QStringList VBoxUpdateData::list() +{ + QStringList result; + for (int i = 0; i < m_dayList.size(); ++i) + result << m_dayList[i].val; + return result; +} + +VBoxUpdateData::VBoxUpdateData(const QString &strData) + : m_strData(strData) + , m_periodIndex(Period1Day) + , m_branchIndex(BranchStable) +{ + decode(); +} + +VBoxUpdateData::VBoxUpdateData(PeriodType periodIndex, BranchType branchIndex) + : m_strData(QString()) + , m_periodIndex(periodIndex) + , m_branchIndex(branchIndex) +{ + encode(); +} + +bool VBoxUpdateData::isNoNeedToCheck() const +{ + return m_periodIndex == PeriodNever; +} + +bool VBoxUpdateData::isNeedToCheck() const +{ + return !isNoNeedToCheck() && QDate::currentDate() >= m_date; +} + +QString VBoxUpdateData::data() const +{ + return m_strData; +} + +VBoxUpdateData::PeriodType VBoxUpdateData::periodIndex() const +{ + return m_periodIndex; +} + +QString VBoxUpdateData::date() const +{ + return isNoNeedToCheck() ? QCoreApplication::translate("UIUpdateManager", "Never") : m_date.toString(Qt::LocaleDate); +} + +VBoxUpdateData::BranchType VBoxUpdateData::branchIndex() const +{ + return m_branchIndex; +} + +QString VBoxUpdateData::branchName() const +{ + switch (m_branchIndex) + { + case BranchStable: + return "stable"; + case BranchAllRelease: + return "allrelease"; + case BranchWithBetas: + return "withbetas"; + } + return QString(); +} + +void VBoxUpdateData::decode() +{ + /* Parse standard values: */ + if (m_strData == "never") + m_periodIndex = PeriodNever; + /* Parse other values: */ + else + { + QStringList parser(m_strData.split(", ", QString::SkipEmptyParts)); + + /* Parse 'period' value: */ + if (parser.size() > 0) + { + if (m_dayList.isEmpty()) + populate(); + PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0])); + m_periodIndex = index == PeriodUndefined ? Period1Day : index; + } + + /* Parse 'date' value: */ + if (parser.size() > 1) + { + QDate date = QDate::fromString(parser[1], Qt::ISODate); + m_date = date.isValid() ? date : QDate::currentDate(); + } + + /* Parse 'branch' value: */ + if (parser.size() > 2) + { + QString branch(parser[2]); + m_branchIndex = branch == "withbetas" ? BranchWithBetas : + branch == "allrelease" ? BranchAllRelease : BranchStable; + } + } +} + +void VBoxUpdateData::encode() +{ + /* Encode standard values: */ + if (m_periodIndex == PeriodNever) + m_strData = "never"; + /* Encode other values: */ + else + { + /* Encode 'period' value: */ + if (m_dayList.isEmpty()) + populate(); + QString remindPeriod = m_dayList[m_periodIndex].key; + + /* Encode 'date' value: */ + m_date = QDate::currentDate(); + QStringList parser(remindPeriod.split(' ')); + if (parser[1] == "d") + m_date = m_date.addDays(parser[0].toInt()); + else if (parser[1] == "w") + m_date = m_date.addDays(parser[0].toInt() * 7); + else if (parser[1] == "m") + m_date = m_date.addMonths(parser[0].toInt()); + QString remindDate = m_date.toString(Qt::ISODate); + + /* Encode 'branch' value: */ + QString branchValue = m_branchIndex == BranchWithBetas ? "withbetas" : + m_branchIndex == BranchAllRelease ? "allrelease" : "stable"; + + /* Composite m_strData: */ + m_strData = QString("%1, %2, %3").arg(remindPeriod, remindDate, branchValue); + } +} + diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.h b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.h index 7b068d1c2..a7243b50c 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.h +++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.h @@ -1,7 +1,7 @@ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): - * VBoxUpdateDlg class declaration + * Update routine related declarations */ /* @@ -16,44 +16,31 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#ifndef __VBoxUpdateDlg_h__ -#define __VBoxUpdateDlg_h__ +#ifndef __UIUpdateDefs_h__ +#define __UIUpdateDefs_h__ /* Global includes: */ #include <QDate> -#include <QUrl> -/* Local includes */ -#include "QIWithRetranslateUI.h" -#include "VBoxUpdateDlg.gen.h" - -/* Forward declarations: */ -class QNetworkAccessManager; - -/** - * This structure is used to store retranslated reminder values. - */ -struct UpdateDay +/* This structure is used to store retranslated reminder values. */ +struct VBoxUpdateDay { - UpdateDay(const QString &strVal, const QString &strKey) + VBoxUpdateDay(const QString &strVal, const QString &strKey) : val(strVal), key(strKey) {} - bool operator==(const UpdateDay &other) - { - return val == other.val || key == other.key; - } + bool operator==(const VBoxUpdateDay &other) { return val == other.val || key == other.key; } QString val; QString key; }; +typedef QList<VBoxUpdateDay> VBoxUpdateDayList; -/** - * This class is used to encode/decode the registration data. - */ +/* This class is used to encode/decode update data. */ class VBoxUpdateData { public: + /* Period types: */ enum PeriodType { PeriodNever = -2, @@ -70,6 +57,7 @@ public: Period1Month = 9 }; + /* Branch types: */ enum BranchType { BranchStable = 0, @@ -77,15 +65,17 @@ public: BranchWithBetas = 2 }; + /* Public static helpers: */ static void populate(); static QStringList list(); + /* Constructors: */ VBoxUpdateData(const QString &strData); VBoxUpdateData(PeriodType periodIndex, BranchType branchIndex); - bool isNecessary(); - bool isNoNeedToCheck(); - + /* Public helpers: */ + bool isNoNeedToCheck() const; + bool isNeedToCheck() const; QString data() const; PeriodType periodIndex() const; QString date() const; @@ -94,55 +84,16 @@ public: private: - /* Private functions */ + /* Private helpers: */ void decode(); void encode(); - /* Private variables */ - static QList <UpdateDay> m_dayList; - + /* Private variables: */ + static VBoxUpdateDayList m_dayList; QString m_strData; PeriodType m_periodIndex; QDate m_date; BranchType m_branchIndex; }; -class VBoxUpdateDlg : public QIWithRetranslateUI<QDialog>, public Ui::VBoxUpdateDlg -{ - Q_OBJECT; - -public: - - static bool isNecessary(); - - VBoxUpdateDlg(VBoxUpdateDlg **ppSelf, bool fForceRun, QWidget *pParent = 0); - ~VBoxUpdateDlg(); - -signals: - - void sigDelayedAcception(); - -public slots: - - void search(); - -protected: - - void retranslateUi(); - void acceptLater() { emit sigDelayedAcception(); } - -private slots: - - void accept(); - void sltHandleReply(); - -private: - - VBoxUpdateDlg **m_ppSelf; - QNetworkAccessManager *m_pNetworkManager; - QUrl m_url; - bool m_fForceRun; -}; - -#endif // __VBoxUpdateDlg_h__ - +#endif // __UIUpdateDefs_h__ diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp new file mode 100644 index 000000000..001a320f0 --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp @@ -0,0 +1,266 @@ +/* $Id: UIUpdateManager.cpp $ */ +/** @file + * + * VBox frontends: Qt4 GUI ("VirtualBox"): + * UIUpdateManager class implementation + */ + +/* + * Copyright (C) 2006-2011 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +/* Global includes: */ +#include <QEventLoop> +#include <QNetworkReply> +#include <QTimer> +#include <QDir> + +#include <VBox/version.h> + +/* Local includes: */ +#include "UIUpdateManager.h" +#include "UINetworkManager.h" +#include "VBoxGlobal.h" +#include "UIMessageCenter.h" +#include "VBoxUtils.h" +#include "UIDownloaderExtensionPack.h" +#include "UIGlobalSettingsExtension.h" +#include "VBoxDefs.h" + +/* Using declarations: */ +using namespace VBoxGlobalDefs; + +/* UIUpdateManager stuff: */ +UIUpdateManager* UIUpdateManager::m_pInstance = 0; + +/* static */ +void UIUpdateManager::schedule() +{ + /* Ensure instance is NOT created: */ + if (m_pInstance) + return; + + /* Create instance: */ + new UIUpdateManager; +} + +/* static */ +void UIUpdateManager::shutdown() +{ + /* Ensure instance is created: */ + if (!m_pInstance) + return; + + /* Delete instance: */ + delete m_pInstance; +} + +void UIUpdateManager::sltForceCheck() +{ + /* Force call for new version check: */ + sltCheckIfUpdateIsNecessary(true); +} + +UIUpdateManager::UIUpdateManager() + : m_uTime(1 /* day */ * 24 /* hours */ * 60 /* minutes */ * 60 /* seconds */ * 1000 /* ms */) +{ + /* Prepare instance: */ + if (m_pInstance != this) + m_pInstance = this; + +#ifdef VBOX_WITH_UPDATE_REQUEST + /* Ask updater to check for the first time: */ + QTimer::singleShot(0, this, SLOT(sltCheckIfUpdateIsNecessary())); +#endif /* VBOX_WITH_UPDATE_REQUEST */ +} + +UIUpdateManager::~UIUpdateManager() +{ + /* Cleanup instance: */ + if (m_pInstance == this) + m_pInstance = 0; +} + +void UIUpdateManager::sltCheckIfUpdateIsNecessary(bool fForceCall /* = false */) +{ + /* Load/decode curent update data: */ + VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)); + + /* Check if update is really neessary: */ + if (fForceCall || currentData.isNeedToCheck()) + { + /* Check if update is necessary for VirtualBox itself: */ + checkIfUpdateIsNecessary(fForceCall); + + /* Check if update is necessary for VirtualBox extension pack: */ + checkIfUpdateIsNecessaryForExtensionPack(fForceCall); + + /* Encode/save new update data: */ + VBoxUpdateData newData(currentData.periodIndex(), currentData.branchIndex()); + vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data()); + } + +#ifdef VBOX_WITH_UPDATE_REQUEST + /* Ask updater to check for the next time: */ + QTimer::singleShot(m_uTime, this, SLOT(sltCheckIfUpdateIsNecessary())); +#endif /* VBOX_WITH_UPDATE_REQUEST */ +} + +void UIUpdateManager::checkIfUpdateIsNecessary(bool fForceCall) +{ + /* Creating VirtualBox version checker: */ + UINewVersionChecker checker(fForceCall); + /* Start synchronous check: */ + checker.checkForTheNewVersion(); +} + +void UIUpdateManager::checkIfUpdateIsNecessaryForExtensionPack(bool /* fForceCall */) +{ + /* Check if updater instance already created: */ + if (UIDownloaderExtensionPack::current()) + return; + + /* Get extension pack information: */ + CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName); + /* Check if extension pack is really installed: */ + if (extPack.isNull()) + return; + + /* Get VirtualBox version: */ + VBoxVersion vboxVersion(vboxGlobal().vboxVersionStringNormalized()); + /* Get extension pack version: */ + QString strExtPackVersion(extPack.GetVersion().remove(VBOX_BUILD_PUBLISHER)); + VBoxVersion extPackVersion(strExtPackVersion); + /* Check if extension pack version less than required: */ + if ((vboxVersion.z() % 2 != 0) /* Skip unstable VBox version */ || + !(extPackVersion < vboxVersion) /* Ext Pack version more or equal to VBox version */) + return; + + /* Ask the user about extension pack downloading: */ + if (!msgCenter().proposeDownloadExtensionPack(UI_ExtPackName, strExtPackVersion)) + return; + + /* Run downloader for VirtualBox extension pack: */ + UIDownloaderExtensionPack::download(this); +} + +void UIUpdateManager::sltHandleDownloadedExtensionPack(const QString &strSource, const QString &strTarget) +{ + /* Warn the user about extension pack was downloaded and saved, propose to install it: */ + if (msgCenter().proposeInstallExtentionPack(UI_ExtPackName, strSource, QDir::toNativeSeparators(strTarget))) + UIGlobalSettingsExtension::doInstallation(strTarget, msgCenter().mainWindowShown(), NULL); +} + +/* UINewVersionChecker stuff: */ +UINewVersionChecker::UINewVersionChecker(bool fForceCall) + : m_url("http://update.virtualbox.org/query.php") + , m_fForceCall(fForceCall) + , m_pLoop(new QEventLoop(this)) +{ +} + +void UINewVersionChecker::checkForTheNewVersion() +{ + /* Calculate the count of checks left: */ + int cCount = 1; + QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount); + if (!strCount.isEmpty()) + { + bool ok = false; + int c = strCount.toLongLong(&ok); + if (ok) cCount = c; + } + + /* Compose query: */ + QUrl url(m_url); + url.addQueryItem("platform", vboxGlobal().virtualBox().GetPackageType()); + /* Check if branding is active: */ + if (vboxGlobal().brandingIsActive()) + { + /* Branding: Check whether we have a local branding file which tells us our version suffix "FOO" + (e.g. 3.06.54321_FOO) to identify this installation: */ + url.addQueryItem("version", QString("%1_%2_%3").arg(vboxGlobal().virtualBox().GetVersion()) + .arg(vboxGlobal().virtualBox().GetRevision()) + .arg(vboxGlobal().brandingGetKey("VerSuffix"))); + } + else + { + /* Use hard coded version set by VBOX_VERSION_STRING: */ + url.addQueryItem("version", QString("%1_%2").arg(vboxGlobal().virtualBox().GetVersion()) + .arg(vboxGlobal().virtualBox().GetRevision())); + } + url.addQueryItem("count", QString::number(cCount)); + url.addQueryItem("branch", VBoxUpdateData(vboxGlobal().virtualBox(). + GetExtraData(VBoxDefs::GUI_UpdateDate)).branchName()); + QString strUserAgent(QString("VirtualBox %1 <%2>") + .arg(vboxGlobal().virtualBox().GetVersion()) + .arg(vboxGlobal().platformInfo())); + + /* Setup GET request: */ + QNetworkRequest request; + request.setUrl(url); + request.setRawHeader("User-Agent", strUserAgent.toAscii()); + QNetworkReply *pReply = gNetworkManager->get(request); + connect(pReply, SIGNAL(finished()), this, SLOT(sltHandleCheckReply())); + connect(pReply, SIGNAL(sslErrors(QList<QSslError>)), pReply, SLOT(ignoreSslErrors())); + + /* Lock event loop: */ + m_pLoop->exec(); +} + +void UINewVersionChecker::sltHandleCheckReply() +{ + /* Get corresponding network reply object: */ + QNetworkReply *pReply = qobject_cast<QNetworkReply*>(sender()); + /* And ask it for suicide: */ + pReply->deleteLater(); + + /* Handle normal result: */ + if (pReply->error() == QNetworkReply::NoError) + { + /* Deserialize incoming data: */ + QString strResponseData(pReply->readAll()); + + /* Newer version of necessary package found: */ + if (strResponseData.indexOf(QRegExp("^\\d+\\.\\d+\\.\\d+ \\S+$")) == 0) + { + QStringList response = strResponseData.split(" ", QString::SkipEmptyParts); + msgCenter().showUpdateSuccess(vboxGlobal().mainWindow(), response[0], response[1]); + } + /* No newer version of necessary package found: */ + else + { + if (m_fForceCall) + msgCenter().showUpdateNotFound(vboxGlobal().mainWindow()); + } + + /* Save left count of checks: */ + int cCount = 1; + QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount); + if (!strCount.isEmpty()) + { + bool ok = false; + int c = strCount.toLongLong(&ok); + if (ok) cCount = c; + } + vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateCheckCount, QString("%1").arg((qulonglong)cCount + 1)); + } + /* Handle errors: */ + else + { + if (m_fForceCall) + msgCenter().showUpdateFailure(vboxGlobal().mainWindow(), pReply->errorString()); + } + + /* Unlock event loop: */ + m_pLoop->exit(); +} + diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.h b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.h new file mode 100644 index 000000000..e7daaaa6b --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.h @@ -0,0 +1,106 @@ +/** @file + * + * VBox frontends: Qt4 GUI ("VirtualBox"): + * UIUpdateManager class declaration + */ + +/* + * Copyright (C) 2006-2011 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifndef __UIUpdateManager_h__ +#define __UIUpdateManager_h__ + +/* Global includes: */ +#include <QUrl> + +/* Local includes: */ +#include "UIUpdateDefs.h" + +/* Forward declarations: */ +class QEventLoop; + +/* Singleton to check for the new VirtualBox version. + * Performs update of required parts if necessary. */ +class UIUpdateManager : public QObject +{ + Q_OBJECT; + +public: + + /* Schedule manager: */ + static void schedule(); + /* Shutdown manager: */ + static void shutdown(); + /* Manager instance: */ + static UIUpdateManager* instance() { return m_pInstance; } + +signals: + + /* Signal to notify listeners about downloading: */ + void sigDownloaderCreatedForExtensionPack(); + +public slots: + + /* Force call for new version check: */ + void sltForceCheck(); + +private slots: + + /* Slot to check if update is necessary: */ + void sltCheckIfUpdateIsNecessary(bool fForceCall = false); + + /* Handle downloaded extension pack: */ + void sltHandleDownloadedExtensionPack(const QString &strSource, const QString &strTarget); + +private: + + /* Constructor/destructor: */ + UIUpdateManager(); + ~UIUpdateManager(); + + /* Helping stuff: */ + void checkIfUpdateIsNecessary(bool fForceCall); + void checkIfUpdateIsNecessaryForExtensionPack(bool fForceCall); + + /* Variables: */ + static UIUpdateManager* m_pInstance; + quint64 m_uTime; +}; +#define gUpdateManager UIUpdateManager::instance() + +/* Class to check for the new VirtualBox version: */ +class UINewVersionChecker : public QObject +{ + Q_OBJECT; + +public: + + /* Constructor: */ + UINewVersionChecker(bool fForceCall); + + /* Function to check if new version is available: */ + void checkForTheNewVersion(); + +private slots: + + /* Slot to analyze new version check reply: */ + void sltHandleCheckReply(); + +private: + + /* Variables: */ + QUrl m_url; + bool m_fForceCall; + QEventLoop *m_pLoop; +}; + +#endif // __UIUpdateManager_h__ diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/CocoaEventHelper.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/CocoaEventHelper.mm index b79ba32c1..9b86ac3e6 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/CocoaEventHelper.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/CocoaEventHelper.mm @@ -1,4 +1,4 @@ -/* $Id: CocoaEventHelper.mm 30122 2010-06-09 13:50:26Z vboxsync $ */ +/* $Id: CocoaEventHelper.mm $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp index 0cf8d2814..b802d1c85 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp @@ -1,4 +1,4 @@ -/* $Id: DarwinKeyboard.cpp 35873 2011-02-07 14:10:08Z vboxsync $ */ +/* $Id: DarwinKeyboard.cpp $ */ /** @file * Common GUI Library - Darwin Keyboard routines. * diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/DockIconPreview.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/DockIconPreview.h index 8a4f86abc..c4ffaef4f 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/DockIconPreview.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/DockIconPreview.h @@ -1,4 +1,4 @@ -/* $Id: DockIconPreview.h 29812 2010-05-26 11:46:22Z vboxsync $ */ +/* $Id: DockIconPreview.h $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp index fe6c17fc7..f2391f87f 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp @@ -1,4 +1,4 @@ -/* $Id: UIAbstractDockIconPreview.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: UIAbstractDockIconPreview.cpp $ */ /** @file * Qt GUI - Realtime Dock Icon Preview */ diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h index ec6c4b262..8c4c46fd2 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h @@ -1,4 +1,4 @@ -/* $Id: UIAbstractDockIconPreview.h 29823 2010-05-26 14:49:27Z vboxsync $ */ +/* $Id: UIAbstractDockIconPreview.h $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaApplication.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaApplication.mm index 96d9dbd9d..c45147102 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaApplication.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaApplication.mm @@ -1,4 +1,4 @@ -/* $Id: UICocoaApplication.mm 30154 2010-06-10 16:28:15Z vboxsync $ */ +/* $Id: UICocoaApplication.mm $ */ /** @file * UICocoaApplication - C++ interface to NSApplication for handling -sendEvent. */ diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h index c20088f9f..7bfe2d76a 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h @@ -1,4 +1,4 @@ -/* $Id: UICocoaDockIconPreview.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: UICocoaDockIconPreview.h $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.mm index 95fdd9ecf..152e5d1df 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.mm @@ -1,4 +1,4 @@ -/* $Id: UICocoaDockIconPreview.mm 30151 2010-06-10 16:12:33Z vboxsync $ */ +/* $Id: UICocoaDockIconPreview.mm $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm index ebedcd24e..e7688a9ff 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm @@ -1,4 +1,4 @@ -/* $Id: UICocoaSpecialControls.mm 37115 2011-05-16 22:44:58Z vboxsync $ */ +/* $Id: UICocoaSpecialControls.mm $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin.cpp index 4ab55aaa2..75041bd20 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: UIDesktopServices_darwin.cpp 34411 2010-11-26 16:57:30Z vboxsync $ */ +/* $Id: UIDesktopServices_darwin.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin_cocoa.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin_cocoa.mm index bc0502c42..213aafd3b 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin_cocoa.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIDesktopServices_darwin_cocoa.mm @@ -1,4 +1,4 @@ -/* $Id: UIDesktopServices_darwin_cocoa.mm 34411 2010-11-26 16:57:30Z vboxsync $ */ +/* $Id: UIDesktopServices_darwin_cocoa.mm $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp index 6acc1f3ad..1bd88925c 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp @@ -1,4 +1,4 @@ -/* $Id: UIWindowMenuManager.cpp 34401 2010-11-26 16:37:51Z vboxsync $ */ +/* $Id: UIWindowMenuManager.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h index d1e86f996..235bc0a29 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h @@ -1,4 +1,4 @@ -/* $Id: VBoxIChatTheaterWrapper.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxIChatTheaterWrapper.h $ */ /** @file * Qt GUI - iChat Theater cocoa wrapper. */ diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.m b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.m index d5f5de91a..1fd2792e8 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.m +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.m @@ -1,4 +1,4 @@ -/* $Id: VBoxIChatTheaterWrapper.m 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxIChatTheaterWrapper.m $ */ /** @file * Qt GUI - iChat Theater cocoa wrapper. */ diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm index 5fbd7d54a..cf4195177 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm @@ -1,4 +1,4 @@ -/* $Id: VBoxUtils-darwin-cocoa.mm 35870 2011-02-07 13:18:02Z vboxsync $ */ +/* $Id: VBoxUtils-darwin-cocoa.mm $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp index 030a73e96..2d9e363f7 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUtils-darwin.cpp 36534 2011-04-04 15:00:49Z vboxsync $ */ +/* $Id: VBoxUtils-darwin.cpp $ */ /** @file * Qt GUI - Utility Classes and Functions specific to Darwin. */ diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp index 84a4ae4ab..929de5335 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDarwinKeyboard.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstDarwinKeyboard.cpp $ */ /** @file * Common GUI Library - Testcase - Darwin Keyboard routines. * diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/vmstarter.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/vmstarter.mm index 23bb6e0be..f755566af 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/vmstarter.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/vmstarter.mm @@ -1,4 +1,4 @@ -/* $Id: vmstarter.mm 34275 2010-11-23 11:08:52Z vboxsync $ */ +/* $Id: vmstarter.mm $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.asm b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.asm index 40739aa46..f82fac0b6 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.asm +++ b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.asm @@ -1,4 +1,4 @@ -; $Id: VBoxHlp.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: VBoxHlp.asm $ ;; @file ; ; VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.cpp b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.cpp index 989a7606c..87244dc56 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxHlp.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxHlp.cpp $ */ /** @file * VBox frontends: Qt GUI ("VirtualBox"): * Implementation of OS/2-specific helpers that require to reside in a DLL diff --git a/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp b/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp index a5f67ef7f..7f14234ef 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp @@ -1,4 +1,4 @@ -/* $Id: UIDesktopServices_win.cpp 34415 2010-11-26 17:09:29Z vboxsync $ */ +/* $Id: UIDesktopServices_win.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.cpp b/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.cpp index fc980a52c..50ee3aea9 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUtils-win.cpp 35940 2011-02-11 11:58:32Z vboxsync $ */ +/* $Id: VBoxUtils-win.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc b/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc index 87ea3ba74..64ac53857 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc +++ b/src/VBox/Frontends/VirtualBox/src/platform/win/VirtualBox.rc @@ -1,4 +1,4 @@ -/* $Id: VirtualBox.rc 34384 2010-11-25 16:23:57Z vboxsync $ */ +/* $Id: VirtualBox.rc $ */ /** @file * Windows resource file for VirtualBox.exe. */ diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp b/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp index e4fd8dcab..6aa8200d3 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp @@ -1,4 +1,4 @@ -/* $Id: UIDesktopServices_x11.cpp 34886 2010-12-09 14:06:02Z vboxsync $ */ +/* $Id: UIDesktopServices_x11.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp index 9d70cb657..45b2e5c85 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxX11Helper.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxX11Helper.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp b/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp index 980ada621..cb9728efb 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp @@ -1,4 +1,4 @@ -/* $Id: XKeyboard-new.cpp 36335 2011-03-21 21:58:58Z vboxsync $ */ +/* $Id: XKeyboard-new.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/precomp.h b/src/VBox/Frontends/VirtualBox/src/precomp.h index 58d43eae1..778e95c1b 100644 --- a/src/VBox/Frontends/VirtualBox/src/precomp.h +++ b/src/VBox/Frontends/VirtualBox/src/precomp.h @@ -1,4 +1,4 @@ -/* $Id: precomp.h 38412 2011-08-11 09:50:04Z vboxsync $*/ +/* $Id: precomp.h $*/ /** @file * Header used if VBOX_WITH_PRECOMPILED_HEADERS is active. */ diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp index 95963db52..514fac4f6 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp @@ -1,4 +1,4 @@ -/* $Id: UIActionPoolRuntime.cpp 38398 2011-08-10 13:24:33Z vboxsync $ */ +/* $Id: UIActionPoolRuntime.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp index b444f6d28..4fa97ea27 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: UIConsoleEventHandler.cpp 37712 2011-06-30 14:11:14Z vboxsync $ */ +/* $Id: UIConsoleEventHandler.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp index 3f8681244..5526b3d5f 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp @@ -1,4 +1,4 @@ -/* $Id: UIFrameBuffer.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIFrameBuffer.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp index bb9384752..650cb5bfd 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp @@ -1,4 +1,4 @@ -/* $Id: UIFrameBufferDirectDraw.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: UIFrameBufferDirectDraw.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQGL.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQGL.cpp index c5e43f903..ecc38973e 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQGL.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQGL.cpp @@ -1,4 +1,4 @@ -/* $Id: UIFrameBufferQGL.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: UIFrameBufferQGL.cpp $ */ /** @file * VBoxFBQGL Opengl-based FrameBuffer implementation */ diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp index 03fca3218..36b0e5d08 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp @@ -1,4 +1,4 @@ -/* $Id: UIFrameBufferQImage.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIFrameBufferQImage.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp index 077be1638..0a36a080d 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp @@ -1,4 +1,4 @@ -/* $Id: UIFrameBufferQuartz2D.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIFrameBufferQuartz2D.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferSDL.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferSDL.cpp index 86ce55066..8b035679b 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferSDL.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferSDL.cpp @@ -1,4 +1,4 @@ -/* $Id: UIFrameBufferSDL.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: UIFrameBufferSDL.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp index 9e2d48e0b..2da9d00ee 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp @@ -1,4 +1,4 @@ -/* $Id: UIIndicatorsPool.cpp 38318 2011-08-04 15:51:15Z vboxsync $ */ +/* $Id: UIIndicatorsPool.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp index 44055b6a9..596617000 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: UIKeyboardHandler.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIKeyboardHandler.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -918,9 +918,6 @@ bool UIKeyboardHandler::winLowKeyboardEvent(UINT msg, const KBDLLHOOKSTRUCT &eve if (!m_views.contains(m_iKeyboardHookViewIndex)) return false; - if (!m_fIsKeyboardCaptured) - return false; - /* Sometimes it happens that Win inserts additional events on some key * press/release. For example, it prepends ALT_GR in German layout with * the VK_LCONTROL vkey with curious 0x21D scan code (seems to be necessary @@ -939,6 +936,14 @@ bool UIKeyboardHandler::winLowKeyboardEvent(UINT msg, const KBDLLHOOKSTRUCT &eve return true; } + /** @todo this needs to be after the preceding check so that + * we ignore those spurious key events even when the + * keyboard is not captured. However, that is probably a + * hint that that filtering should be done somewhere else, + * and not in the keyboard capture handler. */ + if (!m_fIsKeyboardCaptured) + return false; + /* It's possible that a key has been pressed while the keyboard was not * captured, but is being released under the capture. Detect this situation * and return false to let Windows process the message normally and update diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp index bf11657fd..2df17a4f9 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachine.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachine.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -385,9 +385,6 @@ UIMachine::UIMachine(UIMachine **ppSelf, const CSession &session) if (m_ppThis) *m_ppThis = this; - /* Create action pool: */ - UIActionPoolRuntime::create(); - /* Create UISession object: */ m_pSession = new UISession(this, m_session); @@ -417,8 +414,6 @@ UIMachine::~UIMachine() m_pSession = 0; m_session.UnlockMachine(); m_session.detach(); - /* Destroy action pool: */ - UIActionPoolRuntime::destroy(); /* Quit application: */ QApplication::quit(); } diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp index 00ffcb21e..36733e1d7 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineLogic.cpp 38431 2011-08-12 11:04:16Z vboxsync $ */ +/* $Id: UIMachineLogic.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -45,7 +45,6 @@ /* Global includes */ #include <iprt/path.h> -#include <VBox/VMMDev.h> #ifdef VBOX_WITH_DEBUGGER_GUI # include <iprt/ldr.h> @@ -1454,7 +1453,7 @@ void UIMachineLogic::sltInstallGuestAdditions() /* Check for the already registered image */ CVirtualBox vbox = vboxGlobal().virtualBox(); - QString name = QString("VBoxGuestAdditions_%1.iso").arg(vbox.GetVersion().remove("_OSE")); + const QString &name = QString("VBoxGuestAdditions_%1.iso").arg(vboxGlobal().vboxVersionStringNormalized()); CMediumVector vec = vbox.GetDVDImages(); for (CMediumVector::ConstIterator it = vec.begin(); it != vec.end(); ++ it) @@ -1470,8 +1469,8 @@ void UIMachineLogic::sltInstallGuestAdditions() int result = msgCenter().cannotFindGuestAdditions(QDir::toNativeSeparators(strSrc1), QDir::toNativeSeparators(strSrc2)); if (result == QIMessageBox::Yes) { - QString source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vbox.GetVersion().remove("_OSE")) + name; - QString target = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(name); + const QString &source = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vboxGlobal().vboxVersionStringNormalized()) + name; + const QString &target = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(name); UIDownloaderAdditions *pDl = UIDownloaderAdditions::create(); /* Configure the additions downloader. */ diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp index df3a44cd6..9cedf9c5b 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineMenuBar.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineMenuBar.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -25,6 +25,7 @@ #include "UIMessageCenter.h" #include "UIExtraDataEventHandler.h" #include "UIImageTools.h" +#include "UIUpdateManager.h" /* Global includes */ #include <QMenuBar> @@ -294,7 +295,7 @@ void UIMachineMenuBar::prepareMenuHelp(QMenu *pMenu) VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog())); VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()), - &vboxGlobal(), SLOT(showUpdateDialog())); + gUpdateManager, SLOT(sltForceCheck())); #if defined(Q_WS_MAC) && (QT_VERSION < 0x040700) } #endif diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp index ea96cb204..7fbed1cb8 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineShortcuts.cpp 36357 2011-03-23 09:36:05Z vboxsync $ */ +/* $Id: UIMachineShortcuts.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp index b9405ef86..be044115d 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineView.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineView.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -485,6 +485,11 @@ void UIMachineView::cleanupFrameBuffer() * 2. make it easier to preserve the current 2D state */ Assert(m_pFrameBuffer == uisession()->frameBuffer(screenId())); m_pFrameBuffer->setView(NULL); +#ifdef VBOX_WITH_CROGL + /* Call SetFramebuffer to ensure 3D gets notified of view being destroyed */ + CDisplay display = session().GetConsole().GetDisplay(); + display.SetFramebuffer(m_uScreenId, CFramebuffer(m_pFrameBuffer)); +#endif } else #endif /* VBOX_WITH_VIDEOHWACCEL */ diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp index 2efbc152c..def6976d0 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineWindow.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineWindow.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -197,6 +197,13 @@ void UIMachineWindow::closeEvent(QCloseEvent *pEvent) /* Get the machine: */ CMachine machine = session().GetMachine(); + /* Check if there is a close hock script defined. */ + const QString& strScript = machine.GetExtraData(VBoxDefs::GUI_CloseActionHook); + if (!strScript.isEmpty()) + { + QProcess::startDetached(strScript, QStringList() << machine.GetId()); + return; + } /* Prepare close dialog: */ UIVMCloseDialog dlg(machineWindow()); diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp index b80a181c0..735b06e2b 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMouseHandler.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIMouseHandler.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp index 741dec02f..bbe49bc23 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMultiScreenLayout.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMultiScreenLayout.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp index 00611716b..1a37d4ef5 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp @@ -1,4 +1,4 @@ -/* $Id: UISession.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UISession.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -1026,11 +1026,6 @@ void UISession::reinitMenuPool() void UISession::preparePowerUp() { -#ifdef VBOX_WITH_UPDATE_REQUEST - /* Check for updates if necessary: */ - vboxGlobal().showUpdateDialog(false /* force request? */); -#endif - /* Notify user about mouse&keyboard auto-capturing: */ if (vboxGlobal().settings().autoCapture()) msgCenter().remindAboutAutoCapture(); diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp index 0b8aa1e95..ebd02ef57 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp @@ -1,4 +1,4 @@ -/* $Id: UIVMCloseDialog.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIVMCloseDialog.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp index 66e4db31d..d21199c6e 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp @@ -1,4 +1,4 @@ -/* $Id: UIKeyboardHandlerFullscreen.cpp 35752 2011-01-28 10:57:53Z vboxsync $ */ +/* $Id: UIKeyboardHandlerFullscreen.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp index 55b189c26..8b915e6d5 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineLogicFullscreen.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineLogicFullscreen.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp index 3cf048145..410356772 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineViewFullscreen.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineViewFullscreen.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp index f3876cb4b..40ff70c3e 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineWindowFullscreen.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineWindowFullscreen.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp index 3796e4055..782417d88 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp @@ -1,4 +1,4 @@ -/* $Id: UIKeyboardHandlerNormal.cpp 35752 2011-01-28 10:57:53Z vboxsync $ */ +/* $Id: UIKeyboardHandlerNormal.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp index cf1f56f23..c96496a7b 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineLogicNormal.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineLogicNormal.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -30,6 +30,7 @@ #include "UIMachineLogicNormal.h" #include "UIMachineWindow.h" #include "UIDownloaderAdditions.h" +#include "UIDownloaderExtensionPack.h" #ifdef Q_WS_MAC #include "VBoxUtils.h" @@ -76,11 +77,14 @@ void UIMachineLogicNormal::initialize() /* Prepare normal machine window: */ prepareMachineWindows(); - /* If there is an Additions download running, update the parent window - * information. */ + /* If there is an Additions download running, update the parent window information. */ if (UIDownloaderAdditions *pDl = UIDownloaderAdditions::current()) pDl->setParentWidget(mainMachineWindow()->machineWindow()); + /* If there is an Extension Pack download running, update the parent window information. */ + if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current()) + pDl->setParentWidget(mainMachineWindow()->machineWindow()); + #ifdef Q_WS_MAC /* Prepare dock: */ prepareDock(); diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp index c48658135..98b0afc3f 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineViewNormal.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineViewNormal.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp index a9defab8f..952f1b642 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineWindowNormal.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineWindowNormal.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -36,8 +36,10 @@ #include "UIMachineLogic.h" #include "UIMachineWindowNormal.h" #include "UIMachineView.h" +#include "UIUpdateManager.h" #include "UIDownloaderAdditions.h" #include "UIDownloaderUserManual.h" +#include "UIDownloaderExtensionPack.h" #ifdef Q_WS_MAC # include "UIImageTools.h" #endif /* Q_WS_MAC */ @@ -167,20 +169,27 @@ void UIMachineWindowNormal::sltTryClose() UIMachineWindow::sltTryClose(); } -void UIMachineWindowNormal::sltDownloaderAdditionsEmbed() +void UIMachineWindowNormal::sltEmbedDownloaderForAdditions() { /* If there is an additions download running show the process bar: */ if (UIDownloaderAdditions *pDl = UIDownloaderAdditions::current()) statusBar()->addWidget(pDl->progressWidget(this), 0); } -void UIMachineWindowNormal::sltDownloaderUserManualEmbed() +void UIMachineWindowNormal::sltEmbedDownloaderForUserManual() { /* If there is an additions download running show the process bar: */ if (UIDownloaderUserManual *pDl = UIDownloaderUserManual::current()) statusBar()->addWidget(pDl->progressWidget(this), 0); } +void UIMachineWindowNormal::sltEmbedDownloaderForExtensionPack() +{ + /* If there is an extension pack download running show the process bar: */ + if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current()) + statusBar()->addWidget(pDl->progressWidget(this), 0); +} + void UIMachineWindowNormal::sltUpdateIndicators() { CConsole console = session().GetConsole(); @@ -459,11 +468,15 @@ void UIMachineWindowNormal::prepareStatusBar() /* Add the additions downloader progress bar to the status bar, * if a download is actually running: */ - sltDownloaderAdditionsEmbed(); + sltEmbedDownloaderForAdditions(); /* Add the user manual progress bar to the status bar, * if a download is actually running: */ - sltDownloaderUserManualEmbed(); + sltEmbedDownloaderForUserManual(); + + /* Add the extension pack progress bar to the status bar, + * if a download is actually running: */ + sltEmbedDownloaderForExtensionPack(); /* Create & start timer to update LEDs: */ m_pIdleTimer = new QTimer(this); @@ -482,9 +495,11 @@ void UIMachineWindowNormal::prepareConnections() connect(&vboxGlobal().settings(), SIGNAL(propertyChanged(const char *, const char *)), this, SLOT(sltProcessGlobalSettingChange(const char *, const char *))); /* Setup additions downloader listener: */ - connect(machineLogic(), SIGNAL(sigDownloaderAdditionsCreated()), this, SLOT(sltDownloaderAdditionsEmbed())); + connect(machineLogic(), SIGNAL(sigDownloaderAdditionsCreated()), this, SLOT(sltEmbedDownloaderForAdditions())); /* Setup user manual downloader listener: */ - connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltDownloaderUserManualEmbed())); + connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltEmbedDownloaderForUserManual())); + /* Setup extension pack downloader listener: */ + connect(gUpdateManager, SIGNAL(sigDownloaderCreatedForExtensionPack()), this, SLOT(sltEmbedDownloaderForExtensionPack())); } void UIMachineWindowNormal::prepareMachineView() diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h index 39be14cdf..36339db62 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h @@ -62,8 +62,9 @@ private slots: void sltTryClose(); /* Downloader listeners: */ - void sltDownloaderAdditionsEmbed(); - void sltDownloaderUserManualEmbed(); + void sltEmbedDownloaderForAdditions(); + void sltEmbedDownloaderForUserManual(); + void sltEmbedDownloaderForExtensionPack(); private: diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp index 4356e604d..3b6290221 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp @@ -1,4 +1,4 @@ -/* $Id: UIKeyboardHandlerScale.cpp 35752 2011-01-28 10:57:53Z vboxsync $ */ +/* $Id: UIKeyboardHandlerScale.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp index 0e5861c47..ed253f960 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineLogicScale.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineLogicScale.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -27,6 +27,7 @@ #include "UIMachineLogicScale.h" #include "UIMachineWindow.h" #include "UIDownloaderAdditions.h" +#include "UIDownloaderExtensionPack.h" #ifdef Q_WS_MAC #include "VBoxUtils.h" @@ -96,11 +97,14 @@ void UIMachineLogicScale::initialize() /* Prepare scale machine window: */ prepareMachineWindows(); - /* If there is an Additions download running, update the parent window - * information. */ + /* If there is an Additions download running, update the parent window information. */ if (UIDownloaderAdditions *pDl = UIDownloaderAdditions::current()) pDl->setParentWidget(mainMachineWindow()->machineWindow()); + /* If there is an Extension Pack download running, update the parent window information. */ + if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current()) + pDl->setParentWidget(mainMachineWindow()->machineWindow()); + #ifdef Q_WS_MAC /* Prepare dock: */ prepareDock(); diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp index 5dc242f2a..460f6fc06 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineViewScale.cpp 33595 2010-10-29 10:35:00Z vboxsync $ */ +/* $Id: UIMachineViewScale.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp index 7aa4bf135..5cccacbd0 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineWindowScale.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineWindowScale.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp index c5228ca38..46bfd7e02 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp @@ -1,4 +1,4 @@ -/* $Id: UIKeyboardHandlerSeamless.cpp 35752 2011-01-28 10:57:53Z vboxsync $ */ +/* $Id: UIKeyboardHandlerSeamless.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp index ca400ea5e..93f0b43bd 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineLogicSeamless.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineLogicSeamless.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp index 7e732253c..529a33772 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineViewSeamless.cpp 32174 2010-09-01 12:52:17Z vboxsync $ */ +/* $Id: UIMachineViewSeamless.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp index f27c90742..e2ea129ae 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineWindowSeamless.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */ +/* $Id: UIMachineWindowSeamless.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp index 2f7c3f91e..e0a10e0b3 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp @@ -1,4 +1,4 @@ -/* $Id: UIActionPoolSelector.cpp 38372 2011-08-09 09:52:55Z vboxsync $ */ +/* $Id: UIActionPoolSelector.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp index fda5c78ad..f7ce62913 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp @@ -1,4 +1,4 @@ -/* $Id: UISelectorShortcuts.cpp 37878 2011-07-11 16:15:02Z vboxsync $ */ +/* $Id: UISelectorShortcuts.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp index 8eb12e9dc..8f1a6fb0a 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp @@ -1,4 +1,4 @@ -/* $Id: UIVMDesktop.cpp 37755 2011-07-04 10:21:00Z vboxsync $ */ +/* $Id: UIVMDesktop.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp index 08c6a4f81..bd3587194 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp @@ -1,4 +1,4 @@ -/* $Id: UIVMItem.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIVMItem.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp index 74429c86c..822cdc676 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp @@ -1,4 +1,4 @@ -/* $Id: UIVMListView.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIVMListView.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp index 4c7774f0e..de9f554d1 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp @@ -1,4 +1,4 @@ -/* $Id: UIVMPreviewWindow.cpp 35798 2011-01-31 18:09:28Z vboxsync $ */ +/* $Id: UIVMPreviewWindow.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp index f284021a5..453f4f01f 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: UIVirtualBoxEventHandler.cpp 35722 2011-01-26 16:37:16Z vboxsync $ */ +/* $Id: UIVirtualBoxEventHandler.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp index 9db321781..b9a2185b5 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp @@ -21,7 +21,9 @@ #else /* !VBOX_WITH_PRECOMPILED_HEADERS */ #include "QISplitter.h" #include "UIBar.h" +#include "UIUpdateManager.h" #include "UIDownloaderUserManual.h" +#include "UIDownloaderExtensionPack.h" #include "UIExportApplianceWzd.h" #include "UIIconPool.h" #include "UIImportApplianceWzd.h" @@ -41,7 +43,7 @@ #include "UISelectorShortcuts.h" #include "UIDesktopServices.h" #include "UIGlobalSettingsExtension.h" /* extension pack installation */ -#include "UIActionPoolSelector.h" +#include "UIActionPool.h" #ifdef VBOX_GUI_WITH_SYSTRAY # include "VBoxTrayIcon.h" @@ -93,9 +95,6 @@ VBoxSelectorWnd(VBoxSelectorWnd **aSelf, QWidget* aParent, : QIWithRetranslateUI2<QMainWindow>(aParent, aFlags) , mDoneInaccessibleWarningOnce(false) { - /* Create offline action pool: */ - UIActionPoolSelector::create(); - VBoxGlobalSettings settings = vboxGlobal().settings(); if (aSelf) @@ -493,7 +492,8 @@ VBoxSelectorWnd(VBoxSelectorWnd **aSelf, QWidget* aParent, #endif /* Listen to potential downloaders signals: */ - connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltDownloaderUserManualEmbed())); + connect(&msgCenter(), SIGNAL(sigDownloaderUserManualCreated()), this, SLOT(sltEmbedDownloaderForUserManual())); + connect(gUpdateManager, SIGNAL(sigDownloaderCreatedForExtensionPack()), this, SLOT(sltEmbedDownloaderForExtensionPack())); /* bring the VM list to the focus */ mVMListView->setFocus(); @@ -562,9 +562,6 @@ VBoxSelectorWnd::~VBoxSelectorWnd() /* Delete the items from our model */ mVMModel->clear(); - - /* Delete offline action pool: */ - UIActionPoolSelector::destroy(); } // @@ -1662,13 +1659,20 @@ void VBoxSelectorWnd::trayIconChanged(bool fEnabled) #endif /* VBOX_GUI_WITH_SYSTRAY */ -void VBoxSelectorWnd::sltDownloaderUserManualEmbed() +void VBoxSelectorWnd::sltEmbedDownloaderForUserManual() { /* If there is User Manual downloader created => show the process bar: */ if (UIDownloaderUserManual *pDl = UIDownloaderUserManual::current()) statusBar()->addWidget(pDl->progressWidget(this), 0); } +void VBoxSelectorWnd::sltEmbedDownloaderForExtensionPack() +{ + /* If there is Extension Pack downloader created => show the process bar: */ + if (UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::current()) + statusBar()->addWidget(pDl->progressWidget(this), 0); +} + void VBoxSelectorWnd::showViewContextMenu(const QPoint &pos) { CVirtualBox vbox = vboxGlobal().virtualBox(); @@ -1769,7 +1773,7 @@ void VBoxSelectorWnd::prepareMenuHelp(QMenu *pMenu) gActionPool->action(UIActionIndex_Simple_Register), SLOT(setEnabled(bool))); #endif /* VBOX_WITH_REGISTRATION */ VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()), - &vboxGlobal(), SLOT(showUpdateDialog())); + gUpdateManager, SLOT(sltForceCheck())); VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog())); } diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.h b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.h index a69ba2f4f..31d2885d5 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.h @@ -133,7 +133,8 @@ private slots: void trayIconChanged(bool fEnabled); #endif - void sltDownloaderUserManualEmbed(); + void sltEmbedDownloaderForUserManual(); + void sltEmbedDownloaderForExtensionPack(); void showViewContextMenu(const QPoint &pos); diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp index d06e913ce..2756260ea 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxSnapshotsWgt.cpp 38393 2011-08-10 10:25:56Z vboxsync $ */ +/* $Id: VBoxSnapshotsWgt.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp index 953d9ebdf..e719bd27a 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp @@ -1,4 +1,4 @@ -/* $Id: UISettingsDefs.cpp 36589 2011-04-06 15:24:00Z vboxsync $ */ +/* $Id: UISettingsDefs.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp index 8692b71de..829ce3f23 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp @@ -1,4 +1,4 @@ -/* $Id: UISettingsDialog.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UISettingsDialog.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp index 610cabab4..bd0d8be00 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -1,4 +1,4 @@ -/* $Id: UISettingsDialogSpecific.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UISettingsDialogSpecific.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): @@ -469,12 +469,6 @@ void UISettingsDialogGlobal::saveData() void UISettingsDialogGlobal::retranslateUi() { - /* Base-class UI translation: */ - UISettingsDialog::retranslateUi(); - - /* Set dialog's name: */ - setWindowTitle(title()); - /* General page: */ m_pSelector->setItemText(GLSettingsPage_General, tr("General")); @@ -499,8 +493,14 @@ void UISettingsDialogGlobal::retranslateUi() /* Proxy page: */ m_pSelector->setItemText(GLSettingsPage_Proxy, tr("Proxy")); - /* Translate the selector: */ + /* Polish the selector: */ m_pSelector->polish(); + + /* Base-class UI translation: */ + UISettingsDialog::retranslateUi(); + + /* Set dialog's name: */ + setWindowTitle(title()); } QString UISettingsDialogGlobal::title() const @@ -864,12 +864,6 @@ void UISettingsDialogMachine::retranslateUi() if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Parallel)) qApp->sendEvent(pPage, &event); - /* Base-class UI translation: */ - UISettingsDialog::retranslateUi(); - - /* Set dialog's name: */ - setWindowTitle(title()); - /* General page: */ m_pSelector->setItemText(VMSettingsPage_General, tr("General")); @@ -903,8 +897,14 @@ void UISettingsDialogMachine::retranslateUi() /* SFolders page: */ m_pSelector->setItemText(VMSettingsPage_SF, tr("Shared Folders")); - /* Translate the selector: */ + /* Polish the selector: */ m_pSelector->polish(); + + /* Base-class UI translation: */ + UISettingsDialog::retranslateUi(); + + /* Set dialog's name: */ + setWindowTitle(title()); } QString UISettingsDialogMachine::title() const diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp index 7864714f6..bc7b70217 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp @@ -1,4 +1,4 @@ -/* $Id: UISettingsPage.cpp 36594 2011-04-06 16:22:58Z vboxsync $ */ +/* $Id: UISettingsPage.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp b/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp index 63892d7c4..ed11fcae5 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxSettingsSelector.cpp 37610 2011-06-23 12:26:14Z vboxsync $ */ +/* $Id: VBoxSettingsSelector.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp index 5a589709b..21ae06120 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp @@ -1,4 +1,4 @@ -/* $Id: UIGlobalSettingsExtension.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIGlobalSettingsExtension.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp index b2ca9c691..100621cbd 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp @@ -1,4 +1,4 @@ -/* $Id: UIGlobalSettingsGeneral.cpp 33926 2010-11-10 09:02:39Z vboxsync $ */ +/* $Id: UIGlobalSettingsGeneral.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp index e0d890de4..280628dea 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp @@ -1,4 +1,4 @@ -/* $Id: UIGlobalSettingsInput.cpp 35862 2011-02-07 08:57:38Z vboxsync $ */ +/* $Id: UIGlobalSettingsInput.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp index afb4ee14b..378cb37d8 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp @@ -1,4 +1,4 @@ -/* $Id: UIGlobalSettingsLanguage.cpp 35522 2011-01-13 13:06:44Z vboxsync $ */ +/* $Id: UIGlobalSettingsLanguage.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp index 440b880dc..7500a8874 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp @@ -1,4 +1,4 @@ -/* $Id: UIGlobalSettingsNetwork.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIGlobalSettingsNetwork.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetails.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetails.cpp index 5a6cfd831..75bd79265 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetails.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetails.cpp @@ -1,4 +1,4 @@ -/* $Id: UIGlobalSettingsNetworkDetails.cpp 34162 2010-11-18 12:04:47Z vboxsync $ */ +/* $Id: UIGlobalSettingsNetworkDetails.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp index 13cd07cfb..3a147d51e 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp @@ -1,4 +1,4 @@ -/* $Id: UIGlobalSettingsProxy.cpp 37548 2011-06-20 06:19:31Z vboxsync $ */ +/* $Id: UIGlobalSettingsProxy.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp index a9acc3c26..b3d74537e 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp @@ -1,4 +1,4 @@ -/* $Id: UIGlobalSettingsUpdate.cpp 34166 2010-11-18 12:36:43Z vboxsync $ */ +/* $Id: UIGlobalSettingsUpdate.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h index 051428562..b0dc89c48 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h @@ -22,7 +22,7 @@ /* Local includes */ #include "UISettingsPage.h" #include "UIGlobalSettingsUpdate.gen.h" -#include "VBoxUpdateDlg.h" +#include "UIUpdateDefs.h" /* Global settings / Update page / Cache: */ struct UISettingsCacheGlobalUpdate diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp index d0c9ca7be..e087f5156 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsAudio.cpp 37126 2011-05-17 13:56:50Z vboxsync $ */ +/* $Id: UIMachineSettingsAudio.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp index 77a642b8d..8f84b7e1d 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsDisplay.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIMachineSettingsDisplay.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp index e3218a1bc..68f83f941 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsGeneral.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIMachineSettingsGeneral.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp index cf858fae9..b32b2029c 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsNetwork.cpp 37945 2011-07-14 09:40:35Z vboxsync $ */ +/* $Id: UIMachineSettingsNetwork.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp index eaf00bbfb..5093c6bd0 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsParallel.cpp 37126 2011-05-17 13:56:50Z vboxsync $ */ +/* $Id: UIMachineSettingsParallel.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp index 3d7d6dd49..1409d1104 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsPortForwardingDlg.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIMachineSettingsPortForwardingDlg.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp index 217a71089..c6dfbb47a 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsSF.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIMachineSettingsSF.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp index 710075642..25219fd47 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsSFDetails.cpp 35956 2011-02-14 11:43:07Z vboxsync $ */ +/* $Id: UIMachineSettingsSFDetails.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp index ac2378d88..2598ab3c7 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsSerial.cpp 37126 2011-05-17 13:56:50Z vboxsync $ */ +/* $Id: UIMachineSettingsSerial.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp index f8b6ed2ad..c01b401a5 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsStorage.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIMachineSettingsStorage.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp index 2918d647b..b088052a9 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsSystem.cpp 37753 2011-07-04 10:09:18Z vboxsync $ */ +/* $Id: UIMachineSettingsSystem.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp index bc282a122..51fc5bbdd 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsUSB.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIMachineSettingsUSB.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): @@ -17,6 +17,9 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +/* Global includes */ +#include <QHeaderView> + /* Local includes */ #include "QIWidgetValidator.h" #include "UIIconPool.h" @@ -25,9 +28,10 @@ #include "UIToolBar.h" #include "UIMachineSettingsUSB.h" #include "UIMachineSettingsUSBFilterDetails.h" +#include "VBoxDefs.h" -/* Global includes */ -#include <QHeaderView> +/* Using declarations: */ +using namespace VBoxGlobalDefs; UIMachineSettingsUSB::UIMachineSettingsUSB(UISettingsPageType type) : UISettingsPage(type) @@ -308,8 +312,7 @@ void UIMachineSettingsUSB::putToCache() /* USB 1.0 (OHCI): */ usbData.m_fUSBEnabled = mGbUSB->isChecked(); /* USB 2.0 (EHCI): */ - QString strExtPackName = "Oracle VM VirtualBox Extension Pack"; - CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(strExtPackName); + CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName); usbData.m_fEHCIEnabled = extPack.isNull() || !extPack.GetUsable() ? false : mCbUSB2->isChecked(); /* Update USB cache: */ @@ -466,8 +469,9 @@ void UIMachineSettingsUSB::setValidator (QIWidgetValidator *aVal) bool UIMachineSettingsUSB::revalidate(QString &strWarningText, QString& /* strTitle */) { /* USB 2.0 Extension Pack presence test: */ - QString strExtPackName = "Oracle VM VirtualBox Extension Pack"; - CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(strExtPackName); + NOREF(strWarningText); +#ifdef VBOX_WITH_EXTPACK + CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName); if (mGbUSB->isChecked() && mCbUSB2->isChecked() && (extPack.isNull() || !extPack.GetUsable())) { strWarningText = tr("USB 2.0 is currently enabled for this virtual machine. " @@ -475,10 +479,11 @@ bool UIMachineSettingsUSB::revalidate(QString &strWarningText, QString& /* strTi "Please install the Extension Pack from the VirtualBox download site. " "After this you will be able to re-enable USB 2.0. " "It will be disabled in the meantime unless you cancel the current settings changes.") - .arg(strExtPackName); - msgCenter().remindAboutUnsupportedUSB2(strExtPackName, this); + .arg(UI_ExtPackName); + msgCenter().remindAboutUnsupportedUSB2(UI_ExtPackName, this); return true; } +#endif return true; } diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp index b2b59c34b..f9602283b 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp @@ -1,4 +1,4 @@ -/* $Id: UIMachineSettingsUSBFilterDetails.cpp 33882 2010-11-09 09:32:27Z vboxsync $ */ +/* $Id: UIMachineSettingsUSBFilterDetails.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp index 7a36ba687..68ab5dd61 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp @@ -1,4 +1,4 @@ -/* $Id: UIApplianceEditorWidget.cpp 38384 2011-08-09 16:07:54Z vboxsync $ */ +/* $Id: UIApplianceEditorWidget.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp index 235c7524e..800c205ff 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp @@ -1,4 +1,4 @@ -/* $Id: UIApplianceExportEditorWidget.cpp 38410 2011-08-11 09:34:18Z vboxsync $ */ +/* $Id: UIApplianceExportEditorWidget.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp index 341e5870d..f85290cd9 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp @@ -1,4 +1,4 @@ -/* $Id: UIApplianceImportEditorWidget.cpp 38412 2011-08-11 09:50:04Z vboxsync $ */ +/* $Id: UIApplianceImportEditorWidget.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp index 459f90427..5fe7f4b28 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp @@ -1,4 +1,4 @@ -/* $Id: UIBar.cpp 35424 2011-01-07 13:05:41Z vboxsync $ */ +/* $Id: UIBar.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp index 77792d83e..bdfdca1c7 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp @@ -1,4 +1,4 @@ -/* $Id: UIBootTable.cpp 34614 2010-12-02 14:09:47Z vboxsync $ */ +/* $Id: UIBootTable.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp index ca0a5b678..7c0317549 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp @@ -1,4 +1,4 @@ -/* $Id: UIHotKeyEditor.cpp 35862 2011-02-07 08:57:38Z vboxsync $ */ +/* $Id: UIHotKeyEditor.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp index 52cb4e387..4608f8a29 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp @@ -1,4 +1,4 @@ -/* $Id: UILineTextEdit.cpp 38375 2011-08-09 11:55:48Z vboxsync $ */ +/* $Id: UILineTextEdit.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp index 1c552fc68..31b8bae12 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp @@ -1,4 +1,4 @@ -/* $Id: UIPopupBox.cpp 30904 2010-07-19 09:43:24Z vboxsync $ */ +/* $Id: UIPopupBox.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp index 2d43f5d30..03aad59dd 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp @@ -1,4 +1,4 @@ -/* $Id: UIProgressDialog.cpp 37572 2011-06-21 11:37:31Z vboxsync $ */ +/* $Id: UIProgressDialog.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp index 353c9a5a0..85233ecfb 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp @@ -1,4 +1,4 @@ -/* $Id: UISpecialControls.cpp 30694 2010-07-07 09:24:18Z vboxsync $ */ +/* $Id: UISpecialControls.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.cpp index e16221b11..8f951835c 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxFilePathSelectorWidget.cpp 33778 2010-11-04 15:25:25Z vboxsync $ */ +/* $Id: VBoxFilePathSelectorWidget.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp index 964c69d49..c194e4742 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestRAMSlider.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxGuestRAMSlider.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp index 607a5524b..382711d48 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxMediaComboBox.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxMediaComboBox.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp index 6cbac2bcb..703485ee7 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxMiniToolBar.cpp 35867 2011-02-07 12:51:10Z vboxsync $ */ +/* $Id: VBoxMiniToolBar.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp index 745838c00..6253d4c62 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxOSTypeSelectorButton.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxOSTypeSelectorButton.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp index b1dcc7624..7d453c8a6 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxOSTypeSelectorWidget.cpp 33781 2010-11-04 15:59:35Z vboxsync $ */ +/* $Id: VBoxOSTypeSelectorWidget.cpp $ */ /** @file * * VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.cpp index d24970a01..ae41c05a4 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxWarningPane.cpp 37106 2011-05-16 14:50:12Z vboxsync $ */ +/* $Id: VBoxWarningPane.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp index d862d49b1..89870028a 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp @@ -1,4 +1,4 @@ -/* $Id: UICloneVMWizard.cpp 38440 2011-08-12 15:32:49Z vboxsync $ */ +/* $Id: UICloneVMWizard.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp index ba1182d93..5d1fa861d 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp @@ -1,4 +1,4 @@ -/* $Id: UIExportApplianceWzd.cpp 38343 2011-08-08 10:11:12Z vboxsync $ */ +/* $Id: UIExportApplianceWzd.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp index b83d76ee8..ac0efb188 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp @@ -1,4 +1,4 @@ -/* $Id: UIFirstRunWzd.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIFirstRunWzd.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp index 38ffb1002..98e3344a7 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp @@ -1,4 +1,4 @@ -/* $Id: UIImportApplianceWzd.cpp 38412 2011-08-11 09:50:04Z vboxsync $ */ +/* $Id: UIImportApplianceWzd.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.cpp index beed26bb9..38f5a1601 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.cpp @@ -1,4 +1,4 @@ -/* $Id: UINewHDWizard.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UINewHDWizard.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): @@ -196,11 +196,11 @@ UINewHDWizard::UINewHDWizard(QWidget *pParent, const QString &strDefaultName, co /* Create & add pages: */ if (wizardType() == UINewHDWizardType_Copying) - addPage(new UINewHDWizardPageWelcome(sourceHardDisk)); - addPage(new UINewHDWizardPageFormat); - addPage(new UINewHDWizardPageVariant); - addPage(new UINewHDWizardPageOptions(strDefaultName, strDefaultPath, uDefaultSize)); - addPage(new UINewHDWizardPageSummary); + setPage(PageWelcome, new UINewHDWizardPageWelcome(sourceHardDisk)); + setPage(PageFormat, new UINewHDWizardPageFormat); + setPage(PageVariant, new UINewHDWizardPageVariant); + setPage(PageOptions, new UINewHDWizardPageOptions(strDefaultName, strDefaultPath, uDefaultSize)); + setPage(PageSummary, new UINewHDWizardPageSummary); /* Translate wizard: */ retranslateUi(); @@ -371,6 +371,12 @@ QString UINewHDWizardPageFormat::fullFormatName(const QString &strBaseFormatName return UINewHDWizard::tr("V&MDK (Virtual Machine Disk)"); else if (strBaseFormatName == "VHD") return UINewHDWizard::tr("V&HD (Virtual Hard Disk)"); + else if (strBaseFormatName == "Parallels") + return UINewHDWizard::tr("H&DD (Parallels Hard Disk)"); + else if (strBaseFormatName == "QED") + return UINewHDWizard::tr("Q&ED (QEMU enhanced disk)"); + else if (strBaseFormatName == "QCOW") + return UINewHDWizard::tr("&QCOW (QEMU Copy-On-Write)"); return strBaseFormatName; } @@ -447,6 +453,23 @@ bool UINewHDWizardPageFormat::isComplete() const return !m_mediumFormat.isNull(); } +int UINewHDWizardPageFormat::nextId() const +{ + CMediumFormat mediumFormat = field("mediumFormat").value<CMediumFormat>(); + ULONG uCapabilities = mediumFormat.GetCapabilities(); + int cTest = 0; + if (uCapabilities & KMediumFormatCapabilities_CreateDynamic) + ++cTest; + if (uCapabilities & KMediumFormatCapabilities_CreateFixed) + ++cTest; + if (uCapabilities & KMediumFormatCapabilities_CreateSplit2G) + ++cTest; + if (cTest > 1) + return UINewHDWizard::PageVariant; + + return UINewHDWizard::PageOptions; +} + void UINewHDWizardPageFormat::processFormat(CMediumFormat mediumFormat) { /* Check that medium format supports creation: */ @@ -481,7 +504,10 @@ UINewHDWizardPageVariant::UINewHDWizardPageVariant() /* Register 'mediumVariant' field: */ registerField("mediumVariant", this, "mediumVariant"); - /* Unfortuanelly, KMediumVariant is very messy, + /* Default */ + setMediumVariant(KMediumVariant_Standard); + + /* Unfortunately, KMediumVariant is very messy, * so we can't enumerate it to make sure GUI will not hard-code its values, * we can only use hard-coded values that we need: */ diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.h b/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.h index 507576e0a..ed685aea6 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.h +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.h @@ -49,6 +49,15 @@ class UINewHDWizard : public QIWizard public: + enum + { + PageWelcome, + PageFormat, + PageVariant, + PageOptions, + PageSummary + }; + /* Constructor: */ UINewHDWizard(QWidget *pParent, const QString &strDefaultName = QString(), const QString &strDefaultPath = QString(), @@ -155,6 +164,8 @@ private: /* Completeness validator: */ bool isComplete() const; + int nextId() const; + /* Helping stuff: */ void processFormat(CMediumFormat mediumFormat); diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp index d54837991..c6f7930ec 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp @@ -1,4 +1,4 @@ -/* $Id: UINewVMWzd.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UINewVMWzd.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): @@ -27,6 +27,10 @@ #include "QIFileDialog.h" #include "UIMessageCenter.h" #include "UIMachineSettingsStorage.h" +#include "VBoxDefs.h" + +/* Using declarations: */ +using namespace VBoxGlobalDefs; /* Globals */ struct osTypePattern @@ -55,9 +59,11 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, - { QRegExp("(Wi.*2)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, + { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" }, { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" }, + { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" }, + { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" }, { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" }, { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" }, @@ -85,8 +91,8 @@ static const osTypePattern gs_OSTypePattern[] = /* Regular names of Linux distributions */ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, - { QRegExp("De.*64", Qt::CaseInsensitive), "Debian_64" }, - { QRegExp("De", Qt::CaseInsensitive), "Debian" }, + { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, + { QRegExp("Deb", Qt::CaseInsensitive), "Debian" }, { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" }, { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" }, { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" }, @@ -763,9 +769,8 @@ bool UINewVMWzdPage5::constructMachine() * necessary evil to patch over legacy compatability issues * introduced by the new distribution model. */ - static const char *s_pszUsbExtPackName = "Oracle VM VirtualBox Extension Pack"; CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager(); - if (manager.IsExtPackUsable(s_pszUsbExtPackName)) + if (manager.IsExtPackUsable(UI_ExtPackName)) usbController.SetEnabledEhci(true); } diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/registration/UIRegistrationWzd.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/registration/UIRegistrationWzd.cpp index d2f579d1e..c2d508d68 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/registration/UIRegistrationWzd.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/registration/UIRegistrationWzd.cpp @@ -1,4 +1,4 @@ -/* $Id: UIRegistrationWzd.cpp 38311 2011-08-04 13:08:39Z vboxsync $ */ +/* $Id: UIRegistrationWzd.cpp $ */ /** @file * * VBox frontends: Qt4 GUI ("VirtualBox"): diff --git a/src/VBox/GuestHost/HGSMI/Makefile.kmk b/src/VBox/GuestHost/HGSMI/Makefile.kmk index c0461ad45..f44ba3b55 100644 --- a/src/VBox/GuestHost/HGSMI/Makefile.kmk +++ b/src/VBox/GuestHost/HGSMI/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the common HGSMI library. # diff --git a/src/VBox/GuestHost/Makefile.kmk b/src/VBox/GuestHost/Makefile.kmk index c3fe08415..cbb12c012 100644 --- a/src/VBox/GuestHost/Makefile.kmk +++ b/src/VBox/GuestHost/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest/Host part # diff --git a/src/VBox/GuestHost/OpenGL/Makefile.kmk b/src/VBox/GuestHost/OpenGL/Makefile.kmk index fa657099e..0a6413cf8 100644 --- a/src/VBox/GuestHost/OpenGL/Makefile.kmk +++ b/src/VBox/GuestHost/OpenGL/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 35351 2010-12-27 17:04:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest/Host OpenGL part # diff --git a/src/VBox/GuestHost/OpenGL/error/errorspu.rc b/src/VBox/GuestHost/OpenGL/error/errorspu.rc index c62821d41..af3aac9ec 100644 --- a/src/VBox/GuestHost/OpenGL/error/errorspu.rc +++ b/src/VBox/GuestHost/OpenGL/error/errorspu.rc @@ -1,4 +1,4 @@ -/* $Id: errorspu.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: errorspu.rc $ */ /** @file * VBoxOGLerrorspu - Resource file containing version info and icon. */ diff --git a/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py b/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py index d648cc848..d648cc848 100644..100755 --- a/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py +++ b/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py diff --git a/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h b/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h index 8aa724cf8..2707660dd 100644 --- a/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h +++ b/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h @@ -1,4 +1,4 @@ -/* $Id: cr_framebuffer.h 34107 2010-11-16 11:37:51Z vboxsync $ */ +/* $Id: cr_framebuffer.h $ */ /** @file * VBox crOpenGL: FBO related state info diff --git a/src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h b/src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h index c9409b354..21e12e0f1 100644 --- a/src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h +++ b/src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h @@ -1,4 +1,4 @@ -/* $Id: cr_glsl.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: cr_glsl.h $ */ /** @file * VBox crOpenGL: GLSL related state info diff --git a/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c b/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c index b2d44caa6..f4d13b362 100644 --- a/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c +++ b/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c @@ -1,4 +1,4 @@ -/* $Id: pack_framebuffer.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: pack_framebuffer.c $ */ /** @file * VBox OpenGL: EXT_framebuffer_object diff --git a/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c b/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c index aa92b7d58..36fc6beaf 100644 --- a/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c +++ b/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c @@ -1,4 +1,4 @@ -/* $Id: pack_shaders.c 37393 2011-06-09 14:06:42Z vboxsync $ */ +/* $Id: pack_shaders.c $ */ /** @file * VBox OpenGL DRI driver functions diff --git a/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c b/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c index d76fc29ce..d76fc29ce 100755..100644 --- a/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c +++ b/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c diff --git a/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c b/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c index ddda089da..46ecb9e8e 100644 --- a/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c +++ b/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c @@ -1,4 +1,4 @@ -/* $Id: state_framebuffer.c 37394 2011-06-09 15:25:30Z vboxsync $ */ +/* $Id: state_framebuffer.c $ */ /** @file * VBox OpenGL: EXT_framebuffer_object state tracking diff --git a/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c b/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c index 50a2e79e9..e68268022 100644 --- a/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c +++ b/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c @@ -1,4 +1,4 @@ -/* $Id: state_glsl.c 37773 2011-07-04 18:07:09Z vboxsync $ */ +/* $Id: state_glsl.c $ */ /** @file * VBox OpenGL: GLSL state tracking diff --git a/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c b/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c index 031dfe2f7..8709b2a15 100644 --- a/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c +++ b/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c @@ -1,4 +1,4 @@ -/* $Id: state_snapshot.c 38394 2011-08-10 11:46:47Z vboxsync $ */ +/* $Id: state_snapshot.c $ */ /** @file * VBox Context state saving/loading used by VM snapshot diff --git a/src/VBox/GuestHost/OpenGL/util/util.rc b/src/VBox/GuestHost/OpenGL/util/util.rc index cff1898b5..794cf2400 100644 --- a/src/VBox/GuestHost/OpenGL/util/util.rc +++ b/src/VBox/GuestHost/OpenGL/util/util.rc @@ -1,4 +1,4 @@ -/* $Id: util.rc 35319 2010-12-24 15:42:36Z vboxsync $ */ +/* $Id: util.rc $ */ /** @file * VBoxOGLcrutil - Resource file containing version info and icon. */ diff --git a/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c b/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c index 6366c2075..2573b5474 100644 --- a/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c +++ b/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c @@ -1,4 +1,4 @@ -/* $Id: vboxhgcm.c 38314 2011-08-04 14:05:58Z vboxsync $ */ +/* $Id: vboxhgcm.c $ */ /** @file * VBox HGCM connection diff --git a/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c b/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c index c35cdd932..60d5ce21f 100644 --- a/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c +++ b/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c @@ -1,4 +1,4 @@ -/* $Id: vboxhgsmi.c 34110 2010-11-16 12:10:23Z vboxsync $ */ +/* $Id: vboxhgsmi.c $ */ /** @file * VBox HGCM connection diff --git a/src/VBox/GuestHost/SharedClipboard/Makefile.kmk b/src/VBox/GuestHost/SharedClipboard/Makefile.kmk index 2d1f6313c..bc0a3f45c 100644 --- a/src/VBox/GuestHost/SharedClipboard/Makefile.kmk +++ b/src/VBox/GuestHost/SharedClipboard/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the shared clipboard code for both host and guest. # diff --git a/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp b/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp index f5810f581..f69d61cf1 100644 --- a/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp +++ b/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp @@ -1,4 +1,4 @@ -/* $Id: clipboard-helper.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: clipboard-helper.cpp $ */ /** @file * Shared Clipboard: Some helper function for converting between the various eol. */ diff --git a/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp b/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp index 4a8e2e729..2dbfc859b 100644 --- a/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp +++ b/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp @@ -1159,6 +1159,8 @@ static Boolean clipXtConvertSelectionProc(Widget widget, Atom *atomSelection, int rc = VINF_SUCCESS; LogRelFlowFunc(("\n")); + if (!pCtx) + return false; if (!clipIsSupportedSelectionType(pCtx->widget, *atomSelection)) return false; if (*atomTarget == clipGetAtom(pCtx->widget, "TARGETS")) diff --git a/src/VBox/HostDrivers/Makefile.kmk b/src/VBox/HostDrivers/Makefile.kmk index c847509a2..f652cb2fd 100644 --- a/src/VBox/HostDrivers/Makefile.kmk +++ b/src/VBox/HostDrivers/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38136 2011-07-25 09:10:40Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VBox Host drivers. # diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk index bf7708531..b4ebf01a0 100644 --- a/src/VBox/HostDrivers/Support/Makefile.kmk +++ b/src/VBox/HostDrivers/Support/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38183 2011-07-26 13:20:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the support library and the drivers/modules/kexts it uses. # diff --git a/src/VBox/HostDrivers/Support/SUPDrv-dtrace.d b/src/VBox/HostDrivers/Support/SUPDrv-dtrace.d index 4a2aaf270..2a0535cc4 100644 --- a/src/VBox/HostDrivers/Support/SUPDrv-dtrace.d +++ b/src/VBox/HostDrivers/Support/SUPDrv-dtrace.d @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-dtrace.d 33375 2010-10-24 12:29:42Z vboxsync $ */ +/* $Id: SUPDrv-dtrace.d $ */ /** @file * SUPDrv - Static dtrace probes */ diff --git a/src/VBox/HostDrivers/Support/SUPDrv.c b/src/VBox/HostDrivers/Support/SUPDrv.c index 868fc0d7e..8b0fdcc0e 100644 --- a/src/VBox/HostDrivers/Support/SUPDrv.c +++ b/src/VBox/HostDrivers/Support/SUPDrv.c @@ -1,4 +1,4 @@ -/* $Revision: 38323 $ */ +/* $Revision: 73339 $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Common code. */ diff --git a/src/VBox/HostDrivers/Support/SUPDrvIDC.h b/src/VBox/HostDrivers/Support/SUPDrvIDC.h index 524e6bdfb..ca9fe3148 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvIDC.h +++ b/src/VBox/HostDrivers/Support/SUPDrvIDC.h @@ -1,4 +1,4 @@ -/* $Id: SUPDrvIDC.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: SUPDrvIDC.h $ */ /** @file * VirtualBox Support Driver - Inter-Driver Communication (IDC) definitions. */ diff --git a/src/VBox/HostDrivers/Support/SUPDrvIOC.h b/src/VBox/HostDrivers/Support/SUPDrvIOC.h index 806107953..055dd34d1 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvIOC.h +++ b/src/VBox/HostDrivers/Support/SUPDrvIOC.h @@ -1,4 +1,4 @@ -/* $Revision: 37591 $ */ +/* $Revision: 72437 $ */ /** @file * VirtualBox Support Driver - IOCtl definitions. */ diff --git a/src/VBox/HostDrivers/Support/SUPDrvInternal.h b/src/VBox/HostDrivers/Support/SUPDrvInternal.h index 5eb135350..41dc4f4c1 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvInternal.h +++ b/src/VBox/HostDrivers/Support/SUPDrvInternal.h @@ -1,4 +1,4 @@ -/* $Revision: 37249 $ */ +/* $Revision: 71971 $ */ /** @file * VirtualBox Support Driver - Internal header. */ diff --git a/src/VBox/HostDrivers/Support/SUPDrvSem.c b/src/VBox/HostDrivers/Support/SUPDrvSem.c index b0c7901c7..f546f56fb 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvSem.c +++ b/src/VBox/HostDrivers/Support/SUPDrvSem.c @@ -1,4 +1,4 @@ -/* $Revision: 33167 $ */ +/* $Revision: 66703 $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Common OS agnostic. */ diff --git a/src/VBox/HostDrivers/Support/SUPLib.cpp b/src/VBox/HostDrivers/Support/SUPLib.cpp index 4c3821961..71053bae6 100644 --- a/src/VBox/HostDrivers/Support/SUPLib.cpp +++ b/src/VBox/HostDrivers/Support/SUPLib.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: SUPLib.cpp $ */ /** @file * VirtualBox Support Library - Common code. */ diff --git a/src/VBox/HostDrivers/Support/SUPLibInternal.h b/src/VBox/HostDrivers/Support/SUPLibInternal.h index 34e884e7a..1e35a50d2 100644 --- a/src/VBox/HostDrivers/Support/SUPLibInternal.h +++ b/src/VBox/HostDrivers/Support/SUPLibInternal.h @@ -1,4 +1,4 @@ -/* $Id: SUPLibInternal.h 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: SUPLibInternal.h $ */ /** @file * VirtualBox Support Library - Internal header. */ diff --git a/src/VBox/HostDrivers/Support/SUPLibSem.cpp b/src/VBox/HostDrivers/Support/SUPLibSem.cpp index 3f91d60fd..bd7f2e56c 100644 --- a/src/VBox/HostDrivers/Support/SUPLibSem.cpp +++ b/src/VBox/HostDrivers/Support/SUPLibSem.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLibSem.cpp 33167 2010-10-15 18:16:59Z vboxsync $ */ +/* $Id: SUPLibSem.cpp $ */ /** @file * VirtualBox Support Library - Semaphores, ring-3 implementation. */ diff --git a/src/VBox/HostDrivers/Support/SUPR0.def b/src/VBox/HostDrivers/Support/SUPR0.def index 9a72a752b..b8a22dd1e 100644 --- a/src/VBox/HostDrivers/Support/SUPR0.def +++ b/src/VBox/HostDrivers/Support/SUPR0.def @@ -1,4 +1,4 @@ -; $Id: SUPR0.def 37410 2011-06-10 15:11:40Z vboxsync $ +; $Id: SUPR0.def $ ;; @file ; VirtualBox Support Driver - Exports. ; diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c index d63dd1d19..7d7193c57 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: SUPR0IdcClient.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Core. */ diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c index db7d54ba3..d867a37e1 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClientComponent.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPR0IdcClientComponent.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Component APIs. */ diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h b/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h index c5bde94fe..29ada07f1 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClientInternal.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPR0IdcClientInternal.h $ */ /** @file * VirtualBox Support Driver - Internal header for the IDC client library. */ diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c index 41ee67d94..595d24740 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClientStubs.c 29285 2010-05-10 00:22:29Z vboxsync $ */ +/* $Id: SUPR0IdcClientStubs.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Stubs for SUPR0 APIs. */ diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp index 30378807e..f13e42f67 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPR3HardenedIPRT.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPR3HardenedIPRT.cpp $ */ /** @file * VirtualBox Support Library - Hardened Support Routines using IPRT. */ diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp index ec3d7b01e..f39aad395 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPR3HardenedMain.cpp 38076 2011-07-19 16:53:07Z vboxsync $ */ +/* $Id: SUPR3HardenedMain.cpp $ */ /** @file * VirtualBox Support Library - Hardened main(). */ diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp index 184d0801a..c6c913ed7 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPR3HardenedVerify.cpp 37344 2011-06-07 12:23:53Z vboxsync $ */ +/* $Id: SUPR3HardenedVerify.cpp $ */ /** @file * VirtualBox Support Library - Verification of Hardened Installation. */ diff --git a/src/VBox/HostDrivers/Support/SUPSvc.cpp b/src/VBox/HostDrivers/Support/SUPSvc.cpp index 9e7eb8a2d..de087be52 100644 --- a/src/VBox/HostDrivers/Support/SUPSvc.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvc.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPSvc.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: SUPSvc.cpp $ */ /** @file * VirtualBox Support Service - Common Code. */ diff --git a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp index fa2290b58..f58a03adb 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPSvcGlobal.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPSvcGlobal.cpp $ */ /** @file * VirtualBox Support Service - The Global Service. */ diff --git a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp index 7f66afed3..50a9cdef8 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPSvcGrant.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: SUPSvcGrant.cpp $ */ /** @file * VirtualBox Support Service - The Grant Service. */ diff --git a/src/VBox/HostDrivers/Support/SUPSvcInternal.h b/src/VBox/HostDrivers/Support/SUPSvcInternal.h index eb0f5f02c..afdc78f40 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcInternal.h +++ b/src/VBox/HostDrivers/Support/SUPSvcInternal.h @@ -1,4 +1,4 @@ -/* $Id: SUPSvcInternal.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: SUPSvcInternal.h $ */ /** @file * VirtualBox Support Service - Internal header. */ diff --git a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp index f6f66574c..856bffd3a 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp +++ b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-darwin.cpp 37970 2011-07-14 14:37:23Z vboxsync $ */ +/* $Id: SUPDrv-darwin.cpp $ */ /** @file * VirtualBox Support Driver - Darwin Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp b/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp index d2f2b0122..5d5b03d39 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp +++ b/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-darwin.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: SUPLib-darwin.cpp $ */ /** @file * VirtualBox Support Library - Darwin specific parts. */ diff --git a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c index a9171c940..128a6907c 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c +++ b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-darwin.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPR0IdcClient-darwin.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Darwin Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/freebsd/Makefile b/src/VBox/HostDrivers/Support/freebsd/Makefile index 5f805155a..15e61aa53 100644 --- a/src/VBox/HostDrivers/Support/freebsd/Makefile +++ b/src/VBox/HostDrivers/Support/freebsd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 37233 2011-05-27 13:31:57Z vboxsync $ +# $Id: Makefile $ ## @file # Makefile for the VirtualBox FreeBSD Host Driver. # diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c b/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c index f0780450a..9da836ddb 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c +++ b/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-freebsd.c 37249 2011-05-30 10:03:45Z vboxsync $ */ +/* $Id: SUPDrv-freebsd.c $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - FreeBSD specifics. */ diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp b/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp index 6e6b28c9f..29b6fd9c1 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp +++ b/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-freebsd.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: SUPLib-freebsd.cpp $ */ /** @file * VirtualBox Support Library - FreeBSD specific parts. */ diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c index 570ce7815..b0e39038d 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c +++ b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-freebsd.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPR0IdcClient-freebsd.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, FreeBSD Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv b/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv index ccfee76a4..15d4588a3 100644..100755 --- a/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv +++ b/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxdrv 37955 2011-07-14 12:23:02Z vboxsync $ +# $Id: files_vboxdrv $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/HostDrivers/Support/linux/Makefile b/src/VBox/HostDrivers/Support/linux/Makefile index e98dba678..ec62b5ba5 100644 --- a/src/VBox/HostDrivers/Support/linux/Makefile +++ b/src/VBox/HostDrivers/Support/linux/Makefile @@ -1,4 +1,4 @@ -# $Revision: 37233 $ +# $Revision: 71955 $ ## @file # Makefile for the VirtualBox Linux Host Driver. # diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c index a9ebd1e25..e478391a3 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c @@ -1,4 +1,4 @@ -/* $Rev: 37972 $ */ +/* $Rev: 72885 $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Linux specifics. */ diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c index 913869e87..0aaea1a1c 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c +++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-linux.mod.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPDrv-linux.mod.c $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Autogenerated Linux code. * diff --git a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp index 0fd899817..4ec14ca58 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp +++ b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-linux.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: SUPLib-linux.cpp $ */ /** @file * VirtualBox Support Library - GNU/Linux specific parts. */ diff --git a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c index b9433056c..15d9761fe 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c +++ b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-linux.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPR0IdcClient-linux.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Linux Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/linux/files_vboxdrv b/src/VBox/HostDrivers/Support/linux/files_vboxdrv index f67be7ce3..1eb45f9a8 100644..100755 --- a/src/VBox/HostDrivers/Support/linux/files_vboxdrv +++ b/src/VBox/HostDrivers/Support/linux/files_vboxdrv @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxdrv 37955 2011-07-14 12:23:02Z vboxsync $ +# $Id: files_vboxdrv $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp index de1671e29..ab89c4ea1 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp +++ b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-os2.cpp 37249 2011-05-30 10:03:45Z vboxsync $ */ +/* $Id: SUPDrv-os2.cpp $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - OS/2 specifics. */ diff --git a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def index 51d2899d8..420bfd619 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def +++ b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def @@ -1,4 +1,4 @@ -; $Id: SUPDrv-os2.def 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: SUPDrv-os2.def $ ;; @file ; VBoxDrv - OS/2 definition file. ; diff --git a/src/VBox/HostDrivers/Support/os2/SUPDrvA-os2.asm b/src/VBox/HostDrivers/Support/os2/SUPDrvA-os2.asm index 280470cc4..5992ecd16 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPDrvA-os2.asm +++ b/src/VBox/HostDrivers/Support/os2/SUPDrvA-os2.asm @@ -1,4 +1,4 @@ -; $Id: SUPDrvA-os2.asm 22077 2009-08-07 16:01:57Z vboxsync $ +; $Id: SUPDrvA-os2.asm $ ;; @file ; VBoxDrv - OS/2 assembly file, the first file in the link. ; diff --git a/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp b/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp index 0f72caad2..c502b7c4b 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp +++ b/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-os2.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: SUPLib-os2.cpp $ */ /** @file * VirtualBox Support Library - OS/2 specific parts. */ diff --git a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c index 5455545bf..a20af4603 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c +++ b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-os2.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPR0IdcClient-os2.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, OS/2 Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c index 6e8b6c385..9782da9ea 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c +++ b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-solaris.c 37280 2011-05-31 21:31:19Z vboxsync $ */ +/* $Id: SUPDrv-solaris.c $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Solaris specifics. */ diff --git a/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp b/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp index ef294df06..21c3788b5 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp +++ b/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-solaris.cpp 37611 2011-06-23 12:32:04Z vboxsync $ */ +/* $Id: SUPLib-solaris.cpp $ */ /** @file * VirtualBox Support Library - Solaris specific parts. */ diff --git a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c index 5b33761d7..033fcdec5 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c +++ b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-solaris.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPR0IdcClient-solaris.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Solaris Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/solaris/mod.sh b/src/VBox/HostDrivers/Support/solaris/mod.sh index 5ebb39f2c..ff622d319 100755 --- a/src/VBox/HostDrivers/Support/solaris/mod.sh +++ b/src/VBox/HostDrivers/Support/solaris/mod.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: mod.sh 37314 2011-06-03 09:23:02Z vboxsync $ +# $Id: mod.sh $ ## @file # Helper script for installing the solaris module in a development environment. # diff --git a/src/VBox/HostDrivers/Support/testcase/Makefile.kmk b/src/VBox/HostDrivers/Support/testcase/Makefile.kmk index f66e4ce08..5ec98e0df 100644 --- a/src/VBox/HostDrivers/Support/testcase/Makefile.kmk +++ b/src/VBox/HostDrivers/Support/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the SUPLib testcases. # diff --git a/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp b/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp index 9b9988c20..58b3f749b 100644 --- a/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp +++ b/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPInstall.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPInstall.cpp $ */ /** @file * SUPInstall - Driver Install */ diff --git a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp index 72e24b0a4..162ae9c06 100644 --- a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp +++ b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLoggerCtl.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPLoggerCtl.cpp $ */ /** @file * SUPLoggerCtl - Support Driver Logger Control. */ diff --git a/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp b/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp index d1f7d8dd2..44d7d3db8 100644 --- a/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp +++ b/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPUninstall.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: SUPUninstall.cpp $ */ /** @file * SUPUninstall - Driver Uninstall. */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp index 7496dc2e3..328857885 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp @@ -1,4 +1,4 @@ -/* $Id: tstContiguous.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstContiguous.cpp $ */ /** @file * SUP Testcase - Contiguous Memory Interface (ring-3). */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp index e198185dd..2039292a6 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGIP-2.cpp 33595 2010-10-29 10:35:00Z vboxsync $ */ +/* $Id: tstGIP-2.cpp $ */ /** @file * SUP Testcase - Global Info Page interface (ring 3). */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp index c48a4fe6c..1368f0ceb 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGetPagingMode.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstGetPagingMode.cpp $ */ /** @file * SUP Testcase - Host paging mode interface (ring 3). */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp index 81290ec5e..8c46e1adc 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp @@ -1,4 +1,4 @@ -/* $Id: tstInit.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstInit.cpp $ */ /** @file * SUP Testcase - Support Library initialization and termination. */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp index 349bf00ee..d853cc4ae 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp @@ -1,4 +1,4 @@ -/* $Id: tstInt.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstInt.cpp $ */ /** @file * SUP Testcase - Test the interrupt gate feature of the support library. */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp index 4983f98d0..553c4711a 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLow.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstLow.cpp $ */ /** @file * SUP Testcase - Low (<4GB) Memory Allocate interface (ring 3). */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstPage.cpp b/src/VBox/HostDrivers/Support/testcase/tstPage.cpp index 286679c03..bcb550312 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstPage.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstPage.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPage.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstPage.cpp $ */ /** @file * SUP Testcase - Page allocation interface (ring 3). */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp index da4096ae0..ff6a36dfd 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPin.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstPin.cpp $ */ /** @file * SUP Testcase - Memory locking interface (ring 3). */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp index 27d748867..cbe204ffb 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSupLoadModule.cpp 35188 2010-12-16 15:13:07Z vboxsync $ */ +/* $Id: tstSupLoadModule.cpp $ */ /** @file * SUP Testcase - Test SUPR3LoadModule. */ @@ -94,7 +94,7 @@ int main(int argc, char **argv) return 1; case 'V': - RTPrintf("$Revision: 35188 $\n"); + RTPrintf("$Revision: 69027 $\n"); return 0; default: diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp index 6954c1b17..844446428 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSupSem-Zombie.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstSupSem-Zombie.cpp $ */ /** @file * Support Library Testcase - Ring-3 Semaphore interface - Zombie bugs. */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp index 81ebf1fa9..14ee9ef59 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSupSem.cpp 33383 2010-10-24 14:33:13Z vboxsync $ */ +/* $Id: tstSupSem.cpp $ */ /** @file * Support Library Testcase - Ring-3 Semaphore interface. */ diff --git a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp index 4243da34d..cc99fc1a5 100644 --- a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-win.cpp 38323 2011-08-05 10:27:14Z vboxsync $ */ +/* $Id: SUPDrv-win.cpp $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Windows NT specifics. */ diff --git a/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm b/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm index ff2cb4d59..f7d5e9539 100644 --- a/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm +++ b/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm @@ -1,4 +1,4 @@ -; $Id: SUPDrvA-win.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: SUPDrvA-win.asm $ ;; @file ; VirtualBox Support Driver - Windows NT specific assembly parts. ; diff --git a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp index 789641768..d12ea3c35 100644 --- a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-win.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: SUPLib-win.cpp $ */ /** @file * VirtualBox Support Library - Windows NT specific parts. */ diff --git a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c index f7609e3ca..536982d5e 100644 --- a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c +++ b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-win.c 38321 2011-08-05 10:08:31Z vboxsync $ */ +/* $Id: SUPR0IdcClient-win.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Windows Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp b/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp index bb1cd7371..19245e5f8 100644 --- a/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPSvc-win.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: SUPSvc-win.cpp $ */ /** @file * VirtualBox Support Service - Windows Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/win/VBoxDrv.inf b/src/VBox/HostDrivers/Support/win/VBoxDrv.inf index 37a453a9f..5dd41e26f 100644 --- a/src/VBox/HostDrivers/Support/win/VBoxDrv.inf +++ b/src/VBox/HostDrivers/Support/win/VBoxDrv.inf @@ -1,28 +1,28 @@ -; $Id: VBoxDrv.inf 32408 2010-09-10 13:43:23Z vboxsync $
+; $Id: VBoxDrv.inf $
;; @file
; VirtualBox Support Driver - Windows Driver INF file.
;
;
-; Copyright (C) 2006-2007 Oracle Corporation
-;
-; This file is part of VirtualBox Open Source Edition (OSE), as
-; available from http://www.virtualbox.org. This file is free software;
-; you can redistribute it and/or modify it under the terms of the GNU
-; General Public License (GPL) as published by the Free Software
-; Foundation, in version 2 as it comes in the "COPYING" file of the
-; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-;
-; The contents of this file may alternatively be used under the terms
-; of the Common Development and Distribution License Version 1.0
-; (CDDL) only, as it comes in the "COPYING.CDDL" file of the
-; VirtualBox OSE distribution, in which case the provisions of the
-; CDDL are applicable instead of those of the GPL.
-;
-; You may elect to license modified versions of this file under the
-; terms and conditions of either the GPL or the CDDL or both.
-;
+; Copyright (C) 2006-2007 Oracle Corporation +; +; This file is part of VirtualBox Open Source Edition (OSE), as +; available from http://www.virtualbox.org. This file is free software; +; you can redistribute it and/or modify it under the terms of the GNU +; General Public License (GPL) as published by the Free Software +; Foundation, in version 2 as it comes in the "COPYING" file of the +; VirtualBox OSE distribution. VirtualBox OSE is distributed in the +; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +; +; The contents of this file may alternatively be used under the terms +; of the Common Development and Distribution License Version 1.0 +; (CDDL) only, as it comes in the "COPYING.CDDL" file of the +; VirtualBox OSE distribution, in which case the provisions of the +; CDDL are applicable instead of those of the GPL. +; +; You may elect to license modified versions of this file under the +; terms and conditions of either the GPL or the CDDL or both. +; [Version]
Signature="$Windows NT$"
diff --git a/src/VBox/HostDrivers/Support/win/VBoxDrv.rc b/src/VBox/HostDrivers/Support/win/VBoxDrv.rc index 716936107..15c34900b 100644 --- a/src/VBox/HostDrivers/Support/win/VBoxDrv.rc +++ b/src/VBox/HostDrivers/Support/win/VBoxDrv.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxDrv.rc 32394 2010-09-10 12:13:11Z vboxsync $ */ +/* $Id: VBoxDrv.rc $ */ /** @file * VirtualBox Support Driver - Windows Resource File. */ diff --git a/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk index dd6d755a5..1eec978f5 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38183 2011-07-26 13:20:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Network Adapter Driver (VBoxNetAdp). # diff --git a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c index fe9d7cef1..78b987129 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdp.c 38408 2011-08-10 20:07:04Z vboxsync $ */ +/* $Id: VBoxNetAdp.c $ */ /** @file * VBoxNetAdp - Virtual Network Adapter Driver (Host), Common Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h index b42053843..ab713e46d 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h +++ b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdpInternal.h 38408 2011-08-10 20:07:04Z vboxsync $ */ +/* $Id: VBoxNetAdpInternal.h $ */ /** @file * VBoxNetAdp - Network Filter Driver (Host), Internal Header. */ diff --git a/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp b/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp index a79a5a305..6d44ae501 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp +++ b/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdp-darwin.cpp 38408 2011-08-10 20:07:04Z vboxsync $ */ +/* $Id: VBoxNetAdp-darwin.cpp $ */ /** @file * VBoxNetAdp - Virtual Network Adapter Driver (Host), Darwin Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile index ae66f4e1b..c432b4687 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile +++ b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile $ ## @file # Makefile for the VirtualBox FreeBSD Host Driver. # diff --git a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c index 0654315fc..4dc591465 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdp-freebsd.c 35950 2011-02-14 07:46:18Z vboxsync $ */ +/* $Id: VBoxNetAdp-freebsd.c $ */ /** @file * VBoxNetAdp - Virtual Network Adapter Driver (Host), FreeBSD Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp index 691b305fa..6f4bc31d2 100644..100755 --- a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp +++ b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxnetadp 36190 2011-03-07 16:28:50Z vboxsync $ +# $Id: files_vboxnetadp $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c index 8ea781efe..0b297da85 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdp-linux.c 35809 2011-02-01 12:31:15Z vboxsync $ */ +/* $Id: VBoxNetAdp-linux.c $ */ /** @file * VBoxNetAdp - Virtual Network Adapter Driver (Host), Linux Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp b/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp index 64e8dea0b..acdae40c8 100644..100755 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp @@ -1,5 +1,5 @@ #!/bin/sh -# $Revision: 37964 $ +# $Revision: 72877 $ ## @files # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c b/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c index 8d85e4011..f5c85e8e7 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdp-solaris.c 37786 2011-07-05 14:16:15Z vboxsync $ */ +/* $Id: VBoxNetAdp-solaris.c $ */ /** @file * VBoxNetAdapter - Network Adapter Driver (Host), Solaris Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk index a40f46dfc..c8ca4ac66 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38183 2011-07-26 13:20:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Network Filter Driver (VBoxNetFlt). # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c index 033c12f01..bca13618b 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxNetFlt.c $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Common Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h index 124552db0..4574d26bd 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltInternal.h 38408 2011-08-10 20:07:04Z vboxsync $ */ +/* $Id: VBoxNetFltInternal.h $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Internal Header. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp b/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp index e6579f732..d5996860f 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt-darwin.cpp 38408 2011-08-10 20:07:04Z vboxsync $ */ +/* $Id: VBoxNetFlt-darwin.cpp $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Darwin Specific Code. */ @@ -996,7 +996,12 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, u /* * Create a mbuf for the gather list and push it onto the wire. */ - if (fDst & INTNETTRUNKDIR_WIRE) + /* + * If the interface is in the promiscuous mode we need to send + * the packet down the stack so it reaches the driver and Berkeley + * Packet Filter (see #5817). + */ + if ((fDst & INTNETTRUNKDIR_WIRE) || vboxNetFltDarwinIsPromiscuous(pThis)) { mbuf_t pMBuf = vboxNetFltDarwinMBufFromSG(pThis, pSG); if (pMBuf) diff --git a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile index 20ba2da61..a6792b019 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile +++ b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 36385 2011-03-24 06:15:17Z vboxsync $ +# $Id: Makefile $ ## @file # Makefile for the VirtualBox FreeBSD Host Driver. # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c index 38ee00d99..418c244a4 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt-freebsd.c 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: VBoxNetFlt-freebsd.c $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), FreeBSD Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt index 3189c4955..691e18fe7 100644..100755 --- a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt +++ b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxnetflt 36190 2011-03-07 16:28:50Z vboxsync $ +# $Id: files_vboxnetflt $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c index d1c7f284e..6ccc3011c 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt-linux.c 38063 2011-07-19 09:58:08Z vboxsync $ */ +/* $Id: VBoxNetFlt-linux.c $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Linux Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt b/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt index f27ac7b4d..8e22c249a 100644..100755 --- a/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt +++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxnetflt 36190 2011-03-07 16:28:50Z vboxsync $ +# $Id: files_vboxnetflt $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c index 1a4b1b6b0..5495f7520 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt-solaris.c 37983 2011-07-15 14:42:57Z vboxsync $ */ +/* $Id: VBoxNetFlt-solaris.c $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Solaris Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c index 6caf018ad..a8e2f4367 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltBow-solaris.c 38160 2011-07-25 13:47:04Z vboxsync $ */ +/* $Id: VBoxNetFltBow-solaris.c $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Solaris Specific Code. */ @@ -225,6 +225,8 @@ typedef struct VBOXNETFLTVNIC mac_client_handle_t hClient; /** The unicast address handle. */ mac_unicast_handle_t hUnicast; + /** The promiscuous handle. */ + mac_promisc_handle_t hPromisc; /* The VNIC name. */ char szName[MAXLINKNAMESPECIFIER]; /** Handle to the next VNIC in the list. */ @@ -232,6 +234,7 @@ typedef struct VBOXNETFLTVNIC } VBOXNETFLTVNIC; typedef struct VBOXNETFLTVNIC *PVBOXNETFLTVNIC; + /******************************************************************************* * Global Variables * *******************************************************************************/ @@ -981,6 +984,7 @@ LOCAL PVBOXNETFLTVNIC vboxNetFltSolarisAllocVNIC(void) pVNIC->hLinkId = DATALINK_INVALID_LINKID; pVNIC->hClient = NULL; pVNIC->hUnicast = NULL; + pVNIC->hPromisc = NULL; RT_ZERO(pVNIC->szName); list_link_init(&pVNIC->hNode); return pVNIC; @@ -1018,6 +1022,12 @@ LOCAL void vboxNetFltSolarisDestroyVNIC(PVBOXNETFLTVNIC pVNIC) pVNIC->hUnicast = NULL; } + if (pVNIC->hPromisc) + { + mac_promisc_remove(pVNIC->hPromisc); + pVNIC->hPromisc = NULL; + } + mac_rx_clear(pVNIC->hClient); mac_client_close(pVNIC->hClient, 0 /* fFlags */); @@ -1205,6 +1215,45 @@ LOCAL inline int vboxNetFltSolarisGetLinkId(const char *pszMacName, datalink_id_ } +/** + * Set the promiscuous mode RX hook. + * + * @param pThis The VM connection instance. + * @param pVNIC Pointer to the VNIC. + * + * @returns VBox status code. + */ +LOCAL inline int vboxNetFltSolarisSetPromisc(PVBOXNETFLTINS pThis, PVBOXNETFLTVNIC pVNIC) +{ + int rc = VINF_SUCCESS; + if (!pVNIC->hPromisc) + { + rc = mac_promisc_add(pVNIC->hClient, MAC_CLIENT_PROMISC_FILTERED, vboxNetFltSolarisRecv, pThis, &pVNIC->hPromisc, + MAC_PROMISC_FLAGS_NO_TX_LOOP | MAC_PROMISC_FLAGS_VLAN_TAG_STRIP | MAC_PROMISC_FLAGS_NO_PHYS); + if (RT_UNLIKELY(rc)) + LogRel((DEVICE_NAME ":vboxNetFltSolarisSetPromisc failed. rc=%d\n", rc)); + rc = RTErrConvertFromErrno(rc); + } + return rc; +} + + +/** + * Clear the promiscuous mode RX hook. + * + * @param pThis The VM connection instance. + * @param pVNIC Pointer to the VNIC. + */ +LOCAL inline void vboxNetFltSolarisRemovePromisc(PVBOXNETFLTINS pThis, PVBOXNETFLTVNIC pVNIC) +{ + if (pVNIC->hPromisc) + { + mac_promisc_remove(pVNIC->hPromisc); + pVNIC->hPromisc = NULL; + } +} + + /* -=-=-=-=-=- Common Hooks -=-=-=-=-=- */ @@ -1220,13 +1269,23 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive) { for (; pVNIC != NULL; pVNIC = list_next(&pThis->u.s.hVNICs, pVNIC)) if (pVNIC->hClient) + { +#if 0 mac_rx_set(pVNIC->hClient, vboxNetFltSolarisRecv, pThis); +#endif + vboxNetFltSolarisSetPromisc(pThis, pVNIC); + } } else { for (; pVNIC != NULL; pVNIC = list_next(&pThis->u.s.hVNICs, pVNIC)) if (pVNIC->hClient) + { +#if 0 mac_rx_clear(pVNIC->hClient); +#endif + vboxNetFltSolarisRemovePromisc(pThis, pVNIC); + } } } @@ -1410,7 +1469,7 @@ void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRT if (RT_LIKELY(!rc)) { /* - * Remove existing unicast address and the RX hook. + * Remove existing unicast address, promisc. and the RX hook. */ if (pVNIC->hUnicast) { @@ -1419,21 +1478,36 @@ void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRT pVNIC->hUnicast = NULL; } - /* - * Add the primary unicast address and set the RX hook. - */ + if (pVNIC->hPromisc) + { + mac_promisc_remove(pVNIC->hPromisc); + pVNIC->hPromisc = NULL; + } + mac_diag_t MacDiag = MAC_DIAG_NONE; /* uint16_t uVLANId = pVNIC->pVNICTemplate ? pVNIC->pVNICTemplate->uVLANId : 0; */ +#if 0 rc = mac_unicast_add(pVNIC->hClient, NULL, MAC_UNICAST_PRIMARY, &pVNIC->hUnicast, 0 /* VLAN Id */, &MacDiag); +#endif if (RT_LIKELY(!rc)) { - /* - * Set the RX receive function. - * This shouldn't be necessary as vboxNetFltPortOsSetActive() will be invoked after this, but in the future, - * if the guest NIC changes MAC address this may not be followed by a vboxNetFltPortOsSetActive() call, so set it here anyway. - */ - mac_rx_set(pVNIC->hClient, vboxNetFltSolarisRecv, pThis); - LogFlow((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress successfully added unicast address %.6Rhxs\n", pMac)); + rc = vboxNetFltSolarisSetPromisc(pThis, pVNIC); +#if 0 + if (RT_SUCCESS(rc)) + { + /* + * Set the RX receive function. + * This shouldn't be necessary as vboxNetFltPortOsSetActive() will be invoked after this, but in the future, + * if the guest NIC changes MAC address this may not be followed by a vboxNetFltPortOsSetActive() call, so set it here anyway. + */ + mac_rx_set(pVNIC->hClient, vboxNetFltSolarisRecv, pThis); + LogFlow((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress successfully added unicast address %.6Rhxs\n", pMac)); + } + else + LogRel((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress failed to set promiscuous mode. rc=%d\n", rc)); + mac_unicast_remove(pVNIC->hClient, pVNIC->hUnicast); + pVNIC->hUnicast = NULL; +#endif } else LogRel((DEVICE_NAME ":vboxNetFltPortOsNotifyMacAddress failed to add primary unicast address. rc=%d Diag=%d\n", rc, MacDiag)); diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp index 9692ff87d..acde86827 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetCfg.cpp 37301 2011-06-01 19:57:39Z vboxsync $ */ +/* $Id: VBoxNetCfg.cpp $ */ /** @file * VBoxNetCfg.cpp - Network Configuration API. */ @@ -36,7 +36,7 @@ #include <comdef.h> -#ifndef Assert +#ifndef Assert /** @todo r=bird: where would this be defined? */ //# ifdef DEBUG //# define Assert(_expr) assert(_expr) //# else @@ -48,12 +48,12 @@ static LOG_ROUTINE g_Logger = NULL; static VOID DoLogging(LPCSTR szString, ...); -#define Log DoLogging -#define LogFlow(x) DoLogging x +#define NonStandardLog DoLogging +#define NonStandardLogFlow(x) DoLogging x -#define DbgLog +#define DbgLog /** @todo r=bird: What does this do? */ -#define VBOX_NETCFG_LOCK_TIME_OUT 5000 +#define VBOX_NETCFG_LOCK_TIME_OUT 5000 /** @todo r=bird: What does this do? */ static HRESULT vboxNetCfgWinINetCfgLock(IN INetCfg *pNetCfg, @@ -65,18 +65,18 @@ static HRESULT vboxNetCfgWinINetCfgLock(IN INetCfg *pNetCfg, HRESULT hr = pNetCfg->QueryInterface(IID_INetCfgLock, (PVOID*)&pLock); if (FAILED(hr)) { - LogFlow(("QueryInterface failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("QueryInterface failed, hr (0x%x)\n", hr)); return hr; } hr = pLock->AcquireWriteLock(cmsTimeout, pszwClientDescription, ppszwClientDescription); if (hr == S_FALSE) { - LogFlow(("Write lock busy\n")); + NonStandardLogFlow(("Write lock busy\n")); } else if (FAILED(hr)) { - LogFlow(("AcquireWriteLock failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("AcquireWriteLock failed, hr (0x%x)\n", hr)); } pLock->Release(); @@ -89,13 +89,13 @@ static HRESULT vboxNetCfgWinINetCfgUnlock(IN INetCfg *pNetCfg) HRESULT hr = pNetCfg->QueryInterface(IID_INetCfgLock, (PVOID*)&pLock); if (FAILED(hr)) { - LogFlow(("QueryInterface failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("QueryInterface failed, hr (0x%x)\n", hr)); return hr; } hr = pLock->ReleaseWriteLock(); if (FAILED(hr)) - LogFlow(("ReleaseWriteLock failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("ReleaseWriteLock failed, hr (0x%x)\n", hr)); pLock->Release(); return hr; @@ -111,7 +111,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinQueryINetCfg(OUT INetCfg **ppNetCfg, HRESULT hr = CoCreateInstance(CLSID_CNetCfg, NULL, CLSCTX_INPROC_SERVER, IID_INetCfg, (PVOID*)&pNetCfg); if (FAILED(hr)) { - LogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr)); return hr; } @@ -120,7 +120,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinQueryINetCfg(OUT INetCfg **ppNetCfg, hr = vboxNetCfgWinINetCfgLock(pNetCfg, pszwClientDescription, cmsTimeout, ppszwClientDescription); if (hr == S_FALSE) { - LogFlow(("Write lock is busy\n", hr)); + NonStandardLogFlow(("Write lock is busy\n", hr)); hr = NETCFG_E_NO_WRITE_LOCK; } } @@ -134,7 +134,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinQueryINetCfg(OUT INetCfg **ppNetCfg, return S_OK; } else - LogFlow(("Initialize failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Initialize failed, hr (0x%x)\n", hr)); } pNetCfg->Release(); @@ -146,7 +146,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinReleaseINetCfg(IN INetCfg *pNetCfg, IN HRESULT hr = pNetCfg->Uninitialize(); if (FAILED(hr)) { - LogFlow(("Uninitialize failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Uninitialize failed, hr (0x%x)\n", hr)); return hr; } @@ -154,7 +154,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinReleaseINetCfg(IN INetCfg *pNetCfg, IN { hr = vboxNetCfgWinINetCfgUnlock(pNetCfg); if (FAILED(hr)) - LogFlow(("vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr)); } pNetCfg->Release(); @@ -168,7 +168,7 @@ static HRESULT vboxNetCfgWinGetComponentByGuidEnum(IEnumNetCfgComponent *pEnumNc HRESULT hr = pEnumNcc->Reset(); if (FAILED(hr)) { - LogFlow(("Reset failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Reset failed, hr (0x%x)\n", hr)); return hr; } @@ -194,7 +194,7 @@ static HRESULT vboxNetCfgWinGetComponentByGuidEnum(IEnumNetCfgComponent *pEnumNc } } else - LogFlow(("GetInstanceGuid failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("GetInstanceGuid failed, hr (0x%x)\n", hr)); } } @@ -216,16 +216,16 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGetComponentByGuid(IN INetCfg *pNc, hr = vboxNetCfgWinGetComponentByGuidEnum(pEnumNcc, pComponentGuid, ppncc); if (hr == S_FALSE) { - LogFlow(("Component not found\n")); + NonStandardLogFlow(("Component not found\n")); } else if (FAILED(hr)) { - LogFlow(("vboxNetCfgWinGetComponentByGuidEnum failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("vboxNetCfgWinGetComponentByGuidEnum failed, hr (0x%x)\n", hr)); } pEnumNcc->Release(); } else - LogFlow(("EnumComponents failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("EnumComponents failed, hr (0x%x)\n", hr)); return hr; } @@ -233,7 +233,7 @@ static HRESULT vboxNetCfgWinQueryInstaller(IN INetCfg *pNetCfg, IN const GUID *p { HRESULT hr = pNetCfg->QueryNetCfgClass(pguidClass, IID_INetCfgClassSetup, (void**)ppSetup); if (FAILED(hr)) - LogFlow(("QueryNetCfgClass failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("QueryNetCfgClass failed, hr (0x%x)\n", hr)); return hr; } @@ -244,7 +244,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallComponent(IN INetCfg *pNetCfg, I HRESULT hr = vboxNetCfgWinQueryInstaller(pNetCfg, pguidClass, &pSetup); if (FAILED(hr)) { - LogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr)); return hr; } @@ -264,31 +264,33 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallComponent(IN INetCfg *pNetCfg, I HRESULT tmpHr = pNetCfg->Apply(); Assert(tmpHr == S_OK); if (tmpHr != S_OK) - LogFlow(("Apply failed, hr (0x%x)\n", tmpHr)); + NonStandardLogFlow(("Apply failed, hr (0x%x)\n", tmpHr)); } else - LogFlow(("Install failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Install failed, hr (0x%x)\n", hr)); pSetup->Release(); return hr; } +/** @todo r=bird: This function is not in the header file, why is it + * exported? */ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallInfAndComponent(IN INetCfg *pNetCfg, IN LPCWSTR pszwComponentId, IN const GUID *pguidClass, - IN LPCWSTR * apInfPaths, IN UINT cInfPaths, + IN LPCWSTR const *apInfPaths, IN UINT cInfPaths, OUT INetCfgComponent **ppComponent) { HRESULT hr = S_OK; UINT i = 0; - LogFlow(("Installing %u INF files ...\n", cInfPaths)); + NonStandardLogFlow(("Installing %u INF files ...\n", cInfPaths)); for (; i < cInfPaths; i++) { - LogFlow(("Installing INF file \"%ws\" ...\n", apInfPaths[i])); + NonStandardLogFlow(("Installing INF file \"%ws\" ...\n", apInfPaths[i])); hr = VBoxDrvCfgInfInstall(apInfPaths[i]); if (FAILED(hr)) { - LogFlow(("VBoxNetCfgWinInfInstall failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("VBoxNetCfgWinInfInstall failed, hr (0x%x)\n", hr)); break; } } @@ -297,7 +299,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallInfAndComponent(IN INetCfg *pNet { hr = VBoxNetCfgWinInstallComponent(pNetCfg, pszwComponentId, pguidClass, ppComponent); if (FAILED(hr)) - LogFlow(("VBoxNetCfgWinInstallComponent failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("VBoxNetCfgWinInstallComponent failed, hr (0x%x)\n", hr)); } if (FAILED(hr)) @@ -315,7 +317,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUninstallComponent(IN INetCfg *pNetCfg, HRESULT hr = pComponent->GetClassGuid(&GuidClass); if (FAILED(hr)) { - LogFlow(("GetClassGuid failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("GetClassGuid failed, hr (0x%x)\n", hr)); return hr; } @@ -323,7 +325,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUninstallComponent(IN INetCfg *pNetCfg, hr = vboxNetCfgWinQueryInstaller(pNetCfg, &GuidClass, &pSetup); if (FAILED(hr)) { - LogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr)); return hr; } @@ -336,10 +338,10 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUninstallComponent(IN INetCfg *pNetCfg, { hr = pNetCfg->Apply(); if (FAILED(hr)) - LogFlow(("Apply failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Apply failed, hr (0x%x)\n", hr)); } else - LogFlow(("DeInstall failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("DeInstall failed, hr (0x%x)\n", hr)); if (pSetup) pSetup->Release(); @@ -385,7 +387,7 @@ static HRESULT vboxNetCfgWinEnumNetCfgComponents(IN INetCfg *pNetCfg, hr = S_OK; } else - LogFlow(("Next failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Next failed, hr (0x%x)\n", hr)); break; } } while (true); @@ -417,28 +419,28 @@ static BOOL vboxNetCfgWinRemoveAllNetDevicesOfIdCallback(HDEVINFO hDevInfo, PSP_ if (devParams.Flags & (DI_NEEDRESTART|DI_NEEDREBOOT)) { hr = S_FALSE; - Log(("!!!REBOOT REQUIRED!!!\n")); + NonStandardLog(("!!!REBOOT REQUIRED!!!\n")); } } } else { DWORD dwErr = GetLastError(); - LogFlow(("SetupDiCallClassInstaller failed with %ld\n", dwErr)); + NonStandardLogFlow(("SetupDiCallClassInstaller failed with %ld\n", dwErr)); hr = HRESULT_FROM_WIN32(dwErr); } } else { DWORD dwErr = GetLastError(); - LogFlow(("SetupDiSetSelectedDevice failed with %ld\n", dwErr)); + NonStandardLogFlow(("SetupDiSetSelectedDevice failed with %ld\n", dwErr)); hr = HRESULT_FROM_WIN32(dwErr); } } else { DWORD dwErr = GetLastError(); - LogFlow(("SetupDiSetClassInstallParams failed with %ld\n", dwErr)); + NonStandardLogFlow(("SetupDiSetClassInstallParams failed with %ld\n", dwErr)); hr = HRESULT_FROM_WIN32(dwErr); } @@ -485,7 +487,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnumNetDevices(LPCWSTR pPnPId, VBOXNETC winEr = GetLastError(); if (winEr != ERROR_INSUFFICIENT_BUFFER) { - LogFlow(("SetupDiGetDeviceRegistryPropertyW (1) failed winErr(%d)\n", winEr)); + NonStandardLogFlow(("SetupDiGetDeviceRegistryPropertyW (1) failed winErr(%d)\n", winEr)); hr = HRESULT_FROM_WIN32(winEr); break; } @@ -505,7 +507,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnumNetDevices(LPCWSTR pPnPId, VBOXNETC )) { winEr = GetLastError(); - LogFlow(("SetupDiGetDeviceRegistryPropertyW (2) failed winErr(%d)\n", winEr)); + NonStandardLogFlow(("SetupDiGetDeviceRegistryPropertyW (2) failed winErr(%d)\n", winEr)); hr = HRESULT_FROM_WIN32(winEr); break; } @@ -540,7 +542,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnumNetDevices(LPCWSTR pPnPId, VBOXNETC else { DWORD winEr = GetLastError(); - LogFlow(("SetupDiGetClassDevsExW failed winErr(%d)\n", winEr)); + NonStandardLogFlow(("SetupDiGetClassDevsExW failed winErr(%d)\n", winEr)); hr = HRESULT_FROM_WIN32(winEr); } @@ -557,16 +559,16 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRemoveAllNetDevicesOfId(IN LPCWSTR lpsz */ static VOID DoLogging(LPCSTR szString, ...) { - LOG_ROUTINE pRoutine = (LOG_ROUTINE)(*((void * volatile *)&g_Logger)); - if (pRoutine) + LOG_ROUTINE pfnRoutine = (LOG_ROUTINE)(*((void * volatile *)&g_Logger)); + if (pfnRoutine) { char szBuffer[4096] = {0}; - va_list pArgList; - va_start(pArgList, szString); - _vsnprintf(szBuffer, RT_ELEMENTS(szBuffer), szString, pArgList); - va_end(pArgList); + va_list va; + va_start(va, szString); + _vsnprintf(szBuffer, RT_ELEMENTS(szBuffer), szString, va); + va_end(va); - pRoutine(szBuffer); + pfnRoutine(szBuffer); } } @@ -786,52 +788,59 @@ public: static HRESULT netIfWinFindAdapterClassById(IWbemServices * pSvc, const GUID * pGuid, IWbemClassObject **pAdapterConfig) { HRESULT hr; - WCHAR aQueryString[256]; - WCHAR GuidString[50]; + WCHAR wszQuery[256]; + WCHAR wszGuid[50]; - int length = StringFromGUID2(*pGuid, GuidString, sizeof(GuidString)/sizeof(GuidString[0])); + int length = StringFromGUID2(*pGuid, wszGuid, RT_ELEMENTS(wszGuid)); if (length) { - swprintf(aQueryString, L"SELECT * FROM Win32_NetworkAdapterConfiguration WHERE SettingID = \"%s\"", GuidString); + swprintf(wszQuery, L"SELECT * FROM Win32_NetworkAdapterConfiguration WHERE SettingID = \"%s\"", wszGuid); IEnumWbemClassObject* pEnumerator = NULL; - hr = pSvc->ExecQuery(bstr_t("WQL"), bstr_t(aQueryString), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnumerator); + hr = pSvc->ExecQuery(bstr_t("WQL"), bstr_t(wszQuery), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, + NULL, &pEnumerator); if (SUCCEEDED(hr)) { - IWbemClassObject *pclsObj; - ULONG uReturn = 0; - if (pEnumerator) { - HRESULT hr = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn); - + IWbemClassObject *pclsObj; + ULONG uReturn = 0; + hr = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn); + NonStandardLogFlow(("netIfWinFindAdapterClassById: IEnumWbemClassObject::Next -> hr=0x%x pclsObj=%p uReturn=%u 42=%u\n", + hr, (void *)pclsObj, uReturn, 42)); if (SUCCEEDED(hr)) { - if (uReturn) + if (uReturn && pclsObj != NULL) { - pEnumerator->Release(); *pAdapterConfig = pclsObj; - hr = S_OK; - return hr; - } - else - { - hr = S_FALSE; + pEnumerator->Release(); + NonStandardLogFlow(("netIfWinFindAdapterClassById: S_OK and %p\n", *pAdapterConfig)); + return S_OK; } + + hr = E_FAIL; } pEnumerator->Release(); } + else + { + NonStandardLogFlow(("ExecQuery returned no enumerator\n")); + hr = E_FAIL; + } } else - LogFlow(("ExecQuery failed (0x%x)\n", hr)); + NonStandardLogFlow(("ExecQuery failed (0x%x)\n", hr)); } else { DWORD winEr = GetLastError(); - LogFlow(("StringFromGUID2 failed winEr (%d)\n", winEr)); hr = HRESULT_FROM_WIN32( winEr ); + if (SUCCEEDED(hr)) + hr = E_FAIL; + NonStandardLogFlow(("StringFromGUID2 failed winEr=%u, hr=0x%x\n", winEr, hr)); } + NonStandardLogFlow(("netIfWinFindAdapterClassById: 0x%x and %p\n", hr, *pAdapterConfig)); return hr; } @@ -841,10 +850,10 @@ static HRESULT netIfWinIsHostOnly(IWbemClassObject * pAdapterConfig, BOOL * pbIs BOOL bIsHostOnly = FALSE; VariantInit(&vtServiceName); - HRESULT hr = pAdapterConfig->Get(L"ServiceName", 0, &vtServiceName, 0, 0); + HRESULT hr = pAdapterConfig->Get(L"ServiceName", 0 /*lFlags*/, &vtServiceName, NULL /*pvtType*/, NULL /*plFlavor*/); if (SUCCEEDED(hr)) { - *pbIsHostOnly = (bstr_t(vtServiceName.bstrVal) == bstr_t("VBoxNetAdp")); + *pbIsHostOnly = bstr_t(vtServiceName.bstrVal) == bstr_t("VBoxNetAdp"); VariantClear(&vtServiceName); } @@ -982,10 +991,10 @@ static HRESULT netIfWinWaitIpSettings(IWbemServices *pSvc, const GUID * pGuid, S ComPtr <IWbemClassObject> pAdapterConfig; for (i = 0; (hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam())) == S_OK - && (hr = netIfWinHasIpSettings(pAdapterConfig, pCheckIp, pCheckMask, pFound)) == S_OK - && !(*pFound) - && i < sec2Wait/6; - i++) + && (hr = netIfWinHasIpSettings(pAdapterConfig, pCheckIp, pCheckMask, pFound)) == S_OK + && !(*pFound) + && i < sec2Wait/6; + i++) { Sleep(6000); } @@ -1027,16 +1036,16 @@ static HRESULT netIfWinCreateIWbemServices(IWbemServices ** ppSvc) return hr; } else - LogFlow(("CoSetProxyBlanket failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("CoSetProxyBlanket failed, hr (0x%x)\n", hr)); pSvc->Release(); } else - LogFlow(("ConnectServer failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("ConnectServer failed, hr (0x%x)\n", hr)); pLoc->Release(); } else - LogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr)); return hr; } @@ -1051,7 +1060,7 @@ static HRESULT netIfWinAdapterConfigPath(IWbemClassObject *pObj, BSTR * pStr) *pStr = (bstr_t(L"Win32_NetworkAdapterConfiguration.Index='") + strIndex + "'").copy(); } else - LogFlow(("Get failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Get failed, hr (0x%x)\n", hr)); return hr; } @@ -1454,7 +1463,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGetAdapterSettings(IN const GUID * pGui hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); if (SUCCEEDED(hr)) { - ComPtr <IWbemClassObject> pAdapterConfig; + ComPtr<IWbemClassObject> pAdapterConfig; hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); if (SUCCEEDED(hr)) { @@ -1470,73 +1479,74 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGetAdapterSettings(IN const GUID * pGui VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinIsDhcpEnabled(const GUID * pGuid, BOOL *pEnabled) { HRESULT hr; - ComPtr <IWbemServices> pSvc; - hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); + ComPtr <IWbemServices> pSvc; + hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); + if (SUCCEEDED(hr)) + { + ComPtr<IWbemClassObject> pAdapterConfig; + hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); if (SUCCEEDED(hr)) { - ComPtr <IWbemClassObject> pAdapterConfig; - hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); + VARIANT vtEnabled; + hr = pAdapterConfig->Get(L"DHCPEnabled", 0, &vtEnabled, 0, 0); if (SUCCEEDED(hr)) - { - VARIANT vtEnabled; - hr = pAdapterConfig->Get(L"DHCPEnabled", 0, &vtEnabled, 0, 0); - if (SUCCEEDED(hr)) - *pEnabled = vtEnabled.boolVal; - } + *pEnabled = vtEnabled.boolVal; } + } return hr; } VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnableStaticIpConfig(IN const GUID *pGuid, IN ULONG ip, IN ULONG mask) { - HRESULT hr; - ComPtr <IWbemServices> pSvc; - hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); + NonStandardLogFlow(("VBoxNetCfgWinEnableStaticIpConfig: ip=0x%x mask=0x%x", ip, mask)); + ComPtr<IWbemServices> pSvc; + HRESULT hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); + if (SUCCEEDED(hr)) + { + ComPtr<IWbemClassObject> pAdapterConfig; + hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); if (SUCCEEDED(hr)) { - ComPtr <IWbemClassObject> pAdapterConfig; - hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); + BOOL bIsHostOnly; + hr = netIfWinIsHostOnly(pAdapterConfig, &bIsHostOnly); if (SUCCEEDED(hr)) { - BOOL bIsHostOnly; - hr = netIfWinIsHostOnly(pAdapterConfig, &bIsHostOnly); - if (SUCCEEDED(hr)) + if (bIsHostOnly) { - if (bIsHostOnly) - { - in_addr aIp[1]; - in_addr aMask[1]; - aIp[0].S_un.S_addr = ip; - aMask[0].S_un.S_addr = mask; + in_addr aIp[1]; + in_addr aMask[1]; + aIp[0].S_un.S_addr = ip; + aMask[0].S_un.S_addr = mask; - BSTR ObjPath; - hr = netIfWinAdapterConfigPath(pAdapterConfig, &ObjPath); + BSTR ObjPath; + hr = netIfWinAdapterConfigPath(pAdapterConfig, &ObjPath); + if (SUCCEEDED(hr)) + { + hr = netIfWinEnableStaticV4(pSvc, pGuid, ObjPath, aIp, aMask, ip != 0 ? 1 : 0); if (SUCCEEDED(hr)) { - hr = netIfWinEnableStaticV4(pSvc, pGuid, ObjPath, aIp, aMask, ip != 0 ? 1 : 0); - if (SUCCEEDED(hr)) - { #if 0 - in_addr aGw[1]; - aGw[0].S_un.S_addr = gw; - hr = netIfWinSetGatewaysV4(pSvc, ObjPath, aGw, 1); - if (SUCCEEDED(hr)) + in_addr aGw[1]; + aGw[0].S_un.S_addr = gw; + hr = netIfWinSetGatewaysV4(pSvc, ObjPath, aGw, 1); + if (SUCCEEDED(hr)) #endif - { - } + { } - SysFreeString(ObjPath); } - } - else - { - hr = E_FAIL; + SysFreeString(ObjPath); } } + else + { + hr = E_FAIL; + } } } + } + NonStandardLogFlow(("VBoxNetCfgWinEnableStaticIpConfig: returns 0x%x", hr)); return hr; } @@ -1548,7 +1558,7 @@ static HRESULT netIfEnableStaticIpConfigV6(const GUID *pGuid, IN_BSTR aIPV6Addre hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); if (SUCCEEDED(hr)) { - ComPtr <IWbemClassObject> pAdapterConfig; + ComPtr<IWbemClassObject> pAdapterConfig; hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); if (SUCCEEDED(hr)) { @@ -1596,7 +1606,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnableDynamicIpConfig(IN const GUID *pG hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); if (SUCCEEDED(hr)) { - ComPtr <IWbemClassObject> pAdapterConfig; + ComPtr<IWbemClassObject> pAdapterConfig; hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); if (SUCCEEDED(hr)) { @@ -1633,39 +1643,39 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnableDynamicIpConfig(IN const GUID *pG VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinDhcpRediscover(IN const GUID *pGuid) { HRESULT hr; - ComPtr <IWbemServices> pSvc; - hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); + ComPtr <IWbemServices> pSvc; + hr = netIfWinCreateIWbemServices(pSvc.asOutParam()); + if (SUCCEEDED(hr)) + { + ComPtr<IWbemClassObject> pAdapterConfig; + hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); if (SUCCEEDED(hr)) { - ComPtr <IWbemClassObject> pAdapterConfig; - hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam()); + BOOL bIsHostOnly; + hr = netIfWinIsHostOnly(pAdapterConfig, &bIsHostOnly); if (SUCCEEDED(hr)) { - BOOL bIsHostOnly; - hr = netIfWinIsHostOnly(pAdapterConfig, &bIsHostOnly); - if (SUCCEEDED(hr)) + if (bIsHostOnly) { - if (bIsHostOnly) + BSTR ObjPath; + hr = netIfWinAdapterConfigPath(pAdapterConfig, &ObjPath); + if (SUCCEEDED(hr)) { - BSTR ObjPath; - hr = netIfWinAdapterConfigPath(pAdapterConfig, &ObjPath); + hr = netIfWinDhcpRediscover(pSvc, ObjPath); if (SUCCEEDED(hr)) { - hr = netIfWinDhcpRediscover(pSvc, ObjPath); - if (SUCCEEDED(hr)) - { -// hr = netIfWinUpdateConfig(pIf); - } - SysFreeString(ObjPath); + //hr = netIfWinUpdateConfig(pIf); } - } - else - { - hr = E_FAIL; + SysFreeString(ObjPath); } } + else + { + hr = E_FAIL; + } } } + } return hr; @@ -1803,7 +1813,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGenHostOnlyNetworkNetworkIp(OUT PULONG dwRc = ERROR_DHCP_ADDRESS_CONFLICT; } else - LogFlow(("GetAdaptersAddresses err (%d)\n", dwRc)); + NonStandardLogFlow(("GetAdaptersAddresses err (%d)\n", dwRc)); if (pAddresses) free(pAddresses); @@ -1828,7 +1838,7 @@ static HRESULT vboxNetCfgWinNetFltUninstall(IN INetCfg *pNc, DWORD InfRmFlags) HRESULT hr = pNc->FindComponent(VBOXNETCFGWIN_NETFLT_ID, &pNcc); if (hr == S_OK) { - Log("NetFlt is installed currently, uninstalling ...\n"); + NonStandardLog("NetFlt is installed currently, uninstalling ...\n"); hr = VBoxNetCfgWinUninstallComponent(pNc, pNcc); @@ -1836,12 +1846,12 @@ static HRESULT vboxNetCfgWinNetFltUninstall(IN INetCfg *pNc, DWORD InfRmFlags) } else if (hr == S_FALSE) { - Log("NetFlt is not installed currently\n"); + NonStandardLog("NetFlt is not installed currently\n"); hr = S_OK; } else { - LogFlow(("FindComponent failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("FindComponent failed, hr (0x%x)\n", hr)); hr = S_OK; } @@ -1857,12 +1867,12 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetFltUninstall(IN INetCfg *pNc) } VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetFltInstall(IN INetCfg *pNc, - IN LPCWSTR * apInfFullPaths, IN UINT cInfFullPaths) + IN LPCWSTR const *apInfFullPaths, IN UINT cInfFullPaths) { HRESULT hr = vboxNetCfgWinNetFltUninstall(pNc, SUOI_FORCEDELETE); if (SUCCEEDED(hr)) { - Log("NetFlt will be installed ...\n"); + NonStandardLog("NetFlt will be installed ...\n"); hr = VBoxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETFLT_ID, &GUID_DEVCLASS_NETSERVICE, apInfFullPaths, @@ -1949,14 +1959,14 @@ static BOOL vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority(IN INetCfg *pNc, { hr = pNetCfgBindings->MoveAfter(pNetCfgBindPath, NULL); if (FAILED(hr)) - LogFlow(("Unable to move interface, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Unable to move interface, hr (0x%x)\n", hr)); bFoundIface = true; } } pNetCfgCompo->Release(); } else - LogFlow(("GetLowerComponent failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("GetLowerComponent failed, hr (0x%x)\n", hr)); pNetCfgBindIfce->Release(); } else @@ -1964,14 +1974,14 @@ static BOOL vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority(IN INetCfg *pNc, if (hr == S_FALSE) /* No more binding interfaces? */ hr = S_OK; else - LogFlow(("Next binding interface failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Next binding interface failed, hr (0x%x)\n", hr)); break; } } while (!bFoundIface); pEnumNetCfgBindIface->Release(); } else - LogFlow(("EnumBindingInterfaces failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("EnumBindingInterfaces failed, hr (0x%x)\n", hr)); pNetCfgBindPath->Release(); } else @@ -1979,18 +1989,18 @@ static BOOL vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority(IN INetCfg *pNc, if (hr = S_FALSE) /* No more binding paths? */ hr = S_OK; else - LogFlow(("Next bind path failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("Next bind path failed, hr (0x%x)\n", hr)); break; } } while (!bFoundIface); pEnumNetCfgBindPath->Release(); } else - LogFlow(("EnumBindingPaths failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("EnumBindingPaths failed, hr (0x%x)\n", hr)); pNetCfgBindings->Release(); } else - LogFlow(("QueryInterface for IID_INetCfgComponentBindings failed, hr (0x%x)\n", hr)); + NonStandardLogFlow(("QueryInterface for IID_INetCfgComponentBindings failed, hr (0x%x)\n", hr)); return TRUE; } @@ -2055,15 +2065,15 @@ static HRESULT rename_shellfolder (PCWSTR wGuid, PCWSTR wNewName) HRESULT hr; /* Build the display name in the form "::{GUID}". */ - if (wcslen (wGuid) >= MAX_PATH) + if (wcslen(wGuid) >= MAX_PATH) return E_INVALIDARG; WCHAR szAdapterGuid[MAX_PATH + 2] = {0}; - swprintf (szAdapterGuid, L"::%ls", wGuid); + swprintf(szAdapterGuid, L"::%ls", wGuid); /* Create an instance of the network connections folder. */ - hr = CoCreateInstance (CLSID_NetworkConnections, NULL, - CLSCTX_INPROC_SERVER, IID_IShellFolder, - reinterpret_cast <LPVOID *> (&pShellFolder)); + hr = CoCreateInstance(CLSID_NetworkConnections, NULL, + CLSCTX_INPROC_SERVER, IID_IShellFolder, + reinterpret_cast<LPVOID *>(&pShellFolder)); /* Parse the display name. */ if (SUCCEEDED (hr)) { @@ -2129,7 +2139,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRenameConnection (LPWSTR pGuid, PCWSTR #define SetErrBreak(strAndArgs) \ if (1) { \ hrc = E_FAIL; \ - Log strAndArgs; \ + NonStandardLog strAndArgs; \ break; \ } else do {} while (0) @@ -2149,16 +2159,16 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRemoveHostOnlyNetworkInterface(IN const do { WCHAR strRegLocation [256]; - WCHAR GuidString[50]; + WCHAR wszGuid[50]; - int length = StringFromGUID2(*pGUID, GuidString, sizeof(GuidString)/sizeof(GuidString[0])); + int length = StringFromGUID2(*pGUID, wszGuid, RT_ELEMENTS(wszGuid)); if (!length) SetErrBreak(("Failed to create a Guid string")); swprintf (strRegLocation, L"SYSTEM\\CurrentControlSet\\Control\\Network\\" L"{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s", - GuidString); + wszGuid); LONG status; status = RegOpenKeyExW (HKEY_LOCAL_MACHINE, strRegLocation, 0, @@ -2428,20 +2438,20 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWS if (!fResult) { DWORD winEr = GetLastError(); - LogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr)); + NonStandardLogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr)); break; } } else { - LogFlow(("SetupDiSetDeviceInstallParams faileed: INF path is too long\n")); + NonStandardLogFlow(("SetupDiSetDeviceInstallParams faileed: INF path is too long\n")); break; } } else { DWORD winEr = GetLastError(); - LogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr)); + NonStandardLogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr)); } } @@ -2562,20 +2572,20 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWS if (!fResult) { DWORD winEr = GetLastError(); - LogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr)); + NonStandardLogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr)); } Assert(fResult); } else { DWORD winEr = GetLastError(); - LogFlow(("SetupInitDefaultQueueCallback failed, winEr (%d)\n", winEr)); + NonStandardLogFlow(("SetupInitDefaultQueueCallback failed, winEr (%d)\n", winEr)); } } else { DWORD winEr = GetLastError(); - LogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr)); + NonStandardLogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr)); } /* install the files first */ @@ -2634,10 +2644,9 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWS DIREG_DRV, KEY_READ); if (hkey == INVALID_HANDLE_VALUE) - SetErrBreak (("SetupDiOpenDevRegKey failed (0x%08X)", - GetLastError())); + SetErrBreak(("SetupDiOpenDevRegKey failed (0x%08X)", GetLastError())); - cbSize = sizeof (pWCfgGuidString); + cbSize = sizeof(pWCfgGuidString); DWORD ret; ret = RegQueryValueExW (hkey, L"NetCfgInstanceId", NULL, &dwValueType, (LPBYTE) pWCfgGuidString, &cbSize); @@ -2708,10 +2717,10 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWS if (lppszName) { - *lppszName = ::SysAllocString((const OLECHAR *) DevName); + *lppszName = SysAllocString((const OLECHAR *) DevName); if (!*lppszName) { - LogFlow(("SysAllocString failed\n")); + NonStandardLogFlow(("SysAllocString failed\n")); hrc = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); } } @@ -2720,7 +2729,7 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWS { hrc = CLSIDFromString(pWCfgGuidString, (LPCLSID)pGuid); if (FAILED(hrc)) - LogFlow(("CLSIDFromString failed, hrc (0x%x)\n", hrc)); + NonStandardLogFlow(("CLSIDFromString failed, hrc (0x%x)\n", hrc)); } INetCfg *pNetCfg = NULL; @@ -2753,16 +2762,16 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWS hr = pNetCfg->Apply(); } else - LogFlow(("Enumeration failed, hr 0x%x\n", hr)); + NonStandardLogFlow(("Enumeration failed, hr 0x%x\n", hr)); VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE); } else if (hr == NETCFG_E_NO_WRITE_LOCK && lpszApp) { - LogFlow(("Application %ws is holding the lock, failed\n", lpszApp)); + NonStandardLogFlow(("Application %ws is holding the lock, failed\n", lpszApp)); CoTaskMemFree(lpszApp); } else - LogFlow(("VBoxNetCfgWinQueryINetCfg failed, hr 0x%x\n", hr)); + NonStandardLogFlow(("VBoxNetCfgWinQueryINetCfg failed, hr 0x%x\n", hr)); } return hrc; } diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf index b7d2702c8..033482a98 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf @@ -1,4 +1,4 @@ -; $Id: VBoxNetAdp.inf 36184 2011-03-07 10:57:04Z vboxsync $ +; $Id: VBoxNetAdp.inf $ ; @file ; VBoxNetAdp.inf - VirtualBox Host-Only Driver inf file ; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc index 41da1c3ea..c05f8c2c7 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt-win.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt-win.rc 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFlt-win.rc $ */ /** @file * VBoxNetFlt - Resource file containing version info and icon. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf index 8745ae884..d06b33a50 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf @@ -1,4 +1,4 @@ -; $Id: VBoxNetFlt.inf 36184 2011-03-07 10:57:04Z vboxsync $ +; $Id: VBoxNetFlt.inf $ ; @file ; VBoxNetFlt.inf - VirtualBox Bridged Networking Driver inf file ; Protocol edge diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h index 9d89ededd..39cfa945f 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltCmn-win.h 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltCmn-win.h $ */ /** @file * VBoxNetFltCmn-win.h - Bridged Networking Driver, Windows Specific Code. * Common header with configuration defines and global defs diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp index 897dc09c2..079ef7ff9 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltM-win.cpp 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltM-win.cpp $ */ /** @file * VBoxNetFltM-win.cpp - Bridged Networking Driver, Windows Specific Code. * Miniport edge diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h index 958deb4cb..1883cb491 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltM-win.h 36207 2011-03-08 17:12:10Z vboxsync $ */ +/* $Id: VBoxNetFltM-win.h $ */ /** @file * VBoxNetFltM-win.h - Bridged Networking Driver, Windows Specific Code - Miniport edge API */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf index 25748e10d..761b5105c 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf @@ -1,4 +1,4 @@ -; $Id: VBoxNetFltM.inf 36184 2011-03-07 10:57:04Z vboxsync $ +; $Id: VBoxNetFltM.inf $ ; @file ; VBoxNetFltM.inf - VirtualBox Bridged Networking Driver inf file ; Miniport edge diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp index bba6ba40d..6dc796a6a 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltP-win.cpp 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltP-win.cpp $ */ /** @file * VBoxNetFltP-win.cpp - Bridged Networking Driver, Windows Specific Code. * Protocol edge diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.h index 63e8f102b..a43dbc8c8 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltP-win.h 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltP-win.h $ */ /** @file * VBoxNetFltP-win.h - Bridged Networking Driver, Windows Specific Code. * Protocol edge API diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp index 7175be6b3..289ee5474 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltRt-win.cpp 37161 2011-05-20 07:28:21Z vboxsync $ */ +/* $Id: VBoxNetFltRt-win.cpp $ */ /** @file * VBoxNetFltRt-win.cpp - Bridged Networking Driver, Windows Specific Code. * NetFlt Runtime diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h index 9ef0d2588..695fb48f9 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltRt-win.h 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltRt-win.h $ */ /** @file * VBoxNetFltRt-win.h - Bridged Networking Driver, Windows Specific Code. * NetFlt Runtime API diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp index d0a7ac23a..6167c55b7 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltNobj.cpp 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltNobj.cpp $ */ /** @file * VBoxNetFltNobj.cpp - Notify Object for Bridged Networking Driver. * Used to filter Bridged Networking Driver bindings diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def index 6512eefc6..68b76d38f 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def @@ -1,4 +1,4 @@ -; $Id: VBoxNetFltNobj.def 36184 2011-03-07 10:57:04Z vboxsync $ +; $Id: VBoxNetFltNobj.def $ ; @file ; VBoxNetFltNobj.def - Notify Object for Bridged Networking Driver. ; Library def file diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h index 036df1dee..41f8523cc 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltNobj.h 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltNobj.h $ */ /** @file * VBoxNetFltNobj.h - Notify Object for Bridged Networking Driver. * Used to filter Bridged Networking Driver bindings diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc index 57f92364c..255535551 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltNobj.rc 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltNobj.rc $ */ /** @file * VBoxNetFltNobj.h - Notify Object for Bridged Networking Driver. * Resource file diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h index cedcda7f3..ba168a3b1 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltNobjRc.h 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltNobjRc.h $ */ /** @file * VBoxNetFltNobjRc.h - Notify Object for Bridged Networking Driver. * Resource definitions diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl index 22b6f2bfe..69d3c9a9d 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltNobjT.idl 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltNobjT.idl $ */ /** @file * VBoxNetFltNobjT.idl - Notify Object for Bridged Networking Driver. * Type lib definition diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp index a836cf023..9e315355a 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdpInstall.cpp 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetAdpInstall.cpp $ */ /** @file * NetAdpInstall - VBoxNetAdp installer command line tool */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp index 63e6772c0..f5b1b7807 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdpUninstall.cpp 36487 2011-04-01 08:21:30Z vboxsync $ */ +/* $Id: VBoxNetAdpUninstall.cpp $ */ /** @file * NetAdpUninstall - VBoxNetAdp uninstaller command line tool */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp index 3ce13ab90..f8e93be0c 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltInstall.cpp 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltInstall.cpp $ */ /** @file * NetFltInstall - VBoxNetFlt installer command line tool */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp index 710db34ab..7c0169458 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltUninstall.cpp 36184 2011-03-07 10:57:04Z vboxsync $ */ +/* $Id: VBoxNetFltUninstall.cpp $ */ /** @file * NetFltUninstall - VBoxNetFlt uninstaller command line tool */ diff --git a/src/VBox/HostDrivers/VBoxPci/Makefile.kmk b/src/VBox/HostDrivers/VBoxPci/Makefile.kmk index e13ac9712..41e25626a 100644 --- a/src/VBox/HostDrivers/VBoxPci/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxPci/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38183 2011-07-26 13:20:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the PCI passthru driver (VBoxPci). # diff --git a/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h b/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h index b52841862..312ff07e7 100644 --- a/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h +++ b/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxPciInternal.h 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: VBoxPciInternal.h $ */ /** @file * VBoxPci - PCI driver (Host), Internal Header. */ diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c index 8626145af..9d688243c 100644 --- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c @@ -1,4 +1,4 @@ -/* $Id: VBoxPci-linux.c 38299 2011-08-03 11:35:54Z vboxsync $ */ +/* $Id: VBoxPci-linux.c $ */ /** @file * VBoxPci - PCI Driver (Host), Linux Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci b/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci index 3e5a7abde..434ed56e4 100644..100755 --- a/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci +++ b/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: files_vboxpci 37798 2011-07-06 11:35:19Z vboxsync $ +# $Id: files_vboxpci $ ## @file # Shared file between Makefile.kmk and export_modules # diff --git a/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk b/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk index d23ebc065..5c6055b1b 100644 --- a/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38183 2011-07-26 13:20:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Windows USB drivers. # diff --git a/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp index 6c958ce09..fd1882835 100644 --- a/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp @@ -1,4 +1,4 @@ -/* $Id: USBFilter.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: USBFilter.cpp $ */ /** @file * VirtualBox USB filter abstraction. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp b/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp index c4b8011b3..e404a396f 100644 --- a/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp @@ -1,4 +1,4 @@ -/* $Id: USBLib.cpp 31898 2010-08-24 09:28:43Z vboxsync $ */ +/* $Id: USBLib.cpp $ */ /** @file * VirtualBox USB Library, Common Bits. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp index 182373993..c4857e492 100644 --- a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUSBFilterMgr.cpp 36941 2011-05-03 14:56:08Z vboxsync $ */ +/* $Id: VBoxUSBFilterMgr.cpp $ */ /** @file * VirtualBox Ring-0 USB Filter Manager. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h index fd2a8b1d3..eec6bb6eb 100644 --- a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h +++ b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUSBFilterMgr.h 36941 2011-05-03 14:56:08Z vboxsync $ */ +/* $Id: VBoxUSBFilterMgr.h $ */ /** @file * VirtualBox Ring-0 USB Filter Manager. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk b/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk index f4ca6bf42..e279b240f 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38286 2011-08-02 18:51:11Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Darwin VBoxUSB kernel extension. # diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp index d00784485..c55829726 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp @@ -1,4 +1,4 @@ -/** $Id: USBLib-darwin.cpp 31898 2010-08-24 09:28:43Z vboxsync $ */ +/** $Id: USBLib-darwin.cpp $ */ /** @file * USBLib - Library for wrapping up the VBoxUSB functionality, Darwin flavor. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp index c967bbd7c..64945f997 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUSB.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxUSB.cpp $ */ /** @file * VirtualBox USB driver for Darwin. * diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h index f3f2b8275..6b39bcfd5 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h @@ -1,4 +1,4 @@ -/** $Id: VBoxUSBInterface.h 31898 2010-08-24 09:28:43Z vboxsync $ */ +/** $Id: VBoxUSBInterface.h $ */ /** @file * VirtualBox USB Driver User<->Kernel Interface. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp index 9eaa8aaef..a2e879172 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp @@ -1,4 +1,4 @@ -/* $Id: tstOpenUSBDev.cpp 31898 2010-08-24 09:28:43Z vboxsync $ */ +/* $Id: tstOpenUSBDev.cpp $ */ /** @file * Testcase that attempts to locate and open the specfied device. */ @@ -206,7 +206,7 @@ int main(int argc, char **argv) case 'h': return tstSyntax(argv[0]); case 'V': - RTPrintf("$Revision: 31898 $\n"); + RTPrintf("$Revision: 65108 $\n"); return 0; default: diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk b/src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk index b2da85822..cfb87be6e 100644 --- a/src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 37149 2011-05-19 11:59:08Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Solaris VBoxUSB kernel extension. # diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp b/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp index 20e149309..71ab2dd0c 100644 --- a/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp @@ -1,4 +1,4 @@ -/** $Id: USBLib-solaris.cpp 37151 2011-05-19 12:12:16Z vboxsync $ */ +/** $Id: USBLib-solaris.cpp $ */ /** @file * USBLib - Library for wrapping up the VBoxUSB functionality, Solaris flavor. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c b/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c index ba7102d4e..1874c05ef 100644 --- a/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c +++ b/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxUSB-solaris.c 38379 2011-08-09 14:32:10Z vboxsync $ */ +/* $Id: VBoxUSB-solaris.c $ */ /** @file * VirtualBox USB Client Driver, Solaris Hosts. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c b/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c index e1861d5ef..a717d9c30 100644 --- a/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c +++ b/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxUSBMon-solaris.c 38016 2011-07-18 13:06:11Z vboxsync $ */ +/* $Id: VBoxUSBMon-solaris.c $ */ /** @file * VirtualBox USB Monitor Driver, Solaris Hosts. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp index c41a6448e..d19edb4ed 100644 --- a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp @@ -1,4 +1,4 @@ -/** $Id: tstUSBFilter.cpp 31898 2010-08-24 09:28:43Z vboxsync $ */ +/** $Id: tstUSBFilter.cpp $ */ /** @file * VirtualBox USB filter abstraction - testcase. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk b/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk index d43f9845e..374991eba 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38392 2011-08-10 07:21:07Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Windows USB drivers. # diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp index b069a897e..947833edb 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDrvTool.cpp 38356 2011-08-08 15:49:01Z vboxsync $ */ +/* $Id: VBoxDrvTool.cpp $ */ /** @file * Windows Driver R0 Tooling. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h index 1579fdfe8..c2b945301 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDrvTool.h 37047 2011-05-12 10:29:26Z vboxsync $ */ +/* $Id: VBoxDrvTool.h $ */ /** @file * Windows Driver R0 Tooling. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h index 38c25bd35..4ad6bb9ce 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbIdc.h 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbIdc.h $ */ /** @file * Windows USB Proxy - Monitor Driver communication interface. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp index 5d9b1e6cd..2a81d50f3 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbTool.cpp 38356 2011-08-08 15:49:01Z vboxsync $ */ +/* $Id: VBoxUsbTool.cpp $ */ /** @file * Windows USB R0 Tooling. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h index 324104d0c..5ab544663 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbTool.h 37047 2011-05-12 10:29:26Z vboxsync $ */ +/* $Id: VBoxUsbTool.h $ */ /** @file * Windows USB R0 Tooling. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h index fc9bfcee7..7e1bcfb9c 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbCmn.h 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbCmn.h $ */ /** @file * VBoxUsmCmn.h - USB device. Common defs */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp index 5fe98612e..91a179516 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbDev.cpp 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbDev.cpp $ */ /** @file * VBoxUsbDev.cpp - USB device. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h index ce65b8c9e..7f6cbda5a 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbDev.h 36998 2011-05-07 20:19:55Z vboxsync $ */ +/* $Id: VBoxUsbDev.h $ */ /** @file * VBoxUsbDev.h - USB device. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc index 94f31a29c..d5342a630 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbDev.rc 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbDev.rc $ */ /** @file * VBoxUSB - Resource file containing version info and icon. */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp index bc236a2a2..46dd4123e 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbPnP.cpp 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbPnP.cpp $ */ /** @file * USB PnP Handling */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h index 0450d0a26..2c7f6b39a 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbPnP.h 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbPnP.h $ */ /** @file * USB PnP Handling */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp index 80e28ece1..b0c88369b 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbPwr.cpp 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbPwr.cpp $ */ /** @file * USB Power state Handling */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h index 272bfad72..d8d19e4e8 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbPwr.h 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbPwr.h $ */ /** @file * USB Power state Handling */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp index 52e1394dc..009e3f6ad 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbRt.cpp 37047 2011-05-12 10:29:26Z vboxsync $ */ +/* $Id: VBoxUsbRt.cpp $ */ /** @file * VBox USB R0 runtime */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h index 39dc36c1e..a01daa0ef 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbRt.h 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbRt.h $ */ /** @file * VBox USB R0 runtime */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp b/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp index 5455a61f6..13d127f7c 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbLib-win.cpp 38280 2011-08-02 13:12:56Z vboxsync $ */ +/* $Id: VBoxUsbLib-win.cpp $ */ /** @file * VBox USB R3 Driver Interface library */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp index 99c18309b..afa382a0d 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbFlt.cpp 38436 2011-08-12 14:10:45Z vboxsync $ */ +/* $Id: VBoxUsbFlt.cpp $ */ /** @file * VBox USB Monitor Device Filtering functionality */ @@ -349,8 +349,27 @@ static NTSTATUS vboxUsbFltPdoReplug(PDEVICE_OBJECT pDo) return Status; } +static bool vboxUsbFltDevCanBeCaptured(PVBOXUSBFLT_DEVICE pDevice) +{ + if (pDevice->bClass == USB_DEVICE_CLASS_HUB) + { + LOG(("device (0x%p), pdo (0x%p) is a hub, can not be captured", pDevice, pDevice->Pdo)); + return false; + } + return true; +} + static PVBOXUSBFLTCTX vboxUsbFltDevMatchLocked(PVBOXUSBFLT_DEVICE pDevice, uintptr_t *puId, bool fRemoveFltIfOneShot, bool *pfFilter, bool *pfIsOneShot) { + *puId = 0; + *pfFilter = false; + *pfIsOneShot = false; + if (!vboxUsbFltDevCanBeCaptured(pDevice)) + { + LOG(("vboxUsbFltDevCanBeCaptured returned false")); + return NULL; + } + USBFILTER DevFlt; USBFilterInit(&DevFlt, USBFILTERTYPE_CAPTURE); USBFilterSetNumExact(&DevFlt, USBFILTERIDX_VENDOR_ID, pDevice->idVendor, true); @@ -364,9 +383,6 @@ static PVBOXUSBFLTCTX vboxUsbFltDevMatchLocked(PVBOXUSBFLT_DEVICE pDevice, uintp USBFilterSetStringExact(&DevFlt, USBFILTERIDX_SERIAL_NUMBER_STR, pDevice->szSerial, true); /* Run filters on the thing. */ - *puId = 0; - *pfFilter = false; - *pfIsOneShot = false; PVBOXUSBFLTCTX pOwner = VBoxUSBFilterMatchEx(&DevFlt, puId, fRemoveFltIfOneShot, pfFilter, pfIsOneShot); USBFilterDelete(&DevFlt); return pOwner; @@ -402,7 +418,7 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT pDevDr = (PUSB_DEVICE_DESCRIPTOR)VBoxUsbMonMemAllocZ(sizeof(*pDevDr)); if (pDevDr == NULL) { - WARN(("Failed to alloc mem for urb\n")); + WARN(("Failed to alloc mem for urb")); return STATUS_INSUFFICIENT_RESOURCES; } @@ -411,18 +427,18 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT Status = VBoxUsbToolGetDescriptor(pDo, pDevDr, sizeof(*pDevDr), USB_DEVICE_DESCRIPTOR_TYPE, 0, 0, VBOXUSBMON_POPULATE_REQUEST_TIMEOUT_MS); if (!NT_SUCCESS(Status)) { - WARN(("getting device descriptor failed, Status (0x%x)\n", Status)); + WARN(("getting device descriptor failed, Status (0x%x)", Status)); break; } if (vboxUsbFltBlDevMatchLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)) { - WARN(("found a known black list device, vid(0x%x), pid(0x%x), rev(0x%x)\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); + WARN(("found a known black list device, vid(0x%x), pid(0x%x), rev(0x%x)", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); Status = STATUS_UNSUCCESSFUL; break; } - LOG(("Device pid=%x vid=%x rev=%x\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); + LOG(("Device pid=%x vid=%x rev=%x", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); pDevice->idVendor = pDevDr->idVendor; pDevice->idProduct = pDevDr->idProduct; pDevice->bcdDevice = pDevDr->bcdDevice; @@ -441,10 +457,10 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT Status = VBoxUsbToolGetLangID(pDo, &langId, VBOXUSBMON_POPULATE_REQUEST_TIMEOUT_MS); if (!NT_SUCCESS(Status)) { - WARN(("reading language ID failed\n")); + WARN(("reading language ID failed")); if (Status == STATUS_CANCELLED) { - WARN(("found a new black list device, vid(0x%x), pid(0x%x), rev(0x%x)\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); + WARN(("found a new black list device, vid(0x%x), pid(0x%x), rev(0x%x)", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); vboxUsbFltBlDevAddLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice); Status = STATUS_UNSUCCESSFUL; } @@ -456,11 +472,11 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT Status = VBoxUsbToolGetStringDescriptorA(pDo, pDevice->szSerial, sizeof (pDevice->szSerial), pDevDr->iSerialNumber, langId, VBOXUSBMON_POPULATE_REQUEST_TIMEOUT_MS); if (!NT_SUCCESS(Status)) { - WARN(("reading serial number failed\n")); + WARN(("reading serial number failed")); ASSERT_WARN(pDevice->szSerial[0] == '\0', ("serial is not zero!!")); if (Status == STATUS_CANCELLED) { - WARN(("found a new black list device, vid(0x%x), pid(0x%x), rev(0x%x)\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); + WARN(("found a new black list device, vid(0x%x), pid(0x%x), rev(0x%x)", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); vboxUsbFltBlDevAddLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice); Status = STATUS_UNSUCCESSFUL; break; @@ -475,11 +491,11 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT Status = VBoxUsbToolGetStringDescriptorA(pDo, pDevice->szMfgName, sizeof (pDevice->szMfgName), pDevDr->iManufacturer, langId, VBOXUSBMON_POPULATE_REQUEST_TIMEOUT_MS); if (!NT_SUCCESS(Status)) { - WARN(("reading manufacturer name failed\n")); + WARN(("reading manufacturer name failed")); ASSERT_WARN(pDevice->szMfgName[0] == '\0', ("szMfgName is not zero!!")); if (Status == STATUS_CANCELLED) { - WARN(("found a new black list device, vid(0x%x), pid(0x%x), rev(0x%x)\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); + WARN(("found a new black list device, vid(0x%x), pid(0x%x), rev(0x%x)", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); vboxUsbFltBlDevAddLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice); Status = STATUS_UNSUCCESSFUL; break; @@ -494,11 +510,11 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT Status = VBoxUsbToolGetStringDescriptorA(pDo, pDevice->szProduct, sizeof (pDevice->szProduct), pDevDr->iProduct, langId, VBOXUSBMON_POPULATE_REQUEST_TIMEOUT_MS); if (!NT_SUCCESS(Status)) { - WARN(("reading product name failed\n")); + WARN(("reading product name failed")); ASSERT_WARN(pDevice->szProduct[0] == '\0', ("szProduct is not zero!!")); if (Status == STATUS_CANCELLED) { - WARN(("found a new black list device, vid(0x%x), pid(0x%x), rev(0x%x)\n", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); + WARN(("found a new black list device, vid(0x%x), pid(0x%x), rev(0x%x)", pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice)); vboxUsbFltBlDevAddLocked(pDevDr->idVendor, pDevDr->idProduct, pDevDr->bcdDevice); Status = STATUS_UNSUCCESSFUL; break; @@ -520,7 +536,7 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT &cbRegKeyBuf); if (!NT_SUCCESS(Status)) { - AssertMsgFailed((__FUNCTION__": IoGetDeviceProperty failed Status (0x%x)\n", Status)); + AssertMsgFailed((__FUNCTION__": IoGetDeviceProperty failed Status (0x%x)", Status)); break; } @@ -534,7 +550,7 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT Status = RtlUnicodeStringToAnsiString(&Ansi, &Unicode, FALSE /* do not allocate */); if (!NT_SUCCESS(Status)) { - AssertMsgFailed((__FUNCTION__": RtlUnicodeStringToAnsiString failed Status (0x%x)\n", Status)); + AssertMsgFailed((__FUNCTION__": RtlUnicodeStringToAnsiString failed Status (0x%x)", Status)); break; } @@ -542,12 +558,12 @@ static NTSTATUS vboxUsbFltDevPopulate(PVBOXUSBFLT_DEVICE pDevice, PDEVICE_OBJECT Status = VBoxUsbToolGetDeviceSpeed(pDo, &pDevice->fHighSpend); if (!NT_SUCCESS(Status)) { - AssertMsgFailed((__FUNCTION__": VBoxUsbToolGetDeviceSpeed failed Status (0x%x)\n", Status)); + AssertMsgFailed((__FUNCTION__": VBoxUsbToolGetDeviceSpeed failed Status (0x%x)", Status)); break; } } #endif - LOG((": strings: '%s':'%s':'%s' (lang ID %x)\n", + LOG((": strings: '%s':'%s':'%s' (lang ID %x)", pDevice->szMfgName, pDevice->szProduct, pDevice->szSerial, langId)); } @@ -753,185 +769,142 @@ static void vboxUsbFltReplugList(PLIST_ENTRY pList) } } -NTSTATUS VBoxUsbFltFilterCheck(PVBOXUSBFLTCTX pContext) +typedef struct VBOXUSBFLTCHECKWALKER { - NTSTATUS Status; - UNICODE_STRING szStandardControllerName[RT_ELEMENTS(lpszStandardControllerName)]; - KIRQL Irql = KeGetCurrentIrql(); - Assert(Irql == PASSIVE_LEVEL); + PVBOXUSBFLTCTX pContext; +} VBOXUSBFLTCHECKWALKER, *PVBOXUSBFLTCHECKWALKER; - LOG(("Running filters, Context (0x%p)..", pContext)); +static DECLCALLBACK(BOOLEAN) vboxUsbFltFilterCheckWalker(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pHubDo, PVOID pvContext) +{ + PVBOXUSBFLTCHECKWALKER pData = (PVBOXUSBFLTCHECKWALKER)pvContext; + PVBOXUSBFLTCTX pContext = pData->pContext; - for (int i=0;i<RT_ELEMENTS(lpszStandardControllerName);i++) - { - szStandardControllerName[i].Length = 0; - szStandardControllerName[i].MaximumLength = 0; - szStandardControllerName[i].Buffer = 0; + LOG(("Visiting pFile(0x%p), pTopDo(0x%p), pHubDo(0x%p), oContext(0x%p)", pFile, pTopDo, pHubDo, pContext)); + KIRQL Irql = KeGetCurrentIrql(); + ASSERT_WARN(Irql == PASSIVE_LEVEL, ("unexpected IRQL (%d)", Irql)); - RtlInitUnicodeString(&szStandardControllerName[i], lpszStandardControllerName[i]); - } + PDEVICE_RELATIONS pDevRelations = NULL; - for (int i = 0; i < 16; i++) + NTSTATUS Status = VBoxUsbMonQueryBusRelations(pTopDo, pFile, &pDevRelations); + if (Status == STATUS_SUCCESS && pDevRelations) { - char szHubName[32]; - WCHAR szwHubName[32]; - UNICODE_STRING UnicodeName; - ANSI_STRING AnsiName; - PDEVICE_OBJECT pHubDevObj; - PFILE_OBJECT pHubFileObj; - - sprintf(szHubName, "\\Device\\USBPDO-%d", i); + ULONG cReplugPdos = pDevRelations->Count; + LIST_ENTRY ReplugDevList; + InitializeListHead(&ReplugDevList); + for (ULONG k = 0; k < pDevRelations->Count; ++k) + { + PDEVICE_OBJECT pDevObj = pDevRelations->Objects[k]; - UnicodeName.Length = 0; - UnicodeName.MaximumLength = sizeof (szwHubName); - UnicodeName.Buffer = szwHubName; + LOG(("Found existing USB PDO 0x%p", pDevObj)); + VBOXUSBFLT_LOCK_ACQUIRE(); + PVBOXUSBFLT_DEVICE pDevice = vboxUsbFltDevGetLocked(pDevObj); + if (pDevice) + { + LOG(("Found existing device info (0x%p) for PDO 0x%p", pDevice, pDevObj)); + bool bReplug = vboxUsbFltDevCheckReplugLocked(pDevice, pContext); + if (bReplug) + { + LOG(("Replug needed for device (0x%p)", pDevice)); + InsertHeadList(&ReplugDevList, &pDevice->RepluggingLe); + vboxUsbFltDevRetain(pDevice); + /* do not dereference object since we will use it later */ + } + else + { + LOG(("Replug NOT needed for device (0x%p)", pDevice)); + ObDereferenceObject(pDevObj); + } - RtlInitAnsiString(&AnsiName, szHubName); - RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, FALSE); + VBOXUSBFLT_LOCK_RELEASE(); - Status = IoGetDeviceObjectPointer(&UnicodeName, FILE_READ_DATA, &pHubFileObj, &pHubDevObj); - if (Status == STATUS_SUCCESS) - { - LOG(("IoGetDeviceObjectPointer for %s returned %p %p\n", szHubName, pHubDevObj, pHubFileObj)); + pDevRelations->Objects[k] = NULL; + --cReplugPdos; + ASSERT_WARN((uint32_t)cReplugPdos < UINT32_MAX/2, ("cReplugPdos(%d) state broken", cReplugPdos)); + continue; + } + VBOXUSBFLT_LOCK_RELEASE(); - if (pHubDevObj->DriverObject - && pHubDevObj->DriverObject->DriverName.Buffer - && pHubDevObj->DriverObject->DriverName.Length - ) + LOG(("NO device info found for PDO 0x%p", pDevObj)); + VBOXUSBFLT_DEVICE Device; + Status = vboxUsbFltDevPopulate(&Device, pDevObj /*, FALSE /* only need filter properties */); + if (NT_SUCCESS(Status)) { - for (int j = 0; j < RT_ELEMENTS(lpszStandardControllerName); ++j) + uintptr_t uId = 0; + bool fFilter = false; + bool fIsOneShot = false; + VBOXUSBFLT_LOCK_ACQUIRE(); + PVBOXUSBFLTCTX pCtx = vboxUsbFltDevMatchLocked(&Device, &uId, + false, /* do not remove a one-shot filter */ + &fFilter, &fIsOneShot); + VBOXUSBFLT_LOCK_RELEASE(); + LOG(("Matching Info: Filter (0x%p), pCtx(0x%p), fFilter(%d), fIsOneShot(%d)", uId, pCtx, (int)fFilter, (int)fIsOneShot)); + if (fFilter) { - if (!RtlCompareUnicodeString(&szStandardControllerName[j], &pHubDevObj->DriverObject->DriverName, TRUE /* case insensitive */)) - { - PDEVICE_RELATIONS pDevRelations = NULL; - - LOG(("Flt Associated driver ")); - LOG_USTR(&pHubDevObj->DriverObject->DriverName); - LOG((" -> related dev obj=0x%p", pHubDevObj)); - - Status = VBoxUsbMonQueryBusRelations(pHubDevObj, pHubFileObj, &pDevRelations); - if (Status == STATUS_SUCCESS && pDevRelations) - { - ULONG cReplugPdos = pDevRelations->Count; - LIST_ENTRY ReplugDevList; - InitializeListHead(&ReplugDevList); - for (ULONG k = 0; k < pDevRelations->Count; ++k) - { - PDEVICE_OBJECT pDevObj = pDevRelations->Objects[k]; - - LOG(("Found existing USB PDO 0x%p", pDevObj)); - VBOXUSBFLT_LOCK_ACQUIRE(); - PVBOXUSBFLT_DEVICE pDevice = vboxUsbFltDevGetLocked(pDevObj); - if (pDevice) - { - LOG(("Found existing device info (0x%p) for PDO 0x%p", pDevice, pDevObj)); - bool bReplug = vboxUsbFltDevCheckReplugLocked(pDevice, pContext); - if (bReplug) - { - LOG(("Replug needed for device (0x%p)", pDevice)); - InsertHeadList(&ReplugDevList, &pDevice->RepluggingLe); - vboxUsbFltDevRetain(pDevice); - /* do not dereference object since we will use it later */ - } - else - { - LOG(("Replug NOT needed for device (0x%p)", pDevice)); - ObDereferenceObject(pDevObj); - } - - VBOXUSBFLT_LOCK_RELEASE(); - - pDevRelations->Objects[k] = NULL; - --cReplugPdos; - ASSERT_WARN((uint32_t)cReplugPdos < UINT32_MAX/2, ("cReplugPdos(%d) state broken", cReplugPdos)); - continue; - } - VBOXUSBFLT_LOCK_RELEASE(); - - LOG(("NO device info found for PDO 0x%p", pDevObj)); - VBOXUSBFLT_DEVICE Device; - Status = vboxUsbFltDevPopulate(&Device, pDevObj /*, FALSE /* only need filter properties */); - if (NT_SUCCESS(Status)) - { - uintptr_t uId = 0; - bool fFilter = false; - bool fIsOneShot = false; - VBOXUSBFLT_LOCK_ACQUIRE(); - PVBOXUSBFLTCTX pCtx = vboxUsbFltDevMatchLocked(&Device, &uId, - false, /* do not remove a one-shot filter */ - &fFilter, &fIsOneShot); - VBOXUSBFLT_LOCK_RELEASE(); - LOG(("Matching Info: Filter (0x%p), pCtx(0x%p), fFilter(%d), fIsOneShot(%d)", uId, pCtx, (int)fFilter, (int)fIsOneShot)); - if (fFilter) - { - LOG(("Matching: This device SHOULD be filtered")); - /* this device needs to be filtered, but it's not, - * leave the PDO in array to issue a replug request for it - * later on */ - continue; - } - } - else - { - WARN(("vboxUsbFltDevPopulate for PDO 0x%p failed with Status 0x%x", pDevObj, Status)); - } - - LOG(("Matching: This device should NOT be filtered")); - /* this device should not be filtered, and it's not */ - ObDereferenceObject(pDevObj); - pDevRelations->Objects[k] = NULL; - --cReplugPdos; - ASSERT_WARN((uint32_t)cReplugPdos < UINT32_MAX/2, ("cReplugPdos is %d", cReplugPdos)); - } - - LOG(("(%d) non-matched PDOs to be replugged", cReplugPdos)); - - if (cReplugPdos) - { - for (ULONG k = 0; k < pDevRelations->Count; ++k) - { - if (!pDevRelations->Objects[k]) - continue; - - Status = vboxUsbFltPdoReplug(pDevRelations->Objects[k]); - ASSERT_WARN(Status == STATUS_SUCCESS, ("vboxUsbFltPdoReplug ailed Status(0x%x)", Status)); - ObDereferenceObject(pDevRelations->Objects[k]); - if (!--cReplugPdos) - break; - } - - ASSERT_WARN(!cReplugPdos, ("cReplugPdosreached zero!")); - } - - vboxUsbFltReplugList(&ReplugDevList); - - ExFreePool(pDevRelations); - } - else - { - WARN(("VBoxUsbMonQueryBusRelations failed for DO(0x%p), Status(0x%x), pDevRelations(0x%p)", - pHubDevObj, Status, pDevRelations)); - } - } - else - { - LOG(("driver name not match, was:")); - LOG_USTR(&pHubDevObj->DriverObject->DriverName); - LOG(("but expected:")); - LOG_USTR(&szStandardControllerName[j]); - } + LOG(("Matching: This device SHOULD be filtered")); + /* this device needs to be filtered, but it's not, + * leave the PDO in array to issue a replug request for it + * later on */ + continue; } } else { - LOG(("null driver object (0x%p) or name buffer (0x%p), length(%d)", pHubDevObj->DriverObject, - pHubDevObj->DriverObject ? pHubDevObj->DriverObject->DriverName.Buffer : NULL, - pHubDevObj->DriverObject ? pHubDevObj->DriverObject->DriverName.Length : 0)); + WARN(("vboxUsbFltDevPopulate for PDO 0x%p failed with Status 0x%x", pDevObj, Status)); + } + + LOG(("Matching: This device should NOT be filtered")); + /* this device should not be filtered, and it's not */ + ObDereferenceObject(pDevObj); + pDevRelations->Objects[k] = NULL; + --cReplugPdos; + ASSERT_WARN((uint32_t)cReplugPdos < UINT32_MAX/2, ("cReplugPdos is %d", cReplugPdos)); + } + + LOG(("(%d) non-matched PDOs to be replugged", cReplugPdos)); + + if (cReplugPdos) + { + for (ULONG k = 0; k < pDevRelations->Count; ++k) + { + if (!pDevRelations->Objects[k]) + continue; + + Status = vboxUsbFltPdoReplug(pDevRelations->Objects[k]); + ASSERT_WARN(Status == STATUS_SUCCESS, ("vboxUsbFltPdoReplug ailed Status(0x%x)", Status)); + ObDereferenceObject(pDevRelations->Objects[k]); + if (!--cReplugPdos) + break; } - ObDereferenceObject(pHubFileObj); + + ASSERT_WARN(!cReplugPdos, ("cReplugPdosreached zero!")); } + + vboxUsbFltReplugList(&ReplugDevList); + + ExFreePool(pDevRelations); + } + else + { + WARN(("VBoxUsbMonQueryBusRelations failed for DO(0x%p), Status(0x%x), pDevRelations(0x%p)", + pTopDo, Status, pDevRelations)); } + LOG(("Done Visiting pFile(0x%p), pTopDo(0x%p), pHubDo(0x%p), oContext(0x%p)", pFile, pTopDo, pHubDo, pContext)); + + return TRUE; +} + +NTSTATUS VBoxUsbFltFilterCheck(PVBOXUSBFLTCTX pContext) +{ + KIRQL Irql = KeGetCurrentIrql(); + ASSERT_WARN(Irql == PASSIVE_LEVEL, ("unexpected IRQL (%d)", Irql)); + + LOG(("Running filters, Context (0x%p)..", pContext)); + + VBOXUSBFLTCHECKWALKER Data; + Data.pContext = pContext; + vboxUsbMonHubDevWalk(vboxUsbFltFilterCheckWalker, &Data, VBOXUSBMONHUBWALK_F_FDO); + LOG(("DONE Running filters, Context (0x%p)", pContext)); return STATUS_SUCCESS; @@ -1028,12 +1001,12 @@ int VBoxUsbFltAdd(PVBOXUSBFLTCTX pContext, PUSBFILTER pFilter, uintptr_t *pId) LOG(("adding filter, Context (0x%p)..", pContext)); *pId = 0; /* LOG the filter details. */ - LOG((__FUNCTION__": %s %s %s\n", + LOG((__FUNCTION__": %s %s %s", USBFilterGetString(pFilter, USBFILTERIDX_MANUFACTURER_STR) ? USBFilterGetString(pFilter, USBFILTERIDX_MANUFACTURER_STR) : "<null>", USBFilterGetString(pFilter, USBFILTERIDX_PRODUCT_STR) ? USBFilterGetString(pFilter, USBFILTERIDX_PRODUCT_STR) : "<null>", USBFilterGetString(pFilter, USBFILTERIDX_SERIAL_NUMBER_STR) ? USBFilterGetString(pFilter, USBFILTERIDX_SERIAL_NUMBER_STR) : "<null>")); #ifdef VBOX_USB_WITH_VERBOSE_LOGGING - LOG(("VBoxUSBClient::addFilter: idVendor=%#x idProduct=%#x bcdDevice=%#x bDeviceClass=%#x bDeviceSubClass=%#x bDeviceProtocol=%#x bBus=%#x bPort=%#x Type%#x\n", + LOG(("VBoxUSBClient::addFilter: idVendor=%#x idProduct=%#x bcdDevice=%#x bDeviceClass=%#x bDeviceSubClass=%#x bDeviceProtocol=%#x bBus=%#x bPort=%#x Type%#x", USBFilterGetNum(pFilter, USBFILTERIDX_VENDOR_ID), USBFilterGetNum(pFilter, USBFILTERIDX_PRODUCT_ID), USBFilterGetNum(pFilter, USBFILTERIDX_DEVICE_REV), @@ -1393,7 +1366,7 @@ HVBOXUSBFLTDEV VBoxUsbFltProxyStarted(PDEVICE_OBJECT pPdo) if (pDevice->enmState = VBOXUSBFLT_DEVSTATE_CAPTURING) { pDevice->enmState = VBOXUSBFLT_DEVSTATE_CAPTURED; - LOG(("The proxy notified proxy start for the captured device 0x%x\n", pDevice)); + LOG(("The proxy notified proxy start for the captured device 0x%x", pDevice)); vboxUsbFltDevRetain(pDevice); vboxUsbFltSignalChangeLocked(); } @@ -1414,7 +1387,7 @@ void VBoxUsbFltProxyStopped(HVBOXUSBFLTDEV hDev) || pDevice->enmState == VBOXUSBFLT_DEVSTATE_USED_BY_GUEST) { /* this is due to devie was physically removed */ - LOG(("The proxy notified proxy stop for the captured device 0x%x, current state %d\n", pDevice, pDevice->enmState)); + LOG(("The proxy notified proxy stop for the captured device 0x%x, current state %d", pDevice, pDevice->enmState)); pDevice->enmState = VBOXUSBFLT_DEVSTATE_CAPTURING; vboxUsbFltSignalChangeLocked(); } diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h index 8016c7e7e..1d474b9a6 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbFlt.h 36998 2011-05-07 20:19:55Z vboxsync $ */ +/* $Id: VBoxUsbFlt.h $ */ /** @file * VBox USB Monitor Device Filtering functionality */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp index 3f9ceaeaf..a1a24925a 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbHook.cpp 38356 2011-08-08 15:49:01Z vboxsync $ */ +/* $Id: VBoxUsbHook.cpp $ */ /** @file * Driver Dispatch Table Hooking API */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h index f34c6d8cb..95139ff05 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbHook.h 37042 2011-05-11 19:04:07Z vboxsync $ */ +/* $Id: VBoxUsbHook.h $ */ /** @file * Driver Dispatch Table Hooking API impl */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp index 293b65e23..f86d17f84 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbMon.cpp 38425 2011-08-11 20:22:34Z vboxsync $ */ +/* $Id: VBoxUsbMon.cpp $ */ /** @file * VBox USB Monitor */ @@ -101,7 +101,7 @@ VOID VBoxUsbMonMemFree(PVOID pvMem) #define VBOXUSBDBG_STRCASE(_t) \ case _t: return #_t #define VBOXUSBDBG_STRCASE_UNKNOWN(_v) \ - default: LOG((__FUNCTION__": Unknown Value (0n%d), (0x%x)\n", _v, _v)); return "Unknown" + default: LOG((__FUNCTION__": Unknown Value (0n%d), (0x%x)", _v, _v)); return "Unknown" static const char* vboxUsbDbgStrPnPMn(UCHAR uMn) { @@ -167,7 +167,7 @@ NTSTATUS VBoxUsbMonQueryBusRelations(PDEVICE_OBJECT pDevObj, PFILE_OBJECT pFileO pIrp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, pDevObj, NULL, 0, NULL, &Event, &IoStatus); if (!pIrp) { - WARN(("IoBuildDeviceIoControlRequest failed!!\n")); + WARN(("IoBuildDeviceIoControlRequest failed!!")); return STATUS_INSUFFICIENT_RESOURCES; } IoStatus.Status = STATUS_NOT_SUPPORTED; @@ -181,7 +181,7 @@ NTSTATUS VBoxUsbMonQueryBusRelations(PDEVICE_OBJECT pDevObj, PFILE_OBJECT pFileO Status = IoCallDriver(pDevObj, pIrp); if (Status == STATUS_PENDING) { - LOG(("IoCallDriver returned STATUS_PENDING!!\n")); + LOG(("IoCallDriver returned STATUS_PENDING!!")); KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatus.Status; } @@ -189,26 +189,324 @@ NTSTATUS VBoxUsbMonQueryBusRelations(PDEVICE_OBJECT pDevObj, PFILE_OBJECT pFileO if (Status == STATUS_SUCCESS) { PDEVICE_RELATIONS pRel = (PDEVICE_RELATIONS)IoStatus.Information; - LOG(("pRel = %p\n", pRel)); + LOG(("pRel = %p", pRel)); if (VALID_PTR(pRel)) { *pDevRelations = pRel; } else { - WARN(("Invalid pointer %p\n", pRel)); + WARN(("Invalid pointer %p", pRel)); } } else { - WARN(("IRP_MN_QUERY_DEVICE_RELATIONS failed Status(0x%x)\n", Status)); + WARN(("IRP_MN_QUERY_DEVICE_RELATIONS failed Status(0x%x)", Status)); } - LOG(("IoCallDriver returned %x\n", Status)); + LOG(("IoCallDriver returned %x", Status)); return Status; } -static PDRIVER_OBJECT vboxUsbMonHookFindHubDrvObj() +RT_C_DECLS_BEGIN +/* these two come from IFS Kit, which is not included in 2K DDK we use, + * although they are documented and exported in ntoskrnl, + * and both should be present for >= XP according to MSDN */ +NTKERNELAPI +NTSTATUS +ObQueryNameString( + __in PVOID Object, + __out_bcount_opt(Length) POBJECT_NAME_INFORMATION ObjectNameInfo, + __in ULONG Length, + __out PULONG ReturnLength + ); + +NTKERNELAPI +PDEVICE_OBJECT +IoGetLowerDeviceObject( + __in PDEVICE_OBJECT DeviceObject + ); + +RT_C_DECLS_END + +typedef DECLCALLBACK(VOID) FNVBOXUSBDEVNAMEMATCHER(PDEVICE_OBJECT pDo, PUNICODE_STRING pName, PVOID pvMatcher); +typedef FNVBOXUSBDEVNAMEMATCHER *PFNVBOXUSBDEVNAMEMATCHER; + +static NTSTATUS vboxUsbObjCheckName(PDEVICE_OBJECT pDo, PFNVBOXUSBDEVNAMEMATCHER pfnMatcher, PVOID pvMatcher) +{ + union + { + OBJECT_NAME_INFORMATION Info; + char buf[1024]; + } buf; + ULONG cbLength = 0; + + POBJECT_NAME_INFORMATION pInfo = &buf.Info; + NTSTATUS Status = ObQueryNameString(pDo, &buf.Info, sizeof (buf), &cbLength); + if (!NT_SUCCESS(Status)) + { + if (STATUS_INFO_LENGTH_MISMATCH != Status) + { + WARN(("ObQueryNameString failed 0x%x", Status)); + return Status; + } + + LOG(("ObQueryNameString returned STATUS_INFO_LENGTH_MISMATCH, required size %d", cbLength)); + + pInfo = (POBJECT_NAME_INFORMATION)VBoxUsbMonMemAlloc(cbLength); + if (!pInfo) + { + WARN(("VBoxUsbMonMemAlloc failed")); + return STATUS_NO_MEMORY; + } + Status = ObQueryNameString(pDo, pInfo, cbLength, &cbLength); + if (!NT_SUCCESS(Status)) + { + WARN(("ObQueryNameString second try failed 0x%x", Status)); + VBoxUsbMonMemFree(pInfo); + return Status; + } + } + + /* we've got the name! */ + LOG(("got the name:")); + LOG_USTR(&pInfo->Name); + pfnMatcher(pDo, &pInfo->Name, pvMatcher); + + if (&buf.Info != pInfo) + { + LOG(("freeing allocated pInfo(0x%p)", pInfo)); + VBoxUsbMonMemFree(pInfo); + } + else + { + LOG(("no freeing info needed")); + } + + return STATUS_SUCCESS; +} + + +typedef DECLCALLBACK(BOOLEAN) FNVBOXUSBDEVSTACKWALKER(PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pCurDo, PVOID pvContext); +typedef FNVBOXUSBDEVSTACKWALKER *PFNVBOXUSBDEVSTACKWALKER; + +VOID vboxUsbObjDevStackWalk(PDEVICE_OBJECT pDo, PFNVBOXUSBDEVSTACKWALKER pfnWalker, PVOID pvWalker) +{ + LOG(("==>tree walk for Do 0x%p", pDo)); + PDEVICE_OBJECT pCurDo = pDo; + ObReferenceObject(pCurDo); /* <- to make sure the dereferencing logic below works correctly */ + do + { + LOG(("==Do 0x%p", pCurDo)); +#ifdef VBOX_USB_WITH_VERBOSE_LOGGING + { + union + { + OBJECT_NAME_INFORMATION Info; + char buf[1024]; + } buf; + ULONG cbLength = 0; + + NTSTATUS tmpStatus = ObQueryNameString(pCurDo, &buf.Info, sizeof (buf), &cbLength); + if (NT_SUCCESS(tmpStatus)) + { + LOG((" Obj name:")); + LOG_USTR(&buf.Info.Name); + } + else + { + if (STATUS_INFO_LENGTH_MISMATCH != tmpStatus) + { + WARN(("ObQueryNameString failed 0x%x", tmpStatus)); + } + else + { + WARN(("ObQueryNameString STATUS_INFO_LENGTH_MISMATCH, required %d", cbLength)); + } + } + + if (pCurDo->DriverObject + && pCurDo->DriverObject->DriverName.Buffer + && pCurDo->DriverObject->DriverName.Length) + { + LOG((" Drv Obj(0x%p), name:", pCurDo->DriverObject)); + LOG_USTR(&pCurDo->DriverObject->DriverName); + } + else + { + LOG((" No Drv Name, Drv Obj(0x%p)", pCurDo->DriverObject)); + if (pCurDo->DriverObject) + { + LOG((" driver name is zero, Length(%d), Buffer(0x%p)", + pCurDo->DriverObject->DriverName.Length, pCurDo->DriverObject->DriverName.Buffer)); + } + else + { + LOG((" driver object is NULL")); + } + } + } +#endif + if (!pfnWalker(pDo, pCurDo, pvWalker)) + { + LOG(("the walker said to stop")); + ObDereferenceObject(pCurDo); + break; + } + + PDEVICE_OBJECT pLowerDo = IoGetLowerDeviceObject(pCurDo); + ObDereferenceObject(pCurDo); + if (!pLowerDo) + { + LOG(("IoGetLowerDeviceObject returnned NULL, stop")); + break; + } + pCurDo = pLowerDo; + } while (1); + + LOG(("<==tree walk")); +} + +static DECLCALLBACK(BOOLEAN) vboxUsbObjNamePrefixMatch(PUNICODE_STRING pName, PUNICODE_STRING pNamePrefix, BOOLEAN fCaseInSensitive) +{ + LOG(("Matching prefix:")); + LOG_USTR(pNamePrefix); + if (pNamePrefix->Length > pName->Length) + { + LOG(("Pregix Length(%d) > Name Length(%d)", pNamePrefix->Length, pName->Length)); + return FALSE; + } + + LOG(("Pregix Length(%d) <= Name Length(%d)", pNamePrefix->Length, pName->Length)); + + UNICODE_STRING NamePrefix = *pName; + NamePrefix.Length = pNamePrefix->Length; + LONG rc = RtlCompareUnicodeString(&NamePrefix, pNamePrefix, fCaseInSensitive); + + if (!rc) + { + LOG(("prefix MATCHED!")); + return TRUE; + } + + LOG(("prefix NOT matched!")); + return FALSE; +} + +typedef struct VBOXUSBOBJNAMEPREFIXMATCHER +{ + PUNICODE_STRING pNamePrefix; + BOOLEAN fMatched; +} VBOXUSBOBJNAMEPREFIXMATCHER, *PVBOXUSBOBJNAMEPREFIXMATCHER; + +static DECLCALLBACK(VOID) vboxUsbObjDevNamePrefixMatcher(PDEVICE_OBJECT pDo, PUNICODE_STRING pName, PVOID pvMatcher) +{ + PVBOXUSBOBJNAMEPREFIXMATCHER pData = (PVBOXUSBOBJNAMEPREFIXMATCHER)pvMatcher; + PUNICODE_STRING pNamePrefix = pData->pNamePrefix; + ASSERT_WARN(!pData->fMatched, ("match flag already set!")); + pData->fMatched = vboxUsbObjNamePrefixMatch(pName, pNamePrefix, TRUE /* fCaseInSensitive */); + LOG(("match result (%d)", (int)pData->fMatched)); +} + +typedef struct VBOXUSBOBJDRVOBJSEARCHER +{ + PDEVICE_OBJECT pDevObj; + PUNICODE_STRING pDrvName; + PUNICODE_STRING pPdoNamePrefix; + ULONG fFlags; +} VBOXUSBOBJDRVOBJSEARCHER, *PVBOXUSBOBJDRVOBJSEARCHER; + +static DECLCALLBACK(BOOLEAN) vboxUsbObjDevObjSearcherWalker(PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pCurDo, PVOID pvContext) +{ + PVBOXUSBOBJDRVOBJSEARCHER pData = (PVBOXUSBOBJDRVOBJSEARCHER)pvContext; + ASSERT_WARN(!pData->pDevObj, ("non-null dev object (0x%p) on enter", pData->pDevObj)); + pData->pDevObj = NULL; + if (pCurDo->DriverObject + && pCurDo->DriverObject->DriverName.Buffer + && pCurDo->DriverObject->DriverName.Length + && !RtlCompareUnicodeString(pData->pDrvName, &pCurDo->DriverObject->DriverName, TRUE /* case insensitive */)) + { + LOG(("MATCHED driver:")); + LOG_USTR(&pCurDo->DriverObject->DriverName); + if ((pData->fFlags & VBOXUSBMONHUBWALK_F_ALL) != VBOXUSBMONHUBWALK_F_ALL) + { + VBOXUSBOBJNAMEPREFIXMATCHER Data = {0}; + Data.pNamePrefix = pData->pPdoNamePrefix; + NTSTATUS Status = vboxUsbObjCheckName(pCurDo, vboxUsbObjDevNamePrefixMatcher, &Data); + if (!NT_SUCCESS(Status)) + { + WARN(("vboxUsbObjCheckName failed Status (0x%x)", Status)); + return TRUE; + } + + + LOG(("prefix match result (%d)", Data.fMatched)); + if ((pData->fFlags & VBOXUSBMONHUBWALK_F_FDO) == VBOXUSBMONHUBWALK_F_FDO) + { + LOG(("VBOXUSBMONHUBWALK_F_FDO")); + if (Data.fMatched) + { + LOG(("this is a PDO object, skip it and stop search")); + /* stop search as we will not find FDO here */ + return FALSE; + } + + LOG(("this is a FDO object, MATCHED!!")); + } + else if ((pData->fFlags & VBOXUSBMONHUBWALK_F_PDO) == VBOXUSBMONHUBWALK_F_PDO) + { + LOG(("VBOXUSBMONHUBWALK_F_PDO")); + if (!Data.fMatched) + { + LOG(("this is a FDO object, skip it and continue search")); + /* continue seach since since this could be a nested hub that would have a usbhub-originated PDO */ + return TRUE; + } + + LOG(("this is a PDO object, MATCHED!!")); + } + + } + else + { + LOG(("VBOXUSBMONHUBWALK_F_ALL")); + LOG(("either PDO or FDO, MATCHED!!")); + } + + /* ensure the dev object is not destroyed */ + ObReferenceObject(pCurDo); + pData->pDevObj = pCurDo; + /* we are done */ + return FALSE; + } + else + { + LOG(("driver object (0x%p) no match", pCurDo->DriverObject)); + if (pCurDo->DriverObject) + { + if ( pCurDo->DriverObject->DriverName.Buffer + && pCurDo->DriverObject->DriverName.Length) + { + LOG(("driver name not match, was:")); + LOG_USTR(&pCurDo->DriverObject->DriverName); + LOG(("but expected:")); + LOG_USTR(pData->pDrvName); + } + else + { + LOG(("driver name is zero, Length(%d), Buffer(0x%p)", + pCurDo->DriverObject->DriverName.Length, pCurDo->DriverObject->DriverName.Buffer)); + } + } + else + { + LOG(("driver object is NULL")); + } + } + return TRUE; +} + +VOID vboxUsbMonHubDevWalk(PFNVBOXUSBMONDEVWALKER pfnWalker, PVOID pvWalker, ULONG fFlags) { NTSTATUS Status = STATUS_UNSUCCESSFUL; UNICODE_STRING szStandardHubName; @@ -217,12 +515,16 @@ static PDRIVER_OBJECT vboxUsbMonHookFindHubDrvObj() szStandardHubName.MaximumLength = 0; szStandardHubName.Buffer = 0; RtlInitUnicodeString(&szStandardHubName, L"\\Driver\\usbhub"); + UNICODE_STRING szStandardHubPdoNamePrefix; + szStandardHubPdoNamePrefix.Length = 0; + szStandardHubPdoNamePrefix.MaximumLength = 0; + szStandardHubPdoNamePrefix.Buffer = 0; + RtlInitUnicodeString(&szStandardHubPdoNamePrefix, L"\\Device\\USBPDO-"); - LOG(("Search USB hub\n")); for (int i = 0; i < 16; i++) { - WCHAR szwHubName[32] = {}; - char szHubName[32] = {}; + WCHAR szwHubName[32] = {0}; + char szHubName[32] = {0}; ANSI_STRING AnsiName; UNICODE_STRING UnicodeName; PDEVICE_OBJECT pHubDevObj; @@ -243,54 +545,40 @@ static PDRIVER_OBJECT vboxUsbMonHookFindHubDrvObj() Status = IoGetDeviceObjectPointer(&UnicodeName, FILE_READ_DATA, &pHubFileObj, &pHubDevObj); if (Status == STATUS_SUCCESS) { - LOG(("IoGetDeviceObjectPointer for %S returned %p %p\n", szwHubName, pHubDevObj, pHubFileObj)); + LOG(("IoGetDeviceObjectPointer for %S returned %p %p", szwHubName, pHubDevObj, pHubFileObj)); + + VBOXUSBOBJDRVOBJSEARCHER Data = {0}; + Data.pDrvName = &szStandardHubName; + Data.pPdoNamePrefix = &szStandardHubPdoNamePrefix; + Data.fFlags = fFlags; - if (pHubDevObj->DriverObject - && pHubDevObj->DriverObject->DriverName.Buffer - && pHubDevObj->DriverObject->DriverName.Length - && !RtlCompareUnicodeString(&szStandardHubName, &pHubDevObj->DriverObject->DriverName, TRUE /* case insensitive */)) + vboxUsbObjDevStackWalk(pHubDevObj, vboxUsbObjDevObjSearcherWalker, &Data); + if (Data.pDevObj) { - LOG(("Associated driver")); - LOG_USTR(&pHubDevObj->DriverObject->DriverName); - LOG(("pnp handler %p\n", pHubDevObj->DriverObject->MajorFunction[IRP_MJ_PNP])); - - pDrvObj = pHubDevObj->DriverObject; - /* ensure the driver object is not destroyed */ - ObReferenceObject(pDrvObj); - /* release the file object which will releade the dev objectas well, - * as we do not need those anymore */ - ObDereferenceObject(pHubFileObj); - break; + LOG(("found hub dev obj (0x%p)", Data.pDevObj)); + if (!pfnWalker(pHubFileObj, pHubDevObj, Data.pDevObj, pvWalker)) + { + LOG(("the walker said to stop")); + ObDereferenceObject(Data.pDevObj); + ObDereferenceObject(pHubFileObj); + break; + } + + LOG(("going forward..")); + ObDereferenceObject(Data.pDevObj); } else { - LOG(("driver object (0x%p) no match", pHubDevObj->DriverObject)); - if (pHubDevObj->DriverObject) - { - if ( pHubDevObj->DriverObject->DriverName.Buffer - && pHubDevObj->DriverObject->DriverName.Length) - { - LOG(("driver name not match, was:")); - LOG_USTR(&pHubDevObj->DriverObject->DriverName); - LOG(("but expected:")); - LOG_USTR(&szStandardHubName); - } - else - { - LOG(("driver name is zero, Length(%d), Buffer(0x%p)", - pHubDevObj->DriverObject->DriverName.Length, pHubDevObj->DriverObject->DriverName.Buffer)); - } - } - else - { - LOG(("driver object is NULL")); - } + LOG(("no hub driver obj found")); + ASSERT_WARN(!Data.pDevObj, ("non-null dev obj poiter returned (0x%p)", Data.pDevObj)); } + + /* this will dereference both file and dev obj */ ObDereferenceObject(pHubFileObj); } else { - WARN(("IoGetDeviceObjectPointer returned Status (0x%x) for (%S)", Status, szwHubName)); + LOG(("IoGetDeviceObjectPointer returned Status (0x%x) for (%S)", Status, szwHubName)); } } else @@ -298,8 +586,53 @@ static PDRIVER_OBJECT vboxUsbMonHookFindHubDrvObj() WARN(("RtlAnsiStringToUnicodeString failed, Status (0x%x) for Ansu name (%s)", Status, szHubName)); } } +} - return pDrvObj; +typedef struct VBOXUSBMONFINDHUBWALKER +{ + PDRIVER_OBJECT pDrvObj; +} VBOXUSBMONFINDHUBWALKER, *PVBOXUSBMONFINDHUBWALKER; + +static DECLCALLBACK(BOOLEAN) vboxUsbMonFindHubDrvObjWalker(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pHubDo, PVOID pvContext) +{ + PVBOXUSBMONFINDHUBWALKER pData = (PVBOXUSBMONFINDHUBWALKER)pvContext; + PDRIVER_OBJECT pDrvObj = pHubDo->DriverObject; + + ASSERT_WARN(!pData->pDrvObj, ("pDrvObj expected null on enter, but was(0x%p)", pData->pDrvObj)); + if(pDrvObj) + { + LOG(("found driver object 0x%p", pDrvObj)); + ObReferenceObject(pDrvObj); + pData->pDrvObj = pDrvObj; + return FALSE; + } + + WARN(("null pDrvObj!")); + return TRUE; +} + +static PDRIVER_OBJECT vboxUsbMonHookFindHubDrvObj() +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + UNICODE_STRING szStandardHubName; + PDRIVER_OBJECT pDrvObj = NULL; + szStandardHubName.Length = 0; + szStandardHubName.MaximumLength = 0; + szStandardHubName.Buffer = 0; + RtlInitUnicodeString(&szStandardHubName, L"\\Driver\\usbhub"); + + LOG(("Search USB hub")); + VBOXUSBMONFINDHUBWALKER Data = {0}; + vboxUsbMonHubDevWalk(vboxUsbMonFindHubDrvObjWalker, &Data, VBOXUSBMONHUBWALK_F_ALL); + if (Data.pDrvObj) + { + LOG(("returning driver object 0x%p", Data.pDrvObj)); + } + else + { + WARN(("no hub driver object found!")); + } + return Data.pDrvObj; } /* NOTE: the stack location data is not the "actual" IRP stack location, @@ -307,12 +640,12 @@ static PDRIVER_OBJECT vboxUsbMonHookFindHubDrvObj() * See the note in VBoxUsbPnPCompletion for detail */ static NTSTATUS vboxUsbMonHandlePnPIoctl(PDEVICE_OBJECT pDevObj, PIO_STACK_LOCATION pSl, PIO_STATUS_BLOCK pIoStatus) { - LOG(("IRQL = %d\n", KeGetCurrentIrql())); + LOG(("IRQL = %d", KeGetCurrentIrql())); switch(pSl->MinorFunction) { case IRP_MN_QUERY_DEVICE_TEXT: { - LOG(("IRP_MN_QUERY_DEVICE_TEXT: pIoStatus->Status = %x\n", pIoStatus->Status)); + LOG(("IRP_MN_QUERY_DEVICE_TEXT: pIoStatus->Status = %x", pIoStatus->Status)); if (pIoStatus->Status == STATUS_SUCCESS) { WCHAR *pId = (WCHAR *)pIoStatus->Information; @@ -357,14 +690,14 @@ static NTSTATUS vboxUsbMonHandlePnPIoctl(PDEVICE_OBJECT pDevObj, PIO_STACK_LOCAT } } else - LOG(("Invalid pointer %p\n", pId)); + LOG(("Invalid pointer %p", pId)); } break; } case IRP_MN_QUERY_ID: { - LOG(("IRP_MN_QUERY_ID: Irp->pIoStatus->Status = %x\n", pIoStatus->Status)); + LOG(("IRP_MN_QUERY_ID: Irp->pIoStatus->Status = %x", pIoStatus->Status)); if (pIoStatus->Status == STATUS_SUCCESS && pDevObj) { WCHAR *pId = (WCHAR *)pIoStatus->Information; @@ -510,7 +843,7 @@ static NTSTATUS vboxUsbMonHandlePnPIoctl(PDEVICE_OBJECT pDevObj, PIO_STACK_LOCAT } else { - LOG(("Invalid pointer %p\n", pId)); + LOG(("Invalid pointer %p", pId)); } } break; @@ -523,33 +856,33 @@ static NTSTATUS vboxUsbMonHandlePnPIoctl(PDEVICE_OBJECT pDevObj, PIO_STACK_LOCAT { case BusRelations: { - LOG(("BusRelations\n")); + LOG(("BusRelations")); if (pIoStatus->Status == STATUS_SUCCESS) { PDEVICE_RELATIONS pRel = (PDEVICE_RELATIONS)pIoStatus->Information; - LOG(("pRel = %p\n", pRel)); + LOG(("pRel = %p", pRel)); if (VALID_PTR(pRel)) { for (unsigned i=0;i<pRel->Count;i++) { if (VBoxUsbFltPdoIsFiltered(pDevObj)) - LOG(("New PDO %p\n", pRel->Objects[i])); + LOG(("New PDO %p", pRel->Objects[i])); } } else - LOG(("Invalid pointer %p\n", pRel)); + LOG(("Invalid pointer %p", pRel)); } break; } case TargetDeviceRelation: - LOG(("TargetDeviceRelation\n")); + LOG(("TargetDeviceRelation")); break; case RemovalRelations: - LOG(("RemovalRelations\n")); + LOG(("RemovalRelations")); break; case EjectionRelations: - LOG(("EjectionRelations\n")); + LOG(("EjectionRelations")); break; } break; @@ -557,19 +890,19 @@ static NTSTATUS vboxUsbMonHandlePnPIoctl(PDEVICE_OBJECT pDevObj, PIO_STACK_LOCAT case IRP_MN_QUERY_CAPABILITIES: { - LOG(("IRP_MN_QUERY_CAPABILITIES: pIoStatus->Status = %x\n", pIoStatus->Status)); + LOG(("IRP_MN_QUERY_CAPABILITIES: pIoStatus->Status = %x", pIoStatus->Status)); if (pIoStatus->Status == STATUS_SUCCESS) { PDEVICE_CAPABILITIES pCaps = pSl->Parameters.DeviceCapabilities.Capabilities; if (VALID_PTR(pCaps)) { - LOG(("Caps.SilentInstall = %d\n", pCaps->SilentInstall)); - LOG(("Caps.UniqueID = %d\n", pCaps->UniqueID )); - LOG(("Caps.Address = %d\n", pCaps->Address )); - LOG(("Caps.UINumber = %d\n", pCaps->UINumber )); + LOG(("Caps.SilentInstall = %d", pCaps->SilentInstall)); + LOG(("Caps.UniqueID = %d", pCaps->UniqueID )); + LOG(("Caps.Address = %d", pCaps->Address )); + LOG(("Caps.UINumber = %d", pCaps->UINumber )); } else - LOG(("Invalid pointer %p\n", pCaps)); + LOG(("Invalid pointer %p", pCaps)); } break; } @@ -579,13 +912,13 @@ static NTSTATUS vboxUsbMonHandlePnPIoctl(PDEVICE_OBJECT pDevObj, PIO_STACK_LOCAT #endif } /*switch */ - LOG(("Done returns %x (IRQL = %d)\n", pIoStatus->Status, KeGetCurrentIrql())); + LOG(("Done returns %x (IRQL = %d)", pIoStatus->Status, KeGetCurrentIrql())); return pIoStatus->Status; } NTSTATUS _stdcall VBoxUsbPnPCompletion(DEVICE_OBJECT *pDevObj, IRP *pIrp, void *pvContext) { - LOG(("Completion PDO(0x%p), IRP(0x%p), Status(0x%x)\n", pDevObj, pIrp, pIrp->IoStatus.Status)); + LOG(("Completion PDO(0x%p), IRP(0x%p), Status(0x%x)", pDevObj, pIrp, pIrp->IoStatus.Status)); ASSERT_WARN(pvContext, ("zero context")); PVBOXUSBHOOK_REQUEST pRequest = (PVBOXUSBHOOK_REQUEST)pvContext; @@ -656,7 +989,7 @@ NTSTATUS _stdcall VBoxUsbPnPCompletion(DEVICE_OBJECT *pDevObj, IRP *pIrp, void * break; } - LOG(("<==PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x), Sl PDO(0x%p), Compl PDO(0x%p)\n", + LOG(("<==PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x), Sl PDO(0x%p), Compl PDO(0x%p)", vboxUsbDbgStrPnPMn(pSl->MinorFunction), pRealDevObj, pIrp, pIrp->IoStatus.Status, pSl->DeviceObject, pDevObj)); @@ -683,7 +1016,7 @@ NTSTATUS _stdcall VBoxUsbPnPCompletion(DEVICE_OBJECT *pDevObj, IRP *pIrp, void * */ NTSTATUS _stdcall VBoxUsbMonPnPHook(IN PDEVICE_OBJECT pDevObj, IN PIRP pIrp) { - LOG(("==>PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x)\n", vboxUsbDbgStrPnPMn(IoGetCurrentIrpStackLocation(pIrp)->MinorFunction), pDevObj, pIrp, pIrp->IoStatus.Status)); + LOG(("==>PnP: Mn(%s), PDO(0x%p), IRP(0x%p), Status(0x%x)", vboxUsbDbgStrPnPMn(IoGetCurrentIrpStackLocation(pIrp)->MinorFunction), pDevObj, pIrp, pIrp->IoStatus.Status)); if(!VBoxUsbHookRetain(&g_VBoxUsbMonGlobals.UsbHubPnPHook.Hook)) { @@ -760,7 +1093,7 @@ static NTSTATUS vboxUsbMonHookUninstall() NTSTATUS Status = VBoxUsbHookUninstall(&g_VBoxUsbMonGlobals.UsbHubPnPHook.Hook); if (!NT_SUCCESS(Status)) { - AssertMsgFailed(("usbhub pnp unhook failed, setting the fUninitFailed flag, the current value of fUninitFailed (%d)\n", g_VBoxUsbMonGlobals.UsbHubPnPHook.fUninitFailed)); + AssertMsgFailed(("usbhub pnp unhook failed, setting the fUninitFailed flag, the current value of fUninitFailed (%d)", g_VBoxUsbMonGlobals.UsbHubPnPHook.fUninitFailed)); g_VBoxUsbMonGlobals.UsbHubPnPHook.fUninitFailed = true; } return Status; @@ -923,7 +1256,7 @@ static NTSTATUS _stdcall VBoxUsbMonClose(PDEVICE_OBJECT pDevObj, PIRP pIrp) WARN(("vboxUsbMonContextClose failed, Status (0x%x), prefent unload", Status)); if (!InterlockedExchange(&g_VBoxUsbMonGlobals.ulPreventUnloadOn, 1)) { - LOGREL(("ulPreventUnloadOn not set, preventing unload\n")); + LOGREL(("ulPreventUnloadOn not set, preventing unload")); UNICODE_STRING UniName; PDEVICE_OBJECT pTmpDevObj; RtlInitUnicodeString(&UniName, USBMON_DEVICE_NAME_NT); @@ -1033,10 +1366,10 @@ static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOI { PUSBSUP_VERSION pOut = (PUSBSUP_VERSION)pvBuffer; - LOG(("SUPUSBFLT_IOCTL_GET_VERSION\n")); + LOG(("SUPUSBFLT_IOCTL_GET_VERSION")); if (!pvBuffer || cbOutBuffer != sizeof(*pOut) || cbInBuffer != 0) { - WARN(("SUPUSBFLT_IOCTL_GET_VERSION: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.\n", + WARN(("SUPUSBFLT_IOCTL_GET_VERSION: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.", cbInBuffer, 0, cbOutBuffer, sizeof (*pOut))); Status = STATUS_INVALID_PARAMETER; break; @@ -1056,7 +1389,7 @@ static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOI int rc; if (RT_UNLIKELY(!pvBuffer || cbInBuffer != sizeof (*pFilter) || cbOutBuffer != sizeof (*pOut))) { - WARN(("SUPUSBFLT_IOCTL_ADD_FILTER: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.\n", + WARN(("SUPUSBFLT_IOCTL_ADD_FILTER: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.", cbInBuffer, sizeof (*pFilter), cbOutBuffer, sizeof (*pOut))); Status = STATUS_INVALID_PARAMETER; break; @@ -1077,12 +1410,12 @@ static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOI if (!pvBuffer || cbInBuffer != sizeof (*pIn) || (cbOutBuffer && cbOutBuffer != sizeof (*pRc))) { - WARN(("SUPUSBFLT_IOCTL_REMOVE_FILTER: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.\n", + WARN(("SUPUSBFLT_IOCTL_REMOVE_FILTER: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.", cbInBuffer, sizeof (*pIn), cbOutBuffer, 0)); Status = STATUS_INVALID_PARAMETER; break; } - LOG(("SUPUSBFLT_IOCTL_REMOVE_FILTER %x\n", *pIn)); + LOG(("SUPUSBFLT_IOCTL_REMOVE_FILTER %x", *pIn)); int rc = VBoxUsbMonFltRemove(pContext, *pIn); if (cbOutBuffer) { @@ -1099,12 +1432,12 @@ static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOI { if (pvBuffer || cbInBuffer || cbOutBuffer) { - WARN(("SUPUSBFLT_IOCTL_RUN_FILTERS: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.\n", + WARN(("SUPUSBFLT_IOCTL_RUN_FILTERS: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.", cbInBuffer, 0, cbOutBuffer, 0)); Status = STATUS_INVALID_PARAMETER; break; } - LOG(("SUPUSBFLT_IOCTL_RUN_FILTERS \n")); + LOG(("SUPUSBFLT_IOCTL_RUN_FILTERS ")); Status = VBoxUsbMonRunFilters(pContext); ASSERT_WARN(Status != STATUS_PENDING, ("status pending!")); break; @@ -1116,7 +1449,7 @@ static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOI PUSBSUP_GETDEV_MON pOut = (PUSBSUP_GETDEV_MON)pvBuffer; if (!pvBuffer || cbInBuffer != sizeof (hDevice) || cbOutBuffer < sizeof (*pOut)) { - WARN(("SUPUSBFLT_IOCTL_GET_DEVICE: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected >= %d.\n", + WARN(("SUPUSBFLT_IOCTL_GET_DEVICE: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected >= %d.", cbInBuffer, sizeof (hDevice), cbOutBuffer, sizeof (*pOut))); Status = STATUS_INVALID_PARAMETER; break; @@ -1140,7 +1473,7 @@ static NTSTATUS vboxUsbMonIoctlDispatch(PVBOXUSBMONCTX pContext, ULONG Ctl, PVOI PUSBSUP_SET_NOTIFY_EVENT pSne = (PUSBSUP_SET_NOTIFY_EVENT)pvBuffer; if (!pvBuffer || cbInBuffer != sizeof (*pSne) || cbOutBuffer != sizeof (*pSne)) { - WARN(("SUPUSBFLT_IOCTL_SET_NOTIFY_EVENT: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.\n", + WARN(("SUPUSBFLT_IOCTL_SET_NOTIFY_EVENT: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected %d.", cbInBuffer, sizeof (*pSne), cbOutBuffer, sizeof (*pSne))); Status = STATUS_INVALID_PARAMETER; break; @@ -1207,10 +1540,10 @@ static NTSTATUS vboxUsbMonInternalIoctlDispatch(ULONG Ctl, PVOID pvBuffer, ULON { PVBOXUSBIDC_VERSION pOut = (PVBOXUSBIDC_VERSION)pvBuffer; - LOG(("VBOXUSBIDC_INTERNAL_IOCTL_GET_VERSION\n")); + LOG(("VBOXUSBIDC_INTERNAL_IOCTL_GET_VERSION")); if (!pvBuffer) { - WARN(("VBOXUSBIDC_INTERNAL_IOCTL_GET_VERSION: Buffer is NULL\n")); + WARN(("VBOXUSBIDC_INTERNAL_IOCTL_GET_VERSION: Buffer is NULL")); Status = STATUS_INVALID_PARAMETER; break; } @@ -1224,10 +1557,10 @@ static NTSTATUS vboxUsbMonInternalIoctlDispatch(ULONG Ctl, PVOID pvBuffer, ULON { PVBOXUSBIDC_PROXY_STARTUP pOut = (PVBOXUSBIDC_PROXY_STARTUP)pvBuffer; - LOG(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_STARTUP\n")); + LOG(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_STARTUP")); if (!pvBuffer) { - WARN(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_STARTUP: Buffer is NULL\n")); + WARN(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_STARTUP: Buffer is NULL")); Status = STATUS_INVALID_PARAMETER; break; } @@ -1242,10 +1575,10 @@ static NTSTATUS vboxUsbMonInternalIoctlDispatch(ULONG Ctl, PVOID pvBuffer, ULON { PVBOXUSBIDC_PROXY_TEARDOWN pOut = (PVBOXUSBIDC_PROXY_TEARDOWN)pvBuffer; - LOG(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_TEARDOWN\n")); + LOG(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_TEARDOWN")); if (!pvBuffer) { - WARN(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_TEARDOWN: Buffer is NULL\n")); + WARN(("VBOXUSBIDC_INTERNAL_IOCTL_PROXY_TEARDOWN: Buffer is NULL")); Status = STATUS_INVALID_PARAMETER; break; } @@ -1295,7 +1628,7 @@ static NTSTATUS _stdcall VBoxUsbMonInternalDeviceControl(PDEVICE_OBJECT pDevObj, */ static void _stdcall VBoxUsbMonUnload(PDRIVER_OBJECT pDrvObj) { - LOG(("VBoxUSBMonUnload pDrvObj (0x%p)\n", pDrvObj)); + LOG(("VBoxUSBMonUnload pDrvObj (0x%p)", pDrvObj)); IoReleaseRemoveLockAndWait(&g_VBoxUsbMonGlobals.RmLock, &g_VBoxUsbMonGlobals); @@ -1368,7 +1701,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OBJECT pDrvObj, PUNICODE_STRING pRegPath) pDrvObj->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = VBoxUsbMonInternalDeviceControl; g_VBoxUsbMonGlobals.pDevObj = pDevObj; - LOG(("VBoxUSBMon::DriverEntry returning STATUS_SUCCESS\n")); + LOG(("VBoxUSBMon::DriverEntry returning STATUS_SUCCESS")); return STATUS_SUCCESS; } IoDeleteDevice(pDevObj); diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h index b47a72f90..b3f17f2b1 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbMon.h 38356 2011-08-08 15:49:01Z vboxsync $ */ +/* $Id: VBoxUsbMon.h $ */ /** @file * VBox USB Monitor */ @@ -46,4 +46,16 @@ NTSTATUS VBoxUsbMonQueryBusRelations(PDEVICE_OBJECT pDevObj, PFILE_OBJECT pFileO void vboxUsbDbgPrintUnicodeString(PUNICODE_STRING pUnicodeString); +/* visit usbhub-originated device PDOs */ +#define VBOXUSBMONHUBWALK_F_PDO 0x00000001 +/* visit usbhub device FDOs */ +#define VBOXUSBMONHUBWALK_F_FDO 0x00000002 +/* visit all usbhub-originated device objects */ +#define VBOXUSBMONHUBWALK_F_ALL (VBOXUSBMONHUBWALK_F_FDO | VBOXUSBMONHUBWALK_F_PDO) + +typedef DECLCALLBACK(BOOLEAN) FNVBOXUSBMONDEVWALKER(PFILE_OBJECT pFile, PDEVICE_OBJECT pTopDo, PDEVICE_OBJECT pHubDo, PVOID pvContext); +typedef FNVBOXUSBMONDEVWALKER *PFNVBOXUSBMONDEVWALKER; + +VOID vboxUsbMonHubDevWalk(PFNVBOXUSBMONDEVWALKER pfnWalker, PVOID pvWalker, ULONG fFlags); + #endif /* #ifndef ___VBoxUsbMon_h___ */ diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc index 8411ba288..06a6d21e3 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxUsbMon.rc 36968 2011-05-05 08:55:16Z vboxsync $ */ +/* $Id: VBoxUsbMon.rc $ */ /** @file * VBoxUSBMon - Resource file containing version info and icon. */ diff --git a/src/VBox/HostDrivers/darwin/Makefile.kmk b/src/VBox/HostDrivers/darwin/Makefile.kmk index 41265f58b..20d3b673d 100644 --- a/src/VBox/HostDrivers/darwin/Makefile.kmk +++ b/src/VBox/HostDrivers/darwin/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38183 2011-07-26 13:20:51Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-makefile for the darwin host driver helper scripts. # diff --git a/src/VBox/HostDrivers/darwin/loadall.sh b/src/VBox/HostDrivers/darwin/loadall.sh index 058b85e93..058b85e93 100644..100755 --- a/src/VBox/HostDrivers/darwin/loadall.sh +++ b/src/VBox/HostDrivers/darwin/loadall.sh diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk index 19c15d58d..011bf371b 100644 --- a/src/VBox/HostDrivers/win/Makefile.kmk +++ b/src/VBox/HostDrivers/win/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 36871 2011-04-28 07:57:12Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for Windows driver tooling lib. # diff --git a/src/VBox/HostDrivers/win/VBoxDbgLog.h b/src/VBox/HostDrivers/win/VBoxDbgLog.h index 0f1fc06d6..9fe6651cc 100644 --- a/src/VBox/HostDrivers/win/VBoxDbgLog.h +++ b/src/VBox/HostDrivers/win/VBoxDbgLog.h @@ -1,4 +1,4 @@ -/* $Id: VBoxDbgLog.h 38433 2011-08-12 12:04:34Z vboxsync $ */ +/* $Id: VBoxDbgLog.h $ */ /** @file * Logging helper diff --git a/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp b/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp index a1a9bf05d..47c7db43a 100644 --- a/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp +++ b/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDrvCfg.cpp 36941 2011-05-03 14:56:08Z vboxsync $ */ +/* $Id: VBoxDrvCfg.cpp $ */ /** @file * VBoxDrvCfg.cpp - Windows Driver Manipulation API implementation */ diff --git a/src/VBox/HostServices/GuestControl/Makefile.kmk b/src/VBox/HostServices/GuestControl/Makefile.kmk index e743aa2b8..853e254aa 100644 --- a/src/VBox/HostServices/GuestControl/Makefile.kmk +++ b/src/VBox/HostServices/GuestControl/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 36873 2011-04-28 08:55:09Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Guest Control Host Service. # diff --git a/src/VBox/HostServices/GuestControl/gctrl.cpp b/src/VBox/HostServices/GuestControl/gctrl.cpp index ebe86e63f..dcb74a626 100644 --- a/src/VBox/HostServices/GuestControl/gctrl.cpp +++ b/src/VBox/HostServices/GuestControl/gctrl.cpp @@ -1,4 +1,4 @@ -/* $Id: gctrl.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: gctrl.cpp $ */ /** @file * Guest Control Service: Internal function used by service, Main and testcase. */ diff --git a/src/VBox/HostServices/GuestControl/service.cpp b/src/VBox/HostServices/GuestControl/service.cpp index 305ca46d3..08d8ebf4e 100644 --- a/src/VBox/HostServices/GuestControl/service.cpp +++ b/src/VBox/HostServices/GuestControl/service.cpp @@ -1,4 +1,4 @@ -/* $Id: service.cpp 38133 2011-07-25 09:02:17Z vboxsync $ */ +/* $Id: service.cpp $ */ /** @file * Guest Control Service: Controlling the guest. */ diff --git a/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk b/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk index 7c054b21a..e1fa6be73 100644 --- a/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk +++ b/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Guest Control Host Service testcases. # diff --git a/src/VBox/HostServices/GuestControl/testcase/tstGuestControlSvc.cpp b/src/VBox/HostServices/GuestControl/testcase/tstGuestControlSvc.cpp index 671476663..39b940dc6 100644 --- a/src/VBox/HostServices/GuestControl/testcase/tstGuestControlSvc.cpp +++ b/src/VBox/HostServices/GuestControl/testcase/tstGuestControlSvc.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGuestControlSvc.cpp 36873 2011-04-28 08:55:09Z vboxsync $ */ +/* $Id: tstGuestControlSvc.cpp $ */ /** @file * * Testcase for the guest control service. diff --git a/src/VBox/HostServices/GuestProperties/Makefile.kmk b/src/VBox/HostServices/GuestProperties/Makefile.kmk index c449bd411..6c387e104 100644 --- a/src/VBox/HostServices/GuestProperties/Makefile.kmk +++ b/src/VBox/HostServices/GuestProperties/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Info Services Host Service. # diff --git a/src/VBox/HostServices/GuestProperties/service.cpp b/src/VBox/HostServices/GuestProperties/service.cpp index 50cf8176c..d73e54702 100644 --- a/src/VBox/HostServices/GuestProperties/service.cpp +++ b/src/VBox/HostServices/GuestProperties/service.cpp @@ -1,4 +1,4 @@ -/* $Id: service.cpp 36529 2011-04-04 13:54:13Z vboxsync $ */ +/* $Id: service.cpp $ */ /** @file * Guest Property Service: Host service entry points. */ diff --git a/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk b/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk index 3d3374c1f..4ea07cbac 100644 --- a/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk +++ b/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Guest Properties Host Service testcases. # diff --git a/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp b/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp index 0d9683e53..76c563e3f 100644 --- a/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp +++ b/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGuestPropSvc.cpp 36412 2011-03-24 17:25:33Z vboxsync $ */ +/* $Id: tstGuestPropSvc.cpp $ */ /** @file * * Testcase for the guest property service. diff --git a/src/VBox/HostServices/Makefile.kmk b/src/VBox/HostServices/Makefile.kmk index f414f09ce..66d9dfbd8 100644 --- a/src/VBox/HostServices/Makefile.kmk +++ b/src/VBox/HostServices/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 33185 2010-10-18 08:40:50Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VBox Host Services. # diff --git a/src/VBox/HostServices/SharedClipboard/Makefile.kmk b/src/VBox/HostServices/SharedClipboard/Makefile.kmk index c6ff527e0..bf609b5b7 100644 --- a/src/VBox/HostServices/SharedClipboard/Makefile.kmk +++ b/src/VBox/HostServices/SharedClipboard/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Clipboard Host Service. # diff --git a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp index 2ad88d3a8..31da35b83 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp +++ b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp @@ -1,4 +1,4 @@ -/* $Id: darwin-pasteboard.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: darwin-pasteboard.cpp $ */ /** @file * Shared Clipboard: Mac OS X host implementation. */ diff --git a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h index a93c6ed1c..4e36ff1a5 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h +++ b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h @@ -1,4 +1,4 @@ -/* $Id: darwin-pasteboard.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: darwin-pasteboard.h $ */ /** @file * Shared Clipboard: Mac OS X host implementation. */ diff --git a/src/VBox/HostServices/SharedClipboard/darwin.cpp b/src/VBox/HostServices/SharedClipboard/darwin.cpp index 3d5ae6e99..1f7fe0ba2 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin.cpp +++ b/src/VBox/HostServices/SharedClipboard/darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: darwin.cpp 37472 2011-06-15 16:15:34Z vboxsync $ */ +/* $Id: darwin.cpp $ */ /** @file * Shared Clipboard: Mac OS X host. */ diff --git a/src/VBox/HostServices/SharedClipboard/service.cpp b/src/VBox/HostServices/SharedClipboard/service.cpp index a7a28788f..0cbd8a028 100644 --- a/src/VBox/HostServices/SharedClipboard/service.cpp +++ b/src/VBox/HostServices/SharedClipboard/service.cpp @@ -1,4 +1,4 @@ -/* $Id: service.cpp 37472 2011-06-15 16:15:34Z vboxsync $ */ +/* $Id: service.cpp $ */ /** @file * Shared Clipboard: Host service entry points. */ diff --git a/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk b/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk index 68201e33a..81ceae375 100644 --- a/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk +++ b/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 37458 2011-06-14 21:15:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Clipboard Host Service testcases. # diff --git a/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp b/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp index 6ca74b65c..b994f627c 100644 --- a/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp +++ b/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp @@ -1,4 +1,4 @@ -/* $Id: tstClipboardServiceHost.cpp 37472 2011-06-15 16:15:34Z vboxsync $ */ +/* $Id: tstClipboardServiceHost.cpp $ */ /** @file * Shared Clipboard host service test case. */ diff --git a/src/VBox/HostServices/SharedFolders/Makefile.kmk b/src/VBox/HostServices/SharedFolders/Makefile.kmk index 1e22e76d4..cc250c8e4 100644 --- a/src/VBox/HostServices/SharedFolders/Makefile.kmk +++ b/src/VBox/HostServices/SharedFolders/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Folders Host Service. # diff --git a/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk b/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk index b88ae169f..88d2b1c4b 100644 --- a/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk +++ b/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Folders Host Service testcases. # diff --git a/src/VBox/HostServices/SharedOpenGL/Makefile.kmk b/src/VBox/HostServices/SharedOpenGL/Makefile.kmk index c327d9a16..dd943b8b8 100644 --- a/src/VBox/HostServices/SharedOpenGL/Makefile.kmk +++ b/src/VBox/HostServices/SharedOpenGL/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared OpenGL Host Service. # diff --git a/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp b/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp index 7eb5c3ce7..a58f42644 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp +++ b/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp @@ -1,4 +1,4 @@ -/* $Id: crservice.cpp 37433 2011-06-14 11:44:45Z vboxsync $ */ +/* $Id: crservice.cpp $ */ /** @file * VBox crOpenGL: Host service entry points. @@ -1352,11 +1352,21 @@ static DECLCALLBACK(int) svcHostCall (void *, uint32_t u32Function, uint32_t cPa else { CHECK_ERROR_RET(pFramebuffer, COMGETTER(WinId)(&winId), rc); - CHECK_ERROR_RET(pFramebuffer, COMGETTER(Width)(&w), rc); - CHECK_ERROR_RET(pFramebuffer, COMGETTER(Height)(&h), rc); - rc = crVBoxServerMapScreen(screenId, xo, yo, w, h, winId); - AssertRCReturn(rc, rc); + if (!winId) + { + /* View associated with framebuffer is destroyed, happens with 2d accel enabled */ + rc = crVBoxServerUnmapScreen(screenId); + AssertRCReturn(rc, rc); + } + else + { + CHECK_ERROR_RET(pFramebuffer, COMGETTER(Width)(&w), rc); + CHECK_ERROR_RET(pFramebuffer, COMGETTER(Height)(&h), rc); + + rc = crVBoxServerMapScreen(screenId, xo, yo, w, h, winId); + AssertRCReturn(rc, rc); + } } rc = VINF_SUCCESS; diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c index 8978b9292..8fb33c511 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c @@ -1,4 +1,4 @@ -/* $Id: server_framebuffer.c 31808 2010-08-20 09:40:40Z vboxsync $ */ +/* $Id: server_framebuffer.c $ */ /** @file * VBox OpenGL: EXT_framebuffer_object diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c index 57bf2a4a8..3807b695b 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c @@ -1,4 +1,4 @@ -/* $Id: server_getshaders.c 33045 2010-10-11 16:57:21Z vboxsync $ */ +/* $Id: server_getshaders.c $ */ /** @file * VBox OpenGL GLSL related get functions diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c index 9598b4546..dd0a870f3 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c @@ -1,4 +1,4 @@ -/* $Id: server_glsl.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: server_glsl.c $ */ /** @file * VBox OpenGL: GLSL related functions diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c index aa5a369b6..a95589048 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c @@ -1156,6 +1156,8 @@ DECLEXPORT(int32_t) crVBoxServerSetScreenCount(int sCount) DECLEXPORT(int32_t) crVBoxServerUnmapScreen(int sIndex) { + crDebug("crVBoxServerUnmapScreen(%i)", sIndex); + if (sIndex<0 || sIndex>=cr_server.screenCount) return VERR_INVALID_PARAMETER; @@ -1173,7 +1175,7 @@ DECLEXPORT(int32_t) crVBoxServerUnmapScreen(int sIndex) DECLEXPORT(int32_t) crVBoxServerMapScreen(int sIndex, int32_t x, int32_t y, uint32_t w, uint32_t h, uint64_t winID) { - crDebug("crVBoxServerMapScreen(%i) [%i,%i:%u,%u]", sIndex, x, y, w, h); + crDebug("crVBoxServerMapScreen(%i) [%i,%i:%u,%u %x]", sIndex, x, y, w, h, winID); if (sIndex<0 || sIndex>=cr_server.screenCount) return VERR_INVALID_PARAMETER; diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c index 6464995ae..f7d3dd287 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c @@ -1,4 +1,4 @@ -/* $Id: server_muralfbo.c 37613 2011-06-23 12:42:08Z vboxsync $ */ +/* $Id: server_muralfbo.c $ */ /** @file * VBox crOpenGL: Window to FBO redirect support. diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_texture.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_texture.c index 2806dbae8..392bcd20c 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_texture.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_texture.c @@ -1,4 +1,4 @@ -/* $Id: server_texture.c 29857 2010-05-28 12:25:02Z vboxsync $ */ +/* $Id: server_texture.c $ */ /** @file * VBox crOpenGL: teximage functions. diff --git a/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c b/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c index 139f6e6e7..b94613834 100644 --- a/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c +++ b/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c @@ -86,7 +86,7 @@ MainWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) break; case WM_DESTROY: - crDebug( "Render SPU: caught WM_DESTROY for our window" ); + crDebug("Render SPU: caught WM_DESTROY for our window %x", hWnd); break; case WM_NCHITTEST: diff --git a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_framebuffer.c b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_framebuffer.c index 1241f4bcb..ca4d82b30 100644 --- a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_framebuffer.c +++ b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_framebuffer.c @@ -1,4 +1,4 @@ -/* $Id: unpack_framebuffer.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: unpack_framebuffer.c $ */ /** @file * VBox OpenGL: EXT_framebuffer_object diff --git a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c index 6bc97422a..6b3204ce4 100644 --- a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c +++ b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c @@ -1,4 +1,4 @@ -/* $Id: unpack_shaders.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: unpack_shaders.c $ */ /** @file * VBox OpenGL DRI driver functions diff --git a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c index 503e015c5..4bae17d19 100755..100644 --- a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c +++ b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c @@ -1,4 +1,4 @@ -/* $Id: unpack_visibleregion.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: unpack_visibleregion.c $ */ /** @file * VBox Packing VisibleRegion information diff --git a/src/VBox/HostServices/auth/Makefile.kmk b/src/VBox/HostServices/auth/Makefile.kmk index 11939a276..5ec7c952d 100644 --- a/src/VBox/HostServices/auth/Makefile.kmk +++ b/src/VBox/HostServices/auth/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38278 2011-08-02 13:02:50Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox RDP authentication plugins. # diff --git a/src/VBox/HostServices/testcase/Makefile.kmk b/src/VBox/HostServices/testcase/Makefile.kmk index 6e2a29263..e2951711a 100644 --- a/src/VBox/HostServices/testcase/Makefile.kmk +++ b/src/VBox/HostServices/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the HGCM service testcase. # diff --git a/src/VBox/HostServices/testcase/tstHGCMSvc.cpp b/src/VBox/HostServices/testcase/tstHGCMSvc.cpp index 648a9c18f..6adf1a28c 100644 --- a/src/VBox/HostServices/testcase/tstHGCMSvc.cpp +++ b/src/VBox/HostServices/testcase/tstHGCMSvc.cpp @@ -1,4 +1,4 @@ -/* $Id: tstHGCMSvc.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstHGCMSvc.cpp $ */ /** @file * HGCM Service Testcase. */ diff --git a/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk b/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk index 2e23fb460..5800b1dc0 100644 --- a/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk +++ b/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 31844 2010-08-21 19:37:58Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBoxFUSE Program. # diff --git a/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp b/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp index de3a47305..6cce87e6c 100644 --- a/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp +++ b/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxFUSE.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: VBoxFUSE.cpp $ */ /** @file * VBoxFUSE - Disk Image Flattening FUSE Program. */ diff --git a/src/VBox/Installer/Makefile.kmk b/src/VBox/Installer/Makefile.kmk index ab07ee40c..a6ab33f11 100644 --- a/src/VBox/Installer/Makefile.kmk +++ b/src/VBox/Installer/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Install misc stuff and create dist packages. # diff --git a/src/VBox/Installer/common/Makefile.kmk b/src/VBox/Installer/common/Makefile.kmk index 0163173d3..60dc1dbbb 100644 --- a/src/VBox/Installer/common/Makefile.kmk +++ b/src/VBox/Installer/common/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38278 2011-08-02 13:02:50Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Common installer stuff. # diff --git a/src/VBox/Installer/darwin/Makefile.kmk b/src/VBox/Installer/darwin/Makefile.kmk index cb5db4ee5..d11870ed1 100644 --- a/src/VBox/Installer/darwin/Makefile.kmk +++ b/src/VBox/Installer/darwin/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38390 2011-08-09 23:12:52Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Install misc stuff and create dist packages for Mac OS X. # diff --git a/src/VBox/Installer/darwin/VirtualBox/postflight b/src/VBox/Installer/darwin/VirtualBox/postflight index 0a1320037..1d25377da 100644..100755 --- a/src/VBox/Installer/darwin/VirtualBox/postflight +++ b/src/VBox/Installer/darwin/VirtualBox/postflight @@ -68,7 +68,7 @@ VBOXWEBSRV_TRG="${HOME}/Library/LaunchAgents" if [[ -e "${VBOXWEBSRV}" && -e "${VBOXWEBSRV_TRG}" ]]; then echo "Installing vboxwebsrv launchd file to ${VBOXWEBSRV_TRG}" ${CP} "${VBOXWEBSRV}" "${VBOXWEBSRV_TRG}/" - /usr/sbin/chown "${USER}" "${VBOXWEBSRV_TRG}/org.virtualbox.vboxwebsrv.plist" + [ "x" != "x${USER}" ] && /usr/sbin/chown "${USER}" "${VBOXWEBSRV_TRG}/org.virtualbox.vboxwebsrv.plist" fi # @@ -84,8 +84,8 @@ fi # Register our file extensions # LSREGISTER=/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -if [ -e ${LSREGISTER} ]; then - echo "Register file extensions for $USER" +if [[ -e "${LSREGISTER}" && "x" != "x${USER}" ]]; then + echo "Register file extensions for \"${USER}\"" /usr/bin/sudo -u "${USER}" ${LSREGISTER} -f /Applications/VirtualBox.app /usr/bin/sudo -u "${USER}" ${LSREGISTER} -f /Applications/VirtualBox.app/Contents/Resources/vmstarter.app fi diff --git a/src/VBox/Installer/freebsd/Makefile.kmk b/src/VBox/Installer/freebsd/Makefile.kmk index 052c9a0dc..a2f66c860 100644 --- a/src/VBox/Installer/freebsd/Makefile.kmk +++ b/src/VBox/Installer/freebsd/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the FreeBSD installer. # diff --git a/src/VBox/Installer/freebsd/postdeinstall.sh b/src/VBox/Installer/freebsd/postdeinstall.sh index 394d5d4a7..394d5d4a7 100644..100755 --- a/src/VBox/Installer/freebsd/postdeinstall.sh +++ b/src/VBox/Installer/freebsd/postdeinstall.sh diff --git a/src/VBox/Installer/freebsd/postinstall.sh b/src/VBox/Installer/freebsd/postinstall.sh index 7bb905b75..7bb905b75 100644..100755 --- a/src/VBox/Installer/freebsd/postinstall.sh +++ b/src/VBox/Installer/freebsd/postinstall.sh diff --git a/src/VBox/Installer/linux/Makefile.kmk b/src/VBox/Installer/linux/Makefile.kmk index fda6ade11..73014e20c 100644 --- a/src/VBox/Installer/linux/Makefile.kmk +++ b/src/VBox/Installer/linux/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Linux installer. # @@ -396,10 +396,12 @@ $(VBOX_LNX_INST_STAGE_DIR)/VirtualBox.tar.bz2: $(VBOX_LNX_INST_ARCH_DEPS) $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@) $(QUIET)$(MKDIR) -p $(@D) ifdef VBOX_USE_PBZIP2 - $(QUIET)tar --owner 0 --group 0 -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES) + $(QUIET)tar --dereference --owner 0 --group 0 \ + -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES) $(QUIET)pbzip2 $(patsubst %.bz2,%,$@) else - $(QUIET)tar --owner 0 --group 0 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES) + $(QUIET)tar --dereference --owner 0 --group 0 \ + -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES) endif $(QUIET)$(CHMOD) 0644 $@ @@ -411,11 +413,13 @@ $(PATH_STAGE_BIN)/VirtualBox.tar.bz2: $(VBOX_LNX_INST_ARCH_DEPS) $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING) $@ $(patsubst %.bz2,%,$@) $(QUIET)$(LN_SYMLINK) $(VBOX_LNX_INST_OUT_DIR)/archive/ $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING) ifdef VBOX_USE_PBZIP2 - $(QUIET)tar --owner 0 --group 0 -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR) \ + $(QUIET)tar --dereference --owner 0 --group 0 \ + -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR) \ $(addprefix VirtualBox-$(VBOX_VERSION_STRING)/,$(VBOX_LNX_ARCH_FILES)) $(QUIET)pbzip2 $(patsubst %.bz2,%,$@) else - $(QUIET)tar --owner 0 --group 0 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR) \ + $(QUIET)tar --dereference --owner 0 --group 0 \ + -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR) \ $(addprefix VirtualBox-$(VBOX_VERSION_STRING)/,$(VBOX_LNX_ARCH_FILES)) endif $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING) @@ -484,11 +488,13 @@ $(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2: \ $(call MSG_L1,Packing $@) $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@) ifdef VBOX_USE_PBZIP2 - $(QUIET)tar --owner 0 --group 0 -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \ + $(QUIET)tar --dereference --owner 0 --group 0 \ + -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \ $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN)) $(QUIET)pbzip2 $(patsubst %.bz2,%,$@) else - $(QUIET)tar --owner 0 --group 0 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \ + $(QUIET)tar --dereference --owner 0 --group 0 \ + -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \ $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN)) endif diff --git a/src/VBox/Installer/linux/VBoxCreateUSBNode.sh b/src/VBox/Installer/linux/VBoxCreateUSBNode.sh index 0793e0342..9c9a8df9e 100755 --- a/src/VBox/Installer/linux/VBoxCreateUSBNode.sh +++ b/src/VBox/Installer/linux/VBoxCreateUSBNode.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: VBoxCreateUSBNode.sh 38362 2011-08-08 18:45:19Z vboxsync $ */ +# $Id: VBoxCreateUSBNode.sh $ */ ## @file # VirtualBox USB Proxy Service, Linux Specialization. # udev helper for creating and removing device nodes for VirtualBox USB devices diff --git a/src/VBox/Installer/linux/deffiles b/src/VBox/Installer/linux/deffiles index e2eaa1513..e2eaa1513 100644..100755 --- a/src/VBox/Installer/linux/deffiles +++ b/src/VBox/Installer/linux/deffiles diff --git a/src/VBox/Installer/linux/install.sh b/src/VBox/Installer/linux/install.sh index 937d15060..345d85007 100644..100755 --- a/src/VBox/Installer/linux/install.sh +++ b/src/VBox/Installer/linux/install.sh @@ -373,6 +373,10 @@ if [ "$ACTION" = "install" ]; then test -e $INSTALLATION_DIR/VBoxNetAdpCtl && chmod 4511 $INSTALLATION_DIR/VBoxNetAdpCtl # Install runlevel scripts + # Note: vboxdrv is also handled by setup_init_script. This function will + # use chkconfig to adjust the sequence numbers, therefore vboxdrv + # numbers here should match the numbers in the vboxdrv.sh check + # header! install_init_script vboxdrv.sh vboxdrv install_init_script vboxballoonctrl-service.sh vboxballoonctrl-service install_init_script vboxweb-service.sh vboxweb-service diff --git a/src/VBox/Installer/linux/routines.sh b/src/VBox/Installer/linux/routines.sh index d6d9220e9..5cf42bb21 100755..100644 --- a/src/VBox/Installer/linux/routines.sh +++ b/src/VBox/Installer/linux/routines.sh @@ -469,7 +469,7 @@ delrunlevel() { if [ "$ro_SYS_TYPE" = "redhat" ] then test -x "/sbin/chkconfig" || \ - { log "addrunlevel: /sbin/chkconfig not found" && return 1; } + { log "delrunlevel: /sbin/chkconfig not found" && return 1; } if /sbin/chkconfig --list $1 > /dev/null 2>&1; then /sbin/chkconfig --del $1 > /dev/null 2>&1 || { log "Cannot delete $1 from runlevels" && return 1 @@ -479,18 +479,18 @@ delrunlevel() { elif [ "$ro_SYS_TYPE" = "suse" ] then test -x /sbin/insserv || { - log "addrunlevel: insserv not found" && return 1; + log "delrunlevel: insserv not found" && return 1; } /sbin/insserv -r $1 > /dev/null 2>&1 # Debian/Ubuntu-based systems elif [ "$ro_SYS_TYPE" = "debian" ]; then test -x `which update-rc.d` || \ - { log "addrunlevel: update-rc.d not found" && return 1; } + { log "delrunlevel: update-rc.d not found" && return 1; } update-rc.d -f $1 remove > /dev/null 2>&1 # Gentoo Linux elif [ "$ro_SYS_TYPE" = "gentoo" ]; then test -x `which rc-update` || \ - { log "addrunlevel: update-rc.d not found" && return 1; } + { log "delrunlevel: update-rc.d not found" && return 1; } rc-update del "$1" > /dev/null 2>&1 # Linux from scratch, by the book elif [ "$ro_SYS_TYPE" = "lfs" ]; then diff --git a/src/VBox/Installer/linux/run-inst.sh b/src/VBox/Installer/linux/run-inst.sh index a513fc0b7..a513fc0b7 100644..100755 --- a/src/VBox/Installer/linux/run-inst.sh +++ b/src/VBox/Installer/linux/run-inst.sh diff --git a/src/VBox/Installer/linux/runasroot.sh b/src/VBox/Installer/linux/runasroot.sh index 89460abe6..41125ced1 100644..100755 --- a/src/VBox/Installer/linux/runasroot.sh +++ b/src/VBox/Installer/linux/runasroot.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: runasroot.sh 36785 2011-04-21 08:07:14Z vboxsync $ +# $Id: runasroot.sh $ ## @file # VirtualBox privileged execution helper script for Linux and Solaris # diff --git a/src/VBox/Installer/linux/sh-utils.sh b/src/VBox/Installer/linux/sh-utils.sh index 2921a184d..dc9e0e823 100644 --- a/src/VBox/Installer/linux/sh-utils.sh +++ b/src/VBox/Installer/linux/sh-utils.sh @@ -1,4 +1,4 @@ -# $Id: sh-utils.sh 36779 2011-04-20 20:55:49Z vboxsync $ +# $Id: sh-utils.sh $ # Shell script include file ## @file # Shell script routines which are likely to be useful for different scripts diff --git a/src/VBox/Installer/linux/testcase/Makefile.kmk b/src/VBox/Installer/linux/testcase/Makefile.kmk index ebfddc08f..07c64678b 100644 --- a/src/VBox/Installer/linux/testcase/Makefile.kmk +++ b/src/VBox/Installer/linux/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38093 2011-07-21 12:45:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Linux installer testcase. # diff --git a/src/VBox/Installer/linux/testcase/tstInstaller.sh b/src/VBox/Installer/linux/testcase/tstInstaller.sh index 094321e08..094321e08 100644..100755 --- a/src/VBox/Installer/linux/testcase/tstInstaller.sh +++ b/src/VBox/Installer/linux/testcase/tstInstaller.sh diff --git a/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh b/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh index 194a1c9a3..194a1c9a3 100644..100755 --- a/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh +++ b/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh diff --git a/src/VBox/Installer/linux/uninstall.sh b/src/VBox/Installer/linux/uninstall.sh index 26dc0fcae..26dc0fcae 100644..100755 --- a/src/VBox/Installer/linux/uninstall.sh +++ b/src/VBox/Installer/linux/uninstall.sh diff --git a/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in b/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in index 488fd238f..488fd238f 100644..100755 --- a/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in +++ b/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in diff --git a/src/VBox/Installer/linux/vboxdrv.sh.in b/src/VBox/Installer/linux/vboxdrv.sh.in index 9846cdb3c..da9fe5ed1 100644..100755 --- a/src/VBox/Installer/linux/vboxdrv.sh.in +++ b/src/VBox/Installer/linux/vboxdrv.sh.in @@ -14,7 +14,7 @@ # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. # -# chkconfig: 35 30 70 +# chkconfig: 35 20 80 # description: VirtualBox Linux kernel module # ### BEGIN INIT INFO diff --git a/src/VBox/Installer/linux/vboxweb-service.sh.in b/src/VBox/Installer/linux/vboxweb-service.sh.in index dfd9605eb..dfd9605eb 100644..100755 --- a/src/VBox/Installer/linux/vboxweb-service.sh.in +++ b/src/VBox/Installer/linux/vboxweb-service.sh.in diff --git a/src/VBox/Installer/solaris/Makefile.kmk b/src/VBox/Installer/solaris/Makefile.kmk index cb4bc97f0..8e78fcadd 100644 --- a/src/VBox/Installer/solaris/Makefile.kmk +++ b/src/VBox/Installer/solaris/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38135 2011-07-25 09:09:08Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Solaris installer. # @@ -58,10 +58,11 @@ SOLARIS_OUT_BIN_64 := $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin SOLARIS_OUT_BIN_32 := $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin SOLARIS_OUT_BIN := $(PATH_STAGE_BIN) -SOLARIS_DBG_DIR := $(PATH_TARGET)/Installer/DebugPkg +SOLARIS_DBG_DIR_NAME := DebugPkg +SOLARIS_DBG_DIR := $(SOLARIS_INST_OUT_DIR)/$(SOLARIS_DBG_DIR_NAME) SOLARIS_DBG_DIR_32 := $(SOLARIS_DBG_DIR)/$(SOLARIS_DIR_NAME_32) SOLARIS_DBG_DIR_64 := $(SOLARIS_DBG_DIR)/$(SOLARIS_DIR_NAME_64) -SOLARIS_VBI_DIR := $(PATH_TARGET)/Installer/KernelPkg +SOLARIS_VBI_DIR := $(SOLARIS_INST_OUT_DIR)/KernelPkg ifeq ($(KBUILD_TARGET_ARCH),amd64) SOLARIS_VBOXINST_DIR_ISA := $(SOLARIS_VBOXINST_DIR_64) @@ -605,6 +606,10 @@ ifdef VBOX_WITH_COMBINED_PACKAGE $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../rdesktop-vrdp-keymaps $(SOLARIS_VBOXINST_DIR_64)/rdesktop-vrdp-keymaps,) $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../additions $(SOLARIS_VBOXINST_DIR_32)/additions,) $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../additions $(SOLARIS_VBOXINST_DIR_64)/additions,) + $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI32.fd $(SOLARIS_VBOXINST_DIR_32)/,) + $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI32.fd $(SOLARIS_VBOXINST_DIR_64)/,) + $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI64.fd $(SOLARIS_VBOXINST_DIR_32)/,) + $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI64.fd $(SOLARIS_VBOXINST_DIR_64)/,) 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,) @@ -618,6 +623,8 @@ else $(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,) + $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI32.fd $(SOLARIS_VBOXINST_DIR_ISA)/,) + $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../VBoxEFI64.fd $(SOLARIS_VBOXINST_DIR_ISA)/,) endif $(QUIET)$(LN_SYMLINK) -f ./pkginstall.sh $(SOLARIS_VBOXINST_DIR)/ipsinstall.sh $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../../$(SOLARIS_VBOXINST_SUBDIR)/VBox.sh $(SOLARIS_USRBIN_DIR)/VBoxQtconfig,) @@ -833,7 +840,8 @@ $(PATH_STAGE_BIN)/$(DBG_ARCHIVE): \ $(SOLARIS_DBG_DEPFILES) $(call MSG_L1,Installing debug binaries $(SOLARIS_DBG_DIR)) $(call MSG_L1,Packing $@) - $(QUIET)/usr/sfw/bin/gtar --owner 0 --group 0 -cjRhf $(PATH_STAGE_BIN)/$(DBG_ARCHIVE) -C $(SOLARIS_DBG_DIR) $(SOLARIS_DBG_DEPFILES) + $(QUIET)/usr/sfw/bin/gtar --dereference --owner 0 --group 0 \ + -cjRhf "$(PATH_STAGE_BIN)/$(DBG_ARCHIVE)" -C "$(SOLARIS_INST_OUT_DIR)" "$(SOLARIS_DBG_DIR_NAME)" $(QUIET)$(CHMOD) 0644 $@ # diff --git a/src/VBox/Installer/solaris/VBoxISAExec.c b/src/VBox/Installer/solaris/VBoxISAExec.c index db5f341e6..97f8ad9fc 100644 --- a/src/VBox/Installer/solaris/VBoxISAExec.c +++ b/src/VBox/Installer/solaris/VBoxISAExec.c @@ -1,4 +1,4 @@ -/* $Id: VBoxISAExec.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxISAExec.c $ */ /** @file * VBoxISAExec, ISA exec wrapper, Solaris hosts. */ diff --git a/src/VBox/Installer/solaris/VBoxZoneAccess.c b/src/VBox/Installer/solaris/VBoxZoneAccess.c index e8d9174e8..a77f32cb4 100644 --- a/src/VBox/Installer/solaris/VBoxZoneAccess.c +++ b/src/VBox/Installer/solaris/VBoxZoneAccess.c @@ -1,4 +1,4 @@ -/* $Id: VBoxZoneAccess.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxZoneAccess.c $ */ /** @file * VBoxZoneAccess - Hack that keeps vboxdrv referenced for granting zone access, Solaris hosts. */ diff --git a/src/VBox/Installer/solaris/checkinstall.sh b/src/VBox/Installer/solaris/checkinstall.sh index 040ce57df..040ce57df 100644..100755 --- a/src/VBox/Installer/solaris/checkinstall.sh +++ b/src/VBox/Installer/solaris/checkinstall.sh diff --git a/src/VBox/Installer/solaris/makepackage.sh b/src/VBox/Installer/solaris/makepackage.sh index 113ad5d3a..113ad5d3a 100644..100755 --- a/src/VBox/Installer/solaris/makepackage.sh +++ b/src/VBox/Installer/solaris/makepackage.sh diff --git a/src/VBox/Installer/solaris/pkginstall.sh b/src/VBox/Installer/solaris/pkginstall.sh index 49aea0cff..49aea0cff 100644..100755 --- a/src/VBox/Installer/solaris/pkginstall.sh +++ b/src/VBox/Installer/solaris/pkginstall.sh diff --git a/src/VBox/Installer/solaris/postinstall.sh b/src/VBox/Installer/solaris/postinstall.sh index 1dbfa2bde..1dbfa2bde 100644..100755 --- a/src/VBox/Installer/solaris/postinstall.sh +++ b/src/VBox/Installer/solaris/postinstall.sh diff --git a/src/VBox/Installer/solaris/preremove.sh b/src/VBox/Installer/solaris/preremove.sh index a0ab4b528..a0ab4b528 100644..100755 --- a/src/VBox/Installer/solaris/preremove.sh +++ b/src/VBox/Installer/solaris/preremove.sh diff --git a/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh b/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh index dfcd835cc..9b4ee5b05 100755 --- a/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh +++ b/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh @@ -1,5 +1,5 @@ #!/sbin/sh -# $Id: smf-vboxballoonctrl.sh 36748 2011-04-20 11:24:54Z vboxsync $ +# $Id: smf-vboxballoonctrl.sh $ # Copyright (C) 2008-2011 Oracle Corporation # diff --git a/src/VBox/Installer/solaris/smf-vboxwebsrv.sh b/src/VBox/Installer/solaris/smf-vboxwebsrv.sh index c03201036..9a5b57d8f 100755 --- a/src/VBox/Installer/solaris/smf-vboxwebsrv.sh +++ b/src/VBox/Installer/solaris/smf-vboxwebsrv.sh @@ -1,5 +1,5 @@ #!/sbin/sh -# $Id: smf-vboxwebsrv.sh 36748 2011-04-20 11:24:54Z vboxsync $ +# $Id: smf-vboxwebsrv.sh $ # Copyright (C) 2008-2011 Oracle Corporation # diff --git a/src/VBox/Installer/solaris/vbi/makepackage.sh b/src/VBox/Installer/solaris/vbi/makepackage.sh index 60689207d..60689207d 100644..100755 --- a/src/VBox/Installer/solaris/vbi/makepackage.sh +++ b/src/VBox/Installer/solaris/vbi/makepackage.sh diff --git a/src/VBox/Installer/solaris/vbi/preremove.sh b/src/VBox/Installer/solaris/vbi/preremove.sh index f1e0b750e..f1e0b750e 100644..100755 --- a/src/VBox/Installer/solaris/vbi/preremove.sh +++ b/src/VBox/Installer/solaris/vbi/preremove.sh diff --git a/src/VBox/Installer/solaris/vboxconfig.sh b/src/VBox/Installer/solaris/vboxconfig.sh index 5da68cf47..aba6c5086 100644..100755 --- a/src/VBox/Installer/solaris/vboxconfig.sh +++ b/src/VBox/Installer/solaris/vboxconfig.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: vboxconfig.sh 38016 2011-07-18 13:06:11Z vboxsync $ +# $Id: vboxconfig.sh $ # # VirtualBox Configuration Script, Solaris host. diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk index 5271e49ef..c8c5af739 100644 --- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk +++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxInstallHelper.dll. # diff --git a/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp b/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp index a7fb8450f..78e999f17 100644 --- a/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp +++ b/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp @@ -1,10 +1,10 @@ -/* $Id: VBoxCommon.cpp 37289 2011-06-01 11:59:23Z vboxsync $ */ +/* $Id: VBoxCommon.cpp $ */ /** @file * VBoxCommon - Misc helper routines for install helper. */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -15,6 +15,10 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ + +/******************************************************************************* +* Header Files * +*******************************************************************************/ #include <windows.h> #include <tchar.h> #include <stdio.h> @@ -23,39 +27,37 @@ #include <msiquery.h> -#if (_MSC_VER < 1400) /* Provide _stprintf_s to VC < 8.0. */ -int _stprintf_s(TCHAR *buffer, size_t cbBuffer, const TCHAR *format, ...) +#if (_MSC_VER < 1400) /* Provide swprintf_s to VC < 8.0. */ +int swprintf_s(WCHAR *buffer, size_t cbBuffer, const WCHAR *format, ...) { int ret; - va_list args; - va_start(args, format); - ret = _vsntprintf(buffer, cbBuffer, format, args); - va_end(args); + va_list va; + va_start(va, format); + ret = _vsnwprintf(buffer, cbBuffer, format, va); + va_end(va); return ret; } #endif -UINT VBoxGetProperty(MSIHANDLE a_hModule, TCHAR* a_pszName, TCHAR* a_pValue, DWORD a_dwSize) +UINT VBoxGetProperty(MSIHANDLE a_hModule, WCHAR *a_pwszName, WCHAR *a_pwszValue, DWORD a_dwSize) { - UINT uiRet = ERROR_SUCCESS; DWORD dwBuffer = 0; - - uiRet = MsiGetProperty(a_hModule, a_pszName, TEXT(""), &dwBuffer); - if (ERROR_MORE_DATA == uiRet) + UINT uiRet = MsiGetPropertyW(a_hModule, a_pwszName, L"", &dwBuffer); + if (uiRet == ERROR_MORE_DATA) { ++dwBuffer; /* On output does not include terminating null, so add 1. */ if (dwBuffer > a_dwSize) return ERROR_MORE_DATA; - ZeroMemory(a_pValue, a_dwSize); - uiRet = MsiGetProperty(a_hModule, a_pszName, a_pValue, &dwBuffer); + ZeroMemory(a_pwszValue, a_dwSize); + uiRet = MsiGetPropertyW(a_hModule, a_pwszName, a_pwszValue, &dwBuffer); } return uiRet; } -UINT VBoxSetProperty(MSIHANDLE a_hModule, TCHAR* a_pszName, TCHAR* a_pValue) +UINT VBoxSetProperty(MSIHANDLE a_hModule, WCHAR *a_pwszName, WCHAR *a_pwszValue) { - return MsiSetProperty(a_hModule, a_pszName, a_pValue); + return MsiSetPropertyW(a_hModule, a_pwszName, a_pwszValue); } diff --git a/src/VBox/Installer/win/InstallHelper/VBoxCommon.h b/src/VBox/Installer/win/InstallHelper/VBoxCommon.h index 2adb275e8..b526193ac 100644 --- a/src/VBox/Installer/win/InstallHelper/VBoxCommon.h +++ b/src/VBox/Installer/win/InstallHelper/VBoxCommon.h @@ -1,10 +1,10 @@ -/* $Id: VBoxCommon.h 32112 2010-08-31 08:44:09Z vboxsync $ */ +/* $Id: VBoxCommon.h $ */ /** @file * VBoxCommon - Misc helper routines for install helper. */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -19,11 +19,11 @@ #define ___VBoxInstallHelper_Common_h #if (_MSC_VER < 1400) /* Provide _stprintf_s to VC < 8.0. */ -int _stprintf_s(TCHAR *buffer, size_t cbBuffer, const TCHAR *format, ...); +int swprintf_s(WCHAR *buffer, size_t cbBuffer, const WCHAR *format, ...); #endif -UINT VBoxGetProperty(MSIHANDLE a_hModule, TCHAR *a_pszName, TCHAR *a_pValue, DWORD a_dwSize); -UINT VBoxSetProperty(MSIHANDLE a_hModule, TCHAR *a_pszName, TCHAR *a_pValue); +UINT VBoxGetProperty(MSIHANDLE a_hModule, WCHAR *a_pwszName, WCHAR *a_pwszValue, DWORD a_dwSize); +UINT VBoxSetProperty(MSIHANDLE a_hModule, WCHAR *a_pwszName, WCHAR *a_pwszValue); #endif /* !___VBoxInstallHelper_Common_h */ diff --git a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp index e564add60..6e52b7fea 100644 --- a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp +++ b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxInstallHelper.cpp 37765 2011-07-04 13:54:00Z vboxsync $ */ +/* $Id: VBoxInstallHelper.cpp $ */ /** @file * VBoxInstallHelper - Various helper routines for Windows host installer. */ @@ -15,6 +15,10 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ + +/******************************************************************************* +* Header Files * +*******************************************************************************/ #ifdef VBOX_WITH_NETFLT # include "VBox/VBoxNetCfg-win.h" # include "VBox/VBoxDrvCfg-win.h" @@ -23,7 +27,7 @@ #include <VBox/version.h> #include <windows.h> -#include <tchar.h> +#include <wchar.h> #include <stdio.h> #include <msi.h> @@ -47,12 +51,20 @@ # include "internal/VBoxSerial.h" #endif + +/******************************************************************************* +* Header Files * +*******************************************************************************/ #ifdef DEBUG # define Assert(_expr) assert(_expr) #else # define Assert(_expr) do{ }while(0) #endif +#define MY_WTEXT_HLP(a_str) L##a_str +#define MY_WTEXT(a_str) MY_WTEXT_HLP(a_str) + + BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) @@ -60,34 +72,34 @@ BOOL APIENTRY DllMain(HANDLE hModule, return TRUE; } -static void LogString(MSIHANDLE hInstall, LPCSTR szString, ...) +static void logString(MSIHANDLE hInstall, LPCSTR szString, ...) { PMSIHANDLE newHandle = MsiCreateRecord(2); - char szBuffer[1024] = {0}; - va_list pArgList; - va_start(pArgList, szString); - _vsnprintf(szBuffer, sizeof(szBuffer) / sizeof(char), szString, pArgList); - va_end(pArgList); + char szBuffer[1024]; + va_list va; + va_start(va, szString); + _vsnprintf(szBuffer, sizeof(szBuffer), szString, va); + va_end(va); MsiRecordSetStringA(newHandle, 0, szBuffer); MsiProcessMessage(hInstall, INSTALLMESSAGE(INSTALLMESSAGE_INFO), newHandle); MsiCloseHandle(newHandle); -#ifdef DEBUG +#if 0/*def DEBUG - wrong? What does '%s' expect, wchar or char? */ _tprintf(_T("Debug: %s\n"), szBuffer); #endif } -static void LogStringW(MSIHANDLE hInstall, LPCWSTR szString, ...) +static void logStringW(MSIHANDLE hInstall, LPCWSTR pwszString, ...) { PMSIHANDLE newHandle = MsiCreateRecord(2); - TCHAR szBuffer[1024] = {0}; - va_list pArgList; - va_start(pArgList, szString); - _vsnwprintf(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), szString, pArgList); - va_end(pArgList); + WCHAR szBuffer[1024]; + va_list va; + va_start(va, pwszString); + _vsnwprintf(szBuffer, RT_ELEMENTS(szBuffer), pwszString, va); + va_end(va); MsiRecordSetStringW(newHandle, 0, szBuffer); MsiProcessMessage(hInstall, INSTALLMESSAGE(INSTALLMESSAGE_INFO), newHandle); @@ -111,10 +123,10 @@ UINT __stdcall CheckSerial(MSIHANDLE hModule) } DWORD Exec(MSIHANDLE hModule, - const TCHAR *pszAppName, TCHAR *pszCmdLine, const TCHAR *pszWorkDir, + const WCHAR *pwszAppName, WCHAR *pwszCmdLine, const WCHAR *pwszWorkDir, DWORD *pdwExitCode) { - STARTUPINFO si; + STARTUPINFOW si; PROCESS_INFORMATION pi; DWORD rc = ERROR_SUCCESS; @@ -127,23 +139,23 @@ DWORD Exec(MSIHANDLE hModule, si.cb = sizeof(si); ZeroMemory(&pi, sizeof(pi)); - LogStringW(hModule, TEXT("Executing command line: %s %s (Working Dir: %s)"), - pszAppName, pszCmdLine, pszWorkDir == NULL ? L"Current" : pszWorkDir); + logStringW(hModule, L"Executing command line: %s %s (Working Dir: %s)", + pwszAppName, pwszCmdLine, pwszWorkDir == NULL ? L"Current" : pwszWorkDir); SetLastError(0); - if (!CreateProcess(pszAppName, /* Module name. */ - pszCmdLine, /* Command line. */ - NULL, /* Process handle not inheritable. */ - NULL, /* Thread handle not inheritable. */ - FALSE, /* Set handle inheritance to FALSE .*/ - 0, /* No creation flags. */ - NULL, /* Use parent's environment block. */ - pszWorkDir, /* Use parent's starting directory. */ - &si, /* Pointer to STARTUPINFO structure. */ - &pi)) /* Pointer to PROCESS_INFORMATION structure. */ + if (!CreateProcessW(pwszAppName, /* Module name. */ + pwszCmdLine, /* Command line. */ + NULL, /* Process handle not inheritable. */ + NULL, /* Thread handle not inheritable. */ + FALSE, /* Set handle inheritance to FALSE .*/ + 0, /* No creation flags. */ + NULL, /* Use parent's environment block. */ + pwszWorkDir, /* Use parent's starting directory. */ + &si, /* Pointer to STARTUPINFO structure. */ + &pi)) /* Pointer to PROCESS_INFORMATION structure. */ { rc = GetLastError(); - LogStringW(hModule, TEXT("Executing command line: CreateProcess() failed! Error: %ld"), rc); + logStringW(hModule, L"Executing command line: CreateProcess() failed! Error: %ld", rc); return rc; } @@ -151,14 +163,14 @@ DWORD Exec(MSIHANDLE hModule, if (WAIT_FAILED == WaitForSingleObject(pi.hProcess, 30 * 1000 /* Wait 30 secs max. */)) { rc = GetLastError(); - LogStringW(hModule, TEXT("Executing command line: WaitForSingleObject() failed! Error: %ld"), rc); + logStringW(hModule, L"Executing command line: WaitForSingleObject() failed! Error: %u", rc); } else { if (!GetExitCodeProcess(pi.hProcess, pdwExitCode)) { rc = GetLastError(); - LogStringW(hModule, TEXT("Executing command line: GetExitCodeProcess() failed! Error: %ld"), rc); + logStringW(hModule, L"Executing command line: GetExitCodeProcess() failed! Error: %u", rc); } } @@ -166,155 +178,152 @@ DWORD Exec(MSIHANDLE hModule, CloseHandle(pi.hProcess); CloseHandle(pi.hThread); - LogStringW(hModule, TEXT("Executing command returned: %ld (exit code %ld)"), rc, *pdwExitCode); + logStringW(hModule, L"Executing command returned: %u (exit code %u)", rc, *pdwExitCode); return rc; } UINT __stdcall InstallPythonAPI(MSIHANDLE hModule) { - LogStringW(hModule, TEXT("InstallPythonAPI: Checking for installed Python environment ...")); + logStringW(hModule, L"InstallPythonAPI: Checking for installed Python environment ..."); HKEY hkPythonCore = NULL; BOOL bFound = FALSE; - LONG rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Python\\PythonCore", 0, KEY_READ, &hkPythonCore); + LONG rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Python\\PythonCore", 0, KEY_READ, &hkPythonCore); if (rc != ERROR_SUCCESS) { - LogStringW(hModule, TEXT("InstallPythonAPI: Python seems not to be installed.")); + logStringW(hModule, L"InstallPythonAPI: Python seems not to be installed."); return ERROR_SUCCESS; } - TCHAR szPath[MAX_PATH] = { 0 }; - TCHAR szVal[MAX_PATH] = { 0 }; + WCHAR wszPath[MAX_PATH] = { 0 }; + WCHAR wszVal[MAX_PATH] = { 0 }; for (int i = 0;; ++i) { - TCHAR szRoot[MAX_PATH] = { 0 }; - DWORD dwLen = sizeof (szPath); + WCHAR wszRoot[MAX_PATH] = { 0 }; + DWORD dwLen = sizeof(wszPath); DWORD dwKeyType = REG_SZ; - rc = RegEnumKeyEx(hkPythonCore, i, szRoot, &dwLen, NULL, NULL, NULL, NULL); + rc = RegEnumKeyExW(hkPythonCore, i, wszRoot, &dwLen, NULL, NULL, NULL, NULL); if (rc != ERROR_SUCCESS || dwLen <= 0) break; - _stprintf_s(szPath, sizeof(szPath) / sizeof(TCHAR), L"%s\\InstallPath", szRoot); - dwLen = sizeof(szVal); + swprintf_s(wszPath, RT_ELEMENTS(wszPath), L"%s\\InstallPath", wszRoot); + dwLen = sizeof(wszVal); HKEY hkPythonInstPath = NULL; - rc = RegOpenKeyEx(hkPythonCore, szPath, 0, KEY_READ, &hkPythonInstPath); + rc = RegOpenKeyExW(hkPythonCore, wszPath, 0, KEY_READ, &hkPythonInstPath); if (rc != ERROR_SUCCESS) continue; - rc = RegQueryValueEx(hkPythonInstPath, L"", NULL, &dwKeyType, (LPBYTE)szVal, &dwLen); + rc = RegQueryValueExW(hkPythonInstPath, L"", NULL, &dwKeyType, (LPBYTE)wszVal, &dwLen); if (rc == ERROR_SUCCESS) - LogStringW(hModule, TEXT("InstallPythonAPI: Path \"%s\" detected."), szVal); + logStringW(hModule, L"InstallPythonAPI: Path \"%s\" detected.", wszVal); RegCloseKey(hkPythonInstPath); } RegCloseKey(hkPythonCore); /* Python path found? */ - TCHAR szExec[MAX_PATH] = { 0 }; - TCHAR szCmdLine[MAX_PATH] = { 0 }; + WCHAR wszExec[MAX_PATH] = { 0 }; + WCHAR wszCmdLine[MAX_PATH] = { 0 }; DWORD dwExitCode = 0; - if (_tcslen(szVal) > 0) + if (wcslen(wszVal) > 0) { /* Cool, check for installed Win32 extensions. */ - LogStringW(hModule, TEXT("InstallPythonAPI: Python installed. Checking for Win32 extensions ...")); - _stprintf_s(szExec, sizeof(szExec) / sizeof(TCHAR), L"%s\\python.exe", szVal); - _stprintf_s(szCmdLine, sizeof(szCmdLine) / sizeof(TCHAR), L"%s\\python.exe -c \"import win32api\"", szVal); + logStringW(hModule, L"InstallPythonAPI: Python installed. Checking for Win32 extensions ..."); + swprintf_s(wszExec, RT_ELEMENTS(wszExec), L"%s\\python.exe", wszVal); + swprintf_s(wszCmdLine, RT_ELEMENTS(wszCmdLine), L"%s\\python.exe -c \"import win32api\"", wszVal); - DWORD dwRetExec = Exec(hModule, szExec, szCmdLine, NULL, &dwExitCode); + DWORD dwRetExec = Exec(hModule, wszExec, wszCmdLine, NULL, &dwExitCode); if ( (ERROR_SUCCESS == dwRetExec) && ( 0 == dwExitCode)) { /* Did we get the correct error level (=0)? */ - LogStringW(hModule, TEXT("InstallPythonAPI: Win32 extensions installed.")); + logStringW(hModule, L"InstallPythonAPI: Win32 extensions installed."); bFound = TRUE; } else - LogStringW(hModule, TEXT("InstallPythonAPI: Win32 extensions not found.")); + logStringW(hModule, L"InstallPythonAPI: Win32 extensions not found."); } BOOL bInstalled = FALSE; if (bFound) /* Is Python and all required stuff installed? */ { /* Get the VBoxAPI setup string. */ - TCHAR szPathTargetDir[MAX_PATH] = {0}; - VBoxGetProperty(hModule, L"CustomActionData", szPathTargetDir, sizeof(szPathTargetDir)); - if (_tcslen(szPathTargetDir)) + WCHAR wszPathTargetDir[MAX_PATH] = {0}; + VBoxGetProperty(hModule, L"CustomActionData", wszPathTargetDir, sizeof(wszPathTargetDir)); + if (wcslen(wszPathTargetDir)) { /* Set final path. */ - _stprintf_s(szPath, sizeof(szPath) / sizeof(TCHAR), L"%s\\sdk\\install", szPathTargetDir); + swprintf_s(wszPath, RT_ELEMENTS(wszPath), L"%s\\sdk\\install", wszPathTargetDir); /* Install our API module. */ - _stprintf_s(szCmdLine, sizeof(szCmdLine) / sizeof(TCHAR), L"%s\\python.exe vboxapisetup.py install", szVal); + swprintf_s(wszCmdLine, RT_ELEMENTS(wszCmdLine), L"%s\\python.exe vboxapisetup.py install", wszVal); /* Set required environment variables. */ - if (!SetEnvironmentVariable(L"VBOX_INSTALL_PATH", szPathTargetDir)) - { - LogStringW(hModule, TEXT("InstallPythonAPI: Could set environment variable VBOX_INSTALL_PATH!")); - } + if (!SetEnvironmentVariableW(L"VBOX_INSTALL_PATH", wszPathTargetDir)) + logStringW(hModule, L"InstallPythonAPI: Could set environment variable VBOX_INSTALL_PATH!"); else { - DWORD dwRetExec = Exec(hModule, szExec, szCmdLine, szPath, &dwExitCode); + DWORD dwRetExec = Exec(hModule, wszExec, wszCmdLine, wszPath, &dwExitCode); if ( (ERROR_SUCCESS == dwRetExec) && ( 0 == dwExitCode)) { /* All done! */ - LogStringW(hModule, TEXT("InstallPythonAPI: VBoxAPI for Python successfully installed.")); + logStringW(hModule, L"InstallPythonAPI: VBoxAPI for Python successfully installed."); bInstalled = TRUE; } else { if (dwRetExec) - LogStringW(hModule, TEXT("InstallPythonAPI: Error while executing installation of VBox API: %ld"), dwRetExec); + logStringW(hModule, L"InstallPythonAPI: Error while executing installation of VBox API: %ld", dwRetExec); else - LogStringW(hModule, TEXT("InstallPythonAPI: Python reported an error while installing VBox API: %ld"), dwExitCode); + logStringW(hModule, L"InstallPythonAPI: Python reported an error while installing VBox API: %ld", dwExitCode); } } } else - LogStringW(hModule, TEXT("InstallPythonAPI: Unable to retrieve VBox installation path!")); + logStringW(hModule, L"InstallPythonAPI: Unable to retrieve VBox installation path!"); } VBoxSetProperty(hModule, L"PYTHON_INSTALLED", bInstalled ? L"1" : L"0"); if (!bInstalled) - LogStringW(hModule, TEXT("InstallPythonAPI: VBox API not installed.")); + logStringW(hModule, L"InstallPythonAPI: VBox API not installed."); return ERROR_SUCCESS; /* Do not fail here. */ } -static LONG InstallBrandingValue(MSIHANDLE hModule, - const TCHAR* pszFileName, - const TCHAR* pszSection, - const TCHAR* pszValue) +static LONG installBrandingValue(MSIHANDLE hModule, + const WCHAR *pwszFileName, + const WCHAR *pwszSection, + const WCHAR *pwszValue) { LONG rc; - TCHAR szValue[_MAX_PATH]; - if (GetPrivateProfileString(pszSection, pszValue, NULL, - szValue, sizeof(szValue), pszFileName) > 0) + WCHAR wszValue[_MAX_PATH]; + if (GetPrivateProfileStringW(pwszSection, pwszValue, NULL, + wszValue, sizeof(wszValue), pwszFileName) > 0) { HKEY hkBranding; - TCHAR szKey[_MAX_PATH]; + WCHAR wszKey[_MAX_PATH]; - if (wcsicmp(L"General", pszSection) != 0) - _stprintf_s(szKey, sizeof(szKey) / sizeof(TCHAR), L"SOFTWARE\\%s\\VirtualBox\\Branding\\", VBOX_VENDOR_SHORT, pszSection); + if (wcsicmp(L"General", pwszSection) != 0) + swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%s\\VirtualBox\\Branding\\", VBOX_VENDOR_SHORT, pwszSection); else - _stprintf_s(szKey, sizeof(szKey) / sizeof(TCHAR), L"SOFTWARE\\%s\\VirtualBox\\Branding", VBOX_VENDOR_SHORT); + swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%s\\VirtualBox\\Branding", VBOX_VENDOR_SHORT); - rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, - 0, KEY_WRITE, &hkBranding); + rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszKey, 0, KEY_WRITE, &hkBranding); if (rc == ERROR_SUCCESS) { - rc = RegSetValueEx(hkBranding, - pszValue, - NULL, - REG_SZ, - (BYTE*)szValue, - (DWORD)wcslen(szValue)); + rc = RegSetValueExW(hkBranding, + pwszValue, + NULL, + REG_SZ, + (BYTE *)wszValue, + (DWORD)wcslen(wszValue)); if (rc != ERROR_SUCCESS) - LogStringW(hModule, TEXT("InstallBranding: Could not write value %s! Error %ld"), pszValue, rc); + logStringW(hModule, L"InstallBranding: Could not write value %s! Error %ld", pwszValue, rc); RegCloseKey (hkBranding); } } @@ -323,31 +332,30 @@ static LONG InstallBrandingValue(MSIHANDLE hModule, return rc; } -UINT CopyDir(MSIHANDLE hModule, const TCHAR *pszDestDir, const TCHAR *pszSourceDir) +UINT CopyDir(MSIHANDLE hModule, const WCHAR *pwszDestDir, const WCHAR *pwszSourceDir) { UINT rc; - TCHAR szDest[_MAX_PATH + 1]; - TCHAR szSource[_MAX_PATH + 1]; + WCHAR wszDest[_MAX_PATH + 1]; + WCHAR wszSource[_MAX_PATH + 1]; - _stprintf_s(szDest, sizeof(szDest) / sizeof(TCHAR), L"%s%c", pszDestDir, '\0'); - _stprintf_s(szSource, sizeof(szSource) / sizeof(TCHAR), L"%s%c", pszSourceDir, '\0'); + swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, '\0'); + swprintf_s(wszSource, RT_ELEMENTS(wszSource), L"%s%c", pwszSourceDir, '\0'); - SHFILEOPSTRUCT s = {0}; + SHFILEOPSTRUCTW s = {0}; s.hwnd = NULL; s.wFunc = FO_COPY; - s.pTo = szDest; - s.pFrom = szSource; + s.pTo = wszDest; + s.pFrom = wszSource; s.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI; - LogStringW(hModule, TEXT("CopyDir: DestDir=%s, SourceDir=%s"), - szDest, szSource); - int r = SHFileOperation(&s); + logStringW(hModule, L"CopyDir: DestDir=%s, SourceDir=%s", wszDest, wszSource); + int r = SHFileOperationW(&s); if (r != 0) { - LogStringW(hModule, TEXT("CopyDir: Copy operation returned status 0x%x"), r); + logStringW(hModule, L"CopyDir: Copy operation returned status 0x%x", r); rc = ERROR_GEN_FAILURE; } else @@ -355,27 +363,27 @@ UINT CopyDir(MSIHANDLE hModule, const TCHAR *pszDestDir, const TCHAR *pszSourceD return rc; } -UINT RemoveDir(MSIHANDLE hModule, const TCHAR *pszDestDir) +UINT RemoveDir(MSIHANDLE hModule, const WCHAR *pwszDestDir) { UINT rc; - TCHAR szDest[_MAX_PATH + 1]; + WCHAR wszDest[_MAX_PATH + 1]; - _stprintf_s(szDest, sizeof(szDest) / sizeof(TCHAR), L"%s%c", pszDestDir, '\0'); + swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, '\0'); - SHFILEOPSTRUCT s = {0}; + SHFILEOPSTRUCTW s = {0}; s.hwnd = NULL; s.wFunc = FO_DELETE; - s.pFrom = szDest; - s.fFlags = FOF_SILENT | - FOF_NOCONFIRMATION | - FOF_NOCONFIRMMKDIR | - FOF_NOERRORUI; - - LogStringW(hModule, TEXT("RemoveDir: DestDir=%s"), szDest); - int r = SHFileOperation(&s); + s.pFrom = wszDest; + s.fFlags = FOF_SILENT + | FOF_NOCONFIRMATION + | FOF_NOCONFIRMMKDIR + | FOF_NOERRORUI; + + logStringW(hModule, L"RemoveDir: DestDir=%s", wszDest); + int r = SHFileOperationW(&s); if (r != 0) { - LogStringW(hModule, TEXT("RemoveDir: Remove operation returned status 0x%x"), r); + logStringW(hModule, L"RemoveDir: Remove operation returned status 0x%x", r); rc = ERROR_GEN_FAILURE; } else @@ -383,31 +391,30 @@ UINT RemoveDir(MSIHANDLE hModule, const TCHAR *pszDestDir) return rc; } -UINT RenameDir(MSIHANDLE hModule, const TCHAR *pszDestDir, const TCHAR *pszSourceDir) +UINT RenameDir(MSIHANDLE hModule, const WCHAR *pwszDestDir, const WCHAR *pwszSourceDir) { UINT rc; - TCHAR szDest[_MAX_PATH + 1]; - TCHAR szSource[_MAX_PATH + 1]; + WCHAR wszDest[_MAX_PATH + 1]; + WCHAR wszSource[_MAX_PATH + 1]; - _stprintf_s(szDest, sizeof(szDest) / sizeof(TCHAR), L"%s%c", pszDestDir, '\0'); - _stprintf_s(szSource, sizeof(szSource) / sizeof(TCHAR), L"%s%c", pszSourceDir, '\0'); + swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, '\0'); + swprintf_s(wszSource, RT_ELEMENTS(wszSource), L"%s%c", pwszSourceDir, '\0'); - SHFILEOPSTRUCT s = {0}; + SHFILEOPSTRUCTW s = {0}; s.hwnd = NULL; s.wFunc = FO_RENAME; - s.pTo = szDest; - s.pFrom = szSource; - s.fFlags = FOF_SILENT | - FOF_NOCONFIRMATION | - FOF_NOCONFIRMMKDIR | - FOF_NOERRORUI; - - LogStringW(hModule, TEXT("RenameDir: DestDir=%s, SourceDir=%s"), - szDest, szSource); - int r = SHFileOperation(&s); + s.pTo = wszDest; + s.pFrom = wszSource; + s.fFlags = FOF_SILENT + | FOF_NOCONFIRMATION + | FOF_NOCONFIRMMKDIR + | FOF_NOERRORUI; + + logStringW(hModule, L"RenameDir: DestDir=%s, SourceDir=%s", wszDest, wszSource); + int r = SHFileOperationW(&s); if (r != 0) { - LogStringW(hModule, TEXT("RenameDir: Rename operation returned status 0x%x"), r); + logStringW(hModule, L"RenameDir: Rename operation returned status 0x%x", r); rc = ERROR_GEN_FAILURE; } else @@ -418,60 +425,65 @@ UINT RenameDir(MSIHANDLE hModule, const TCHAR *pszDestDir, const TCHAR *pszSourc UINT __stdcall UninstallBranding(MSIHANDLE hModule) { UINT rc; - LogStringW(hModule, TEXT("UninstallBranding: Handling branding file ...")); + logStringW(hModule, L"UninstallBranding: Handling branding file ..."); - TCHAR szPathTargetDir[_MAX_PATH]; - TCHAR szPathDest[_MAX_PATH]; + WCHAR wszPathTargetDir[_MAX_PATH]; + WCHAR wszPathDest[_MAX_PATH]; - rc = VBoxGetProperty(hModule, L"CustomActionData", szPathTargetDir, sizeof(szPathTargetDir)); + rc = VBoxGetProperty(hModule, L"CustomActionData", wszPathTargetDir, sizeof(wszPathTargetDir)); if (rc == ERROR_SUCCESS) { /** @todo Check trailing slash after %s. */ - _stprintf_s(szPathDest, sizeof(szPathDest) / sizeof(TCHAR), L"%scustom", szPathTargetDir); - rc = RemoveDir(hModule, szPathDest); +/** @todo r=bird: using swprintf_s for formatting paths without checking for + * overflow not good. You're dodging the buffer overflow issue only to end up + * with incorrect behavior! (Truncated file/dir names) + * + * This applies almost to all swprintf_s calls in this file!! + */ + swprintf_s(wszPathDest, RT_ELEMENTS(wszPathDest), L"%scustom", wszPathTargetDir); + rc = RemoveDir(hModule, wszPathDest); if (rc != ERROR_SUCCESS) { /* Check for hidden .custom directory and remove it. */ - _stprintf_s(szPathDest, sizeof(szPathDest) / sizeof(TCHAR), L"%s.custom", szPathTargetDir); - rc = RemoveDir(hModule, szPathDest); + swprintf_s(wszPathDest, RT_ELEMENTS(wszPathDest), L"%s.custom", wszPathTargetDir); + rc = RemoveDir(hModule, wszPathDest); } } - LogStringW(hModule, TEXT("UninstallBranding: Handling done.")); + logStringW(hModule, L"UninstallBranding: Handling done. (rc=%u (ignored))", rc); return ERROR_SUCCESS; /* Do not fail here. */ } UINT __stdcall InstallBranding(MSIHANDLE hModule) { UINT rc; - LogStringW(hModule, TEXT("InstallBranding: Handling branding file ...")); + logStringW(hModule, L"InstallBranding: Handling branding file ..."); - TCHAR szPathMSI[_MAX_PATH]; - TCHAR szPathTargetDir[_MAX_PATH]; - - TCHAR szPathSource[_MAX_PATH]; - TCHAR szPathDest[_MAX_PATH]; - - rc = VBoxGetProperty(hModule, L"SOURCEDIR", szPathMSI, sizeof(szPathMSI)); + WCHAR wszPathMSI[_MAX_PATH]; + rc = VBoxGetProperty(hModule, L"SOURCEDIR", wszPathMSI, sizeof(wszPathMSI)); if (rc == ERROR_SUCCESS) { - rc = VBoxGetProperty(hModule, L"CustomActionData", szPathTargetDir, sizeof(szPathTargetDir)); + WCHAR wszPathTargetDir[_MAX_PATH]; + rc = VBoxGetProperty(hModule, L"CustomActionData", wszPathTargetDir, sizeof(wszPathTargetDir)); if (rc == ERROR_SUCCESS) { /** @todo Check for trailing slash after %s. */ - _stprintf_s(szPathDest, sizeof(szPathDest) / sizeof(TCHAR), L"%s", szPathTargetDir); - _stprintf_s(szPathSource, sizeof(szPathSource) / sizeof(TCHAR), L"%s.custom", szPathMSI); - rc = CopyDir(hModule, szPathDest, szPathSource); + WCHAR wszPathDest[_MAX_PATH]; + swprintf_s(wszPathDest, RT_ELEMENTS(wszPathDest), L"%s", wszPathTargetDir); + + WCHAR wszPathSource[_MAX_PATH]; + swprintf_s(wszPathSource, RT_ELEMENTS(wszPathSource), L"%s.custom", wszPathMSI); + rc = CopyDir(hModule, wszPathDest, wszPathSource); if (rc == ERROR_SUCCESS) { - _stprintf_s(szPathDest, sizeof(szPathDest) / sizeof(TCHAR), L"%scustom", szPathTargetDir); - _stprintf_s(szPathSource, sizeof(szPathSource) / sizeof(TCHAR), L"%s.custom", szPathTargetDir); - rc = RenameDir(hModule, szPathDest, szPathSource); + swprintf_s(wszPathDest, RT_ELEMENTS(wszPathDest), L"%scustom", wszPathTargetDir); + swprintf_s(wszPathSource, RT_ELEMENTS(wszPathSource), L"%s.custom", wszPathTargetDir); + rc = RenameDir(hModule, wszPathDest, wszPathSource); } } } - LogStringW(hModule, TEXT("InstallBranding: Handling done.")); + logStringW(hModule, L"InstallBranding: Handling done. (rc=%u (ignored))", rc); return ERROR_SUCCESS; /* Do not fail here. */ } @@ -490,7 +502,7 @@ static MSIHANDLE g_hCurrentModule = NULL; static VOID netCfgLoggerCallback(LPCSTR szString) { if (g_hCurrentModule) - LogString(g_hCurrentModule, szString); + logString(g_hCurrentModule, szString); } static VOID netCfgLoggerDisable() @@ -514,7 +526,7 @@ static VOID netCfgLoggerEnable(MSIHANDLE hModule) VBoxNetCfgWinSetLogging((LOG_ROUTINE)netCfgLoggerCallback); } -static UINT ErrorConvertFromHResult(MSIHANDLE hModule, HRESULT hr) +static UINT errorConvertFromHResult(MSIHANDLE hModule, HRESULT hr) { UINT uRet; switch (hr) @@ -525,16 +537,16 @@ static UINT ErrorConvertFromHResult(MSIHANDLE hModule, HRESULT hr) case NETCFG_S_REBOOT: { - LogStringW(hModule, TEXT("Reboot required, setting REBOOT property to Force")); - HRESULT hr2 = MsiSetProperty(hModule, TEXT("REBOOT"), TEXT("Force")); + logStringW(hModule, L"Reboot required, setting REBOOT property to Force"); + HRESULT hr2 = MsiSetPropertyW(hModule, L"REBOOT", L"Force"); if (hr2 != ERROR_SUCCESS) - LogStringW(hModule, TEXT("Failed to set REBOOT property, error = 0x%x"), hr2); + logStringW(hModule, L"Failed to set REBOOT property, error = 0x%x", hr2); uRet = ERROR_SUCCESS; /* Never fail here. */ break; } default: - LogStringW(hModule, TEXT("Converting unhandled HRESULT (0x%x) to ERROR_GEN_FAILURE"), hr); + logStringW(hModule, L"Converting unhandled HRESULT (0x%x) to ERROR_GEN_FAILURE", hr); uRet = ERROR_GEN_FAILURE; } return uRet; @@ -548,13 +560,13 @@ static MSIHANDLE createNetCfgLockedMsgRecord(MSIHANDLE hModule) UINT uErr = MsiRecordSetInteger(hRecord, 1, 25001); if (uErr != ERROR_SUCCESS) { - LogStringW(hModule, TEXT("createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, error = 0x%x"), uErr); + logStringW(hModule, L"createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, error = 0x%x", uErr); MsiCloseHandle(hRecord); hRecord = NULL; } } else - LogStringW(hModule, TEXT("createNetCfgLockedMsgRecord: Failed to create a record")); + logStringW(hModule, L"createNetCfgLockedMsgRecord: Failed to create a record"); return hRecord; } @@ -573,8 +585,8 @@ static UINT doNetCfgInit(MSIHANDLE hModule, INetCfg **ppnc, BOOL bWrite) if (hr != NETCFG_E_NO_WRITE_LOCK) { if (FAILED(hr)) - LogStringW(hModule, TEXT("doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = 0x%x"), hr); - uErr = ErrorConvertFromHResult(hModule, hr); + logStringW(hModule, L"doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = 0x%x", hr); + uErr = errorConvertFromHResult(hModule, hr); break; } @@ -582,7 +594,7 @@ static UINT doNetCfgInit(MSIHANDLE hModule, INetCfg **ppnc, BOOL bWrite) if (!lpszLockedBy) { - LogStringW(hModule, TEXT("doNetCfgInit: lpszLockedBy == NULL, breaking")); + logStringW(hModule, L"doNetCfgInit: lpszLockedBy == NULL, breaking"); break; } @@ -596,7 +608,7 @@ static UINT doNetCfgInit(MSIHANDLE hModule, INetCfg **ppnc, BOOL bWrite) && !wcscmp(lpszLockedBy, L"6to4svc.dll")) { cRetries++; - LogStringW(hModule, TEXT("doNetCfgInit: lpszLockedBy is 6to4svc.dll, retrying %d out of %d"), cRetries, VBOX_NETCFG_MAX_RETRIES); + logStringW(hModule, L"doNetCfgInit: lpszLockedBy is 6to4svc.dll, retrying %d out of %d", cRetries, VBOX_NETCFG_MAX_RETRIES); MsgResult = IDRETRY; } else @@ -606,7 +618,7 @@ static UINT doNetCfgInit(MSIHANDLE hModule, INetCfg **ppnc, BOOL bWrite) hMsg = createNetCfgLockedMsgRecord(hModule); if (!hMsg) { - LogStringW(hModule, TEXT("doNetCfgInit: Failed to create a message record, breaking")); + logStringW(hModule, L"doNetCfgInit: Failed to create a message record, breaking"); CoTaskMemFree(lpszLockedBy); break; } @@ -616,14 +628,14 @@ static UINT doNetCfgInit(MSIHANDLE hModule, INetCfg **ppnc, BOOL bWrite) Assert(rTmp == ERROR_SUCCESS); if (rTmp != ERROR_SUCCESS) { - LogStringW(hModule, TEXT("doNetCfgInit: MsiRecordSetStringW failed, error = 0x%x"), rTmp); + logStringW(hModule, L"doNetCfgInit: MsiRecordSetStringW failed, error = 0x%x", rTmp); CoTaskMemFree(lpszLockedBy); break; } MsgResult = MsiProcessMessage(hModule, (INSTALLMESSAGE)(INSTALLMESSAGE_USER | MB_RETRYCANCEL), hMsg); Assert(MsgResult == IDRETRY || MsgResult == IDCANCEL); - LogStringW(hModule, TEXT("doNetCfgInit: MsiProcessMessage returned (0x%x)"), MsgResult); + logStringW(hModule, L"doNetCfgInit: MsiProcessMessage returned (0x%x)", MsgResult); } CoTaskMemFree(lpszLockedBy); } while(MsgResult == IDRETRY); @@ -634,39 +646,27 @@ static UINT doNetCfgInit(MSIHANDLE hModule, INetCfg **ppnc, BOOL bWrite) return uErr; } -static UINT vboxNetFltQueryInfArray(MSIHANDLE hModule, OUT LPWSTR *apInfFullPaths, PUINT pcInfs, DWORD dwSize) +static UINT vboxNetFltQueryInfArray(MSIHANDLE hModule, OUT LPWSTR pwszPtInf, OUT LPWSTR pwszMpInf, DWORD dwSize) { - UINT uErr; - if (*pcInfs >= 2) + DWORD dwBuf = dwSize - RT_MAX(sizeof(NETFLT_PT_INF_REL_PATH), sizeof(NETFLT_MP_INF_REL_PATH)); + UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", pwszPtInf, &dwBuf); + if ( uErr == ERROR_SUCCESS + && dwBuf) { - *pcInfs = 2; - - DWORD dwBuf = dwSize; - uErr = MsiGetPropertyW(hModule, L"CustomActionData", apInfFullPaths[0], &dwBuf); - if ( uErr == ERROR_SUCCESS - && dwBuf) - { - /** @todo r=andy Avoid wcscpy and wcsncat, can cause buffer overruns! */ - wcscpy(apInfFullPaths[1], apInfFullPaths[0]); + wcscpy(pwszMpInf, pwszPtInf); - wcsncat(apInfFullPaths[0], NETFLT_PT_INF_REL_PATH, sizeof(NETFLT_PT_INF_REL_PATH)); - LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: INF 1: %s"), apInfFullPaths[0]); + wcsncat(pwszPtInf, NETFLT_PT_INF_REL_PATH, sizeof(NETFLT_PT_INF_REL_PATH)); + logStringW(hModule, L"vboxNetFltQueryInfArray: INF 1: %s", pwszPtInf); - wcsncat(apInfFullPaths[1], NETFLT_MP_INF_REL_PATH, sizeof(NETFLT_MP_INF_REL_PATH)); - LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: INF 2: %s"), apInfFullPaths[1]); - } - else - { - if (uErr != ERROR_SUCCESS) - LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = 0x%x"), uErr); - else - LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: Empty installation directory")); - } + wcsncat(pwszMpInf, NETFLT_MP_INF_REL_PATH, sizeof(NETFLT_MP_INF_REL_PATH)); + logStringW(hModule, L"vboxNetFltQueryInfArray: INF 2: %s", pwszMpInf); } + else if (uErr != ERROR_SUCCESS) + logStringW(hModule, L"vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = 0x%x", uErr); else { - uErr = ERROR_BUFFER_OVERFLOW; - LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: Buffer array size is < 2 (%u)"), *pcInfs); + logStringW(hModule, L"vboxNetFltQueryInfArray: Empty installation directory"); + uErr = ERROR_GEN_FAILURE; } return uErr; @@ -686,26 +686,26 @@ UINT __stdcall UninstallNetFlt(MSIHANDLE hModule) __try { - LogStringW(hModule, TEXT("Uninstalling NetFlt")); + logStringW(hModule, L"Uninstalling NetFlt"); uErr = doNetCfgInit(hModule, &pNetCfg, TRUE); if (uErr == ERROR_SUCCESS) { HRESULT hr = VBoxNetCfgWinNetFltUninstall(pNetCfg); if (hr != S_OK) - LogStringW(hModule, TEXT("UninstallNetFlt: VBoxNetCfgWinUninstallComponent failed, error = 0x%x"), hr); + logStringW(hModule, L"UninstallNetFlt: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr); - uErr = ErrorConvertFromHResult(hModule, hr); + uErr = errorConvertFromHResult(hModule, hr); VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE); - LogStringW(hModule, TEXT("Uninstalling NetFlt done, error = 0x%x"), uErr); + logStringW(hModule, L"Uninstalling NetFlt done, error = 0x%x", uErr); /* Never fail on uninstall. */ uErr = ERROR_SUCCESS; } else - LogStringW(hModule, TEXT("UninstallNetFlt: doNetCfgInit failed, error = 0x%x"), uErr); + logStringW(hModule, L"UninstallNetFlt: doNetCfgInit failed, error = 0x%x", uErr); } __finally { @@ -735,34 +735,32 @@ UINT __stdcall InstallNetFlt(MSIHANDLE hModule) __try { - LogStringW(hModule, TEXT("Installing NetFlt")); + logStringW(hModule, L"Installing NetFlt"); uErr = doNetCfgInit(hModule, &pNetCfg, TRUE); if (uErr == ERROR_SUCCESS) { - WCHAR PtInf[MAX_PATH]; - WCHAR MpInf[MAX_PATH]; - DWORD sz = sizeof(PtInf); - LPWSTR aInfs[] = {PtInf, MpInf}; - UINT cInfs = 2; - uErr = vboxNetFltQueryInfArray(hModule, aInfs, &cInfs, sz); + WCHAR wszPtInf[MAX_PATH]; + WCHAR wszMpInf[MAX_PATH]; + uErr = vboxNetFltQueryInfArray(hModule, wszPtInf, wszMpInf, sizeof(wszMpInf)); if (uErr == ERROR_SUCCESS) { - HRESULT hr = VBoxNetCfgWinNetFltInstall(pNetCfg, (LPCWSTR*)aInfs, cInfs); + LPCWSTR const apwszInfs[] = { wszPtInf, wszMpInf }; + HRESULT hr = VBoxNetCfgWinNetFltInstall(pNetCfg, &apwszInfs[0], RT_ELEMENTS(apwszInfs)); if (FAILED(hr)) - LogStringW(hModule, TEXT("InstallNetFlt: VBoxNetCfgWinNetFltInstall failed, error = 0x%x"), hr); + logStringW(hModule, L"InstallNetFlt: VBoxNetCfgWinNetFltInstall failed, error = 0x%x", hr); - uErr = ErrorConvertFromHResult(hModule, hr); + uErr = errorConvertFromHResult(hModule, hr); } else - LogStringW(hModule, TEXT("InstallNetFlt: vboxNetFltQueryInfArray failed, error = 0x%x"), uErr); + logStringW(hModule, L"InstallNetFlt: vboxNetFltQueryInfArray failed, error = 0x%x", uErr); VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE); - LogStringW(hModule, TEXT("Installing NetFlt done")); + logStringW(hModule, L"Installing NetFlt done"); } else - LogStringW(hModule, TEXT("InstallNetFlt: doNetCfgInit failed, error = 0x%x"), uErr); + logStringW(hModule, L"InstallNetFlt: doNetCfgInit failed, error = 0x%x", uErr); } __finally { @@ -821,7 +819,7 @@ static BOOL RenameHostOnlyConnectionsCallback(HDEVINFO hDevInfo, PSP_DEVINFO_DAT Assert(hr == S_OK); if (SUCCEEDED(hr)) { - hr = VBoxNetCfgWinRenameConnection (guid, ConnectoinName); + hr = VBoxNetCfgWinRenameConnection(guid, ConnectoinName); Assert(hr == S_OK); } } @@ -845,73 +843,78 @@ UINT __stdcall CreateHostOnlyInterface(MSIHANDLE hModule) BOOL bSetupModeInteractive = SetupSetNonInteractiveMode(FALSE); bool bSetStaticIp = true; - LogStringW(hModule, TEXT("Creating host-only interface")); + logStringW(hModule, L"Creating host-only interface"); HRESULT hr = VBoxNetCfgWinRemoveAllNetDevicesOfId(NETADP_ID); if (FAILED(hr)) { - LogStringW(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinRemoveAllNetDevicesOfId failed, error = 0x%x"), hr); + logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinRemoveAllNetDevicesOfId failed, error = 0x%x", hr); bSetStaticIp = false; } GUID guid; - WCHAR MpInf[MAX_PATH]; - DWORD cSize = sizeof(MpInf)/sizeof(MpInf[0]); - LPCWSTR pInfPath = NULL; + WCHAR wszMpInf[MAX_PATH]; + DWORD cchMpInf = RT_ELEMENTS(wszMpInf) - sizeof("drivers\\network\\netadp\\VBoxNetAdp.inf") - 1; + LPCWSTR pwszInfPath = NULL; bool bIsFile = false; - UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", MpInf, &cSize); + UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", wszMpInf, &cchMpInf); if (uErr == ERROR_SUCCESS) { - if (cSize) + if (cchMpInf) { - LogStringW(hModule, TEXT("CreateHostOnlyInterface: NetAdpDir property = %s"), MpInf); - if (MpInf[cSize-1] != L'\\') + logStringW(hModule, L"CreateHostOnlyInterface: NetAdpDir property = %s", wszMpInf); + if (wszMpInf[cchMpInf - 1] != L'\\') { - MpInf[cSize] = L'\\'; - ++cSize; - MpInf[cSize] = L'\0'; + wszMpInf[cchMpInf++] = L'\\'; + wszMpInf[cchMpInf] = L'\0'; } - /** @todo r=andy Avoid wcscat, can cause buffer overruns! */ - wcscat(MpInf, L"drivers\\network\\netadp\\VBoxNetAdp.inf"); - pInfPath = MpInf; + wcscat(wszMpInf, L"drivers\\network\\netadp\\VBoxNetAdp.inf"); + pwszInfPath = wszMpInf; bIsFile = true; - LogStringW(hModule, TEXT("CreateHostOnlyInterface: Resulting INF path = %s"), pInfPath); + logStringW(hModule, L"CreateHostOnlyInterface: Resulting INF path = %s", pwszInfPath); } else - LogStringW(hModule, TEXT("CreateHostOnlyInterface: NetAdpDir property value is empty")); + logStringW(hModule, L"CreateHostOnlyInterface: NetAdpDir property value is empty"); } else - LogStringW(hModule, TEXT("CreateHostOnlyInterface: Failed to get NetAdpDir property, error = 0x%x"), uErr); + logStringW(hModule, L"CreateHostOnlyInterface: Failed to get NetAdpDir property, error = 0x%x", uErr); /* Make sure the inf file is installed. */ - if (!!pInfPath && bIsFile) + if (pwszInfPath != NULL && bIsFile) { - hr = VBoxDrvCfgInfInstall(pInfPath); +logStringW(hModule, L"CreateHostOnlyInterface: Calling VBoxDrvCfgInfInstall(%s)", pwszInfPath); + hr = VBoxDrvCfgInfInstall(pwszInfPath); +logStringW(hModule, L"CreateHostOnlyInterface: VBoxDrvCfgInfInstall returns 0x%x", hr); if (FAILED(hr)) - LogStringW(hModule, TEXT("CreateHostOnlyInterface: Failed to install INF file, error = 0x%x"), hr); + logStringW(hModule, L"CreateHostOnlyInterface: Failed to install INF file, error = 0x%x", hr); } if (SUCCEEDED(hr)) { - hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface(pInfPath, bIsFile, &guid, NULL, NULL); +logStringW(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinCreateHostOnlyNetworkInterface"); + hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface(pwszInfPath, bIsFile, &guid, NULL, NULL); +logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface returns 0x%x", hr); if (SUCCEEDED(hr)) { ULONG ip = inet_addr("192.168.56.1"); ULONG mask = inet_addr("255.255.255.0"); +logStringW(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinEnableStaticIpConfig"); hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask); +logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig returns 0x%x", hr); if (FAILED(hr)) - LogStringW(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = 0x%x"), hr); + logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = 0x%x", hr); } else - LogStringW(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = 0x%x"), hr); + logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = 0x%x", hr); } if (SUCCEEDED(hr)) - LogStringW(hModule, TEXT("Creating host-only interface done")); + logStringW(hModule, L"Creating host-only interface done"); /* Restore original setup mode. */ +logStringW(hModule, L"CreateHostOnlyInterface: almost done..."); if (bSetupModeInteractive) SetupSetNonInteractiveMode(bSetupModeInteractive); @@ -919,6 +922,7 @@ UINT __stdcall CreateHostOnlyInterface(MSIHANDLE hModule) #endif /* VBOX_WITH_NETFLT */ +logStringW(hModule, L"CreateHostOnlyInterface: returns success (ignoring all failures)"); /* Never fail the install even if we did not succeed. */ return ERROR_SUCCESS; } @@ -928,7 +932,7 @@ UINT __stdcall RemoveHostOnlyInterfaces(MSIHANDLE hModule) #ifdef VBOX_WITH_NETFLT netCfgLoggerEnable(hModule); - LogStringW(hModule, TEXT("RemoveHostOnlyInterfaces: Removing All Host-Only Interface")); + logStringW(hModule, L"RemoveHostOnlyInterfaces: Removing All Host-Only Interface"); BOOL bSetupModeInteractive = SetupSetNonInteractiveMode(FALSE); @@ -938,11 +942,11 @@ UINT __stdcall RemoveHostOnlyInterfaces(MSIHANDLE hModule) hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, NETADP_ID, L"Net", 0/* could be SUOI_FORCEDELETE */); if (FAILED(hr)) { - LogStringW(hModule, TEXT("RemoveHostOnlyInterfaces: NetAdp uninstalled successfully, but failed to remove infs\n")); + logStringW(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstalled successfully, but failed to remove infs\n"); } } else - LogStringW(hModule, TEXT("RemoveHostOnlyInterfaces: NetAdp uninstall failed, hr = 0x%x\n"), hr); + logStringW(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstall failed, hr = 0x%x\n", hr); /* Restore original setup mode. */ if (bSetupModeInteractive) @@ -955,53 +959,53 @@ UINT __stdcall RemoveHostOnlyInterfaces(MSIHANDLE hModule) return ERROR_SUCCESS; } -static bool IsTAPDevice(const TCHAR *pcGUID) +static bool isTAPDevice(const WCHAR *pwszGUID) { HKEY hNetcard; bool bIsTapDevice = false; - LONG lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"), - 0, KEY_READ, &hNetcard); + LONG lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}", + 0, KEY_READ, &hNetcard); if (lStatus != ERROR_SUCCESS) return false; int i = 0; - while (true) + for (;;) { - TCHAR szEnumName[256]; - TCHAR szNetCfgInstanceId[256]; + WCHAR wszEnumName[256]; + WCHAR wszNetCfgInstanceId[256]; DWORD dwKeyType; HKEY hNetCardGUID; - DWORD dwLen = sizeof(szEnumName); - lStatus = RegEnumKeyEx(hNetcard, i, szEnumName, &dwLen, NULL, NULL, NULL, NULL); + DWORD dwLen = sizeof(wszEnumName); + lStatus = RegEnumKeyExW(hNetcard, i, wszEnumName, &dwLen, NULL, NULL, NULL, NULL); if (lStatus != ERROR_SUCCESS) break; - lStatus = RegOpenKeyEx(hNetcard, szEnumName, 0, KEY_READ, &hNetCardGUID); + lStatus = RegOpenKeyExW(hNetcard, wszEnumName, 0, KEY_READ, &hNetCardGUID); if (lStatus == ERROR_SUCCESS) { - dwLen = sizeof(szNetCfgInstanceId); - lStatus = RegQueryValueEx(hNetCardGUID, TEXT("NetCfgInstanceId"), NULL, &dwKeyType, (LPBYTE)szNetCfgInstanceId, &dwLen); + dwLen = sizeof(wszNetCfgInstanceId); + lStatus = RegQueryValueExW(hNetCardGUID, L"NetCfgInstanceId", NULL, &dwKeyType, (LPBYTE)wszNetCfgInstanceId, &dwLen); if ( lStatus == ERROR_SUCCESS && dwKeyType == REG_SZ) { - TCHAR szNetProductName[256]; - TCHAR szNetProviderName[256]; - - szNetProductName[0] = 0; - dwLen = sizeof(szNetProductName); - lStatus = RegQueryValueEx(hNetCardGUID, TEXT("ProductName"), NULL, &dwKeyType, (LPBYTE)szNetProductName, &dwLen); - - szNetProviderName[0] = 0; - dwLen = sizeof(szNetProviderName); - lStatus = RegQueryValueEx(hNetCardGUID, TEXT("ProviderName"), NULL, &dwKeyType, (LPBYTE)szNetProviderName, &dwLen); - - if ( !wcscmp(szNetCfgInstanceId, pcGUID) - && !wcscmp(szNetProductName, TEXT("VirtualBox TAP Adapter")) - && ( (!wcscmp(szNetProviderName, TEXT("innotek GmbH"))) /* Legacy stuff. */ - || (!wcscmp(szNetProviderName, TEXT("Sun Microsystems, Inc."))) /* Legacy stuff. */ - || (!wcscmp(szNetProviderName, TEXT(VBOX_VENDOR))) /* Reflects current vendor string. */ + WCHAR wszNetProductName[256]; + WCHAR wszNetProviderName[256]; + + wszNetProductName[0] = 0; + dwLen = sizeof(wszNetProductName); + lStatus = RegQueryValueExW(hNetCardGUID, L"ProductName", NULL, &dwKeyType, (LPBYTE)wszNetProductName, &dwLen); + + wszNetProviderName[0] = 0; + dwLen = sizeof(wszNetProviderName); + lStatus = RegQueryValueExW(hNetCardGUID, L"ProviderName", NULL, &dwKeyType, (LPBYTE)wszNetProviderName, &dwLen); + + if ( !wcscmp(wszNetCfgInstanceId, pwszGUID) + && !wcscmp(wszNetProductName, L"VirtualBox TAP Adapter") + && ( (!wcscmp(wszNetProviderName, L"innotek GmbH")) /* Legacy stuff. */ + || (!wcscmp(wszNetProviderName, L"Sun Microsystems, Inc.")) /* Legacy stuff. */ + || (!wcscmp(wszNetProviderName, MY_WTEXT(VBOX_VENDOR))) /* Reflects current vendor string. */ ) ) { @@ -1015,55 +1019,49 @@ static bool IsTAPDevice(const TCHAR *pcGUID) ++i; } - RegCloseKey (hNetcard); + RegCloseKey(hNetcard); return bIsTapDevice; } -#define VBOX_TAP_HWID _T("vboxtap") - #define SetErrBreak(strAndArgs) \ if (1) { \ rc = 0; \ - LogStringW(hModule, strAndArgs); \ + logStringW(hModule, strAndArgs); \ break; \ } else do {} while (0) -int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID) +int removeNetworkInterface(MSIHANDLE hModule, const WCHAR *pwszGUID) { int rc = 1; do { - TCHAR lszPnPInstanceId [512] = {0}; + WCHAR wszPnPInstanceId[512] = {0}; /* We have to find the device instance ID through a registry search */ HKEY hkeyNetwork = 0; HKEY hkeyConnection = 0; - do + do /* break-loop */ { - TCHAR strRegLocation [256]; - swprintf (strRegLocation, - TEXT("SYSTEM\\CurrentControlSet\\Control\\Network\\") - TEXT("{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s"), - pcGUID); - LONG lStatus; - lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, strRegLocation, 0, - KEY_READ, &hkeyNetwork); + WCHAR wszRegLocation[256]; + swprintf(wszRegLocation, + L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s", + pwszGUID); + LONG lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegLocation, 0, KEY_READ, &hkeyNetwork); if ((lStatus != ERROR_SUCCESS) || !hkeyNetwork) - SetErrBreak((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [1]"), strRegLocation)); + SetErrBreak((L"VBox HostInterfaces: Host interface network was not found in registry (%s)! [1]", wszRegLocation)); - lStatus = RegOpenKeyExA(hkeyNetwork, "Connection", 0, - KEY_READ, &hkeyConnection); + lStatus = RegOpenKeyExW(hkeyNetwork, L"Connection", 0, KEY_READ, &hkeyConnection); if ((lStatus != ERROR_SUCCESS) || !hkeyConnection) - SetErrBreak((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [2]"), strRegLocation)); + SetErrBreak((L"VBox HostInterfaces: Host interface network was not found in registry (%s)! [2]", wszRegLocation)); - DWORD len = sizeof (lszPnPInstanceId); + DWORD len = sizeof(wszPnPInstanceId); DWORD dwKeyType; lStatus = RegQueryValueExW(hkeyConnection, L"PnPInstanceID", NULL, - &dwKeyType, (LPBYTE) lszPnPInstanceId, &len); + &dwKeyType, (LPBYTE)&wszPnPInstanceId[0], &len); if ((lStatus != ERROR_SUCCESS) || (dwKeyType != REG_SZ)) - SetErrBreak((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [3]"), strRegLocation)); + SetErrBreak((L"VBox HostInterfaces: Host interface network was not found in registry (%s)! [3]", wszRegLocation)); } while (0); @@ -1098,8 +1096,8 @@ int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID) hDeviceInfo = SetupDiGetClassDevs(&netGuid, NULL, NULL, DIGCF_PRESENT); if (hDeviceInfo == INVALID_HANDLE_VALUE) { - LogStringW(hModule, TEXT("VBox HostInterfaces: SetupDiGetClassDevs failed (0x%08X)!"), GetLastError()); - SetErrBreak(TEXT("VBox HostInterfaces: Uninstallation failed!")); + logStringW(hModule, L"VBox HostInterfaces: SetupDiGetClassDevs failed (0x%08X)!", GetLastError()); + SetErrBreak(L"VBox HostInterfaces: Uninstallation failed!"); } BOOL fFoundDevice = FALSE; @@ -1107,7 +1105,7 @@ int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID) /* enumerate the driver info list */ while (TRUE) { - TCHAR *pszDeviceHwid; + WCHAR *pwszDeviceHwid; fResult = SetupDiEnumDeviceInfo(hDeviceInfo, index, &DeviceInfoData); if (!fResult) @@ -1137,20 +1135,20 @@ int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID) continue; } - pszDeviceHwid = (TCHAR *)malloc(size); - if (pszDeviceHwid) + pwszDeviceHwid = (WCHAR *)malloc(size); + if (pwszDeviceHwid) { fResult = SetupDiGetDeviceRegistryProperty(hDeviceInfo, &DeviceInfoData, SPDRP_HARDWAREID, NULL, - (PBYTE)pszDeviceHwid, + (PBYTE)pwszDeviceHwid, size, NULL); if (!fResult) { - free(pszDeviceHwid); - pszDeviceHwid = NULL; + free(pwszDeviceHwid); + pwszDeviceHwid = NULL; index++; continue; } @@ -1163,19 +1161,19 @@ int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID) continue; } - for (TCHAR *t = pszDeviceHwid; - t && *t && t < &pszDeviceHwid[size / sizeof(TCHAR)]; - t += _tcslen (t) + 1) + for (WCHAR *t = pwszDeviceHwid; + t && *t && t < &pwszDeviceHwid[size / sizeof(WCHAR)]; + t += wcslen(t) + 1) { - if (!_tcsicmp(VBOX_TAP_HWID, t)) + if (!_wcsicmp(L"vboxtap", t)) { /* get the device instance ID */ - TCHAR devID [MAX_DEVICE_ID_LEN]; - if (CM_Get_Device_ID(DeviceInfoData.DevInst, - devID, MAX_DEVICE_ID_LEN, 0) == CR_SUCCESS) + WCHAR wszDevID[MAX_DEVICE_ID_LEN]; + if (CM_Get_Device_IDW(DeviceInfoData.DevInst, + wszDevID, MAX_DEVICE_ID_LEN, 0) == CR_SUCCESS) { /* compare to what we determined before */ - if (!wcscmp(devID, lszPnPInstanceId)) + if (!wcscmp(wszDevID, wszPnPInstanceId)) { fFoundDevice = TRUE; break; @@ -1184,10 +1182,10 @@ int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID) } } - if (pszDeviceHwid) + if (pwszDeviceHwid) { - free(pszDeviceHwid); - pszDeviceHwid = NULL; + free(pwszDeviceHwid); + pwszDeviceHwid = NULL; } if (fFoundDevice) @@ -1201,19 +1199,19 @@ int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID) fResult = SetupDiSetSelectedDevice(hDeviceInfo, &DeviceInfoData); if (!fResult) { - LogStringW(hModule, TEXT("VBox HostInterfaces: SetupDiSetSelectedDevice failed (0x%08X)!"), GetLastError()); - SetErrBreak(TEXT("VBox HostInterfaces: Uninstallation failed!")); + logStringW(hModule, L"VBox HostInterfaces: SetupDiSetSelectedDevice failed (0x%08X)!", GetLastError()); + SetErrBreak(L"VBox HostInterfaces: Uninstallation failed!"); } fResult = SetupDiCallClassInstaller(DIF_REMOVE, hDeviceInfo, &DeviceInfoData); if (!fResult) { - LogStringW(hModule, TEXT("VBox HostInterfaces: SetupDiCallClassInstaller (DIF_REMOVE) failed (0x%08X)!"), GetLastError()); - SetErrBreak(TEXT("VBox HostInterfaces: Uninstallation failed!")); + logStringW(hModule, L"VBox HostInterfaces: SetupDiCallClassInstaller (DIF_REMOVE) failed (0x%08X)!", GetLastError()); + SetErrBreak(L"VBox HostInterfaces: Uninstallation failed!"); } } else - SetErrBreak(TEXT("VBox HostInterfaces: Host interface network device not found!")); + SetErrBreak(L"VBox HostInterfaces: Host interface network device not found!"); } while (0); @@ -1227,44 +1225,41 @@ int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID) UINT __stdcall UninstallTAPInstances(MSIHANDLE hModule) { - static const TCHAR *NetworkKey = TEXT("SYSTEM\\CurrentControlSet\\Control\\Network\\") - TEXT("{4D36E972-E325-11CE-BFC1-08002BE10318}"); + static const WCHAR *s_wszNetworkKey = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"; HKEY hCtrlNet; - LONG lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, NetworkKey, 0, KEY_READ, &hCtrlNet); + LONG lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_wszNetworkKey, 0, KEY_READ, &hCtrlNet); if (lStatus == ERROR_SUCCESS) { - LogStringW(hModule, TEXT("VBox HostInterfaces: Enumerating interfaces ...")); - for (int i = 0;; ++ i) + logStringW(hModule, L"VBox HostInterfaces: Enumerating interfaces ..."); + for (int i = 0; ; ++i) { - TCHAR szNetworkGUID [256] = { 0 }; - TCHAR szNetworkConnection [256] = { 0 }; - - DWORD dwLen = (DWORD)sizeof(szNetworkGUID); - lStatus = RegEnumKeyEx(hCtrlNet, i, szNetworkGUID, &dwLen, NULL, NULL, NULL, NULL); + WCHAR wszNetworkGUID[256] = { 0 }; + DWORD dwLen = (DWORD)sizeof(wszNetworkGUID); + lStatus = RegEnumKeyExW(hCtrlNet, i, wszNetworkGUID, &dwLen, NULL, NULL, NULL, NULL); if (lStatus != ERROR_SUCCESS) { switch (lStatus) { - case ERROR_NO_MORE_ITEMS: - LogStringW(hModule, TEXT("VBox HostInterfaces: No interfaces found.")); - break; - default: - LogStringW(hModule, TEXT("VBox HostInterfaces: Enumeration failed: %ld"), lStatus); - break; - }; + case ERROR_NO_MORE_ITEMS: + logStringW(hModule, L"VBox HostInterfaces: No interfaces found."); + break; + default: + logStringW(hModule, L"VBox HostInterfaces: Enumeration failed: %ld", lStatus); + break; + } break; } - if (IsTAPDevice(szNetworkGUID)) + if (isTAPDevice(wszNetworkGUID)) { - LogStringW(hModule, TEXT("VBox HostInterfaces: Removing interface \"%s\" ..."), szNetworkGUID); - removeNetworkInterface (hModule, szNetworkGUID); - lStatus = RegDeleteKey (hCtrlNet, szNetworkGUID); + logStringW(hModule, L"VBox HostInterfaces: Removing interface \"%s\" ...", wszNetworkGUID); + removeNetworkInterface(hModule, wszNetworkGUID); + lStatus = RegDeleteKeyW(hCtrlNet, wszNetworkGUID); } } - RegCloseKey (hCtrlNet); - LogStringW(hModule, TEXT("VBox HostInterfaces: Removing interfaces done.")); + RegCloseKey(hCtrlNet); + logStringW(hModule, L"VBox HostInterfaces: Removing interfaces done."); } return ERROR_SUCCESS; } diff --git a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def index 27f50954e..cfe118b94 100644 --- a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def +++ b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def @@ -1,4 +1,4 @@ -; $Id: VBoxInstallHelper.def 32112 2010-08-31 08:44:09Z vboxsync $ +; $Id: VBoxInstallHelper.def $ ;; @file ; VBoxInstallHelper - Defines the exports the MSI engine uses. ; diff --git a/src/VBox/Installer/win/Makefile.kmk b/src/VBox/Installer/win/Makefile.kmk index dab62d975..a6837342b 100644 --- a/src/VBox/Installer/win/Makefile.kmk +++ b/src/VBox/Installer/win/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Windows installer. # @@ -256,10 +256,10 @@ $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi: $(MAKEFILE_CURRENT) | $$(dir $ # ifdef VBOX_WITH_DOCS_CHM $(APPEND) $@ ' <Shortcut Id="sc_StartMenu_ManualCHM_en_US" Directory="dir_StartMenuVBox" Name="!(loc.StartMenu_UserManual) (CHM, English)" Description="!(loc.StartMenu_UserManual)"' \ - ' Target="[INSTALLDIR]\doc\VirtualBox.chm" WorkingDirectory="dir_Documents" Advertise="no"/>' + ' Target="[INSTALLDIR]\VirtualBox.chm" WorkingDirectory="dir_Documents" Advertise="no"/>' $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \ ' <Shortcut Id="sc_StartMenu_ManualCHM_$(lang)" Directory="dir_StartMenuVBox" Name="$!(loc.StartMenu_UserManual) (CHM, $(VBOX_BRAND_$(lang)_LANG_NAME))"' \ - ' Description="$!(loc.StartMenu_UserManual) ($(VBOX_BRAND_$(lang)_LANG_NAME))" Target="[INSTALLDIR]\doc\VirtualBox_$(lang).chm" WorkingDirectory="dir_Documents"/>') + ' Description="$!(loc.StartMenu_UserManual) ($(VBOX_BRAND_$(lang)_LANG_NAME))" Target="[INSTALLDIR]\VirtualBox_$(lang).chm" WorkingDirectory="dir_Documents"/>') endif $(APPEND) $@ ' <Shortcut Id="sc_StartMenu_ManualPDF_en_US" Directory="dir_StartMenuVBox" Name="!(loc.StartMenu_UserManual) (PDF, English)" Description="!(loc.StartMenu_UserManual)"' \ ' Target="[INSTALLDIR]\doc\UserManual.pdf" WorkingDirectory="dir_Documents" Advertise="no"/>' @@ -288,6 +288,7 @@ $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi: \ $(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl \ $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \ $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \ + $(VBOX_SVN_REV_KMK) \ $(MAKEFILE_CURRENT) \ | $$$$(dir $$$$@) $$(call MSG_L1,Linking installer $$@) @@ -304,7 +305,7 @@ $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi: \ $(VBOX_PATH_WIX)/difxapp_x86.wixlib, \ $(VBOX_PATH_WIX)/difxapp_x64.wixlib) $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst - $(call VBOX_SIGN_FILE_FN,$$@) + $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH))) endef $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), $(eval $(def_vbox_link_msi))) @@ -549,12 +550,13 @@ $(PACKAGE_NAME_FINAL): \ $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \ $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \ $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst) \ + $(VBOX_SVN_REV_KMK) \ | $$(dir $$@) $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/$(PACKAGE_BASE)-r*.msi) $(REDIRECT) -C $(@D) -- \ wscript.exe $(VBOX_PATH_WISUMINFO) $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi $(VBOX_INS_PROD_LANG) $(CP) -f $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi $@ - $(call VBOX_SIGN_FILE_FN,$@) + $(call VBOX_SIGN_FILE_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV)) if defined(VBOX_WITH_COMBINED_PACKAGE) && "$(KBUILD_TARGET_ARCH)" == "x86" @@ -566,8 +568,8 @@ if defined(VBOX_WITH_COMBINED_PACKAGE) && "$(KBUILD_TARGET_ARCH)" == "x86" $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL): \ $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \ $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) - $(call MSG_L1,Building Windows combined package) - $(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB)) + $(call MSG_L1,Building Windows combined package) + $(call VBOX_SIGN_FILE_FN,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB)) $(REDIRECT) -C $(@D) -- \ VBoxStubBld -out $@ \ -target-x86 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \ diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk index 77ea1b776..2b7738d85 100644 --- a/src/VBox/Installer/win/Resources/Makefile.kmk +++ b/src/VBox/Installer/win/Resources/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38360 2011-08-08 18:02:14Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxRes.dll. # diff --git a/src/VBox/Installer/win/Resources/VBoxRes.rc b/src/VBox/Installer/win/Resources/VBoxRes.rc index 367025391..a5a61624b 100644 --- a/src/VBox/Installer/win/Resources/VBoxRes.rc +++ b/src/VBox/Installer/win/Resources/VBoxRes.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxRes.rc 34454 2010-11-29 11:27:20Z vboxsync $ */ +/* $Id: VBoxRes.rc $ */ /** @file * VBoxRes - Resource file for VirtualBox binaries. */ diff --git a/src/VBox/Installer/win/Resources/dummy.cpp b/src/VBox/Installer/win/Resources/dummy.cpp index 6bd5dca1b..5a40e3698 100644 --- a/src/VBox/Installer/win/Resources/dummy.cpp +++ b/src/VBox/Installer/win/Resources/dummy.cpp @@ -1,4 +1,4 @@ -/* $Id: dummy.cpp 35477 2011-01-11 11:20:35Z vboxsync $ */ +/* $Id: dummy.cpp $ */ /** @file * dummy.cpp - file to make kBuild happy when building a resource only DLL. */ diff --git a/src/VBox/Installer/win/Resources/resource.h b/src/VBox/Installer/win/Resources/resource.h index af271d98e..e2ea716ee 100644 --- a/src/VBox/Installer/win/Resources/resource.h +++ b/src/VBox/Installer/win/Resources/resource.h @@ -1,4 +1,4 @@ -/* $Id: resource.h 37549 2011-06-20 08:44:19Z vboxsync $ */ +/* $Id: resource.h $ */ /** @file * resource.h - resource header file. */ diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk index a8f89ebe7..9c6438c84 100644 --- a/src/VBox/Installer/win/Stub/Makefile.kmk +++ b/src/VBox/Installer/win/Stub/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 37991 2011-07-18 09:26:43Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the stub installer. # diff --git a/src/VBox/Installer/win/Stub/VBoxStub.cpp b/src/VBox/Installer/win/Stub/VBoxStub.cpp index 7491d79a9..1f18de321 100644 --- a/src/VBox/Installer/win/Stub/VBoxStub.cpp +++ b/src/VBox/Installer/win/Stub/VBoxStub.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxStub.cpp 37989 2011-07-18 08:51:46Z vboxsync $ */ +/* $Id: VBoxStub.cpp $ */ /** @file * VBoxStub - VirtualBox's Windows installer stub. */ diff --git a/src/VBox/Installer/win/Stub/VBoxStub.h b/src/VBox/Installer/win/Stub/VBoxStub.h index 4931bcd36..455023a67 100644 --- a/src/VBox/Installer/win/Stub/VBoxStub.h +++ b/src/VBox/Installer/win/Stub/VBoxStub.h @@ -1,4 +1,4 @@ -/* $Id: VBoxStub.h 31667 2010-08-13 15:57:03Z vboxsync $ */ +/* $Id: VBoxStub.h $ */ /** @file * VBoxStub - VirtualBox's Windows installer stub. */ diff --git a/src/VBox/Installer/win/Stub/VBoxStub.rc b/src/VBox/Installer/win/Stub/VBoxStub.rc index a02e8e5b6..04ef56645 100644 --- a/src/VBox/Installer/win/Stub/VBoxStub.rc +++ b/src/VBox/Installer/win/Stub/VBoxStub.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxStub.rc 37987 2011-07-18 08:11:16Z vboxsync $*/ +/* $Id: VBoxStub.rc $*/ /** @file * Resource file for the Windows install stub program. */ diff --git a/src/VBox/Installer/win/Stub/resource.h b/src/VBox/Installer/win/Stub/resource.h index b9d3adc0e..fbffe2268 100644 --- a/src/VBox/Installer/win/Stub/resource.h +++ b/src/VBox/Installer/win/Stub/resource.h @@ -1,4 +1,4 @@ -/* $Id: resource.h 37987 2011-07-18 08:11:16Z vboxsync $ */ +/* $Id: resource.h $ */ /** @file * VBoxStub - resource header file. */ diff --git a/src/VBox/Installer/win/StubBld/Makefile.kmk b/src/VBox/Installer/win/StubBld/Makefile.kmk index 99299d722..45aa9b402 100644 --- a/src/VBox/Installer/win/StubBld/Makefile.kmk +++ b/src/VBox/Installer/win/StubBld/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 31667 2010-08-13 15:57:03Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the stub builder. # diff --git a/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp b/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp index 95e57dd78..862b088da 100644 --- a/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp +++ b/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxStubBld.cpp 32388 2010-09-10 10:13:07Z vboxsync $ */ +/* $Id: VBoxStubBld.cpp $ */ /** @file * VBoxStubBld - VirtualBox's Windows installer stub builder. */ diff --git a/src/VBox/Installer/win/StubBld/VBoxStubBld.h b/src/VBox/Installer/win/StubBld/VBoxStubBld.h index 242996a0e..67005674c 100644 --- a/src/VBox/Installer/win/StubBld/VBoxStubBld.h +++ b/src/VBox/Installer/win/StubBld/VBoxStubBld.h @@ -1,4 +1,4 @@ -/* $Id: VBoxStubBld.h 31667 2010-08-13 15:57:03Z vboxsync $ */ +/* $Id: VBoxStubBld.h $ */ /** @file * VBoxStubBld - VirtualBox's Windows installer stub builder. */ diff --git a/src/VBox/Installer/win/UserInterface.wxi b/src/VBox/Installer/win/UserInterface.wxi index 24631a2b5..63f158351 100644 --- a/src/VBox/Installer/win/UserInterface.wxi +++ b/src/VBox/Installer/win/UserInterface.wxi @@ -338,8 +338,8 @@ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)"> <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> - <Publish Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg"><![CDATA[(&ft_VBoxNetworkFlt=3) AND NOT(!ft_VBoxNetworkFlt=3)]]></Publish> - <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[(&ft_VBoxNetworkFlt<3)]]></Publish> + <Publish Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg"><![CDATA[(&VBoxNetworkFlt=3) AND NOT(!VBoxNetworkFlt=3)]]></Publish> + <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[(&VBoxNetworkFlt<3)]]></Publish> <?else ?> <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish> <?endif?> @@ -542,43 +542,50 @@ </Control> </Dialog> - <!-- This dialog is called after an error during installation --> - <Dialog Id="VBoxFatalErrorDlg" ErrorDialog="yes" Width="270" Height="150" Title="[ProductName] !(loc.Setup)" NoMinimize="yes"> + <!-- This dialog is called via the ErrorDialog property on an installation error. --> + <Dialog Id="VBoxErrorDlg" ErrorDialog="yes" Width="270" Height="150" Title="[ProductName] !(loc.Setup)" NoMinimize="yes"> <!-- Do *not* change the control IDs in the dialog! --> - <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Icon" FixedSize="yes" IconSize="32" Text="[ExclamationIcon]" /> - <Control Id="ErrorText" Type="Text" X="75" Y="20" Width="155" Height="80" TabSkip="no"> - <Text><![CDATA[{&DlgFont8}]]></Text> - </Control> - <Control Id="Y" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes"> - <Text><![CDATA[{\DlgFont8}&Yes]]></Text> + <Control Id="ErrorText" Type="Text" X="75" Y="20" Width="155" Height="80" TabSkip="no" NoPrefix="yes" Text="Error information text" /> + <Control Id="Y" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Yes)"> <Publish Event="EndDialog" Value="ErrorYes">1</Publish> </Control> - <Control Id="A" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes"> - <Text><![CDATA[{\DlgFont8}&Cancel]]></Text> + <Control Id="A" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Cancel)"> <Publish Event="EndDialog" Value="ErrorAbort">1</Publish> </Control> - <Control Id="C" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes"> - <Text><![CDATA[{\DlgFont8}&Cancel]]></Text> + <Control Id="C" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Cancel)"> <Publish Event="EndDialog" Value="ErrorCancel">1</Publish> </Control> - <Control Id="I" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes"> - <Text><![CDATA[{\DlgFont8}&Ignore]]></Text> + <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Information icon" FixedSize="yes" IconSize="32" Text="[InfoIcon]" /> + <Control Id="I" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Ignore)"> <Publish Event="EndDialog" Value="ErrorIgnore">1</Publish> </Control> - <Control Id="N" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes"> - <Text><![CDATA[{\DlgFont8}&No]]></Text> + <Control Id="N" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_No)"> <Publish Event="EndDialog" Value="ErrorNo">1</Publish> </Control> - <Control Id="O" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes"> - <Text><![CDATA[{\DlgFont8}&OK]]></Text> + <Control Id="O" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_OK)"> <Publish Event="EndDialog" Value="ErrorOk">1</Publish> </Control> - <Control Id="R" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes"> - <Text><![CDATA[{\DlgFont8}&Retry]]></Text> + <Control Id="R" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Retry)"> <Publish Event="EndDialog" Value="ErrorRetry">1</Publish> </Control> </Dialog> + <!-- Used to signal a fatal error in the 'OnExit="error"' fashion. --> + <Dialog Id="VBoxFatalErrorDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes"> + <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Finish)"> + <Publish Event="EndDialog" Value="Exit">1</Publish> + </Control> + <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Cancel)" /> + <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" /> + <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" /> + <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> + <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorTitle)" /> + <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorDescription1) !(loc.FatalErrorDescription2)" /> + <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes"> + <Text>[Version_text] $(var.Property_Version)</Text> + </Control> + </Dialog> + <Dialog Id="FilesInUse" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" KeepModeless="yes"> <Control Id="Retry" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Retry)"> <Publish Event="EndDialog" Value="Retry">1</Publish> @@ -904,7 +911,7 @@ </Dialog> <!-- Dialog property table. --> - <Property Id="ErrorDialog" Value="VBoxFatalErrorDlg"/> + <Property Id="ErrorDialog" Value="VBoxErrorDlg"/> <!-- Define some textstyles used for formatting dialog items. --> <Property Id="DefaultUIFont">DlgFont8</Property> diff --git a/src/VBox/Installer/win/VirtualBox.wxs b/src/VBox/Installer/win/VirtualBox.wxs index 290cef853..3bacb3343 100644 --- a/src/VBox/Installer/win/VirtualBox.wxs +++ b/src/VBox/Installer/win/VirtualBox.wxs @@ -675,6 +675,9 @@ </Component> </Directory> <!-- TARGETDIR --> + <!-- Note: Feature IDs *must not* be renamed to use any prefixes or such, + otherwise this will break manual selection using the ADDLOCAL= syntax + when using the command line / scripts (see VBox manual). --> <Feature Id="VBoxApplication" Title="VirtualBox Application" Level="1" Description="!(loc.VB_App)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" @@ -707,7 +710,7 @@ <?endif?> <ComponentRef Id="cp_VBoxDrv" /> - <Feature Id="ft_VBoxUSB" Title="VirtualBox USB Support" Level="1" + <Feature Id="VBoxUSB" Title="VirtualBox USB Support" Level="1" Description="!(loc.VB_USBDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" > <ComponentRef Id="cp_USBFilterDriver" /> @@ -715,15 +718,15 @@ </Feature> <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> - <Feature Id="ft_VBoxNetwork" Title="VirtualBox Networking" Level="1" + <Feature Id="VBoxNetwork" Title="VirtualBox Networking" Level="1" Description="!(loc.VB_Network)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" > - <Feature Id="ft_VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1" + <Feature Id="VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1" Description="!(loc.VB_NetFltDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" > <ComponentRef Id="cp_NetFltDriver" /> </Feature> - <Feature Id="ft_VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1" + <Feature Id="VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1" Description="!(loc.VB_NetAdpDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" > <ComponentRef Id="cp_NetAdpDriver" /> @@ -732,7 +735,7 @@ <?endif?> <?if $(env.VBOX_WITH_PYTHON) = "yes" ?> - <Feature Id="ft_VBoxPython" Title="VirtualBox Python 2.x Support" Level="1" + <Feature Id="VBoxPython" Title="VirtualBox Python 2.x Support" Level="1" Description="!(loc.VB_Python)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" > <ComponentRef Id="cp_VBoxPythonBinding" /> @@ -756,22 +759,22 @@ <Custom Action="ca_UninstallTAPInstances" Before="InstallFiles" >1</Custom> <?if $(env.VBOX_WITH_NETFLT) = "yes" ?> - <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[&ft_VBoxNetworkAdp=3]]></Custom> - <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&ft_VBoxNetworkAdp=3]]></Custom> + <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkAdp=3]]></Custom> + <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&VBoxNetworkAdp=3]]></Custom> <Custom Action="ca_RemoveHostOnlyInterfaces" After="ca_UninstallNetFlt" ></Custom> - <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=3]]></Custom> - <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=3]]></Custom> - <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=3]]></Custom> - <Custom Action="ca_InstallNetFlt" Before="ca_CreateHostOnlyInterface" ><![CDATA[&ft_VBoxNetworkFlt=3]]></Custom> + <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom> + <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom> + <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom> + <Custom Action="ca_InstallNetFlt" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkFlt=3]]></Custom> - <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=2]]></Custom> - <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=2]]></Custom> - <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=2]]></Custom> - <Custom Action="ca_UninstallNetFlt" After="InstallInitialize" ><![CDATA[&ft_VBoxNetworkFlt=2]]></Custom> + <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom> + <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom> + <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom> + <Custom Action="ca_UninstallNetFlt" After="InstallInitialize" ><![CDATA[&VBoxNetworkFlt=2]]></Custom> <?endif?> - <Custom Action="ca_InstallPythonAPIArgs" Before="ca_InstallPythonAPI" ><![CDATA[&ft_VBoxPython=3]]></Custom> - <Custom Action="ca_InstallPythonAPI" Before="InstallFinalize" ><![CDATA[&ft_VBoxPython=3]]></Custom> + <Custom Action="ca_InstallPythonAPIArgs" Before="ca_InstallPythonAPI" ><![CDATA[&VBoxPython=3]]></Custom> + <Custom Action="ca_InstallPythonAPI" Before="InstallFinalize" ><![CDATA[&VBoxPython=3]]></Custom> <Custom Action="ca_InstallBrandingArgs" Before="ca_InstallBranding" ><![CDATA[NOT REMOVE]]></Custom> <Custom Action="ca_InstallBranding" Before="InstallFinalize" ><![CDATA[NOT REMOVE]]></Custom> diff --git a/src/VBox/Installer/win/dep.sed b/src/VBox/Installer/win/dep.sed index 0e349152c..7d75b549e 100644 --- a/src/VBox/Installer/win/dep.sed +++ b/src/VBox/Installer/win/dep.sed @@ -1,4 +1,4 @@ -# $Id: dep.sed 37289 2011-06-01 11:59:23Z vboxsync $ +# $Id: dep.sed $ ## @file # Generate dependencies from .wxs and .wxi sources. # diff --git a/src/VBox/Main/Makefile.kmk b/src/VBox/Main/Makefile.kmk index 5b76d1905..cef367351 100644 --- a/src/VBox/Main/Makefile.kmk +++ b/src/VBox/Main/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38290 2011-08-03 09:22:12Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the VBox Main module. # @@ -906,16 +906,17 @@ VBoxJMscom-inst-jar_CLEAN = \ ) VBoxJMscom-inst-jar_BLDDIRS += $(VBOX_JMSCOM_GEN)/java -$(VBOX_JMSCOM_GEN)/jmscomglue.list: \ - $(VBOX_XIDL_FILE) \ - $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \ - $(VBOX_FILESPLIT) \ +$(VBOX_JMSCOM_GEN)/jmscomglue.list: \ + $(VBOX_XIDL_FILE) \ + $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \ + $(VBOX_FILESPLIT) \ | $(VBOX_JMSCOM_GEN)/java/ $(call MSG_L1,Generating Java MSCOM glue files from XIDL) $(QUIET)$(RM) -f $(wildcard $(VBOX_JMSCOM_GEN)/java/*.java) $(QUIET)$(VBOX_XSLTPROC) \ --stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX) \ --stringparam G_vboxGlueStyle mscom \ + --stringparam G_vboxDirPrefix "" \ -o $(VBOX_JMSCOM_GEN)/java/merged.file $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl $< $(QUIET)$(VBOX_FILESPLIT) $(VBOX_JMSCOM_GEN)/java/merged.file $(VBOX_JMSCOM_GEN)/java $(QUIET)echo $(VBOX_JMSCOM_GEN)/java/*.java > $@ @@ -931,6 +932,8 @@ $$(VBOX_JMSCOM_JAR): $(VBOX_JMSCOM_GEN)/jmscomglue.list | $$(dir $$@) $(call MSG_LINK,$(notdir $@),$@) $(VBOX_JAR) cf $@ -C $(VBOX_JMSCOM_JDEST) . +## @todo compile TestVBox.java (see below) to have sanity checking + endif # VBOX_WITH_JMSCOM # @@ -941,7 +944,7 @@ javagluesample_INST = $(INST_SDK)bindings/glue/java/ javagluesample_MODE = a+r,u+w javagluesample_SOURCES = \ $(VBOX_PATH_MAIN_SRC)/glue/tests/TestVBox.java=>TestVBox.java \ - $(VBOX_PATH_MAIN_SRC)/glue/tests/Makefile.kmk=>Makefile.kmk + $(VBOX_PATH_MAIN_SRC)/glue/tests/Makefile=>Makefile updatenls:: $(VBOX_LUPDATE) $(VBoxSVC_SOURCES) $(VBoxSVC_VBOX_HEADERS) -ts $(VBoxSVC_VBOX_TRANSLATIONS) diff --git a/src/VBox/Main/cbinding/Makefile.kmk b/src/VBox/Main/cbinding/Makefile.kmk index d221e4d61..03af2602a 100644 --- a/src/VBox/Main/cbinding/Makefile.kmk +++ b/src/VBox/Main/cbinding/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 29167 2010-05-06 15:58:14Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox C Binding. # diff --git a/src/VBox/Main/cbinding/VBoxXPCOMC.cpp b/src/VBox/Main/cbinding/VBoxXPCOMC.cpp index dd236f911..505ee7202 100644 --- a/src/VBox/Main/cbinding/VBoxXPCOMC.cpp +++ b/src/VBox/Main/cbinding/VBoxXPCOMC.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxXPCOMC.cpp 29167 2010-05-06 15:58:14Z vboxsync $ */ +/* $Id: VBoxXPCOMC.cpp $ */ /** @file VBoxXPCOMC.cpp * Utility functions to use with the C binding for XPCOM. */ diff --git a/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c b/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c index 69ad2d36d..3484ad65e 100644 --- a/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c +++ b/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c @@ -1,4 +1,4 @@ -/* $Revision: 33396 $ */ +/* $Revision: 66985 $ */ /** @file * Glue code for dynamically linking to VBoxXPCOMC. */ diff --git a/src/VBox/Main/cbinding/VBoxXPCOMCGlue.h b/src/VBox/Main/cbinding/VBoxXPCOMCGlue.h index 61ab816fb..3edd49a79 100644 --- a/src/VBox/Main/cbinding/VBoxXPCOMCGlue.h +++ b/src/VBox/Main/cbinding/VBoxXPCOMCGlue.h @@ -1,4 +1,4 @@ -/* $Revision: 29200 $ */ +/* $Revision: 61277 $ */ /** @file VBoxXPCOMCGlue.h * Glue for dynamically linking with VBoxXPCOMC. */ diff --git a/src/VBox/Main/cbinding/makefile.tstXPCOMCGlue b/src/VBox/Main/cbinding/makefile.tstXPCOMCGlue index 11769019e..07838aba6 100644 --- a/src/VBox/Main/cbinding/makefile.tstXPCOMCGlue +++ b/src/VBox/Main/cbinding/makefile.tstXPCOMCGlue @@ -1,4 +1,4 @@ -# $Revision: 28800 $ +# $Revision: 60692 $ ## @file makefile.tstLinuxC # Makefile for sample program illustrating use of C binding for XPCOM. # diff --git a/src/VBox/Main/cbinding/tstXPCOMCCall.c b/src/VBox/Main/cbinding/tstXPCOMCCall.c index e65e144c2..a2311829f 100644 --- a/src/VBox/Main/cbinding/tstXPCOMCCall.c +++ b/src/VBox/Main/cbinding/tstXPCOMCCall.c @@ -1,4 +1,4 @@ -/* $Revision: 28800 $ */ +/* $Revision: 60692 $ */ /** @file tstXPCOMCGlue.c * Demonstrator program to illustrate use of C bindings of Main API. * diff --git a/src/VBox/Main/cbinding/tstXPCOMCGlue.c b/src/VBox/Main/cbinding/tstXPCOMCGlue.c index d2e87876a..751bb1acd 100644 --- a/src/VBox/Main/cbinding/tstXPCOMCGlue.c +++ b/src/VBox/Main/cbinding/tstXPCOMCGlue.c @@ -1,4 +1,4 @@ -/* $Revision: 33294 $ */ +/* $Revision: 66862 $ */ /** @file tstXPCOMCGlue.c * Demonstrator program to illustrate use of C bindings of Main API. * diff --git a/src/VBox/Main/cbinding/xpcidl.xsl b/src/VBox/Main/cbinding/xpcidl.xsl index 38d3139cb..fdab2a8ba 100644 --- a/src/VBox/Main/cbinding/xpcidl.xsl +++ b/src/VBox/Main/cbinding/xpcidl.xsl @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- $Id: xpcidl.xsl 32404 2010-09-10 13:17:42Z vboxsync $ --> +<!-- $Id: xpcidl.xsl $ --> <!-- * A template to generate a XPCOM IDL compatible interface definition file diff --git a/src/VBox/Main/glue/ErrorInfo.cpp b/src/VBox/Main/glue/ErrorInfo.cpp index 758f2b5a5..8d7e31eca 100644 --- a/src/VBox/Main/glue/ErrorInfo.cpp +++ b/src/VBox/Main/glue/ErrorInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: ErrorInfo.cpp 33782 2010-11-04 16:23:22Z vboxsync $ */ +/* $Id: ErrorInfo.cpp $ */ /** @file * diff --git a/src/VBox/Main/glue/EventQueue.cpp b/src/VBox/Main/glue/EventQueue.cpp index 1216f512e..e812277f3 100644 --- a/src/VBox/Main/glue/EventQueue.cpp +++ b/src/VBox/Main/glue/EventQueue.cpp @@ -1,4 +1,4 @@ -/* $Id: EventQueue.cpp 33720 2010-11-03 10:54:42Z vboxsync $ */ +/* $Id: EventQueue.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer: * Event and EventQueue class declaration @@ -29,6 +29,7 @@ #include <iprt/err.h> #include <iprt/time.h> #include <iprt/thread.h> +#include <iprt/log.h> #ifdef USE_XPCOM_QUEUE # include <errno.h> #endif @@ -340,6 +341,13 @@ static int waitForEventsOnXPCOM(nsIEventQueue *pQueue, RTMSINTERVAL cMsTimeout) rc = VINF_INTERRUPTED; else { + static uint32_t s_ErrorCount = 0; + if (s_ErrorCount < 500) + { + LogRel(("waitForEventsOnXPCOM rc=%d errno=%d\n", rc, errno)); + ++s_ErrorCount; + } + AssertMsgFailed(("rc=%d errno=%d\n", rc, errno)); rc = VERR_INTERNAL_ERROR_4; } @@ -510,7 +518,8 @@ int EventQueue::processEventQueue(RTMSINTERVAL cMsTimeout) } if ( ( RT_SUCCESS(rc) - || rc == VERR_INTERRUPTED) + || rc == VERR_INTERRUPTED + || rc == VERR_TIMEOUT) && mInterrupted) { mInterrupted = false; diff --git a/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp b/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp index 8854a99e4..6e863edb1 100644 --- a/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp +++ b/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxErrorInfo.cpp 32780 2010-09-27 19:00:22Z vboxsync $ */ +/* $Id: VirtualBoxErrorInfo.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer: diff --git a/src/VBox/Main/glue/com.cpp b/src/VBox/Main/glue/com.cpp index 465ab400b..896c1d91f 100644 --- a/src/VBox/Main/glue/com.cpp +++ b/src/VBox/Main/glue/com.cpp @@ -1,4 +1,4 @@ -/* $Id: com.cpp 30632 2010-07-05 19:36:40Z vboxsync $ */ +/* $Id: com.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer */ diff --git a/src/VBox/Main/glue/errorprint.cpp b/src/VBox/Main/glue/errorprint.cpp index 68da8bbe9..3e8c9caf0 100644 --- a/src/VBox/Main/glue/errorprint.cpp +++ b/src/VBox/Main/glue/errorprint.cpp @@ -1,4 +1,4 @@ -/* $Id: errorprint.cpp 32718 2010-09-23 12:57:52Z vboxsync $ */ +/* $Id: errorprint.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer: diff --git a/src/VBox/Main/glue/glue-java.xsl b/src/VBox/Main/glue/glue-java.xsl index db03e8dc8..46427c9e0 100644 --- a/src/VBox/Main/glue/glue-java.xsl +++ b/src/VBox/Main/glue/glue-java.xsl @@ -10,7 +10,7 @@ XSLT stylesheet that generates Java glue code for XPCOM, MSCOM and JAX-WS from VirtualBox.xidl. - Copyright (C) 2010 Oracle Corporation + Copyright (C) 2010-2011 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; @@ -42,18 +42,22 @@ <xsl:include href="../webservice/websrv-shared.inc.xsl" /> +<xsl:strip-space elements="*"/> + <xsl:template name="fileheader"> <xsl:param name="name" /> - <xsl:text>/** - * Copyright (C) 2010 Oracle Corporation + <xsl:text>/* + * Copyright (C) 2010-2011 Oracle Corporation * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * This file is part of the VirtualBox SDK, as available from + * http://www.virtualbox.org. This library is free software; you can + * redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation, in version 2.1 + * as it comes in the "COPYING.LIB" file of the VirtualBox SDK distribution. + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * </xsl:text> <xsl:value-of select="concat(' * ',$name)"/> @@ -71,7 +75,7 @@ <xsl:param name="file" /> <xsl:param name="package" /> - <xsl:value-of select="concat(' // ##### BEGINFILE "', $file, '" ')" /> + <xsl:value-of select="concat(' // ##### BEGINFILE "', $G_vboxDirPrefix, $file, '" ')" /> <xsl:call-template name="fileheader"> <xsl:with-param name="name" select="$file" /> </xsl:call-template> @@ -90,7 +94,7 @@ </xsl:when> <xsl:when test="$G_vboxGlueStyle='jaxws'"> - <xsl:value-of select=" 'import javax.xml.ws.*; '" /> + <xsl:value-of select="'import javax.xml.ws.*; '" /> </xsl:when> <xsl:otherwise> @@ -106,6 +110,384 @@ <xsl:value-of select="concat(' // ##### ENDFILE "', $file, '" ')" /> </xsl:template> + +<xsl:template name="string-replace"> + <xsl:param name="haystack"/> + <xsl:param name="needle"/> + <xsl:param name="replacement"/> + <xsl:choose> + <xsl:when test="contains($haystack,$needle)"> + <xsl:value-of select="substring-before($haystack,$needle)"/> + <xsl:value-of select="$replacement"/> + <xsl:call-template name="string-replace"> + <xsl:with-param name="haystack" select="substring-after($haystack,$needle)"/> + <xsl:with-param name="needle" select="$needle"/> + <xsl:with-param name="replacement" select="$replacement"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$haystack"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<!-- descriptions --> + +<xsl:template match="*/text()"> + <!-- TODO: strip out @c/@a for now. long term solution is changing that to a + tag in the xidl file, and translate it when generating doxygen etc. --> + <xsl:variable name="rep1"> + <xsl:call-template name="string-replace"> + <xsl:with-param name="haystack" select="."/> + <xsl:with-param name="needle" select="'@c'"/> + <xsl:with-param name="replacement" select="''"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="rep2"> + <xsl:call-template name="string-replace"> + <xsl:with-param name="haystack" select="$rep1"/> + <xsl:with-param name="needle" select="'@a'"/> + <xsl:with-param name="replacement" select="''"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="rep3"> + <xsl:call-template name="string-replace"> + <xsl:with-param name="haystack" select="$rep2"/> + <xsl:with-param name="needle" select="'@todo'"/> + <xsl:with-param name="replacement" select="'TODO'"/> + </xsl:call-template> + </xsl:variable> + + <xsl:value-of select="$rep3"/> +</xsl:template> + +<!-- + * all sub-elements that are not explicitly matched are considered to be + * html tags and copied w/o modifications +--> +<xsl:template match="desc//*"> + <xsl:variable name="tagname" select="local-name()"/> + <xsl:value-of select="concat('<',$tagname,'>')"/> + <xsl:apply-templates/> + <xsl:value-of select="concat('</',$tagname,'>')"/> +</xsl:template> + +<xsl:template name="emit_refsig"> + <xsl:param name="context"/> + <xsl:param name="identifier"/> + + <xsl:choose> + <xsl:when test="//enum[@name=$context]/const[@name=$identifier]"> + <xsl:value-of select="$identifier"/> + </xsl:when> + <xsl:when test="//interface[@name=$context]/method[@name=$identifier]"> + <xsl:value-of select="$identifier"/> + <xsl:text>(</xsl:text> + <xsl:for-each select="//interface[@name=$context]/method[@name=$identifier]/param"> + <xsl:if test="@dir!='return'"> + <xsl:if test="position() > 1"> + <xsl:text>,</xsl:text> + </xsl:if> + <xsl:choose> + <xsl:when test="@dir='out'"> + <xsl:text>Holder</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="typeIdl2Glue"> + <xsl:with-param name="type" select="@type"/> + <xsl:with-param name="safearray" select="@safearray"/> + <xsl:with-param name="skiplisttype" select="'yes'"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:if> + </xsl:for-each> + <xsl:text>)</xsl:text> + </xsl:when> + <xsl:when test="//interface[@name=$context]/attribute[@name=$identifier]"> + <xsl:call-template name="makeGetterName"> + <xsl:with-param name="attrname" select="$identifier" /> + </xsl:call-template> + <xsl:text>()</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="fatalError"> + <xsl:with-param name="msg" select="concat('unknown reference destination in @see/@link: context=',$context,' identifier=',$identifier)" /> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<!-- + * link +--> +<xsl:template match="desc//link"> + <xsl:text>{@link </xsl:text> + <xsl:apply-templates select="." mode="middle"/> + <xsl:text>}</xsl:text> +</xsl:template> + +<xsl:template match="link" mode="middle"> + <xsl:variable name="linktext"> + <xsl:value-of select="translate(@to,'_','#')"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="substring($linktext,1,1)='#'"> + <xsl:variable name="context"> + <xsl:choose> + <xsl:when test="local-name(../..)='interface' or local-name(../..)='enum'"> + <xsl:value-of select="../../@name"/> + </xsl:when> + <xsl:when test="local-name(../../..)='interface' or local-name(../../..)='enum'"> + <xsl:value-of select="../../../@name"/> + </xsl:when> + <xsl:when test="local-name(../../../..)='interface' or local-name(../../../..)='enum'"> + <xsl:value-of select="../../../../@name"/> + </xsl:when> + <xsl:when test="local-name(../../../../..)='interface' or local-name(../../../../..)='enum'"> + <xsl:value-of select="../../../../../@name"/> + </xsl:when> + <xsl:when test="local-name(../../../../../..)='interface' or local-name(../../../../../..)='enum'"> + <xsl:value-of select="../../../../../../@name"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="fatalError"> + <xsl:with-param name="msg" select="concat('cannot determine context for identifier ',$linktext)" /> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="linkname"> + <xsl:value-of select="substring($linktext,2)"/> + </xsl:variable> + <xsl:text>#</xsl:text> + <xsl:call-template name="emit_refsig"> + <xsl:with-param name="context" select="$context"/> + <xsl:with-param name="identifier" select="$linkname"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="contains($linktext,'::')"> + <xsl:variable name="context"> + <xsl:value-of select="substring-before($linktext,'::')"/> + </xsl:variable> + <xsl:variable name="linkname"> + <xsl:value-of select="substring-after($linktext,'::')"/> + </xsl:variable> + <xsl:value-of select="concat($G_virtualBoxPackage,'.',$context,'#')"/> + <xsl:call-template name="emit_refsig"> + <xsl:with-param name="context" select="$context"/> + <xsl:with-param name="identifier" select="$linkname"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat($G_virtualBoxPackage,'.',$linktext)"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> +<!-- + * note +--> +<xsl:template match="desc/note"> + <xsl:if test="not(@internal='yes')"> + <xsl:text> NOTE: </xsl:text> + <xsl:apply-templates/> + <xsl:text> </xsl:text> + </xsl:if> +</xsl:template> + +<!-- + * see +--> +<xsl:template match="desc/see"> + <!-- TODO: quirk in our xidl file: only one <see> tag with <link> nested + into it, translate this to multiple @see lines and strip the rest. + Should be replaced in the xidl by multiple <see> without nested tag --> + <xsl:text> </xsl:text> + <xsl:apply-templates match="link"/> +</xsl:template> + +<xsl:template match="desc/see/text()"/> + +<xsl:template match="desc/see/link"> + <xsl:text>@see </xsl:text> + <xsl:apply-templates select="." mode="middle"/> + <xsl:text> </xsl:text> +</xsl:template> + +<!-- + * common comment prologue (handles group IDs) +--> +<xsl:template match="desc" mode="begin"> + <xsl:param name="id" select="@group | preceding::descGroup[1]/@id"/> + <xsl:text>/** </xsl:text> + <xsl:if test="$id"> + <xsl:value-of select="concat(' @ingroup ',$id,' ')"/> + </xsl:if> +</xsl:template> + +<!-- + * common middle part of the comment block +--> +<xsl:template match="desc" mode="middle"> + <xsl:apply-templates select="text() | *[not(self::note or self::see)]"/> + <xsl:apply-templates select="note"/> + <xsl:apply-templates select="see"/> +</xsl:template> + +<!-- + * result part of the comment block +--> +<xsl:template match="desc" mode="results"> + <xsl:if test="result"> + <xsl:text> Expected result codes: </xsl:text> + <xsl:text><table> </xsl:text> + <xsl:for-each select="result"> + <xsl:text><tr></xsl:text> + <xsl:choose> + <xsl:when test="ancestor::library/result[@name=current()/@name]"> + <xsl:value-of select="concat('<td>@link ::',@name,' ',@name,'</td>')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat('<td>',@name,'</td>')"/> + </xsl:otherwise> + </xsl:choose> + <xsl:text><td></xsl:text> + <xsl:apply-templates select="text() | *[not(self::note or self::see or + self::result)]"/> + <xsl:text></td><tr> </xsl:text> + </xsl:for-each> + <xsl:text></table> </xsl:text> + </xsl:if> +</xsl:template> + +<!-- + * translates the string to uppercase +--> +<xsl:template name="uppercase"> + <xsl:param name="str" select="."/> + <xsl:value-of select=" + translate($str,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ') + "/> +</xsl:template> + +<!-- + * comment for interfaces +--> +<xsl:template match="desc" mode="interface"> + <xsl:apply-templates select="." mode="begin"/> + <xsl:apply-templates select="." mode="middle"/> + <xsl:text> Interface ID: <tt>{</xsl:text> + <xsl:call-template name="uppercase"> + <xsl:with-param name="str" select="../@uuid"/> + </xsl:call-template> + <xsl:text>}</tt> */ </xsl:text> +</xsl:template> + +<!-- + * comment for attribute getters +--> +<xsl:template match="desc" mode="attribute_get"> + <xsl:apply-templates select="." mode="begin"/> + <xsl:apply-templates select="text() | *[not(self::note or self::see or self::result)]"/> + <xsl:apply-templates select="." mode="results"/> + <xsl:apply-templates select="note"/> + <xsl:text> @return </xsl:text> + <xsl:call-template name="typeIdl2Glue"> + <xsl:with-param name="type" select="../@type"/> + <xsl:with-param name="safearray" select="../@safearray"/> + </xsl:call-template> + <xsl:text> </xsl:text> + <xsl:apply-templates select="see"/> + <xsl:text> */ </xsl:text> +</xsl:template> + +<!-- + * comment for attribute setters +--> +<xsl:template match="desc" mode="attribute_set"> + <xsl:apply-templates select="." mode="begin"/> + <xsl:apply-templates select="text() | *[not(self::note or self::see or self::result)]"/> + <xsl:apply-templates select="." mode="results"/> + <xsl:apply-templates select="note"/> + <xsl:text> @param value </xsl:text> + <xsl:call-template name="typeIdl2Glue"> + <xsl:with-param name="type" select="../@type"/> + <xsl:with-param name="safearray" select="../@safearray"/> + </xsl:call-template> + <xsl:text> </xsl:text> + <xsl:apply-templates select="see"/> + <xsl:text> */ </xsl:text> +</xsl:template> + +<!-- + * comment for methods +--> +<xsl:template match="desc" mode="method"> + <xsl:apply-templates select="." mode="begin"/> + <xsl:apply-templates select="text() | *[not(self::note or self::see or self::result)]"/> + <xsl:for-each select="../param"> + <xsl:apply-templates select="desc"/> + </xsl:for-each> + <xsl:apply-templates select="." mode="results"/> + <xsl:apply-templates select="note"/> + <xsl:apply-templates select="../param/desc/note"/> + <xsl:apply-templates select="see"/> + <xsl:text> */ </xsl:text> +</xsl:template> + +<!-- + * comment for method parameters +--> +<xsl:template match="method/param/desc"> + <xsl:if test="text() | *[not(self::note or self::see)]"> + <xsl:choose> + <xsl:when test="../@dir='return'"> + <xsl:text> @return </xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text> @param </xsl:text> + <xsl:value-of select="../@name"/> + <xsl:text> </xsl:text> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="text() | *[not(self::note or self::see)]"/> + <xsl:text> </xsl:text> + </xsl:if> +</xsl:template> + +<!-- + * comment for enums +--> +<xsl:template match="desc" mode="enum"> + <xsl:apply-templates select="." mode="begin"/> + <xsl:apply-templates select="." mode="middle"/> + <xsl:text> Interface ID: <tt>{</xsl:text> + <xsl:call-template name="uppercase"> + <xsl:with-param name="str" select="../@uuid"/> + </xsl:call-template> + <xsl:text>}</tt> */ </xsl:text> +</xsl:template> + +<!-- + * comment for enum values +--> +<xsl:template match="desc" mode="enum_const"> + <xsl:apply-templates select="." mode="begin"/> + <xsl:apply-templates select="." mode="middle"/> + <xsl:text> */ </xsl:text> +</xsl:template> + +<!-- + * ignore descGroups by default (processed in /idl) +--> +<xsl:template match="descGroup"/> + + + +<!-- actual code generation --> + <xsl:template name="genEnum"> <xsl:param name="enumname" /> <xsl:param name="filename" /> @@ -115,8 +497,10 @@ <xsl:with-param name="package" select="$G_virtualBoxPackage" /> </xsl:call-template> + <xsl:apply-templates select="desc" mode="enum"/> <xsl:value-of select="concat('public enum ', $enumname, ' { ')" /> <xsl:for-each select="const"> + <xsl:apply-templates select="desc" mode="enum_const"/> <xsl:variable name="enumconst" select="@name" /> <xsl:value-of select="concat(' ', $enumconst, '(', @value, ')')" /> <xsl:choose> @@ -163,7 +547,7 @@ <xsl:template name="startExcWrapper"> - <xsl:value-of select=" ' try { '" /> + <xsl:value-of select="' try { '" /> </xsl:template> @@ -246,34 +630,42 @@ <xsl:param name="type" /> <xsl:param name="safearray" /> <xsl:param name="forceelem" /> + <xsl:param name="skiplisttype" /> <xsl:variable name="needarray" select="($safearray='yes') and not($forceelem='yes')" /> <xsl:variable name="needlist" select="($needarray) and not($type='octet')" /> <xsl:if test="($needlist)"> - <xsl:value-of select="'List<'" /> + <xsl:value-of select="'List'" /> + <xsl:if test="not($skiplisttype='yes')"> + <xsl:value-of select="'<'" /> + </xsl:if> </xsl:if> - <!-- look up Java type from IDL type from table array in websrv-shared.inc.xsl --> - <xsl:variable name="javatypefield" select="exsl:node-set($G_aSharedTypes)/type[@idlname=$type]/@javaname" /> + <xsl:if test="not($needlist) or not($skiplisttype='yes')"> + <!-- look up Java type from IDL type from table array in websrv-shared.inc.xsl --> + <xsl:variable name="javatypefield" select="exsl:node-set($G_aSharedTypes)/type[@idlname=$type]/@javaname" /> - <xsl:choose> - <xsl:when test="string-length($javatypefield)"> - <xsl:value-of select="$javatypefield" /> - </xsl:when> - <!-- not a standard type: then it better be one of the types defined in the XIDL --> - <xsl:when test="$type='$unknown'">IUnknown</xsl:when> - <xsl:otherwise> - <xsl:call-template name="fullClassName"> - <xsl:with-param name="name" select="$type" /> - <xsl:with-param name="collPrefix" select="''"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="string-length($javatypefield)"> + <xsl:value-of select="$javatypefield" /> + </xsl:when> + <!-- not a standard type: then it better be one of the types defined in the XIDL --> + <xsl:when test="$type='$unknown'">IUnknown</xsl:when> + <xsl:otherwise> + <xsl:call-template name="fullClassName"> + <xsl:with-param name="name" select="$type" /> + <xsl:with-param name="collPrefix" select="''"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:if> <xsl:choose> <xsl:when test="($needlist)"> - <xsl:value-of select="'>'" /> + <xsl:if test="not($skiplisttype='yes')"> + <xsl:value-of select="'>'" /> + </xsl:if> </xsl:when> <xsl:when test="($needarray)"> <xsl:value-of select="'[]'" /> @@ -287,9 +679,9 @@ <xsl:template name="typeIdl2Back"> <xsl:param name="type" /> <xsl:param name="safearray" /> - <xsl:param name="forceelem" /> + <xsl:param name="forceelem" /> - <xsl:choose> + <xsl:choose> <xsl:when test="($G_vboxGlueStyle='xpcom')"> <xsl:variable name="needarray" select="($safearray='yes') and not($forceelem='yes')" /> @@ -368,7 +760,7 @@ <xsl:when test="($G_vboxGlueStyle='jaxws')"> <xsl:variable name="needarray" select="($safearray='yes' and not($type='octet')) and not($forceelem='yes')" /> - + <xsl:if test="$needarray"> <xsl:value-of select="'List<'" /> </xsl:if> @@ -1426,6 +1818,7 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> + <xsl:apply-templates select="desc" mode="method"/> <xsl:value-of select="concat(' public ', $returngluetype, ' ', $methodname, '(')" /> <xsl:variable name="paramsinout" select="param[@dir='in' or @dir='out']" /> <xsl:for-each select="exsl:node-set($paramsinout)"> @@ -1866,6 +2259,7 @@ <xsl:otherwise> <!-- emit getter method --> + <xsl:apply-templates select="desc" mode="attribute_get"/> <xsl:variable name="gettername"> <xsl:call-template name="makeGetterName"> <xsl:with-param name="attrname" select="$attrname" /> @@ -1908,6 +2302,7 @@ <xsl:value-of select= "' } '" /> <xsl:if test="not(@readonly='yes')"> <!-- emit setter method --> + <xsl:apply-templates select="desc" mode="attribute_set"/> <xsl:variable name="settername"><xsl:call-template name="makeSetterName"><xsl:with-param name="attrname" select="$attrname" /></xsl:call-template></xsl:variable> <xsl:variable name="unwrapped"> <xsl:call-template name="cookInParam"> @@ -1961,43 +2356,45 @@ <xsl:with-param name="package" select="$G_virtualBoxPackage" /> </xsl:call-template> - <xsl:text>import java.util.List; </xsl:text> + <xsl:text>import java.util.List; </xsl:text> - <xsl:choose> - <xsl:when test="($wsmap='struct') and ($G_vboxGlueStyle='jaxws')"> - <xsl:value-of select="concat('public class ', $ifname, ' { ')" /> - <xsl:call-template name="genStructWrapperJaxws"> - <xsl:with-param name="ifname" select="$ifname" /> - </xsl:call-template> - </xsl:when> + <xsl:apply-templates select="desc" mode="interface"/> + <xsl:choose> + <xsl:when test="($wsmap='struct') and ($G_vboxGlueStyle='jaxws')"> + <xsl:value-of select="concat('public class ', $ifname, ' { ')" /> + <xsl:call-template name="genStructWrapperJaxws"> + <xsl:with-param name="ifname" select="$ifname" /> + </xsl:call-template> + </xsl:when> + + <xsl:otherwise> + <xsl:variable name="extends" select="//interface[@name=$ifname]/@extends" /> + <xsl:choose> + <xsl:when test="($extends = '$unknown') or ($extends = '$dispatched') or ($extends = '$errorinfo')"> + <xsl:value-of select="concat('public class ', $ifname, ' extends IUnknown { ')" /> + </xsl:when> + <xsl:when test="//interface[@name=$extends]"> + <xsl:value-of select="concat('public class ', $ifname, ' extends ', $extends, ' { ')" /> + </xsl:when> <xsl:otherwise> - <xsl:variable name="extends" select="//interface[@name=$ifname]/@extends" /> - <xsl:choose> - <xsl:when test="($extends = '$unknown') or ($extends = '$dispatched') or ($extends = '$errorinfo')"> - <xsl:value-of select="concat('public class ', $ifname, ' extends IUnknown { ')" /> - </xsl:when> - <xsl:when test="//interface[@name=$extends]"> - <xsl:value-of select="concat('public class ', $ifname, ' extends ', $extends, ' { ')" /> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="fatalError"> - <xsl:with-param name="msg" select="concat('Interface generation: interface "', $ifname, '" has invalid "extends" value ', $extends, '.')" /> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - <xsl:call-template name="genIfaceWrapper"> - <xsl:with-param name="ifname" select="$ifname" /> - </xsl:call-template> + <xsl:call-template name="fatalError"> + <xsl:with-param name="msg" select="concat('Interface generation: interface "', $ifname, '" has invalid "extends" value ', $extends, '.')" /> + </xsl:call-template> </xsl:otherwise> - </xsl:choose> + </xsl:choose> + <xsl:call-template name="genIfaceWrapper"> + <xsl:with-param name="ifname" select="$ifname" /> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> - <!-- end of class --> - <xsl:value-of select="'} '" /> + <!-- end of class --> + <xsl:value-of select="'} '" /> - <xsl:call-template name="endFile"> - <xsl:with-param name="file" select="$filename" /> - </xsl:call-template> + <xsl:call-template name="endFile"> + <xsl:with-param name="file" select="$filename" /> + </xsl:call-template> </xsl:template> @@ -2076,30 +2473,6 @@ <xsl:template name="emitHandwritten"> - <xsl:call-template name="startFile"> - <xsl:with-param name="file" select="'Holder.java'" /> - <xsl:with-param name="package" select="$G_virtualBoxPackage" /> - </xsl:call-template> - - <xsl:text><![CDATA[ -public class Holder<T> -{ - public T value; - - public Holder() - { - } - public Holder(T value) - { - this.value = value; - } -} -]]></xsl:text> - - <xsl:call-template name="endFile"> - <xsl:with-param name="file" select="'Holder.java'" /> - </xsl:call-template> - <xsl:call-template name="startFile"> <xsl:with-param name="file" select="'Holder.java'" /> <xsl:with-param name="package" select="$G_virtualBoxPackage" /> @@ -3106,7 +3479,7 @@ public class VirtualBoxManager <xsl:call-template name="startFile"> <xsl:with-param name="file" select="'IUnknown.java'" /> - <xsl:with-param name="package" select="$G_virtualBoxPackageCom" /> + <xsl:with-param name="package" select="$G_virtualBoxPackage" /> </xsl:call-template> <xsl:text><![CDATA[ @@ -3154,7 +3527,7 @@ public class IUnknown <xsl:call-template name="startFile"> <xsl:with-param name="file" select="'Helper.java'" /> - <xsl:with-param name="package" select="$G_virtualBoxPackageCom" /> + <xsl:with-param name="package" select="$G_virtualBoxPackage" /> </xsl:call-template> <xsl:text><![CDATA[ @@ -3242,13 +3615,13 @@ public class Helper { throw new AssertionError(e); } } - + /* Pretty naive Base64 encoder/decoder. */ private static final char[] valToChar = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray(); private static final int[] charToVal = new int[256]; - /* Initialize recoding alphabet. */ - static + /* Initialize recoding alphabet. */ + static { for (int i = 0; i < charToVal.length; i++) charToVal[i] = -1; @@ -3282,7 +3655,7 @@ public class Helper { result[stringIndex++] = valToChar[((ch2 << 2) & 0x3f) | (ch3 >> 6)]; result[stringIndex++] = valToChar[ch3 & 0x3f]; } - + switch (data.length - dataIndex) { case 0: @@ -3326,7 +3699,7 @@ public class Helper { { if (str == null) return null; - + int stringLength = str.length(); if (stringLength == 0) return new byte[0]; @@ -3342,7 +3715,7 @@ public class Helper { if (ch == '=') padChars++; } - + if ((validChars * 3 % 4) != 0) throw new RuntimeException("invalid encoded string "+str); @@ -3364,13 +3737,13 @@ public class Helper { int ch4 = str.charAt(stringIndex++); result[dataIndex++] = (byte)(((charToVal[ch1] << 2) | charToVal[ch2] >> 4) & 0xff); - /* we check this to ensure that we don't override data with '=' padding. */ + /* we check this to ensure that we don't override data with '=' padding. */ if (dataIndex < result.length) result[dataIndex++] = (byte)(((charToVal[ch2] << 4) | charToVal[ch3] >> 2) & 0xff); if (dataIndex < result.length) result[dataIndex++] = (byte)(((charToVal[ch3] << 6) | charToVal[ch4]) & 0xff); } - + return result; } } diff --git a/src/VBox/Main/glue/initterm.cpp b/src/VBox/Main/glue/initterm.cpp index c2adf88ce..276b68b8c 100644 --- a/src/VBox/Main/glue/initterm.cpp +++ b/src/VBox/Main/glue/initterm.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm.cpp 35640 2011-01-19 20:44:02Z vboxsync $ */ +/* $Id: initterm.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer - Initialization and Termination. diff --git a/src/VBox/Main/glue/string.cpp b/src/VBox/Main/glue/string.cpp index 49fe8366c..09edbeee2 100644 --- a/src/VBox/Main/glue/string.cpp +++ b/src/VBox/Main/glue/string.cpp @@ -1,4 +1,4 @@ -/* $Id: string.cpp 36530 2011-04-04 13:56:10Z vboxsync $ */ +/* $Id: string.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer - UTF-8 and UTF-16 string classes. */ diff --git a/src/VBox/Main/glue/tests/Makefile b/src/VBox/Main/glue/tests/Makefile new file mode 100644 index 000000000..e1f0cb204 --- /dev/null +++ b/src/VBox/Main/glue/tests/Makefile @@ -0,0 +1,71 @@ +## @file +# Makefile for a sample/testcase using the 'glue' Java API bindings + +# +# Copyright (C) 2010-2011 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +# +# User serviceable parts: adjust the following lines appropriately +# + +# The host OS: linux, solaris, win, darwin, freebsd +HOSTOS=linux +# Absolute (!) path to the VirtualBox install directory +VBOX_BIN = /opt/VirtualBox +# Path to the sdk directory of the unpacked VirtualBox SDK +VBOX_SDK = ../../.. +# On Windows, if you want to use the COM API: install directory of Jacob lib +JACOB_DIR = +# Extra classpath entries needed for compiling/running the sample +CLASSPATH = +# Java compiler to use +JAVAC = javac +# Java VM to use +JAVA = java + + +# +# No changes should be necessary after this point. +# + +ifeq ($(HOSTOS),win) + JACOB_JAR=$(JACOB_DIR)/jacob.jar + VBOX_JAR=$(VBOX_SDK)/bindings/mscom/java/vboxjmscom.jar + SEP=\; + JAVA_COM_ARGS += -Djava.library.path=$(JACOB_DIR) + CLASSPATH += $(JACOB_JAR)$(SEP) +else + VBOX_JAR=$(VBOX_SDK)/bindings/xpcom/java/vboxjxpcom.jar + SEP=: + JAVA_COM_ARGS += -Dvbox.home=$(VBOX_BIN) +endif + +VBOX_JAR_WS=$(VBOX_SDK)/bindings/webservice/java/jax-ws/vboxjws.jar + + +all: ws/TestVBox.class com/TestVBox.class + +test: ws/test-TestVBox com/test-TestVBox + +com/TestVBox.class: + @mkdir com 2>/dev/null || true + $(JAVAC) -d com -cp $(VBOX_JAR)$(SEP)$(CLASSPATH) TestVBox.java + +com/test-TestVBox: com/TestVBox.class + $(JAVA) $(JAVA_COM_ARGS) -cp com$(SEP)$(VBOX_JAR)$(SEP)$(CLASSPATH) TestVBox + +ws/TestVBox.class: + @mkdir ws 2>/dev/null || true + $(JAVAC) -d ws -cp $(VBOX_JAR_WS)$(SEP)$(CLASSPATH) TestVBox.java + +ws/test-TestVBox: ws/TestVBox.class + $(JAVA) $(JAVA_WS_ARGS) -cp ws$(SEP)$(VBOX_JAR_WS)$(SEP)$(CLASSPATH) TestVBox -w -url http://localhost:18083/ diff --git a/src/VBox/Main/glue/tests/Makefile.kmk b/src/VBox/Main/glue/tests/Makefile.kmk deleted file mode 100644 index 17251a90b..000000000 --- a/src/VBox/Main/glue/tests/Makefile.kmk +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2010 Oracle Corporation -# -# This file is part of VirtualBox Open Source Edition (OSE), as -# available from http://www.virtualbox.org. This file is free software; -# you can redistribute it and/or modify it under the terms of the GNU -# General Public License (GPL) as published by the Free Software -# Foundation, in version 2 as it comes in the "COPYING" file of the -# VirtualBox OSE distribution. VirtualBox OSE is distributed in the -# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -# -ifeq ($(KBUILD_HOST),darwin) - VBOX_BIN=/Applications/VirtualBox.app/Contents/MacOS - VBOX_SDK=$(VBOX_BIN)/sdk - JAVA15=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Commands/java -# JAVA_ARGS += -d32 -endif - -ifeq ($(KBUILD_HOST),linux) - VBOX_BIN=/home/nike/work/ws/out/linux.amd64/debug/bin - VBOX_SDK=$(VBOX_BIN)/sdk -endif - -ifeq ($(KBUILD_HOST),win) - VBOX_BIN=e:/ws/out/win.amd64/debug/bin - VBOX_SDK=$(VBOX_BIN)/sdk - JACOB_DIR=s:/jacob-1.15-M3/ - JACOB_JAR=$(JACOB_DIR)/jacob.jar - CLASSPATH += $(JACOB_JAR)$(SEP) - JAVA_ARGS += -Djava.library.path=$(JACOB_DIR) -endif - -ifeq ($(KBUILD_HOST),win) - VBOX_JAR=$(VBOX_SDK)/bindings/mscom/java/vboxjmscom.jar - SEP=\; -else - VBOX_JAR=$(VBOX_SDK)/bindings/xpcom/java/vboxjxpcom.jar - SEP=: -endif - -VBOX_JAR_WS=$(VBOX_SDK)/bindings/webservice/java/jax-ws/vboxjws.jar - -JAVA_ARGS += -Dvbox.home=$(VBOX_BIN) -CLASSPATH := $(CLASSPATH)$(VBOX_JAR)$(SEP). - -all: testvb - -testvb: - javac -cp $(VBOX_JAR) TestVBox.java - java $(JAVA_ARGS) -cp $(CLASSPATH) TestVBox - -JAXLIBS=../../webservice/jaxlibs/ -# -noverify could be needed due http://bugs.sun.com/bugdatabase/view_bug.do;jsessionid=eb3fcd8f72ab4713f96e378a7575?bug_id=6614974 -testws15: - javac -target 1.5 -source 1.5 -cp $(VBOX_JAR) TestVBox.java - $(JAVA15) $(JAVA_ARGS) -cp $(VBOX_JAR_WS)$(SEP)$(CLASSPATH)$(SEP)$(JAXLIBS)/jaxws-api.jar$(SEP)$(JAXLIBS)/jaxws-rt.jar \ - TestVBox -w -url http://localhost:18083 - -testws: - javac -cp $(VBOX_JAR_WS) TestVBox.java - java $(JAVA_ARGS) -cp $(VBOX_JAR_WS)$(SEP)$(CLASSPATH) TestVBox -w -url http://localhost:18083 diff --git a/src/VBox/Main/glue/tests/TestVBox.java b/src/VBox/Main/glue/tests/TestVBox.java index 447260548..8da41fdbc 100644 --- a/src/VBox/Main/glue/tests/TestVBox.java +++ b/src/VBox/Main/glue/tests/TestVBox.java @@ -1,6 +1,10 @@ -/* $Id: TestVBox.java 36281 2011-03-15 11:49:08Z vboxsync $ */ +/* $Id: TestVBox.java $ */ + +/* Small sample/testcase which demonstrates that the same source code can + * be used to connect to the webservice and (XP)COM APIs. */ + /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -59,10 +63,10 @@ public class TestVBox es.registerListener(listener, Arrays.asList(VBoxEventType.Any), false); try { - for (int i=0; i<100; i++) + for (int i=0; i<50; i++) { System.out.print("."); - IEvent ev = es.getEvent(listener, 1000); + IEvent ev = es.getEvent(listener, 500); if (ev != null) { processEvent(ev); @@ -81,10 +85,32 @@ public class TestVBox List<IMachine> machs = vbox.getMachines(); for (IMachine m : machs) { - System.out.println("VM name: " + m.getName());// + ", RAM size: " + m.getMemorySize() + "MB"); - System.out.println(" HWVirt: " + m.getHWVirtExProperty(HWVirtExPropertyType.Enabled) - + ", Nested Paging: " + m.getHWVirtExProperty(HWVirtExPropertyType.NestedPaging) - + ", PAE: " + m.getCPUProperty(CPUPropertyType.PAE) ); + String name; + Long ram = 0L; + boolean hwvirtEnabled = false, hwvirtNestedPaging = false; + boolean paeEnabled = false; + boolean inaccessible = false; + try + { + name = m.getName(); + ram = m.getMemorySize(); + hwvirtEnabled = m.getHWVirtExProperty(HWVirtExPropertyType.Enabled); + hwvirtNestedPaging = m.getHWVirtExProperty(HWVirtExPropertyType.NestedPaging); + paeEnabled = m.getCPUProperty(CPUPropertyType.PAE); + } + catch (VBoxException e) + { + name = "<inaccessible>"; + inaccessible = true; + } + System.out.println("VM name: " + name); + if (!inaccessible) + { + System.out.println(" RAM size: " + ram + "MB" + + ", HWVirt: " + hwvirtEnabled + + ", Nested Paging: " + hwvirtNestedPaging + + ", PAE: " + paeEnabled); + } } } @@ -170,7 +196,7 @@ public class TestVBox { System.out.println("VirtualBox version: " + vbox.getVersion() + "\n"); testEnumeration(mgr, vbox); - //testReadLog(mgr, vbox); + testReadLog(mgr, vbox); testStart(mgr, vbox); testEvents(mgr, vbox.getEventSource()); diff --git a/src/VBox/Main/idl/VirtualBox.xidl b/src/VBox/Main/idl/VirtualBox.xidl index f008661b7..3686c37ae 100644 --- a/src/VBox/Main/idl/VirtualBox.xidl +++ b/src/VBox/Main/idl/VirtualBox.xidl @@ -1,4 +1,4 @@ -<?xml version="1.0" ?> +<?xml version="1.0" encoding="utf-8"?> <!-- @@ -2633,11 +2633,11 @@ </method> <method name="getWarnings"> - <desc>Returns textual warnings which occurred during execution of <link to="#interpret" />.</desc> + <desc>Returns textual warnings which occurred during execution of <link to="#interpret" />.</desc> - <param name="aWarnings" type="wstring" dir="return" safearray="yes"> - <desc></desc> - </param> + <param name="aWarnings" type="wstring" dir="return" safearray="yes"> + <desc></desc> + </param> </method> </interface> @@ -3759,7 +3759,7 @@ will return an appropriate error message explaining the exact reason and the changes you made to this machine will not be saved. - Starting with VirtualBox 4.0, a “.vbox†extension of the settings + Starting with VirtualBox 4.0, a ".vbox" extension of the settings file is recommended, but not enforced. (Previous versions always used a generic ".xml" extension.) </desc> @@ -4383,11 +4383,11 @@ The @a environment argument is a string containing definitions of environment variables in the following format: - @code + <pre> NAME[=VALUE]\n NAME[=VALUE]\n ... - @endcode + </pre> where <tt>\\n</tt> is the new line character. These environment variables will be appended to the environment of the VirtualBox server process. If an environment variable exists both in the server process @@ -9782,6 +9782,12 @@ Differencing image. Only allowed for child images. </desc> </const> + <const name="NoCreateDir" value="0x40000000"> + <desc> + Special flag which suppresses automatic creation of the subdirectory. + Only used when passing the medium variant as an input parameter. + </desc> + </const> </enum> <interface diff --git a/src/VBox/Main/idl/midl.xsl b/src/VBox/Main/idl/midl.xsl index b9fe818c6..c2fd56bc0 100644 --- a/src/VBox/Main/idl/midl.xsl +++ b/src/VBox/Main/idl/midl.xsl @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- $Id: midl.xsl 35913 2011-02-09 12:44:03Z vboxsync $ --> +<!-- $Id: midl.xsl $ --> <!-- * A template to generate a MS IDL compatible interface definition file diff --git a/src/VBox/Main/idl/xpidl.xsl b/src/VBox/Main/idl/xpidl.xsl index 18c9e3e23..e53819da7 100644 --- a/src/VBox/Main/idl/xpidl.xsl +++ b/src/VBox/Main/idl/xpidl.xsl @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- $Id: xpidl.xsl 30631 2010-07-05 19:20:03Z vboxsync $ --> +<!-- $Id: xpidl.xsl $ --> <!-- * A template to generate a XPCOM IDL compatible interface definition file diff --git a/src/VBox/Main/include/ApplianceImpl.h b/src/VBox/Main/include/ApplianceImpl.h index ef0b3d475..d6f22a5ec 100644 --- a/src/VBox/Main/include/ApplianceImpl.h +++ b/src/VBox/Main/include/ApplianceImpl.h @@ -1,4 +1,4 @@ -/* $Id: ApplianceImpl.h 38455 2011-08-15 09:57:51Z vboxsync $ */ +/* $Id: ApplianceImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/AudioAdapterImpl.h b/src/VBox/Main/include/AudioAdapterImpl.h index becf72ecb..d2c91b307 100644 --- a/src/VBox/Main/include/AudioAdapterImpl.h +++ b/src/VBox/Main/include/AudioAdapterImpl.h @@ -1,4 +1,4 @@ -/* $Id: AudioAdapterImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: AudioAdapterImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/BIOSSettingsImpl.h b/src/VBox/Main/include/BIOSSettingsImpl.h index 6df3a15bc..dffff1d00 100644 --- a/src/VBox/Main/include/BIOSSettingsImpl.h +++ b/src/VBox/Main/include/BIOSSettingsImpl.h @@ -1,4 +1,4 @@ -/* $Id: BIOSSettingsImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: BIOSSettingsImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/BusAssignmentManager.h b/src/VBox/Main/include/BusAssignmentManager.h index a0531a554..e5b004deb 100644 --- a/src/VBox/Main/include/BusAssignmentManager.h +++ b/src/VBox/Main/include/BusAssignmentManager.h @@ -1,4 +1,4 @@ -/* $Id: BusAssignmentManager.h 36107 2011-02-28 18:24:32Z vboxsync $ */ +/* $Id: BusAssignmentManager.h $ */ /** @file * diff --git a/src/VBox/Main/include/ConsoleImpl.h b/src/VBox/Main/include/ConsoleImpl.h index a566fa5ca..201c559be 100644 --- a/src/VBox/Main/include/ConsoleImpl.h +++ b/src/VBox/Main/include/ConsoleImpl.h @@ -1,4 +1,4 @@ -/* $Id: ConsoleImpl.h 37851 2011-07-08 17:04:03Z vboxsync $ */ +/* $Id: ConsoleImpl.h $ */ /** @file * VBox Console COM Class definition */ diff --git a/src/VBox/Main/include/ConsoleVRDPServer.h b/src/VBox/Main/include/ConsoleVRDPServer.h index ef2af20fd..f425e9afb 100644 --- a/src/VBox/Main/include/ConsoleVRDPServer.h +++ b/src/VBox/Main/include/ConsoleVRDPServer.h @@ -1,4 +1,4 @@ -/* $Id: ConsoleVRDPServer.h 37282 2011-06-01 02:56:05Z vboxsync $ */ +/* $Id: ConsoleVRDPServer.h $ */ /** @file * VBox Console VRDE Server Helper class and implementation of IVRDEServerInfo */ diff --git a/src/VBox/Main/include/DHCPServerImpl.h b/src/VBox/Main/include/DHCPServerImpl.h index 044720755..0773d7bfe 100644 --- a/src/VBox/Main/include/DHCPServerImpl.h +++ b/src/VBox/Main/include/DHCPServerImpl.h @@ -1,4 +1,4 @@ -/* $Id: DHCPServerImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: DHCPServerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/DHCPServerRunner.h b/src/VBox/Main/include/DHCPServerRunner.h index adc8da713..b13084555 100644 --- a/src/VBox/Main/include/DHCPServerRunner.h +++ b/src/VBox/Main/include/DHCPServerRunner.h @@ -1,4 +1,4 @@ -/* $Id: DHCPServerRunner.h 33590 2010-10-29 08:55:09Z vboxsync $ */ +/* $Id: DHCPServerRunner.h $ */ /** @file * VirtualBox Main - interface for VBox DHCP server */ diff --git a/src/VBox/Main/include/DisplayImpl.h b/src/VBox/Main/include/DisplayImpl.h index 1c5c09b99..4d8a0fe40 100644 --- a/src/VBox/Main/include/DisplayImpl.h +++ b/src/VBox/Main/include/DisplayImpl.h @@ -1,4 +1,4 @@ -/* $Id: DisplayImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: DisplayImpl.h $ */ /** @file * VirtualBox COM class implementation */ diff --git a/src/VBox/Main/include/ExtPackManagerImpl.h b/src/VBox/Main/include/ExtPackManagerImpl.h index c0c0e57c1..894f5d5d1 100644 --- a/src/VBox/Main/include/ExtPackManagerImpl.h +++ b/src/VBox/Main/include/ExtPackManagerImpl.h @@ -1,4 +1,4 @@ -/* $Id: ExtPackManagerImpl.h 37843 2011-07-08 12:34:18Z vboxsync $ */ +/* $Id: ExtPackManagerImpl.h $ */ /** @file * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC. */ diff --git a/src/VBox/Main/include/ExtPackUtil.h b/src/VBox/Main/include/ExtPackUtil.h index c2016728e..1e2c6da86 100644 --- a/src/VBox/Main/include/ExtPackUtil.h +++ b/src/VBox/Main/include/ExtPackUtil.h @@ -1,4 +1,4 @@ -/* $Id: ExtPackUtil.h 37843 2011-07-08 12:34:18Z vboxsync $ */ +/* $Id: ExtPackUtil.h $ */ /** @file * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++. */ diff --git a/src/VBox/Main/include/FramebufferImpl.h b/src/VBox/Main/include/FramebufferImpl.h index eb13c796c..1ea5951a9 100644 --- a/src/VBox/Main/include/FramebufferImpl.h +++ b/src/VBox/Main/include/FramebufferImpl.h @@ -1,4 +1,4 @@ -/* $Id: FramebufferImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: FramebufferImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/Global.h b/src/VBox/Main/include/Global.h index 011b4bcb1..e43aa7081 100644 --- a/src/VBox/Main/include/Global.h +++ b/src/VBox/Main/include/Global.h @@ -1,4 +1,4 @@ -/* $Id: Global.h 34244 2010-11-22 14:31:02Z vboxsync $ */ +/* $Id: Global.h $ */ /** @file * VirtualBox COM API - Global Declarations and Definitions. */ diff --git a/src/VBox/Main/include/GuestDirEntryImpl.h b/src/VBox/Main/include/GuestDirEntryImpl.h index a9269da47..8d56267fa 100644 --- a/src/VBox/Main/include/GuestDirEntryImpl.h +++ b/src/VBox/Main/include/GuestDirEntryImpl.h @@ -1,4 +1,4 @@ -/* $Id: GuestDirEntryImpl.h 38296 2011-08-03 11:16:08Z vboxsync $ */ +/* $Id: GuestDirEntryImpl.h $ */ /** @file * VirtualBox Main - interface for guest directory entries, VBoxC. */ diff --git a/src/VBox/Main/include/HostHardwareLinux.h b/src/VBox/Main/include/HostHardwareLinux.h index d7dea5cd6..6469ced15 100644 --- a/src/VBox/Main/include/HostHardwareLinux.h +++ b/src/VBox/Main/include/HostHardwareLinux.h @@ -1,4 +1,4 @@ -/* $Id: HostHardwareLinux.h 36527 2011-04-04 13:16:09Z vboxsync $ */ +/* $Id: HostHardwareLinux.h $ */ /** @file * VirtualBox Main - Classes for handling hardware detection under Linux. * diff --git a/src/VBox/Main/include/HostImpl.h b/src/VBox/Main/include/HostImpl.h index 757ec7409..516065ff8 100644 --- a/src/VBox/Main/include/HostImpl.h +++ b/src/VBox/Main/include/HostImpl.h @@ -1,4 +1,4 @@ -/* $Id: HostImpl.h 36615 2011-04-07 12:45:27Z vboxsync $ */ +/* $Id: HostImpl.h $ */ /** @file * Implementation of IHost. */ diff --git a/src/VBox/Main/include/HostNetworkInterfaceImpl.h b/src/VBox/Main/include/HostNetworkInterfaceImpl.h index 0c6f0a72d..0d8306cdb 100644 --- a/src/VBox/Main/include/HostNetworkInterfaceImpl.h +++ b/src/VBox/Main/include/HostNetworkInterfaceImpl.h @@ -1,4 +1,4 @@ -/* $Id: HostNetworkInterfaceImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: HostNetworkInterfaceImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/HostUSBDeviceImpl.h b/src/VBox/Main/include/HostUSBDeviceImpl.h index 106ce1274..e04f17277 100644 --- a/src/VBox/Main/include/HostUSBDeviceImpl.h +++ b/src/VBox/Main/include/HostUSBDeviceImpl.h @@ -1,4 +1,4 @@ -/* $Id: HostUSBDeviceImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: HostUSBDeviceImpl.h $ */ /** @file * VirtualBox IHostUSBDevice COM interface implementation. */ diff --git a/src/VBox/Main/include/KeyboardImpl.h b/src/VBox/Main/include/KeyboardImpl.h index 0225044cc..4b8446f48 100644 --- a/src/VBox/Main/include/KeyboardImpl.h +++ b/src/VBox/Main/include/KeyboardImpl.h @@ -1,4 +1,4 @@ -/* $Id: KeyboardImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: KeyboardImpl.h $ */ /** @file * VirtualBox COM class implementation */ diff --git a/src/VBox/Main/include/Logging.h b/src/VBox/Main/include/Logging.h index 17ca5e55e..a01737983 100644 --- a/src/VBox/Main/include/Logging.h +++ b/src/VBox/Main/include/Logging.h @@ -1,4 +1,4 @@ -/* $Id: Logging.h 38037 2011-07-18 17:31:38Z vboxsync $ */ +/* $Id: Logging.h $ */ /** @file * diff --git a/src/VBox/Main/include/MachineDebuggerImpl.h b/src/VBox/Main/include/MachineDebuggerImpl.h index 3ad95d129..b17c086b6 100644 --- a/src/VBox/Main/include/MachineDebuggerImpl.h +++ b/src/VBox/Main/include/MachineDebuggerImpl.h @@ -1,4 +1,4 @@ -/* $Id: MachineDebuggerImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: MachineDebuggerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/MachineImpl.h b/src/VBox/Main/include/MachineImpl.h index 3bb4ffb46..ae5c6e253 100644 --- a/src/VBox/Main/include/MachineImpl.h +++ b/src/VBox/Main/include/MachineImpl.h @@ -1,4 +1,4 @@ -/* $Id: MachineImpl.h 37851 2011-07-08 17:04:03Z vboxsync $ */ +/* $Id: MachineImpl.h $ */ /** @file * VirtualBox COM class implementation */ @@ -270,8 +270,8 @@ public: BOOL mCPUAttached[SchemaDefs::MaxCPUCount]; - settings::CpuIdLeaf mCpuIdStdLeafs[10]; - settings::CpuIdLeaf mCpuIdExtLeafs[10]; + settings::CpuIdLeaf mCpuIdStdLeafs[11]; + settings::CpuIdLeaf mCpuIdExtLeafs[11]; DeviceType_T mBootOrder[SchemaDefs::MaxBootPosition]; diff --git a/src/VBox/Main/include/MediumAttachmentImpl.h b/src/VBox/Main/include/MediumAttachmentImpl.h index e367af283..e3707ac4a 100644 --- a/src/VBox/Main/include/MediumAttachmentImpl.h +++ b/src/VBox/Main/include/MediumAttachmentImpl.h @@ -51,6 +51,7 @@ public: bool fTempEject, bool fNonRotational, const Utf8Str &strBandwidthGroup); + HRESULT initCopy(Machine *aParent, MediumAttachment *aThat); void uninit(); HRESULT FinalConstruct(); diff --git a/src/VBox/Main/include/MediumFormatImpl.h b/src/VBox/Main/include/MediumFormatImpl.h index 0220f66e8..feac8a716 100644 --- a/src/VBox/Main/include/MediumFormatImpl.h +++ b/src/VBox/Main/include/MediumFormatImpl.h @@ -1,4 +1,4 @@ -/* $Id: MediumFormatImpl.h 37587 2011-06-22 12:02:13Z vboxsync $ */ +/* $Id: MediumFormatImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/MediumImpl.h b/src/VBox/Main/include/MediumImpl.h index bad9db21e..014afb6d0 100644 --- a/src/VBox/Main/include/MediumImpl.h +++ b/src/VBox/Main/include/MediumImpl.h @@ -1,4 +1,4 @@ -/* $Id: MediumImpl.h 38420 2011-08-11 14:30:48Z vboxsync $ */ +/* $Id: MediumImpl.h $ */ /** @file * @@ -176,10 +176,9 @@ public: MediumType_T getType() const; Utf8Str getName(); + /* handles caller/locking itself */ bool addRegistry(const Guid& id, bool fRecurse); -private: - void addRegistryImpl(const Guid& id, bool fRecurse); -public: + /* handles caller/locking itself */ bool removeRegistry(const Guid& id, bool fRecurse); bool isInRegistry(const Guid& id); bool getFirstRegistryMachineId(Guid &uuid) const; diff --git a/src/VBox/Main/include/MediumLock.h b/src/VBox/Main/include/MediumLock.h index b6cd68cf5..eaa12f8b4 100644 --- a/src/VBox/Main/include/MediumLock.h +++ b/src/VBox/Main/include/MediumLock.h @@ -1,4 +1,4 @@ -/* $Id: MediumLock.h 36580 2011-04-06 13:52:10Z vboxsync $ */ +/* $Id: MediumLock.h $ */ /** @file * diff --git a/src/VBox/Main/include/MouseImpl.h b/src/VBox/Main/include/MouseImpl.h index ca9725925..4bbb6a182 100644 --- a/src/VBox/Main/include/MouseImpl.h +++ b/src/VBox/Main/include/MouseImpl.h @@ -1,4 +1,4 @@ -/* $Id: MouseImpl.h 36161 2011-03-04 10:24:58Z vboxsync $ */ +/* $Id: MouseImpl.h $ */ /** @file * VirtualBox COM class implementation */ diff --git a/src/VBox/Main/include/NATEngineImpl.h b/src/VBox/Main/include/NATEngineImpl.h index 31fe4a69f..2f2485e0c 100644 --- a/src/VBox/Main/include/NATEngineImpl.h +++ b/src/VBox/Main/include/NATEngineImpl.h @@ -1,4 +1,4 @@ -/* $Id: NATEngineImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: NATEngineImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/NetworkAdapterImpl.h b/src/VBox/Main/include/NetworkAdapterImpl.h index 12d45486f..8eb57485b 100644 --- a/src/VBox/Main/include/NetworkAdapterImpl.h +++ b/src/VBox/Main/include/NetworkAdapterImpl.h @@ -1,4 +1,4 @@ -/* $Id: NetworkAdapterImpl.h 37200 2011-05-24 15:34:06Z vboxsync $ */ +/* $Id: NetworkAdapterImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/ParallelPortImpl.h b/src/VBox/Main/include/ParallelPortImpl.h index b9e499c01..f952f7207 100644 --- a/src/VBox/Main/include/ParallelPortImpl.h +++ b/src/VBox/Main/include/ParallelPortImpl.h @@ -1,4 +1,4 @@ -/* $Id: ParallelPortImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: ParallelPortImpl.h $ */ /** @file * VirtualBox COM class implementation. diff --git a/src/VBox/Main/include/PciDeviceAttachmentImpl.h b/src/VBox/Main/include/PciDeviceAttachmentImpl.h index c2d26b355..8b25b905b 100644 --- a/src/VBox/Main/include/PciDeviceAttachmentImpl.h +++ b/src/VBox/Main/include/PciDeviceAttachmentImpl.h @@ -1,4 +1,4 @@ -/* $Id: PciDeviceAttachmentImpl.h 35885 2011-02-08 01:20:04Z vboxsync $ */ +/* $Id: PciDeviceAttachmentImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/PciRawDevImpl.h b/src/VBox/Main/include/PciRawDevImpl.h index 89146c256..26e66050c 100644 --- a/src/VBox/Main/include/PciRawDevImpl.h +++ b/src/VBox/Main/include/PciRawDevImpl.h @@ -1,4 +1,4 @@ -/* $Id: PciRawDevImpl.h 37802 2011-07-06 13:32:15Z vboxsync $ */ +/* $Id: PciRawDevImpl.h $ */ /** @file * VirtualBox Driver interface to raw PCI device */ diff --git a/src/VBox/Main/include/Performance.h b/src/VBox/Main/include/Performance.h index ee958c81e..84c458668 100644 --- a/src/VBox/Main/include/Performance.h +++ b/src/VBox/Main/include/Performance.h @@ -1,4 +1,4 @@ -/* $Id: Performance.h 36842 2011-04-26 07:54:09Z vboxsync $ */ +/* $Id: Performance.h $ */ /** @file * VirtualBox Main - Performance Classes declaration. */ diff --git a/src/VBox/Main/include/PerformanceImpl.h b/src/VBox/Main/include/PerformanceImpl.h index 1d6618afd..1ac7304fd 100644 --- a/src/VBox/Main/include/PerformanceImpl.h +++ b/src/VBox/Main/include/PerformanceImpl.h @@ -1,4 +1,4 @@ -/* $Id: PerformanceImpl.h 36128 2011-03-02 05:44:04Z vboxsync $ */ +/* $Id: PerformanceImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/ProgressCombinedImpl.h b/src/VBox/Main/include/ProgressCombinedImpl.h index ab733b759..c6454d6eb 100644 --- a/src/VBox/Main/include/ProgressCombinedImpl.h +++ b/src/VBox/Main/include/ProgressCombinedImpl.h @@ -1,4 +1,4 @@ -/* $Id: ProgressCombinedImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: ProgressCombinedImpl.h $ */ /** @file * * VirtualBox COM class implementation diff --git a/src/VBox/Main/include/ProgressImpl.h b/src/VBox/Main/include/ProgressImpl.h index aefb9f333..a04d4b06f 100644 --- a/src/VBox/Main/include/ProgressImpl.h +++ b/src/VBox/Main/include/ProgressImpl.h @@ -1,4 +1,4 @@ -/* $Id: ProgressImpl.h 37069 2011-05-13 12:41:38Z vboxsync $ */ +/* $Id: ProgressImpl.h $ */ /** @file * * VirtualBox COM class implementation diff --git a/src/VBox/Main/include/ProgressProxyImpl.h b/src/VBox/Main/include/ProgressProxyImpl.h index 8271f1cfa..8e1715ca0 100644 --- a/src/VBox/Main/include/ProgressProxyImpl.h +++ b/src/VBox/Main/include/ProgressProxyImpl.h @@ -1,4 +1,4 @@ -/* $Id: ProgressProxyImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: ProgressProxyImpl.h $ */ /** @file * IProgress implementation for Machine::openRemoteSession in VBoxSVC. */ diff --git a/src/VBox/Main/include/RemoteUSBDeviceImpl.h b/src/VBox/Main/include/RemoteUSBDeviceImpl.h index 5ac7e40a6..5154997a3 100644 --- a/src/VBox/Main/include/RemoteUSBDeviceImpl.h +++ b/src/VBox/Main/include/RemoteUSBDeviceImpl.h @@ -1,4 +1,4 @@ -/* $Id: RemoteUSBDeviceImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: RemoteUSBDeviceImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/SerialPortImpl.h b/src/VBox/Main/include/SerialPortImpl.h index 7b3775d64..1ecfa939b 100644 --- a/src/VBox/Main/include/SerialPortImpl.h +++ b/src/VBox/Main/include/SerialPortImpl.h @@ -1,4 +1,4 @@ -/* $Id: SerialPortImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: SerialPortImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/SnapshotImpl.h b/src/VBox/Main/include/SnapshotImpl.h index f38f6d868..6310b3d03 100644 --- a/src/VBox/Main/include/SnapshotImpl.h +++ b/src/VBox/Main/include/SnapshotImpl.h @@ -1,4 +1,4 @@ -/* $Id: SnapshotImpl.h 37449 2011-06-14 16:34:16Z vboxsync $ */ +/* $Id: SnapshotImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/StorageControllerImpl.h b/src/VBox/Main/include/StorageControllerImpl.h index 38cd9ae2a..abf130509 100644 --- a/src/VBox/Main/include/StorageControllerImpl.h +++ b/src/VBox/Main/include/StorageControllerImpl.h @@ -1,4 +1,4 @@ -/* $Id: StorageControllerImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: StorageControllerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/SystemPropertiesImpl.h b/src/VBox/Main/include/SystemPropertiesImpl.h index 1a127bdc7..55a06eefa 100644 --- a/src/VBox/Main/include/SystemPropertiesImpl.h +++ b/src/VBox/Main/include/SystemPropertiesImpl.h @@ -1,4 +1,4 @@ -/* $Id: SystemPropertiesImpl.h 35761 2011-01-28 13:19:26Z vboxsync $ */ +/* $Id: SystemPropertiesImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/USBControllerImpl.h b/src/VBox/Main/include/USBControllerImpl.h index b6584b14a..19c97a3e0 100644 --- a/src/VBox/Main/include/USBControllerImpl.h +++ b/src/VBox/Main/include/USBControllerImpl.h @@ -1,4 +1,4 @@ -/* $Id: USBControllerImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: USBControllerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/USBDeviceFilterImpl.h b/src/VBox/Main/include/USBDeviceFilterImpl.h index 56cfde57d..562d76931 100644 --- a/src/VBox/Main/include/USBDeviceFilterImpl.h +++ b/src/VBox/Main/include/USBDeviceFilterImpl.h @@ -1,4 +1,4 @@ -/* $Id: USBDeviceFilterImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: USBDeviceFilterImpl.h $ */ /** @file * Declaration of USBDeviceFilter and HostUSBDeviceFilter. */ diff --git a/src/VBox/Main/include/USBDeviceImpl.h b/src/VBox/Main/include/USBDeviceImpl.h index 3d66a60c8..162fb6e8c 100644 --- a/src/VBox/Main/include/USBDeviceImpl.h +++ b/src/VBox/Main/include/USBDeviceImpl.h @@ -1,4 +1,4 @@ -/* $Id: USBDeviceImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: USBDeviceImpl.h $ */ /** @file * Header file for the OUSBDevice (IUSBDevice) class, VBoxC. diff --git a/src/VBox/Main/include/USBGetDevices.h b/src/VBox/Main/include/USBGetDevices.h index 082bda9c8..fd0b29ff0 100644 --- a/src/VBox/Main/include/USBGetDevices.h +++ b/src/VBox/Main/include/USBGetDevices.h @@ -1,4 +1,4 @@ -/* $Id: USBGetDevices.h 37624 2011-06-24 08:57:35Z vboxsync $ */ +/* $Id: USBGetDevices.h $ */ /** @file * VirtualBox Linux host USB device enumeration. */ diff --git a/src/VBox/Main/include/USBProxyService.h b/src/VBox/Main/include/USBProxyService.h index 3ea4441b0..1dad12d6f 100644 --- a/src/VBox/Main/include/USBProxyService.h +++ b/src/VBox/Main/include/USBProxyService.h @@ -1,4 +1,4 @@ -/* $Id: USBProxyService.h 37618 2011-06-23 17:16:39Z vboxsync $ */ +/* $Id: USBProxyService.h $ */ /** @file * VirtualBox USB Proxy Service (base) class. */ diff --git a/src/VBox/Main/include/VFSExplorerImpl.h b/src/VBox/Main/include/VFSExplorerImpl.h index 3869d7b12..958714320 100644 --- a/src/VBox/Main/include/VFSExplorerImpl.h +++ b/src/VBox/Main/include/VFSExplorerImpl.h @@ -1,4 +1,4 @@ -/* $Id: VFSExplorerImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: VFSExplorerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/VRDEServerImpl.h b/src/VBox/Main/include/VRDEServerImpl.h index a876928f6..84ceaa527 100644 --- a/src/VBox/Main/include/VRDEServerImpl.h +++ b/src/VBox/Main/include/VRDEServerImpl.h @@ -1,4 +1,4 @@ -/* $Id: VRDEServerImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: VRDEServerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/VirtualBoxClientImpl.h b/src/VBox/Main/include/VirtualBoxClientImpl.h index 266c0061d..8a4d973d8 100644 --- a/src/VBox/Main/include/VirtualBoxClientImpl.h +++ b/src/VBox/Main/include/VirtualBoxClientImpl.h @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxClientImpl.h 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: VirtualBoxClientImpl.h $ */ /** @file * Header file for the VirtualBoxClient (IVirtualBoxClient) class, VBoxC. diff --git a/src/VBox/Main/include/VirtualBoxImpl.h b/src/VBox/Main/include/VirtualBoxImpl.h index 2d3efb651..3447397de 100644 --- a/src/VBox/Main/include/VirtualBoxImpl.h +++ b/src/VBox/Main/include/VirtualBoxImpl.h @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxImpl.h 37985 2011-07-15 15:04:39Z vboxsync $ */ +/* $Id: VirtualBoxImpl.h $ */ /** @file * VirtualBox COM class implementation */ @@ -281,7 +281,7 @@ public: static void addGuidToListUniquely(GuidList &llRegistriesThatNeedSaving, const Guid &uuid); HRESULT saveRegistries(const GuidList &llRegistriesThatNeedSaving); - static HRESULT ensureFilePathExists(const Utf8Str &strFileName); + static HRESULT ensureFilePathExists(const Utf8Str &strFileName, bool fCreate); static HRESULT handleUnexpectedExceptions (RT_SRC_POS_DECL); diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h index ee5afb807..e1e21d5cb 100644 --- a/src/VBox/Main/include/ovfreader.h +++ b/src/VBox/Main/include/ovfreader.h @@ -1,4 +1,4 @@ -/* $Id: ovfreader.h 36527 2011-04-04 13:16:09Z vboxsync $ */ +/* $Id: ovfreader.h $ */ /** @file * VirtualBox Main - OVF reader declarations. * diff --git a/src/VBox/Main/src-all/DisplayPNGUtil.cpp b/src/VBox/Main/src-all/DisplayPNGUtil.cpp index 127b33afb..345becfcc 100644 --- a/src/VBox/Main/src-all/DisplayPNGUtil.cpp +++ b/src/VBox/Main/src-all/DisplayPNGUtil.cpp @@ -1,4 +1,4 @@ -/* $Id: DisplayPNGUtil.cpp 36494 2011-04-01 13:14:47Z vboxsync $ */ +/* $Id: DisplayPNGUtil.cpp $ */ /** @file * PNG utilities */ diff --git a/src/VBox/Main/src-all/DisplayUtils.cpp b/src/VBox/Main/src-all/DisplayUtils.cpp index 29cf02553..691155d78 100644 --- a/src/VBox/Main/src-all/DisplayUtils.cpp +++ b/src/VBox/Main/src-all/DisplayUtils.cpp @@ -1,4 +1,4 @@ -/* $Id: DisplayUtils.cpp 35576 2011-01-14 18:46:03Z vboxsync $ */ +/* $Id: DisplayUtils.cpp $ */ /** @file * Implementation of IDisplay helpers. */ diff --git a/src/VBox/Main/src-all/EventImpl.cpp b/src/VBox/Main/src-all/EventImpl.cpp index 5c7ee87be..131b8d824 100644 --- a/src/VBox/Main/src-all/EventImpl.cpp +++ b/src/VBox/Main/src-all/EventImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: EventImpl.cpp 36619 2011-04-08 07:51:31Z vboxsync $ */ +/* $Id: EventImpl.cpp $ */ /** @file * VirtualBox COM Event class implementation */ diff --git a/src/VBox/Main/src-all/ExtPackManagerImpl.cpp b/src/VBox/Main/src-all/ExtPackManagerImpl.cpp index e541b9061..4573b61eb 100644 --- a/src/VBox/Main/src-all/ExtPackManagerImpl.cpp +++ b/src/VBox/Main/src-all/ExtPackManagerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ExtPackManagerImpl.cpp 37843 2011-07-08 12:34:18Z vboxsync $ */ +/* $Id: ExtPackManagerImpl.cpp $ */ /** @file * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC. */ diff --git a/src/VBox/Main/src-all/ExtPackUtil.cpp b/src/VBox/Main/src-all/ExtPackUtil.cpp index 232673ed9..86728a2fd 100644 --- a/src/VBox/Main/src-all/ExtPackUtil.cpp +++ b/src/VBox/Main/src-all/ExtPackUtil.cpp @@ -1,4 +1,4 @@ -/* $Id: ExtPackUtil.cpp 36527 2011-04-04 13:16:09Z vboxsync $ */ +/* $Id: ExtPackUtil.cpp $ */ /** @file * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++. */ diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp index 374723e39..a26431818 100644 --- a/src/VBox/Main/src-all/Global.cpp +++ b/src/VBox/Main/src-all/Global.cpp @@ -1,4 +1,4 @@ -/* $Id: Global.cpp 38295 2011-08-03 09:47:48Z vboxsync $ */ +/* $Id: Global.cpp $ */ /** @file * @@ -99,6 +99,14 @@ const Global::OSType Global::sOSTypes[SchemaDefs::OSTypeId_COUNT] = VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 512, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, + { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8, "Windows 8", + VBOXOSTYPE_Win8, VBOXOSHINT_NONE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 1024, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, + { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8_64, "Windows 8 (64 bit)", + VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 1536, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT, "Other Windows", VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -221,7 +229,7 @@ const Global::OSType Global::sOSTypes[SchemaDefs::OSTypeId_COUNT] = StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris_64, "Oracle Solaris 10 5/09 and earlier (64 bit)", VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, - 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris, "Oracle Solaris 10 10/09 and later", VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, @@ -229,7 +237,7 @@ const Global::OSType Global::sOSTypes[SchemaDefs::OSTypeId_COUNT] = StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris_64, "Oracle Solaris 10 10/09 and later (64 bit)", VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, + 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD, "FreeBSD", VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, diff --git a/src/VBox/Main/src-all/PciDeviceAttachmentImpl.cpp b/src/VBox/Main/src-all/PciDeviceAttachmentImpl.cpp index d3aedbe08..2d5e66ed6 100644 --- a/src/VBox/Main/src-all/PciDeviceAttachmentImpl.cpp +++ b/src/VBox/Main/src-all/PciDeviceAttachmentImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: PciDeviceAttachmentImpl.cpp 36107 2011-02-28 18:24:32Z vboxsync $ */ +/* $Id: PciDeviceAttachmentImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-all/ProgressImpl.cpp b/src/VBox/Main/src-all/ProgressImpl.cpp index c68626a03..6fa4eab43 100644 --- a/src/VBox/Main/src-all/ProgressImpl.cpp +++ b/src/VBox/Main/src-all/ProgressImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ProgressImpl.cpp 38181 2011-07-26 12:31:09Z vboxsync $ */ +/* $Id: ProgressImpl.cpp $ */ /** @file * * VirtualBox Progress COM class implementation diff --git a/src/VBox/Main/src-all/VirtualBoxBase.cpp b/src/VBox/Main/src-all/VirtualBoxBase.cpp index d6265af3a..9f819e46e 100644 --- a/src/VBox/Main/src-all/VirtualBoxBase.cpp +++ b/src/VBox/Main/src-all/VirtualBoxBase.cpp @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxBase.cpp 36451 2011-03-28 19:40:52Z vboxsync $ */ +/* $Id: VirtualBoxBase.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-client/AudioSnifferInterface.cpp b/src/VBox/Main/src-client/AudioSnifferInterface.cpp index adbf028dd..ee8ea5218 100644 --- a/src/VBox/Main/src-client/AudioSnifferInterface.cpp +++ b/src/VBox/Main/src-client/AudioSnifferInterface.cpp @@ -1,4 +1,4 @@ -/* $Id: AudioSnifferInterface.cpp 35368 2010-12-30 13:38:23Z vboxsync $ */ +/* $Id: AudioSnifferInterface.cpp $ */ /** @file * VirtualBox Driver Interface to Audio Sniffer device */ diff --git a/src/VBox/Main/src-client/BusAssignmentManager.cpp b/src/VBox/Main/src-client/BusAssignmentManager.cpp index 3350bd663..e25b05e14 100644 --- a/src/VBox/Main/src-client/BusAssignmentManager.cpp +++ b/src/VBox/Main/src-client/BusAssignmentManager.cpp @@ -1,4 +1,4 @@ -/* $Id: BusAssignmentManager.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: BusAssignmentManager.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-client/ConsoleImpl.cpp b/src/VBox/Main/src-client/ConsoleImpl.cpp index 126edde3a..3a01ad937 100644 --- a/src/VBox/Main/src-client/ConsoleImpl.cpp +++ b/src/VBox/Main/src-client/ConsoleImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ConsoleImpl.cpp 37851 2011-07-08 17:04:03Z vboxsync $ */ +/* $Id: ConsoleImpl.cpp $ */ /** @file * VBox Console COM Class implementation */ @@ -6427,7 +6427,9 @@ HRESULT Console::powerUp(IProgress **aProgress, bool aPaused) rc = consoleInitReleaseLog(mMachine); if (FAILED(rc)) throw rc; +#ifdef VBOX_WITH_EXTPACK mptrExtPackManager->dumpAllToReleaseLog(); +#endif #ifdef RT_OS_SOLARIS /* setup host core dumper for the VM */ @@ -7133,7 +7135,6 @@ HRESULT Console::createSharedFolder(const Utf8Str &strName, const SharedFolderDa Log(("Adding shared folder '%s' -> '%s'\n", strName.c_str(), aData.m_strHostPath.c_str())); // check whether the path is valid and exists - /* Check whether the path is full (absolute) */ char hostPathFull[RTPATH_MAX]; int vrc = RTPathAbsEx(NULL, aData.m_strHostPath.c_str(), @@ -7143,15 +7144,15 @@ HRESULT Console::createSharedFolder(const Utf8Str &strName, const SharedFolderDa return setError(E_INVALIDARG, tr("Invalid shared folder path: '%s' (%Rrc)"), aData.m_strHostPath.c_str(), vrc); - - if (RTPathCompare(aData.m_strHostPath.c_str(), hostPathFull) != 0) - return setError(E_INVALIDARG, - tr("Shared folder path '%s' is not absolute"), - aData.m_strHostPath.c_str()); if (!RTPathExists(hostPathFull)) return setError(E_INVALIDARG, tr("Shared folder path '%s' does not exist on the host"), aData.m_strHostPath.c_str()); + /* Check whether the path is full (absolute) */ + if (RTPathCompare(aData.m_strHostPath.c_str(), hostPathFull) != 0) + return setError(E_INVALIDARG, + tr("Shared folder path '%s' is not absolute"), + aData.m_strHostPath.c_str()); // now that we know the path is good, give it to HGCM diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp index d531c2cc2..40610844f 100644 --- a/src/VBox/Main/src-client/ConsoleImpl2.cpp +++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp @@ -1,4 +1,4 @@ -/* $Id: ConsoleImpl2.cpp 38192 2011-07-27 05:41:11Z vboxsync $ */ +/* $Id: ConsoleImpl2.cpp $ */ /** @file * VBox Console COM Class implementation * @@ -232,7 +232,10 @@ static int findEfiRom(IVirtualBox* vbox, FirmwareType_T aFirmwareType, Utf8Str * AssertComRCReturn(hrc, Global::vboxStatusCodeFromCOM(hrc)); if (!fPresent) + { + LogRel(("Failed to find an EFI ROM file.\n")); return VERR_FILE_NOT_FOUND; + } *pEfiRomFile = Utf8Str(aFilePath); diff --git a/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp b/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp index 80fb44734..d5f4561eb 100644 --- a/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp +++ b/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp @@ -1,4 +1,4 @@ -/* $Id: ConsoleImplTeleporter.cpp 36041 2011-02-21 16:04:53Z vboxsync $ */ +/* $Id: ConsoleImplTeleporter.cpp $ */ /** @file * VBox Console COM Class implementation, The Teleporter Part. */ diff --git a/src/VBox/Main/src-client/ConsoleVRDPServer.cpp b/src/VBox/Main/src-client/ConsoleVRDPServer.cpp index 9b0b652c9..8471267fc 100644 --- a/src/VBox/Main/src-client/ConsoleVRDPServer.cpp +++ b/src/VBox/Main/src-client/ConsoleVRDPServer.cpp @@ -1,4 +1,4 @@ -/* $Id: ConsoleVRDPServer.cpp 37809 2011-07-07 08:15:02Z vboxsync $ */ +/* $Id: ConsoleVRDPServer.cpp $ */ /** @file * VBox Console VRDP Helper class */ diff --git a/src/VBox/Main/src-client/DisplayImpl.cpp b/src/VBox/Main/src-client/DisplayImpl.cpp index dd3a278bd..658fa3963 100644 --- a/src/VBox/Main/src-client/DisplayImpl.cpp +++ b/src/VBox/Main/src-client/DisplayImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: DisplayImpl.cpp 38275 2011-08-02 11:14:44Z vboxsync $ */ +/* $Id: DisplayImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ @@ -2192,7 +2192,8 @@ int Display::displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_ { int rc; pDisplay->vbvaLock(); - if (aScreenId == VBOX_VIDEO_PRIMARY_SCREEN) + if ( aScreenId == VBOX_VIDEO_PRIMARY_SCREEN + && pDisplay->maFramebuffers[aScreenId].fVBVAEnabled == false) /* A non-VBVA mode. */ { rc = pDisplay->mpDrv->pUpPort->pfnTakeScreenshot(pDisplay->mpDrv->pUpPort, ppu8Data, pcbData, pu32Width, pu32Height); } @@ -2991,6 +2992,19 @@ DECLCALLBACK(int) Display::changeFramebuffer (Display *that, IFramebuffer *aFB, /* Setup the new framebuffer, the resize will lead to an updateDisplayData call. */ DISPLAYFBINFO *pFBInfo = &that->maFramebuffers[uScreenId]; +#if defined(VBOX_WITH_CROGL) + /* Leave the lock, because SHCRGL_HOST_FN_SCREEN_CHANGED will read current framebuffer */ + { + BOOL is3denabled; + that->mParent->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled); + + if (is3denabled) + { + alock.leave (); + } + } +#endif + if (pFBInfo->fVBVAEnabled && pFBInfo->pu8FramebufferVRAM) { /* This display in VBVA mode. Resize it to the last guest resolution, diff --git a/src/VBox/Main/src-client/GuestCtrlIO.cpp b/src/VBox/Main/src-client/GuestCtrlIO.cpp index 657f12e6e..a7aa568cb 100644 --- a/src/VBox/Main/src-client/GuestCtrlIO.cpp +++ b/src/VBox/Main/src-client/GuestCtrlIO.cpp @@ -1,4 +1,4 @@ -/* $Id: GuestCtrlIO.cpp 38439 2011-08-12 15:29:32Z vboxsync $ */ +/* $Id: GuestCtrlIO.cpp $ */ /** @file * * IO helper for IGuest COM class implementations. diff --git a/src/VBox/Main/src-client/GuestCtrlImpl.cpp b/src/VBox/Main/src-client/GuestCtrlImpl.cpp index 3ab4d8884..10c9ee96d 100644 --- a/src/VBox/Main/src-client/GuestCtrlImpl.cpp +++ b/src/VBox/Main/src-client/GuestCtrlImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: GuestCtrlImpl.cpp 38439 2011-08-12 15:29:32Z vboxsync $ */ +/* $Id: GuestCtrlImpl.cpp $ */ /** @file * VirtualBox COM class implementation: Guest */ @@ -1455,7 +1455,7 @@ HRESULT Guest::executeProcessInternal(IN_BSTR aCommand, ULONG aFlags, if (FAILED(autoCaller.rc())) return autoCaller.rc(); /* Validate flags. */ - if (aFlags != ExecuteProcessFlag_None) + if (aFlags != ExecuteProcessFlag_None) { if ( !(aFlags & ExecuteProcessFlag_IgnoreOrphanedProcesses) && !(aFlags & ExecuteProcessFlag_WaitForProcessStartOnly) diff --git a/src/VBox/Main/src-client/GuestCtrlImplFile.cpp b/src/VBox/Main/src-client/GuestCtrlImplFile.cpp index 917550218..d04abe217 100644 --- a/src/VBox/Main/src-client/GuestCtrlImplFile.cpp +++ b/src/VBox/Main/src-client/GuestCtrlImplFile.cpp @@ -86,7 +86,7 @@ HRESULT Guest::fileExistsInternal(IN_BSTR aFile, IN_BSTR aUsername, IN_BSTR aPas break; case VERR_NOT_FOUND: - rc = setError(VBOX_E_IPRT_ERROR, + hr = setError(VBOX_E_IPRT_ERROR, Guest::tr("Unable to query file existence")); break; diff --git a/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp b/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp index 8f12624dd..b026322b3 100644 --- a/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp +++ b/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp @@ -464,6 +464,8 @@ HRESULT Guest::taskCopyFileFromGuest(GuestTask *aTask) Guest::tr("Source file \"%s\" does not exist, or is not a file"), aTask->strSource.c_str()); } + else + rc = GuestTask::setProgressErrorInfo(rc, aTask->progress, pGuest); /* Query file size to make an estimate for our progress object. */ if (SUCCEEDED(rc)) @@ -538,7 +540,7 @@ HRESULT Guest::taskCopyFileFromGuest(GuestTask *aTask) RTFILE hFileDest; int vrc = RTFileOpen(&hFileDest, aTask->strDest.c_str(), - RTFILE_O_READWRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE); + RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE); if (RT_FAILURE(vrc)) rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress, Guest::tr("Unable to create/open destination file \"%s\", rc=%Rrc"), @@ -557,10 +559,18 @@ HRESULT Guest::taskCopyFileFromGuest(GuestTask *aTask) { if (!aOutputData.size()) { - if (cbToRead) + /* + * Only bitch about an unexpected end of a file when there already + * was data read from that file. If this was the very first read we can + * be (almost) sure that this file is not meant to be read by the specified user. + */ + if ( cbTransfered + && cbToRead) + { rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress, - Guest::tr("Unexpected end of file \"%s\" (%u bytes left)"), - aTask->strSource.c_str(), cbToRead); + Guest::tr("Unexpected end of file \"%s\" (%u bytes left, %u bytes written)"), + aTask->strSource.c_str(), cbToRead, cbTransfered); + } break; } diff --git a/src/VBox/Main/src-client/GuestDirEntryImpl.cpp b/src/VBox/Main/src-client/GuestDirEntryImpl.cpp index 78052273f..8bf50daad 100644 --- a/src/VBox/Main/src-client/GuestDirEntryImpl.cpp +++ b/src/VBox/Main/src-client/GuestDirEntryImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: GuestDirEntryImpl.cpp 38395 2011-08-10 11:48:29Z vboxsync $ */ +/* $Id: GuestDirEntryImpl.cpp $ */ /** @file * VirtualBox Main - interface for guest directory entries, VBoxC. */ diff --git a/src/VBox/Main/src-client/GuestImpl.cpp b/src/VBox/Main/src-client/GuestImpl.cpp index 467036834..47c4af6ab 100644 --- a/src/VBox/Main/src-client/GuestImpl.cpp +++ b/src/VBox/Main/src-client/GuestImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: GuestImpl.cpp 37930 2011-07-13 19:56:55Z vboxsync $ */ +/* $Id: GuestImpl.cpp $ */ /** @file * VirtualBox COM class implementation: Guest */ diff --git a/src/VBox/Main/src-client/HGCMObjects.cpp b/src/VBox/Main/src-client/HGCMObjects.cpp index c4e01791e..76de0e72e 100644 --- a/src/VBox/Main/src-client/HGCMObjects.cpp +++ b/src/VBox/Main/src-client/HGCMObjects.cpp @@ -1,4 +1,4 @@ -/* $Id: HGCMObjects.cpp 35374 2010-12-30 14:42:15Z vboxsync $ */ +/* $Id: HGCMObjects.cpp $ */ /** @file * HGCMObjects - Host-Guest Communication Manager objects */ diff --git a/src/VBox/Main/src-client/HGCMThread.cpp b/src/VBox/Main/src-client/HGCMThread.cpp index dfab76ebc..49c3db18e 100644 --- a/src/VBox/Main/src-client/HGCMThread.cpp +++ b/src/VBox/Main/src-client/HGCMThread.cpp @@ -1,4 +1,4 @@ -/* $Id: HGCMThread.cpp 35909 2011-02-09 11:50:02Z vboxsync $ */ +/* $Id: HGCMThread.cpp $ */ /** @file * HGCMThread - Host-Guest Communication Manager Threads */ diff --git a/src/VBox/Main/src-client/KeyboardImpl.cpp b/src/VBox/Main/src-client/KeyboardImpl.cpp index f90414799..81b60576d 100644 --- a/src/VBox/Main/src-client/KeyboardImpl.cpp +++ b/src/VBox/Main/src-client/KeyboardImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: KeyboardImpl.cpp 36724 2011-04-19 08:57:30Z vboxsync $ */ +/* $Id: KeyboardImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ diff --git a/src/VBox/Main/src-client/MachineDebuggerImpl.cpp b/src/VBox/Main/src-client/MachineDebuggerImpl.cpp index 77a38c8e9..16f63ed92 100644 --- a/src/VBox/Main/src-client/MachineDebuggerImpl.cpp +++ b/src/VBox/Main/src-client/MachineDebuggerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MachineDebuggerImpl.cpp 38324 2011-08-05 14:02:53Z vboxsync $ */ +/* $Id: MachineDebuggerImpl.cpp $ */ /** @file * VBox IMachineDebugger COM class implementation. */ diff --git a/src/VBox/Main/src-client/MouseImpl.cpp b/src/VBox/Main/src-client/MouseImpl.cpp index 68e07acc7..8ce0784c0 100644 --- a/src/VBox/Main/src-client/MouseImpl.cpp +++ b/src/VBox/Main/src-client/MouseImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MouseImpl.cpp 38271 2011-08-01 21:01:03Z vboxsync $ */ +/* $Id: MouseImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ @@ -479,6 +479,13 @@ STDMETHODIMP Mouse::PutMouseEvent(LONG dx, LONG dy, LONG dz, LONG dw, LONG butto * value from MOUSE_RANGE_LOWER to MOUSE_RANGE_UPPER. Sets the optional * validity value to false if the pair is not on an active screen and to true * otherwise. + * @note since guests with recent versions of X.Org use a different method + * to everyone else to map the valuator value to a screen pixel (they + * multiply by the screen dimension, do a floating point divide by + * the valuator maximum and round the result, while everyone else + * does truncating integer operations) we adjust the value we send + * so that it maps to the right pixel both when the result is rounded + * and when it is truncated. * * @returns COM status value */ @@ -490,6 +497,10 @@ HRESULT Mouse::convertDisplayRes(LONG x, LONG y, int32_t *pcX, int32_t *pcY, AssertPtrNullReturn(pfValid, E_POINTER); Display *pDisplay = mParent->getDisplay(); ComAssertRet(pDisplay, E_FAIL); + /** The amount to add to the result (multiplied by the screen width/height) + * to compensate for differences in guest methods for mapping back to + * pixels */ + enum { ADJUST_RANGE = - 3 * MOUSE_RANGE / 4 }; if (pfValid) *pfValid = true; @@ -502,16 +513,16 @@ HRESULT Mouse::convertDisplayRes(LONG x, LONG y, int32_t *pcX, int32_t *pcY, if (FAILED(rc)) return rc; - *pcX = displayWidth ? (x * MOUSE_RANGE - MOUSE_RANGE / 2) / (LONG) displayWidth: 0; - *pcY = displayHeight ? (y * MOUSE_RANGE - MOUSE_RANGE / 2) / (LONG) displayHeight: 0; + *pcX = displayWidth ? (x * MOUSE_RANGE + ADJUST_RANGE) / (LONG) displayWidth: 0; + *pcY = displayHeight ? (y * MOUSE_RANGE + ADJUST_RANGE) / (LONG) displayHeight: 0; } else { int32_t x1, y1, x2, y2; /* Takes the display lock */ pDisplay->getFramebufferDimensions(&x1, &y1, &x2, &y2); - *pcX = x1 < x2 ? ((x - x1) * MOUSE_RANGE - MOUSE_RANGE / 2) / (x2 - x1) : 0; - *pcY = y1 < y2 ? ((y - y1) * MOUSE_RANGE - MOUSE_RANGE / 2) / (y2 - y1) : 0; + *pcX = x1 < x2 ? ((x - x1) * MOUSE_RANGE + ADJUST_RANGE) / (x2 - x1) : 0; + *pcY = y1 < y2 ? ((y - y1) * MOUSE_RANGE + ADJUST_RANGE) / (y2 - y1) : 0; if ( *pcX < MOUSE_RANGE_LOWER || *pcX > MOUSE_RANGE_UPPER || *pcY < MOUSE_RANGE_LOWER || *pcY > MOUSE_RANGE_UPPER) if (pfValid) diff --git a/src/VBox/Main/src-client/PciRawDevImpl.cpp b/src/VBox/Main/src-client/PciRawDevImpl.cpp index 80c644ad7..bca5b047b 100644 --- a/src/VBox/Main/src-client/PciRawDevImpl.cpp +++ b/src/VBox/Main/src-client/PciRawDevImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: PciRawDevImpl.cpp 37802 2011-07-06 13:32:15Z vboxsync $ */ +/* $Id: PciRawDevImpl.cpp $ */ /** @file * VirtualBox Driver Interface to raw PCI device. */ diff --git a/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp b/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp index 70934fc94..df63ad26d 100644 --- a/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp +++ b/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: RemoteUSBDeviceImpl.cpp 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: RemoteUSBDeviceImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-client/SessionImpl.cpp b/src/VBox/Main/src-client/SessionImpl.cpp index 564cf9a59..355df5e90 100644 --- a/src/VBox/Main/src-client/SessionImpl.cpp +++ b/src/VBox/Main/src-client/SessionImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: SessionImpl.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: SessionImpl.cpp $ */ /** @file * VBox Client Session COM Class implementation in VBoxC. */ diff --git a/src/VBox/Main/src-client/USBDeviceImpl.cpp b/src/VBox/Main/src-client/USBDeviceImpl.cpp index 2600d4069..a927d64fe 100644 --- a/src/VBox/Main/src-client/USBDeviceImpl.cpp +++ b/src/VBox/Main/src-client/USBDeviceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: USBDeviceImpl.cpp 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: USBDeviceImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ diff --git a/src/VBox/Main/src-client/VMMDevInterface.cpp b/src/VBox/Main/src-client/VMMDevInterface.cpp index b512da2e2..6e7f05c39 100644 --- a/src/VBox/Main/src-client/VMMDevInterface.cpp +++ b/src/VBox/Main/src-client/VMMDevInterface.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMDevInterface.cpp 37175 2011-05-21 20:51:24Z vboxsync $ */ +/* $Id: VMMDevInterface.cpp $ */ /** @file * VirtualBox Driver Interface to VMM device. */ diff --git a/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp b/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp index 607512c90..94ed652d5 100644 --- a/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp +++ b/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxClientImpl.cpp 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: VirtualBoxClientImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ diff --git a/src/VBox/Main/src-client/win/VBoxC.rc b/src/VBox/Main/src-client/win/VBoxC.rc index 3a6602cc5..2adf754b3 100644 --- a/src/VBox/Main/src-client/win/VBoxC.rc +++ b/src/VBox/Main/src-client/win/VBoxC.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxC.rc 35368 2010-12-30 13:38:23Z vboxsync $ */ +/* $Id: VBoxC.rc $ */ /** @file * VBoxC - Resource file containing version info and icon. */ diff --git a/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp b/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp index b5071a37a..2e8de5d49 100644 --- a/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp +++ b/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxExtPackHelperApp.cpp 36527 2011-04-04 13:16:09Z vboxsync $ */ +/* $Id: VBoxExtPackHelperApp.cpp $ */ /** @file * VirtualBox Main - Extension Pack Helper Application, usually set-uid-to-root. */ diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp index 709c0d0cb..4edfff352 100644 --- a/src/VBox/Main/src-server/ApplianceImpl.cpp +++ b/src/VBox/Main/src-server/ApplianceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ApplianceImpl.cpp 37200 2011-05-24 15:34:06Z vboxsync $ */ +/* $Id: ApplianceImpl.cpp $ */ /** @file * * IAppliance and IVirtualSystem COM class implementations. diff --git a/src/VBox/Main/src-server/ApplianceImplExport.cpp b/src/VBox/Main/src-server/ApplianceImplExport.cpp index 46fb013f9..841356c4a 100644 --- a/src/VBox/Main/src-server/ApplianceImplExport.cpp +++ b/src/VBox/Main/src-server/ApplianceImplExport.cpp @@ -1,4 +1,4 @@ -/* $Id: ApplianceImplExport.cpp 36523 2011-04-04 12:40:10Z vboxsync $ */ +/* $Id: ApplianceImplExport.cpp $ */ /** @file * * IAppliance and IVirtualSystem COM class implementations. diff --git a/src/VBox/Main/src-server/ApplianceImplIO.cpp b/src/VBox/Main/src-server/ApplianceImplIO.cpp index 36dd13552..2a5765fec 100644 --- a/src/VBox/Main/src-server/ApplianceImplIO.cpp +++ b/src/VBox/Main/src-server/ApplianceImplIO.cpp @@ -1,4 +1,4 @@ -/* $Id: ApplianceImplIO.cpp 36043 2011-02-21 17:04:14Z vboxsync $ */ +/* $Id: ApplianceImplIO.cpp $ */ /** @file * * IO helper for IAppliance COM class implementations. diff --git a/src/VBox/Main/src-server/ApplianceImplImport.cpp b/src/VBox/Main/src-server/ApplianceImplImport.cpp index 3d0377f4e..f02253b45 100644 --- a/src/VBox/Main/src-server/ApplianceImplImport.cpp +++ b/src/VBox/Main/src-server/ApplianceImplImport.cpp @@ -1,4 +1,4 @@ -/* $Id: ApplianceImplImport.cpp 38455 2011-08-15 09:57:51Z vboxsync $ */ +/* $Id: ApplianceImplImport.cpp $ */ /** @file * * IAppliance and IVirtualSystem COM class implementations. diff --git a/src/VBox/Main/src-server/DHCPServerImpl.cpp b/src/VBox/Main/src-server/DHCPServerImpl.cpp index d0ce36348..45f21370b 100644 --- a/src/VBox/Main/src-server/DHCPServerImpl.cpp +++ b/src/VBox/Main/src-server/DHCPServerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: DHCPServerImpl.cpp 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: DHCPServerImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/DHCPServerRunner.cpp b/src/VBox/Main/src-server/DHCPServerRunner.cpp index e1c5e8172..5bb58033a 100644 --- a/src/VBox/Main/src-server/DHCPServerRunner.cpp +++ b/src/VBox/Main/src-server/DHCPServerRunner.cpp @@ -1,4 +1,4 @@ -/* $Id: DHCPServerRunner.cpp 35368 2010-12-30 13:38:23Z vboxsync $ */ +/* $Id: DHCPServerRunner.cpp $ */ /** @file * VirtualBox Main - interface for VBox DHCP server */ diff --git a/src/VBox/Main/src-server/HostImpl.cpp b/src/VBox/Main/src-server/HostImpl.cpp index fe75e22c8..ef84d042d 100644 --- a/src/VBox/Main/src-server/HostImpl.cpp +++ b/src/VBox/Main/src-server/HostImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: HostImpl.cpp 38406 2011-08-10 15:40:47Z vboxsync $ */ +/* $Id: HostImpl.cpp $ */ /** @file * VirtualBox COM class implementation: Host */ diff --git a/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp b/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp index ac089e8e7..a5ae09485 100644 --- a/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp +++ b/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: HostNetworkInterfaceImpl.cpp 38406 2011-08-10 15:40:47Z vboxsync $ */ +/* $Id: HostNetworkInterfaceImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp b/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp index cd85264b2..9c6fe5c75 100644 --- a/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp +++ b/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: HostUSBDeviceImpl.cpp 38213 2011-07-28 09:35:47Z vboxsync $ */ +/* $Id: HostUSBDeviceImpl.cpp $ */ /** @file * VirtualBox IHostUSBDevice COM interface implementation. */ diff --git a/src/VBox/Main/src-server/Logging.cpp b/src/VBox/Main/src-server/Logging.cpp index 148a50f5d..9b6d1e37e 100644 --- a/src/VBox/Main/src-server/Logging.cpp +++ b/src/VBox/Main/src-server/Logging.cpp @@ -1,4 +1,4 @@ -/* $Id: Logging.cpp 37666 2011-06-28 12:33:34Z vboxsync $ */ +/* $Id: Logging.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp index fb4692411..98f596fda 100644 --- a/src/VBox/Main/src-server/MachineImpl.cpp +++ b/src/VBox/Main/src-server/MachineImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MachineImpl.cpp 38357 2011-08-08 16:05:00Z vboxsync $ */ +/* $Id: MachineImpl.cpp $ */ /** @file * Implementation of IMachine in VBoxSVC. */ @@ -1903,7 +1903,7 @@ STDMETHODIMP Machine::SetCPUIDLeaf(ULONG aId, ULONG aValEax, ULONG aValEbx, ULON case 0x8: case 0x9: case 0xA: - AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xA); + AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs)); setModified(IsModified_MachineData); mHWData.backup(); @@ -1925,7 +1925,7 @@ STDMETHODIMP Machine::SetCPUIDLeaf(ULONG aId, ULONG aValEax, ULONG aValEbx, ULON case 0x80000008: case 0x80000009: case 0x8000000A: - AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xA); + AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs)); setModified(IsModified_MachineData); mHWData.backup(); @@ -1965,7 +1965,7 @@ STDMETHODIMP Machine::RemoveCPUIDLeaf(ULONG aId) case 0x8: case 0x9: case 0xA: - AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xA); + AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs)); setModified(IsModified_MachineData); mHWData.backup(); @@ -1984,7 +1984,7 @@ STDMETHODIMP Machine::RemoveCPUIDLeaf(ULONG aId) case 0x80000008: case 0x80000009: case 0x8000000A: - AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xA); + AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs)); setModified(IsModified_MachineData); mHWData.backup(); @@ -3732,7 +3732,9 @@ STDMETHODIMP Machine::AttachDevice(IN_BSTR aControllerName, // image that has not yet been attached (medium then points to the base and we're // creating the diff image for the immutable, and the parent is not yet registered); // put the parent in the machine registry then + mediumLock.release(); addMediumToRegistry(medium, llRegistriesThatNeedSaving, &uuidRegistryParent); + mediumLock.acquire(); } rc = diff->init(mParent, medium->getPreferredDiffFormat(), @@ -3815,9 +3817,11 @@ STDMETHODIMP Machine::AttachDevice(IN_BSTR aControllerName, // here we can fail because of Deleting, or being in process of creating a Diff if (FAILED(rc)) return rc; + mediumLock.release(); addMediumToRegistry(medium, llRegistriesThatNeedSaving, NULL /* Guid *puuid */); + mediumLock.acquire(); } /* success: finally remember the attachment */ @@ -4189,7 +4193,9 @@ STDMETHODIMP Machine::MountMedium(IN_BSTR aControllerName, { pMedium->addBackReference(mData->mUuid); + mediumLock.release(); addMediumToRegistry(pMedium, llRegistriesThatNeedSaving, NULL /* Guid *puuid */ ); + mediumLock.acquire(); } pAttach->updateMedium(pMedium); @@ -4946,7 +4952,7 @@ STDMETHODIMP Machine::CreateSharedFolder(IN_BSTR aName, IN_BSTR aHostPath, BOOL aHostPath, !!aWritable, !!aAutoMount, - true /* fFailOnError */); + true /* fFailOnError */); if (FAILED(rc)) return rc; setModified(IsModified_SharedFolders); @@ -6286,6 +6292,7 @@ STDMETHODIMP Machine::CloneTo(IMachine *pTarget, CloneMode_T mode, ComSafeArrayI void Machine::setModified(uint32_t fl) { mData->flModifications |= fl; + mData->mCurrentStateModified = true; } /** @@ -6297,7 +6304,7 @@ void Machine::setModified(uint32_t fl) void Machine::setModifiedLock(uint32_t fModification) { AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); - mData->flModifications |= fModification; + setModified(fModification); } /** @@ -6629,7 +6636,13 @@ HRESULT Machine::launchVMProcess(IInternalSessionControl *aControl, unsigned pos = RT_ELEMENTS(args) - 2; args[pos] = "--capture"; } - vrc = RTProcCreate(szPath, args, env, 0, &pid); + vrc = RTProcCreate(szPath, args, env, +#ifdef RT_OS_WINDOWS + RTPROC_FLAGS_NO_WINDOW, +#else + 0, +#endif + &pid); } #else /* !VBOX_WITH_HEADLESS */ if (0) @@ -7832,15 +7845,32 @@ HRESULT Machine::loadHardware(const settings::Hardware &data) rc = mAudioAdapter->loadSettings(data.audioAdapter); if (FAILED(rc)) return rc; + /* Shared folders */ for (settings::SharedFoldersList::const_iterator it = data.llSharedFolders.begin(); it != data.llSharedFolders.end(); ++it) { const settings::SharedFolder &sf = *it; - rc = CreateSharedFolder(Bstr(sf.strName).raw(), - Bstr(sf.strHostPath).raw(), - sf.fWritable, sf.fAutoMount); + + ComObjPtr<SharedFolder> sharedFolder; + /* Check for double entries. Not allowed! */ + rc = findSharedFolder(sf.strName, sharedFolder, false /* aSetError */); + if (SUCCEEDED(rc)) + return setError(VBOX_E_OBJECT_IN_USE, + tr("Shared folder named '%s' already exists"), + sf.strName.c_str()); + + /* Create the new shared folder. Don't break on error. This will be + * reported when the machine starts. */ + sharedFolder.createObject(); + rc = sharedFolder->init(getMachine(), + sf.strName, + sf.strHostPath, + RT_BOOL(sf.fWritable), + RT_BOOL(sf.fAutoMount), + false /* fFailOnError */); if (FAILED(rc)) return rc; + mHWData->mSharedFolders.push_back(sharedFolder); } // Clipboard @@ -8588,7 +8618,7 @@ HRESULT Machine::saveSettings(bool *pfNeedsGlobalSaveSettings, // previously stored in the config file; this invokes MachineConfigFile::operator== // which does a deep compare of all the settings, which is expensive but less expensive // than writing out XML in vain - bool fAnySettingsChanged = (*pNewConfig == *pOldConfig); + bool fAnySettingsChanged = !(*pNewConfig == *pOldConfig); // could still be modified if any settings changed mData->mCurrentStateModified = fAnySettingsChanged; @@ -9182,7 +9212,8 @@ HRESULT Machine::saveStateSettings(int aFlags) * that registry is added to the given list so that the caller can save the * registry. * - * Caller must hold machine read lock! + * Caller must hold machine read lock and at least media tree read lock! + * Caller must NOT hold any medium locks. * * @param pMedium * @param llRegistriesThatNeedSaving @@ -9192,6 +9223,11 @@ void Machine::addMediumToRegistry(ComObjPtr<Medium> &pMedium, GuidList &llRegistriesThatNeedSaving, Guid *puuid) { + ComObjPtr<Medium> pBase = pMedium->getBase(); + /* Paranoia checks: do not hold medium locks. */ + AssertReturnVoid(!pMedium->isWriteLockOnCurrentThread()); + AssertReturnVoid(!pBase->isWriteLockOnCurrentThread()); + // decide which medium registry to use now that the medium is attached: Guid uuid; if (mData->pMachineConfigFile->canHaveOwnMediaRegistry()) @@ -9200,13 +9236,25 @@ void Machine::addMediumToRegistry(ComObjPtr<Medium> &pMedium, else uuid = mParent->getGlobalRegistryId(); // VirtualBox global registry UUID - AutoCaller autoCaller(pMedium); - if (FAILED(autoCaller.rc())) return; - AutoWriteLock alock(pMedium COMMA_LOCKVAL_SRC_POS); - + bool fAdd = false; if (pMedium->addRegistry(uuid, false /* fRecurse */)) + { // registry actually changed: VirtualBox::addGuidToListUniquely(llRegistriesThatNeedSaving, uuid); + fAdd = true; + } + + /* For more complex hard disk structures it can happen that the base + * medium isn't yet associated with any medium registry. Do that now. */ + if (pMedium != pBase) + { + if ( pBase->addRegistry(uuid, true /* fRecurse */) + && !fAdd) + { + VirtualBox::addGuidToListUniquely(llRegistriesThatNeedSaving, uuid); + fAdd = true; + } + } if (puuid) *puuid = uuid; diff --git a/src/VBox/Main/src-server/MachineImplCloneVM.cpp b/src/VBox/Main/src-server/MachineImplCloneVM.cpp index cb1447a78..370b24fa4 100644 --- a/src/VBox/Main/src-server/MachineImplCloneVM.cpp +++ b/src/VBox/Main/src-server/MachineImplCloneVM.cpp @@ -1,4 +1,4 @@ -/* $Id: MachineImplCloneVM.cpp 38428 2011-08-12 10:21:10Z vboxsync $ */ +/* $Id: MachineImplCloneVM.cpp $ */ /** @file * Implementation of MachineCloneVM */ diff --git a/src/VBox/Main/src-server/MediumAttachmentImpl.cpp b/src/VBox/Main/src-server/MediumAttachmentImpl.cpp index 8fb9ab84b..0ad663de4 100644 --- a/src/VBox/Main/src-server/MediumAttachmentImpl.cpp +++ b/src/VBox/Main/src-server/MediumAttachmentImpl.cpp @@ -64,8 +64,8 @@ struct BackupableMediumAttachmentData struct MediumAttachment::Data { - Data() - : pMachine(NULL), + Data(Machine * const aMachine = NULL) + : pMachine(aMachine), fIsEjected(false) { } @@ -165,6 +165,36 @@ HRESULT MediumAttachment::init(Machine *aParent, } /** + * Initializes the medium attachment object given another guest object + * (a kind of copy constructor). This object makes a private copy of data + * of the original object passed as an argument. + */ +HRESULT MediumAttachment::initCopy(Machine *aParent, MediumAttachment *aThat) +{ + LogFlowThisFunc(("aParent=%p, aThat=%p\n", aParent, aThat)); + + ComAssertRet(aParent && aThat, E_INVALIDARG); + + /* Enclose the state transition NotReady->InInit->Ready */ + AutoInitSpan autoInitSpan(this); + AssertReturn(autoInitSpan.isOk(), E_FAIL); + + m = new Data(aParent); + /* m->pPeer is left null */ + + AutoCaller thatCaller(aThat); + AssertComRCReturnRC(thatCaller.rc()); + + AutoReadLock thatlock(aThat COMMA_LOCKVAL_SRC_POS); + m->bd.attachCopy(aThat->m->bd); + + /* Confirm a successful initialization */ + autoInitSpan.setSucceeded(); + + return S_OK; +} + +/** * Uninitializes the instance. * Called from FinalRelease(). */ diff --git a/src/VBox/Main/src-server/MediumFormatImpl.cpp b/src/VBox/Main/src-server/MediumFormatImpl.cpp index d830fa2f8..71080e43e 100644 --- a/src/VBox/Main/src-server/MediumFormatImpl.cpp +++ b/src/VBox/Main/src-server/MediumFormatImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MediumFormatImpl.cpp 37587 2011-06-22 12:02:13Z vboxsync $ */ +/* $Id: MediumFormatImpl.cpp $ */ /** @file * * VirtualBox COM class implementation diff --git a/src/VBox/Main/src-server/MediumImpl.cpp b/src/VBox/Main/src-server/MediumImpl.cpp index 7e335a06b..5d46be866 100644 --- a/src/VBox/Main/src-server/MediumImpl.cpp +++ b/src/VBox/Main/src-server/MediumImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MediumImpl.cpp 38452 2011-08-15 08:50:33Z vboxsync $ */ +/* $Id: MediumImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ @@ -2935,7 +2935,12 @@ STDMETHODIMP Medium::Reset(IProgress **aProgress) throw rc; } + /* Temporary leave this lock, cause IMedium::LockWrite, will wait for + * an running IMedium::queryInfo. If there is one running it might be + * it tries to acquire a MediaTreeLock as well -> dead-lock. */ + multilock.leave(); rc = pMediumLockList->Lock(); + multilock.enter(); if (FAILED(rc)) { delete pMediumLockList; @@ -3135,9 +3140,7 @@ Utf8Str Medium::getName() * one registry, which causes trouble with keeping diff images in sync. * See getFirstRegistryMachineId() for details. * - * Must have caller + locking! - * - * If fRecurse == true, then additionally the media tree lock must be held for reading. + * If fRecurse == true, then the media tree lock must be held for reading. * * @param id * @param fRecurse If true, recurses into child media to make sure the whole tree has registries in sync. @@ -3145,55 +3148,59 @@ Utf8Str Medium::getName() */ bool Medium::addRegistry(const Guid& id, bool fRecurse) { - // hard disks cannot be in more than one registry - if ( m->devType == DeviceType_HardDisk - && m->llRegistryIDs.size() > 0 - ) + AutoCaller autoCaller(this); + if (FAILED(autoCaller.rc())) return false; + AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); + + bool fAdd = true; + + // hard disks cannot be in more than one registry + if ( m->devType == DeviceType_HardDisk + && m->llRegistryIDs.size() > 0) + fAdd = false; // no need to add the UUID twice - for (GuidList::const_iterator it = m->llRegistryIDs.begin(); - it != m->llRegistryIDs.end(); - ++it) + if (fAdd) { - if ((*it) == id) - return false; + for (GuidList::const_iterator it = m->llRegistryIDs.begin(); + it != m->llRegistryIDs.end(); + ++it) + { + if ((*it) == id) + { + fAdd = false; + break; + } + } } - addRegistryImpl(id, fRecurse); - - return true; -} - -/** - * Private implementation for addRegistry() so we can recurse more efficiently. - * @param id - * @param fRecurse - */ -void Medium::addRegistryImpl(const Guid& id, bool fRecurse) -{ - m->llRegistryIDs.push_back(id); + if (fAdd) + m->llRegistryIDs.push_back(id); if (fRecurse) { - for (MediaList::iterator it = m->llChildren.begin(); - it != m->llChildren.end(); + // Get private list of children and release medium lock straight away. + MediaList llChildren(m->llChildren); + alock.release(); + + for (MediaList::iterator it = llChildren.begin(); + it != llChildren.end(); ++it) { Medium *pChild = *it; - // recurse! - pChild->addRegistryImpl(id, fRecurse); + fAdd |= pChild->addRegistry(id, true); } } + + return fAdd; } /** * Removes the given UUID from the list of media registry UUIDs. Returns true * if found or false if not. * - * Must have caller + locking! - * - * If fRecurse == true, then additionally the media tree lock must be held for reading. + * If fRecurse == true, then the media tree lock must be held for reading. * * @param id * @param fRecurse If true, recurses into child media to make sure the whole tree has registries in sync. @@ -3201,6 +3208,13 @@ void Medium::addRegistryImpl(const Guid& id, bool fRecurse) */ bool Medium::removeRegistry(const Guid& id, bool fRecurse) { + AutoCaller autoCaller(this); + if (FAILED(autoCaller.rc())) + return false; + AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); + + bool fRemove = false; + for (GuidList::iterator it = m->llRegistryIDs.begin(); it != m->llRegistryIDs.end(); ++it) @@ -3208,40 +3222,39 @@ bool Medium::removeRegistry(const Guid& id, bool fRecurse) if ((*it) == id) { m->llRegistryIDs.erase(it); + fRemove = true; + break; + } + } - if (fRecurse) - { - for (MediaList::iterator it2 = m->llChildren.begin(); - it2 != m->llChildren.end(); - ++it2) - { - Medium *pChild = *it2; - pChild->removeRegistry(id, true); - } - } + if (fRecurse) + { + // Get private list of children and release medium lock straight away. + MediaList llChildren(m->llChildren); + alock.release(); - return true; + for (MediaList::iterator it = llChildren.begin(); + it != llChildren.end(); + ++it) + { + Medium *pChild = *it; + fRemove |= pChild->removeRegistry(id, true); } } - return false; + return fRemove; } /** * Returns true if id is in the list of media registries for this medium. * - * Must have caller + locking! + * Must have caller + read locking! * * @param id * @return */ bool Medium::isInRegistry(const Guid& id) { - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return false; - - AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - for (GuidList::const_iterator it = m->llRegistryIDs.begin(); it != m->llRegistryIDs.end(); ++it) @@ -4251,6 +4264,11 @@ HRESULT Medium::deleteStorage(ComObjPtr<Progress> *aProgress, /* Undo deleting state if necessary. */ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); + /* Make sure that any error signalled by unmarkForDeletion() is not + * ending up in the error list (if the caller uses MultiResult). It + * usually is spurious, as in most cases the medium hasn't been marked + * for deletion when the error was thrown above. */ + ErrorInfoKeeper eik; unmarkForDeletion(); } @@ -6401,7 +6419,7 @@ HRESULT Medium::taskCreateBaseHandler(Medium::CreateBaseTask &task) /* ensure the directory exists */ if (capabilities & MediumFormatCapabilities_File) { - rc = VirtualBox::ensureFilePathExists(location); + rc = VirtualBox::ensureFilePathExists(location, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */); if (FAILED(rc)) throw rc; } @@ -6412,7 +6430,7 @@ HRESULT Medium::taskCreateBaseHandler(Medium::CreateBaseTask &task) format.c_str(), location.c_str(), task.mSize, - task.mVariant, + task.mVariant & ~MediumVariant_NoCreateDir, NULL, &geo, &geo, @@ -6568,7 +6586,7 @@ HRESULT Medium::taskCreateDiffHandler(Medium::CreateDiffTask &task) /* ensure the target directory exists */ if (capabilities & MediumFormatCapabilities_File) { - HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation); + HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */); if (FAILED(rc)) throw rc; } @@ -6576,7 +6594,7 @@ HRESULT Medium::taskCreateDiffHandler(Medium::CreateDiffTask &task) vrc = VDCreateDiff(hdd, targetFormat.c_str(), targetLocation.c_str(), - task.mVariant | VD_IMAGE_FLAGS_DIFF, + (task.mVariant & ~MediumVariant_NoCreateDir) | VD_IMAGE_FLAGS_DIFF, NULL, targetId.raw(), id.raw(), @@ -7071,7 +7089,7 @@ HRESULT Medium::taskCloneHandler(Medium::CloneTask &task) /* ensure the target directory exists */ if (capabilities & MediumFormatCapabilities_File) { - HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation); + HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */); if (FAILED(rc)) throw rc; } @@ -7134,7 +7152,7 @@ HRESULT Medium::taskCloneHandler(Medium::CloneTask &task) (fCreatingTarget) ? targetLocation.c_str() : (char *)NULL, false /* fMoveByRename */, 0 /* cbSize */, - task.mVariant, + task.mVariant & ~MediumVariant_NoCreateDir, targetId.raw(), VD_OPEN_FLAGS_NORMAL, NULL /* pVDIfsOperation */, @@ -7152,7 +7170,7 @@ HRESULT Medium::taskCloneHandler(Medium::CloneTask &task) 0 /* cbSize */, task.midxSrcImageSame, task.midxDstImageSame, - task.mVariant, + task.mVariant & ~MediumVariant_NoCreateDir, targetId.raw(), VD_OPEN_FLAGS_NORMAL, NULL /* pVDIfsOperation */, @@ -7742,7 +7760,7 @@ HRESULT Medium::taskExportHandler(Medium::ExportTask &task) /* ensure the target directory exists */ if (capabilities & MediumFormatCapabilities_File) { - rc = VirtualBox::ensureFilePathExists(targetLocation); + rc = VirtualBox::ensureFilePathExists(targetLocation, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */); if (FAILED(rc)) throw rc; } @@ -7760,7 +7778,7 @@ HRESULT Medium::taskExportHandler(Medium::ExportTask &task) targetLocation.c_str(), false /* fMoveByRename */, 0 /* cbSize */, - task.mVariant, + task.mVariant & ~MediumVariant_NoCreateDir, NULL /* pDstUuid */, VD_OPEN_FLAGS_NORMAL | VD_OPEN_FLAGS_SEQUENTIAL, NULL /* pVDIfsOperation */, @@ -7867,7 +7885,7 @@ HRESULT Medium::taskImportHandler(Medium::ImportTask &task) /* ensure the target directory exists */ if (capabilities & MediumFormatCapabilities_File) { - HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation); + HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */); if (FAILED(rc)) throw rc; } @@ -7928,7 +7946,7 @@ HRESULT Medium::taskImportHandler(Medium::ImportTask &task) (fCreatingTarget) ? targetLocation.c_str() : (char *)NULL, false /* fMoveByRename */, 0 /* cbSize */, - task.mVariant, + task.mVariant & ~MediumVariant_NoCreateDir, targetId.raw(), VD_OPEN_FLAGS_NORMAL, NULL /* pVDIfsOperation */, diff --git a/src/VBox/Main/src-server/NATEngineImpl.cpp b/src/VBox/Main/src-server/NATEngineImpl.cpp index 18eb78cf6..a693b8c17 100644 --- a/src/VBox/Main/src-server/NATEngineImpl.cpp +++ b/src/VBox/Main/src-server/NATEngineImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: NATEngineImpl.cpp 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: NATEngineImpl.cpp $ */ /** @file * Implementation of INATEngine in VBoxSVC. */ diff --git a/src/VBox/Main/src-server/NetworkAdapterImpl.cpp b/src/VBox/Main/src-server/NetworkAdapterImpl.cpp index 85bfc08bd..2a4364a63 100644 --- a/src/VBox/Main/src-server/NetworkAdapterImpl.cpp +++ b/src/VBox/Main/src-server/NetworkAdapterImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: NetworkAdapterImpl.cpp 37927 2011-07-13 15:48:41Z vboxsync $ */ +/* $Id: NetworkAdapterImpl.cpp $ */ /** @file * Implementation of INetworkAdaptor in VBoxSVC. */ diff --git a/src/VBox/Main/src-server/ParallelPortImpl.cpp b/src/VBox/Main/src-server/ParallelPortImpl.cpp index 78574886d..56743a089 100644 --- a/src/VBox/Main/src-server/ParallelPortImpl.cpp +++ b/src/VBox/Main/src-server/ParallelPortImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ParallelPortImpl.cpp 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: ParallelPortImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ diff --git a/src/VBox/Main/src-server/Performance.cpp b/src/VBox/Main/src-server/Performance.cpp index 298fdc11d..ecdd53dd1 100644 --- a/src/VBox/Main/src-server/Performance.cpp +++ b/src/VBox/Main/src-server/Performance.cpp @@ -1,4 +1,4 @@ -/* $Id: Performance.cpp 36839 2011-04-25 17:29:21Z vboxsync $ */ +/* $Id: Performance.cpp $ */ /** @file * VBox Performance Classes implementation. */ diff --git a/src/VBox/Main/src-server/PerformanceImpl.cpp b/src/VBox/Main/src-server/PerformanceImpl.cpp index c8c0a7ebe..8da7342c9 100644 --- a/src/VBox/Main/src-server/PerformanceImpl.cpp +++ b/src/VBox/Main/src-server/PerformanceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceImpl.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: PerformanceImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/ProgressProxyImpl.cpp b/src/VBox/Main/src-server/ProgressProxyImpl.cpp index b4fa20462..a6628760a 100644 --- a/src/VBox/Main/src-server/ProgressProxyImpl.cpp +++ b/src/VBox/Main/src-server/ProgressProxyImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ProgressProxyImpl.cpp 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: ProgressProxyImpl.cpp $ */ /** @file * IProgress implementation for Machine::openRemoteSession in VBoxSVC. */ diff --git a/src/VBox/Main/src-server/SnapshotImpl.cpp b/src/VBox/Main/src-server/SnapshotImpl.cpp index aa3520f51..afc9322a7 100644 --- a/src/VBox/Main/src-server/SnapshotImpl.cpp +++ b/src/VBox/Main/src-server/SnapshotImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: SnapshotImpl.cpp 37985 2011-07-15 15:04:39Z vboxsync $ */ +/* $Id: SnapshotImpl.cpp $ */ /** @file * @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1430,7 +1430,7 @@ STDMETHODIMP SessionMachine::BeginTakingSnapshot(IConsole *aInitiator, if (strStateFilePath.isNotEmpty()) { // ensure the directory for the saved state file exists - HRESULT rc = VirtualBox::ensureFilePathExists(strStateFilePath); + HRESULT rc = VirtualBox::ensureFilePathExists(strStateFilePath, true /* fCreate */); if (FAILED(rc)) return rc; } @@ -1819,7 +1819,16 @@ void SessionMachine::restoreSnapshotHandler(RestoreSnapshotTask &aTask) // restore the attachments from the snapshot setModified(IsModified_Storage); mMediaData.backup(); - mMediaData->mAttachments = pSnapshotMachine->mMediaData->mAttachments; + mMediaData->mAttachments.clear(); + for (MediaData::AttachmentList::const_iterator it = pSnapshotMachine->mMediaData->mAttachments.begin(); + it != pSnapshotMachine->mMediaData->mAttachments.end(); + ++it) + { + ComObjPtr<MediumAttachment> pAttach; + pAttach.createObject(); + pAttach->initCopy(this, *it); + mMediaData->mAttachments.push_back(pAttach); + } /* leave the locks before the potentially lengthy operation */ snapshotLock.release(); diff --git a/src/VBox/Main/src-server/StorageControllerImpl.cpp b/src/VBox/Main/src-server/StorageControllerImpl.cpp index b51387fca..5390b5fa2 100644 --- a/src/VBox/Main/src-server/StorageControllerImpl.cpp +++ b/src/VBox/Main/src-server/StorageControllerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: StorageControllerImpl.cpp 37926 2011-07-13 15:36:59Z vboxsync $ */ +/* $Id: StorageControllerImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/SystemPropertiesImpl.cpp b/src/VBox/Main/src-server/SystemPropertiesImpl.cpp index 813bbd53d..8acdede9b 100644 --- a/src/VBox/Main/src-server/SystemPropertiesImpl.cpp +++ b/src/VBox/Main/src-server/SystemPropertiesImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: SystemPropertiesImpl.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: SystemPropertiesImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/USBControllerImpl.cpp b/src/VBox/Main/src-server/USBControllerImpl.cpp index b78051bd4..624e02a5a 100644 --- a/src/VBox/Main/src-server/USBControllerImpl.cpp +++ b/src/VBox/Main/src-server/USBControllerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: USBControllerImpl.cpp 38441 2011-08-12 16:25:06Z vboxsync $ */ +/* $Id: USBControllerImpl.cpp $ */ /** @file * Implementation of IUSBController. */ diff --git a/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp b/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp index 3ad591a0e..0c8046e96 100644 --- a/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp +++ b/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: USBDeviceFilterImpl.cpp 35638 2011-01-19 19:10:49Z vboxsync $ */ +/* $Id: USBDeviceFilterImpl.cpp $ */ /** @file * Implementation of VirtualBox COM components: USBDeviceFilter and HostUSBDeviceFilter */ diff --git a/src/VBox/Main/src-server/USBProxyService.cpp b/src/VBox/Main/src-server/USBProxyService.cpp index 8b76aed9e..b0ee34435 100644 --- a/src/VBox/Main/src-server/USBProxyService.cpp +++ b/src/VBox/Main/src-server/USBProxyService.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyService.cpp 37599 2011-06-22 21:06:38Z vboxsync $ */ +/* $Id: USBProxyService.cpp $ */ /** @file * VirtualBox USB Proxy Service (base) class. */ diff --git a/src/VBox/Main/src-server/VFSExplorerImpl.cpp b/src/VBox/Main/src-server/VFSExplorerImpl.cpp index 3956b57af..e94b7225d 100644 --- a/src/VBox/Main/src-server/VFSExplorerImpl.cpp +++ b/src/VBox/Main/src-server/VFSExplorerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: VFSExplorerImpl.cpp 37678 2011-06-29 08:24:09Z vboxsync $ */ +/* $Id: VFSExplorerImpl.cpp $ */ /** @file * * IVFSExplorer COM class implementations. diff --git a/src/VBox/Main/src-server/VirtualBoxImpl.cpp b/src/VBox/Main/src-server/VirtualBoxImpl.cpp index 6af42a0e5..43207ef5f 100644 --- a/src/VBox/Main/src-server/VirtualBoxImpl.cpp +++ b/src/VBox/Main/src-server/VirtualBoxImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxImpl.cpp 38211 2011-07-28 09:26:31Z vboxsync $ */ +/* $Id: VirtualBoxImpl.cpp $ */ /** @file * Implementation of IVirtualBox in VBoxSVC. @@ -3931,30 +3931,38 @@ HRESULT VirtualBox::saveRegistries(const GuidList &llRegistriesThatNeedSaving) } /** - * Creates the path to the specified file according to the path information - * present in the file name. + * Checks if the path to the specified file exists, according to the path + * information present in the file name. Optionally the path is created. * * Note that the given file name must contain the full path otherwise the * extracted relative path will be created based on the current working * directory which is normally unknown. * - * @param aFileName Full file name which path needs to be created. + * @param aFileName Full file name which path is checked/created. + * @param aCreate Flag if the path should be created if it doesn't exist. * - * @return Extended error information on failure to create the path. + * @return Extended error information on failure to check/create the path. */ /* static */ -HRESULT VirtualBox::ensureFilePathExists(const Utf8Str &strFileName) +HRESULT VirtualBox::ensureFilePathExists(const Utf8Str &strFileName, bool fCreate) { Utf8Str strDir(strFileName); strDir.stripFilename(); if (!RTDirExists(strDir.c_str())) { - int vrc = RTDirCreateFullPath(strDir.c_str(), 0777); - if (RT_FAILURE(vrc)) - return setErrorStatic(E_FAIL, - Utf8StrFmt(tr("Could not create the directory '%s' (%Rrc)"), - strDir.c_str(), - vrc)); + if (fCreate) + { + int vrc = RTDirCreateFullPath(strDir.c_str(), 0777); + if (RT_FAILURE(vrc)) + return setErrorStatic(VBOX_E_IPRT_ERROR, + Utf8StrFmt(tr("Could not create the directory '%s' (%Rrc)"), + strDir.c_str(), + vrc)); + } + else + return setErrorStatic(VBOX_E_IPRT_ERROR, + Utf8StrFmt(tr("Directory '%s' does not exist"), + strDir.c_str())); } return S_OK; @@ -4538,7 +4546,13 @@ DECLCALLBACK(int) VirtualBox::AsyncEventHandler(RTTHREAD thread, void *pvUser) // signal that we're ready RTThreadUserSignal(thread); - while (RT_SUCCESS(eventQ->processEventQueue(RT_INDEFINITE_WAIT))) + /* + * In case of spurious wakeups causing VERR_TIMEOUTs and/or other return codes + * we must not stop processing events and delete the "eventQ" object. This must + * be done ONLY when we stop this loop via interruptEventQueueProcessing(). + * See #5724. + */ + while (eventQ->processEventQueue(RT_INDEFINITE_WAIT) != VERR_INTERRUPTED) /* nothing */ ; delete eventQ; diff --git a/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp b/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp index ac8b72ae6..99cf52e2f 100644 --- a/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp +++ b/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIf-darwin.cpp 35693 2011-01-24 17:27:05Z vboxsync $ */ +/* $Id: NetIf-darwin.cpp $ */ /** @file * Main - NetIfList, Darwin implementation. */ diff --git a/src/VBox/Main/src-server/darwin/OpenGLTestDarwin.cpp b/src/VBox/Main/src-server/darwin/OpenGLTestDarwin.cpp index de80f4d34..74ddedd16 100644 --- a/src/VBox/Main/src-server/darwin/OpenGLTestDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/OpenGLTestDarwin.cpp @@ -1,4 +1,4 @@ -/* $Id: OpenGLTestDarwin.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: OpenGLTestDarwin.cpp $ */ /** @file * VBox host opengl support test diff --git a/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp b/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp index eda4e5c06..f02581bb0 100644 --- a/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceDarwin.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: PerformanceDarwin.cpp $ */ /** @file * VBox Darwin-specific Performance Classes implementation. */ diff --git a/src/VBox/Main/src-server/darwin/USBProxyServiceDarwin.cpp b/src/VBox/Main/src-server/darwin/USBProxyServiceDarwin.cpp index 41e514eeb..1ca09d69a 100644 --- a/src/VBox/Main/src-server/darwin/USBProxyServiceDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/USBProxyServiceDarwin.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyServiceDarwin.cpp 37599 2011-06-22 21:06:38Z vboxsync $ */ +/* $Id: USBProxyServiceDarwin.cpp $ */ /** @file * VirtualBox USB Proxy Service (in VBoxSVC), Darwin Specialization. */ diff --git a/src/VBox/Main/src-server/darwin/iokit.cpp b/src/VBox/Main/src-server/darwin/iokit.cpp index 084e01b77..573d0809a 100644 --- a/src/VBox/Main/src-server/darwin/iokit.cpp +++ b/src/VBox/Main/src-server/darwin/iokit.cpp @@ -1,4 +1,4 @@ -/* $Id: iokit.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: iokit.cpp $ */ /** @file * Main - Darwin IOKit Routines. * diff --git a/src/VBox/Main/src-server/darwin/iokit.h b/src/VBox/Main/src-server/darwin/iokit.h index caa40a5bf..8cb80a52f 100644 --- a/src/VBox/Main/src-server/darwin/iokit.h +++ b/src/VBox/Main/src-server/darwin/iokit.h @@ -1,4 +1,4 @@ -/* $Id: iokit.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: iokit.h $ */ /** @file * Main - Darwin IOKit Routines. */ diff --git a/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp b/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp index efa504940..b654f5a63 100644 --- a/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp +++ b/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp @@ -1,4 +1,4 @@ -/* $Id: HostHardwareFreeBSD.cpp 37774 2011-07-04 21:19:27Z vboxsync $ */ +/* $Id: HostHardwareFreeBSD.cpp $ */ /** @file * Classes for handling hardware detection under FreeBSD. */ diff --git a/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp b/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp index 2fdd2566d..b3d45e979 100644 --- a/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp +++ b/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIf-freebsd.cpp 36797 2011-04-21 15:46:31Z vboxsync $ */ +/* $Id: NetIf-freebsd.cpp $ */ /** @file * Main - NetIfList, FreeBSD implementation. */ diff --git a/src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp b/src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp index 3e38af6fc..0b8178423 100644 --- a/src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp +++ b/src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceFreeBSD.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: PerformanceFreeBSD.cpp $ */ /** @file * VirtualBox Performance Collector, FreeBSD Specialization. */ diff --git a/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp b/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp index 8776b5680..73607776e 100644 --- a/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp +++ b/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyServiceFreeBSD.cpp 37599 2011-06-22 21:06:38Z vboxsync $ */ +/* $Id: USBProxyServiceFreeBSD.cpp $ */ /** @file * VirtualBox USB Proxy Service, FreeBSD Specialization. */ diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp index 00f417f33..0b16950c9 100644 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp +++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIf-generic.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: NetIf-generic.cpp $ */ /** @file * VirtualBox Main - Generic NetIf implementation. */ diff --git a/src/VBox/Main/src-server/generic/OpenGLTest.cpp b/src/VBox/Main/src-server/generic/OpenGLTest.cpp index efc68d1f4..318583ab0 100644 --- a/src/VBox/Main/src-server/generic/OpenGLTest.cpp +++ b/src/VBox/Main/src-server/generic/OpenGLTest.cpp @@ -1,4 +1,4 @@ -/* $Id: OpenGLTest.cpp 29208 2010-05-07 13:09:51Z vboxsync $ */ +/* $Id: OpenGLTest.cpp $ */ /** @file * VBox host opengl support test - generic implementation. */ diff --git a/src/VBox/Main/src-server/generic/OpenGLTestApp.cpp b/src/VBox/Main/src-server/generic/OpenGLTestApp.cpp index 1157142f4..1ca0d7994 100644 --- a/src/VBox/Main/src-server/generic/OpenGLTestApp.cpp +++ b/src/VBox/Main/src-server/generic/OpenGLTestApp.cpp @@ -1,4 +1,4 @@ -/* $Id: OpenGLTestApp.cpp 36344 2011-03-22 14:29:37Z vboxsync $ */ +/* $Id: OpenGLTestApp.cpp $ */ /** @file * VBox host opengl support test application. */ diff --git a/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp b/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp index 95646fcd6..2dc722cce 100644 --- a/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp +++ b/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: HostHardwareLinux.cpp 36618 2011-04-08 07:18:11Z vboxsync $ */ +/* $Id: HostHardwareLinux.cpp $ */ /** @file * Classes for handling hardware detection under Linux. Please feel free to * expand these to work for other systems (Solaris!) or to add new ones for diff --git a/src/VBox/Main/src-server/linux/NetIf-linux.cpp b/src/VBox/Main/src-server/linux/NetIf-linux.cpp index f3befb2c2..ebfd9e349 100644 --- a/src/VBox/Main/src-server/linux/NetIf-linux.cpp +++ b/src/VBox/Main/src-server/linux/NetIf-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIf-linux.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: NetIf-linux.cpp $ */ /** @file * Main - NetIfList, Linux implementation. */ diff --git a/src/VBox/Main/src-server/linux/PerformanceLinux.cpp b/src/VBox/Main/src-server/linux/PerformanceLinux.cpp index 75c9a4c77..f5589995c 100644 --- a/src/VBox/Main/src-server/linux/PerformanceLinux.cpp +++ b/src/VBox/Main/src-server/linux/PerformanceLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceLinux.cpp 37713 2011-06-30 15:14:13Z vboxsync $ */ +/* $Id: PerformanceLinux.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/linux/USBGetDevices.cpp b/src/VBox/Main/src-server/linux/USBGetDevices.cpp index 78d6063d4..1b8cf4d9c 100644 --- a/src/VBox/Main/src-server/linux/USBGetDevices.cpp +++ b/src/VBox/Main/src-server/linux/USBGetDevices.cpp @@ -1,4 +1,4 @@ -/* $Id: USBGetDevices.cpp 37624 2011-06-24 08:57:35Z vboxsync $ */ +/* $Id: USBGetDevices.cpp $ */ /** @file * VirtualBox Linux host USB device enumeration. */ diff --git a/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp b/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp index c14eb4b93..79506554a 100644 --- a/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp +++ b/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyServiceLinux.cpp 37618 2011-06-23 17:16:39Z vboxsync $ */ +/* $Id: USBProxyServiceLinux.cpp $ */ /** @file * VirtualBox USB Proxy Service, Linux Specialization. */ diff --git a/src/VBox/Main/src-server/os2/NetIf-os2.cpp b/src/VBox/Main/src-server/os2/NetIf-os2.cpp index 70162e42b..d0c287b52 100644 --- a/src/VBox/Main/src-server/os2/NetIf-os2.cpp +++ b/src/VBox/Main/src-server/os2/NetIf-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIf-os2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: NetIf-os2.cpp $ */ /** @file * Main - NetIfList, OS/2 implementation. */ diff --git a/src/VBox/Main/src-server/os2/PerformanceOs2.cpp b/src/VBox/Main/src-server/os2/PerformanceOs2.cpp index a741ef02c..19e804a93 100644 --- a/src/VBox/Main/src-server/os2/PerformanceOs2.cpp +++ b/src/VBox/Main/src-server/os2/PerformanceOs2.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceOs2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: PerformanceOs2.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/os2/USBProxyServiceOs2.cpp b/src/VBox/Main/src-server/os2/USBProxyServiceOs2.cpp index 22ba59ba0..34af0a088 100644 --- a/src/VBox/Main/src-server/os2/USBProxyServiceOs2.cpp +++ b/src/VBox/Main/src-server/os2/USBProxyServiceOs2.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyServiceOs2.cpp 31892 2010-08-24 08:00:51Z vboxsync $ */ +/* $Id: USBProxyServiceOs2.cpp $ */ /** @file * VirtualBox USB Proxy Service, OS/2 Specialization. */ diff --git a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp index aea962e58..4bd864f16 100644 --- a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp @@ -1,4 +1,4 @@ -/* $Id: DynLoadLibSolaris.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: DynLoadLibSolaris.cpp $ */ /** @file * Dynamically load libraries for Solaris hosts. */ diff --git a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h index 64b91f14c..4fc35b8ac 100644 --- a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h +++ b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h @@ -1,4 +1,4 @@ -/* $Id: DynLoadLibSolaris.h 31340 2010-08-03 14:29:43Z vboxsync $ */ +/* $Id: DynLoadLibSolaris.h $ */ /** @file * Dynamically loaded libraries for Solaris hosts, Internal header. */ diff --git a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp index 95dc68db4..05fd34592 100644 --- a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp +++ b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIf-solaris.cpp 37662 2011-06-28 11:41:49Z vboxsync $ */ +/* $Id: NetIf-solaris.cpp $ */ /** @file * Main - NetIfList, Solaris implementation. */ diff --git a/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp b/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp index 035f80d18..bcc1eae03 100644 --- a/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceSolaris.cpp 36090 2011-02-25 15:53:28Z vboxsync $ */ +/* $Id: PerformanceSolaris.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp b/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp index dd2764a21..6dc77de0a 100644 --- a/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyServiceSolaris.cpp 38016 2011-07-18 13:06:11Z vboxsync $ */ +/* $Id: USBProxyServiceSolaris.cpp $ */ /** @file * VirtualBox USB Proxy Service, Solaris Specialization. */ diff --git a/src/VBox/Main/src-server/win/NetIf-win.cpp b/src/VBox/Main/src-server/win/NetIf-win.cpp index bbbeaa535..3377d585a 100644 --- a/src/VBox/Main/src-server/win/NetIf-win.cpp +++ b/src/VBox/Main/src-server/win/NetIf-win.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIf-win.cpp 36121 2011-03-01 15:25:18Z vboxsync $ */ +/* $Id: NetIf-win.cpp $ */ /** @file * Main - NetIfList, Windows implementation. */ diff --git a/src/VBox/Main/src-server/win/PerformanceWin.cpp b/src/VBox/Main/src-server/win/PerformanceWin.cpp index 96ee57d57..2fc96b5d8 100644 --- a/src/VBox/Main/src-server/win/PerformanceWin.cpp +++ b/src/VBox/Main/src-server/win/PerformanceWin.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceWin.cpp 35368 2010-12-30 13:38:23Z vboxsync $ */ +/* $Id: PerformanceWin.cpp $ */ /** @file * diff --git a/src/VBox/Main/src-server/win/USBProxyServiceWindows.cpp b/src/VBox/Main/src-server/win/USBProxyServiceWindows.cpp index d763e8eb8..f12cf37f3 100644 --- a/src/VBox/Main/src-server/win/USBProxyServiceWindows.cpp +++ b/src/VBox/Main/src-server/win/USBProxyServiceWindows.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyServiceWindows.cpp 37599 2011-06-22 21:06:38Z vboxsync $ */ +/* $Id: USBProxyServiceWindows.cpp $ */ /** @file * VirtualBox USB Proxy Service, Windows Specialization. */ diff --git a/src/VBox/Main/src-server/win/VBoxSVC.rc b/src/VBox/Main/src-server/win/VBoxSVC.rc index aec838f34..b7ac5fdcd 100644 --- a/src/VBox/Main/src-server/win/VBoxSVC.rc +++ b/src/VBox/Main/src-server/win/VBoxSVC.rc @@ -1,4 +1,4 @@ -/* $Id: VBoxSVC.rc 35368 2010-12-30 13:38:23Z vboxsync $ */ +/* $Id: VBoxSVC.rc $ */ /** @file * VBoxSVC - Resource file containing version info and icon. */ diff --git a/src/VBox/Main/src-server/xpcom/server.cpp b/src/VBox/Main/src-server/xpcom/server.cpp index f521f21d8..e0d28ea5e 100644 --- a/src/VBox/Main/src-server/xpcom/server.cpp +++ b/src/VBox/Main/src-server/xpcom/server.cpp @@ -1,4 +1,4 @@ -/* $Id: server.cpp 37666 2011-06-28 12:33:34Z vboxsync $ */ +/* $Id: server.cpp $ */ /** @file * XPCOM server process (VBoxSVC) start point. */ diff --git a/src/VBox/Main/testcase/Makefile.kmk b/src/VBox/Main/testcase/Makefile.kmk index c6acdd13f..d35766846 100644 --- a/src/VBox/Main/testcase/Makefile.kmk +++ b/src/VBox/Main/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38210 2011-07-28 08:42:59Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox API testcases. # diff --git a/src/VBox/Main/testcase/tstCollector.cpp b/src/VBox/Main/testcase/tstCollector.cpp index ab31b42b9..32e52ccdc 100644 --- a/src/VBox/Main/testcase/tstCollector.cpp +++ b/src/VBox/Main/testcase/tstCollector.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCollector.cpp 35368 2010-12-30 13:38:23Z vboxsync $ */ +/* $Id: tstCollector.cpp $ */ /** @file * diff --git a/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp b/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp index b5d75647a..e54549c16 100644 --- a/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp +++ b/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGuestCtrlParseBuffer.cpp 38437 2011-08-12 15:05:41Z vboxsync $ */ +/* $Id: tstGuestCtrlParseBuffer.cpp $ */ /** @file * @@ -90,10 +90,13 @@ static struct /* Good stuff, but with a second block -- should be *not* taken into account since * we're only interested in parsing/handling the first object. */ { "t9=t9\0t91=t91\0\0t92=t92\0\0", sizeof("t9=t9\0t91=t91\0\0t92=t92\0\0"), 0, sizeof("t9=t9\0t91=t91\0") - 1, 2, VINF_SUCCESS }, + /* Nasty stuff. */ + { "äöü=fäö\0\0", sizeof("äöü=fäö\0\0"), 0, sizeof("äöü=fäö\0") - 1, 1, VINF_SUCCESS }, + { "äöü=fäö\0ööö=äää", sizeof("äöü=fäö\0ööö=äää"), 0, sizeof("äöü=fäö\0") - 1, 1, VERR_MORE_DATA }, /* Some "real world" examples. */ { "hdr_id=vbt_stat\0hdr_ver=1\0name=foo.txt\0\0", sizeof("hdr_id=vbt_stat\0hdr_ver=1\0name=foo.txt\0\0"), - 0, sizeof("hdr_id=vbt_stat\0hdr_ver=1\0name=foo.txt\0\0") - 1, + 0, sizeof("hdr_id=vbt_stat\0hdr_ver=1\0name=foo.txt\0") - 1, 3, VINF_SUCCESS } }; diff --git a/src/VBox/Main/testcase/tstOVF.cpp b/src/VBox/Main/testcase/tstOVF.cpp index 2d7345d19..7386f4083 100644 --- a/src/VBox/Main/testcase/tstOVF.cpp +++ b/src/VBox/Main/testcase/tstOVF.cpp @@ -1,4 +1,4 @@ -/* $Id: tstOVF.cpp 37862 2011-07-11 10:09:29Z vboxsync $ */ +/* $Id: tstOVF.cpp $ */ /** @file * * tstOVF - testcases for OVF import and export diff --git a/src/VBox/Main/testcase/tstUSBLinux.h b/src/VBox/Main/testcase/tstUSBLinux.h index 91880c94f..5a9491a4c 100644 --- a/src/VBox/Main/testcase/tstUSBLinux.h +++ b/src/VBox/Main/testcase/tstUSBLinux.h @@ -1,4 +1,4 @@ -/* $Id: tstUSBLinux.h 30714 2010-07-07 16:20:03Z vboxsync $ */ +/* $Id: tstUSBLinux.h $ */ /** @file * VirtualBox USB Proxy Service class, test version for Linux hosts. */ diff --git a/src/VBox/Main/testcase/tstUSBProxyLinux.cpp b/src/VBox/Main/testcase/tstUSBProxyLinux.cpp index 1f9f916e3..0535332fe 100644 --- a/src/VBox/Main/testcase/tstUSBProxyLinux.cpp +++ b/src/VBox/Main/testcase/tstUSBProxyLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: tstUSBProxyLinux.cpp 37618 2011-06-23 17:16:39Z vboxsync $ */ +/* $Id: tstUSBProxyLinux.cpp $ */ /** @file * USBProxyServiceLinux test case. */ diff --git a/src/VBox/Main/testcase/tstVBoxAPIWin.cpp b/src/VBox/Main/testcase/tstVBoxAPIWin.cpp index cd0adb485..d3c0839c0 100644 --- a/src/VBox/Main/testcase/tstVBoxAPIWin.cpp +++ b/src/VBox/Main/testcase/tstVBoxAPIWin.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVBoxAPIWin.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstVBoxAPIWin.cpp $ */ /** @file * * tstVBoxAPIWin - sample program to illustrate the VirtualBox diff --git a/src/VBox/Main/webservice/MANIFEST.MF.in b/src/VBox/Main/webservice/MANIFEST.MF.in new file mode 100644 index 000000000..b3a91ccca --- /dev/null +++ b/src/VBox/Main/webservice/MANIFEST.MF.in @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-Symbolicname: org.virtualbox@VBOX_API_SUFFIX@ +Bundle-Name: vboxjws +Bundle-Vendor: VirtualBox +Bundle-Version: @VBOX_VERSION_STRING@ +Bundle-License: http://glassfish.java.net/nonav/public/CDDL+GPL.html +Bundle-ManifestVersion: 2 +Tool: vi+sed +Export-Package: org.virtualbox@VBOX_API_SUFFIX@;uses="javax.jws.soap,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax,xml.namespace,javax.xml.parsers,javax.xml.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.ws.wsaddressing,org.w3c.dom,org.xml.sax";version="@VBOX_VERSION_STRING@" +Import-Package:javax.validation.constraints;version="1.0",javax.jws,com.sun.xml.ws.developer,com.sun.xml.ws,com.sun.xml.ws.api.message,javax.jws.soap,javax.xml.namespace,javax.xml.ws,javax.xml.ws.spi,javax.xml.ws.soap,javax.xml.ws.handler,javax.xml.ws.http,javax.xml.ws.wsaddressing,javax.xml.parsers,javax.xml.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.w2c.dom,org.xml.sax,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,org.virtualbox@VBOX_API_SUFFIX@;version="@VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@" diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk index d51304709..0fc47cc7c 100644 --- a/src/VBox/Main/webservice/Makefile.kmk +++ b/src/VBox/Main/webservice/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38228 2011-07-28 17:33:56Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox web service. # @@ -6,7 +6,7 @@ # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -154,9 +154,9 @@ PATH_TARGET_SOAPDEMOHEADERS := $(VBOXWEB_OUT_DIR)/demo_headers PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest +# the original XIDL file (has to include documentation as we need it): +VBOXWEB_IDL_SRC_ORIG := $(VBOX_XIDL_FILE_SRC) # platform-specific XIDL file generated from $(VBOXWEB_IDL_SRC): -VBOXWEB_IDL_SRC_ORIG := $(VBOX_XIDL_FILE) -# the original XIDL file: VBOXWEB_IDL_SRC := $(VBOXWEB_OUT_DIR)/VirtualBox.xidl VBOXWEB_WSDL = $(VBOX_PATH_SDK)/bindings/webservice/vboxweb.wsdl @@ -285,10 +285,12 @@ endif vboxwebsrv_SOURCES = \ vboxweb.cpp \ $(VBOXWEB_OUT_DIR)/methodmaps.cpp \ - $(VBOXWEB_OUT_DIR)/soapServer.cpp + $(VBOXWEB_OUT_DIR)/soapServer.cpp \ + $(VBOXWEB_OUT_DIR)/vboxweb-wsdl.c vboxwebsrv_CLEAN = \ $(VBOXWEB_OUT_DIR)/methodmaps.cpp \ - $(VBOXWEB_OUT_DIR)/soapServer.cpp + $(VBOXWEB_OUT_DIR)/soapServer.cpp \ + $(VBOXWEB_OUT_DIR)/vboxweb-wsdl.c vboxweb.cpp_DEFS = \ VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\" \ @@ -304,49 +306,64 @@ INSTALLS += VBoxJWs-inst-jar # Java glue JAR files # VBOX_JWS_JAR = $(VBoxJWs-inst-jar_0_OUTDIR)/vboxjws.jar +VBOX_JWSDOC_JAR = $(VBoxJWs-inst-jar_0_OUTDIR)/vboxjws-doc.jar +VBOX_JWSSRC_JAR = $(VBoxJWs-inst-jar_0_OUTDIR)/vboxjws-src.jar VBOX_JWS_TARGET := $(PATH_TARGET)/vboxjws-gen VBOX_JWS_GEN = $(VBOX_JWS_TARGET)/jwsgen VBOX_JWS_JDEST := $(VBOX_JWS_TARGET)/jdest +VBOX_JWSDOC_JDEST := $(VBOX_JWS_TARGET)/jdest-doc VBOX_GLUE_XSLT_DIR := $(PATH_ROOT)/src/VBox/Main/glue VBOX_JAXLIB_DIR := $(PATH_ROOT)/src/VBox/Main/webservice/jaxlibs VBoxJWs-inst-jar_INST = $(INST_SDK)bindings/webservice/java/jax-ws/ VBoxJWs-inst-jar_MODE = a+r,u+w VBoxJWs-inst-jar_SOURCES = \ - $(VBOX_JWS_JAR) + $(VBOX_JWS_JAR) \ + $(VBOX_JWSDOC_JAR) \ + $(VBOX_JWSSRC_JAR) VBoxJWs-inst-jar_CLEAN = \ $(VBOX_JWS_JAR) \ + $(VBOX_JWSDOC_JAR) \ + $(VBOX_JWSSRC_JAR) \ $(VBOX_JWS_GEN)/jwsglue.list \ + $(VBOX_JWSDOC_JDEST)/package-list \ $(wildcard \ - $(VBOX_JWS_GEN)/java/*.java \ - $(VBOX_JWS_GEN)/java/jws/*/*/*/*.java \ + $(VBOX_JWS_GEN)/java/*/*/*.java \ + $(VBOX_JWS_GEN)/java/*/*/*/*.java \ $(VBOX_JWS_JDEST)/*.class \ $(VBOX_JWS_JDEST)/*/*.class \ $(VBOX_JWS_JDEST)/*/*/*.class \ $(VBOX_JWS_JDEST)/*/*/*/*.class \ + $(VBOX_JWSDOC_JDEST)/*.html \ + $(VBOX_JWSDOC_JDEST)/*.css \ + $(VBOX_JWSDOC_JDEST)/*/*.gif \ + $(VBOX_JWSDOC_JDEST)/*/*/*.html \ + $(VBOX_JWSDOC_JDEST)/*/*/*/*.html \ ) -VBoxJWs-inst-jar_BLDDIRS += $(VBOX_JWS_GEN)/java $(VBOX_JWS_GEN)/java/jws +VBoxJWs-inst-jar_BLDDIRS += $(VBOX_JWS_GEN)/java -$(VBOX_JWS_GEN)/jwsglue.list: \ - $(VBOX_XIDL_FILE) \ - $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \ - $(VBOX_FILESPLIT) \ +$(VBOX_JWS_GEN)/jwsglue.list: \ + $(VBOXWEB_IDL_SRC_ORIG) \ + $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \ + $(VBOX_FILESPLIT) \ $(VBOXWEBSERVICE_WSDL) \ $(VBOXWEB_WSDL) \ - | $(VBOX_JWS_GEN)/java/jws/ + | $(VBOX_JWS_GEN)/java/ $(call MSG_L1,Generating JAX-WS Java glue files from XIDL) - $(RM) -f $(wildcard $(VBOX_JWS_GEN)/java/*.java) $(wildcard $(VBOX_JWS_GEN)/java/jws/*/*/*/*.java) + $(RM) -f $(wildcard $(VBOX_JWS_GEN)/java/*/*/*.java) $(wildcard $(VBOX_JWS_GEN)/java/*/*/*/*.java) $(QUIET)$(VBOX_XSLTPROC) \ --stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX) \ --stringparam G_vboxGlueStyle jaxws \ - -o $(VBOX_JWS_GEN)/java/merged.file $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl $< - $(QUIET)$(VBOX_FILESPLIT) $(VBOX_JWS_GEN)/java/merged.file $(VBOX_JWS_GEN)/java + --stringparam G_vboxDirPrefix org/virtualbox$(VBOX_API_SUFFIX)/ \ + -o $(VBOX_JWS_GEN)/merged.file $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl $< + $(QUIET)$(MKDIR) -p $(VBOX_JWS_GEN)/java/org/virtualbox$(VBOX_API_SUFFIX) + $(QUIET)$(VBOX_FILESPLIT) $(VBOX_JWS_GEN)/merged.file $(VBOX_JWS_GEN)/java $(call MSG_GENERATE,,$@,JAX-WS for Java 1.6 bindings using $(VBOXWEBSERVICE_WSDL)) - $(VBOX_WSIMPORT) -Xnocompile -p $(VBOX_JAVA_PACKAGE).jaxws -d $(VBOX_JWS_GEN)/java/jws $(VBOXWEBSERVICE_WSDL) - $(QUIET)echo $(VBOX_JWS_GEN)/java/*.java > $@ - $(QUIET)echo $(VBOX_JWS_GEN)/java/jws/*/*/*/*.java >> $@ + $(VBOX_WSIMPORT) -Xnocompile -p $(VBOX_JAVA_PACKAGE).jaxws -d $(VBOX_JWS_GEN)/java $(VBOXWEBSERVICE_WSDL) + $(QUIET)echo $(VBOX_JWS_GEN)/java/*/*/*.java > $@ + $(QUIET)echo $(VBOX_JWS_GEN)/java/*/*/*/*.java >> $@ -$$(VBOX_JWS_JAR): $(VBOX_JWS_GEN)/jwsglue.list $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL) | $$(dir $$@) +$$(VBOX_JWS_JAR): $(VBOX_JWS_GEN)/jwsglue.list $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL) $(VBOX_JWS_GEN)/MANIFEST.MF | $$(dir $$@) $(call MSG_TOOL,javac,$(notdir $@),jwsgen.list,) $(QUIET)$(RM) -Rf $(VBOX_JWS_JDEST) $(QUIET)$(MKDIR) -p $(VBOX_JWS_JDEST) @@ -357,7 +374,34 @@ $$(VBOX_JWS_JAR): $(VBOX_JWS_GEN)/jwsglue.list $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_ $(QUIET)$(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" < $(VBOXWEBSERVICE_WSDL) > $(VBOX_JWS_JDEST)/vboxwebService$(VBOX_API_SUFFIX).wsdl $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOX_JWS_JDEST)/vboxweb$(VBOX_API_SUFFIX).wsdl $(call MSG_LINK,$(notdir $@),$@) - $(VBOX_JAR) cf $@ -C $(VBOX_JWS_JDEST) . + $(VBOX_JAR) cf $@ $(VBOX_JWS_GEN)/MANIFEST.MF -C $(VBOX_JWS_JDEST) . + +$(VBOX_JWS_GEN)/MANIFEST.MF: $(VBOX_PATH_WEBSERVICE)/MANIFEST.MF.in + $(QUIET)$(RM) -f -- $@ + $(QUIET)$(MKDIR) -p $(VBOX_JWS_GEN) + $(QUIET)$(SED) \ + -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/' \ + -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/' \ + -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/' \ + -e 's/@VBOX_API_SUFFIX@/$(VBOX_API_SUFFIX)/' \ + < $< > $@ + +$$(VBOX_JWSDOC_JAR): $(VBOX_JWS_GEN)/jwsglue.list $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL) $$(VBOX_JWS_JAR) | $$(dir $$@) + $(call MSG_TOOL,javadoc,$(notdir $@),jwsgen.list,) + $(QUIET)$(RM) -Rf $(VBOX_JWSDOC_JDEST) + $(QUIET)$(MKDIR) -p $(VBOX_JWSDOC_JDEST) + $(call MSG_L1,Generating javadoc html documentation) + $(VBOX_JAVADOC) $(VBOX_JAVADOC_OPTS) -quiet \ + -sourcepath $(VBOX_JWS_GEN)/java org.virtualbox$(VBOX_API_SUFFIX) \ + -d $(VBOX_JWSDOC_JDEST) + $(call MSG_LINK,$(notdir $@),$@) + $(VBOX_JAR) cf $@ -C $(VBOX_JWSDOC_JDEST) . + +$$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) | $$(dir $$@) + $(call MSG_LINK,$(notdir $@),$@) + $(VBOX_JAR) cf $@ -C $(VBOX_JWS_GEN)/java . + +## @todo compile ../glue/tests/TestVBox.java to have sanity checking endif # VBOX_WITH_JWS @@ -645,6 +689,11 @@ $(VBOXWEB_OUT_DIR)/methodmaps.cpp: $(VBOXWEB_IDL_SRC) $(VBOX_PATH_WEBSERVICE)/we $(call MSG_GENERATE,,$@,$(VBOXWEB_IDL_SRC) using websrv-cpp.xsl) $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_PATH_WEBSERVICE)/websrv-cpp.xsl $< +# generate C file which contains vboxweb.wsdl +$$(VBOXWEB_OUT_DIR)/vboxweb-wsdl.c: $(VBOXWEB_WSDL) $(VBOX_BIN2C) + $(call MSG_TOOL,bin2c,vboxweb-wsdl,$<,$@) + $(QUIET)$(VBOX_BIN2C) -export -ascii VBoxWebWSDL $< $@ + ifdef VBOX_ONLY_SDK diff --git a/src/VBox/Main/webservice/platform-xidl.xsl b/src/VBox/Main/webservice/platform-xidl.xsl index ed543a3e2..f168fdb99 100644 --- a/src/VBox/Main/webservice/platform-xidl.xsl +++ b/src/VBox/Main/webservice/platform-xidl.xsl @@ -8,7 +8,7 @@ is identical to the original except that all <if...> sections are resolved (for easier processing). - Copyright (C) 2006-2010 Oracle Corporation + Copyright (C) 2006-2011 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; @@ -61,15 +61,26 @@ <!-- ignore everything we don't need --> -<xsl:template match="cpp|class|enumerator|desc|note"> +<xsl:template match="cpp|class|enumerator"> </xsl:template> <!-- and keep the rest intact (including all attributes) + + NOTE: this drops class and everything in it, which I left unchanged + since the other xslt scripts blow up badly. --> -<xsl:template match="library|module|enum|const|interface|attribute|collection|method|param"> +<xsl:template match="library|module|enum|const|interface|attribute|collection|method|param|result"> <xsl:copy><xsl:copy-of select="@*"/><xsl:apply-templates/></xsl:copy> </xsl:template> +<!-- + keep those completely unchanged, including child nodes (including all + attributes) + --> +<xsl:template match="descGroup|desc|note"> + <xsl:copy-of select="."/> +</xsl:template> + </xsl:stylesheet> diff --git a/src/VBox/Main/webservice/samples/perl/clienttest.pl b/src/VBox/Main/webservice/samples/perl/clienttest.pl index a2877962f..a2877962f 100644..100755 --- a/src/VBox/Main/webservice/samples/perl/clienttest.pl +++ b/src/VBox/Main/webservice/samples/perl/clienttest.pl diff --git a/src/VBox/Main/webservice/vboxweb.cpp b/src/VBox/Main/webservice/vboxweb.cpp index da6114326..c9c0131d5 100644 --- a/src/VBox/Main/webservice/vboxweb.cpp +++ b/src/VBox/Main/webservice/vboxweb.cpp @@ -67,6 +67,14 @@ // include generated namespaces table #include "vboxwebsrv.nsmap" +RT_C_DECLS_BEGIN + +// declarations for the generated WSDL text +extern DECLIMPORT(const unsigned char) g_abVBoxWebWSDL[]; +extern DECLIMPORT(const unsigned) g_cbVBoxWebWSDL; + +RT_C_DECLS_END + /**************************************************************************** * * private typedefs @@ -288,6 +296,7 @@ public: { // make a copy of the soap struct for the new thread m_soap = soap_copy(soap); + m_soap->fget = fnHttpGet; /* The soap.max_keep_alive value can be set to the maximum keep-alive calls allowed, * which is important to avoid a client from holding a thread indefinitely. @@ -316,6 +325,17 @@ public: void process(); + static int fnHttpGet(struct soap *soap) + { + char *s = strchr(soap->path, '?'); + if (!s || strcmp(s, "?wsdl")) + return SOAP_GET_METHOD; + soap_response(soap, SOAP_HTML); + soap_send_raw(soap, (const char *)g_abVBoxWebWSDL, g_cbVBoxWebWSDL); + soap_end_send(soap); + return SOAP_OK; + } + /** * Static function that can be passed to RTThreadCreate and that calls * process() on the SoapThread instance passed as the thread parameter. diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp index 796a01b72..c12a5870a 100644 --- a/src/VBox/Main/xml/Settings.cpp +++ b/src/VBox/Main/xml/Settings.cpp @@ -1,4 +1,4 @@ -/* $Id: Settings.cpp 38100 2011-07-21 14:07:48Z vboxsync $ */ +/* $Id: Settings.cpp $ */ /** @file * Settings File Manipulation API. * diff --git a/src/VBox/Main/xml/VirtualBox-settings-common.xsd b/src/VBox/Main/xml/VirtualBox-settings-common.xsd index 7e596e137..7345d5fec 100644 --- a/src/VBox/Main/xml/VirtualBox-settings-common.xsd +++ b/src/VBox/Main/xml/VirtualBox-settings-common.xsd @@ -156,6 +156,8 @@ <xsd:enumeration value="Windows2008_64"/> <xsd:enumeration value="Windows7"/> <xsd:enumeration value="Windows7_64"/> + <xsd:enumeration value="Windows8"/> + <xsd:enumeration value="Windows8_64"/> <xsd:enumeration value="WindowsNT"/> <xsd:enumeration value="OS2Warp3"/> <xsd:enumeration value="OS2Warp4"/> diff --git a/src/VBox/Main/xml/ovfreader.cpp b/src/VBox/Main/xml/ovfreader.cpp index 0d8af9ceb..eb685fd31 100644 --- a/src/VBox/Main/xml/ovfreader.cpp +++ b/src/VBox/Main/xml/ovfreader.cpp @@ -1,4 +1,4 @@ -/* $Id: ovfreader.cpp 37869 2011-07-11 12:42:46Z vboxsync $ */ +/* $Id: ovfreader.cpp $ */ /** @file * OVF reader declarations. * diff --git a/src/VBox/Makefile.kmk b/src/VBox/Makefile.kmk index 39b7b320d..e3fe32a92 100644 --- a/src/VBox/Makefile.kmk +++ b/src/VBox/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 34662 2010-12-02 21:51:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for src/VBox. # diff --git a/src/VBox/NetworkServices/DHCP/Makefile.kmk b/src/VBox/NetworkServices/DHCP/Makefile.kmk index 981b9cafd..45db7eceb 100644 --- a/src/VBox/NetworkServices/DHCP/Makefile.kmk +++ b/src/VBox/NetworkServices/DHCP/Makefile.kmk @@ -1,4 +1,4 @@ - # $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ + # $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxNetDHCP. # diff --git a/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp b/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp index e76d4d9ba..6a7c24dea 100644 --- a/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp +++ b/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetDHCP.cpp 36469 2011-03-30 08:52:15Z vboxsync $ */ +/* $Id: VBoxNetDHCP.cpp $ */ /** @file * VBoxNetDHCP - DHCP Service for connecting to IntNet. */ diff --git a/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp b/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp index 046c206bd..7d0e1bef3 100644 --- a/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp +++ b/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetDHCPHardened.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxNetDHCPHardened.cpp $ */ /** @file * VBoxNetDHCP - Hardened main(). */ diff --git a/src/VBox/NetworkServices/Makefile.kmk b/src/VBox/NetworkServices/Makefile.kmk index 46b2e2004..affd27263 100644 --- a/src/VBox/NetworkServices/Makefile.kmk +++ b/src/VBox/NetworkServices/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VBox Network Services. # diff --git a/src/VBox/NetworkServices/NAT/Makefile.kmk b/src/VBox/NetworkServices/NAT/Makefile.kmk index 34e40539a..7902a547c 100644 --- a/src/VBox/NetworkServices/NAT/Makefile.kmk +++ b/src/VBox/NetworkServices/NAT/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 36217 2011-03-09 03:22:09Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # diff --git a/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp b/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp index 28e5a8db3..7afcd5c2f 100644 --- a/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp +++ b/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetNAT.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: VBoxNetNAT.cpp $ */ /** @file * VBoxNetNAT - NAT Service for connecting to IntNet. */ diff --git a/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp b/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp index 1d30f8659..b0d74e735 100644 --- a/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp +++ b/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetNATHardened.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxNetNATHardened.cpp $ */ /** @file * VBoxNetNAT - Hardened main(). */ diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp index 82ca1065d..ec5ed275f 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetARP.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxNetARP.cpp $ */ /** @file * VBoxNetARP - IntNet ARP Client Routines. */ diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp index 97eafb95a..926a296e9 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetBaseService.cpp 36217 2011-03-09 03:22:09Z vboxsync $ */ +/* $Id: VBoxNetBaseService.cpp $ */ /** @file * VBoxNetDHCP - DHCP Service for connecting to IntNet. */ diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h index c12040c88..ea24aea71 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h +++ b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetBaseService.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxNetBaseService.h $ */ /** @file * VBoxNetUDP - IntNet Client Library. */ diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp index 44ffb3c2b..74a3998a4 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetIntIf.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxNetIntIf.cpp $ */ /** @file * VBoxNetIntIf - IntNet Interface Client Routines. */ diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetLib.h b/src/VBox/NetworkServices/NetLib/VBoxNetLib.h index 02ac249c7..e1150bfb1 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetLib.h +++ b/src/VBox/NetworkServices/NetLib/VBoxNetLib.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetLib.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: VBoxNetLib.h $ */ /** @file * VBoxNetUDP - IntNet Client Library. */ diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp index f660c394f..79c40c277 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetUDP.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VBoxNetUDP.cpp $ */ /** @file * VBoxNetUDP - IntNet UDP Client Routines. */ diff --git a/src/VBox/RDP/client/Makefile.in b/src/VBox/RDP/client/Makefile.in index 78c43731d..145cad088 100644 --- a/src/VBox/RDP/client/Makefile.in +++ b/src/VBox/RDP/client/Makefile.in @@ -17,6 +17,7 @@ KEYMAP_PATH = $(datadir)/rdesktop/keymaps/ CC = @CC@ INSTALL = @INSTALL@ CFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ -Iinclude -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -DWITH_RDPUSB=1 -DRDESKTOP -DVBOX -DIN_RING3 -DRT_OS_LINUX -DLOG_DISABLED -DRTLOG_REL_DISABLED -DVBOX_USB_WITH_SYSFS +CXXFLAGS = @CXXFLAGS@ @DEFS@ -Iinclude -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" -DWITH_RDPUSB=1 -DRDESKTOP -DVBOX -DIN_RING3 -DRT_OS_LINUX -DLOG_DISABLED -DRTLOG_REL_DISABLED -DVBOX_USB_WITH_SYSFS LDFLAGS = @LDFLAGS@ @LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ STRIP = @STRIP@ @@ -27,7 +28,7 @@ VNCLINK = @VNCLINK@ SOUNDOBJ = @SOUNDOBJ@ SCARDOBJ = @SCARDOBJ@ -RDPOBJ = tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o rdp5.o channels.o rdpdr.o serial.o printer.o disk.o parallel.o printercache.o mppc.o pstcache.o lspci.o seamless.o ssl.o Runtime/common/alloc/alloc.o Runtime/common/err/errmsg.o Runtime/common/err/errmsgxpcom.o Runtime/common/err/RTErrConvertFromErrno.o Runtime/common/err/RTErrConvertToErrno.o Runtime/common/path/RTPathAppend.o Runtime/common/path/RTPathCountComponents.o Runtime/common/path/RTPathFilename.o Runtime/common/path/rtPathRootSpecLen.o Runtime/common/path/RTPathStripFilename.o Runtime/common/path/RTPathStripTrailingSlash.o Runtime/common/path/rtPathVolumeSpecLen.o Runtime/common/string/RTStrCopy.o Runtime/common/string/RTStrNLen.o Runtime/common/string/straprintf.o Runtime/common/string/stringalloc.o Runtime/common/string/strformat.o Runtime/common/string/strformatrt.o Runtime/common/string/strformattype.o Runtime/common/string/strprintf.o Runtime/common/string/strstrip.o Runtime/common/string/strtonum.o Runtime/common/string/unidata.o Runtime/common/string/utf-16.o Runtime/common/string/utf-8.o Runtime/common/time/timesysalias.o Runtime/generic/pathhost-generic.o Runtime/r3/alloc.o Runtime/r3/dir.o Runtime/r3/fileio.o Runtime/r3/fs.o Runtime/r3/linux/sysfs.o Runtime/r3/linux/time-linux.o Runtime/r3/posix/dir-posix.o Runtime/r3/posix/env-posix.o Runtime/r3/posix/fileio-posix.o Runtime/r3/posix/path-posix.o Runtime/r3/posix/utf8-posix.o Runtime/r3/stream.o vrdp/rdpusb.o vrdp/USBGetDevices.o vrdp/USBLib.o vrdp/linux/USBProxyDevice-linux.o +RDPOBJ = tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o rdp5.o channels.o rdpdr.o serial.o printer.o disk.o parallel.o printercache.o mppc.o pstcache.o lspci.o seamless.o ssl.o Runtime/common/alloc/alloc.o Runtime/common/err/errmsg.o Runtime/common/err/errmsgxpcom.o Runtime/common/err/RTErrConvertFromErrno.o Runtime/common/err/RTErrConvertToErrno.o Runtime/common/path/RTPathAppend.o Runtime/common/path/RTPathAppendEx.o Runtime/common/path/RTPathCountComponents.o Runtime/common/path/RTPathFilename.o Runtime/common/path/rtPathRootSpecLen.o Runtime/common/path/RTPathStripFilename.o Runtime/common/path/RTPathStripTrailingSlash.o Runtime/common/path/rtPathVolumeSpecLen.o Runtime/common/string/RTStrCmp.o Runtime/common/string/RTStrNCmp.o Runtime/common/string/RTStrCopy.o Runtime/common/string/RTStrNLen.o Runtime/common/string/straprintf.o Runtime/common/string/stringalloc.o Runtime/common/string/strformat.o Runtime/common/string/strformatrt.o Runtime/common/string/strformattype.o Runtime/common/string/strprintf.o Runtime/common/string/strstrip.o Runtime/common/string/strtonum.o Runtime/common/string/unidata.o Runtime/common/string/utf-16.o Runtime/common/string/utf-8.o Runtime/common/string/utf-8-case.o Runtime/common/time/timesysalias.o Runtime/generic/pathhost-generic.o Runtime/r3/alloc.o Runtime/r3/dir.o Runtime/r3/fileio.o Runtime/r3/fs.o Runtime/r3/linux/sysfs.o Runtime/r3/linux/time-linux.o Runtime/r3/posix/dir-posix.o Runtime/r3/posix/env-posix.o Runtime/r3/posix/fileio-posix.o Runtime/r3/posix/fs2-posix.o Runtime/r3/posix/fs3-posix.o Runtime/r3/posix/path-posix.o Runtime/r3/posix/path2-posix.o Runtime/r3/posix/utf8-posix.o Runtime/r3/stream.o vrdp/rdpusb.o vrdp/USBGetDevices.o vrdp/USBLib.o vrdp/linux/USBProxyDevice-linux.o X11OBJ = rdesktop.o xwin.o xkeymap.o ewmhints.o xclip.o cliprdr.o VNCOBJ = vnc/rdp2vnc.o vnc/vnc.o vnc/xkeymap.o vnc/x11stubs.o diff --git a/src/VBox/RDP/client/Makefile.kmk b/src/VBox/RDP/client/Makefile.kmk index 30d011c45..ffa84d760 100644 --- a/src/VBox/RDP/client/Makefile.kmk +++ b/src/VBox/RDP/client/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38302 2011-08-03 14:24:50Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # VBox - rdesktop with VRDP enhancements sub-makefile. # @@ -272,6 +272,7 @@ rdesktop-src_SOURCES = \ $(PATH_ROOT)/include/iprt/file.h=>include/iprt/file.h \ $(PATH_ROOT)/include/iprt/fs.h=>include/iprt/fs.h \ $(PATH_ROOT)/include/iprt/linux/sysfs.h=>include/iprt/linux/sysfs.h \ + $(PATH_ROOT)/include/iprt/list.h=>include/iprt/list.h \ $(PATH_ROOT)/include/iprt/log.h=>include/iprt/log.h \ $(PATH_ROOT)/include/iprt/mem.h=>include/iprt/mem.h \ $(PATH_ROOT)/include/iprt/net.h=>include/iprt/net.h \ @@ -309,6 +310,7 @@ rdesktop-src_SOURCES = \ $(PATH_ROOT)/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp=>Runtime/common/err/RTErrConvertFromErrno.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp=>Runtime/common/err/RTErrConvertToErrno.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/path/RTPathAppend.cpp=>Runtime/common/path/RTPathAppend.cpp \ + $(PATH_ROOT)/src/VBox/Runtime/common/path/RTPathAppendEx.cpp=>Runtime/common/path/RTPathAppendEx.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/path/RTPathCountComponents.cpp=>Runtime/common/path/RTPathCountComponents.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/path/RTPathFilename.cpp=>Runtime/common/path/RTPathFilename.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp=>Runtime/common/path/rtPathRootSpecLen.cpp \ @@ -317,6 +319,8 @@ rdesktop-src_SOURCES = \ $(PATH_ROOT)/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp=>Runtime/common/path/rtPathVolumeSpecLen.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/string/RTStrCopy.cpp=>Runtime/common/string/RTStrCopy.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/string/RTStrNLen.cpp=>Runtime/common/string/RTStrNLen.cpp \ + $(PATH_ROOT)/src/VBox/Runtime/common/string/RTStrCmp.cpp=>Runtime/common/string/RTStrCmp.cpp \ + $(PATH_ROOT)/src/VBox/Runtime/common/string/RTStrNCmp.cpp=>Runtime/common/string/RTStrNCmp.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/string/straprintf.cpp=>Runtime/common/string/straprintf.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/string/stringalloc.cpp=>Runtime/common/string/stringalloc.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/string/strformat.cpp=>Runtime/common/string/strformat.cpp \ @@ -328,6 +332,7 @@ rdesktop-src_SOURCES = \ $(PATH_ROOT)/src/VBox/Runtime/common/string/unidata.cpp=>Runtime/common/string/unidata.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/string/utf-16.cpp=>Runtime/common/string/utf-16.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/string/utf-8.cpp=>Runtime/common/string/utf-8.cpp \ + $(PATH_ROOT)/src/VBox/Runtime/common/string/utf-8-case.cpp=>Runtime/common/string/utf-8-case.cpp \ $(PATH_ROOT)/src/VBox/Runtime/common/time/timesysalias.cpp=>Runtime/common/time/timesysalias.cpp \ $(PATH_ROOT)/src/VBox/Runtime/generic/pathhost-generic.cpp=>Runtime/generic/pathhost-generic.cpp \ $(PATH_ROOT)/src/VBox/Runtime/include/internal/alignmentchecks.h=>include/internal/alignmentchecks.h \ @@ -336,6 +341,7 @@ rdesktop-src_SOURCES = \ $(PATH_ROOT)/src/VBox/Runtime/include/internal/fs.h=>include/internal/fs.h \ $(PATH_ROOT)/src/VBox/Runtime/include/internal/iprt.h=>include/internal/iprt.h \ $(PATH_ROOT)/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \ + $(PATH_ROOT)/src/VBox/Runtime/include/internal/mem.h=>include/internal/mem.h \ $(PATH_ROOT)/src/VBox/Runtime/include/internal/path.h=>include/internal/path.h \ $(PATH_ROOT)/src/VBox/Runtime/include/internal/process.h=>include/internal/process.h \ $(PATH_ROOT)/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \ @@ -350,7 +356,10 @@ rdesktop-src_SOURCES = \ $(PATH_ROOT)/src/VBox/Runtime/r3/posix/dir-posix.cpp=>Runtime/r3/posix/dir-posix.cpp \ $(PATH_ROOT)/src/VBox/Runtime/r3/posix/env-posix.cpp=>Runtime/r3/posix/env-posix.cpp \ $(PATH_ROOT)/src/VBox/Runtime/r3/posix/fileio-posix.cpp=>Runtime/r3/posix/fileio-posix.cpp \ + $(PATH_ROOT)/src/VBox/Runtime/r3/posix/fs2-posix.cpp=>Runtime/r3/posix/fs2-posix.cpp \ + $(PATH_ROOT)/src/VBox/Runtime/r3/posix/fs3-posix.cpp=>Runtime/r3/posix/fs3-posix.cpp \ $(PATH_ROOT)/src/VBox/Runtime/r3/posix/path-posix.cpp=>Runtime/r3/posix/path-posix.cpp \ + $(PATH_ROOT)/src/VBox/Runtime/r3/posix/path2-posix.cpp=>Runtime/r3/posix/path2-posix.cpp \ $(PATH_ROOT)/src/VBox/Runtime/r3/posix/utf8-posix.cpp=>Runtime/r3/posix/utf8-posix.cpp \ $(PATH_ROOT)/src/VBox/Runtime/r3/stream.cpp=>Runtime/r3/stream.cpp diff --git a/src/VBox/RDP/client/rdpdr.c b/src/VBox/RDP/client/rdpdr.c index ebc57f2ee..c1fb2889c 100644 --- a/src/VBox/RDP/client/rdpdr.c +++ b/src/VBox/RDP/client/rdpdr.c @@ -422,6 +422,7 @@ rdpdr_process_irp(STREAM s) default: error("IRP for bad device %ld\n", device); + xfree(buffer); return; } diff --git a/src/VBox/Runtime/.scm-settings b/src/VBox/Runtime/.scm-settings index 4d597df34..8c5b4f8d4 100644 --- a/src/VBox/Runtime/.scm-settings +++ b/src/VBox/Runtime/.scm-settings @@ -1,4 +1,4 @@ -# $Id: .scm-settings 32394 2010-09-10 12:13:11Z vboxsync $ +# $Id: .scm-settings $ ## @file # Source code massager settings for Runtime. # diff --git a/src/VBox/Runtime/Makefile.kmk b/src/VBox/Runtime/Makefile.kmk index 47dd2168a..d10888f56 100644 --- a/src/VBox/Runtime/Makefile.kmk +++ b/src/VBox/Runtime/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38419 2011-08-11 14:15:25Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the IPRT (IPRT). # diff --git a/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp b/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp index 603d26d82..4db5e2e45 100644 --- a/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp +++ b/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertShouldPanic-vbox.cpp 37233 2011-05-27 13:31:57Z vboxsync $ */ +/* $Id: RTAssertShouldPanic-vbox.cpp $ */ /** @file * IPRT - Assertions, generic RTAssertShouldPanic. */ diff --git a/src/VBox/Runtime/VBox/VBoxRTDeps.cpp b/src/VBox/Runtime/VBox/VBoxRTDeps.cpp index d9488dc25..8e84441fa 100644 --- a/src/VBox/Runtime/VBox/VBoxRTDeps.cpp +++ b/src/VBox/Runtime/VBox/VBoxRTDeps.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxRTDeps.cpp 37277 2011-05-31 14:38:12Z vboxsync $ */ +/* $Id: VBoxRTDeps.cpp $ */ /** @file * IPRT - VBoxRT.dll/so dependencies. */ diff --git a/src/VBox/Runtime/VBox/VBoxRTImp.def b/src/VBox/Runtime/VBox/VBoxRTImp.def index 0630d9651..3b672a047 100644 --- a/src/VBox/Runtime/VBox/VBoxRTImp.def +++ b/src/VBox/Runtime/VBox/VBoxRTImp.def @@ -1,4 +1,4 @@ -; $Id: VBoxRTImp.def 35185 2010-12-16 14:10:38Z vboxsync $ +; $Id: VBoxRTImp.def $ ;; @file ; VirtualBox Runtime DLL - Stable Interface Definition file. diff --git a/src/VBox/Runtime/VBox/log-vbox.cpp b/src/VBox/Runtime/VBox/log-vbox.cpp index 039e43e4d..4403648d1 100644 --- a/src/VBox/Runtime/VBox/log-vbox.cpp +++ b/src/VBox/Runtime/VBox/log-vbox.cpp @@ -1,4 +1,4 @@ -/* $Id: log-vbox.cpp 37217 2011-05-26 08:54:27Z vboxsync $ */ +/* $Id: log-vbox.cpp $ */ /** @file * VirtualBox Runtime - Logging configuration. */ diff --git a/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp b/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp index 87bbde2bc..637c4005d 100644 --- a/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp +++ b/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp @@ -1,4 +1,4 @@ -/* $Id: logbackdoor-redirect.cpp 36408 2011-03-24 16:25:47Z vboxsync $ */ +/* $Id: logbackdoor-redirect.cpp $ */ /** @file * VirtualBox Runtime - RTLog stubs for the stripped down IPRT used by * RuntimeGuestR3Shared (X11), output is redirected diff --git a/src/VBox/Runtime/VBox/logbackdoor.cpp b/src/VBox/Runtime/VBox/logbackdoor.cpp index 37bb57cbd..99d4485db 100644 --- a/src/VBox/Runtime/VBox/logbackdoor.cpp +++ b/src/VBox/Runtime/VBox/logbackdoor.cpp @@ -1,4 +1,4 @@ -/* $Id: logbackdoor.cpp 29250 2010-05-09 17:53:58Z vboxsync $ */ +/* $Id: logbackdoor.cpp $ */ /** @file * VirtualBox Runtime - Guest Backdoor Logging. */ diff --git a/src/VBox/Runtime/common/alloc/alloc.cpp b/src/VBox/Runtime/common/alloc/alloc.cpp index ffaff343f..585a22f67 100644 --- a/src/VBox/Runtime/common/alloc/alloc.cpp +++ b/src/VBox/Runtime/common/alloc/alloc.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc.cpp 37808 2011-07-07 07:45:50Z vboxsync $ */ +/* $Id: alloc.cpp $ */ /** @file * IPRT - Memory Allocation. */ diff --git a/src/VBox/Runtime/common/alloc/heapoffset.cpp b/src/VBox/Runtime/common/alloc/heapoffset.cpp index fd5d0e96d..2cd8697a9 100644 --- a/src/VBox/Runtime/common/alloc/heapoffset.cpp +++ b/src/VBox/Runtime/common/alloc/heapoffset.cpp @@ -1,4 +1,4 @@ -/* $Id: heapoffset.cpp 35525 2011-01-13 14:00:37Z vboxsync $ */ +/* $Id: heapoffset.cpp $ */ /** @file * IPRT - An Offset Based Heap. */ diff --git a/src/VBox/Runtime/common/alloc/heapsimple.cpp b/src/VBox/Runtime/common/alloc/heapsimple.cpp index 3377e6597..7e680132d 100644 --- a/src/VBox/Runtime/common/alloc/heapsimple.cpp +++ b/src/VBox/Runtime/common/alloc/heapsimple.cpp @@ -1,4 +1,4 @@ -/* $Id: heapsimple.cpp 35525 2011-01-13 14:00:37Z vboxsync $ */ +/* $Id: heapsimple.cpp $ */ /** @file * IPRT - A Simple Heap. */ diff --git a/src/VBox/Runtime/common/alloc/memcache.cpp b/src/VBox/Runtime/common/alloc/memcache.cpp index 72349f353..f7f41ff65 100644 --- a/src/VBox/Runtime/common/alloc/memcache.cpp +++ b/src/VBox/Runtime/common/alloc/memcache.cpp @@ -1,4 +1,4 @@ -/* $Id: memcache.cpp 34507 2010-11-30 13:14:14Z vboxsync $ */ +/* $Id: memcache.cpp $ */ /** @file * IPRT - Memory Object Allocation Cache. */ diff --git a/src/VBox/Runtime/common/alloc/memtracker.cpp b/src/VBox/Runtime/common/alloc/memtracker.cpp index 61346d98c..d55560775 100644 --- a/src/VBox/Runtime/common/alloc/memtracker.cpp +++ b/src/VBox/Runtime/common/alloc/memtracker.cpp @@ -1,4 +1,4 @@ -/* $Id: memtracker.cpp 36674 2011-04-14 16:03:06Z vboxsync $ */ +/* $Id: memtracker.cpp $ */ /** @file * IPRT - Memory Tracker & Leak Detector. */ diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm index 1e0974623..da71254ef 100644 --- a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm +++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm @@ -1,4 +1,4 @@ -; $Id: ASMAtomicCmpXchgExU64.asm 33540 2010-10-28 09:27:05Z vboxsync $ +; $Id: ASMAtomicCmpXchgExU64.asm $ ;; @file ; IPRT - ASMAtomicCmpXchgExU64(). ; diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm index e0f96d47d..d6ee4d69c 100644 --- a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm +++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm @@ -1,4 +1,4 @@ -; $Id: ASMAtomicCmpXchgU64.asm 33540 2010-10-28 09:27:05Z vboxsync $ +; $Id: ASMAtomicCmpXchgU64.asm $ ;; @file ; IPRT - ASMAtomicCmpXchgU64(). ; diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm index 86f1af833..0c57b29d3 100644 --- a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm +++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm @@ -1,4 +1,4 @@ -; $Id: ASMAtomicCmpXchgU8.asm 33540 2010-10-28 09:27:05Z vboxsync $ +; $Id: ASMAtomicCmpXchgU8.asm $ ;; @file ; IPRT - ASMAtomicCmpXchgU8(). ; diff --git a/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm index cf8298e47..60d01e32a 100644 --- a/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm +++ b/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm @@ -1,4 +1,4 @@ -; $Id: ASMAtomicReadU64.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: ASMAtomicReadU64.asm $ ;; @file ; IPRT - ASMAtomicReadU64(). ; diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm index 0751ba001..8e83ebe7e 100644 --- a/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm +++ b/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm @@ -1,4 +1,4 @@ -; $Id: ASMAtomicUoReadU64.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: ASMAtomicUoReadU64.asm $ ;; @file ; IPRT - ASMAtomicUoReadU64(). ; diff --git a/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm index 0545fcc92..2530060ec 100644 --- a/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm +++ b/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm @@ -1,4 +1,4 @@ -; $Id: ASMAtomicXchgU64.asm 33540 2010-10-28 09:27:05Z vboxsync $ +; $Id: ASMAtomicXchgU64.asm $ ;; @file ; IPRT - ASMAtomicXchgU64(). ; diff --git a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm index f5e92a5bc..6155e869a 100644 --- a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm +++ b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm @@ -1,4 +1,4 @@ -; $Id: ASMMultU64ByU32DivByU32.asm 33540 2010-10-28 09:27:05Z vboxsync $ +; $Id: ASMMultU64ByU32DivByU32.asm $ ;; @file ; IPRT - Assembly Functions, ASMMultU64ByU32DivByU32. ; diff --git a/src/VBox/Runtime/common/asm/ASMNopPause.asm b/src/VBox/Runtime/common/asm/ASMNopPause.asm index 25b50a9e6..455bd14d0 100644 --- a/src/VBox/Runtime/common/asm/ASMNopPause.asm +++ b/src/VBox/Runtime/common/asm/ASMNopPause.asm @@ -1,4 +1,4 @@ -; $Id: ASMNopPause.asm 33540 2010-10-28 09:27:05Z vboxsync $ +; $Id: ASMNopPause.asm $ ;; @file ; IPRT - ASMNopPause(). ; diff --git a/src/VBox/Runtime/common/asm/asm-fake.cpp b/src/VBox/Runtime/common/asm/asm-fake.cpp index 263ad3e22..73478a86e 100644 --- a/src/VBox/Runtime/common/asm/asm-fake.cpp +++ b/src/VBox/Runtime/common/asm/asm-fake.cpp @@ -1,4 +1,4 @@ -/* $Id: asm-fake.cpp 29278 2010-05-09 23:28:27Z vboxsync $ */ +/* $Id: asm-fake.cpp $ */ /** @file * IPRT - Fake asm.h routines for use early in a new port. */ diff --git a/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp b/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp index 4caac022e..70b158be2 100644 --- a/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp +++ b/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSha1Digest.cpp 32569 2010-09-16 15:42:51Z vboxsync $ */ +/* $Id: RTSha1Digest.cpp $ */ /** @file * IPRT - SHA1 digest creation */ diff --git a/src/VBox/Runtime/common/checksum/adler32.cpp b/src/VBox/Runtime/common/checksum/adler32.cpp index 05fa27736..d9e54985b 100644 --- a/src/VBox/Runtime/common/checksum/adler32.cpp +++ b/src/VBox/Runtime/common/checksum/adler32.cpp @@ -1,4 +1,4 @@ -/* $Id: adler32.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: adler32.cpp $ */ /** @file * IPRT - Adler-32 */ diff --git a/src/VBox/Runtime/common/checksum/crc32-zlib.cpp b/src/VBox/Runtime/common/checksum/crc32-zlib.cpp index 6320688b7..650a959b2 100644 --- a/src/VBox/Runtime/common/checksum/crc32-zlib.cpp +++ b/src/VBox/Runtime/common/checksum/crc32-zlib.cpp @@ -1,4 +1,4 @@ -/* $Id: crc32-zlib.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: crc32-zlib.cpp $ */ /** @file * IPRT - CRC-32 on top of zlib (very fast). */ diff --git a/src/VBox/Runtime/common/checksum/crc32.cpp b/src/VBox/Runtime/common/checksum/crc32.cpp index 998c8f455..c43b2cbbd 100644 --- a/src/VBox/Runtime/common/checksum/crc32.cpp +++ b/src/VBox/Runtime/common/checksum/crc32.cpp @@ -1,4 +1,4 @@ -/* $Id: crc32.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: crc32.cpp $ */ /** @file * IPRT - CRC32. */ diff --git a/src/VBox/Runtime/common/checksum/crc64.cpp b/src/VBox/Runtime/common/checksum/crc64.cpp index 586b5c8b4..74c60070d 100644 --- a/src/VBox/Runtime/common/checksum/crc64.cpp +++ b/src/VBox/Runtime/common/checksum/crc64.cpp @@ -1,4 +1,4 @@ -/* $Id: crc64.cpp 31847 2010-08-21 20:33:07Z vboxsync $ */ +/* $Id: crc64.cpp $ */ /** @file * IPRT - CRC64. * diff --git a/src/VBox/Runtime/common/checksum/ipv4.cpp b/src/VBox/Runtime/common/checksum/ipv4.cpp index 1dd1ee363..4b10b4b00 100644 --- a/src/VBox/Runtime/common/checksum/ipv4.cpp +++ b/src/VBox/Runtime/common/checksum/ipv4.cpp @@ -1,4 +1,4 @@ -/* $Id: ipv4.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: ipv4.cpp $ */ /** @file * IPRT - IPv4 Checksum calculation and validation. */ diff --git a/src/VBox/Runtime/common/checksum/ipv6.cpp b/src/VBox/Runtime/common/checksum/ipv6.cpp index c9baf477a..d33438a0f 100644 --- a/src/VBox/Runtime/common/checksum/ipv6.cpp +++ b/src/VBox/Runtime/common/checksum/ipv6.cpp @@ -1,4 +1,4 @@ -/* $Id: ipv6.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ipv6.cpp $ */ /** @file * IPRT - IPv6 Checksum calculation and validation. */ diff --git a/src/VBox/Runtime/common/checksum/manifest-file.cpp b/src/VBox/Runtime/common/checksum/manifest-file.cpp index 602c99d49..d686022e6 100644 --- a/src/VBox/Runtime/common/checksum/manifest-file.cpp +++ b/src/VBox/Runtime/common/checksum/manifest-file.cpp @@ -1,4 +1,4 @@ -/* $Id: manifest-file.cpp 35351 2010-12-27 17:04:17Z vboxsync $ */ +/* $Id: manifest-file.cpp $ */ /** @file * IPRT - Manifest, the bits with file dependencies */ diff --git a/src/VBox/Runtime/common/checksum/manifest.cpp b/src/VBox/Runtime/common/checksum/manifest.cpp index 69a52ee42..b1e1152be 100644 --- a/src/VBox/Runtime/common/checksum/manifest.cpp +++ b/src/VBox/Runtime/common/checksum/manifest.cpp @@ -1,4 +1,4 @@ -/* $Id: manifest.cpp 33289 2010-10-21 10:00:15Z vboxsync $ */ +/* $Id: manifest.cpp $ */ /** @file * IPRT - Manifest file handling. */ diff --git a/src/VBox/Runtime/common/checksum/manifest2.cpp b/src/VBox/Runtime/common/checksum/manifest2.cpp index 918b67eb8..534d08d9b 100644 --- a/src/VBox/Runtime/common/checksum/manifest2.cpp +++ b/src/VBox/Runtime/common/checksum/manifest2.cpp @@ -1,4 +1,4 @@ -/* $Id: manifest2.cpp 34941 2010-12-10 10:58:06Z vboxsync $ */ +/* $Id: manifest2.cpp $ */ /** @file * IPRT - Manifest, the core. */ diff --git a/src/VBox/Runtime/common/checksum/manifest3.cpp b/src/VBox/Runtime/common/checksum/manifest3.cpp index cf06cd064..393c130e6 100644 --- a/src/VBox/Runtime/common/checksum/manifest3.cpp +++ b/src/VBox/Runtime/common/checksum/manifest3.cpp @@ -1,4 +1,4 @@ -/* $Id: manifest3.cpp 35351 2010-12-27 17:04:17Z vboxsync $ */ +/* $Id: manifest3.cpp $ */ /** @file * IPRT - Manifest, the bits with the most dependencies. */ diff --git a/src/VBox/Runtime/common/checksum/md5.cpp b/src/VBox/Runtime/common/checksum/md5.cpp index f312d1763..1bc5f97b4 100644 --- a/src/VBox/Runtime/common/checksum/md5.cpp +++ b/src/VBox/Runtime/common/checksum/md5.cpp @@ -1,4 +1,4 @@ -/* $Id: md5.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: md5.cpp $ */ /** @file * IPRT - MD5 message digest functions. */ diff --git a/src/VBox/Runtime/common/checksum/md5str.cpp b/src/VBox/Runtime/common/checksum/md5str.cpp index f85c11783..40dbb8ba9 100644 --- a/src/VBox/Runtime/common/checksum/md5str.cpp +++ b/src/VBox/Runtime/common/checksum/md5str.cpp @@ -1,4 +1,4 @@ -/* $Id: md5str.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: md5str.cpp $ */ /** @file * IPRT - MD5 string functions. */ diff --git a/src/VBox/Runtime/common/checksum/sha1.cpp b/src/VBox/Runtime/common/checksum/sha1.cpp index 624ce03d2..e448a479b 100644 --- a/src/VBox/Runtime/common/checksum/sha1.cpp +++ b/src/VBox/Runtime/common/checksum/sha1.cpp @@ -1,4 +1,4 @@ -/* $Id: sha1.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: sha1.cpp $ */ /** @file * IPRT - SHA-1 hash functions. */ diff --git a/src/VBox/Runtime/common/checksum/sha1str.cpp b/src/VBox/Runtime/common/checksum/sha1str.cpp index d50b57cd4..730d0bee9 100644 --- a/src/VBox/Runtime/common/checksum/sha1str.cpp +++ b/src/VBox/Runtime/common/checksum/sha1str.cpp @@ -1,4 +1,4 @@ -/* $Id: sha1str.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: sha1str.cpp $ */ /** @file * IPRT - SHA-1 string functions. */ diff --git a/src/VBox/Runtime/common/checksum/sha256.cpp b/src/VBox/Runtime/common/checksum/sha256.cpp index ad1c831af..c78e22e22 100644 --- a/src/VBox/Runtime/common/checksum/sha256.cpp +++ b/src/VBox/Runtime/common/checksum/sha256.cpp @@ -1,4 +1,4 @@ -/* $Id: sha256.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: sha256.cpp $ */ /** @file * IPRT - SHA-256 hash functions. */ diff --git a/src/VBox/Runtime/common/checksum/sha256str.cpp b/src/VBox/Runtime/common/checksum/sha256str.cpp index 4c683db9a..43e668e18 100644 --- a/src/VBox/Runtime/common/checksum/sha256str.cpp +++ b/src/VBox/Runtime/common/checksum/sha256str.cpp @@ -1,4 +1,4 @@ -/* $Id: sha256str.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: sha256str.cpp $ */ /** @file * IPRT - SHA-256 string functions. */ diff --git a/src/VBox/Runtime/common/checksum/sha512.cpp b/src/VBox/Runtime/common/checksum/sha512.cpp index 0befcf7f6..ee38f3686 100644 --- a/src/VBox/Runtime/common/checksum/sha512.cpp +++ b/src/VBox/Runtime/common/checksum/sha512.cpp @@ -1,4 +1,4 @@ -/* $Id: sha512.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: sha512.cpp $ */ /** @file * IPRT - SHA-512 hash functions. */ diff --git a/src/VBox/Runtime/common/checksum/sha512str.cpp b/src/VBox/Runtime/common/checksum/sha512str.cpp index eed48abad..133734217 100644 --- a/src/VBox/Runtime/common/checksum/sha512str.cpp +++ b/src/VBox/Runtime/common/checksum/sha512str.cpp @@ -1,4 +1,4 @@ -/* $Id: sha512str.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: sha512str.cpp $ */ /** @file * IPRT - SHA-512 string functions. */ diff --git a/src/VBox/Runtime/common/dbg/dbg.cpp b/src/VBox/Runtime/common/dbg/dbg.cpp index e17bdcb76..4198ddafe 100644 --- a/src/VBox/Runtime/common/dbg/dbg.cpp +++ b/src/VBox/Runtime/common/dbg/dbg.cpp @@ -1,4 +1,4 @@ -/* $Id: dbg.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: dbg.cpp $ */ /** @file * IPRT - Debug Misc. */ diff --git a/src/VBox/Runtime/common/dbg/dbgas.cpp b/src/VBox/Runtime/common/dbg/dbgas.cpp index a5f7c355b..dac5ae97e 100644 --- a/src/VBox/Runtime/common/dbg/dbgas.cpp +++ b/src/VBox/Runtime/common/dbg/dbgas.cpp @@ -1,4 +1,4 @@ -/* $Id: dbgas.cpp 33663 2010-11-01 15:58:06Z vboxsync $ */ +/* $Id: dbgas.cpp $ */ /** @file * IPRT - Debug Address Space. */ diff --git a/src/VBox/Runtime/common/dbg/dbgmod.cpp b/src/VBox/Runtime/common/dbg/dbgmod.cpp index ecfc58793..fc94ffbf7 100644 --- a/src/VBox/Runtime/common/dbg/dbgmod.cpp +++ b/src/VBox/Runtime/common/dbg/dbgmod.cpp @@ -1,4 +1,4 @@ -/* $Id: dbgmod.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: dbgmod.cpp $ */ /** @file * IPRT - Debug Module Interpreter. */ diff --git a/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp b/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp index ed220cba9..476a39aa5 100644 --- a/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp +++ b/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp @@ -1,4 +1,4 @@ -/* $Id: dbgmodcontainer.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: dbgmodcontainer.cpp $ */ /** @file * IPRT - Debug Info Container. */ diff --git a/src/VBox/Runtime/common/dbg/dbgmodnm.cpp b/src/VBox/Runtime/common/dbg/dbgmodnm.cpp index ed10ad0de..fe9275065 100644 --- a/src/VBox/Runtime/common/dbg/dbgmodnm.cpp +++ b/src/VBox/Runtime/common/dbg/dbgmodnm.cpp @@ -1,4 +1,4 @@ -/* $Id: dbgmodnm.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: dbgmodnm.cpp $ */ /** @file * IPRT - Debug Map Reader For NM Like Mapfiles. */ diff --git a/src/VBox/Runtime/common/dvm/dvm.cpp b/src/VBox/Runtime/common/dvm/dvm.cpp index eb9fe7021..3eaf2ce76 100644 --- a/src/VBox/Runtime/common/dvm/dvm.cpp +++ b/src/VBox/Runtime/common/dvm/dvm.cpp @@ -1,4 +1,4 @@ -/* $Id: dvm.cpp 37270 2011-05-30 21:25:42Z vboxsync $ */ +/* $Id: dvm.cpp $ */ /** @file * IPRT Disk Volume Management API (DVM) - generic code. */ diff --git a/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp b/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp index e874178df..f066608e1 100644 --- a/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp +++ b/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp @@ -1,4 +1,4 @@ -/* $Id: dvmbsdlabel.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: dvmbsdlabel.cpp $ */ /** @file * IPRT Disk Volume Management API (DVM) - BSD disklabel format backend. */ diff --git a/src/VBox/Runtime/common/dvm/dvmgpt.cpp b/src/VBox/Runtime/common/dvm/dvmgpt.cpp index e478343de..eca4ae140 100644 --- a/src/VBox/Runtime/common/dvm/dvmgpt.cpp +++ b/src/VBox/Runtime/common/dvm/dvmgpt.cpp @@ -1,4 +1,4 @@ -/* $Id: dvmgpt.cpp 37024 2011-05-10 11:23:44Z vboxsync $ */ +/* $Id: dvmgpt.cpp $ */ /** @file * IPRT Disk Volume Management API (DVM) - GPT format backend. */ diff --git a/src/VBox/Runtime/common/dvm/dvmmbr.cpp b/src/VBox/Runtime/common/dvm/dvmmbr.cpp index 38700ad3b..cfc61b5a3 100644 --- a/src/VBox/Runtime/common/dvm/dvmmbr.cpp +++ b/src/VBox/Runtime/common/dvm/dvmmbr.cpp @@ -1,4 +1,4 @@ -/* $Id: dvmmbr.cpp 37024 2011-05-10 11:23:44Z vboxsync $ */ +/* $Id: dvmmbr.cpp $ */ /** @file * IPRT Disk Volume Management API (DVM) - MBR format backend. */ diff --git a/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp index 5cb304854..13f37b776 100644 --- a/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp +++ b/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromErrno.cpp 31316 2010-08-02 15:36:30Z vboxsync $ */ +/* $Id: RTErrConvertFromErrno.cpp $ */ /** @file * IPRT - Convert errno to iprt status codes. */ diff --git a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp index 11df924fa..5e64b3f79 100644 --- a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp +++ b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertToErrno.cpp 36284 2011-03-15 13:06:05Z vboxsync $ */ +/* $Id: RTErrConvertToErrno.cpp $ */ /** @file * IPRT - Convert iprt status codes to errno. */ diff --git a/src/VBox/Runtime/common/err/errinfo.cpp b/src/VBox/Runtime/common/err/errinfo.cpp index aef5a3973..a8db71fcb 100644 --- a/src/VBox/Runtime/common/err/errinfo.cpp +++ b/src/VBox/Runtime/common/err/errinfo.cpp @@ -1,4 +1,4 @@ -/* $Id: errinfo.cpp 35182 2010-12-16 13:57:44Z vboxsync $ */ +/* $Id: errinfo.cpp $ */ /** @file * IPRT - Error Info. */ diff --git a/src/VBox/Runtime/common/err/errmsg.cpp b/src/VBox/Runtime/common/err/errmsg.cpp index b011bf79c..c22927469 100644 --- a/src/VBox/Runtime/common/err/errmsg.cpp +++ b/src/VBox/Runtime/common/err/errmsg.cpp @@ -1,4 +1,4 @@ -/* $Id: errmsg.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: errmsg.cpp $ */ /** @file * IPRT - Status code messages. */ diff --git a/src/VBox/Runtime/common/err/errmsg.sed b/src/VBox/Runtime/common/err/errmsg.sed index 8af8c7c00..5dc80e9cd 100644 --- a/src/VBox/Runtime/common/err/errmsg.sed +++ b/src/VBox/Runtime/common/err/errmsg.sed @@ -1,4 +1,4 @@ -# $Id: errmsg.sed 35811 2011-02-01 13:12:08Z vboxsync $ +# $Id: errmsg.sed $ ## @file # IPRT - SED script for converting */err.h. # diff --git a/src/VBox/Runtime/common/err/errmsgcom.sed b/src/VBox/Runtime/common/err/errmsgcom.sed index b1c2096a0..b101ad7c9 100644 --- a/src/VBox/Runtime/common/err/errmsgcom.sed +++ b/src/VBox/Runtime/common/err/errmsgcom.sed @@ -1,4 +1,4 @@ -# $Id: errmsgcom.sed 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: errmsgcom.sed $ ## @file # IPRT - SED script for converting COM errors # diff --git a/src/VBox/Runtime/common/err/errmsgxpcom.cpp b/src/VBox/Runtime/common/err/errmsgxpcom.cpp index bee0378da..74071989c 100644 --- a/src/VBox/Runtime/common/err/errmsgxpcom.cpp +++ b/src/VBox/Runtime/common/err/errmsgxpcom.cpp @@ -1,4 +1,4 @@ -/* $Id: errmsgxpcom.cpp 34654 2010-12-02 19:59:22Z vboxsync $ */ +/* $Id: errmsgxpcom.cpp $ */ /** @file * IPRT - Status code messages for XPCOM. */ diff --git a/src/VBox/Runtime/common/ldr/ldr.cpp b/src/VBox/Runtime/common/ldr/ldr.cpp index bbe54edc2..fda1e4372 100644 --- a/src/VBox/Runtime/common/ldr/ldr.cpp +++ b/src/VBox/Runtime/common/ldr/ldr.cpp @@ -1,4 +1,4 @@ -/* $Id: ldr.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: ldr.cpp $ */ /** @file * IPRT - Binary Image Loader. */ diff --git a/src/VBox/Runtime/common/ldr/ldrELF.cpp b/src/VBox/Runtime/common/ldr/ldrELF.cpp index b260fc4c3..47b45f618 100644 --- a/src/VBox/Runtime/common/ldr/ldrELF.cpp +++ b/src/VBox/Runtime/common/ldr/ldrELF.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrELF.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ldrELF.cpp $ */ /** @file * IPRT - Binary Image Loader, Executable and Linker Format (ELF). */ diff --git a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h index f0fff9008..755ef6a94 100644 --- a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h +++ b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h @@ -1,4 +1,4 @@ -/* $Id: ldrELFRelocatable.cpp.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: ldrELFRelocatable.cpp.h $ */ /** @file * IPRT - Binary Image Loader, Template for ELF Relocatable Images. */ diff --git a/src/VBox/Runtime/common/ldr/ldrEx.cpp b/src/VBox/Runtime/common/ldr/ldrEx.cpp index ffd59542a..89750586d 100644 --- a/src/VBox/Runtime/common/ldr/ldrEx.cpp +++ b/src/VBox/Runtime/common/ldr/ldrEx.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrEx.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: ldrEx.cpp $ */ /** @file * IPRT - Binary Image Loader, Extended Features. */ diff --git a/src/VBox/Runtime/common/ldr/ldrFile.cpp b/src/VBox/Runtime/common/ldr/ldrFile.cpp index b0b43f9a8..47783639b 100644 --- a/src/VBox/Runtime/common/ldr/ldrFile.cpp +++ b/src/VBox/Runtime/common/ldr/ldrFile.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrFile.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: ldrFile.cpp $ */ /** @file * IPRT - Binary Image Loader, The File Oriented Parts. */ diff --git a/src/VBox/Runtime/common/ldr/ldrNative.cpp b/src/VBox/Runtime/common/ldr/ldrNative.cpp index 8c25fed4a..8462e7098 100644 --- a/src/VBox/Runtime/common/ldr/ldrNative.cpp +++ b/src/VBox/Runtime/common/ldr/ldrNative.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrNative.cpp 35191 2010-12-16 15:25:20Z vboxsync $ */ +/* $Id: ldrNative.cpp $ */ /** @file * IPRT - Binary Image Loader, Native interface. */ diff --git a/src/VBox/Runtime/common/ldr/ldrPE.cpp b/src/VBox/Runtime/common/ldr/ldrPE.cpp index 47be5429f..82f610b55 100644 --- a/src/VBox/Runtime/common/ldr/ldrPE.cpp +++ b/src/VBox/Runtime/common/ldr/ldrPE.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrPE.cpp 36969 2011-05-05 08:59:43Z vboxsync $ */ +/* $Id: ldrPE.cpp $ */ /** @file * IPRT - Binary Image Loader, Portable Executable (PE). */ diff --git a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp index 09fd971c0..96585a61b 100644 --- a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp +++ b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrkStuff.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ldrkStuff.cpp $ */ /** @file * IPRT - Binary Image Loader, kLdr Interface. */ diff --git a/src/VBox/Runtime/common/log/log.cpp b/src/VBox/Runtime/common/log/log.cpp index 354b32997..196a32764 100644 --- a/src/VBox/Runtime/common/log/log.cpp +++ b/src/VBox/Runtime/common/log/log.cpp @@ -1,4 +1,4 @@ -/* $Id: log.cpp 37818 2011-07-07 13:25:03Z vboxsync $ */ +/* $Id: log.cpp $ */ /** @file * Runtime VBox - Logger. */ diff --git a/src/VBox/Runtime/common/log/logcom.cpp b/src/VBox/Runtime/common/log/logcom.cpp index 065b1dd4d..ed4f26208 100644 --- a/src/VBox/Runtime/common/log/logcom.cpp +++ b/src/VBox/Runtime/common/log/logcom.cpp @@ -1,4 +1,4 @@ -/* $Id: logcom.cpp 29271 2010-05-09 21:25:16Z vboxsync $ */ +/* $Id: logcom.cpp $ */ /** @file * IPRT - Logging to Serial Port. */ diff --git a/src/VBox/Runtime/common/log/logellipsis.cpp b/src/VBox/Runtime/common/log/logellipsis.cpp index ce490429d..48c05840d 100644 --- a/src/VBox/Runtime/common/log/logellipsis.cpp +++ b/src/VBox/Runtime/common/log/logellipsis.cpp @@ -1,4 +1,4 @@ -/* $Id: logellipsis.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: logellipsis.cpp $ */ /** @file * Runtime VBox - Logger, the ellipsis variants. */ diff --git a/src/VBox/Runtime/common/log/logformat.cpp b/src/VBox/Runtime/common/log/logformat.cpp index 761844c88..40cd7d144 100644 --- a/src/VBox/Runtime/common/log/logformat.cpp +++ b/src/VBox/Runtime/common/log/logformat.cpp @@ -1,4 +1,4 @@ -/* $Id: logformat.cpp 33496 2010-10-27 12:15:28Z vboxsync $ */ +/* $Id: logformat.cpp $ */ /** @file * IPRT - Log Formatter. */ diff --git a/src/VBox/Runtime/common/log/logrel.cpp b/src/VBox/Runtime/common/log/logrel.cpp index 7fb5ec746..64f7eb2a7 100644 --- a/src/VBox/Runtime/common/log/logrel.cpp +++ b/src/VBox/Runtime/common/log/logrel.cpp @@ -1,4 +1,4 @@ -/* $Id: logrel.cpp 33704 2010-11-02 18:21:28Z vboxsync $ */ +/* $Id: logrel.cpp $ */ /** @file * Runtime VBox - Release Logger. */ diff --git a/src/VBox/Runtime/common/log/logrelellipsis.cpp b/src/VBox/Runtime/common/log/logrelellipsis.cpp index dbf5619ac..5f1806c6b 100644 --- a/src/VBox/Runtime/common/log/logrelellipsis.cpp +++ b/src/VBox/Runtime/common/log/logrelellipsis.cpp @@ -1,4 +1,4 @@ -/* $Id: logrelellipsis.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: logrelellipsis.cpp $ */ /** @file * Runtime VBox - Logger, the release ellipsis variants. */ diff --git a/src/VBox/Runtime/common/math/ceill.asm b/src/VBox/Runtime/common/math/ceill.asm index 4cd635bad..502181cdd 100644 --- a/src/VBox/Runtime/common/math/ceill.asm +++ b/src/VBox/Runtime/common/math/ceill.asm @@ -1,4 +1,4 @@ -; $Id: ceill.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: ceill.asm $ ;; @file ; IPRT - No-CRT ceill - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/cosl.asm b/src/VBox/Runtime/common/math/cosl.asm index 6e46eb70a..c37c3c6af 100644 --- a/src/VBox/Runtime/common/math/cosl.asm +++ b/src/VBox/Runtime/common/math/cosl.asm @@ -1,4 +1,4 @@ -; $Id: cosl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: cosl.asm $ ;; @file ; IPRT - No-CRT cosl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/fabs.asm b/src/VBox/Runtime/common/math/fabs.asm index f2e114436..18ca01151 100644 --- a/src/VBox/Runtime/common/math/fabs.asm +++ b/src/VBox/Runtime/common/math/fabs.asm @@ -1,4 +1,4 @@ -; $Id: fabs.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: fabs.asm $ ;; @file ; IPRT - No-CRT fabs - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/fabsf.asm b/src/VBox/Runtime/common/math/fabsf.asm index 550ebc9c6..c58d2fc4d 100644 --- a/src/VBox/Runtime/common/math/fabsf.asm +++ b/src/VBox/Runtime/common/math/fabsf.asm @@ -1,4 +1,4 @@ -; $Id: fabsf.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: fabsf.asm $ ;; @file ; IPRT - No-CRT fabsf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/fabsl.asm b/src/VBox/Runtime/common/math/fabsl.asm index e6cbd75a7..1302b00dd 100644 --- a/src/VBox/Runtime/common/math/fabsl.asm +++ b/src/VBox/Runtime/common/math/fabsl.asm @@ -1,4 +1,4 @@ -; $Id: fabsl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: fabsl.asm $ ;; @file ; IPRT - No-CRT fabsl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/floor.asm b/src/VBox/Runtime/common/math/floor.asm index 49b8accbe..7d98b4b4f 100644 --- a/src/VBox/Runtime/common/math/floor.asm +++ b/src/VBox/Runtime/common/math/floor.asm @@ -1,4 +1,4 @@ -; $Id: floor.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: floor.asm $ ;; @file ; IPRT - No-CRT floor - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/floorf.asm b/src/VBox/Runtime/common/math/floorf.asm index 9df9ae551..b54919190 100644 --- a/src/VBox/Runtime/common/math/floorf.asm +++ b/src/VBox/Runtime/common/math/floorf.asm @@ -1,4 +1,4 @@ -; $Id: floorf.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: floorf.asm $ ;; @file ; IPRT - No-CRT floorf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/floorl.asm b/src/VBox/Runtime/common/math/floorl.asm index 8ba748507..c27ada71f 100644 --- a/src/VBox/Runtime/common/math/floorl.asm +++ b/src/VBox/Runtime/common/math/floorl.asm @@ -1,4 +1,4 @@ -; $Id: floorl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: floorl.asm $ ;; @file ; IPRT - No-CRT floorl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/ldexpl.asm b/src/VBox/Runtime/common/math/ldexpl.asm index 230f61fde..f53a4e439 100644 --- a/src/VBox/Runtime/common/math/ldexpl.asm +++ b/src/VBox/Runtime/common/math/ldexpl.asm @@ -1,4 +1,4 @@ -; $Id: ldexpl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: ldexpl.asm $ ;; @file ; IPRT - No-CRT ldexpl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/llrint.asm b/src/VBox/Runtime/common/math/llrint.asm index edd46105d..c870b9136 100644 --- a/src/VBox/Runtime/common/math/llrint.asm +++ b/src/VBox/Runtime/common/math/llrint.asm @@ -1,4 +1,4 @@ -; $Id: llrint.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: llrint.asm $ ;; @file ; IPRT - No-CRT llrint - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/llrintf.asm b/src/VBox/Runtime/common/math/llrintf.asm index 1662c474b..d0c23db7b 100644 --- a/src/VBox/Runtime/common/math/llrintf.asm +++ b/src/VBox/Runtime/common/math/llrintf.asm @@ -1,4 +1,4 @@ -; $Id: llrintf.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: llrintf.asm $ ;; @file ; IPRT - No-CRT llrintf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/llrintl.asm b/src/VBox/Runtime/common/math/llrintl.asm index f35a4d4e9..a0ce49125 100644 --- a/src/VBox/Runtime/common/math/llrintl.asm +++ b/src/VBox/Runtime/common/math/llrintl.asm @@ -1,4 +1,4 @@ -; $Id: llrintl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: llrintl.asm $ ;; @file ; IPRT - No-CRT llrintl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/logl.asm b/src/VBox/Runtime/common/math/logl.asm index 11c19785e..83e7de969 100644 --- a/src/VBox/Runtime/common/math/logl.asm +++ b/src/VBox/Runtime/common/math/logl.asm @@ -1,4 +1,4 @@ -; $Id: logl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: logl.asm $ ;; @file ; IPRT - No-CRT logl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/lrint.asm b/src/VBox/Runtime/common/math/lrint.asm index 7e0f0e0f9..270a79f82 100644 --- a/src/VBox/Runtime/common/math/lrint.asm +++ b/src/VBox/Runtime/common/math/lrint.asm @@ -1,4 +1,4 @@ -; $Id: lrint.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: lrint.asm $ ;; @file ; IPRT - No-CRT lrint - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/lrintf.asm b/src/VBox/Runtime/common/math/lrintf.asm index 80a475587..997294971 100644 --- a/src/VBox/Runtime/common/math/lrintf.asm +++ b/src/VBox/Runtime/common/math/lrintf.asm @@ -1,4 +1,4 @@ -; $Id: lrintf.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: lrintf.asm $ ;; @file ; IPRT - No-CRT lrintf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/lrintl.asm b/src/VBox/Runtime/common/math/lrintl.asm index 777a4a5d8..f336af6ac 100644 --- a/src/VBox/Runtime/common/math/lrintl.asm +++ b/src/VBox/Runtime/common/math/lrintl.asm @@ -1,4 +1,4 @@ -; $Id: lrintl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: lrintl.asm $ ;; @file ; IPRT - No-CRT lrintl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/remainder.asm b/src/VBox/Runtime/common/math/remainder.asm index 1ad6af1e1..117aa502e 100644 --- a/src/VBox/Runtime/common/math/remainder.asm +++ b/src/VBox/Runtime/common/math/remainder.asm @@ -1,4 +1,4 @@ -; $Id: remainder.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: remainder.asm $ ;; @file ; IPRT - No-CRT remainder - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/remainderf.asm b/src/VBox/Runtime/common/math/remainderf.asm index 09e731259..c9b079b70 100644 --- a/src/VBox/Runtime/common/math/remainderf.asm +++ b/src/VBox/Runtime/common/math/remainderf.asm @@ -1,4 +1,4 @@ -; $Id: remainderf.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: remainderf.asm $ ;; @file ; IPRT - No-CRT remainderf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/remainderl.asm b/src/VBox/Runtime/common/math/remainderl.asm index 3f58e9086..922f93a74 100644 --- a/src/VBox/Runtime/common/math/remainderl.asm +++ b/src/VBox/Runtime/common/math/remainderl.asm @@ -1,4 +1,4 @@ -; $Id: remainderl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: remainderl.asm $ ;; @file ; IPRT - No-CRT remainderl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/sinl.asm b/src/VBox/Runtime/common/math/sinl.asm index 689d33c72..57f5ab8b1 100644 --- a/src/VBox/Runtime/common/math/sinl.asm +++ b/src/VBox/Runtime/common/math/sinl.asm @@ -1,4 +1,4 @@ -; $Id: sinl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: sinl.asm $ ;; @file ; IPRT - No-CRT sinl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/tanl.asm b/src/VBox/Runtime/common/math/tanl.asm index fea96200b..85e61d04f 100644 --- a/src/VBox/Runtime/common/math/tanl.asm +++ b/src/VBox/Runtime/common/math/tanl.asm @@ -1,4 +1,4 @@ -; $Id: tanl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: tanl.asm $ ;; @file ; IPRT - No-CRT tanl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/trunc.asm b/src/VBox/Runtime/common/math/trunc.asm index c079fcc50..9ea36820f 100644 --- a/src/VBox/Runtime/common/math/trunc.asm +++ b/src/VBox/Runtime/common/math/trunc.asm @@ -1,4 +1,4 @@ -; $Id: trunc.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: trunc.asm $ ;; @file ; IPRT - No-CRT trunc - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/truncf.asm b/src/VBox/Runtime/common/math/truncf.asm index e2a57264a..9fb8166c7 100644 --- a/src/VBox/Runtime/common/math/truncf.asm +++ b/src/VBox/Runtime/common/math/truncf.asm @@ -1,4 +1,4 @@ -; $Id: truncf.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: truncf.asm $ ;; @file ; IPRT - No-CRT truncf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/truncl.asm b/src/VBox/Runtime/common/math/truncl.asm index ff0fb816a..45576833e 100644 --- a/src/VBox/Runtime/common/math/truncl.asm +++ b/src/VBox/Runtime/common/math/truncl.asm @@ -1,4 +1,4 @@ -; $Id: truncl.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: truncl.asm $ ;; @file ; IPRT - No-CRT truncl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp index 0621c9620..ef0f35ee7 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg1Weak.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTAssertMsg1Weak.cpp $ */ /** @file * IPRT - RTAssertMsg1Weak. */ diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp index d6ee76210..401baac80 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTAssertMsg2.cpp $ */ /** @file * IPRT - RTAssertMsg2. */ diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp index 6112b1835..e0f3fb23f 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg2Add.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTAssertMsg2Add.cpp $ */ /** @file * IPRT - RTAssertMsg2Add. */ diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp index bbf1d998c..297e60d99 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg2AddWeak.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTAssertMsg2AddWeak.cpp $ */ /** @file * IPRT - RTAssertMsg2AddWeak. */ diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp index d1361d99f..99bc5e64c 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg2AddWeakV.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTAssertMsg2AddWeakV.cpp $ */ /** @file * IPRT - RTAssertMsg2AddWeakV. */ diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp index f45c1eff9..2b5b9cf6b 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg2Weak.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTAssertMsg2Weak.cpp $ */ /** @file * IPRT - RTAssertMsg2Weak. */ diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp index 8cffc1212..2d9b5eff7 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg2WeakV.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTAssertMsg2WeakV.cpp $ */ /** @file * IPRT - RTAssertMsg2WeakV. */ diff --git a/src/VBox/Runtime/common/misc/RTFileOpenF.cpp b/src/VBox/Runtime/common/misc/RTFileOpenF.cpp index 008503f06..e2737bf6b 100644 --- a/src/VBox/Runtime/common/misc/RTFileOpenF.cpp +++ b/src/VBox/Runtime/common/misc/RTFileOpenF.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileOpenF.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: RTFileOpenF.cpp $ */ /** @file * IPRT - RTFileOpenF. */ diff --git a/src/VBox/Runtime/common/misc/RTFileOpenV.cpp b/src/VBox/Runtime/common/misc/RTFileOpenV.cpp index 565c075cb..43214e067 100644 --- a/src/VBox/Runtime/common/misc/RTFileOpenV.cpp +++ b/src/VBox/Runtime/common/misc/RTFileOpenV.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileOpenV.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: RTFileOpenV.cpp $ */ /** @file * IPRT - RTFileOpenV. */ diff --git a/src/VBox/Runtime/common/misc/RTMemWipeThoroughly.cpp b/src/VBox/Runtime/common/misc/RTMemWipeThoroughly.cpp index c80fea755..c5656b46f 100644 --- a/src/VBox/Runtime/common/misc/RTMemWipeThoroughly.cpp +++ b/src/VBox/Runtime/common/misc/RTMemWipeThoroughly.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMemWipeThoroughly.cpp 30827 2010-07-14 12:49:36Z vboxsync $ */ +/* $Id: RTMemWipeThoroughly.cpp $ */ /** @file * IPRT - RTMemWipeThoroughly. */ diff --git a/src/VBox/Runtime/common/misc/assert.cpp b/src/VBox/Runtime/common/misc/assert.cpp index ca7d1caf1..d69a12b42 100644 --- a/src/VBox/Runtime/common/misc/assert.cpp +++ b/src/VBox/Runtime/common/misc/assert.cpp @@ -1,4 +1,4 @@ -/* $Id: assert.cpp 37233 2011-05-27 13:31:57Z vboxsync $ */ +/* $Id: assert.cpp $ */ /** @file * IPRT - Assertions, common code. */ diff --git a/src/VBox/Runtime/common/misc/buildconfig.cpp b/src/VBox/Runtime/common/misc/buildconfig.cpp index 03cedbe03..54e87b39b 100644 --- a/src/VBox/Runtime/common/misc/buildconfig.cpp +++ b/src/VBox/Runtime/common/misc/buildconfig.cpp @@ -1,4 +1,4 @@ -/* $Id: buildconfig.cpp 33680 2010-11-02 11:08:08Z vboxsync $ */ +/* $Id: buildconfig.cpp $ */ /** @file * IPRT - Build Configuration Information. */ diff --git a/src/VBox/Runtime/common/misc/cidr.cpp b/src/VBox/Runtime/common/misc/cidr.cpp index b05ae8a72..d64d8e436 100644 --- a/src/VBox/Runtime/common/misc/cidr.cpp +++ b/src/VBox/Runtime/common/misc/cidr.cpp @@ -1,4 +1,4 @@ -/* $Id: cidr.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: cidr.cpp $ */ /** @file * IPRT - IPv4 address parsing. */ diff --git a/src/VBox/Runtime/common/misc/circbuf.cpp b/src/VBox/Runtime/common/misc/circbuf.cpp index 59f2d776b..ca7f39423 100644 --- a/src/VBox/Runtime/common/misc/circbuf.cpp +++ b/src/VBox/Runtime/common/misc/circbuf.cpp @@ -1,4 +1,4 @@ -/* $Id: circbuf.cpp 38305 2011-08-04 08:18:54Z vboxsync $ */ +/* $Id: circbuf.cpp $ */ /** @file * IPRT - Lock Free Circular Buffer */ diff --git a/src/VBox/Runtime/common/misc/getopt.cpp b/src/VBox/Runtime/common/misc/getopt.cpp index 9c186d5d4..1e8d40022 100644 --- a/src/VBox/Runtime/common/misc/getopt.cpp +++ b/src/VBox/Runtime/common/misc/getopt.cpp @@ -1,4 +1,4 @@ -/* $Id: getopt.cpp 37665 2011-06-28 12:32:13Z vboxsync $ */ +/* $Id: getopt.cpp $ */ /** @file * IPRT - Command Line Parsing */ diff --git a/src/VBox/Runtime/common/misc/getoptargv.cpp b/src/VBox/Runtime/common/misc/getoptargv.cpp index 97eda208e..daff7a851 100644 --- a/src/VBox/Runtime/common/misc/getoptargv.cpp +++ b/src/VBox/Runtime/common/misc/getoptargv.cpp @@ -1,4 +1,4 @@ -/* $Id: getoptargv.cpp 38083 2011-07-20 16:24:38Z vboxsync $ */ +/* $Id: getoptargv.cpp $ */ /** @file * IPRT - Command Line Parsing, Argument Vector. */ diff --git a/src/VBox/Runtime/common/misc/handle.cpp b/src/VBox/Runtime/common/misc/handle.cpp index 3d71248ae..b4f81e21b 100644 --- a/src/VBox/Runtime/common/misc/handle.cpp +++ b/src/VBox/Runtime/common/misc/handle.cpp @@ -1,4 +1,4 @@ -/* $Id: handle.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: handle.cpp $ */ /** @file * IPRT - Generic Handle Manipulation. */ diff --git a/src/VBox/Runtime/common/misc/handletable.cpp b/src/VBox/Runtime/common/misc/handletable.cpp index 1a80a3e14..a4139b003 100644 --- a/src/VBox/Runtime/common/misc/handletable.cpp +++ b/src/VBox/Runtime/common/misc/handletable.cpp @@ -1,4 +1,4 @@ -/* $Id: handletable.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: handletable.cpp $ */ /** @file * IPRT - Handle Tables. */ diff --git a/src/VBox/Runtime/common/misc/handletable.h b/src/VBox/Runtime/common/misc/handletable.h index 27ae574ed..5e2eac29d 100644 --- a/src/VBox/Runtime/common/misc/handletable.h +++ b/src/VBox/Runtime/common/misc/handletable.h @@ -1,4 +1,4 @@ -/* $Id: handletable.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: handletable.h $ */ /** @file * IPRT - Handle Tables, internal header. */ diff --git a/src/VBox/Runtime/common/misc/handletablectx.cpp b/src/VBox/Runtime/common/misc/handletablectx.cpp index e0511cc2b..f88363b77 100644 --- a/src/VBox/Runtime/common/misc/handletablectx.cpp +++ b/src/VBox/Runtime/common/misc/handletablectx.cpp @@ -1,4 +1,4 @@ -/* $Id: handletablectx.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: handletablectx.cpp $ */ /** @file * IPRT - Handle Tables. */ diff --git a/src/VBox/Runtime/common/misc/handletablesimple.cpp b/src/VBox/Runtime/common/misc/handletablesimple.cpp index 7fbd77030..c5d685ffe 100644 --- a/src/VBox/Runtime/common/misc/handletablesimple.cpp +++ b/src/VBox/Runtime/common/misc/handletablesimple.cpp @@ -1,4 +1,4 @@ -/* $Id: handletablesimple.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: handletablesimple.cpp $ */ /** @file * IPRT - Handle Tables. */ diff --git a/src/VBox/Runtime/common/misc/lockvalidator.cpp b/src/VBox/Runtime/common/misc/lockvalidator.cpp index 1542221ae..f4f81b08f 100644 --- a/src/VBox/Runtime/common/misc/lockvalidator.cpp +++ b/src/VBox/Runtime/common/misc/lockvalidator.cpp @@ -1,4 +1,4 @@ -/* $Id: lockvalidator.cpp 36597 2011-04-06 19:46:15Z vboxsync $ */ +/* $Id: lockvalidator.cpp $ */ /** @file * IPRT - Lock Validator. */ diff --git a/src/VBox/Runtime/common/misc/message.cpp b/src/VBox/Runtime/common/misc/message.cpp index a136c84e1..e36574269 100644 --- a/src/VBox/Runtime/common/misc/message.cpp +++ b/src/VBox/Runtime/common/misc/message.cpp @@ -1,4 +1,4 @@ -/* $Id: message.cpp 37951 2011-07-14 10:13:59Z vboxsync $ */ +/* $Id: message.cpp $ */ /** @file * IPRT - Error reporting to standard error. */ diff --git a/src/VBox/Runtime/common/misc/once.cpp b/src/VBox/Runtime/common/misc/once.cpp index 468d5cb85..4161fae7b 100644 --- a/src/VBox/Runtime/common/misc/once.cpp +++ b/src/VBox/Runtime/common/misc/once.cpp @@ -1,4 +1,4 @@ -/* $Id: once.cpp 37316 2011-06-03 12:49:02Z vboxsync $ */ +/* $Id: once.cpp $ */ /** @file * IPRT - Execute Once. */ diff --git a/src/VBox/Runtime/common/misc/req.cpp b/src/VBox/Runtime/common/misc/req.cpp index 60f27c6f3..aff3b447d 100644 --- a/src/VBox/Runtime/common/misc/req.cpp +++ b/src/VBox/Runtime/common/misc/req.cpp @@ -1,4 +1,4 @@ -/* $Id: req.cpp 33595 2010-10-29 10:35:00Z vboxsync $ */ +/* $Id: req.cpp $ */ /** @file * IPRT - Request packets */ diff --git a/src/VBox/Runtime/common/misc/s3.cpp b/src/VBox/Runtime/common/misc/s3.cpp index daa16f67e..c49907011 100644 --- a/src/VBox/Runtime/common/misc/s3.cpp +++ b/src/VBox/Runtime/common/misc/s3.cpp @@ -1,4 +1,4 @@ -/* $Id: s3.cpp 38285 2011-08-02 18:50:37Z vboxsync $ */ +/* $Id: s3.cpp $ */ /** @file * IPRT - S3 communication API. */ diff --git a/src/VBox/Runtime/common/misc/sanity-c.c b/src/VBox/Runtime/common/misc/sanity-c.c index 28cf5475a..042cf3839 100644 --- a/src/VBox/Runtime/common/misc/sanity-c.c +++ b/src/VBox/Runtime/common/misc/sanity-c.c @@ -1,4 +1,4 @@ -/* $Id: sanity-c.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: sanity-c.c $ */ /** @file * IPRT - Setup Sanity Checks, C. */ diff --git a/src/VBox/Runtime/common/misc/sanity-cpp.cpp b/src/VBox/Runtime/common/misc/sanity-cpp.cpp index 2bbdf33e0..ea0202d9f 100644 --- a/src/VBox/Runtime/common/misc/sanity-cpp.cpp +++ b/src/VBox/Runtime/common/misc/sanity-cpp.cpp @@ -1,4 +1,4 @@ -/* $Id: sanity-cpp.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: sanity-cpp.cpp $ */ /** @file * IPRT - Setup Sanity Checks, C++. */ diff --git a/src/VBox/Runtime/common/misc/sanity.h b/src/VBox/Runtime/common/misc/sanity.h index 97c7dc077..f0461c425 100644 --- a/src/VBox/Runtime/common/misc/sanity.h +++ b/src/VBox/Runtime/common/misc/sanity.h @@ -1,4 +1,4 @@ -/* $Id: sanity.h 35512 2011-01-12 17:50:12Z vboxsync $ */ +/* $Id: sanity.h $ */ /** @file * IPRT - Setup Sanity Checks, C and C++. */ diff --git a/src/VBox/Runtime/common/misc/semspingpong.cpp b/src/VBox/Runtime/common/misc/semspingpong.cpp index fa3802fa7..e13bed820 100644 --- a/src/VBox/Runtime/common/misc/semspingpong.cpp +++ b/src/VBox/Runtime/common/misc/semspingpong.cpp @@ -1,4 +1,4 @@ -/* $Id: semspingpong.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: semspingpong.cpp $ */ /** @file * IPRT - Thread Ping-Pong Construct. */ diff --git a/src/VBox/Runtime/common/misc/setjmp.asm b/src/VBox/Runtime/common/misc/setjmp.asm index 811f03abd..9bacbbc4e 100644 --- a/src/VBox/Runtime/common/misc/setjmp.asm +++ b/src/VBox/Runtime/common/misc/setjmp.asm @@ -1,4 +1,4 @@ -; $Id: setjmp.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: setjmp.asm $ ;; @file ; IPRT - No-CRT setjmp & longjmp - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/misc/sg.cpp b/src/VBox/Runtime/common/misc/sg.cpp index 08ef8b632..b679b9de6 100644 --- a/src/VBox/Runtime/common/misc/sg.cpp +++ b/src/VBox/Runtime/common/misc/sg.cpp @@ -1,4 +1,4 @@ -/* $Id: sg.cpp 36312 2011-03-18 12:59:15Z vboxsync $ */ +/* $Id: sg.cpp $ */ /** @file * IPRT - S/G buffer handling. */ @@ -35,8 +35,16 @@ static void *sgBufGet(PRTSGBUF pSgBuf, size_t *pcbData) { - size_t cbData = RT_MIN(*pcbData, pSgBuf->cbSegLeft); - void *pvBuf = pSgBuf->pvSegCur; + size_t cbData; + void *pvBuf; + + /* Check that the S/G buffer has memory left. */ + if (RT_UNLIKELY( pSgBuf->idxSeg == pSgBuf->cSegs + && !pSgBuf->cbSegLeft)) + { + *pcbData = 0; + return NULL; + } AssertReleaseMsg( pSgBuf->cbSegLeft <= 5 * _1M && (uintptr_t)pSgBuf->pvSegCur >= (uintptr_t)pSgBuf->paSegs[pSgBuf->idxSeg].pvSeg @@ -45,6 +53,8 @@ static void *sgBufGet(PRTSGBUF pSgBuf, size_t *pcbData) pSgBuf->idxSeg, pSgBuf->cSegs, pSgBuf->pvSegCur, pSgBuf->cbSegLeft, pSgBuf->idxSeg, pSgBuf->paSegs[pSgBuf->idxSeg].pvSeg, pSgBuf->idxSeg, pSgBuf->paSegs[pSgBuf->idxSeg].cbSeg)); + cbData = RT_MIN(*pcbData, pSgBuf->cbSegLeft); + pvBuf = pSgBuf->pvSegCur; pSgBuf->cbSegLeft -= cbData; /* Advance to the next segment if required. */ @@ -52,12 +62,7 @@ static void *sgBufGet(PRTSGBUF pSgBuf, size_t *pcbData) { pSgBuf->idxSeg++; - if (RT_UNLIKELY(pSgBuf->idxSeg == pSgBuf->cSegs)) - { - pSgBuf->cbSegLeft = 0; - pSgBuf->pvSegCur = NULL; - } - else + if (pSgBuf->idxSeg < pSgBuf->cSegs) { pSgBuf->pvSegCur = pSgBuf->paSegs[pSgBuf->idxSeg].pvSeg; pSgBuf->cbSegLeft = pSgBuf->paSegs[pSgBuf->idxSeg].cbSeg; diff --git a/src/VBox/Runtime/common/misc/term.cpp b/src/VBox/Runtime/common/misc/term.cpp index c62953a04..7b789df84 100644 --- a/src/VBox/Runtime/common/misc/term.cpp +++ b/src/VBox/Runtime/common/misc/term.cpp @@ -1,4 +1,4 @@ -/* $Id: term.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: term.cpp $ */ /** @file * IPRT - Common Termination Code. */ diff --git a/src/VBox/Runtime/common/misc/thread.cpp b/src/VBox/Runtime/common/misc/thread.cpp index 85a2cf114..c281a5afa 100644 --- a/src/VBox/Runtime/common/misc/thread.cpp +++ b/src/VBox/Runtime/common/misc/thread.cpp @@ -1,4 +1,4 @@ -/* $Id: thread.cpp 36951 2011-05-04 07:07:34Z vboxsync $ */ +/* $Id: thread.cpp $ */ /** @file * IPRT - Threads, common routines. */ diff --git a/src/VBox/Runtime/common/path/RTPathAbsDup.cpp b/src/VBox/Runtime/common/path/RTPathAbsDup.cpp index 50572f39f..b9f217f99 100644 --- a/src/VBox/Runtime/common/path/RTPathAbsDup.cpp +++ b/src/VBox/Runtime/common/path/RTPathAbsDup.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathAbsDup.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathAbsDup.cpp $ */ /** @file * IPRT - RTPathAbsDup */ diff --git a/src/VBox/Runtime/common/path/RTPathAbsEx.cpp b/src/VBox/Runtime/common/path/RTPathAbsEx.cpp index bbd4f8095..c647b5473 100644 --- a/src/VBox/Runtime/common/path/RTPathAbsEx.cpp +++ b/src/VBox/Runtime/common/path/RTPathAbsEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathAbsEx.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathAbsEx.cpp $ */ /** @file * IPRT - RTPathAbsEx */ diff --git a/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp b/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp index f756cbb4a..8bb8cd176 100644 --- a/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp +++ b/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathAbsExDup.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathAbsExDup.cpp $ */ /** @file * IPRT - RTPathAbsExDup */ diff --git a/src/VBox/Runtime/common/path/RTPathAppend.cpp b/src/VBox/Runtime/common/path/RTPathAppend.cpp index a66bb3af7..5bad6483e 100644 --- a/src/VBox/Runtime/common/path/RTPathAppend.cpp +++ b/src/VBox/Runtime/common/path/RTPathAppend.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathAppend.cpp 34214 2010-11-19 17:18:15Z vboxsync $ */ +/* $Id: RTPathAppend.cpp $ */ /** @file * IPRT - RTPathAppend */ diff --git a/src/VBox/Runtime/common/path/RTPathAppendEx.cpp b/src/VBox/Runtime/common/path/RTPathAppendEx.cpp index e29910800..159b62558 100644 --- a/src/VBox/Runtime/common/path/RTPathAppendEx.cpp +++ b/src/VBox/Runtime/common/path/RTPathAppendEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathAppendEx.cpp 34214 2010-11-19 17:18:15Z vboxsync $ */ +/* $Id: RTPathAppendEx.cpp $ */ /** @file * IPRT - RTPathAppendEx */ diff --git a/src/VBox/Runtime/common/path/RTPathChangeToDosSlashes.cpp b/src/VBox/Runtime/common/path/RTPathChangeToDosSlashes.cpp index 848759fa1..68b58803e 100644 --- a/src/VBox/Runtime/common/path/RTPathChangeToDosSlashes.cpp +++ b/src/VBox/Runtime/common/path/RTPathChangeToDosSlashes.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathChangeToDosSlashes.cpp 34205 2010-11-19 15:09:08Z vboxsync $ */ +/* $Id: RTPathChangeToDosSlashes.cpp $ */ /** @file * IPRT - RTPathChangeToDosSlashes */ diff --git a/src/VBox/Runtime/common/path/RTPathChangeToUnixSlashes.cpp b/src/VBox/Runtime/common/path/RTPathChangeToUnixSlashes.cpp index 823c7ee83..c8e5e3c3c 100644 --- a/src/VBox/Runtime/common/path/RTPathChangeToUnixSlashes.cpp +++ b/src/VBox/Runtime/common/path/RTPathChangeToUnixSlashes.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathChangeToUnixSlashes.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: RTPathChangeToUnixSlashes.cpp $ */ /** @file * IPRT - RTPathChangeToUnixSlashes */ diff --git a/src/VBox/Runtime/common/path/RTPathCopyComponents.cpp b/src/VBox/Runtime/common/path/RTPathCopyComponents.cpp index 55b5f4f86..afe4738cc 100644 --- a/src/VBox/Runtime/common/path/RTPathCopyComponents.cpp +++ b/src/VBox/Runtime/common/path/RTPathCopyComponents.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathCopyComponents.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathCopyComponents.cpp $ */ /** @file * IPRT - RTPathCountComponents */ diff --git a/src/VBox/Runtime/common/path/RTPathCountComponents.cpp b/src/VBox/Runtime/common/path/RTPathCountComponents.cpp index 63a213bfc..509614634 100644 --- a/src/VBox/Runtime/common/path/RTPathCountComponents.cpp +++ b/src/VBox/Runtime/common/path/RTPathCountComponents.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathCountComponents.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathCountComponents.cpp $ */ /** @file * IPRT - RTPathCountComponents */ diff --git a/src/VBox/Runtime/common/path/RTPathExt.cpp b/src/VBox/Runtime/common/path/RTPathExt.cpp index de33d45e8..292c5f2f7 100644 --- a/src/VBox/Runtime/common/path/RTPathExt.cpp +++ b/src/VBox/Runtime/common/path/RTPathExt.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathExt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathExt.cpp $ */ /** @file * IPRT - RTPathExt */ diff --git a/src/VBox/Runtime/common/path/RTPathFilename.cpp b/src/VBox/Runtime/common/path/RTPathFilename.cpp index a77835bf0..a6ef8cf8c 100644 --- a/src/VBox/Runtime/common/path/RTPathFilename.cpp +++ b/src/VBox/Runtime/common/path/RTPathFilename.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathFilename.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathFilename.cpp $ */ /** @file * IPRT - RTPathFilename */ diff --git a/src/VBox/Runtime/common/path/RTPathHaveExt.cpp b/src/VBox/Runtime/common/path/RTPathHaveExt.cpp index 506a53eed..e5be22e1e 100644 --- a/src/VBox/Runtime/common/path/RTPathHaveExt.cpp +++ b/src/VBox/Runtime/common/path/RTPathHaveExt.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathHaveExt.cpp 32864 2010-10-01 12:32:06Z vboxsync $ */ +/* $Id: RTPathHaveExt.cpp $ */ /** @file * IPRT - RTPathHaveExt */ diff --git a/src/VBox/Runtime/common/path/RTPathHavePath.cpp b/src/VBox/Runtime/common/path/RTPathHavePath.cpp index 0e7188c2d..3e33d4608 100644 --- a/src/VBox/Runtime/common/path/RTPathHavePath.cpp +++ b/src/VBox/Runtime/common/path/RTPathHavePath.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathHavePath.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathHavePath.cpp $ */ /** @file * IPRT - RTPathHavePath */ diff --git a/src/VBox/Runtime/common/path/RTPathJoin.cpp b/src/VBox/Runtime/common/path/RTPathJoin.cpp index 68919a49b..100a7987c 100644 --- a/src/VBox/Runtime/common/path/RTPathJoin.cpp +++ b/src/VBox/Runtime/common/path/RTPathJoin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathJoin.cpp 33450 2010-10-26 09:24:32Z vboxsync $ */ +/* $Id: RTPathJoin.cpp $ */ /** @file * IPRT - RTPathJoin. */ diff --git a/src/VBox/Runtime/common/path/RTPathJoinA.cpp b/src/VBox/Runtime/common/path/RTPathJoinA.cpp index e50c692c7..c1b8fbe46 100644 --- a/src/VBox/Runtime/common/path/RTPathJoinA.cpp +++ b/src/VBox/Runtime/common/path/RTPathJoinA.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathJoinA.cpp 33450 2010-10-26 09:24:32Z vboxsync $ */ +/* $Id: RTPathJoinA.cpp $ */ /** @file * IPRT - RTPathJoinA. */ diff --git a/src/VBox/Runtime/common/path/RTPathJoinEx.cpp b/src/VBox/Runtime/common/path/RTPathJoinEx.cpp index ab8b92172..d0b43e397 100644 --- a/src/VBox/Runtime/common/path/RTPathJoinEx.cpp +++ b/src/VBox/Runtime/common/path/RTPathJoinEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathJoinEx.cpp 34214 2010-11-19 17:18:15Z vboxsync $ */ +/* $Id: RTPathJoinEx.cpp $ */ /** @file * IPRT - RTPathJoinEx. */ diff --git a/src/VBox/Runtime/common/path/RTPathParse.cpp b/src/VBox/Runtime/common/path/RTPathParse.cpp index fa22539ef..ce42e3309 100644 --- a/src/VBox/Runtime/common/path/RTPathParse.cpp +++ b/src/VBox/Runtime/common/path/RTPathParse.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathParse.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathParse.cpp $ */ /** @file * IPRT - RTPathParse */ diff --git a/src/VBox/Runtime/common/path/RTPathRealDup.cpp b/src/VBox/Runtime/common/path/RTPathRealDup.cpp index 6d28932b2..18ce0a821 100644 --- a/src/VBox/Runtime/common/path/RTPathRealDup.cpp +++ b/src/VBox/Runtime/common/path/RTPathRealDup.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathRealDup.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathRealDup.cpp $ */ /** @file * IPRT - RTPathRealDup */ diff --git a/src/VBox/Runtime/common/path/RTPathStartsWithRoot.cpp b/src/VBox/Runtime/common/path/RTPathStartsWithRoot.cpp index 6a9aeab2f..52118240a 100644 --- a/src/VBox/Runtime/common/path/RTPathStartsWithRoot.cpp +++ b/src/VBox/Runtime/common/path/RTPathStartsWithRoot.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathStartsWithRoot.cpp 33245 2010-10-20 09:51:08Z vboxsync $ */ +/* $Id: RTPathStartsWithRoot.cpp $ */ /** @file * IPRT - RTPathStartsWithRoot */ diff --git a/src/VBox/Runtime/common/path/RTPathStripExt.cpp b/src/VBox/Runtime/common/path/RTPathStripExt.cpp index aa8920588..789bb3e99 100644 --- a/src/VBox/Runtime/common/path/RTPathStripExt.cpp +++ b/src/VBox/Runtime/common/path/RTPathStripExt.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathStripExt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathStripExt.cpp $ */ /** @file * IPRT - RTPathStripExt */ diff --git a/src/VBox/Runtime/common/path/RTPathStripFilename.cpp b/src/VBox/Runtime/common/path/RTPathStripFilename.cpp index 13548445b..3db34165d 100644 --- a/src/VBox/Runtime/common/path/RTPathStripFilename.cpp +++ b/src/VBox/Runtime/common/path/RTPathStripFilename.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathStripFilename.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathStripFilename.cpp $ */ /** @file * IPRT - RTPathStripFilename */ diff --git a/src/VBox/Runtime/common/path/RTPathStripTrailingSlash.cpp b/src/VBox/Runtime/common/path/RTPathStripTrailingSlash.cpp index 624409ce8..2296e04b7 100644 --- a/src/VBox/Runtime/common/path/RTPathStripTrailingSlash.cpp +++ b/src/VBox/Runtime/common/path/RTPathStripTrailingSlash.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathStripTrailingSlash.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathStripTrailingSlash.cpp $ */ /** @file * IPRT - RTPathSTripTrailingSlash */ diff --git a/src/VBox/Runtime/common/path/RTPathTraverseList.cpp b/src/VBox/Runtime/common/path/RTPathTraverseList.cpp index c77d43792..daa88dcec 100644 --- a/src/VBox/Runtime/common/path/RTPathTraverseList.cpp +++ b/src/VBox/Runtime/common/path/RTPathTraverseList.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathTraverseList.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTPathTraverseList.cpp $ */ /** @file * IPRT - RTPathTraverseList */ diff --git a/src/VBox/Runtime/common/path/comparepaths.cpp b/src/VBox/Runtime/common/path/comparepaths.cpp index c8cf5e81f..7c42db33b 100644 --- a/src/VBox/Runtime/common/path/comparepaths.cpp +++ b/src/VBox/Runtime/common/path/comparepaths.cpp @@ -1,4 +1,4 @@ -/* $Id: comparepaths.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: comparepaths.cpp $ */ /** @file * IPRT - Path Comparison. */ diff --git a/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp b/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp index 25db8263c..92c911361 100644 --- a/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp +++ b/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp @@ -1,4 +1,4 @@ -/* $Id: rtPathRootSpecLen.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: rtPathRootSpecLen.cpp $ */ /** @file * IPRT - rtPathRootSpecLen (internal). */ diff --git a/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp b/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp index e40d5a6f6..4a9fcb7aa 100644 --- a/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp +++ b/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp @@ -1,4 +1,4 @@ -/* $Id: rtPathVolumeSpecLen.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: rtPathVolumeSpecLen.cpp $ */ /** @file * IPRT - rtPathVolumeSpecLen */ diff --git a/src/VBox/Runtime/common/rand/rand.cpp b/src/VBox/Runtime/common/rand/rand.cpp index 8fd1214f6..f4d1dad4d 100644 --- a/src/VBox/Runtime/common/rand/rand.cpp +++ b/src/VBox/Runtime/common/rand/rand.cpp @@ -1,4 +1,4 @@ -/* $Id: rand.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: rand.cpp $ */ /** @file * IPRT - Random Numbers. */ diff --git a/src/VBox/Runtime/common/rand/randadv.cpp b/src/VBox/Runtime/common/rand/randadv.cpp index cb7fab745..e4506c0a6 100644 --- a/src/VBox/Runtime/common/rand/randadv.cpp +++ b/src/VBox/Runtime/common/rand/randadv.cpp @@ -1,4 +1,4 @@ -/* $Id: randadv.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: randadv.cpp $ */ /** @file * IPRT - Random Numbers, Generic Glue. */ diff --git a/src/VBox/Runtime/common/rand/randparkmiller.cpp b/src/VBox/Runtime/common/rand/randparkmiller.cpp index 94f118cac..4c0f3fd1e 100644 --- a/src/VBox/Runtime/common/rand/randparkmiller.cpp +++ b/src/VBox/Runtime/common/rand/randparkmiller.cpp @@ -1,4 +1,4 @@ -/* $Id: randparkmiller.cpp 29250 2010-05-09 17:53:58Z vboxsync $ */ +/* $Id: randparkmiller.cpp $ */ /** @file * IPRT - Random Numbers, Park-Miller Pseudo Random. */ diff --git a/src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp b/src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp index f422f839d..ccf4c62a5 100644 --- a/src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp +++ b/src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSortApvIsSorted.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTSortApvIsSorted.cpp $ */ /** @file * IPRT - RTSortApvIsSorted. */ diff --git a/src/VBox/Runtime/common/sort/RTSortIsSorted.cpp b/src/VBox/Runtime/common/sort/RTSortIsSorted.cpp index 15b1e281b..ff066e4e4 100644 --- a/src/VBox/Runtime/common/sort/RTSortIsSorted.cpp +++ b/src/VBox/Runtime/common/sort/RTSortIsSorted.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSortIsSorted.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTSortIsSorted.cpp $ */ /** @file * IPRT - RTSortIsSorted. */ diff --git a/src/VBox/Runtime/common/sort/shellsort.cpp b/src/VBox/Runtime/common/sort/shellsort.cpp index e40728467..23f956fec 100644 --- a/src/VBox/Runtime/common/sort/shellsort.cpp +++ b/src/VBox/Runtime/common/sort/shellsort.cpp @@ -1,4 +1,4 @@ -/* $Id: shellsort.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: shellsort.cpp $ */ /** @file * IPRT - RTSortIsSorted. */ diff --git a/src/VBox/Runtime/common/string/RTStrCat.cpp b/src/VBox/Runtime/common/string/RTStrCat.cpp index 257552fe0..b85a8832a 100644 --- a/src/VBox/Runtime/common/string/RTStrCat.cpp +++ b/src/VBox/Runtime/common/string/RTStrCat.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCat.cpp 33678 2010-11-02 10:30:46Z vboxsync $ */ +/* $Id: RTStrCat.cpp $ */ /** @file * IPRT - RTStrCat. */ diff --git a/src/VBox/Runtime/common/string/RTStrCatEx.cpp b/src/VBox/Runtime/common/string/RTStrCatEx.cpp index 32f82f1c6..69cb92c3f 100644 --- a/src/VBox/Runtime/common/string/RTStrCatEx.cpp +++ b/src/VBox/Runtime/common/string/RTStrCatEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCatEx.cpp 33678 2010-11-02 10:30:46Z vboxsync $ */ +/* $Id: RTStrCatEx.cpp $ */ /** @file * IPRT - RTStrCatEx */ diff --git a/src/VBox/Runtime/common/string/RTStrCatP.cpp b/src/VBox/Runtime/common/string/RTStrCatP.cpp index c5139ce2a..145fb9c2e 100644 --- a/src/VBox/Runtime/common/string/RTStrCatP.cpp +++ b/src/VBox/Runtime/common/string/RTStrCatP.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCatP.cpp 36407 2011-03-24 16:14:57Z vboxsync $ */ +/* $Id: RTStrCatP.cpp $ */ /** @file * IPRT - RTStrCat. */ diff --git a/src/VBox/Runtime/common/string/RTStrCatPEx.cpp b/src/VBox/Runtime/common/string/RTStrCatPEx.cpp index 9a31a0889..808773ffa 100644 --- a/src/VBox/Runtime/common/string/RTStrCatPEx.cpp +++ b/src/VBox/Runtime/common/string/RTStrCatPEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCatPEx.cpp 36407 2011-03-24 16:14:57Z vboxsync $ */ +/* $Id: RTStrCatPEx.cpp $ */ /** @file * IPRT - RTStrCatPEx */ diff --git a/src/VBox/Runtime/common/string/RTStrCmp.cpp b/src/VBox/Runtime/common/string/RTStrCmp.cpp index 1348da93f..779675f0b 100644 --- a/src/VBox/Runtime/common/string/RTStrCmp.cpp +++ b/src/VBox/Runtime/common/string/RTStrCmp.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCmp.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTStrCmp.cpp $ */ /** @file * IPRT - RTStrCmp. */ diff --git a/src/VBox/Runtime/common/string/RTStrConvertHexBytes.cpp b/src/VBox/Runtime/common/string/RTStrConvertHexBytes.cpp index 4e1c3f17c..841ff4436 100644 --- a/src/VBox/Runtime/common/string/RTStrConvertHexBytes.cpp +++ b/src/VBox/Runtime/common/string/RTStrConvertHexBytes.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrConvertHexBytes.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTStrConvertHexBytes.cpp $ */ /** @file * IPRT - RTStrConvertHexBytes. */ diff --git a/src/VBox/Runtime/common/string/RTStrCopy.cpp b/src/VBox/Runtime/common/string/RTStrCopy.cpp index 51e67b38f..b8062cedc 100644 --- a/src/VBox/Runtime/common/string/RTStrCopy.cpp +++ b/src/VBox/Runtime/common/string/RTStrCopy.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCopy.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTStrCopy.cpp $ */ /** @file * IPRT - RTStrCopy. */ diff --git a/src/VBox/Runtime/common/string/RTStrCopyEx.cpp b/src/VBox/Runtime/common/string/RTStrCopyEx.cpp index 2074729fe..2baabd189 100644 --- a/src/VBox/Runtime/common/string/RTStrCopyEx.cpp +++ b/src/VBox/Runtime/common/string/RTStrCopyEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCopyEx.cpp 33678 2010-11-02 10:30:46Z vboxsync $ */ +/* $Id: RTStrCopyEx.cpp $ */ /** @file * IPRT - RTStrCopyEx. */ diff --git a/src/VBox/Runtime/common/string/RTStrCopyP.cpp b/src/VBox/Runtime/common/string/RTStrCopyP.cpp index 3c7bf68a3..0e6c166a9 100644 --- a/src/VBox/Runtime/common/string/RTStrCopyP.cpp +++ b/src/VBox/Runtime/common/string/RTStrCopyP.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCopyP.cpp 36407 2011-03-24 16:14:57Z vboxsync $ */ +/* $Id: RTStrCopyP.cpp $ */ /** @file * IPRT - RTStrCopyP. */ diff --git a/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp b/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp index 7d3b8e7fe..84919a043 100644 --- a/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp +++ b/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrCopyPEx.cpp 36407 2011-03-24 16:14:57Z vboxsync $ */ +/* $Id: RTStrCopyPEx.cpp $ */ /** @file * IPRT - RTStrCopyPEx. */ diff --git a/src/VBox/Runtime/common/string/RTStrNCmp.cpp b/src/VBox/Runtime/common/string/RTStrNCmp.cpp index c1c3583f5..5070218aa 100644 --- a/src/VBox/Runtime/common/string/RTStrNCmp.cpp +++ b/src/VBox/Runtime/common/string/RTStrNCmp.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrNCmp.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTStrNCmp.cpp $ */ /** @file * IPRT - RTStrNCmp. */ diff --git a/src/VBox/Runtime/common/string/RTStrNLen.cpp b/src/VBox/Runtime/common/string/RTStrNLen.cpp index 16349edf9..d30c9ed51 100644 --- a/src/VBox/Runtime/common/string/RTStrNLen.cpp +++ b/src/VBox/Runtime/common/string/RTStrNLen.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrNLen.cpp 30320 2010-06-21 08:35:09Z vboxsync $ */ +/* $Id: RTStrNLen.cpp $ */ /** @file * IPRT - RTStrNLen. */ diff --git a/src/VBox/Runtime/common/string/RTStrNLenEx.cpp b/src/VBox/Runtime/common/string/RTStrNLenEx.cpp index 124e96000..3764ce353 100644 --- a/src/VBox/Runtime/common/string/RTStrNLenEx.cpp +++ b/src/VBox/Runtime/common/string/RTStrNLenEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrNLenEx.cpp 30320 2010-06-21 08:35:09Z vboxsync $ */ +/* $Id: RTStrNLenEx.cpp $ */ /** @file * IPRT - RTStrNLenEx. */ diff --git a/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp b/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp index 054ac46b3..f00298e5f 100644 --- a/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp +++ b/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrPrintHexBytes.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTStrPrintHexBytes.cpp $ */ /** @file * IPRT - RTStrPrintHexBytes. */ diff --git a/src/VBox/Runtime/common/string/RTStrStr.cpp b/src/VBox/Runtime/common/string/RTStrStr.cpp index 300837a00..903826e10 100644 --- a/src/VBox/Runtime/common/string/RTStrStr.cpp +++ b/src/VBox/Runtime/common/string/RTStrStr.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrStr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTStrStr.cpp $ */ /** @file * IPRT - RTStrStr. */ diff --git a/src/VBox/Runtime/common/string/base64.cpp b/src/VBox/Runtime/common/string/base64.cpp index 6aab11dae..58869fe38 100644 --- a/src/VBox/Runtime/common/string/base64.cpp +++ b/src/VBox/Runtime/common/string/base64.cpp @@ -1,4 +1,4 @@ -/* $Id: base64.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: base64.cpp $ */ /** @file * IPRT - Base64, MIME content transfer encoding. */ diff --git a/src/VBox/Runtime/common/string/memchr.asm b/src/VBox/Runtime/common/string/memchr.asm index d8d0e37d7..0ee2968d5 100644 --- a/src/VBox/Runtime/common/string/memchr.asm +++ b/src/VBox/Runtime/common/string/memchr.asm @@ -1,4 +1,4 @@ -; $Id: memchr.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: memchr.asm $ ;; @file ; IPRT - No-CRT memchr - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memchr.cpp b/src/VBox/Runtime/common/string/memchr.cpp index f6cc7ed56..ba2de0958 100644 --- a/src/VBox/Runtime/common/string/memchr.cpp +++ b/src/VBox/Runtime/common/string/memchr.cpp @@ -1,4 +1,4 @@ -/* $Id: memchr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memchr.cpp $ */ /** @file * IPRT - CRT Strings, memcpy(). */ diff --git a/src/VBox/Runtime/common/string/memchr_alias.c b/src/VBox/Runtime/common/string/memchr_alias.c index f023eac1d..0d009c7da 100644 --- a/src/VBox/Runtime/common/string/memchr_alias.c +++ b/src/VBox/Runtime/common/string/memchr_alias.c @@ -1,4 +1,4 @@ -/* $Id: memchr_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memchr_alias.c $ */ /** @file * IPRT - No-CRT memchr() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/memcmp.asm b/src/VBox/Runtime/common/string/memcmp.asm index f0695aafd..afadf923e 100644 --- a/src/VBox/Runtime/common/string/memcmp.asm +++ b/src/VBox/Runtime/common/string/memcmp.asm @@ -1,4 +1,4 @@ -; $Id: memcmp.asm 30255 2010-06-16 14:55:17Z vboxsync $ +; $Id: memcmp.asm $ ;; @file ; IPRT - No-CRT memcmp - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memcmp.cpp b/src/VBox/Runtime/common/string/memcmp.cpp index f7a389271..3dea769e6 100644 --- a/src/VBox/Runtime/common/string/memcmp.cpp +++ b/src/VBox/Runtime/common/string/memcmp.cpp @@ -1,4 +1,4 @@ -/* $Id: memcmp.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memcmp.cpp $ */ /** @file * IPRT - CRT Strings, memcmp(). */ diff --git a/src/VBox/Runtime/common/string/memcmp_alias.c b/src/VBox/Runtime/common/string/memcmp_alias.c index 34f15a586..30f786375 100644 --- a/src/VBox/Runtime/common/string/memcmp_alias.c +++ b/src/VBox/Runtime/common/string/memcmp_alias.c @@ -1,4 +1,4 @@ -/* $Id: memcmp_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memcmp_alias.c $ */ /** @file * IPRT - No-CRT memcmp() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/memcpy.asm b/src/VBox/Runtime/common/string/memcpy.asm index cda29d223..6f1bed22a 100644 --- a/src/VBox/Runtime/common/string/memcpy.asm +++ b/src/VBox/Runtime/common/string/memcpy.asm @@ -1,4 +1,4 @@ -; $Id: memcpy.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: memcpy.asm $ ;; @file ; IPRT - No-CRT memcpy - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memcpy.cpp b/src/VBox/Runtime/common/string/memcpy.cpp index f799113a5..56ccdfb28 100644 --- a/src/VBox/Runtime/common/string/memcpy.cpp +++ b/src/VBox/Runtime/common/string/memcpy.cpp @@ -1,4 +1,4 @@ -/* $Id: memcpy.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memcpy.cpp $ */ /** @file * IPRT - CRT Strings, memcpy(). */ diff --git a/src/VBox/Runtime/common/string/memcpy_alias.c b/src/VBox/Runtime/common/string/memcpy_alias.c index 1e4998286..5ddc7b8c9 100644 --- a/src/VBox/Runtime/common/string/memcpy_alias.c +++ b/src/VBox/Runtime/common/string/memcpy_alias.c @@ -1,4 +1,4 @@ -/* $Id: memcpy_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memcpy_alias.c $ */ /** @file * IPRT - No-CRT memcpy() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/memmove.asm b/src/VBox/Runtime/common/string/memmove.asm index 02d795f35..b10ede777 100644 --- a/src/VBox/Runtime/common/string/memmove.asm +++ b/src/VBox/Runtime/common/string/memmove.asm @@ -1,4 +1,4 @@ -; $Id: memmove.asm 33540 2010-10-28 09:27:05Z vboxsync $ +; $Id: memmove.asm $ ;; @file ; IPRT - No-CRT memmove - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memmove_alias.c b/src/VBox/Runtime/common/string/memmove_alias.c index 30c62a666..f30c91497 100644 --- a/src/VBox/Runtime/common/string/memmove_alias.c +++ b/src/VBox/Runtime/common/string/memmove_alias.c @@ -1,4 +1,4 @@ -/* $Id: memmove_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memmove_alias.c $ */ /** @file * IPRT - No-CRT memmove() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/mempcpy.asm b/src/VBox/Runtime/common/string/mempcpy.asm index 849e0acf4..b47c43682 100644 --- a/src/VBox/Runtime/common/string/mempcpy.asm +++ b/src/VBox/Runtime/common/string/mempcpy.asm @@ -1,4 +1,4 @@ -; $Id: mempcpy.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: mempcpy.asm $ ;; @file ; IPRT - No-CRT mempcpy - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memset.asm b/src/VBox/Runtime/common/string/memset.asm index 1f39cd282..96cc48ec8 100644 --- a/src/VBox/Runtime/common/string/memset.asm +++ b/src/VBox/Runtime/common/string/memset.asm @@ -1,4 +1,4 @@ -; $Id: memset.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: memset.asm $ ;; @file ; IPRT - No-CRT memset - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memset.cpp b/src/VBox/Runtime/common/string/memset.cpp index c2fda0b1f..9bf358936 100644 --- a/src/VBox/Runtime/common/string/memset.cpp +++ b/src/VBox/Runtime/common/string/memset.cpp @@ -1,4 +1,4 @@ -/* $Id: memset.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memset.cpp $ */ /** @file * IPRT - CRT Strings, memset(). */ diff --git a/src/VBox/Runtime/common/string/memset_alias.c b/src/VBox/Runtime/common/string/memset_alias.c index 4c6bff270..49d4abd35 100644 --- a/src/VBox/Runtime/common/string/memset_alias.c +++ b/src/VBox/Runtime/common/string/memset_alias.c @@ -1,4 +1,4 @@ -/* $Id: memset_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memset_alias.c $ */ /** @file * IPRT - No-CRT memset() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/ministring.cpp b/src/VBox/Runtime/common/string/ministring.cpp index 3a7f31565..bca107c9f 100644 --- a/src/VBox/Runtime/common/string/ministring.cpp +++ b/src/VBox/Runtime/common/string/ministring.cpp @@ -1,4 +1,4 @@ -/* $Id: ministring.cpp 36561 2011-04-05 13:42:59Z vboxsync $ */ +/* $Id: ministring.cpp $ */ /** @file * IPRT - Mini C++ string class. * diff --git a/src/VBox/Runtime/common/string/simplepattern.cpp b/src/VBox/Runtime/common/string/simplepattern.cpp index 607984fd6..f54d4ce02 100644 --- a/src/VBox/Runtime/common/string/simplepattern.cpp +++ b/src/VBox/Runtime/common/string/simplepattern.cpp @@ -1,4 +1,4 @@ -/* $Id: simplepattern.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: simplepattern.cpp $ */ /** @file * IPRT - RTStrSimplePattern. */ diff --git a/src/VBox/Runtime/common/string/straprintf.cpp b/src/VBox/Runtime/common/string/straprintf.cpp index 2df24c9bd..a0ee03502 100644 --- a/src/VBox/Runtime/common/string/straprintf.cpp +++ b/src/VBox/Runtime/common/string/straprintf.cpp @@ -1,4 +1,4 @@ -/* $Id: straprintf.cpp 33464 2010-10-26 12:27:50Z vboxsync $ */ +/* $Id: straprintf.cpp $ */ /** @file * IPRT - Allocating String Formatters. */ diff --git a/src/VBox/Runtime/common/string/strcache.cpp b/src/VBox/Runtime/common/string/strcache.cpp index 480a8b37b..642d5836d 100644 --- a/src/VBox/Runtime/common/string/strcache.cpp +++ b/src/VBox/Runtime/common/string/strcache.cpp @@ -1,4 +1,4 @@ -/* $Id: strcache.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: strcache.cpp $ */ /** @file * IPRT - String Cache. */ diff --git a/src/VBox/Runtime/common/string/strchr.asm b/src/VBox/Runtime/common/string/strchr.asm index 55ac28e44..7163f28c5 100644 --- a/src/VBox/Runtime/common/string/strchr.asm +++ b/src/VBox/Runtime/common/string/strchr.asm @@ -1,4 +1,4 @@ -; $Id: strchr.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: strchr.asm $ ;; @file ; IPRT - No-CRT strchr - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/strchr_alias.c b/src/VBox/Runtime/common/string/strchr_alias.c index b0c5ba97a..4b4fe4b10 100644 --- a/src/VBox/Runtime/common/string/strchr_alias.c +++ b/src/VBox/Runtime/common/string/strchr_alias.c @@ -1,4 +1,4 @@ -/* $Id: strchr_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strchr_alias.c $ */ /** @file * IPRT - No-CRT strchr() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/strcmp.asm b/src/VBox/Runtime/common/string/strcmp.asm index 261cabdd4..574e5d140 100644 --- a/src/VBox/Runtime/common/string/strcmp.asm +++ b/src/VBox/Runtime/common/string/strcmp.asm @@ -1,4 +1,4 @@ -; $Id: strcmp.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: strcmp.asm $ ;; @file ; IPRT - No-CRT strcmp - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/strcmp_alias.c b/src/VBox/Runtime/common/string/strcmp_alias.c index d69b7130d..3c5f7f839 100644 --- a/src/VBox/Runtime/common/string/strcmp_alias.c +++ b/src/VBox/Runtime/common/string/strcmp_alias.c @@ -1,4 +1,4 @@ -/* $Id: strcmp_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strcmp_alias.c $ */ /** @file * IPRT - No-CRT strcmp() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/strcpy.asm b/src/VBox/Runtime/common/string/strcpy.asm index 0c9e53377..bee8738ba 100644 --- a/src/VBox/Runtime/common/string/strcpy.asm +++ b/src/VBox/Runtime/common/string/strcpy.asm @@ -1,4 +1,4 @@ -; $Id: strcpy.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: strcpy.asm $ ;; @file ; IPRT - No-CRT strcpy - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/strcpy.cpp b/src/VBox/Runtime/common/string/strcpy.cpp index 6c67ab319..55da775db 100644 --- a/src/VBox/Runtime/common/string/strcpy.cpp +++ b/src/VBox/Runtime/common/string/strcpy.cpp @@ -1,4 +1,4 @@ -/* $Id: strcpy.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strcpy.cpp $ */ /** @file * IPRT - CRT Strings, strcpy(). */ diff --git a/src/VBox/Runtime/common/string/strcpy_alias.c b/src/VBox/Runtime/common/string/strcpy_alias.c index 096f240a1..517cd801a 100644 --- a/src/VBox/Runtime/common/string/strcpy_alias.c +++ b/src/VBox/Runtime/common/string/strcpy_alias.c @@ -1,4 +1,4 @@ -/* $Id: strcpy_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strcpy_alias.c $ */ /** @file * IPRT - No-CRT strcpy() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/strformat.cpp b/src/VBox/Runtime/common/string/strformat.cpp index d6058e6c0..fec8315ec 100644 --- a/src/VBox/Runtime/common/string/strformat.cpp +++ b/src/VBox/Runtime/common/string/strformat.cpp @@ -1,4 +1,4 @@ -/* $Id: strformat.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: strformat.cpp $ */ /** @file * IPRT - String Formatter. */ diff --git a/src/VBox/Runtime/common/string/strformatnum.cpp b/src/VBox/Runtime/common/string/strformatnum.cpp index 171cd1918..db4a810c7 100644 --- a/src/VBox/Runtime/common/string/strformatnum.cpp +++ b/src/VBox/Runtime/common/string/strformatnum.cpp @@ -1,4 +1,4 @@ -/* $Id: strformatnum.cpp 35585 2011-01-17 14:20:13Z vboxsync $ */ +/* $Id: strformatnum.cpp $ */ /** @file * IPRT - String Formatter, Single Numbers. */ diff --git a/src/VBox/Runtime/common/string/strformatrt.cpp b/src/VBox/Runtime/common/string/strformatrt.cpp index d2409c457..42c3dea97 100644 --- a/src/VBox/Runtime/common/string/strformatrt.cpp +++ b/src/VBox/Runtime/common/string/strformatrt.cpp @@ -1,4 +1,4 @@ -/* $Id: strformatrt.cpp 37996 2011-07-18 10:09:19Z vboxsync $ */ +/* $Id: strformatrt.cpp $ */ /** @file * IPRT - IPRT String Formatter Extensions. */ @@ -30,8 +30,10 @@ *******************************************************************************/ #define LOG_GROUP RTLOGGROUP_STRING #include <iprt/string.h> -#define RT_NO_EXPORT_SYMBOL /* don't slurp <linux/module.h> which then again - slurps arch-specific headers defining symbols */ +#ifndef RT_NO_EXPORT_SYMBOL +# define RT_NO_EXPORT_SYMBOL /* don't slurp <linux/module.h> which then again + slurps arch-specific headers defining symbols */ +#endif #include "internal/iprt.h" #include <iprt/log.h> diff --git a/src/VBox/Runtime/common/string/strformattype.cpp b/src/VBox/Runtime/common/string/strformattype.cpp index 2bd99d91f..70a3f0430 100644 --- a/src/VBox/Runtime/common/string/strformattype.cpp +++ b/src/VBox/Runtime/common/string/strformattype.cpp @@ -1,4 +1,4 @@ -/* $Id: strformattype.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: strformattype.cpp $ */ /** @file * IPRT - IPRT String Formatter Extensions, Dynamic Types. */ diff --git a/src/VBox/Runtime/common/string/stringalloc.cpp b/src/VBox/Runtime/common/string/stringalloc.cpp index 06afd0c55..f5d4ec087 100644 --- a/src/VBox/Runtime/common/string/stringalloc.cpp +++ b/src/VBox/Runtime/common/string/stringalloc.cpp @@ -1,4 +1,4 @@ -/* $Id: stringalloc.cpp 34032 2010-11-12 16:20:25Z vboxsync $ */ +/* $Id: stringalloc.cpp $ */ /** @file * IPRT - String Manipulation. */ diff --git a/src/VBox/Runtime/common/string/strlen.asm b/src/VBox/Runtime/common/string/strlen.asm index 90418f5af..e3ff2f378 100644 --- a/src/VBox/Runtime/common/string/strlen.asm +++ b/src/VBox/Runtime/common/string/strlen.asm @@ -1,4 +1,4 @@ -; $Id: strlen.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: strlen.asm $ ;; @file ; IPRT - No-CRT strlen - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/strlen.cpp b/src/VBox/Runtime/common/string/strlen.cpp index 377ef64ee..173ba2cbc 100644 --- a/src/VBox/Runtime/common/string/strlen.cpp +++ b/src/VBox/Runtime/common/string/strlen.cpp @@ -1,4 +1,4 @@ -/* $Id: strlen.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strlen.cpp $ */ /** @file * IPRT - CRT Strings, strlen(). */ diff --git a/src/VBox/Runtime/common/string/strlen_alias.c b/src/VBox/Runtime/common/string/strlen_alias.c index a89c778ae..8fab3d167 100644 --- a/src/VBox/Runtime/common/string/strlen_alias.c +++ b/src/VBox/Runtime/common/string/strlen_alias.c @@ -1,4 +1,4 @@ -/* $Id: strlen_alias.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strlen_alias.c $ */ /** @file * IPRT - No-CRT strlen() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/strncmp.cpp b/src/VBox/Runtime/common/string/strncmp.cpp index 37f81e565..16faf4b1b 100644 --- a/src/VBox/Runtime/common/string/strncmp.cpp +++ b/src/VBox/Runtime/common/string/strncmp.cpp @@ -1,4 +1,4 @@ -/* $Id: strncmp.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strncmp.cpp $ */ /** @file * IPRT - CRT Strings, strncmp(). */ diff --git a/src/VBox/Runtime/common/string/strpbrk.cpp b/src/VBox/Runtime/common/string/strpbrk.cpp index 0f2c64b84..e8d49a811 100644 --- a/src/VBox/Runtime/common/string/strpbrk.cpp +++ b/src/VBox/Runtime/common/string/strpbrk.cpp @@ -1,4 +1,4 @@ -/* $Id: strpbrk.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strpbrk.cpp $ */ /** @file * IPRT - strpbrk(). */ diff --git a/src/VBox/Runtime/common/string/strprintf.cpp b/src/VBox/Runtime/common/string/strprintf.cpp index 40e589f7b..13bfd4b7a 100644 --- a/src/VBox/Runtime/common/string/strprintf.cpp +++ b/src/VBox/Runtime/common/string/strprintf.cpp @@ -1,4 +1,4 @@ -/* $Id: strprintf.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strprintf.cpp $ */ /** @file * IPRT - String Formatters. */ diff --git a/src/VBox/Runtime/common/string/strspace.cpp b/src/VBox/Runtime/common/string/strspace.cpp index 1c8b4655f..a27a417d0 100644 --- a/src/VBox/Runtime/common/string/strspace.cpp +++ b/src/VBox/Runtime/common/string/strspace.cpp @@ -1,4 +1,4 @@ -/* $Id: strspace.cpp 36597 2011-04-06 19:46:15Z vboxsync $ */ +/* $Id: strspace.cpp $ */ /** @file * IPRT - Unique String Spaces. */ diff --git a/src/VBox/Runtime/common/string/strstrip.cpp b/src/VBox/Runtime/common/string/strstrip.cpp index 909faebe5..3f1b28096 100644 --- a/src/VBox/Runtime/common/string/strstrip.cpp +++ b/src/VBox/Runtime/common/string/strstrip.cpp @@ -1,4 +1,4 @@ -/* $Id: strstrip.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strstrip.cpp $ */ /** @file * IPRT - String Stripping and Trimming. */ diff --git a/src/VBox/Runtime/common/string/strtonum.cpp b/src/VBox/Runtime/common/string/strtonum.cpp index 2c96e3db3..60285fd06 100644 --- a/src/VBox/Runtime/common/string/strtonum.cpp +++ b/src/VBox/Runtime/common/string/strtonum.cpp @@ -1,4 +1,4 @@ -/* $Id: strtonum.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: strtonum.cpp $ */ /** @file * IPRT - String To Number Conversion. */ diff --git a/src/VBox/Runtime/common/string/strversion.cpp b/src/VBox/Runtime/common/string/strversion.cpp index bab3a4c20..7a93bc8d6 100644 --- a/src/VBox/Runtime/common/string/strversion.cpp +++ b/src/VBox/Runtime/common/string/strversion.cpp @@ -1,4 +1,4 @@ -/* $Id: strversion.cpp 35076 2010-12-14 13:31:41Z vboxsync $ */ +/* $Id: strversion.cpp $ */ /** @file * IPRT - Version String Parsing. */ diff --git a/src/VBox/Runtime/common/string/uni.cpp b/src/VBox/Runtime/common/string/uni.cpp index 1f84b533f..1fe613ecb 100644 --- a/src/VBox/Runtime/common/string/uni.cpp +++ b/src/VBox/Runtime/common/string/uni.cpp @@ -1,4 +1,4 @@ -/* $Id: uni.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: uni.cpp $ */ /** @file * IPRT - Unicode. */ diff --git a/src/VBox/Runtime/common/string/unidata.cpp b/src/VBox/Runtime/common/string/unidata.cpp index 914a3f3f6..ea5ce4edc 100644 --- a/src/VBox/Runtime/common/string/unidata.cpp +++ b/src/VBox/Runtime/common/string/unidata.cpp @@ -1,4 +1,4 @@ -/* $Id: unidata.cpp 33560 2010-10-28 14:25:30Z vboxsync $ */ +/* $Id: unidata.cpp $ */ /** @file * IPRT - Unicode Tables * diff --git a/src/VBox/Runtime/common/string/uniread.cpp b/src/VBox/Runtime/common/string/uniread.cpp index 02719fa5e..6b7fd3bcf 100644 --- a/src/VBox/Runtime/common/string/uniread.cpp +++ b/src/VBox/Runtime/common/string/uniread.cpp @@ -1,4 +1,4 @@ -/* $Id: uniread.cpp 33560 2010-10-28 14:25:30Z vboxsync $ */ +/* $Id: uniread.cpp $ */ /** @file * IPRT - Unicode Specification Reader. */ diff --git a/src/VBox/Runtime/common/string/utf-16.cpp b/src/VBox/Runtime/common/string/utf-16.cpp index bf9d3cb3e..f24e95b74 100644 --- a/src/VBox/Runtime/common/string/utf-16.cpp +++ b/src/VBox/Runtime/common/string/utf-16.cpp @@ -1,4 +1,4 @@ -/* $Id: utf-16.cpp 31157 2010-07-28 03:15:35Z vboxsync $ */ +/* $Id: utf-16.cpp $ */ /** @file * IPRT - UTF-16. */ diff --git a/src/VBox/Runtime/common/string/utf-8-case.cpp b/src/VBox/Runtime/common/string/utf-8-case.cpp index 71ea836d2..7a0bf2ebb 100644 --- a/src/VBox/Runtime/common/string/utf-8-case.cpp +++ b/src/VBox/Runtime/common/string/utf-8-case.cpp @@ -1,4 +1,4 @@ -/* $Id: utf-8-case.cpp 33562 2010-10-28 14:38:50Z vboxsync $ */ +/* $Id: utf-8-case.cpp $ */ /** @file * IPRT - UTF-8 Case Sensitivity and Folding. */ diff --git a/src/VBox/Runtime/common/string/utf-8.cpp b/src/VBox/Runtime/common/string/utf-8.cpp index 537e45c66..222e1d18a 100644 --- a/src/VBox/Runtime/common/string/utf-8.cpp +++ b/src/VBox/Runtime/common/string/utf-8.cpp @@ -1,4 +1,4 @@ -/* $Id: utf-8.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: utf-8.cpp $ */ /** @file * IPRT - UTF-8 Decoding. */ diff --git a/src/VBox/Runtime/common/table/avl_Base.cpp.h b/src/VBox/Runtime/common/table/avl_Base.cpp.h index 1c9f0aa36..6ea6d0ef2 100644 --- a/src/VBox/Runtime/common/table/avl_Base.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Base.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Base.cpp.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: avl_Base.cpp.h $ */ /** @file * kAVLBase - basic routines for all AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_Destroy.cpp.h b/src/VBox/Runtime/common/table/avl_Destroy.cpp.h index 9b255ca17..0e0174b40 100644 --- a/src/VBox/Runtime/common/table/avl_Destroy.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Destroy.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Destroy.cpp.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: avl_Destroy.cpp.h $ */ /** @file * kAVLDestroy - Walk the tree calling a callback to destroy all the nodes. */ diff --git a/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h b/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h index 233936803..25c9e82d1 100644 --- a/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h +++ b/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_DoWithAll.cpp.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: avl_DoWithAll.cpp.h $ */ /** @file * kAVLDoWithAll - Do with all nodes routine for AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_Enum.cpp.h b/src/VBox/Runtime/common/table/avl_Enum.cpp.h index d29387bb8..1d6e53655 100644 --- a/src/VBox/Runtime/common/table/avl_Enum.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Enum.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Enum.cpp.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: avl_Enum.cpp.h $ */ /** @file * Enumeration routines for AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_Get.cpp.h b/src/VBox/Runtime/common/table/avl_Get.cpp.h index 3bb16a1ed..36c8713bd 100644 --- a/src/VBox/Runtime/common/table/avl_Get.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Get.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Get.cpp.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: avl_Get.cpp.h $ */ /** @file * kAVLGet - get routine for AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h b/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h index 4b6ceb72d..d15f167f3 100644 --- a/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h +++ b/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_GetBestFit.cpp.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: avl_GetBestFit.cpp.h $ */ /** @file * kAVLGetBestFit - Get Best Fit routine for AVL trees. * Intended specially on heaps. The tree should allow duplicate keys. diff --git a/src/VBox/Runtime/common/table/avl_Range.cpp.h b/src/VBox/Runtime/common/table/avl_Range.cpp.h index fc658838c..3e66c2062 100644 --- a/src/VBox/Runtime/common/table/avl_Range.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Range.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Range.cpp.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: avl_Range.cpp.h $ */ /** @file * kAVLRange - Range routines for AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h b/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h index 30e11c15c..77825f828 100644 --- a/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h +++ b/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_RemoveBestFit.cpp.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: avl_RemoveBestFit.cpp.h $ */ /** @file * kAVLRemoveBestFit - Remove Best Fit routine for AVL trees. * Intended specially on heaps. The tree should allow duplicate keys. diff --git a/src/VBox/Runtime/common/table/avlgcphys.cpp b/src/VBox/Runtime/common/table/avlgcphys.cpp index c4f258165..7f8566b12 100644 --- a/src/VBox/Runtime/common/table/avlgcphys.cpp +++ b/src/VBox/Runtime/common/table/avlgcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlgcphys.cpp 32284 2010-09-07 12:29:14Z vboxsync $ */ +/* $Id: avlgcphys.cpp $ */ /** @file * IPRT - AVL tree, RTGCPHYS, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlgcptr.cpp b/src/VBox/Runtime/common/table/avlgcptr.cpp index f1e184493..426668609 100644 --- a/src/VBox/Runtime/common/table/avlgcptr.cpp +++ b/src/VBox/Runtime/common/table/avlgcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlgcptr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlgcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlhcphys.cpp b/src/VBox/Runtime/common/table/avlhcphys.cpp index f41088b52..499c55534 100644 --- a/src/VBox/Runtime/common/table/avlhcphys.cpp +++ b/src/VBox/Runtime/common/table/avlhcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlhcphys.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlhcphys.cpp $ */ /** @file * IPRT - AVL tree, RTHCPHYS, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avllu32.cpp b/src/VBox/Runtime/common/table/avllu32.cpp index afc7a8fbf..587a5feb3 100644 --- a/src/VBox/Runtime/common/table/avllu32.cpp +++ b/src/VBox/Runtime/common/table/avllu32.cpp @@ -1,4 +1,4 @@ -/* $Id: avllu32.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avllu32.cpp $ */ /** @file * IPRT - AVL tree, uint32_t, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlogcphys.cpp b/src/VBox/Runtime/common/table/avlogcphys.cpp index fc83a1fbb..01cb5f0ef 100644 --- a/src/VBox/Runtime/common/table/avlogcphys.cpp +++ b/src/VBox/Runtime/common/table/avlogcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlogcphys.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlogcphys.cpp $ */ /** @file * IPRT - AVL tree, RTGCPHYS, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlogcptr.cpp b/src/VBox/Runtime/common/table/avlogcptr.cpp index 27f7c5b5f..6602c3097 100644 --- a/src/VBox/Runtime/common/table/avlogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlogcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlogcptr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlogcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlohcphys.cpp b/src/VBox/Runtime/common/table/avlohcphys.cpp index d3c273553..9f6dabae7 100644 --- a/src/VBox/Runtime/common/table/avlohcphys.cpp +++ b/src/VBox/Runtime/common/table/avlohcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlohcphys.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlohcphys.cpp $ */ /** @file * IPRT - AVL tree, RTHCPHYS, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avloioport.cpp b/src/VBox/Runtime/common/table/avloioport.cpp index 4ff60d870..38aa69066 100644 --- a/src/VBox/Runtime/common/table/avloioport.cpp +++ b/src/VBox/Runtime/common/table/avloioport.cpp @@ -1,4 +1,4 @@ -/* $Id: avloioport.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avloioport.cpp $ */ /** @file * IPRT - AVL tree, RTIOPORT, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlou32.cpp b/src/VBox/Runtime/common/table/avlou32.cpp index 3882a5d0d..c01cafa1e 100644 --- a/src/VBox/Runtime/common/table/avlou32.cpp +++ b/src/VBox/Runtime/common/table/avlou32.cpp @@ -1,4 +1,4 @@ -/* $Id: avlou32.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlou32.cpp $ */ /** @file * IPRT - AVL tree, uint_32, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlpv.cpp b/src/VBox/Runtime/common/table/avlpv.cpp index a5f82b9d3..c30680700 100644 --- a/src/VBox/Runtime/common/table/avlpv.cpp +++ b/src/VBox/Runtime/common/table/avlpv.cpp @@ -1,4 +1,4 @@ -/* $Id: avlpv.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlpv.cpp $ */ /** @file * IPRT - AVL tree, void *, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlrfoff.cpp b/src/VBox/Runtime/common/table/avlrfoff.cpp index 7c9da3b87..dd6391b62 100644 --- a/src/VBox/Runtime/common/table/avlrfoff.cpp +++ b/src/VBox/Runtime/common/table/avlrfoff.cpp @@ -1,4 +1,4 @@ -/* $Id: avlrfoff.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlrfoff.cpp $ */ /** @file * IPRT - AVL tree, RTFOFF, range, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlrgcptr.cpp b/src/VBox/Runtime/common/table/avlrgcptr.cpp index aa1c8b380..4ea64fd2d 100644 --- a/src/VBox/Runtime/common/table/avlrgcptr.cpp +++ b/src/VBox/Runtime/common/table/avlrgcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlrgcptr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlrgcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, range, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlrogcphys.cpp b/src/VBox/Runtime/common/table/avlrogcphys.cpp index eb19638e3..f52acdbb2 100644 --- a/src/VBox/Runtime/common/table/avlrogcphys.cpp +++ b/src/VBox/Runtime/common/table/avlrogcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlrogcphys.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlrogcphys.cpp $ */ /** @file * IPRT - AVL tree, RTGCPHYS, range, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlrogcptr.cpp b/src/VBox/Runtime/common/table/avlrogcptr.cpp index 783923815..2f4559473 100644 --- a/src/VBox/Runtime/common/table/avlrogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlrogcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlrogcptr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlrogcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, range, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlroioport.cpp b/src/VBox/Runtime/common/table/avlroioport.cpp index b07e035c6..9aa583411 100644 --- a/src/VBox/Runtime/common/table/avlroioport.cpp +++ b/src/VBox/Runtime/common/table/avlroioport.cpp @@ -1,4 +1,4 @@ -/* $Id: avlroioport.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlroioport.cpp $ */ /** @file * IPRT - AVL tree, RTIOPORT, range, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlroogcptr.cpp b/src/VBox/Runtime/common/table/avlroogcptr.cpp index 8b449f6a8..6c425d5b5 100644 --- a/src/VBox/Runtime/common/table/avlroogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlroogcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlroogcptr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlroogcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, range, unique keys, overlapping ranges, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlrpv.cpp b/src/VBox/Runtime/common/table/avlrpv.cpp index 817dd3822..f7e00339f 100644 --- a/src/VBox/Runtime/common/table/avlrpv.cpp +++ b/src/VBox/Runtime/common/table/avlrpv.cpp @@ -1,4 +1,4 @@ -/* $Id: avlrpv.cpp 33268 2010-10-20 15:37:15Z vboxsync $ */ +/* $Id: avlrpv.cpp $ */ /** @file * IPRT - AVL tree, void *, range, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlru64.cpp b/src/VBox/Runtime/common/table/avlru64.cpp index b562e9466..a7476ea5d 100644 --- a/src/VBox/Runtime/common/table/avlru64.cpp +++ b/src/VBox/Runtime/common/table/avlru64.cpp @@ -1,4 +1,4 @@ -/* $Id: avlru64.cpp 34218 2010-11-21 17:00:38Z vboxsync $ */ +/* $Id: avlru64.cpp $ */ /** @file * IPRT - AVL tree, void *, range, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlruintptr.cpp b/src/VBox/Runtime/common/table/avlruintptr.cpp index b9b8bc2cb..c267284a9 100644 --- a/src/VBox/Runtime/common/table/avlruintptr.cpp +++ b/src/VBox/Runtime/common/table/avlruintptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlruintptr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlruintptr.cpp $ */ /** @file * IPRT - AVL tree, RTUINTPTR, range, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlu32.cpp b/src/VBox/Runtime/common/table/avlu32.cpp index 63420e65d..3bf1283b5 100644 --- a/src/VBox/Runtime/common/table/avlu32.cpp +++ b/src/VBox/Runtime/common/table/avlu32.cpp @@ -1,4 +1,4 @@ -/* $Id: avlu32.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlu32.cpp $ */ /** @file * IPRT - AVL tree, uint32_t, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avluintptr.cpp b/src/VBox/Runtime/common/table/avluintptr.cpp index 96e2b56a3..08d3eb455 100644 --- a/src/VBox/Runtime/common/table/avluintptr.cpp +++ b/src/VBox/Runtime/common/table/avluintptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avluintptr.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avluintptr.cpp $ */ /** @file * IPRT - AVL tree, RTUINTPTR, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlul.cpp b/src/VBox/Runtime/common/table/avlul.cpp index 644c23d58..62b94f97e 100644 --- a/src/VBox/Runtime/common/table/avlul.cpp +++ b/src/VBox/Runtime/common/table/avlul.cpp @@ -1,4 +1,4 @@ -/* $Id: avlul.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: avlul.cpp $ */ /** @file * IPRT - AVL tree, unsigned long, unique keys. */ diff --git a/src/VBox/Runtime/common/table/table.cpp b/src/VBox/Runtime/common/table/table.cpp index a649cb395..b2d7c8b03 100644 --- a/src/VBox/Runtime/common/table/table.cpp +++ b/src/VBox/Runtime/common/table/table.cpp @@ -1,4 +1,4 @@ -/* $Id: table.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: table.cpp $ */ /** @file * IPRT - AVL tree, RTHCPHYS, unique keys. */ diff --git a/src/VBox/Runtime/common/time/time.cpp b/src/VBox/Runtime/common/time/time.cpp index 3a4e7b6bc..bbeeeb7d9 100644 --- a/src/VBox/Runtime/common/time/time.cpp +++ b/src/VBox/Runtime/common/time/time.cpp @@ -1,4 +1,4 @@ -/* $Id: time.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: time.cpp $ */ /** @file * IPRT - Time. */ diff --git a/src/VBox/Runtime/common/time/timeprog.cpp b/src/VBox/Runtime/common/time/timeprog.cpp index c6bdd2380..61571d534 100644 --- a/src/VBox/Runtime/common/time/timeprog.cpp +++ b/src/VBox/Runtime/common/time/timeprog.cpp @@ -1,4 +1,4 @@ -/* $Id: timeprog.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: timeprog.cpp $ */ /** @file * IPRT - Time Relative to Program Start. */ diff --git a/src/VBox/Runtime/common/time/timesup.cpp b/src/VBox/Runtime/common/time/timesup.cpp index 90d659ab7..6a51fd6de 100644 --- a/src/VBox/Runtime/common/time/timesup.cpp +++ b/src/VBox/Runtime/common/time/timesup.cpp @@ -1,4 +1,4 @@ -/* $Id: timesup.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: timesup.cpp $ */ /** @file * IPRT - Time using SUPLib. */ diff --git a/src/VBox/Runtime/common/time/timesupA.asm b/src/VBox/Runtime/common/time/timesupA.asm index c5360fb2e..9c0449304 100644 --- a/src/VBox/Runtime/common/time/timesupA.asm +++ b/src/VBox/Runtime/common/time/timesupA.asm @@ -1,4 +1,4 @@ -; $Id: timesupA.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: timesupA.asm $ ;; @file ; IPRT - Time using SUPLib, the Assembly Implementation. ; diff --git a/src/VBox/Runtime/common/time/timesupA.mac b/src/VBox/Runtime/common/time/timesupA.mac index 2fc22038c..b146c5a6e 100644 --- a/src/VBox/Runtime/common/time/timesupA.mac +++ b/src/VBox/Runtime/common/time/timesupA.mac @@ -1,4 +1,4 @@ -; $Id: timesupA.mac 36262 2011-03-11 14:50:45Z vboxsync $ +; $Id: timesupA.mac $ ;; @file ; IPRT - Time using SUPLib, the Assembly Code Template. ; diff --git a/src/VBox/Runtime/common/time/timesupref.cpp b/src/VBox/Runtime/common/time/timesupref.cpp index 04f68f259..12c9bb350 100644 --- a/src/VBox/Runtime/common/time/timesupref.cpp +++ b/src/VBox/Runtime/common/time/timesupref.cpp @@ -1,4 +1,4 @@ -/* $Id: timesupref.cpp 29267 2010-05-09 21:21:36Z vboxsync $ */ +/* $Id: timesupref.cpp $ */ /** @file * IPRT - Time using SUPLib, the C Implementation. */ diff --git a/src/VBox/Runtime/common/time/timesupref.h b/src/VBox/Runtime/common/time/timesupref.h index 8aa2beac4..e7b345132 100644 --- a/src/VBox/Runtime/common/time/timesupref.h +++ b/src/VBox/Runtime/common/time/timesupref.h @@ -1,4 +1,4 @@ -/* $Id: timesupref.h 36262 2011-03-11 14:50:45Z vboxsync $ */ +/* $Id: timesupref.h $ */ /** @file * IPRT - Time using SUPLib, the C Code Template. */ diff --git a/src/VBox/Runtime/common/time/timesysalias.cpp b/src/VBox/Runtime/common/time/timesysalias.cpp index c3f91dcf8..37f65d392 100644 --- a/src/VBox/Runtime/common/time/timesysalias.cpp +++ b/src/VBox/Runtime/common/time/timesysalias.cpp @@ -1,4 +1,4 @@ -/* $Id: timesysalias.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: timesysalias.cpp $ */ /** @file * IPRT - Time using RTTimeSystem*. */ diff --git a/src/VBox/Runtime/common/vfs/vfsbase.cpp b/src/VBox/Runtime/common/vfs/vfsbase.cpp index 9c0abf5c5..c954aa3f4 100644 --- a/src/VBox/Runtime/common/vfs/vfsbase.cpp +++ b/src/VBox/Runtime/common/vfs/vfsbase.cpp @@ -1,4 +1,4 @@ -/* $Id: vfsbase.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: vfsbase.cpp $ */ /** @file * IPRT - Virtual File System, Base. */ diff --git a/src/VBox/Runtime/common/vfs/vfschain.cpp b/src/VBox/Runtime/common/vfs/vfschain.cpp index 1afbbad91..cf3618cd5 100644 --- a/src/VBox/Runtime/common/vfs/vfschain.cpp +++ b/src/VBox/Runtime/common/vfs/vfschain.cpp @@ -1,4 +1,4 @@ -/* $Id: vfschain.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: vfschain.cpp $ */ /** @file * IPRT - Virtual File System, Chains. */ diff --git a/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp b/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp index f7d88c154..fb9043c09 100644 --- a/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp +++ b/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp @@ -1,4 +1,4 @@ -/* $Id: vfsiosmisc.cpp 34967 2010-12-10 17:52:01Z vboxsync $ */ +/* $Id: vfsiosmisc.cpp $ */ /** @file * IPRT - Virtual File System, Misc I/O Stream Operations. */ diff --git a/src/VBox/Runtime/common/vfs/vfsmemory.cpp b/src/VBox/Runtime/common/vfs/vfsmemory.cpp index 82333fbce..12ccc5c15 100644 --- a/src/VBox/Runtime/common/vfs/vfsmemory.cpp +++ b/src/VBox/Runtime/common/vfs/vfsmemory.cpp @@ -1,4 +1,4 @@ -/* $Id: vfsmemory.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: vfsmemory.cpp $ */ /** @file * IPRT - Virtual File System, Memory Backed VFS. */ diff --git a/src/VBox/Runtime/common/vfs/vfsmisc.cpp b/src/VBox/Runtime/common/vfs/vfsmisc.cpp index b50b7c590..f35005d31 100644 --- a/src/VBox/Runtime/common/vfs/vfsmisc.cpp +++ b/src/VBox/Runtime/common/vfs/vfsmisc.cpp @@ -1,4 +1,4 @@ -/* $Id: vfsmisc.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: vfsmisc.cpp $ */ /** @file * IPRT - Virtual File System, Misc functions with heavy dependencies. */ diff --git a/src/VBox/Runtime/common/vfs/vfsstdfile.cpp b/src/VBox/Runtime/common/vfs/vfsstdfile.cpp index 070b96d4c..2738a96bf 100644 --- a/src/VBox/Runtime/common/vfs/vfsstdfile.cpp +++ b/src/VBox/Runtime/common/vfs/vfsstdfile.cpp @@ -1,4 +1,4 @@ -/* $Id: vfsstdfile.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: vfsstdfile.cpp $ */ /** @file * IPRT - Virtual File System, Standard File Implementation. */ diff --git a/src/VBox/Runtime/common/zip/gzipvfs.cpp b/src/VBox/Runtime/common/zip/gzipvfs.cpp index 33cb16f0b..e680fae0e 100644 --- a/src/VBox/Runtime/common/zip/gzipvfs.cpp +++ b/src/VBox/Runtime/common/zip/gzipvfs.cpp @@ -1,4 +1,4 @@ -/* $Id: gzipvfs.cpp 34049 2010-11-13 01:31:07Z vboxsync $ */ +/* $Id: gzipvfs.cpp $ */ /** @file * IPRT - GZIP Compressor and Decompressor I/O Stream. */ diff --git a/src/VBox/Runtime/common/zip/tar.cpp b/src/VBox/Runtime/common/zip/tar.cpp index d59dcb963..9e1a351f4 100644 --- a/src/VBox/Runtime/common/zip/tar.cpp +++ b/src/VBox/Runtime/common/zip/tar.cpp @@ -1,4 +1,4 @@ -/* $Id: tar.cpp 35351 2010-12-27 17:04:17Z vboxsync $ */ +/* $Id: tar.cpp $ */ /** @file * IPRT - Tar archive I/O. */ diff --git a/src/VBox/Runtime/common/zip/tar.h b/src/VBox/Runtime/common/zip/tar.h index 3876300b8..4e1be2586 100644 --- a/src/VBox/Runtime/common/zip/tar.h +++ b/src/VBox/Runtime/common/zip/tar.h @@ -1,4 +1,4 @@ -/* $Id: tar.h 34179 2010-11-18 15:49:17Z vboxsync $ */ +/* $Id: tar.h $ */ /** @file * IPRT - TAR Virtual Filesystem. */ diff --git a/src/VBox/Runtime/common/zip/tarcmd.cpp b/src/VBox/Runtime/common/zip/tarcmd.cpp index 45a104731..6e7f84a99 100644 --- a/src/VBox/Runtime/common/zip/tarcmd.cpp +++ b/src/VBox/Runtime/common/zip/tarcmd.cpp @@ -1,4 +1,4 @@ -/* $Id: tarcmd.cpp 35351 2010-12-27 17:04:17Z vboxsync $ */ +/* $Id: tarcmd.cpp $ */ /** @file * IPRT - TAR Command. */ diff --git a/src/VBox/Runtime/common/zip/tarvfs.cpp b/src/VBox/Runtime/common/zip/tarvfs.cpp index 26a350a45..ccff3b208 100644 --- a/src/VBox/Runtime/common/zip/tarvfs.cpp +++ b/src/VBox/Runtime/common/zip/tarvfs.cpp @@ -1,4 +1,4 @@ -/* $Id: tarvfs.cpp 34928 2010-12-09 22:54:17Z vboxsync $ */ +/* $Id: tarvfs.cpp $ */ /** @file * IPRT - TAR Virtual Filesystem. */ diff --git a/src/VBox/Runtime/common/zip/zip.cpp b/src/VBox/Runtime/common/zip/zip.cpp index 7b9d34acb..dde89825d 100644 --- a/src/VBox/Runtime/common/zip/zip.cpp +++ b/src/VBox/Runtime/common/zip/zip.cpp @@ -1,4 +1,4 @@ -/* $Id: zip.cpp 33982 2010-11-11 12:37:18Z vboxsync $ */ +/* $Id: zip.cpp $ */ /** @file * IPRT - Compression. */ diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp index ae3de0b8d..082edf8bb 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromDarwin.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: RTErrConvertFromDarwin.cpp $ */ /** @file * IPRT - Convert Darwin Mach returns codes to iprt status codes. */ diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp index 5a2828cfd..19663e7d5 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromDarwinCOM.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: RTErrConvertFromDarwinCOM.cpp $ */ /** @file * IPRT - Convert Darwin COM returns codes to iprt status codes. */ diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp index f5d14bd1e..2bf4fe7da 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromDarwinIO.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: RTErrConvertFromDarwinIO.cpp $ */ /** @file * IPRT - Convert Darwin IOKit returns codes to iprt status codes. */ diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp index 48d3fc1c2..caeceb245 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromDarwinKern.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: RTErrConvertFromDarwinKern.cpp $ */ /** @file * IPRT - Convert Darwin Mach returns codes to iprt status codes. */ diff --git a/src/VBox/Runtime/gc/initterm-gc.cpp b/src/VBox/Runtime/gc/initterm-gc.cpp index 4210e5049..b35ca578b 100644 --- a/src/VBox/Runtime/gc/initterm-gc.cpp +++ b/src/VBox/Runtime/gc/initterm-gc.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-gc.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: initterm-gc.cpp $ */ /** @file * IPRT - Init Raw-mode Context. */ diff --git a/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp b/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp index b5d54e39e..52ea2eef2 100644 --- a/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp +++ b/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertShouldPanic-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTAssertShouldPanic-generic.cpp $ */ /** @file * IPRT - Assertions, generic RTAssertShouldPanic. */ diff --git a/src/VBox/Runtime/generic/RTDirCreateTemp-generic.cpp b/src/VBox/Runtime/generic/RTDirCreateTemp-generic.cpp index afb9aea46..82214b4fe 100644 --- a/src/VBox/Runtime/generic/RTDirCreateTemp-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirCreateTemp-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTDirCreateTemp-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTDirCreateTemp-generic.cpp $ */ /** @file * IPRT - RTDirCreateTemp, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTDirCreateUniqueNumbered-generic.cpp b/src/VBox/Runtime/generic/RTDirCreateUniqueNumbered-generic.cpp index 7a9c378b5..d068b37ee 100644 --- a/src/VBox/Runtime/generic/RTDirCreateUniqueNumbered-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirCreateUniqueNumbered-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTDirCreateUniqueNumbered-generic.cpp 36604 2011-04-06 23:02:52Z vboxsync $ */ +/* $Id: RTDirCreateUniqueNumbered-generic.cpp $ */ /** @file * IPRT - RTDirCreateUniqueNumbered, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTDirExists-generic.cpp b/src/VBox/Runtime/generic/RTDirExists-generic.cpp index f3a4fc1e0..0b5f04a98 100644 --- a/src/VBox/Runtime/generic/RTDirExists-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirExists-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTDirExists-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTDirExists-generic.cpp $ */ /** @file * IPRT - RTDirExists, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp b/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp index 60c2174a8..a01a8d80d 100644 --- a/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTDirQueryInfo-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTDirQueryInfo-generic.cpp $ */ /** @file * IPRT - RTDirQueryInfo, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp b/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp index 019c61f83..b5b781e24 100644 --- a/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTDirSetTimes-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTDirSetTimes-generic.cpp $ */ /** @file * IPRT - RTDirSetTimes, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp b/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp index c101ca7ed..5320cc5f0 100644 --- a/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp +++ b/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTEnvDupEx-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTEnvDupEx-generic.cpp $ */ /** @file * IPRT - Environment, RTEnvDupEx, generic. */ diff --git a/src/VBox/Runtime/generic/RTFileCopy-generic.cpp b/src/VBox/Runtime/generic/RTFileCopy-generic.cpp index b19fb6c88..ea55290cf 100644 --- a/src/VBox/Runtime/generic/RTFileCopy-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileCopy-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileCopy-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileCopy-generic.cpp $ */ /** @file * IPRT - RTFileCopy, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileExists-generic.cpp b/src/VBox/Runtime/generic/RTFileExists-generic.cpp index 5c8cffd6d..f81988165 100644 --- a/src/VBox/Runtime/generic/RTFileExists-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileExists-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileExists-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileExists-generic.cpp $ */ /** @file * IPRT - RTFileExists, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileMove-generic.cpp b/src/VBox/Runtime/generic/RTFileMove-generic.cpp index aa2a37430..21556ec70 100644 --- a/src/VBox/Runtime/generic/RTFileMove-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileMove-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileMove-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileMove-generic.cpp $ */ /** @file * IPRT - RTFileMove, Generic. */ diff --git a/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp b/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp index 3129b7016..a561eea67 100644 --- a/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileQuerySize-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileQuerySize-generic.cpp $ */ /** @file * IPRT - RTFileQuerySize, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp index ea8b8dcc9..71c0af124 100644 --- a/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAll-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileReadAll-generic.cpp $ */ /** @file * IPRT - RTFileReadAll, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp index d45ca98d1..2d94160f1 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAllByHandle-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileReadAllByHandle-generic.cpp $ */ /** @file * IPRT - RTFileReadAllByHandle, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp index 12b713ea4..0c41126c6 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAllByHandleEx-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileReadAllByHandleEx-generic.cpp $ */ /** @file * IPRT - RTFileReadAllByHandleEx, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp index fe086addd..2046d7319 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAllEx-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileReadAllEx-generic.cpp $ */ /** @file * IPRT - RTFileReadAllEx, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp index 8491c323a..1f1dd2920 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAllFree-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTFileReadAllFree-generic.cpp $ */ /** @file * IPRT - RTFileReadAllFree, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp b/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp index f0596f88e..5a1e122c5 100644 --- a/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogDefaultInit-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogDefaultInit-generic.cpp $ */ /** @file * IPRT - Default Log Init, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp index bb1b35876..116900b57 100644 --- a/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-generic.cpp $ */ /** @file * IPRT - Log To Debugger, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp index 18fdbf84a..fc7af9816 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdErr-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteStdErr-generic.cpp $ */ /** @file * IPRT - Log To StdErr, Generic. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp index 9c3e05161..4a42187a7 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdErr-stub-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteStdErr-stub-generic.cpp $ */ /** @file * IPRT - Log To StdErr, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp index 9805d180d..a358c08d4 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdOut-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteStdOut-generic.cpp $ */ /** @file * IPRT - Log To StdOut, Generic. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp index 54fcd2850..99b6b2bb3 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdOut-stub-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteStdOut-stub-generic.cpp $ */ /** @file * IPRT - Log To StdOut, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp index 6ac712221..2fe4d0dfb 100644 --- a/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteUser-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteUser-generic.cpp $ */ /** @file * IPRT - Log User Specific Output, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp index 7ee70e824..591d8318c 100644 --- a/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpCpuId-generic.cpp 29500 2010-05-14 21:43:06Z vboxsync $ */ +/* $Id: RTMpCpuId-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpCpuId. */ diff --git a/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp index 09b6f26f2..2fec3382a 100644 --- a/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpCpuIdFromSetIndex-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpCpuIdFromSetIndex-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpCpuIdFromSetIndex. */ diff --git a/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp index ce825e471..894f8f4f7 100644 --- a/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpCpuIdToSetIndex-generic.cpp 36232 2011-03-09 16:41:09Z vboxsync $ */ +/* $Id: RTMpCpuIdToSetIndex-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpCpuIdToSetIndex. */ diff --git a/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp b/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp index 03f30590c..eafac57ff 100644 --- a/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetArraySize-generic.cpp 36254 2011-03-10 17:22:08Z vboxsync $ */ +/* $Id: RTMpGetArraySize-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetArraySize. */ diff --git a/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp index 52de02d84..f8625e183 100644 --- a/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetCount-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetCount-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetCount. */ diff --git a/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp index c9f590ee6..04c9a68dc 100644 --- a/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetCurFrequency-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetCurFrequency-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetCurFrequency. */ diff --git a/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp b/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp index 3391abb38..a3c176689 100644 --- a/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp +++ b/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetDescription-generic-stub.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetDescription-generic-stub.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetDescription stub. */ diff --git a/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp b/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp index cdb41904a..dccd40583 100644 --- a/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetDescription-generic.cpp 29264 2010-05-09 19:58:37Z vboxsync $ */ +/* $Id: RTMpGetDescription-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetDescription. */ diff --git a/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp b/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp index 8ef1b8dbf..e79633014 100644 --- a/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetMaxCpuId-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetMaxCpuId-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetMaxCpuId. */ diff --git a/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp b/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp index 978f439d7..4f468d882 100644 --- a/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetMaxFrequency-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetMaxFrequency-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetMaxFrequency. */ diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp index 36f43f1ed..e11543e04 100644 --- a/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetOnlineCount-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetOnlineCount-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetOnlineCount. */ diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp index 05be2872c..753ee62dc 100644 --- a/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetOnlineSet-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetOnlineSet-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetOnlineSet. */ diff --git a/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp b/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp index 6a83d70e9..01b724965 100644 --- a/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetSet-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetSet-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetSet. */ diff --git a/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp b/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp index 79cfae8b8..b53c13ae9 100644 --- a/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpIsCpuOnline-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpIsCpuOnline-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpIsCpuOnline. */ diff --git a/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp b/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp index dfdb48046..7c57ae831 100644 --- a/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpIsCpuPossible-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpIsCpuPossible-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpIsCpuPossible. */ diff --git a/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp b/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp index 9fe36f6f9..a099fb0a6 100644 --- a/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp +++ b/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTProcDaemonize-generic.cpp 33806 2010-11-05 17:20:15Z vboxsync $ */ +/* $Id: RTProcDaemonize-generic.cpp $ */ /** @file * IPRT - RTProcDaemonize, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp b/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp index ff37e079a..89e2b4c82 100644 --- a/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp +++ b/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTProcIsRunningByName-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTProcIsRunningByName-generic.cpp $ */ /** @file * IPRT - RTProcIsRunningByName, generic stub. */ diff --git a/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp b/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp index fb277d4e5..0b05fa5e8 100644 --- a/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp +++ b/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTRandAdvCreateSystemFaster-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTRandAdvCreateSystemFaster-generic.cpp $ */ /** @file * IPRT - Random Numbers, generic RTRandAdvCreateSystemFaster. */ diff --git a/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp b/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp index 39c42cbca..375757a77 100644 --- a/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp +++ b/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTRandAdvCreateSystemTruer-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTRandAdvCreateSystemTruer-generic.cpp $ */ /** @file * IPRT - Random Numbers, generic RTRandAdvCreateSystemTruer. */ diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp index 6ce2d195e..437be6be1 100644 --- a/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSemEventMultiWait-2-ex-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: RTSemEventMultiWait-2-ex-generic.cpp $ */ /** @file * IPRT - RTSemEventMultiWait, implementation based on RTSemEventMultiWaitEx. */ diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp index 54b4ba601..16a9580bf 100644 --- a/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSemEventMultiWait-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: RTSemEventMultiWait-generic.cpp $ */ /** @file * IPRT - RTSemEventMultiWait, generic RTSemEventMultiWaitNoResume wrapper. */ diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp index 651f10109..c3eb88db0 100644 --- a/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSemEventMultiWaitNoResume-2-ex-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: RTSemEventMultiWaitNoResume-2-ex-generic.cpp $ */ /** @file * IPRT - RTSemEventMultiWaitNoResume, generic implementation based * on RTSemEventMultiWaitEx. diff --git a/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp index 4cad3116d..b2e78807d 100644 --- a/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSemEventWait-2-ex-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: RTSemEventWait-2-ex-generic.cpp $ */ /** @file * IPRT - RTSemEventWait, implementation based on RTSemEventWaitEx. */ diff --git a/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp index eea5dc6b3..ade778085 100644 --- a/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSemEventWait-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: RTSemEventWait-generic.cpp $ */ /** @file * IPRT - RTSemEventWait, generic RTSemEventWaitNoResume wrapper. */ diff --git a/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp index d712334f5..3dbe66cdc 100644 --- a/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSemEventWaitNoResume-2-ex-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: RTSemEventWaitNoResume-2-ex-generic.cpp $ */ /** @file * IPRT - RTSemEventWaitNoResume, generic implementation based * on RTSemEventWaitEx. diff --git a/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp b/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp index 4c378138a..32c3f8760 100644 --- a/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSemMutexRequest-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: RTSemMutexRequest-generic.cpp $ */ /** @file * IPRT - RTSemMutexRequest, generic RTSemMutexRequestNoResume wrapper. */ diff --git a/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp b/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp index b426a789f..4ba150392 100644 --- a/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSemMutexRequestDebug-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTSemMutexRequestDebug-generic.cpp $ */ /** @file * IPRT - RTSemMutexRequestDebug, generic RTSemMutexRequestNoResumeDebug wrapper. */ diff --git a/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp b/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp index 59c064bcc..723f1aa33 100644 --- a/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp +++ b/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryDmiString-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTSystemQueryDmiString-generic.cpp $ */ /** @file * IPRT - RTSystemQueryDmiString, generic stub. */ diff --git a/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp b/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp index c2fe3c6ae..ec52c77d9 100644 --- a/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp +++ b/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryOSInfo-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTSystemQueryOSInfo-generic.cpp $ */ /** @file * IPRT - RTSystemQueryOSInfo, generic stub. */ diff --git a/src/VBox/Runtime/generic/RTThreadGetAffinity-stub-generic.cpp b/src/VBox/Runtime/generic/RTThreadGetAffinity-stub-generic.cpp index 053db160e..6bba54e63 100644 --- a/src/VBox/Runtime/generic/RTThreadGetAffinity-stub-generic.cpp +++ b/src/VBox/Runtime/generic/RTThreadGetAffinity-stub-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadGetAffinity-stub-generic.cpp 37154 2011-05-19 12:54:32Z vboxsync $ */ +/* $Id: RTThreadGetAffinity-stub-generic.cpp $ */ /** @file * IPRT - Generic RTThreadGetAffinity stub. */ diff --git a/src/VBox/Runtime/generic/RTThreadGetNativeState-generic.cpp b/src/VBox/Runtime/generic/RTThreadGetNativeState-generic.cpp index d776ac8d7..ab8229bd7 100644 --- a/src/VBox/Runtime/generic/RTThreadGetNativeState-generic.cpp +++ b/src/VBox/Runtime/generic/RTThreadGetNativeState-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadGetNativeState-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTThreadGetNativeState-generic.cpp $ */ /** @file * IPRT - RTThreadGetNativeState, generic stub implementation. */ diff --git a/src/VBox/Runtime/generic/RTThreadSetAffinity-stub-generic.cpp b/src/VBox/Runtime/generic/RTThreadSetAffinity-stub-generic.cpp index d442d28d9..6d4f6dd33 100644 --- a/src/VBox/Runtime/generic/RTThreadSetAffinity-stub-generic.cpp +++ b/src/VBox/Runtime/generic/RTThreadSetAffinity-stub-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadSetAffinity-stub-generic.cpp 37154 2011-05-19 12:54:32Z vboxsync $ */ +/* $Id: RTThreadSetAffinity-stub-generic.cpp $ */ /** @file * IPRT - Generic RTThreadSetAffinity stub. */ diff --git a/src/VBox/Runtime/generic/RTThreadSetAffinityToCpu-generic.cpp b/src/VBox/Runtime/generic/RTThreadSetAffinityToCpu-generic.cpp index 9d728891a..173ecf3e6 100644 --- a/src/VBox/Runtime/generic/RTThreadSetAffinityToCpu-generic.cpp +++ b/src/VBox/Runtime/generic/RTThreadSetAffinityToCpu-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadSetAffinityToCpu-generic.cpp 37154 2011-05-19 12:54:32Z vboxsync $ */ +/* $Id: RTThreadSetAffinityToCpu-generic.cpp $ */ /** @file * IPRT - Generic RTThreadSetAffinityToCpu implementation. */ diff --git a/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp index 6c55fdaf5..92826f0e5 100644 --- a/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimeLocalDeltaNano-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTTimeLocalDeltaNano-generic.cpp $ */ /** @file * IPRT - Time, generic RTTimeLocalDeltaNano. */ diff --git a/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp index be65e9b56..ae760602d 100644 --- a/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimeLocalExplode-generic.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: RTTimeLocalExplode-generic.cpp $ */ /** @file * IPRT - Time, generic RTTimeLocalExplode. */ diff --git a/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp b/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp index 7dbbe8d6c..81c28c537 100644 --- a/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimerCreate-generic.cpp 32504 2010-09-15 10:12:38Z vboxsync $ */ +/* $Id: RTTimerCreate-generic.cpp $ */ /** @file * IPRT - Timers, Generic RTTimerCreate() Implementation. */ diff --git a/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp b/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp index e7d1e3db8..6af2c79a5 100644 --- a/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimerLRCreate-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTTimerLRCreate-generic.cpp $ */ /** @file * IPRT - Low Resolution Timers, Generic RTTimerLRCreate() Implementation. */ diff --git a/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp b/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp index 1df1dbf3c..e88ab1ff8 100644 --- a/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp +++ b/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTUuidCreate-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTUuidCreate-generic.cpp $ */ /** @file * IPRT - UUID, Generic RTUuidCreate implementation. */ diff --git a/src/VBox/Runtime/generic/critsect-generic.cpp b/src/VBox/Runtime/generic/critsect-generic.cpp index e11e53d77..9d8399105 100644 --- a/src/VBox/Runtime/generic/critsect-generic.cpp +++ b/src/VBox/Runtime/generic/critsect-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: critsect-generic.cpp 37419 2011-06-11 20:25:37Z vboxsync $ */ +/* $Id: critsect-generic.cpp $ */ /** @file * IPRT - Critical Section, Generic. */ diff --git a/src/VBox/Runtime/generic/env-generic.cpp b/src/VBox/Runtime/generic/env-generic.cpp index 0c4911cde..f07abc997 100644 --- a/src/VBox/Runtime/generic/env-generic.cpp +++ b/src/VBox/Runtime/generic/env-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: env-generic.cpp 36576 2011-04-06 13:28:12Z vboxsync $ */ +/* $Id: env-generic.cpp $ */ /** @file * IPRT - Environment, Generic. */ diff --git a/src/VBox/Runtime/generic/errvars-generic.cpp b/src/VBox/Runtime/generic/errvars-generic.cpp index c57abd44c..b623bc8f9 100644 --- a/src/VBox/Runtime/generic/errvars-generic.cpp +++ b/src/VBox/Runtime/generic/errvars-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: errvars-generic.cpp 37233 2011-05-27 13:31:57Z vboxsync $ */ +/* $Id: errvars-generic.cpp $ */ /** @file * IPRT - Save and Restore Error Variables, generic stub implementation. */ diff --git a/src/VBox/Runtime/generic/fs-stubs-generic.cpp b/src/VBox/Runtime/generic/fs-stubs-generic.cpp index 193121b50..4d4403ad8 100644 --- a/src/VBox/Runtime/generic/fs-stubs-generic.cpp +++ b/src/VBox/Runtime/generic/fs-stubs-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: fs-stubs-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: fs-stubs-generic.cpp $ */ /** @file * IPRT - File System, Generic Stubs. */ diff --git a/src/VBox/Runtime/generic/mempool-generic.cpp b/src/VBox/Runtime/generic/mempool-generic.cpp index 6d485a6d6..8f53402a0 100644 --- a/src/VBox/Runtime/generic/mempool-generic.cpp +++ b/src/VBox/Runtime/generic/mempool-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: mempool-generic.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: mempool-generic.cpp $ */ /** @file * IPRT - Memory Allocation Pool. */ diff --git a/src/VBox/Runtime/generic/mppresent-generic.cpp b/src/VBox/Runtime/generic/mppresent-generic.cpp index 6ebfa08df..2d345f771 100644 --- a/src/VBox/Runtime/generic/mppresent-generic.cpp +++ b/src/VBox/Runtime/generic/mppresent-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: mppresent-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: mppresent-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Stubs for the RTMp*Present* API. */ diff --git a/src/VBox/Runtime/generic/pathhost-generic.cpp b/src/VBox/Runtime/generic/pathhost-generic.cpp index b35c7f9ae..fa615e1af 100644 --- a/src/VBox/Runtime/generic/pathhost-generic.cpp +++ b/src/VBox/Runtime/generic/pathhost-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: pathhost-generic.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: pathhost-generic.cpp $ */ /** @file * IPRT - Path Conversions, generic pass through. */ diff --git a/src/VBox/Runtime/generic/sched-generic.cpp b/src/VBox/Runtime/generic/sched-generic.cpp index 4905ad62c..f272b4d77 100644 --- a/src/VBox/Runtime/generic/sched-generic.cpp +++ b/src/VBox/Runtime/generic/sched-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-generic.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: sched-generic.cpp $ */ /** @file * IPRT - Scheduling, generic stubs. */ diff --git a/src/VBox/Runtime/generic/semfastmutex-generic.cpp b/src/VBox/Runtime/generic/semfastmutex-generic.cpp index 8c4ac1ee6..69de1410e 100644 --- a/src/VBox/Runtime/generic/semfastmutex-generic.cpp +++ b/src/VBox/Runtime/generic/semfastmutex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: semfastmutex-generic.cpp $ */ /** @file * IPRT - Fast Mutex, Generic. */ diff --git a/src/VBox/Runtime/generic/semrw-generic.cpp b/src/VBox/Runtime/generic/semrw-generic.cpp index 81348fb74..f565119e8 100644 --- a/src/VBox/Runtime/generic/semrw-generic.cpp +++ b/src/VBox/Runtime/generic/semrw-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semrw-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semrw-generic.cpp $ */ /** @file * IPRT - Read-Write Semaphore, Generic. * diff --git a/src/VBox/Runtime/generic/semrw-lockless-generic.cpp b/src/VBox/Runtime/generic/semrw-lockless-generic.cpp index 6d1d567f5..3da9d6fe1 100644 --- a/src/VBox/Runtime/generic/semrw-lockless-generic.cpp +++ b/src/VBox/Runtime/generic/semrw-lockless-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semrw-lockless-generic.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semrw-lockless-generic.cpp $ */ /** @file * IPRT Testcase - RTSemXRoads, generic implementation. */ diff --git a/src/VBox/Runtime/generic/semxroads-generic.cpp b/src/VBox/Runtime/generic/semxroads-generic.cpp index 73c84209f..55f9670a3 100644 --- a/src/VBox/Runtime/generic/semxroads-generic.cpp +++ b/src/VBox/Runtime/generic/semxroads-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semxroads-generic.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: semxroads-generic.cpp $ */ /** @file * IPRT Testcase - RTSemXRoads, generic implementation. */ diff --git a/src/VBox/Runtime/generic/spinlock-generic.cpp b/src/VBox/Runtime/generic/spinlock-generic.cpp index f4570ad7b..beac17b0d 100644 --- a/src/VBox/Runtime/generic/spinlock-generic.cpp +++ b/src/VBox/Runtime/generic/spinlock-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: spinlock-generic.cpp 34239 2010-11-22 13:58:16Z vboxsync $ */ +/* $Id: spinlock-generic.cpp $ */ /** @file * IPRT - Spinlock, generic implementation. */ diff --git a/src/VBox/Runtime/generic/strcache-stubs-generic.cpp b/src/VBox/Runtime/generic/strcache-stubs-generic.cpp index b45dc5182..0b358a461 100644 --- a/src/VBox/Runtime/generic/strcache-stubs-generic.cpp +++ b/src/VBox/Runtime/generic/strcache-stubs-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: strcache-stubs-generic.cpp 30320 2010-06-21 08:35:09Z vboxsync $ */ +/* $Id: strcache-stubs-generic.cpp $ */ /** @file * IPRT - String Cache, stub implementation. */ diff --git a/src/VBox/Runtime/generic/timer-generic.cpp b/src/VBox/Runtime/generic/timer-generic.cpp index 6c3595e19..fb3c5b501 100644 --- a/src/VBox/Runtime/generic/timer-generic.cpp +++ b/src/VBox/Runtime/generic/timer-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-generic.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: timer-generic.cpp $ */ /** @file * IPRT - Timers, Generic. */ diff --git a/src/VBox/Runtime/generic/timerlr-generic.cpp b/src/VBox/Runtime/generic/timerlr-generic.cpp index 890bd2fb7..6019356f7 100644 --- a/src/VBox/Runtime/generic/timerlr-generic.cpp +++ b/src/VBox/Runtime/generic/timerlr-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: timerlr-generic.cpp 34507 2010-11-30 13:14:14Z vboxsync $ */ +/* $Id: timerlr-generic.cpp $ */ /** @file * IPRT - Low Resolution Timers, Generic. * diff --git a/src/VBox/Runtime/generic/tls-generic.cpp b/src/VBox/Runtime/generic/tls-generic.cpp index 0c241d2e3..7729c77ac 100644 --- a/src/VBox/Runtime/generic/tls-generic.cpp +++ b/src/VBox/Runtime/generic/tls-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: tls-generic.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: tls-generic.cpp $ */ /** @file * IPRT - Thread Local Storage (TSL), Generic Implementation. */ diff --git a/src/VBox/Runtime/generic/utf16locale-generic.cpp b/src/VBox/Runtime/generic/utf16locale-generic.cpp index 22a1b5896..b75ec9d15 100644 --- a/src/VBox/Runtime/generic/utf16locale-generic.cpp +++ b/src/VBox/Runtime/generic/utf16locale-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: utf16locale-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: utf16locale-generic.cpp $ */ /** @file * IPRT - UTF-16 Locale Specific Manipulation, Generic. */ diff --git a/src/VBox/Runtime/generic/uuid-generic.cpp b/src/VBox/Runtime/generic/uuid-generic.cpp index 30c83c8d4..423892ce2 100644 --- a/src/VBox/Runtime/generic/uuid-generic.cpp +++ b/src/VBox/Runtime/generic/uuid-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: uuid-generic.cpp 32995 2010-10-08 08:11:27Z vboxsync $ */ +/* $Id: uuid-generic.cpp $ */ /** @file * IPRT - UUID, Generic. */ diff --git a/src/VBox/Runtime/include/internal/alignmentchecks.h b/src/VBox/Runtime/include/internal/alignmentchecks.h index 5ecda8bf9..96e96e88e 100644 --- a/src/VBox/Runtime/include/internal/alignmentchecks.h +++ b/src/VBox/Runtime/include/internal/alignmentchecks.h @@ -1,4 +1,4 @@ -/* $Id: alignmentchecks.h 29250 2010-05-09 17:53:58Z vboxsync $ */ +/* $Id: alignmentchecks.h $ */ /** @file * IPRT - Internal header for hacking alignment checks on x86 and AMD64. */ diff --git a/src/VBox/Runtime/include/internal/assert.h b/src/VBox/Runtime/include/internal/assert.h index a45568b5e..ef6334a65 100644 --- a/src/VBox/Runtime/include/internal/assert.h +++ b/src/VBox/Runtime/include/internal/assert.h @@ -1,4 +1,4 @@ -/* $Id: assert.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: assert.h $ */ /** @file * IPRT - Internal RTAssert header */ diff --git a/src/VBox/Runtime/include/internal/dbgmod.h b/src/VBox/Runtime/include/internal/dbgmod.h index ae9c3ca74..900052444 100644 --- a/src/VBox/Runtime/include/internal/dbgmod.h +++ b/src/VBox/Runtime/include/internal/dbgmod.h @@ -1,4 +1,4 @@ -/* $Id: dbgmod.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: dbgmod.h $ */ /** @file * IPRT - Internal Header for RTDbgMod and the associated interpreters. */ diff --git a/src/VBox/Runtime/include/internal/dir.h b/src/VBox/Runtime/include/internal/dir.h index 57a5d1f14..987fe32a0 100644 --- a/src/VBox/Runtime/include/internal/dir.h +++ b/src/VBox/Runtime/include/internal/dir.h @@ -1,4 +1,4 @@ -/* $Id: dir.h 28918 2010-04-29 18:30:09Z vboxsync $ */ +/* $Id: dir.h $ */ /** @file * IPRT - Internal Header for RTDir. */ diff --git a/src/VBox/Runtime/include/internal/dvm.h b/src/VBox/Runtime/include/internal/dvm.h index 6b9cdd612..88263d16e 100644 --- a/src/VBox/Runtime/include/internal/dvm.h +++ b/src/VBox/Runtime/include/internal/dvm.h @@ -1,4 +1,4 @@ -/* $Id: dvm.h 37270 2011-05-30 21:25:42Z vboxsync $ */ +/* $Id: dvm.h $ */ /** @file * IPRT - Disk Volume Management Internals. */ diff --git a/src/VBox/Runtime/include/internal/file.h b/src/VBox/Runtime/include/internal/file.h index 2541d7a73..c8efe1b76 100644 --- a/src/VBox/Runtime/include/internal/file.h +++ b/src/VBox/Runtime/include/internal/file.h @@ -1,4 +1,4 @@ -/* $Id: file.h 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: file.h $ */ /** @file * IPRT - Internal RTFile header. */ diff --git a/src/VBox/Runtime/include/internal/fileaio.h b/src/VBox/Runtime/include/internal/fileaio.h index 6ff4ced99..81172acc6 100644 --- a/src/VBox/Runtime/include/internal/fileaio.h +++ b/src/VBox/Runtime/include/internal/fileaio.h @@ -1,4 +1,4 @@ -/* $Id: fileaio.h 29451 2010-05-13 15:38:48Z vboxsync $ */ +/* $Id: fileaio.h $ */ /** @file * IPRT - Internal RTFileAio header. */ diff --git a/src/VBox/Runtime/include/internal/fs.h b/src/VBox/Runtime/include/internal/fs.h index 44fe99fd7..f5ba04293 100644 --- a/src/VBox/Runtime/include/internal/fs.h +++ b/src/VBox/Runtime/include/internal/fs.h @@ -1,4 +1,4 @@ -/* $Id: fs.h 34002 2010-11-11 17:16:37Z vboxsync $ */ +/* $Id: fs.h $ */ /** @file * IPRT - Internal RTFs header. */ diff --git a/src/VBox/Runtime/include/internal/initterm.h b/src/VBox/Runtime/include/internal/initterm.h index dbd40f042..044729039 100644 --- a/src/VBox/Runtime/include/internal/initterm.h +++ b/src/VBox/Runtime/include/internal/initterm.h @@ -1,4 +1,4 @@ -/* $Id: initterm.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: initterm.h $ */ /** @file * IPRT - Initialization & Termination. */ diff --git a/src/VBox/Runtime/include/internal/iprt.h b/src/VBox/Runtime/include/internal/iprt.h index 98a8a9452..74646cc21 100644 --- a/src/VBox/Runtime/include/internal/iprt.h +++ b/src/VBox/Runtime/include/internal/iprt.h @@ -1,4 +1,4 @@ -/* $Id: iprt.h 35662 2011-01-20 18:11:08Z vboxsync $ */ +/* $Id: iprt.h $ */ /** @file * IPRT - Internal header for miscellaneous global defs and types. */ diff --git a/src/VBox/Runtime/include/internal/ldr.h b/src/VBox/Runtime/include/internal/ldr.h index 1274f60a1..cf51bee07 100644 --- a/src/VBox/Runtime/include/internal/ldr.h +++ b/src/VBox/Runtime/include/internal/ldr.h @@ -1,4 +1,4 @@ -/* $Id: ldr.h 35183 2010-12-16 13:59:44Z vboxsync $ */ +/* $Id: ldr.h $ */ /** @file * IPRT - Loader Internals. */ diff --git a/src/VBox/Runtime/include/internal/ldrELF.h b/src/VBox/Runtime/include/internal/ldrELF.h index f6d2d4009..c52cd816a 100644 --- a/src/VBox/Runtime/include/internal/ldrELF.h +++ b/src/VBox/Runtime/include/internal/ldrELF.h @@ -1,4 +1,4 @@ -/* $Id: ldrELF.h 37560 2011-06-20 14:48:32Z vboxsync $ */ +/* $Id: ldrELF.h $ */ /** @file * ELF types, current architecture. */ diff --git a/src/VBox/Runtime/include/internal/ldrELF32.h b/src/VBox/Runtime/include/internal/ldrELF32.h index 8ad9b5594..0873357ec 100644 --- a/src/VBox/Runtime/include/internal/ldrELF32.h +++ b/src/VBox/Runtime/include/internal/ldrELF32.h @@ -1,4 +1,4 @@ -/* $Id: ldrELF32.h 37560 2011-06-20 14:48:32Z vboxsync $ */ +/* $Id: ldrELF32.h $ */ /** @file * IPRT - ELF 32-bit header. */ diff --git a/src/VBox/Runtime/include/internal/ldrELF64.h b/src/VBox/Runtime/include/internal/ldrELF64.h index 6500731b6..8a60fd9c5 100644 --- a/src/VBox/Runtime/include/internal/ldrELF64.h +++ b/src/VBox/Runtime/include/internal/ldrELF64.h @@ -1,4 +1,4 @@ -/* $Id: ldrELF64.h 37560 2011-06-20 14:48:32Z vboxsync $ */ +/* $Id: ldrELF64.h $ */ /** @file * IPRT - ELF 64-bit header. */ diff --git a/src/VBox/Runtime/include/internal/ldrMZ.h b/src/VBox/Runtime/include/internal/ldrMZ.h index c598970ff..c6c15c163 100644 --- a/src/VBox/Runtime/include/internal/ldrMZ.h +++ b/src/VBox/Runtime/include/internal/ldrMZ.h @@ -1,4 +1,4 @@ -/* $Id: ldrMZ.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ldrMZ.h $ */ /** @file * IPRT, MZ header. */ diff --git a/src/VBox/Runtime/include/internal/ldrMach-O.h b/src/VBox/Runtime/include/internal/ldrMach-O.h index 71b70e585..c75ea6c3f 100644 --- a/src/VBox/Runtime/include/internal/ldrMach-O.h +++ b/src/VBox/Runtime/include/internal/ldrMach-O.h @@ -1,4 +1,4 @@ -/* $Id: ldrMach-O.h 37560 2011-06-20 14:48:32Z vboxsync $ */ +/* $Id: ldrMach-O.h $ */ /** @file * IPRT - Mach-O Structures and Constants. */ diff --git a/src/VBox/Runtime/include/internal/ldrPE.h b/src/VBox/Runtime/include/internal/ldrPE.h index 6e008f257..6b973a2cf 100644 --- a/src/VBox/Runtime/include/internal/ldrPE.h +++ b/src/VBox/Runtime/include/internal/ldrPE.h @@ -1,4 +1,4 @@ -/* $Id: ldrPE.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ldrPE.h $ */ /** @file * IPRT - Windows NT PE Structures and Constants. */ diff --git a/src/VBox/Runtime/include/internal/lockvalidator.h b/src/VBox/Runtime/include/internal/lockvalidator.h index 0cc7796f2..793e3ffff 100644 --- a/src/VBox/Runtime/include/internal/lockvalidator.h +++ b/src/VBox/Runtime/include/internal/lockvalidator.h @@ -1,4 +1,4 @@ -/* $Id: lockvalidator.h 35499 2011-01-12 08:33:45Z vboxsync $ */ +/* $Id: lockvalidator.h $ */ /** @file * IPRT - Internal RTLockValidator header. */ diff --git a/src/VBox/Runtime/include/internal/magics.h b/src/VBox/Runtime/include/internal/magics.h index 1afbb9d17..e6b7990b1 100644 --- a/src/VBox/Runtime/include/internal/magics.h +++ b/src/VBox/Runtime/include/internal/magics.h @@ -1,4 +1,4 @@ -/* $Id: magics.h 37396 2011-06-09 15:48:59Z vboxsync $ */ +/* $Id: magics.h $ */ /** @file * IPRT - Internal header defining The Magic Numbers. */ diff --git a/src/VBox/Runtime/include/internal/mem.h b/src/VBox/Runtime/include/internal/mem.h index aa9b3c6d4..0db465133 100644 --- a/src/VBox/Runtime/include/internal/mem.h +++ b/src/VBox/Runtime/include/internal/mem.h @@ -1,4 +1,4 @@ -/* $Id: mem.h 33676 2010-11-02 09:48:24Z vboxsync $ */ +/* $Id: mem.h $ */ /** @file * IPRT - Memory Management. */ diff --git a/src/VBox/Runtime/include/internal/memobj.h b/src/VBox/Runtime/include/internal/memobj.h index a6c0ae997..14fef8068 100644 --- a/src/VBox/Runtime/include/internal/memobj.h +++ b/src/VBox/Runtime/include/internal/memobj.h @@ -1,4 +1,4 @@ -/* $Id: memobj.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: memobj.h $ */ /** @file * IPRT - Ring-0 Memory Objects. */ diff --git a/src/VBox/Runtime/include/internal/path.h b/src/VBox/Runtime/include/internal/path.h index 4c2d6de1b..a1cdb1eed 100644 --- a/src/VBox/Runtime/include/internal/path.h +++ b/src/VBox/Runtime/include/internal/path.h @@ -1,4 +1,4 @@ -/* $Id: path.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: path.h $ */ /** @file * IPRT - RTPath Internal header. */ diff --git a/src/VBox/Runtime/include/internal/pipe.h b/src/VBox/Runtime/include/internal/pipe.h index ec40772c8..e5566d4f3 100644 --- a/src/VBox/Runtime/include/internal/pipe.h +++ b/src/VBox/Runtime/include/internal/pipe.h @@ -1,4 +1,4 @@ -/* $Id: pipe.h 32131 2010-08-31 11:55:27Z vboxsync $ */ +/* $Id: pipe.h $ */ /** @file * IPRT - Internal RTPipe header. */ diff --git a/src/VBox/Runtime/include/internal/process.h b/src/VBox/Runtime/include/internal/process.h index 915d243af..cf2c07999 100644 --- a/src/VBox/Runtime/include/internal/process.h +++ b/src/VBox/Runtime/include/internal/process.h @@ -1,4 +1,4 @@ -/* $Id: process.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: process.h $ */ /** @file * IPRT - Internal RTProc header. */ diff --git a/src/VBox/Runtime/include/internal/rand.h b/src/VBox/Runtime/include/internal/rand.h index f0d0c8ddf..a68de6582 100644 --- a/src/VBox/Runtime/include/internal/rand.h +++ b/src/VBox/Runtime/include/internal/rand.h @@ -1,4 +1,4 @@ -/* $Id: rand.h 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: rand.h $ */ /** @file * IPRT - Internal RTRand header */ diff --git a/src/VBox/Runtime/include/internal/sched.h b/src/VBox/Runtime/include/internal/sched.h index 6cb62bcc4..bab1a0639 100644 --- a/src/VBox/Runtime/include/internal/sched.h +++ b/src/VBox/Runtime/include/internal/sched.h @@ -1,4 +1,4 @@ -/* $Id: sched.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: sched.h $ */ /** @file * IPRT - Internal RTSched header. */ diff --git a/src/VBox/Runtime/include/internal/socket.h b/src/VBox/Runtime/include/internal/socket.h index ec6699780..3a7882a88 100644 --- a/src/VBox/Runtime/include/internal/socket.h +++ b/src/VBox/Runtime/include/internal/socket.h @@ -1,4 +1,4 @@ -/* $Id: socket.h 32131 2010-08-31 11:55:27Z vboxsync $ */ +/* $Id: socket.h $ */ /** @file * IPRT - Internal Header for RTSocket. */ diff --git a/src/VBox/Runtime/include/internal/strhash.h b/src/VBox/Runtime/include/internal/strhash.h index b26096489..85fd2a867 100644 --- a/src/VBox/Runtime/include/internal/strhash.h +++ b/src/VBox/Runtime/include/internal/strhash.h @@ -1,4 +1,4 @@ -/* $Id: strhash.h 36597 2011-04-06 19:46:15Z vboxsync $ */ +/* $Id: strhash.h $ */ /** @file * IPRT - Internal header containing inline string hashing functions. */ diff --git a/src/VBox/Runtime/include/internal/strict.h b/src/VBox/Runtime/include/internal/strict.h index 7dcd11ba1..eed9a33c2 100644 --- a/src/VBox/Runtime/include/internal/strict.h +++ b/src/VBox/Runtime/include/internal/strict.h @@ -1,4 +1,4 @@ -/* $Id: strict.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: strict.h $ */ /** @file * IPRT - Internal Header Defining Strictness Indicators. */ diff --git a/src/VBox/Runtime/include/internal/string.h b/src/VBox/Runtime/include/internal/string.h index eb57f927d..34d840eea 100644 --- a/src/VBox/Runtime/include/internal/string.h +++ b/src/VBox/Runtime/include/internal/string.h @@ -1,4 +1,4 @@ -/* $Id: string.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: string.h $ */ /** @file * IPRT - Internal RTStr header. */ diff --git a/src/VBox/Runtime/include/internal/thread.h b/src/VBox/Runtime/include/internal/thread.h index 37b3e4719..3dd0583d6 100644 --- a/src/VBox/Runtime/include/internal/thread.h +++ b/src/VBox/Runtime/include/internal/thread.h @@ -1,4 +1,4 @@ -/* $Id: thread.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: thread.h $ */ /** @file * IPRT - Internal RTThread header. */ diff --git a/src/VBox/Runtime/include/internal/time.h b/src/VBox/Runtime/include/internal/time.h index 6d6c4c0b8..1a02c9c97 100644 --- a/src/VBox/Runtime/include/internal/time.h +++ b/src/VBox/Runtime/include/internal/time.h @@ -1,4 +1,4 @@ -/* $Id: time.h 36549 2011-04-05 09:28:24Z vboxsync $ */ +/* $Id: time.h $ */ /** @file * IPRT - Internal RTTime header */ diff --git a/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp b/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp index 279b40726..fcb3bc21c 100644 --- a/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp +++ b/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp @@ -1,4 +1,4 @@ -/* $Id: NtProcessStartup-stub.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: NtProcessStartup-stub.cpp $ */ /** @file * IPRT - NtProcessStartup stub to make the link happy. */ diff --git a/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp b/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp index f3a8b58fb..0f74823bd 100644 --- a/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp +++ b/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromNtStatus.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTErrConvertFromNtStatus.cpp $ */ /** @file * IPRT - Convert NT status codes to iprt status codes. */ diff --git a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp index a87a064f0..edbfb3315 100644 --- a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp +++ b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromOS2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTErrConvertFromOS2.cpp $ */ /** @file * IPRT - Convert OS/2 error codes to iprt status codes. */ diff --git a/src/VBox/Runtime/r0drv/alloc-r0drv.cpp b/src/VBox/Runtime/r0drv/alloc-r0drv.cpp index fe626d1fa..8444838fa 100644 --- a/src/VBox/Runtime/r0drv/alloc-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/alloc-r0drv.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv.cpp 37672 2011-06-28 19:48:17Z vboxsync $ */ +/* $Id: alloc-r0drv.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver. */ diff --git a/src/VBox/Runtime/r0drv/alloc-r0drv.h b/src/VBox/Runtime/r0drv/alloc-r0drv.h index 024c64320..0199864df 100644 --- a/src/VBox/Runtime/r0drv/alloc-r0drv.h +++ b/src/VBox/Runtime/r0drv/alloc-r0drv.h @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: alloc-r0drv.h $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver. */ diff --git a/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp index ef63e351f..9a65df825 100644 --- a/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-r0drv-darwin.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-r0drv-darwin.cpp $ */ /** @file * IPRT - Log To Debugger, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp index 0946d3b4c..57da5a760 100644 --- a/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdOut-r0drv-darwin.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteStdOut-r0drv-darwin.cpp $ */ /** @file * IPRT - Log To StdOut, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp index be2d63145..fa65b96b2 100644 --- a/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-darwin.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: alloc-r0drv-darwin.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp index 3c9e8c0c5..15aebedbf 100644 --- a/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-darwin.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: assert-r0drv-darwin.cpp $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp index d3ba0123f..f38281c94 100644 --- a/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-darwin.cpp 37575 2011-06-21 12:40:01Z vboxsync $ */ +/* $Id: initterm-r0drv-darwin.cpp $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp index bbf3712d4..f3f02baf1 100644 --- a/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: mach_kernel-r0drv-darwin.cpp 37597 2011-06-22 20:54:05Z vboxsync $ */ +/* $Id: mach_kernel-r0drv-darwin.cpp $ */ /** @file * IPRT - mach_kernel symbol resolving hack, R0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp index 9fad7d833..2354373e1 100644 --- a/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-darwin.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: memobj-r0drv-darwin.cpp $ */ /** @file * IPRT - Ring-0 Memory Objects, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp index 4dfbf5e7d..a85bee083 100644 --- a/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: memuserkernel-r0drv-darwin.cpp 36540 2011-04-04 15:58:26Z vboxsync $ */ +/* $Id: memuserkernel-r0drv-darwin.cpp $ */ /** @file * IPRT - User & Kernel Memory, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp index 173aa397b..f5a731661 100644 --- a/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-darwin.cpp 37575 2011-06-21 12:40:01Z vboxsync $ */ +/* $Id: mp-r0drv-darwin.cpp $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp index 215a009a2..355420304 100644 --- a/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-darwin.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: process-r0drv-darwin.cpp $ */ /** @file * IPRT - Process, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp index 1d4848b73..a2098bfd2 100644 --- a/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-darwin.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semevent-r0drv-darwin.cpp $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp index 53ea3f258..a77d41d0d 100644 --- a/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-darwin.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-darwin.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/semfastmutex-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semfastmutex-r0drv-darwin.cpp index d286362b3..407381ec6 100644 --- a/src/VBox/Runtime/r0drv/darwin/semfastmutex-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/semfastmutex-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-darwin.cpp 29255 2010-05-09 18:11:24Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-darwin.cpp $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp index 009be81d1..2b01e760a 100644 --- a/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: semmutex-r0drv-darwin.cpp 36192 2011-03-07 16:33:55Z vboxsync $ */ +/* $Id: semmutex-r0drv-darwin.cpp $ */ /** @file * IPRT - Mutex Semaphores, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp index 2f6986582..df46ce0d7 100644 --- a/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-darwin.cpp 29255 2010-05-09 18:11:24Z vboxsync $ */ +/* $Id: spinlock-r0drv-darwin.cpp $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h b/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h index a2bd2b751..254b1468f 100644 --- a/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h +++ b/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-darwin-kernel.h 37575 2011-06-21 12:40:01Z vboxsync $ */ +/* $Id: the-darwin-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the Darwing kernel. */ diff --git a/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp index 920065af5..c71476355 100644 --- a/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-darwin.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: thread-r0drv-darwin.cpp $ */ /** @file * IPRT - Threads, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp index 48a10d4ca..64cabf79c 100644 --- a/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-darwin.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: thread2-r0drv-darwin.cpp $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp index 00effbd19..23b28a100 100644 --- a/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: threadpreempt-r0drv-darwin.cpp 37575 2011-06-21 12:40:01Z vboxsync $ */ +/* $Id: threadpreempt-r0drv-darwin.cpp $ */ /** @file * IPRT - Thread Preemption, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp index 487099d07..913fa711e 100644 --- a/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-darwin.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: time-r0drv-darwin.cpp $ */ /** @file * IPRT - Time, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c index 3ebf473a0..349ad7bb2 100644 --- a/src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-freebsd.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: alloc-r0drv-freebsd.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c index ed8c8f246..e0e307e28 100644 --- a/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-freebsd.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: assert-r0drv-freebsd.c $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/initterm-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/initterm-r0drv-freebsd.c index 60c50be8f..0992c4733 100644 --- a/src/VBox/Runtime/r0drv/freebsd/initterm-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/initterm-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-freebsd.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: initterm-r0drv-freebsd.c $ */ /** @file * IPRT - Initialization & Termination, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c index 1f253f7c1..493877ccd 100644 --- a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-freebsd.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: memobj-r0drv-freebsd.c $ */ /** @file * IPRT - Ring-0 Memory Objects, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c index 6bd7c45b9..ce24fb5d3 100644 --- a/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: memuserkernel-r0drv-freebsd.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memuserkernel-r0drv-freebsd.c $ */ /** @file * IPRT - User & Kernel Memory, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c index c71c865ad..87e82ff2c 100644 --- a/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-freebsd.c 37774 2011-07-04 21:19:27Z vboxsync $ */ +/* $Id: mp-r0drv-freebsd.c $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/process-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/process-r0drv-freebsd.c index ac08c3e94..96af287aa 100644 --- a/src/VBox/Runtime/r0drv/freebsd/process-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/process-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-freebsd.c 18972 2009-04-16 23:43:08Z vboxsync $ */ +/* $Id: process-r0drv-freebsd.c $ */ /** @file * IPRT - Process Management, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c index 435c255ce..b2a9a5c91 100644 --- a/src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-freebsd.c 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semevent-r0drv-freebsd.c $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c index f8ed7800f..253a5b01d 100644 --- a/src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-freebsd.c 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-freebsd.c $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c index 7058b7fd0..2f42336f0 100644 --- a/src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-freebsd.c 25722 2010-01-11 14:22:03Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-freebsd.c $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c index 370f29a75..b20b9603f 100644 --- a/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: semmutex-r0drv-freebsd.c 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semmutex-r0drv-freebsd.c $ */ /** @file * IPRT - Mutex Semaphores, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h b/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h index 49d3d5393..89e12087b 100644 --- a/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h +++ b/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h @@ -1,4 +1,4 @@ -/* $Id: sleepqueue-r0drv-freebsd.h 37305 2011-06-02 12:32:20Z vboxsync $ */ +/* $Id: sleepqueue-r0drv-freebsd.h $ */ /** @file * IPRT - FreeBSD Ring-0 Driver Helpers for Abstracting Sleep Queues, */ diff --git a/src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c index f208aea90..97a988e6a 100644 --- a/src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-freebsd.c 29500 2010-05-14 21:43:06Z vboxsync $ */ +/* $Id: spinlock-r0drv-freebsd.c $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h b/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h index 4c9fb9261..718b6741a 100644 --- a/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h +++ b/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-freebsd-kernel.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: the-freebsd-kernel.h $ */ /** @file * IPRT - Ring-0 Driver, The FreeBSD Kernel Headers. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c index f58d9dd7d..38474aab3 100644 --- a/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-freebsd.c 35960 2011-02-14 14:52:34Z vboxsync $ */ +/* $Id: thread-r0drv-freebsd.c $ */ /** @file * IPRT - Threads (Part 1), Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c index be9191727..4f356c2df 100644 --- a/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-freebsd.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: thread2-r0drv-freebsd.c $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c index 3d1ff7e78..7f356a10c 100644 --- a/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-freebsd.c 18972 2009-04-16 23:43:08Z vboxsync $ */ +/* $Id: time-r0drv-freebsd.c $ */ /** @file * IPRT - Time, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c index d8981b9d5..43f693f48 100644 --- a/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-freebsd.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: timer-r0drv-freebsd.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp index 100e12e29..925842eb4 100644 --- a/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpIsCpuWorkPending-r0drv-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpIsCpuWorkPending-r0drv-generic.cpp $ */ /** @file * IPRT - RTMpIsCpuWorkPending, Generic. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp index 44114a12a..a9844aceb 100644 --- a/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpOn-r0drv-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpOn-r0drv-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Generic Stubs. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp index e253d3ecf..01835679e 100644 --- a/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpPokeCpu-r0drv-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpPokeCpu-r0drv-generic.cpp $ */ /** @file * IPRT - RTMpPokeCpu, Generic Implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp index afc70a258..0d943b3b2 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptDisable-r0drv-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTThreadPreemptDisable-r0drv-generic.cpp $ */ /** @file * IPRT - RTThreadPreemptDisable, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp index d496cacfb..0e00439d0 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptIsEnabled-r0drv-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTThreadPreemptIsEnabled-r0drv-generic.cpp $ */ /** @file * IPRT - RTThreadPreemptIsEnabled, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp index 88e91de25..1fc9b894f 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptIsPending-r0drv-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTThreadPreemptIsPending-r0drv-generic.cpp $ */ /** @file * IPRT - RTThreadPreemptIsPending, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp index 2288b4d8c..fe94d0226 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp $ */ /** @file * IPRT - RTThreadPreemptIsPendingTrusty, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp index d327ea6ad..9fa8461e1 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptRestore-r0drv-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTThreadPreemptRestore-r0drv-generic.cpp $ */ /** @file * IPRT - RTThreadPreemptRestore, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp index f4336e557..5310c13b3 100644 --- a/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-generic.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: mpnotification-r0drv-generic.cpp $ */ /** @file * IPRT - Multiprocessor Notifications, Ring-0 Driver, Generic Stubs. */ diff --git a/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c b/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c index 8bb2f9739..69f29f24a 100644 --- a/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c +++ b/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c @@ -1,4 +1,4 @@ -/* $Id: semspinmutex-r0drv-generic.c 33393 2010-10-24 16:17:00Z vboxsync $ */ +/* $Id: semspinmutex-r0drv-generic.c $ */ /** @file * IPRT - Spinning Mutex Semaphores, Ring-0 Driver, Generic. */ diff --git a/src/VBox/Runtime/r0drv/initterm-r0drv.cpp b/src/VBox/Runtime/r0drv/initterm-r0drv.cpp index 15ce42f88..099291423 100644 --- a/src/VBox/Runtime/r0drv/initterm-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/initterm-r0drv.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv.cpp 36233 2011-03-09 17:05:12Z vboxsync $ */ +/* $Id: initterm-r0drv.cpp $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, Common. */ diff --git a/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c index 0bb7b0181..144d637ea 100644 --- a/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-r0drv-linux.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-r0drv-linux.c $ */ /** @file * IPRT - Log To Debugger, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c index 2300cff8c..fcf81fb15 100644 --- a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-linux.c 36962 2011-05-04 17:43:50Z vboxsync $ */ +/* $Id: alloc-r0drv-linux.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c index 0d5351d14..2a7fef9f3 100644 --- a/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-linux.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: assert-r0drv-linux.c $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c index d76a42d4c..8acee0195 100644 --- a/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-linux.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: initterm-r0drv-linux.c $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c index 2db3df78e..242229801 100644 --- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Revision: 36555 $ */ +/* $Revision: 70988 $ */ /** @file * IPRT - Ring-0 Memory Objects, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c index b9c470049..4517fea98 100644 --- a/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: memuserkernel-r0drv-linux.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memuserkernel-r0drv-linux.c $ */ /** @file * IPRT - User & Kernel Memory, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c index 58a8a9e08..32ab12345 100644 --- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-linux.c 37672 2011-06-28 19:48:17Z vboxsync $ */ +/* $Id: mp-r0drv-linux.c $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c index 49ff9a0ad..b2a6ab9cb 100644 --- a/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-linux.c 38232 2011-07-28 18:32:16Z vboxsync $ */ +/* $Id: mpnotification-r0drv-linux.c $ */ /** @file * IPRT - Multiprocessor Event Notifications, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c index 4c838081a..e69aeace2 100644 --- a/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-linux.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: process-r0drv-linux.c $ */ /** @file * IPRT - Process, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c index de9b2bd83..2506adc87 100644 --- a/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-linux.c 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semevent-r0drv-linux.c $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c index 23a248544..74cc39002 100644 --- a/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-linux.c 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-linux.c $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c index e23fdeb0d..58e253986 100644 --- a/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-linux.c 36979 2011-05-06 11:55:42Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-linux.c $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c index f8c6c8928..de257acc4 100644 --- a/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: semmutex-r0drv-linux.c 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semmutex-r0drv-linux.c $ */ /** @file * IPRT - Mutex Semaphores, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c index e68b5b0c8..e3be185f0 100644 --- a/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-linux.c 29250 2010-05-09 17:53:58Z vboxsync $ */ +/* $Id: spinlock-r0drv-linux.c $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/string.h b/src/VBox/Runtime/r0drv/linux/string.h index b581ae53a..f2f319411 100644 --- a/src/VBox/Runtime/r0drv/linux/string.h +++ b/src/VBox/Runtime/r0drv/linux/string.h @@ -1,4 +1,4 @@ -/* $Id: string.h 33012 2010-10-08 15:46:40Z vboxsync $ */ +/* $Id: string.h $ */ /** @file * IPRT - wrapper for the linux kernel asm/string.h. */ diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h index a993b5b21..a51583e02 100644 --- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-linux-kernel.h 36233 2011-03-09 17:05:12Z vboxsync $ */ +/* $Id: the-linux-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the Linux kernel. */ diff --git a/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c index 7ada61e3d..44edbc2ac 100644 --- a/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-linux.c 33358 2010-10-22 14:06:43Z vboxsync $ */ +/* $Id: thread-r0drv-linux.c $ */ /** @file * IPRT - Threads, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c index 1ac95ea52..d8a723ace 100644 --- a/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-linux.c 36947 2011-05-03 19:49:12Z vboxsync $ */ +/* $Id: thread2-r0drv-linux.c $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c index 28312e17c..c0fb357f2 100644 --- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-linux.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: time-r0drv-linux.c $ */ /** @file * IPRT - Time, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c index 1d7042838..efad6b0a8 100644 --- a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-linux.c 33603 2010-10-29 12:42:24Z vboxsync $ */ +/* $Id: timer-r0drv-linux.c $ */ /** @file * IPRT - Timers, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h b/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h index 75c781f9e..ba253c680 100644 --- a/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h +++ b/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h @@ -1,4 +1,4 @@ -/* $Id: waitqueue-r0drv-linux.h 33630 2010-10-31 16:00:19Z vboxsync $ */ +/* $Id: waitqueue-r0drv-linux.h $ */ /** @file * IPRT - Linux Ring-0 Driver Helpers for Abstracting Wait Queues, */ diff --git a/src/VBox/Runtime/r0drv/memobj-r0drv.cpp b/src/VBox/Runtime/r0drv/memobj-r0drv.cpp index 8ec15a27c..5f23c96bc 100644 --- a/src/VBox/Runtime/r0drv/memobj-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/memobj-r0drv.cpp @@ -1,4 +1,4 @@ -/* $Revision: 36555 $ */ +/* $Revision: 70988 $ */ /** @file * IPRT - Ring-0 Memory Objects, Common Code. */ diff --git a/src/VBox/Runtime/r0drv/mp-r0drv.h b/src/VBox/Runtime/r0drv/mp-r0drv.h index 81c4b742a..807ef642e 100644 --- a/src/VBox/Runtime/r0drv/mp-r0drv.h +++ b/src/VBox/Runtime/r0drv/mp-r0drv.h @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: mp-r0drv.h $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Internal Header. */ diff --git a/src/VBox/Runtime/r0drv/mpnotification-r0drv.c b/src/VBox/Runtime/r0drv/mpnotification-r0drv.c index d9c7a2422..15090fa5e 100644 --- a/src/VBox/Runtime/r0drv/mpnotification-r0drv.c +++ b/src/VBox/Runtime/r0drv/mpnotification-r0drv.c @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv.c 37211 2011-05-25 11:37:52Z vboxsync $ */ +/* $Id: mpnotification-r0drv.c $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Event Notifications. */ diff --git a/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp index 11c5143b3..95d6a112b 100644 --- a/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-r0drv-nt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-r0drv-nt.cpp $ */ /** @file * IPRT - Log To Debugger, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp index 2927d6771..fead7554d 100644 --- a/src/VBox/Runtime/r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimerGetSystemGranularity-r0drv-nt.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: RTTimerGetSystemGranularity-r0drv-nt.cpp $ */ /** @file * IPRT - RTTimerGetSystemGranularity, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp index 9f8e9c16b..10b15115e 100644 --- a/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-nt.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: alloc-r0drv-nt.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp index 065ca9d93..637286632 100644 --- a/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-nt.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: assert-r0drv-nt.cpp $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp index 2c5137d65..7f0d21531 100644 --- a/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-nt.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: initterm-r0drv-nt.cpp $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h b/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h index 2d4c85aeb..e04230faf 100644 --- a/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h +++ b/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h @@ -1,4 +1,4 @@ -/* $Id: internal-r0drv-nt.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: internal-r0drv-nt.h $ */ /** @file * IPRT - Internal Header for the NT Ring-0 Driver Code. */ diff --git a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp index 0ffa3b2ba..f13aab6c6 100644 --- a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-nt.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: memobj-r0drv-nt.cpp $ */ /** @file * IPRT - Ring-0 Memory Objects, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp index 02f411a8e..9abfd83f5 100644 --- a/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: memuserkernel-r0drv-nt.cpp 29705 2010-05-20 15:58:39Z vboxsync $ */ +/* $Id: memuserkernel-r0drv-nt.cpp $ */ /** @file * IPRT - User & Kernel Memory, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp index da1dcae96..c606861ff 100644 --- a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-nt.cpp 37379 2011-06-08 14:21:34Z vboxsync $ */ +/* $Id: mp-r0drv-nt.cpp $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp index 629e1857a..e334c3536 100644 --- a/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-nt.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: mpnotification-r0drv-nt.cpp $ */ /** @file * IPRT - Multiprocessor Event Notifications, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp index 30e5be609..934887659 100644 --- a/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-nt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: process-r0drv-nt.cpp $ */ /** @file * IPRT - Process, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp index fb64eeb1b..8cda329eb 100644 --- a/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-nt.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semevent-r0drv-nt.cpp $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp index 8da0899b7..50830f754 100644 --- a/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-nt.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-nt.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp index 62d7bc0b2..bd3efc87c 100644 --- a/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-nt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-nt.cpp $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp index f3b1cc21b..71e02e35c 100644 --- a/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: semmutex-r0drv-nt.cpp 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semmutex-r0drv-nt.cpp $ */ /** @file * IPRT - Mutex Semaphores, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp index 8f9fdcf65..1dc11be23 100644 --- a/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-nt.cpp 32463 2010-09-14 07:30:11Z vboxsync $ */ +/* $Id: spinlock-r0drv-nt.cpp $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h b/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h index ada6354e3..3da03794c 100644 --- a/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h +++ b/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-nt-kernel.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: the-nt-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the NT kernel. */ diff --git a/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp index 36a6ea25a..f120040fa 100644 --- a/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-nt.cpp 30359 2010-06-22 09:21:33Z vboxsync $ */ +/* $Id: thread-r0drv-nt.cpp $ */ /** @file * IPRT - Threads, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp index e9361862c..855a8549e 100644 --- a/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-nt.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: thread2-r0drv-nt.cpp $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp index 9545caa23..965f2cbb9 100644 --- a/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-nt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: time-r0drv-nt.cpp $ */ /** @file * IPRT - Time, Ring-0 Driver, Nt. */ diff --git a/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp index 44aa52f46..4f7c82db4 100644 --- a/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-nt.cpp 33155 2010-10-15 12:07:44Z vboxsync $ */ +/* $Id: timer-r0drv-nt.cpp $ */ /** @file * IPRT - Timers, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm b/src/VBox/Runtime/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm index dedefeb81..17e370520 100644 --- a/src/VBox/Runtime/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm +++ b/src/VBox/Runtime/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm @@ -1,4 +1,4 @@ -; $Id: RTR0AssertPanicSystem-r0drv-os2.asm 13306 2008-10-15 21:17:04Z vboxsync $ +; $Id: RTR0AssertPanicSystem-r0drv-os2.asm $ ;; @file ; IPRT - RTR0AssertPanicSystem, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/os2/RTR0Os2DHQueryDOSVar.asm b/src/VBox/Runtime/r0drv/os2/RTR0Os2DHQueryDOSVar.asm index 2ad429f45..e0c94b7f2 100644 --- a/src/VBox/Runtime/r0drv/os2/RTR0Os2DHQueryDOSVar.asm +++ b/src/VBox/Runtime/r0drv/os2/RTR0Os2DHQueryDOSVar.asm @@ -1,4 +1,4 @@ -; $Id: RTR0Os2DHQueryDOSVar.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: RTR0Os2DHQueryDOSVar.asm $ ;; @file ; IPRT - DevHelp_GetDOSVar, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm b/src/VBox/Runtime/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm index 82e221123..e1b44d42b 100644 --- a/src/VBox/Runtime/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm +++ b/src/VBox/Runtime/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm @@ -1,4 +1,4 @@ -; $Id: RTR0Os2DHVMGlobalToProcess.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: RTR0Os2DHVMGlobalToProcess.asm $ ;; @file ; IPRT - DevHelp_VMGlobalToProcess, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp index c29724032..90280501e 100644 --- a/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-os2.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: alloc-r0drv-os2.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp index 6eacf9d9a..69805935d 100644 --- a/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-os2.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: assert-r0drv-os2.cpp $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/assertA-r0drv-os2.asm b/src/VBox/Runtime/r0drv/os2/assertA-r0drv-os2.asm index 4da5eea74..0e0808aab 100644 --- a/src/VBox/Runtime/r0drv/os2/assertA-r0drv-os2.asm +++ b/src/VBox/Runtime/r0drv/os2/assertA-r0drv-os2.asm @@ -1,4 +1,4 @@ -; $Id: assertA-r0drv-os2.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: assertA-r0drv-os2.asm $ ;; @file ; IPRT - DevHelp_GetDOSVar, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/os2/initterm-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/initterm-r0drv-os2.cpp index 6cd80245e..3c86ae3ca 100644 --- a/src/VBox/Runtime/r0drv/os2/initterm-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/initterm-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-os2.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: initterm-r0drv-os2.cpp $ */ /** @file * IPRT - Initialization & Termination, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp index 21dd2fe19..db6791d9f 100644 --- a/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-os2.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: memobj-r0drv-os2.cpp $ */ /** @file * IPRT - Ring-0 Memory Objects, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp index fd742f134..888b5409a 100644 --- a/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: memuserkernel-r0drv-os2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: memuserkernel-r0drv-os2.cpp $ */ /** @file * IPRT - User & Kernel Memory, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/process-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/process-r0drv-os2.cpp index eac1e4624..a05d0617e 100644 --- a/src/VBox/Runtime/r0drv/os2/process-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/process-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: process-r0drv-os2.cpp $ */ /** @file * IPRT - Process Management, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/semevent-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/semevent-r0drv-os2.cpp index 5da10059b..74aaa2d26 100644 --- a/src/VBox/Runtime/r0drv/os2/semevent-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/semevent-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-os2.cpp 33269 2010-10-20 15:42:28Z vboxsync $ */ +/* $Id: semevent-r0drv-os2.cpp $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/semeventmulti-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/semeventmulti-r0drv-os2.cpp index 0ef07282e..fb05a5007 100644 --- a/src/VBox/Runtime/r0drv/os2/semeventmulti-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/semeventmulti-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-os2.cpp 33155 2010-10-15 12:07:44Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-os2.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/semfastmutex-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/semfastmutex-r0drv-os2.cpp index caf6ddc7a..d2edff5e8 100644 --- a/src/VBox/Runtime/r0drv/os2/semfastmutex-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/semfastmutex-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-os2.cpp 25722 2010-01-11 14:22:03Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-os2.cpp $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/spinlock-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/spinlock-r0drv-os2.cpp index d2b7b5fc2..e239f766a 100644 --- a/src/VBox/Runtime/r0drv/os2/spinlock-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/spinlock-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: spinlock-r0drv-os2.cpp $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/the-os2-kernel.h b/src/VBox/Runtime/r0drv/os2/the-os2-kernel.h index f08bd11bf..2057b50bb 100644 --- a/src/VBox/Runtime/r0drv/os2/the-os2-kernel.h +++ b/src/VBox/Runtime/r0drv/os2/the-os2-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-os2-kernel.h 20374 2009-06-08 00:43:21Z vboxsync $ */ +/* $Id: the-os2-kernel.h $ */ /** @file * IPRT - Ring-0 Driver, The OS/2 Kernel Headers. */ diff --git a/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp index bc68b7af0..64c5308a2 100644 --- a/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-os2.cpp 33393 2010-10-24 16:17:00Z vboxsync $ */ +/* $Id: thread-r0drv-os2.cpp $ */ /** @file * IPRT - Threads (Part 1), Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp index 2e209860c..f0aef3c34 100644 --- a/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-os2.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: thread2-r0drv-os2.cpp $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Generic Stubs. */ diff --git a/src/VBox/Runtime/r0drv/os2/time-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/time-r0drv-os2.cpp index ab4bf1b9a..778ee2b0a 100644 --- a/src/VBox/Runtime/r0drv/os2/time-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/time-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-r0drv-os2.cpp $ */ /** @file * IPRT - Time, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/timer-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/timer-r0drv-os2.cpp index e2d023352..ba68fd127 100644 --- a/src/VBox/Runtime/r0drv/os2/timer-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/timer-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-os2.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: timer-r0drv-os2.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/timerA-r0drv-os2.asm b/src/VBox/Runtime/r0drv/os2/timerA-r0drv-os2.asm index 788bcc907..474f85767 100644 --- a/src/VBox/Runtime/r0drv/os2/timerA-r0drv-os2.asm +++ b/src/VBox/Runtime/r0drv/os2/timerA-r0drv-os2.asm @@ -1,4 +1,4 @@ -; $Id: timerA-r0drv-os2.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: timerA-r0drv-os2.asm $ ;; @file ; IPRT - DevHelp_VMGlobalToProcess, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/power-r0drv.h b/src/VBox/Runtime/r0drv/power-r0drv.h index 7dacbc91e..a10c4c1e3 100644 --- a/src/VBox/Runtime/r0drv/power-r0drv.h +++ b/src/VBox/Runtime/r0drv/power-r0drv.h @@ -1,4 +1,4 @@ -/* $Id: power-r0drv.h 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: power-r0drv.h $ */ /** @file * IPRT - Power Management, Ring-0 Driver, Internal Header. */ diff --git a/src/VBox/Runtime/r0drv/powernotification-r0drv.c b/src/VBox/Runtime/r0drv/powernotification-r0drv.c index 4ef59ef46..f35bf4950 100644 --- a/src/VBox/Runtime/r0drv/powernotification-r0drv.c +++ b/src/VBox/Runtime/r0drv/powernotification-r0drv.c @@ -1,4 +1,4 @@ -/* $Id: powernotification-r0drv.c 37211 2011-05-25 11:37:52Z vboxsync $ */ +/* $Id: powernotification-r0drv.c $ */ /** @file * IPRT - Power Management, Ring-0 Driver, Event Notifications. */ diff --git a/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c index 86b07c181..5aa03da81 100644 --- a/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-r0drv-solaris.c 29281 2010-05-09 23:40:43Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-r0drv-solaris.c $ */ /** @file * IPRT - Log To Debugger, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c index 7c1876f9e..ce6fe0dda 100644 --- a/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-solaris.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: assert-r0drv-solaris.c $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c index fec13e31b..f9e2856a9 100644 --- a/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-solaris.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: initterm-r0drv-solaris.c $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c index 88d50e4d1..11b24bd7a 100644 --- a/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: memuserkernel-r0drv-solaris.c 29284 2010-05-10 00:22:16Z vboxsync $ */ +/* $Id: memuserkernel-r0drv-solaris.c $ */ /** @file * IPRT - User & Kernel Memory, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c index 9431c915a..d1b48f999 100644 --- a/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-solaris.c 36392 2011-03-24 11:20:37Z vboxsync $ */ +/* $Id: semevent-r0drv-solaris.c $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c index 011369fae..b922bc658 100644 --- a/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-solaris.c 36392 2011-03-24 11:20:37Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-solaris.c $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h b/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h index d06b26bf0..45fd29aac 100644 --- a/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h +++ b/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h @@ -1,4 +1,4 @@ -/* $Id: semeventwait-r0drv-solaris.h 36392 2011-03-24 11:20:37Z vboxsync $ */ +/* $Id: semeventwait-r0drv-solaris.h $ */ /** @file * IPRT - Solaris Ring-0 Driver Helpers for Event Semaphore Waits. */ diff --git a/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c index ef0f5b602..baeaec2f5 100644 --- a/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-solaris.c 29284 2010-05-10 00:22:16Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-solaris.c $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c index 65802fe1a..8394c4d3c 100644 --- a/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: semmutex-r0drv-solaris.c 36190 2011-03-07 16:28:50Z vboxsync $ */ +/* $Id: semmutex-r0drv-solaris.c $ */ /** @file * IPRT - Mutex Semaphores, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c index 1b37be6b3..a66e63b3c 100644 --- a/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-solaris.c 29281 2010-05-09 23:40:43Z vboxsync $ */ +/* $Id: spinlock-r0drv-solaris.c $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h b/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h index aab14e8fe..7dd607f03 100644 --- a/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h +++ b/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-solaris-kernel.h 33149 2010-10-15 11:26:24Z vboxsync $ */ +/* $Id: the-solaris-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the Solaris kernel. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/RTMpPokeCpu-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/RTMpPokeCpu-r0drv-solaris.c index 2dad122b2..524236571 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/RTMpPokeCpu-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/RTMpPokeCpu-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: RTMpPokeCpu-r0drv-solaris.c 29300 2010-05-10 12:30:43Z vboxsync $ */ +/* $Id: RTMpPokeCpu-r0drv-solaris.c $ */ /** @file * IPRT - RTMpPokeCpu, Solaris Implementation. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c index 2ab6aba0b..def919d23 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-solaris.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: alloc-r0drv-solaris.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c b/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c index 69278261d..8e232342e 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c @@ -198,7 +198,7 @@ vbi_get_ctf_member_offset(ctf_file_t *ctfp, const char *structname, const char * if (ctf_member_info(ctfp, typeident, membername, &memberinfo) != CTF_ERR) { *offset = (memberinfo.ctm_offset >> 3); - cmn_err(CE_NOTE, "%s::%s at %d\n", structname, membername, *offset); + cmn_err(CE_CONT, "!%s::%s at %d\n", structname, membername, *offset); return (0); } else diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c index 4ea9e6796..64a720320 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-solaris.c 37281 2011-05-31 21:32:44Z vboxsync $ */ +/* $Id: memobj-r0drv-solaris.c $ */ /** @file * IPRT - Ring-0 Memory Objects, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c index a281c0011..cd2546654 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-solaris.c 37062 2011-05-13 10:18:29Z vboxsync $ */ +/* $Id: mp-r0drv-solaris.c $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c index 65d31989c..89ed337d1 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-solaris.c 37274 2011-05-31 11:47:51Z vboxsync $ */ +/* $Id: mpnotification-r0drv-solaris.c $ */ /** @file * IPRT - Multiprocessor Event Notifications, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c index 3e3b61179..dbfb639c8 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-solaris.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: process-r0drv-solaris.c $ */ /** @file * IPRT - Process Management, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c index ab31c4b70..9fbf4eff5 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-solaris.c 29281 2010-05-09 23:40:43Z vboxsync $ */ +/* $Id: thread-r0drv-solaris.c $ */ /** @file * IPRT - Threads, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c index 90958120d..b1e64ca0d 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-solaris.c 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: thread2-r0drv-solaris.c $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c index e0b6f903c..d8db73fd1 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-solaris.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: time-r0drv-solaris.c $ */ /** @file * IPRT - Time, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c index da5a41622..714dfe953 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-solaris.c 37275 2011-05-31 11:48:14Z vboxsync $ */ +/* $Id: timer-r0drv-solaris.c $ */ /** @file * IPRT - Timer, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r3/alloc-ef-cpp.cpp b/src/VBox/Runtime/r3/alloc-ef-cpp.cpp index 566e564a7..43ddf34c4 100644 --- a/src/VBox/Runtime/r3/alloc-ef-cpp.cpp +++ b/src/VBox/Runtime/r3/alloc-ef-cpp.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-ef-cpp.cpp 31252 2010-07-30 15:38:52Z vboxsync $ */ +/* $Id: alloc-ef-cpp.cpp $ */ /** @file * IPRT - Memory Allocation, C++ electric fence. */ diff --git a/src/VBox/Runtime/r3/alloc-ef.cpp b/src/VBox/Runtime/r3/alloc-ef.cpp index e3d3b892e..1c45c35d6 100644 --- a/src/VBox/Runtime/r3/alloc-ef.cpp +++ b/src/VBox/Runtime/r3/alloc-ef.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-ef.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: alloc-ef.cpp $ */ /** @file * IPRT - Memory Allocation, electric fence. */ diff --git a/src/VBox/Runtime/r3/alloc-ef.h b/src/VBox/Runtime/r3/alloc-ef.h index d90dc6328..d7f630a01 100644 --- a/src/VBox/Runtime/r3/alloc-ef.h +++ b/src/VBox/Runtime/r3/alloc-ef.h @@ -1,4 +1,4 @@ -/* $Id: alloc-ef.h 34291 2010-11-23 16:06:11Z vboxsync $ */ +/* $Id: alloc-ef.h $ */ /** @file * IPRT - Memory Allocation, electric fence. */ diff --git a/src/VBox/Runtime/r3/alloc.cpp b/src/VBox/Runtime/r3/alloc.cpp index e790feabc..fce5a50cd 100644 --- a/src/VBox/Runtime/r3/alloc.cpp +++ b/src/VBox/Runtime/r3/alloc.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc.cpp 36597 2011-04-06 19:46:15Z vboxsync $ */ +/* $Id: alloc.cpp $ */ /** @file * IPRT - Memory Allocation. */ diff --git a/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp b/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp index dd9d11133..2b033b2fe 100644 --- a/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathUserDocuments-darwin.cpp 36611 2011-04-07 10:35:29Z vboxsync $ */ +/* $Id: RTPathUserDocuments-darwin.cpp $ */ /** @file * IPRT - RTPathUserDocuments, darwin ring-3. */ diff --git a/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp b/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp index bea8c0aec..064bdcbf1 100644 --- a/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryDmiString-darwin.cpp 29560 2010-05-17 15:08:09Z vboxsync $ */ +/* $Id: RTSystemQueryDmiString-darwin.cpp $ */ /** @file * IPRT - RTSystemQueryDmiString, darwin ring-3. */ diff --git a/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp b/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp index 614095074..0e4666bb6 100644 --- a/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: filelock-darwin.cpp 37597 2011-06-22 20:54:05Z vboxsync $ */ +/* $Id: filelock-darwin.cpp $ */ /** @file * IPRT - File Locking, POSIX. */ diff --git a/src/VBox/Runtime/r3/darwin/mp-darwin.cpp b/src/VBox/Runtime/r3/darwin/mp-darwin.cpp index ec1c158e1..a03ca41e5 100644 --- a/src/VBox/Runtime/r3/darwin/mp-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/mp-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-darwin.cpp 36232 2011-03-09 16:41:09Z vboxsync $ */ +/* $Id: mp-darwin.cpp $ */ /** @file * IPRT - Multiprocessor, Darwin. */ diff --git a/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp b/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp index 33452bfcb..0f575fbae 100644 --- a/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: pathhost-darwin.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: pathhost-darwin.cpp $ */ /** @file * IPRT - Path Conversions, Darwin. * diff --git a/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp b/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp index e9bb2f278..103e70b44 100644 --- a/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-darwin.cpp 28929 2010-04-30 11:26:46Z vboxsync $ */ +/* $Id: rtProcInitExePath-darwin.cpp $ */ /** @file * IPRT - rtProcInitName, Darwin. */ diff --git a/src/VBox/Runtime/r3/darwin/sched-darwin.cpp b/src/VBox/Runtime/r3/darwin/sched-darwin.cpp index 1a7cc421c..083d457ff 100644 --- a/src/VBox/Runtime/r3/darwin/sched-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/sched-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-darwin.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: sched-darwin.cpp $ */ /** @file * IPRT - Scheduling, Darwin. */ diff --git a/src/VBox/Runtime/r3/darwin/time-darwin.cpp b/src/VBox/Runtime/r3/darwin/time-darwin.cpp index 762c9a0d1..38878c634 100644 --- a/src/VBox/Runtime/r3/darwin/time-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/time-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: time-darwin.cpp 34921 2010-12-09 19:46:36Z vboxsync $ */ +/* $Id: time-darwin.cpp $ */ /** @file * IPRT - Time, Darwin. */ diff --git a/src/VBox/Runtime/r3/dir.cpp b/src/VBox/Runtime/r3/dir.cpp index a901dbb57..c3e687881 100644 --- a/src/VBox/Runtime/r3/dir.cpp +++ b/src/VBox/Runtime/r3/dir.cpp @@ -1,4 +1,4 @@ -/* $Id: dir.cpp 34015 2010-11-12 00:15:05Z vboxsync $ */ +/* $Id: dir.cpp $ */ /** @file * IPRT - Directory Manipulation, Part 1. */ diff --git a/src/VBox/Runtime/r3/dir2.cpp b/src/VBox/Runtime/r3/dir2.cpp index 13369dae4..cad6d8763 100644 --- a/src/VBox/Runtime/r3/dir2.cpp +++ b/src/VBox/Runtime/r3/dir2.cpp @@ -1,4 +1,4 @@ -/* $Id: dir2.cpp 34015 2010-11-12 00:15:05Z vboxsync $ */ +/* $Id: dir2.cpp $ */ /** @file * IPRT - Directory Manipulation, Part 2. */ diff --git a/src/VBox/Runtime/r3/fileio.cpp b/src/VBox/Runtime/r3/fileio.cpp index dd2b5356b..5b4e88731 100644 --- a/src/VBox/Runtime/r3/fileio.cpp +++ b/src/VBox/Runtime/r3/fileio.cpp @@ -1,4 +1,4 @@ -/* $Id: fileio.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: fileio.cpp $ */ /** @file * IPRT - File I/O. */ diff --git a/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp index db07d481f..1d47c7597 100644 --- a/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp +++ b/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: fileaio-freebsd.cpp 38332 2011-08-05 15:32:09Z vboxsync $ */ +/* $Id: fileaio-freebsd.cpp $ */ /** @file * IPRT - File async I/O, native implementation for the FreeBSD host platform. */ diff --git a/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp index b6481a30f..8296025b0 100644 --- a/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp +++ b/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-freebsd.cpp 36232 2011-03-09 16:41:09Z vboxsync $ */ +/* $Id: mp-freebsd.cpp $ */ /** @file * IPRT - Multiprocessor, FreeBSD. */ diff --git a/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp index a1f4e6669..55112775d 100644 --- a/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp +++ b/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-freebsd.cpp 28929 2010-04-30 11:26:46Z vboxsync $ */ +/* $Id: rtProcInitExePath-freebsd.cpp $ */ /** @file * IPRT - rtProcInitName, FreeBSD. */ diff --git a/src/VBox/Runtime/r3/fs.cpp b/src/VBox/Runtime/r3/fs.cpp index 5637ecd89..9dc46b599 100644 --- a/src/VBox/Runtime/r3/fs.cpp +++ b/src/VBox/Runtime/r3/fs.cpp @@ -1,4 +1,4 @@ -/* $Id: fs.cpp 34015 2010-11-12 00:15:05Z vboxsync $ */ +/* $Id: fs.cpp $ */ /** @file * IPRT - File System. */ diff --git a/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp b/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp index 1efc9b236..1c0e46037 100644 --- a/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp +++ b/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semspinmutex-r3-generic.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: semspinmutex-r3-generic.cpp $ */ /** @file * IPRT - Spinning Mutex Semaphores, Ring-3, Generic. */ diff --git a/src/VBox/Runtime/r3/init.cpp b/src/VBox/Runtime/r3/init.cpp index b37c2501b..138fcf7c9 100644 --- a/src/VBox/Runtime/r3/init.cpp +++ b/src/VBox/Runtime/r3/init.cpp @@ -1,4 +1,4 @@ -/* $Id: init.cpp 36549 2011-04-05 09:28:24Z vboxsync $ */ +/* $Id: init.cpp $ */ /** @file * IPRT - Init Ring-3. */ diff --git a/src/VBox/Runtime/r3/isofs.cpp b/src/VBox/Runtime/r3/isofs.cpp index f783cc674..eca523d26 100644 --- a/src/VBox/Runtime/r3/isofs.cpp +++ b/src/VBox/Runtime/r3/isofs.cpp @@ -1,4 +1,4 @@ -/* $Id: isofs.cpp 34406 2010-11-26 16:45:34Z vboxsync $ */ +/* $Id: isofs.cpp $ */ /** @file * IPRT - ISO 9660 file system handling. */ diff --git a/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp b/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp index 065856c2e..5582cef91 100644 --- a/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp +++ b/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: RTProcIsRunningByName-linux.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTProcIsRunningByName-linux.cpp $ */ /** @file * IPRT - RTProcIsRunningByName, Linux implementation. */ diff --git a/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp b/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp index 91cfbcd66..056a6ade3 100644 --- a/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp +++ b/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryDmiString-linux.cpp 29642 2010-05-18 14:44:56Z vboxsync $ */ +/* $Id: RTSystemQueryDmiString-linux.cpp $ */ /** @file * IPRT - RTSystemQueryDmiString, linux ring-3. */ diff --git a/src/VBox/Runtime/r3/linux/RTThreadGetNativeState-linux.cpp b/src/VBox/Runtime/r3/linux/RTThreadGetNativeState-linux.cpp index ff65d2575..2a7c13964 100644 --- a/src/VBox/Runtime/r3/linux/RTThreadGetNativeState-linux.cpp +++ b/src/VBox/Runtime/r3/linux/RTThreadGetNativeState-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadGetNativeState-linux.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTThreadGetNativeState-linux.cpp $ */ /** @file * IPRT - RTThreadGetNativeState, linux implementation. */ diff --git a/src/VBox/Runtime/r3/linux/fileaio-linux.cpp b/src/VBox/Runtime/r3/linux/fileaio-linux.cpp index 4a268633e..19c1830a4 100644 --- a/src/VBox/Runtime/r3/linux/fileaio-linux.cpp +++ b/src/VBox/Runtime/r3/linux/fileaio-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: fileaio-linux.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: fileaio-linux.cpp $ */ /** @file * IPRT - File async I/O, native implementation for the Linux host platform. */ diff --git a/src/VBox/Runtime/r3/linux/mp-linux.cpp b/src/VBox/Runtime/r3/linux/mp-linux.cpp index fa7001a7c..54304abad 100644 --- a/src/VBox/Runtime/r3/linux/mp-linux.cpp +++ b/src/VBox/Runtime/r3/linux/mp-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-linux.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: mp-linux.cpp $ */ /** @file * IPRT - Multiprocessor, Linux. */ diff --git a/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp b/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp index 50a12f24f..3ab0860b0 100644 --- a/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp +++ b/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-linux.cpp 28929 2010-04-30 11:26:46Z vboxsync $ */ +/* $Id: rtProcInitExePath-linux.cpp $ */ /** @file * IPRT - rtProcInitName, Linux. */ diff --git a/src/VBox/Runtime/r3/linux/sched-linux.cpp b/src/VBox/Runtime/r3/linux/sched-linux.cpp index 824f79759..782e3041d 100644 --- a/src/VBox/Runtime/r3/linux/sched-linux.cpp +++ b/src/VBox/Runtime/r3/linux/sched-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-linux.cpp 36912 2011-05-02 14:23:01Z vboxsync $ */ +/* $Id: sched-linux.cpp $ */ /** @file * IPRT - Scheduling, POSIX. */ diff --git a/src/VBox/Runtime/r3/linux/semevent-linux.cpp b/src/VBox/Runtime/r3/linux/semevent-linux.cpp index a35020fc3..9982d3e83 100644 --- a/src/VBox/Runtime/r3/linux/semevent-linux.cpp +++ b/src/VBox/Runtime/r3/linux/semevent-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-linux.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: semevent-linux.cpp $ */ /** @file * IPRT - Event Semaphore, Linux (2.6.x+). */ diff --git a/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp b/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp index ac74d4780..1afcddc96 100644 --- a/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp +++ b/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-linux.cpp 37211 2011-05-25 11:37:52Z vboxsync $ */ +/* $Id: semeventmulti-linux.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphore, Linux (2.6.x+). */ diff --git a/src/VBox/Runtime/r3/linux/semmutex-linux.cpp b/src/VBox/Runtime/r3/linux/semmutex-linux.cpp index 16a28270f..1be76f4e7 100644 --- a/src/VBox/Runtime/r3/linux/semmutex-linux.cpp +++ b/src/VBox/Runtime/r3/linux/semmutex-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: semmutex-linux.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: semmutex-linux.cpp $ */ /** @file * IPRT - Mutex Semaphore, Linux (2.6.x+). */ diff --git a/src/VBox/Runtime/r3/linux/sysfs.cpp b/src/VBox/Runtime/r3/linux/sysfs.cpp index 49bba0e5a..aa1060ac3 100644 --- a/src/VBox/Runtime/r3/linux/sysfs.cpp +++ b/src/VBox/Runtime/r3/linux/sysfs.cpp @@ -1,4 +1,4 @@ -/* $Id: sysfs.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: sysfs.cpp $ */ /** @file * IPRT - Linux sysfs access. */ diff --git a/src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp b/src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp index 1cbefafc6..8e69d6653 100644 --- a/src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp +++ b/src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-affinity-linux.cpp 37170 2011-05-20 17:15:07Z vboxsync $ */ +/* $Id: thread-affinity-linux.cpp $ */ /** @file * IPRT - Thread Affinity, Linux ring-3 implementation. */ diff --git a/src/VBox/Runtime/r3/linux/time-linux.cpp b/src/VBox/Runtime/r3/linux/time-linux.cpp index b9be9e532..a9de927e7 100644 --- a/src/VBox/Runtime/r3/linux/time-linux.cpp +++ b/src/VBox/Runtime/r3/linux/time-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: time-linux.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: time-linux.cpp $ */ /** @file * IPRT - Time, POSIX. */ diff --git a/src/VBox/Runtime/r3/os2/filelock-os2.cpp b/src/VBox/Runtime/r3/os2/filelock-os2.cpp index c6317f43b..734bb1807 100644 --- a/src/VBox/Runtime/r3/os2/filelock-os2.cpp +++ b/src/VBox/Runtime/r3/os2/filelock-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: filelock-os2.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: filelock-os2.cpp $ */ /** @file * IPRT - File Locking, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/mp-os2.cpp b/src/VBox/Runtime/r3/os2/mp-os2.cpp index ea4b14cc9..00260ca01 100644 --- a/src/VBox/Runtime/r3/os2/mp-os2.cpp +++ b/src/VBox/Runtime/r3/os2/mp-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-os2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: mp-os2.cpp $ */ /** @file * IPRT - Multiprocessor, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/pipe-os2.cpp b/src/VBox/Runtime/r3/os2/pipe-os2.cpp index b84b3226d..b3fbecf1d 100644 --- a/src/VBox/Runtime/r3/os2/pipe-os2.cpp +++ b/src/VBox/Runtime/r3/os2/pipe-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: pipe-os2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: pipe-os2.cpp $ */ /** @file * IPRT - Anonymous Pipes, OS/2 Implementation. */ diff --git a/src/VBox/Runtime/r3/os2/poll-os2.cpp b/src/VBox/Runtime/r3/os2/poll-os2.cpp index 988cad5d8..890cdc8cd 100644 --- a/src/VBox/Runtime/r3/os2/poll-os2.cpp +++ b/src/VBox/Runtime/r3/os2/poll-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: poll-os2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: poll-os2.cpp $ */ /** @file * IPRT - Polling I/O Handles, OS/2 Implementation. */ diff --git a/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp b/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp index a991619e7..26ee5b49f 100644 --- a/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp +++ b/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-os2.cpp 28929 2010-04-30 11:26:46Z vboxsync $ */ +/* $Id: rtProcInitExePath-os2.cpp $ */ /** @file * IPRT - rtProcInitName, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/sched-os2.cpp b/src/VBox/Runtime/r3/os2/sched-os2.cpp index b38b5bb42..02a4bbd3a 100644 --- a/src/VBox/Runtime/r3/os2/sched-os2.cpp +++ b/src/VBox/Runtime/r3/os2/sched-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-os2.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: sched-os2.cpp $ */ /** @file * IPRT - Scheduling, OS/2 */ diff --git a/src/VBox/Runtime/r3/os2/sems-os2.cpp b/src/VBox/Runtime/r3/os2/sems-os2.cpp index e41511b99..09042b79e 100644 --- a/src/VBox/Runtime/r3/os2/sems-os2.cpp +++ b/src/VBox/Runtime/r3/os2/sems-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: sems-os2.cpp 33393 2010-10-24 16:17:00Z vboxsync $ */ +/* $Id: sems-os2.cpp $ */ /** @file * IPRT - Semaphores, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/thread-os2.cpp b/src/VBox/Runtime/r3/os2/thread-os2.cpp index 8b85f4324..77347cb0a 100644 --- a/src/VBox/Runtime/r3/os2/thread-os2.cpp +++ b/src/VBox/Runtime/r3/os2/thread-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-os2.cpp 37154 2011-05-19 12:54:32Z vboxsync $ */ +/* $Id: thread-os2.cpp $ */ /** @file * IPRT - Threads, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/time-os2.cpp b/src/VBox/Runtime/r3/os2/time-os2.cpp index d39e1fc24..13fcad048 100644 --- a/src/VBox/Runtime/r3/os2/time-os2.cpp +++ b/src/VBox/Runtime/r3/os2/time-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: time-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-os2.cpp $ */ /** @file * IPRT - Time, POSIX. */ diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp index 28661291e..591f0556d 100644 --- a/src/VBox/Runtime/r3/path.cpp +++ b/src/VBox/Runtime/r3/path.cpp @@ -1,4 +1,4 @@ -/* $Id: path.cpp 35225 2010-12-17 13:54:46Z vboxsync $ */ +/* $Id: path.cpp $ */ /** @file * IPRT - Path Manipulation. */ diff --git a/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp b/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp index 8d8b92f7d..1536d2cbc 100644 --- a/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileQueryFsSizes-posix.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: RTFileQueryFsSizes-posix.cpp $ */ /** @file * IPRT - File I/O, RTFileFsQuerySizes, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp b/src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp index 31bc53409..aa12323b4 100644 --- a/src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTHandleGetStandard-posix.cpp 33973 2010-11-11 11:10:10Z vboxsync $ */ +/* $Id: RTHandleGetStandard-posix.cpp $ */ /** @file * IPRT - RTHandleGetStandard, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp b/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp index 7ea5a44d0..87055143d 100644 --- a/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMemProtect-posix.cpp 33269 2010-10-20 15:42:28Z vboxsync $ */ +/* $Id: RTMemProtect-posix.cpp $ */ /** @file * IPRT - Memory Allocation, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp b/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp index 740e437b5..4e2e116dd 100644 --- a/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetCount-posix.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTMpGetCount-posix.cpp $ */ /** @file * IPRT - RTMpGetCount, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/RTPathUserDocuments-posix.cpp b/src/VBox/Runtime/r3/posix/RTPathUserDocuments-posix.cpp index d048e3f99..a90a5b887 100644 --- a/src/VBox/Runtime/r3/posix/RTPathUserDocuments-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTPathUserDocuments-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathUserDocuments-posix.cpp 36611 2011-04-07 10:35:29Z vboxsync $ */ +/* $Id: RTPathUserDocuments-posix.cpp $ */ /** @file * IPRT - RTPathUserDocuments, posix ring-3. */ diff --git a/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp b/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp index 8111dd987..d39fd6c6b 100644 --- a/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTPathUserHome-posix.cpp 33602 2010-10-29 12:39:54Z vboxsync $ */ +/* $Id: RTPathUserHome-posix.cpp $ */ /** @file * IPRT - Path Manipulation, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp b/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp index 8e17a976a..b37d921e0 100644 --- a/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryOSInfo-posix.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTSystemQueryOSInfo-posix.cpp $ */ /** @file * IPRT - RTSystemQueryOSInfo, POSIX implementation. */ diff --git a/src/VBox/Runtime/r3/posix/RTSystemQueryTotalRam-posix.cpp b/src/VBox/Runtime/r3/posix/RTSystemQueryTotalRam-posix.cpp index a52065855..a75d2d54d 100644 --- a/src/VBox/Runtime/r3/posix/RTSystemQueryTotalRam-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTSystemQueryTotalRam-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryTotalRam-posix.cpp 33503 2010-10-27 13:12:57Z vboxsync $ */ +/* $Id: RTSystemQueryTotalRam-posix.cpp $ */ /** @file * IPRT - RTSystemQueryTotalRam, windows ring-3. */ diff --git a/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp b/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp index 43f628271..96915feac 100644 --- a/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimeNow-posix.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTTimeNow-posix.cpp $ */ /** @file * IPRT - RTTimeNow, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp b/src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp index 32a09a975..3bebb9ac4 100644 --- a/src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimeSet-posix.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTTimeSet-posix.cpp $ */ /** @file * IPRT - RTTimeSet, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/dir-posix.cpp b/src/VBox/Runtime/r3/posix/dir-posix.cpp index 17c67c025..feb83b4b2 100644 --- a/src/VBox/Runtime/r3/posix/dir-posix.cpp +++ b/src/VBox/Runtime/r3/posix/dir-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: dir-posix.cpp 36167 2011-03-04 12:33:39Z vboxsync $ */ +/* $Id: dir-posix.cpp $ */ /** @file * IPRT - Directory manipulation, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/env-posix.cpp b/src/VBox/Runtime/r3/posix/env-posix.cpp index fe30150b5..3134d7644 100644 --- a/src/VBox/Runtime/r3/posix/env-posix.cpp +++ b/src/VBox/Runtime/r3/posix/env-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: env-posix.cpp 33464 2010-10-26 12:27:50Z vboxsync $ */ +/* $Id: env-posix.cpp $ */ /** @file * IPRT - Environment, Posix. */ diff --git a/src/VBox/Runtime/r3/posix/errvars-posix.cpp b/src/VBox/Runtime/r3/posix/errvars-posix.cpp index aa2a2b273..02caf676b 100644 --- a/src/VBox/Runtime/r3/posix/errvars-posix.cpp +++ b/src/VBox/Runtime/r3/posix/errvars-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: errvars-posix.cpp 37233 2011-05-27 13:31:57Z vboxsync $ */ +/* $Id: errvars-posix.cpp $ */ /** @file * IPRT - Save and Restore Error Variables, POSIX Ring-3. */ diff --git a/src/VBox/Runtime/r3/posix/fileaio-posix.cpp b/src/VBox/Runtime/r3/posix/fileaio-posix.cpp index d4302f1a5..a40009294 100644 --- a/src/VBox/Runtime/r3/posix/fileaio-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fileaio-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: fileaio-posix.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: fileaio-posix.cpp $ */ /** @file * IPRT - File async I/O, native implementation for POSIX compliant host platforms. */ diff --git a/src/VBox/Runtime/r3/posix/fileio-posix.cpp b/src/VBox/Runtime/r3/posix/fileio-posix.cpp index 83ac8ab06..b350dd38f 100644 --- a/src/VBox/Runtime/r3/posix/fileio-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fileio-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: fileio-posix.cpp 37679 2011-06-29 08:24:44Z vboxsync $ */ +/* $Id: fileio-posix.cpp $ */ /** @file * IPRT - File I/O, POSIX, Part 1. */ diff --git a/src/VBox/Runtime/r3/posix/fileio2-posix.cpp b/src/VBox/Runtime/r3/posix/fileio2-posix.cpp index 6b6dee219..e2f30ab22 100644 --- a/src/VBox/Runtime/r3/posix/fileio2-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fileio2-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: fileio2-posix.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: fileio2-posix.cpp $ */ /** @file * IPRT - File I/O, POSIX, Part 2. */ diff --git a/src/VBox/Runtime/r3/posix/filelock-posix.cpp b/src/VBox/Runtime/r3/posix/filelock-posix.cpp index 9b1f3630f..266297f2b 100644 --- a/src/VBox/Runtime/r3/posix/filelock-posix.cpp +++ b/src/VBox/Runtime/r3/posix/filelock-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: filelock-posix.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: filelock-posix.cpp $ */ /** @file * IPRT - File Locking, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/fs-posix.cpp b/src/VBox/Runtime/r3/posix/fs-posix.cpp index 2dcd9ffe3..6354ebeb2 100644 --- a/src/VBox/Runtime/r3/posix/fs-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fs-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: fs-posix.cpp 35015 2010-12-13 14:36:50Z vboxsync $ */ +/* $Id: fs-posix.cpp $ */ /** @file * IPRT - File System, Linux. */ diff --git a/src/VBox/Runtime/r3/posix/fs2-posix.cpp b/src/VBox/Runtime/r3/posix/fs2-posix.cpp index 63da69235..38dafcf17 100644 --- a/src/VBox/Runtime/r3/posix/fs2-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fs2-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: fs2-posix.cpp 34015 2010-11-12 00:15:05Z vboxsync $ */ +/* $Id: fs2-posix.cpp $ */ /** @file * IPRT - File System Helpers, POSIX, Part 2. */ diff --git a/src/VBox/Runtime/r3/posix/fs3-posix.cpp b/src/VBox/Runtime/r3/posix/fs3-posix.cpp index 32882521b..94c3fb5a3 100644 --- a/src/VBox/Runtime/r3/posix/fs3-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fs3-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: fs3-posix.cpp 34015 2010-11-12 00:15:05Z vboxsync $ */ +/* $Id: fs3-posix.cpp $ */ /** @file * IPRT - File System Helpers, POSIX, Part 3. */ diff --git a/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp b/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp index 62cc939d8..61ce35783 100644 --- a/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp +++ b/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrNative-posix.cpp 35191 2010-12-16 15:25:20Z vboxsync $ */ +/* $Id: ldrNative-posix.cpp $ */ /** @file * IPRT - Binary Image Loader, POSIX native. */ diff --git a/src/VBox/Runtime/r3/posix/path-posix.cpp b/src/VBox/Runtime/r3/posix/path-posix.cpp index 33fbd9079..cf613dadc 100644 --- a/src/VBox/Runtime/r3/posix/path-posix.cpp +++ b/src/VBox/Runtime/r3/posix/path-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: path-posix.cpp 36906 2011-05-01 16:35:12Z vboxsync $ */ +/* $Id: path-posix.cpp $ */ /** @file * IPRT - Path Manipulation, POSIX, Part 1. */ diff --git a/src/VBox/Runtime/r3/posix/path2-posix.cpp b/src/VBox/Runtime/r3/posix/path2-posix.cpp index e4a0c7b9c..abc2ce29a 100644 --- a/src/VBox/Runtime/r3/posix/path2-posix.cpp +++ b/src/VBox/Runtime/r3/posix/path2-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: path2-posix.cpp 34230 2010-11-22 10:06:48Z vboxsync $ */ +/* $Id: path2-posix.cpp $ */ /** @file * IPRT - Path Manipulation, POSIX, Part 2 - RTPathQueryInfo. */ diff --git a/src/VBox/Runtime/r3/posix/pathhost-posix.cpp b/src/VBox/Runtime/r3/posix/pathhost-posix.cpp index a5af14150..5390fe574 100644 --- a/src/VBox/Runtime/r3/posix/pathhost-posix.cpp +++ b/src/VBox/Runtime/r3/posix/pathhost-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: pathhost-posix.cpp 37563 2011-06-20 19:47:47Z vboxsync $ */ +/* $Id: pathhost-posix.cpp $ */ /** @file * IPRT - Path Conversions, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/pipe-posix.cpp b/src/VBox/Runtime/r3/posix/pipe-posix.cpp index 868849340..e225b1b1f 100644 --- a/src/VBox/Runtime/r3/posix/pipe-posix.cpp +++ b/src/VBox/Runtime/r3/posix/pipe-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: pipe-posix.cpp 33104 2010-10-13 12:46:59Z vboxsync $ */ +/* $Id: pipe-posix.cpp $ */ /** @file * IPRT - Anonymous Pipes, POSIX Implementation. */ diff --git a/src/VBox/Runtime/r3/posix/poll-posix.cpp b/src/VBox/Runtime/r3/posix/poll-posix.cpp index 14be608c0..ff1249684 100644 --- a/src/VBox/Runtime/r3/posix/poll-posix.cpp +++ b/src/VBox/Runtime/r3/posix/poll-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: poll-posix.cpp 31453 2010-08-08 13:30:35Z vboxsync $ */ +/* $Id: poll-posix.cpp $ */ /** @file * IPRT - Polling I/O Handles, POSIX Implementation. */ diff --git a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp index ccbba43b6..6690baf58 100644 --- a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp +++ b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: process-creation-posix.cpp 37499 2011-06-16 14:46:47Z vboxsync $ */ +/* $Id: process-creation-posix.cpp $ */ /** @file * IPRT - Process Creation, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/process-posix.cpp b/src/VBox/Runtime/r3/posix/process-posix.cpp index 993bff093..6fff7b0c9 100644 --- a/src/VBox/Runtime/r3/posix/process-posix.cpp +++ b/src/VBox/Runtime/r3/posix/process-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: process-posix.cpp 33602 2010-10-29 12:39:54Z vboxsync $ */ +/* $Id: process-posix.cpp $ */ /** @file * IPRT - Process, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/rand-posix.cpp b/src/VBox/Runtime/r3/posix/rand-posix.cpp index 8e02b0a60..f394d149e 100644 --- a/src/VBox/Runtime/r3/posix/rand-posix.cpp +++ b/src/VBox/Runtime/r3/posix/rand-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: rand-posix.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: rand-posix.cpp $ */ /** @file * IPRT - Random Numbers and Byte Streams, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp b/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp index 4977aab03..6cc6f888a 100644 --- a/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp +++ b/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: rtmempage-exec-mmap-heap-posix.cpp 33279 2010-10-20 21:37:58Z vboxsync $ */ +/* $Id: rtmempage-exec-mmap-heap-posix.cpp $ */ /** @file * IPRT - RTMemPage*, POSIX with heap. */ diff --git a/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp b/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp index 498402d8d..1b2466953 100644 --- a/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp +++ b/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: rtmempage-exec-mmap-posix.cpp 33676 2010-11-02 09:48:24Z vboxsync $ */ +/* $Id: rtmempage-exec-mmap-posix.cpp $ */ /** @file * IPRT - RTMemPage*, POSIX with mmap only. */ diff --git a/src/VBox/Runtime/r3/posix/sched-posix.cpp b/src/VBox/Runtime/r3/posix/sched-posix.cpp index bf5cde765..6fbf2f9f0 100644 --- a/src/VBox/Runtime/r3/posix/sched-posix.cpp +++ b/src/VBox/Runtime/r3/posix/sched-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-posix.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: sched-posix.cpp $ */ /** @file * IPRT - Scheduling, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/semevent-posix.cpp b/src/VBox/Runtime/r3/posix/semevent-posix.cpp index 501ae683c..ceeab84e6 100644 --- a/src/VBox/Runtime/r3/posix/semevent-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semevent-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-posix.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: semevent-posix.cpp $ */ /** @file * IPRT - Event Semaphore, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp b/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp index efe9bdc7f..0fad8eeec 100644 --- a/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-posix.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: semeventmulti-posix.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphore, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/semmutex-posix.cpp b/src/VBox/Runtime/r3/posix/semmutex-posix.cpp index ea845d2ad..e1e82558e 100644 --- a/src/VBox/Runtime/r3/posix/semmutex-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semmutex-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: semmutex-posix.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: semmutex-posix.cpp $ */ /** @file * IPRT - Mutex Semaphore, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/semrw-posix.cpp b/src/VBox/Runtime/r3/posix/semrw-posix.cpp index edca8d669..86473b522 100644 --- a/src/VBox/Runtime/r3/posix/semrw-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semrw-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: semrw-posix.cpp 30111 2010-06-09 12:14:59Z vboxsync $ */ +/* $Id: semrw-posix.cpp $ */ /** @file * IPRT - Read-Write Semaphore, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/symlink-posix.cpp b/src/VBox/Runtime/r3/posix/symlink-posix.cpp index e4c00c0f8..61f7c5973 100644 --- a/src/VBox/Runtime/r3/posix/symlink-posix.cpp +++ b/src/VBox/Runtime/r3/posix/symlink-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: symlink-posix.cpp 33426 2010-10-25 14:32:38Z vboxsync $ */ +/* $Id: symlink-posix.cpp $ */ /** @file * IPRT - Symbolic Links, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/thread-posix.cpp b/src/VBox/Runtime/r3/posix/thread-posix.cpp index 316894532..e719994a4 100644 --- a/src/VBox/Runtime/r3/posix/thread-posix.cpp +++ b/src/VBox/Runtime/r3/posix/thread-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-posix.cpp 37733 2011-07-01 15:41:37Z vboxsync $ */ +/* $Id: thread-posix.cpp $ */ /** @file * IPRT - Threads, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/thread2-posix.cpp b/src/VBox/Runtime/r3/posix/thread2-posix.cpp index 2a8f5e8b7..6d051c639 100644 --- a/src/VBox/Runtime/r3/posix/thread2-posix.cpp +++ b/src/VBox/Runtime/r3/posix/thread2-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: thread2-posix.cpp 37733 2011-07-01 15:41:37Z vboxsync $ */ +/* $Id: thread2-posix.cpp $ */ /** @file * IPRT - Threads part 2, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/time-posix.cpp b/src/VBox/Runtime/r3/posix/time-posix.cpp index 179911465..bdb3dcb72 100644 --- a/src/VBox/Runtime/r3/posix/time-posix.cpp +++ b/src/VBox/Runtime/r3/posix/time-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: time-posix.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: time-posix.cpp $ */ /** @file * IPRT - Time, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/timer-posix.cpp b/src/VBox/Runtime/r3/posix/timer-posix.cpp index e3644e1e2..3f851e53b 100644 --- a/src/VBox/Runtime/r3/posix/timer-posix.cpp +++ b/src/VBox/Runtime/r3/posix/timer-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-posix.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: timer-posix.cpp $ */ /** @file * IPRT - Timer, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/tls-posix.cpp b/src/VBox/Runtime/r3/posix/tls-posix.cpp index 17dd255c5..c8005a59f 100644 --- a/src/VBox/Runtime/r3/posix/tls-posix.cpp +++ b/src/VBox/Runtime/r3/posix/tls-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: tls-posix.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tls-posix.cpp $ */ /** @file * IPRT - Thread Local Storage (TLS), POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/utf8-posix.cpp b/src/VBox/Runtime/r3/posix/utf8-posix.cpp index 1c72c4390..bd1d46074 100644 --- a/src/VBox/Runtime/r3/posix/utf8-posix.cpp +++ b/src/VBox/Runtime/r3/posix/utf8-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: utf8-posix.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: utf8-posix.cpp $ */ /** @file * IPRT - UTF-8 helpers, POSIX. */ diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp index 73607065f..7be307f32 100644 --- a/src/VBox/Runtime/r3/process.cpp +++ b/src/VBox/Runtime/r3/process.cpp @@ -1,4 +1,4 @@ -/* $Id: process.cpp 33806 2010-11-05 17:20:15Z vboxsync $ */ +/* $Id: process.cpp $ */ /** @file * IPRT - Process, Common. */ diff --git a/src/VBox/Runtime/r3/socket.cpp b/src/VBox/Runtime/r3/socket.cpp index e09ead6df..abbe5bcc8 100644 --- a/src/VBox/Runtime/r3/socket.cpp +++ b/src/VBox/Runtime/r3/socket.cpp @@ -1,4 +1,4 @@ -/* $Id: socket.cpp 37196 2011-05-24 14:50:05Z vboxsync $ */ +/* $Id: socket.cpp $ */ /** @file * IPRT - Network Sockets. */ diff --git a/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp b/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp index 3f5634264..0dc82edbd 100644 --- a/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryDmiString-solaris.cpp 29560 2010-05-17 15:08:09Z vboxsync $ */ +/* $Id: RTSystemQueryDmiString-solaris.cpp $ */ /** @file * IPRT - RTSystemQueryDmiString, solaris ring-3. */ diff --git a/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp b/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp index d20d8497a..ac78ba098 100644 --- a/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: coredumper-solaris.cpp 37631 2011-06-24 13:25:07Z vboxsync $ */ +/* $Id: coredumper-solaris.cpp $ */ /** @file * IPRT - Custom Core Dumper, Solaris. */ diff --git a/src/VBox/Runtime/r3/solaris/coredumper-solaris.h b/src/VBox/Runtime/r3/solaris/coredumper-solaris.h index f18c90d0f..3bd783a3d 100644 --- a/src/VBox/Runtime/r3/solaris/coredumper-solaris.h +++ b/src/VBox/Runtime/r3/solaris/coredumper-solaris.h @@ -1,4 +1,4 @@ -/* $Id: coredumper-solaris.h 37631 2011-06-24 13:25:07Z vboxsync $ */ +/* $Id: coredumper-solaris.h $ */ /** @file * IPRT - Custom Core Dumper, Solaris. */ diff --git a/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp b/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp index 152ebee68..d8b6fb416 100644 --- a/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: fileaio-solaris.cpp 30238 2010-06-16 11:34:44Z vboxsync $ */ +/* $Id: fileaio-solaris.cpp $ */ /** @file * IPRT - File async I/O, native implementation for the Solaris host platform. */ diff --git a/src/VBox/Runtime/r3/solaris/mp-solaris.cpp b/src/VBox/Runtime/r3/solaris/mp-solaris.cpp index 5101f20bc..0f2c6fdf0 100644 --- a/src/VBox/Runtime/r3/solaris/mp-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/mp-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-solaris.cpp 29269 2010-05-09 21:24:06Z vboxsync $ */ +/* $Id: mp-solaris.cpp $ */ /** @file * IPRT - Multiprocessor, Solaris. */ diff --git a/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp b/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp index f14a3404b..40baf8c25 100644 --- a/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-solaris.cpp 28929 2010-04-30 11:26:46Z vboxsync $ */ +/* $Id: rtProcInitExePath-solaris.cpp $ */ /** @file * IPRT - rtProcInitName, Solaris. */ diff --git a/src/VBox/Runtime/r3/solaris/thread-affinity-solaris.cpp b/src/VBox/Runtime/r3/solaris/thread-affinity-solaris.cpp index b2bd2b4c5..0474ffb2e 100644 --- a/src/VBox/Runtime/r3/solaris/thread-affinity-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/thread-affinity-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-affinity-solaris.cpp 37156 2011-05-19 13:11:14Z vboxsync $ */ +/* $Id: thread-affinity-solaris.cpp $ */ /** @file * IPRT - Thread Affinity, Solaris ring-3 implementation. */ diff --git a/src/VBox/Runtime/r3/stream.cpp b/src/VBox/Runtime/r3/stream.cpp index 52c997397..87c5672ed 100644 --- a/src/VBox/Runtime/r3/stream.cpp +++ b/src/VBox/Runtime/r3/stream.cpp @@ -1,4 +1,4 @@ -/* $Id: stream.cpp 32464 2010-09-14 08:48:32Z vboxsync $ */ +/* $Id: stream.cpp $ */ /** @file * IPRT - I/O Stream. */ @@ -278,6 +278,7 @@ RTR3DECL(int) RTStrmOpen(const char *pszFilename, const char *pszMode, PRTSTREAM *ppStream = pStream; return VINF_SUCCESS; } + RTMemFree(pStream); return RTErrConvertFromErrno(errno); } return VERR_NO_MEMORY; diff --git a/src/VBox/Runtime/r3/tcp.cpp b/src/VBox/Runtime/r3/tcp.cpp index 9f96f71f8..8f47eda56 100644 --- a/src/VBox/Runtime/r3/tcp.cpp +++ b/src/VBox/Runtime/r3/tcp.cpp @@ -1,4 +1,4 @@ -/* $Id: tcp.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tcp.cpp $ */ /** @file * IPRT - TCP/IP. */ diff --git a/src/VBox/Runtime/r3/test.cpp b/src/VBox/Runtime/r3/test.cpp index c7ce69f03..d3e850f63 100644 --- a/src/VBox/Runtime/r3/test.cpp +++ b/src/VBox/Runtime/r3/test.cpp @@ -1,4 +1,4 @@ -/* $Id: test.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: test.cpp $ */ /** @file * IPRT - Testcase Framework. */ diff --git a/src/VBox/Runtime/r3/testi.cpp b/src/VBox/Runtime/r3/testi.cpp index e6db79d6b..e143e3c1e 100644 --- a/src/VBox/Runtime/r3/testi.cpp +++ b/src/VBox/Runtime/r3/testi.cpp @@ -1,4 +1,4 @@ -/* $Id: testi.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: testi.cpp $ */ /** @file * IPRT - Testcase Framework, the implicit test handle API variation. */ diff --git a/src/VBox/Runtime/r3/udp.cpp b/src/VBox/Runtime/r3/udp.cpp index de9016e93..7af858609 100644 --- a/src/VBox/Runtime/r3/udp.cpp +++ b/src/VBox/Runtime/r3/udp.cpp @@ -1,4 +1,4 @@ -/* $Id: udp.cpp 37197 2011-05-24 14:56:02Z vboxsync $ */ +/* $Id: udp.cpp $ */ /** @file * IPRT - UDP/IP. */ diff --git a/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp b/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp index 42e6953c6..683d6ee4e 100644 --- a/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp +++ b/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTHandleGetStandard-win.cpp 36123 2011-03-01 15:38:35Z vboxsync $ */ +/* $Id: RTHandleGetStandard-win.cpp $ */ /** @file * IPRT - RTHandleGetStandard, Windows. */ diff --git a/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp b/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp index faff04b90..2f3c16c03 100644 --- a/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp +++ b/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-win.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-win.cpp $ */ /** @file * IPRT - Log To Debugger, Win32. */ diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp index a37fd76fc..578319106 100644 --- a/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp +++ b/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryDmiString-win.cpp 36440 2011-03-25 16:21:57Z vboxsync $ */ +/* $Id: RTSystemQueryDmiString-win.cpp $ */ /** @file * IPRT - RTSystemQueryDmiString, windows ring-3. */ diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp index a87892ac9..50dee1aa4 100644 --- a/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp +++ b/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryOSInfo-win.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTSystemQueryOSInfo-win.cpp $ */ /** @file * IPRT - RTSystemQueryOSInfo, generic stub. */ @@ -64,6 +64,7 @@ typedef enum RTWINOSTYPE kRTWinOSType_VISTA, kRTWinOSType_2008, kRTWinOSType_7, + kRTWinOSType_8, kRTWinOSType_NT_UNKNOWN = 199, kRTWinOSType_NT_LAST = kRTWinOSType_UNKNOWN } RTWINOSTYPE; @@ -204,6 +205,9 @@ static RTWINOSTYPE rtSystemWinOSType(OSVERSIONINFOEX const *pOSInfoEx) else if ( dwMajorVersion == 6 && dwMinorVersion == 1) enmVer = kRTWinOSType_7; + else if ( dwMajorVersion == 6 + && dwMinorVersion == 2) + enmVer = kRTWinOSType_8; else enmVer = kRTWinOSType_NT_UNKNOWN; } @@ -371,6 +375,7 @@ static int rtSystemWinQueryOSVersion(RTSYSOSINFO enmInfo, char *pszInfo, size_t } case kRTWinOSType_2008: strcpy(szTmp, "Windows 2008"); break; case kRTWinOSType_7: strcpy(szTmp, "Windows 7"); break; + case kRTWinOSType_8: strcpy(szTmp, "Windows 8"); break; case kRTWinOSType_NT_UNKNOWN: RTStrPrintf(szTmp, sizeof(szTmp), "Unknown NT v%u.%u", OSInfoEx.dwMajorVersion, OSInfoEx.dwMinorVersion); diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryTotalRam-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryTotalRam-win.cpp index 36482d824..5e31869c4 100644 --- a/src/VBox/Runtime/r3/win/RTSystemQueryTotalRam-win.cpp +++ b/src/VBox/Runtime/r3/win/RTSystemQueryTotalRam-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryTotalRam-win.cpp 33503 2010-10-27 13:12:57Z vboxsync $ */ +/* $Id: RTSystemQueryTotalRam-win.cpp $ */ /** @file * IPRT - RTSystemQueryTotalRam, windows ring-3. */ diff --git a/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp b/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp index e979fa18c..8083f98de 100644 --- a/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp +++ b/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTUuidCreate-win.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: RTUuidCreate-win.cpp $ */ /** @file * IPRT - UUID, Windows RTUuidCreate implementation. */ diff --git a/src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def b/src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def index 8bdd5da8d..fc314a4d5 100644 --- a/src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def +++ b/src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def @@ -1,4 +1,4 @@ -; $Id: VBoxRT-openssl-ose.def 38036 2011-07-18 16:36:29Z vboxsync $ +; $Id: VBoxRT-openssl-ose.def $ ;; @file ; IPRT - Windows OpenSSL exports. ; diff --git a/src/VBox/Runtime/r3/win/VBoxRT-openssl.def b/src/VBox/Runtime/r3/win/VBoxRT-openssl.def index 713a993d0..8c9a7a6a3 100644 --- a/src/VBox/Runtime/r3/win/VBoxRT-openssl.def +++ b/src/VBox/Runtime/r3/win/VBoxRT-openssl.def @@ -1,4 +1,4 @@ -; $Id: VBoxRT-openssl.def 37254 2011-05-30 12:09:59Z vboxsync $ +; $Id: VBoxRT-openssl.def $ ;; @file ; IPRT - Windows OpenSSL exports. ; diff --git a/src/VBox/Runtime/r3/win/VBoxRT-win32.def b/src/VBox/Runtime/r3/win/VBoxRT-win32.def index 1395665f8..ae6e5cdcb 100644 --- a/src/VBox/Runtime/r3/win/VBoxRT-win32.def +++ b/src/VBox/Runtime/r3/win/VBoxRT-win32.def @@ -1,4 +1,4 @@ -; $Id: VBoxRT-win32.def 32404 2010-09-10 13:17:42Z vboxsync $
+; $Id: VBoxRT-win32.def $
;; @file
; IPRT - Win32 ASM exports.
;
diff --git a/src/VBox/Runtime/r3/win/VBoxRT-win64.def b/src/VBox/Runtime/r3/win/VBoxRT-win64.def index fbc41c243..f0ad7c4e4 100644 --- a/src/VBox/Runtime/r3/win/VBoxRT-win64.def +++ b/src/VBox/Runtime/r3/win/VBoxRT-win64.def @@ -1,4 +1,4 @@ -; $Id: VBoxRT-win64.def 32404 2010-09-10 13:17:42Z vboxsync $
+; $Id: VBoxRT-win64.def $
;; @file
; IPRT - Win64 ASM exports.
;
diff --git a/src/VBox/Runtime/r3/win/alloc-win.cpp b/src/VBox/Runtime/r3/win/alloc-win.cpp index b7b3f75f4..01a0a359f 100644 --- a/src/VBox/Runtime/r3/win/alloc-win.cpp +++ b/src/VBox/Runtime/r3/win/alloc-win.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-win.cpp 33269 2010-10-20 15:42:28Z vboxsync $ */ +/* $Id: alloc-win.cpp $ */ /** @file * IPRT - Memory Allocation, Windows. */ diff --git a/src/VBox/Runtime/r3/win/dir-win.cpp b/src/VBox/Runtime/r3/win/dir-win.cpp index 930d16acd..b5640696c 100644 --- a/src/VBox/Runtime/r3/win/dir-win.cpp +++ b/src/VBox/Runtime/r3/win/dir-win.cpp @@ -1,4 +1,4 @@ -/* $Id: dir-win.cpp 34507 2010-11-30 13:14:14Z vboxsync $ */ +/* $Id: dir-win.cpp $ */ /** @file * IPRT - Directory, win32. */ diff --git a/src/VBox/Runtime/r3/win/dllmain-win.cpp b/src/VBox/Runtime/r3/win/dllmain-win.cpp index 953a95c80..1646b39e0 100644 --- a/src/VBox/Runtime/r3/win/dllmain-win.cpp +++ b/src/VBox/Runtime/r3/win/dllmain-win.cpp @@ -1,4 +1,4 @@ -/* $Id: dllmain-win.cpp 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: dllmain-win.cpp $ */ /** @file * IPRT - Win32 DllMain (Ring-3). */ diff --git a/src/VBox/Runtime/r3/win/errvars-win.cpp b/src/VBox/Runtime/r3/win/errvars-win.cpp index ef00e62a6..f99e8a13c 100644 --- a/src/VBox/Runtime/r3/win/errvars-win.cpp +++ b/src/VBox/Runtime/r3/win/errvars-win.cpp @@ -1,4 +1,4 @@ -/* $Id: errvars-win.cpp 37233 2011-05-27 13:31:57Z vboxsync $ */ +/* $Id: errvars-win.cpp $ */ /** @file * IPRT - Save and Restore Error Variables, Windows Ring-3. */ diff --git a/src/VBox/Runtime/r3/win/fileaio-win.cpp b/src/VBox/Runtime/r3/win/fileaio-win.cpp index 6dc7f5fbf..c573fbbd4 100644 --- a/src/VBox/Runtime/r3/win/fileaio-win.cpp +++ b/src/VBox/Runtime/r3/win/fileaio-win.cpp @@ -1,4 +1,4 @@ -/* $Id: fileaio-win.cpp 37607 2011-06-23 10:42:42Z vboxsync $ */ +/* $Id: fileaio-win.cpp $ */ /** @file * IPRT - File async I/O, native implementation for the Windows host platform. */ diff --git a/src/VBox/Runtime/r3/win/fileio-win.cpp b/src/VBox/Runtime/r3/win/fileio-win.cpp index af09fc6b2..a5a7fb8f0 100644 --- a/src/VBox/Runtime/r3/win/fileio-win.cpp +++ b/src/VBox/Runtime/r3/win/fileio-win.cpp @@ -1,4 +1,4 @@ -/* $Id: fileio-win.cpp 37598 2011-06-22 20:58:35Z vboxsync $ */ +/* $Id: fileio-win.cpp $ */ /** @file * IPRT - File I/O, native implementation for the Windows host platform. */ diff --git a/src/VBox/Runtime/r3/win/fs-win.cpp b/src/VBox/Runtime/r3/win/fs-win.cpp index 14e2fea69..c0fa65c32 100644 --- a/src/VBox/Runtime/r3/win/fs-win.cpp +++ b/src/VBox/Runtime/r3/win/fs-win.cpp @@ -1,4 +1,4 @@ -/* $Id: fs-win.cpp 32431 2010-09-11 18:02:17Z vboxsync $ */ +/* $Id: fs-win.cpp $ */ /** @file * IPRT - File System, Win32. */ diff --git a/src/VBox/Runtime/r3/win/ldrNative-win.cpp b/src/VBox/Runtime/r3/win/ldrNative-win.cpp index 058bde3a4..540169588 100644 --- a/src/VBox/Runtime/r3/win/ldrNative-win.cpp +++ b/src/VBox/Runtime/r3/win/ldrNative-win.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrNative-win.cpp 35183 2010-12-16 13:59:44Z vboxsync $ */ +/* $Id: ldrNative-win.cpp $ */ /** @file * IPRT - Binary Image Loader, Win32 native. */ diff --git a/src/VBox/Runtime/r3/win/localipc-win.cpp b/src/VBox/Runtime/r3/win/localipc-win.cpp index 13d17076c..15ff6f8bb 100644 --- a/src/VBox/Runtime/r3/win/localipc-win.cpp +++ b/src/VBox/Runtime/r3/win/localipc-win.cpp @@ -1,4 +1,4 @@ -/* $Id: localipc-win.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: localipc-win.cpp $ */ /** @file * IPRT - Local IPC, Windows Implementation Using Named Pipes. */ diff --git a/src/VBox/Runtime/r3/win/mp-win.cpp b/src/VBox/Runtime/r3/win/mp-win.cpp index 970900de8..fed1152ba 100644 --- a/src/VBox/Runtime/r3/win/mp-win.cpp +++ b/src/VBox/Runtime/r3/win/mp-win.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-win.cpp 36262 2011-03-11 14:50:45Z vboxsync $ */ +/* $Id: mp-win.cpp $ */ /** @file * IPRT - Multiprocessor, Windows. */ diff --git a/src/VBox/Runtime/r3/win/ntdll-mini-implib.c b/src/VBox/Runtime/r3/win/ntdll-mini-implib.c index b6c683932..74094221d 100644 --- a/src/VBox/Runtime/r3/win/ntdll-mini-implib.c +++ b/src/VBox/Runtime/r3/win/ntdll-mini-implib.c @@ -1,4 +1,4 @@ -/* $Id: ntdll-mini-implib.c 35018 2010-12-13 14:46:17Z vboxsync $ */ +/* $Id: ntdll-mini-implib.c $ */ /** @file * IPRT - Minimal NTDLL import library defintion file. */ diff --git a/src/VBox/Runtime/r3/win/ntdll-mini-implib.def b/src/VBox/Runtime/r3/win/ntdll-mini-implib.def index 8793f742f..a0d39ee48 100644 --- a/src/VBox/Runtime/r3/win/ntdll-mini-implib.def +++ b/src/VBox/Runtime/r3/win/ntdll-mini-implib.def @@ -1,4 +1,4 @@ -; $Id: ntdll-mini-implib.def 35020 2010-12-13 14:53:16Z vboxsync $ +; $Id: ntdll-mini-implib.def $ ;; @file ; IPRT - Minimal NTDLL import library defintion file. ; diff --git a/src/VBox/Runtime/r3/win/path-win.cpp b/src/VBox/Runtime/r3/win/path-win.cpp index 9f24ad5f4..d94eb0357 100644 --- a/src/VBox/Runtime/r3/win/path-win.cpp +++ b/src/VBox/Runtime/r3/win/path-win.cpp @@ -1,4 +1,4 @@ -/* $Id: path-win.cpp 36879 2011-04-29 09:15:52Z vboxsync $ */ +/* $Id: path-win.cpp $ */ /** @file * IPRT - Path manipulation. */ diff --git a/src/VBox/Runtime/r3/win/pipe-win.cpp b/src/VBox/Runtime/r3/win/pipe-win.cpp index 4e4193322..6c12768e2 100644 --- a/src/VBox/Runtime/r3/win/pipe-win.cpp +++ b/src/VBox/Runtime/r3/win/pipe-win.cpp @@ -1,4 +1,4 @@ -/* $Id: pipe-win.cpp 34119 2010-11-16 15:33:25Z vboxsync $ */ +/* $Id: pipe-win.cpp $ */ /** @file * IPRT - Anonymous Pipes, Windows Implementation. */ diff --git a/src/VBox/Runtime/r3/win/poll-win.cpp b/src/VBox/Runtime/r3/win/poll-win.cpp index 54641a99d..0f3b187ff 100644 --- a/src/VBox/Runtime/r3/win/poll-win.cpp +++ b/src/VBox/Runtime/r3/win/poll-win.cpp @@ -1,4 +1,4 @@ -/* $Id: poll-win.cpp 32431 2010-09-11 18:02:17Z vboxsync $ */ +/* $Id: poll-win.cpp $ */ /** @file * IPRT - Polling I/O Handles, Windows Implementation. * diff --git a/src/VBox/Runtime/r3/win/process-win.cpp b/src/VBox/Runtime/r3/win/process-win.cpp index 567b3f196..2e44fa1ac 100644 --- a/src/VBox/Runtime/r3/win/process-win.cpp +++ b/src/VBox/Runtime/r3/win/process-win.cpp @@ -1,4 +1,4 @@ -/* $Id: process-win.cpp 37448 2011-06-14 16:06:06Z vboxsync $ */ +/* $Id: process-win.cpp $ */ /** @file * IPRT - Process, Windows. */ @@ -967,7 +967,7 @@ RTR3DECL(int) RTProcCreateEx(const char *pszExec, const char * const *papszArg */ AssertPtrReturn(pszExec, VERR_INVALID_POINTER); AssertReturn(*pszExec, VERR_INVALID_PARAMETER); - AssertReturn(!(fFlags & ~(RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_HIDDEN | RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_SAME_CONTRACT | RTPROC_FLAGS_NO_PROFILE)), VERR_INVALID_PARAMETER); + AssertReturn(!(fFlags & ~(RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_HIDDEN | RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_SAME_CONTRACT | RTPROC_FLAGS_NO_PROFILE | RTPROC_FLAGS_NO_WINDOW)), VERR_INVALID_PARAMETER); AssertReturn(!(fFlags & RTPROC_FLAGS_DETACHED) || !phProcess, VERR_INVALID_PARAMETER); AssertReturn(hEnv != NIL_RTENV, VERR_INVALID_PARAMETER); AssertPtrReturn(papszArgs, VERR_INVALID_PARAMETER); @@ -1094,6 +1094,8 @@ RTR3DECL(int) RTProcCreateEx(const char *pszExec, const char * const *papszArg DWORD dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; if (fFlags & RTPROC_FLAGS_DETACHED) dwCreationFlags |= DETACHED_PROCESS; + if (fFlags & RTPROC_FLAGS_NO_WINDOW) + dwCreationFlags |= CREATE_NO_WINDOW; /* * Only use the normal CreateProcess stuff if we have no user name diff --git a/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp b/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp index 7965eb31f..4bff933b4 100644 --- a/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp +++ b/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp @@ -1,4 +1,4 @@ -/* $Id: rtFileNativeSetAttributes-win.cpp 37600 2011-06-22 22:05:01Z vboxsync $ */ +/* $Id: rtFileNativeSetAttributes-win.cpp $ */ /** @file * IPRT - NtSetInformationFile wrapper. */ diff --git a/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp b/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp index d285a8052..3b056cde1 100644 --- a/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp +++ b/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-win.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: rtProcInitExePath-win.cpp $ */ /** @file * IPRT - rtProcInitName, Windows. */ diff --git a/src/VBox/Runtime/r3/win/sched-win.cpp b/src/VBox/Runtime/r3/win/sched-win.cpp index 53dacd577..935bd6517 100644 --- a/src/VBox/Runtime/r3/win/sched-win.cpp +++ b/src/VBox/Runtime/r3/win/sched-win.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-win.cpp 36555 2011-04-05 12:34:09Z vboxsync $ */ +/* $Id: sched-win.cpp $ */ /** @file * IPRT - Scheduling, Win32. */ diff --git a/src/VBox/Runtime/r3/win/semevent-win.cpp b/src/VBox/Runtime/r3/win/semevent-win.cpp index 59558abfb..13d715bfc 100644 --- a/src/VBox/Runtime/r3/win/semevent-win.cpp +++ b/src/VBox/Runtime/r3/win/semevent-win.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-win.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: semevent-win.cpp $ */ /** @file * IPRT - Event Semaphore, Windows. */ diff --git a/src/VBox/Runtime/r3/win/semeventmulti-win.cpp b/src/VBox/Runtime/r3/win/semeventmulti-win.cpp index 5fa6d648c..b7f9febbe 100644 --- a/src/VBox/Runtime/r3/win/semeventmulti-win.cpp +++ b/src/VBox/Runtime/r3/win/semeventmulti-win.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-win.cpp 32970 2010-10-07 10:08:00Z vboxsync $ */ +/* $Id: semeventmulti-win.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphore, Windows. * diff --git a/src/VBox/Runtime/r3/win/semmutex-win.cpp b/src/VBox/Runtime/r3/win/semmutex-win.cpp index b86ec5fc5..7cdab20b8 100644 --- a/src/VBox/Runtime/r3/win/semmutex-win.cpp +++ b/src/VBox/Runtime/r3/win/semmutex-win.cpp @@ -1,4 +1,4 @@ -/* $Id: semmutex-win.cpp 30111 2010-06-09 12:14:59Z vboxsync $ */ +/* $Id: semmutex-win.cpp $ */ /** @file * IPRT - Mutex Semaphores, Windows. */ diff --git a/src/VBox/Runtime/r3/win/symlink-win.cpp b/src/VBox/Runtime/r3/win/symlink-win.cpp index 5a02d9ea3..c30245e45 100644 --- a/src/VBox/Runtime/r3/win/symlink-win.cpp +++ b/src/VBox/Runtime/r3/win/symlink-win.cpp @@ -1,4 +1,4 @@ -/* $Id: symlink-win.cpp 33437 2010-10-25 16:28:14Z vboxsync $ */ +/* $Id: symlink-win.cpp $ */ /** @file * IPRT - Symbolic Links, Windows. */ diff --git a/src/VBox/Runtime/r3/win/thread-win.cpp b/src/VBox/Runtime/r3/win/thread-win.cpp index 9280729b0..788a616a7 100644 --- a/src/VBox/Runtime/r3/win/thread-win.cpp +++ b/src/VBox/Runtime/r3/win/thread-win.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-win.cpp 37733 2011-07-01 15:41:37Z vboxsync $ */ +/* $Id: thread-win.cpp $ */ /** @file * IPRT - Threads, Windows. */ diff --git a/src/VBox/Runtime/r3/win/thread2-win.cpp b/src/VBox/Runtime/r3/win/thread2-win.cpp index 3970c0b4d..e1c1cb242 100644 --- a/src/VBox/Runtime/r3/win/thread2-win.cpp +++ b/src/VBox/Runtime/r3/win/thread2-win.cpp @@ -1,4 +1,4 @@ -/* $Id: thread2-win.cpp 37733 2011-07-01 15:41:37Z vboxsync $ */ +/* $Id: thread2-win.cpp $ */ /** @file * IPRT - Threads part 2, Windows. */ diff --git a/src/VBox/Runtime/r3/win/time-win.cpp b/src/VBox/Runtime/r3/win/time-win.cpp index 517589c09..bd4e768a7 100644 --- a/src/VBox/Runtime/r3/win/time-win.cpp +++ b/src/VBox/Runtime/r3/win/time-win.cpp @@ -1,4 +1,4 @@ -/* $Id: time-win.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: time-win.cpp $ */ /** @file * IPRT - Time, Windows. */ diff --git a/src/VBox/Runtime/r3/win/timer-win.cpp b/src/VBox/Runtime/r3/win/timer-win.cpp index 868d1d371..08ed4ec1f 100644 --- a/src/VBox/Runtime/r3/win/timer-win.cpp +++ b/src/VBox/Runtime/r3/win/timer-win.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-win.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: timer-win.cpp $ */ /** @file * IPRT - Timer. */ diff --git a/src/VBox/Runtime/r3/win/tls-win.cpp b/src/VBox/Runtime/r3/win/tls-win.cpp index 01a5e581f..2bc332b76 100644 --- a/src/VBox/Runtime/r3/win/tls-win.cpp +++ b/src/VBox/Runtime/r3/win/tls-win.cpp @@ -1,4 +1,4 @@ -/* $Id: tls-win.cpp 34507 2010-11-30 13:14:14Z vboxsync $ */ +/* $Id: tls-win.cpp $ */ /** @file * IPRT - Thread Local Storage (TLS), Win32. */ diff --git a/src/VBox/Runtime/r3/win/utf16locale-win.cpp b/src/VBox/Runtime/r3/win/utf16locale-win.cpp index 1831a5088..40d99bb2b 100644 --- a/src/VBox/Runtime/r3/win/utf16locale-win.cpp +++ b/src/VBox/Runtime/r3/win/utf16locale-win.cpp @@ -1,4 +1,4 @@ -/* $Id: utf16locale-win.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: utf16locale-win.cpp $ */ /** @file * IPRT - UTF-16 Locale Specific Manipulation, Win32. */ diff --git a/src/VBox/Runtime/r3/win/utf8-win.cpp b/src/VBox/Runtime/r3/win/utf8-win.cpp index bef381b85..58a6e3957 100644 --- a/src/VBox/Runtime/r3/win/utf8-win.cpp +++ b/src/VBox/Runtime/r3/win/utf8-win.cpp @@ -1,4 +1,4 @@ -/* $Id: utf8-win.cpp 31157 2010-07-28 03:15:35Z vboxsync $ */ +/* $Id: utf8-win.cpp $ */ /** @file * IPRT - UTF8 helpers. */ diff --git a/src/VBox/Runtime/r3/win/uuid-win.cpp b/src/VBox/Runtime/r3/win/uuid-win.cpp index 203b81594..0d91df790 100644 --- a/src/VBox/Runtime/r3/win/uuid-win.cpp +++ b/src/VBox/Runtime/r3/win/uuid-win.cpp @@ -1,4 +1,4 @@ -/* $Id: uuid-win.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: uuid-win.cpp $ */ /** @file * IPRT - UUID, Windows implementation. */ diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp index ecf63bc70..bf030e1d1 100644 --- a/src/VBox/Runtime/r3/xml.cpp +++ b/src/VBox/Runtime/r3/xml.cpp @@ -1,4 +1,4 @@ -/* $Id: xml.cpp 37493 2011-06-16 13:18:11Z vboxsync $ */ +/* $Id: xml.cpp $ */ /** @file * IPRT - XML Manipulation API. */ diff --git a/src/VBox/Runtime/testcase/Makefile.kmk b/src/VBox/Runtime/testcase/Makefile.kmk index 70c46bf77..374c32beb 100644 --- a/src/VBox/Runtime/testcase/Makefile.kmk +++ b/src/VBox/Runtime/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the IPRT testcases. # diff --git a/src/VBox/Runtime/testcase/ioctl.h b/src/VBox/Runtime/testcase/ioctl.h index 57732e44b..f9a5273ec 100644 --- a/src/VBox/Runtime/testcase/ioctl.h +++ b/src/VBox/Runtime/testcase/ioctl.h @@ -1,4 +1,4 @@ -/* $Id: ioctl.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ioctl.h $ */ /** @file * VBox L4/OSS audio - header for Linux IoCtls. */ diff --git a/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp b/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp index c25551be1..7e12327c6 100644 --- a/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp +++ b/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp @@ -1,4 +1,4 @@ -/* $Id: ntGetTimerResolution.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: ntGetTimerResolution.cpp $ */ /** @file * IPRT - Win32 (NT) testcase for getting the timer resolution. */ diff --git a/src/VBox/Runtime/testcase/tstDir-2.cpp b/src/VBox/Runtime/testcase/tstDir-2.cpp index 39e8e76b2..27c4edc5e 100644 --- a/src/VBox/Runtime/testcase/tstDir-2.cpp +++ b/src/VBox/Runtime/testcase/tstDir-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDir-2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstDir-2.cpp $ */ /** @file * IPRT Testcase - Directory listing & filtering . */ diff --git a/src/VBox/Runtime/testcase/tstDir-3.cpp b/src/VBox/Runtime/testcase/tstDir-3.cpp index c9b6cf167..9f3623833 100644 --- a/src/VBox/Runtime/testcase/tstDir-3.cpp +++ b/src/VBox/Runtime/testcase/tstDir-3.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDir-3.cpp 33464 2010-10-26 12:27:50Z vboxsync $ */ +/* $Id: tstDir-3.cpp $ */ /** @file * IPRT Testcase - Directory listing & filtering (no parameters needed). */ diff --git a/src/VBox/Runtime/testcase/tstDir.cpp b/src/VBox/Runtime/testcase/tstDir.cpp index 225258add..154231068 100644 --- a/src/VBox/Runtime/testcase/tstDir.cpp +++ b/src/VBox/Runtime/testcase/tstDir.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDir.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstDir.cpp $ */ /** @file * IPRT Testcase - Directory listing. */ diff --git a/src/VBox/Runtime/testcase/tstEnv.cpp b/src/VBox/Runtime/testcase/tstEnv.cpp index 3fe9e37de..b21bdc77f 100644 --- a/src/VBox/Runtime/testcase/tstEnv.cpp +++ b/src/VBox/Runtime/testcase/tstEnv.cpp @@ -1,4 +1,4 @@ -/* $Id: tstEnv.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstEnv.cpp $ */ /** @file * IPRT Testcase - Environment. */ diff --git a/src/VBox/Runtime/testcase/tstErrUnique.cpp b/src/VBox/Runtime/testcase/tstErrUnique.cpp index d3f802482..41386e6f2 100644 --- a/src/VBox/Runtime/testcase/tstErrUnique.cpp +++ b/src/VBox/Runtime/testcase/tstErrUnique.cpp @@ -1,4 +1,4 @@ -/* $Id: tstErrUnique.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstErrUnique.cpp $ */ /** @file * IPRT Testcase - Error Messages. */ diff --git a/src/VBox/Runtime/testcase/tstFile.cpp b/src/VBox/Runtime/testcase/tstFile.cpp index 1a38ddec6..8da4c1693 100644 --- a/src/VBox/Runtime/testcase/tstFile.cpp +++ b/src/VBox/Runtime/testcase/tstFile.cpp @@ -1,4 +1,4 @@ -/* $Id: tstFile.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstFile.cpp $ */ /** @file * IPRT Testcase - File I/O. */ diff --git a/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp b/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp index 6714aec30..7ffd7fe1a 100644 --- a/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp +++ b/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstFileAppendWin-1.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstFileAppendWin-1.cpp $ */ /** @file * IPRT Testcase - Exploration of File Appending on Windows. */ diff --git a/src/VBox/Runtime/testcase/tstFileLock.cpp b/src/VBox/Runtime/testcase/tstFileLock.cpp index 6b577fc8d..950ce1268 100644 --- a/src/VBox/Runtime/testcase/tstFileLock.cpp +++ b/src/VBox/Runtime/testcase/tstFileLock.cpp @@ -1,4 +1,4 @@ -/* $Id: tstFileLock.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstFileLock.cpp $ */ /** @file * IPRT Testcase - File Locks. */ diff --git a/src/VBox/Runtime/testcase/tstFork.cpp b/src/VBox/Runtime/testcase/tstFork.cpp index 7cc4d63c1..8d511f7c2 100644 --- a/src/VBox/Runtime/testcase/tstFork.cpp +++ b/src/VBox/Runtime/testcase/tstFork.cpp @@ -1,4 +1,4 @@ -/* $Id: tstFork.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstFork.cpp $ */ /** @file * IPRT Testcase - fork() issues. */ diff --git a/src/VBox/Runtime/testcase/tstHandleTable.cpp b/src/VBox/Runtime/testcase/tstHandleTable.cpp index b5791f7ba..6dfec0828 100644 --- a/src/VBox/Runtime/testcase/tstHandleTable.cpp +++ b/src/VBox/Runtime/testcase/tstHandleTable.cpp @@ -1,4 +1,4 @@ -/* $Id: tstHandleTable.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstHandleTable.cpp $ */ /** @file * IPRT Testcase - Handle Tables. */ diff --git a/src/VBox/Runtime/testcase/tstIoCtl.cpp b/src/VBox/Runtime/testcase/tstIoCtl.cpp index 0f592b90b..31e901ef8 100644 --- a/src/VBox/Runtime/testcase/tstIoCtl.cpp +++ b/src/VBox/Runtime/testcase/tstIoCtl.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIoCtl.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstIoCtl.cpp $ */ /** @file * IPRT Testcase - file IoCtl. */ diff --git a/src/VBox/Runtime/testcase/tstIprtList.cpp b/src/VBox/Runtime/testcase/tstIprtList.cpp index 31acd089e..eb5785fc1 100644 --- a/src/VBox/Runtime/testcase/tstIprtList.cpp +++ b/src/VBox/Runtime/testcase/tstIprtList.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIprtList.cpp 37861 2011-07-11 10:03:22Z vboxsync $ */ +/* $Id: tstIprtList.cpp $ */ /** @file * IPRT Testcase - RTCList/RTCMTList. */ diff --git a/src/VBox/Runtime/testcase/tstIprtMiniString.cpp b/src/VBox/Runtime/testcase/tstIprtMiniString.cpp index b4d58e8ab..eb28e00ea 100644 --- a/src/VBox/Runtime/testcase/tstIprtMiniString.cpp +++ b/src/VBox/Runtime/testcase/tstIprtMiniString.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIprtMiniString.cpp 36561 2011-04-05 13:42:59Z vboxsync $ */ +/* $Id: tstIprtMiniString.cpp $ */ /** @file * IPRT Testcase - RTCString. */ diff --git a/src/VBox/Runtime/testcase/tstLdr-2.cpp b/src/VBox/Runtime/testcase/tstLdr-2.cpp index dbeb310e6..9dcb2ca7e 100644 --- a/src/VBox/Runtime/testcase/tstLdr-2.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdr-2.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstLdr-2.cpp $ */ /** @file * IPRT - Testcase for parts of RTLdr*, manual inspection. */ diff --git a/src/VBox/Runtime/testcase/tstLdr-3.cpp b/src/VBox/Runtime/testcase/tstLdr-3.cpp index f8fb66880..cfda66ac9 100644 --- a/src/VBox/Runtime/testcase/tstLdr-3.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-3.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdr-3.cpp 32878 2010-10-03 20:30:49Z vboxsync $ */ +/* $Id: tstLdr-3.cpp $ */ /** @file * IPRT - Testcase for parts of RTLdr*, manual inspection. */ diff --git a/src/VBox/Runtime/testcase/tstLdr-4.cpp b/src/VBox/Runtime/testcase/tstLdr-4.cpp index c385f3ca9..bfe1959f8 100644 --- a/src/VBox/Runtime/testcase/tstLdr-4.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-4.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdr-4.cpp 33269 2010-10-20 15:42:28Z vboxsync $ */ +/* $Id: tstLdr-4.cpp $ */ /** @file * IPRT - Testcase for RTLdrOpen using ldrLdrObjR0.r0. */ diff --git a/src/VBox/Runtime/testcase/tstLdr.cpp b/src/VBox/Runtime/testcase/tstLdr.cpp index 9b2a0ae4c..8003bdc2f 100644 --- a/src/VBox/Runtime/testcase/tstLdr.cpp +++ b/src/VBox/Runtime/testcase/tstLdr.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdr.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstLdr.cpp $ */ /** @file * IPRT - Testcase for parts of RTLdr*. */ diff --git a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp index aaa75b836..ad50e9ad2 100644 --- a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp +++ b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdrDisasmTest.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstLdrDisasmTest.cpp $ */ /** @file * IPRT - RTLdr test object. * diff --git a/src/VBox/Runtime/testcase/tstLdrLoad.cpp b/src/VBox/Runtime/testcase/tstLdrLoad.cpp index 7d794e222..ce9b283f4 100644 --- a/src/VBox/Runtime/testcase/tstLdrLoad.cpp +++ b/src/VBox/Runtime/testcase/tstLdrLoad.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdrLoad.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstLdrLoad.cpp $ */ /** @file * IPRT Testcase - Native Loader. */ diff --git a/src/VBox/Runtime/testcase/tstLdrObj.cpp b/src/VBox/Runtime/testcase/tstLdrObj.cpp index ff806a02d..314f10b74 100644 --- a/src/VBox/Runtime/testcase/tstLdrObj.cpp +++ b/src/VBox/Runtime/testcase/tstLdrObj.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdrObj.cpp 38325 2011-08-05 14:11:58Z vboxsync $ */ +/* $Id: tstLdrObj.cpp $ */ /** @file * IPRT - RTLdr test object. * diff --git a/src/VBox/Runtime/testcase/tstLdrObjR0.cpp b/src/VBox/Runtime/testcase/tstLdrObjR0.cpp index 93e96389b..23c220d4e 100644 --- a/src/VBox/Runtime/testcase/tstLdrObjR0.cpp +++ b/src/VBox/Runtime/testcase/tstLdrObjR0.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdrObjR0.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstLdrObjR0.cpp $ */ /** @file * IPRT - RTLdr test object. * diff --git a/src/VBox/Runtime/testcase/tstLog.cpp b/src/VBox/Runtime/testcase/tstLog.cpp index d1a31f810..1e1366c7b 100644 --- a/src/VBox/Runtime/testcase/tstLog.cpp +++ b/src/VBox/Runtime/testcase/tstLog.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLog.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstLog.cpp $ */ /** @file * IPRT Testcase - Log Formatting. */ diff --git a/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp b/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp index 946194944..6bc3e2677 100644 --- a/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp +++ b/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMemAutoPtr.cpp 36529 2011-04-04 13:54:13Z vboxsync $ */ +/* $Id: tstMemAutoPtr.cpp $ */ /** @file * IPRT - Testcase the RTCMemAutoPtr template. */ diff --git a/src/VBox/Runtime/testcase/tstMove.cpp b/src/VBox/Runtime/testcase/tstMove.cpp index a2589795e..ad8d9870c 100644 --- a/src/VBox/Runtime/testcase/tstMove.cpp +++ b/src/VBox/Runtime/testcase/tstMove.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMove.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstMove.cpp $ */ /** @file * IPRT - RTFileMove & RTDirMove test program. */ diff --git a/src/VBox/Runtime/testcase/tstMp-1.cpp b/src/VBox/Runtime/testcase/tstMp-1.cpp index 1de62c71b..736f5181d 100644 --- a/src/VBox/Runtime/testcase/tstMp-1.cpp +++ b/src/VBox/Runtime/testcase/tstMp-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMp-1.cpp 33814 2010-11-05 21:28:14Z vboxsync $ */ +/* $Id: tstMp-1.cpp $ */ /** @file * IPRT Testcase - RTMp. */ diff --git a/src/VBox/Runtime/testcase/tstNoCrt-1.cpp b/src/VBox/Runtime/testcase/tstNoCrt-1.cpp index fc8db47c7..84afa1c53 100644 --- a/src/VBox/Runtime/testcase/tstNoCrt-1.cpp +++ b/src/VBox/Runtime/testcase/tstNoCrt-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstNoCrt-1.cpp 30320 2010-06-21 08:35:09Z vboxsync $ */ +/* $Id: tstNoCrt-1.cpp $ */ /** @file * IPRT Testcase - Testcase for the No-CRT assembly bits. */ diff --git a/src/VBox/Runtime/testcase/tstOnce.cpp b/src/VBox/Runtime/testcase/tstOnce.cpp index 15c717e73..bd48bcf96 100644 --- a/src/VBox/Runtime/testcase/tstOnce.cpp +++ b/src/VBox/Runtime/testcase/tstOnce.cpp @@ -1,4 +1,4 @@ -/* $Id: tstOnce.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstOnce.cpp $ */ /** @file * IPRT Testcase - RTOnce. */ diff --git a/src/VBox/Runtime/testcase/tstPrfRT.cpp b/src/VBox/Runtime/testcase/tstPrfRT.cpp index 0a8c1003b..68be5fe59 100644 --- a/src/VBox/Runtime/testcase/tstPrfRT.cpp +++ b/src/VBox/Runtime/testcase/tstPrfRT.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPrfRT.cpp 29250 2010-05-09 17:53:58Z vboxsync $ */ +/* $Id: tstPrfRT.cpp $ */ /** @file * IPRT testcase - profile some of the important functions. */ diff --git a/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp b/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp index ca91925c9..0c0cfd8d6 100644 --- a/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp +++ b/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp @@ -1,4 +1,4 @@ -/* $Id: tstR0ThreadPreemption.cpp 29250 2010-05-09 17:53:58Z vboxsync $ */ +/* $Id: tstR0ThreadPreemption.cpp $ */ /** @file * IPRT R0 Testcase - Thread Preemption. */ diff --git a/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h b/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h index a5b993662..f37376428 100644 --- a/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h +++ b/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h @@ -1,4 +1,4 @@ -/* $Id: tstR0ThreadPreemption.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstR0ThreadPreemption.h $ */ /** @file * IPRT R0 Testcase - Thread Preemption, common header. */ diff --git a/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp b/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp index b09a08dc3..921269391 100644 --- a/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp +++ b/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp @@ -1,4 +1,4 @@ -/* $Id: tstR0ThreadPreemptionDriver.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstR0ThreadPreemptionDriver.cpp $ */ /** @file * IPRT R0 Testcase - Thread Preemption, driver program. */ diff --git a/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp b/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp index dd3e5538d..c39cefc77 100644 --- a/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp +++ b/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTAssertCompile.cpp 37809 2011-07-07 08:15:02Z vboxsync $ */ +/* $Id: tstRTAssertCompile.cpp $ */ /** @file * IPRT Testcase - AssertCompile* - A Compile Time Testcase. */ diff --git a/src/VBox/Runtime/testcase/tstRTAvl.cpp b/src/VBox/Runtime/testcase/tstRTAvl.cpp index 067ef9816..e77f68113 100644 --- a/src/VBox/Runtime/testcase/tstRTAvl.cpp +++ b/src/VBox/Runtime/testcase/tstRTAvl.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTAvl.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRTAvl.cpp $ */ /** @file * IPRT Testcase - AVL trees. */ diff --git a/src/VBox/Runtime/testcase/tstRTBase64.cpp b/src/VBox/Runtime/testcase/tstRTBase64.cpp index 41f905c5e..bbb2c38d9 100644 --- a/src/VBox/Runtime/testcase/tstRTBase64.cpp +++ b/src/VBox/Runtime/testcase/tstRTBase64.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTBase64.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTBase64.cpp $ */ /** @file * IPRT Testcase - Base64. */ diff --git a/src/VBox/Runtime/testcase/tstRTBitOperations.cpp b/src/VBox/Runtime/testcase/tstRTBitOperations.cpp index a962ec69e..f7a0c5a10 100644 --- a/src/VBox/Runtime/testcase/tstRTBitOperations.cpp +++ b/src/VBox/Runtime/testcase/tstRTBitOperations.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTBitOperations.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTBitOperations.cpp $ */ /** @file * IPRT Testcase - Inlined Bit Operations. */ diff --git a/src/VBox/Runtime/testcase/tstRTCidr.cpp b/src/VBox/Runtime/testcase/tstRTCidr.cpp index 270ac2549..48c5ed375 100644 --- a/src/VBox/Runtime/testcase/tstRTCidr.cpp +++ b/src/VBox/Runtime/testcase/tstRTCidr.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTCidr.cpp 29845 2010-05-27 11:29:36Z vboxsync $ */ +/* $Id: tstRTCidr.cpp $ */ /** @file * IPRT Testcase - IPv4. */ diff --git a/src/VBox/Runtime/testcase/tstRTCircBuf.cpp b/src/VBox/Runtime/testcase/tstRTCircBuf.cpp index 7cb8ef81e..60b2c1776 100644 --- a/src/VBox/Runtime/testcase/tstRTCircBuf.cpp +++ b/src/VBox/Runtime/testcase/tstRTCircBuf.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTCircBuf.cpp 37210 2011-05-25 09:55:16Z vboxsync $ */ +/* $Id: tstRTCircBuf.cpp $ */ /** @file * IPRT Testcase - Lock free circular buffers. */ diff --git a/src/VBox/Runtime/testcase/tstRTCoreDump.cpp b/src/VBox/Runtime/testcase/tstRTCoreDump.cpp index dd5b2ddf9..7594f71b4 100644 --- a/src/VBox/Runtime/testcase/tstRTCoreDump.cpp +++ b/src/VBox/Runtime/testcase/tstRTCoreDump.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTCoreDump.cpp 37631 2011-06-24 13:25:07Z vboxsync $ */ +/* $Id: tstRTCoreDump.cpp $ */ /** @file * IPRT Testcase - Core Dumper. */ diff --git a/src/VBox/Runtime/testcase/tstRTCoreDump.h b/src/VBox/Runtime/testcase/tstRTCoreDump.h index 9220a0873..524db6628 100644 --- a/src/VBox/Runtime/testcase/tstRTCoreDump.h +++ b/src/VBox/Runtime/testcase/tstRTCoreDump.h @@ -1,4 +1,4 @@ -/* $Id: tstRTCoreDump.h 31796 2010-08-19 16:18:42Z vboxsync $ */ +/* $Id: tstRTCoreDump.h $ */ /** @file * IPRT Testcase - Core dump, header. */ diff --git a/src/VBox/Runtime/testcase/tstRTCritSect.cpp b/src/VBox/Runtime/testcase/tstRTCritSect.cpp index 697fa8f81..0f046cd05 100644 --- a/src/VBox/Runtime/testcase/tstRTCritSect.cpp +++ b/src/VBox/Runtime/testcase/tstRTCritSect.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTCritSect.cpp 36492 2011-04-01 12:53:59Z vboxsync $ */ +/* $Id: tstRTCritSect.cpp $ */ /** @file * IPRT Testcase - Critical Sections. */ diff --git a/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp b/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp index aee8ee7d0..789578023 100644 --- a/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp +++ b/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTDarwinMachKernel.cpp 37573 2011-06-21 11:40:11Z vboxsync $ */ +/* $Id: tstRTDarwinMachKernel.cpp $ */ /** @file * IPRT Testcase - mach_kernel symbol resolving hack. */ diff --git a/src/VBox/Runtime/testcase/tstRTDigest.cpp b/src/VBox/Runtime/testcase/tstRTDigest.cpp index ecad8301d..4be63c1ea 100644 --- a/src/VBox/Runtime/testcase/tstRTDigest.cpp +++ b/src/VBox/Runtime/testcase/tstRTDigest.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTDigest.cpp 33806 2010-11-05 17:20:15Z vboxsync $ */ +/* $Id: tstRTDigest.cpp $ */ /** @file * IPRT Testcase - RTSha*, RTMd5, RTCrc*. */ diff --git a/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp b/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp index 0b723d6eb..89e371aff 100644 --- a/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp +++ b/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTDirCreateUniqueNumbered.cpp 36577 2011-04-06 13:35:17Z vboxsync $ */ +/* $Id: tstRTDirCreateUniqueNumbered.cpp $ */ /** @file * IPRT Testcase - Unique directory creation. */ diff --git a/src/VBox/Runtime/testcase/tstRTDvm.cpp b/src/VBox/Runtime/testcase/tstRTDvm.cpp index ecfa2fa71..a218d3452 100644 --- a/src/VBox/Runtime/testcase/tstRTDvm.cpp +++ b/src/VBox/Runtime/testcase/tstRTDvm.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTDvm.cpp 37270 2011-05-30 21:25:42Z vboxsync $ */ +/* $Id: tstRTDvm.cpp $ */ /** @file * IPRT Testcase - IPRT Disk Volume Management (DVM) */ diff --git a/src/VBox/Runtime/testcase/tstRTFileAio.cpp b/src/VBox/Runtime/testcase/tstRTFileAio.cpp index 9e3da3d83..b164083f2 100644 --- a/src/VBox/Runtime/testcase/tstRTFileAio.cpp +++ b/src/VBox/Runtime/testcase/tstRTFileAio.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTFileAio.cpp 29393 2010-05-12 00:20:38Z vboxsync $ */ +/* $Id: tstRTFileAio.cpp $ */ /** @file * IPRT Testcase - File Async I/O. */ diff --git a/src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp b/src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp index d9a977eb4..c18940b3a 100644 --- a/src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp +++ b/src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTFileAppend-1.cpp 29393 2010-05-12 00:20:38Z vboxsync $ */ +/* $Id: tstRTFileAppend-1.cpp $ */ /** @file * IPRT Testcase - File Appending. */ diff --git a/src/VBox/Runtime/testcase/tstRTFsQueries.cpp b/src/VBox/Runtime/testcase/tstRTFsQueries.cpp index 276a5464d..42320d797 100644 --- a/src/VBox/Runtime/testcase/tstRTFsQueries.cpp +++ b/src/VBox/Runtime/testcase/tstRTFsQueries.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTFsQueries.cpp 30365 2010-06-22 12:08:20Z vboxsync $ */ +/* $Id: tstRTFsQueries.cpp $ */ /** @file * IPRT Testcase - RTFs Queries.. */ diff --git a/src/VBox/Runtime/testcase/tstRTGetOpt.cpp b/src/VBox/Runtime/testcase/tstRTGetOpt.cpp index 07a249027..9505f80e3 100644 --- a/src/VBox/Runtime/testcase/tstRTGetOpt.cpp +++ b/src/VBox/Runtime/testcase/tstRTGetOpt.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTGetOpt.cpp 34542 2010-11-30 22:57:21Z vboxsync $ */ +/* $Id: tstRTGetOpt.cpp $ */ /** @file * IPRT Testcase - RTGetOpt */ diff --git a/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp b/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp index baaab0318..27c067683 100644 --- a/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp +++ b/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTGetOptArgv.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTGetOptArgv.cpp $ */ /** @file * IPRT Testcase - RTGetOptArgv*. */ diff --git a/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp b/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp index d017f5c27..467619a2a 100644 --- a/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp +++ b/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTHeapOffset.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTHeapOffset.cpp $ */ /** @file * IPRT Testcase - Offset Based Heap. */ diff --git a/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp b/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp index 7921a1482..ef763466f 100644 --- a/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp +++ b/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTHeapSimple.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTHeapSimple.cpp $ */ /** @file * IPRT Testcase - Simple Heap. */ diff --git a/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp b/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp index 87287ec6d..925b23b51 100644 --- a/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp +++ b/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTInlineAsm.cpp 33207 2010-10-18 15:02:47Z vboxsync $ */ +/* $Id: tstRTInlineAsm.cpp $ */ /** @file * IPRT Testcase - inline assembly. */ diff --git a/src/VBox/Runtime/testcase/tstRTList.cpp b/src/VBox/Runtime/testcase/tstRTList.cpp index 4306f3018..fdbba25da 100644 --- a/src/VBox/Runtime/testcase/tstRTList.cpp +++ b/src/VBox/Runtime/testcase/tstRTList.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTList.cpp 34406 2010-11-26 16:45:34Z vboxsync $ */ +/* $Id: tstRTList.cpp $ */ /** @file * IPRT Testcase - List interface. */ diff --git a/src/VBox/Runtime/testcase/tstRTLockValidator.cpp b/src/VBox/Runtime/testcase/tstRTLockValidator.cpp index b295d7922..575a97fa6 100644 --- a/src/VBox/Runtime/testcase/tstRTLockValidator.cpp +++ b/src/VBox/Runtime/testcase/tstRTLockValidator.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTLockValidator.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRTLockValidator.cpp $ */ /** @file * IPRT Testcase - RTLockValidator. */ diff --git a/src/VBox/Runtime/testcase/tstRTManifest.cpp b/src/VBox/Runtime/testcase/tstRTManifest.cpp index 61d3cf143..629815d8d 100644 --- a/src/VBox/Runtime/testcase/tstRTManifest.cpp +++ b/src/VBox/Runtime/testcase/tstRTManifest.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTManifest.cpp 34464 2010-11-29 13:45:37Z vboxsync $ */ +/* $Id: tstRTManifest.cpp $ */ /** @file * IPRT Testcase - Manifest files. */ diff --git a/src/VBox/Runtime/testcase/tstRTMemCache.cpp b/src/VBox/Runtime/testcase/tstRTMemCache.cpp index 2b4499788..73c481460 100644 --- a/src/VBox/Runtime/testcase/tstRTMemCache.cpp +++ b/src/VBox/Runtime/testcase/tstRTMemCache.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTMemCache.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTMemCache.cpp $ */ /** @file * IPRT Testcase - RTMemCache. */ diff --git a/src/VBox/Runtime/testcase/tstRTMemEf.cpp b/src/VBox/Runtime/testcase/tstRTMemEf.cpp index ca73b1f9f..e4761dd0c 100644 --- a/src/VBox/Runtime/testcase/tstRTMemEf.cpp +++ b/src/VBox/Runtime/testcase/tstRTMemEf.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTMemEf.cpp 36580 2011-04-06 13:52:10Z vboxsync $ */ +/* $Id: tstRTMemEf.cpp $ */ /** @file * IPRT - Testcase for the RTMemEf* functions. */ diff --git a/src/VBox/Runtime/testcase/tstRTMemPool.cpp b/src/VBox/Runtime/testcase/tstRTMemPool.cpp index c04f734c5..2956eb0f4 100644 --- a/src/VBox/Runtime/testcase/tstRTMemPool.cpp +++ b/src/VBox/Runtime/testcase/tstRTMemPool.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTMemPool.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRTMemPool.cpp $ */ /** @file * IPRT Testcase - MemPool. */ diff --git a/src/VBox/Runtime/testcase/tstRTPath.cpp b/src/VBox/Runtime/testcase/tstRTPath.cpp index b91555bbd..cd97f55fb 100644 --- a/src/VBox/Runtime/testcase/tstRTPath.cpp +++ b/src/VBox/Runtime/testcase/tstRTPath.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTPath.cpp 36881 2011-04-29 09:17:05Z vboxsync $ */ +/* $Id: tstRTPath.cpp $ */ /** @file * IPRT Testcase - Test various path functions. */ diff --git a/src/VBox/Runtime/testcase/tstRTPipe.cpp b/src/VBox/Runtime/testcase/tstRTPipe.cpp index 74862c227..dfb73685d 100644 --- a/src/VBox/Runtime/testcase/tstRTPipe.cpp +++ b/src/VBox/Runtime/testcase/tstRTPipe.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTPipe.cpp 33806 2010-11-05 17:20:15Z vboxsync $ */ +/* $Id: tstRTPipe.cpp $ */ /** @file * IPRT Testcase - RTPipe. */ diff --git a/src/VBox/Runtime/testcase/tstRTPoll.cpp b/src/VBox/Runtime/testcase/tstRTPoll.cpp index 9b9e09d93..8e14c23d7 100644 --- a/src/VBox/Runtime/testcase/tstRTPoll.cpp +++ b/src/VBox/Runtime/testcase/tstRTPoll.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTPoll.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTPoll.cpp $ */ /** @file * IPRT Testcase - RTPoll. */ diff --git a/src/VBox/Runtime/testcase/tstRTPrfIO.cpp b/src/VBox/Runtime/testcase/tstRTPrfIO.cpp index 9c3a516d8..7b2bfe11d 100644 --- a/src/VBox/Runtime/testcase/tstRTPrfIO.cpp +++ b/src/VBox/Runtime/testcase/tstRTPrfIO.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTPrfIO.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRTPrfIO.cpp $ */ /** @file * IPRT Testcase - Profile IPRT I/O APIs. */ @@ -210,7 +210,7 @@ int main(int argc, char **argv) break; case 'V': - RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "$Revision: 33540 $\n"); + RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "$Revision: 67140 $\n"); return RTTestSummaryAndDestroy(g_hTest); case 'h': diff --git a/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp b/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp index ef0a8c008..0e3019ac4 100644 --- a/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp +++ b/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTProcCreateEx.cpp 33806 2010-11-05 17:20:15Z vboxsync $ */ +/* $Id: tstRTProcCreateEx.cpp $ */ /** @file * IPRT Testcase - RTProcCreateEx. */ diff --git a/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp b/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp index a872808ce..578985eae 100644 --- a/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp +++ b/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTProcIsRunningByName.cpp 33806 2010-11-05 17:20:15Z vboxsync $ */ +/* $Id: tstRTProcIsRunningByName.cpp $ */ /** @file * IPRT Testcase - RTProcIsRunningByName */ diff --git a/src/VBox/Runtime/testcase/tstRTProcWait.cpp b/src/VBox/Runtime/testcase/tstRTProcWait.cpp index 6217521e9..210988a8d 100644 --- a/src/VBox/Runtime/testcase/tstRTProcWait.cpp +++ b/src/VBox/Runtime/testcase/tstRTProcWait.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTProcWait.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTProcWait.cpp $ */ /** @file * IPRT Testcase - RTProcWait. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0Common.h b/src/VBox/Runtime/testcase/tstRTR0Common.h index 2b246e466..196e5f9de 100644 --- a/src/VBox/Runtime/testcase/tstRTR0Common.h +++ b/src/VBox/Runtime/testcase/tstRTR0Common.h @@ -1,4 +1,4 @@ -/* $Id: tstRTR0Common.h 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRTR0Common.h $ */ /** @file * IPRT R0 Testcase - Common header. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h b/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h index 1bacfba26..b381383c6 100644 --- a/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h +++ b/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h @@ -1,4 +1,4 @@ -/* $Id: tstRTR0CommonDriver.h 32736 2010-09-23 16:19:46Z vboxsync $ */ +/* $Id: tstRTR0CommonDriver.h $ */ /** @file * IPRT R0 Testcase - Common header for the testcase drivers. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0CommonReq.h b/src/VBox/Runtime/testcase/tstRTR0CommonReq.h index 54924d79b..b32e174d2 100644 --- a/src/VBox/Runtime/testcase/tstRTR0CommonReq.h +++ b/src/VBox/Runtime/testcase/tstRTR0CommonReq.h @@ -1,4 +1,4 @@ -/* $Id: tstRTR0CommonReq.h 32648 2010-09-20 16:17:03Z vboxsync $ */ +/* $Id: tstRTR0CommonReq.h $ */ /** @file * IPRT R0 Testcase - Common header defining the request packet. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp index 4f504b6b3..4fc007651 100644 --- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTR0MemUserKernel.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTR0MemUserKernel.cpp $ */ /** @file * IPRT R0 Testcase - Thread Preemption. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h index f1d09aba0..7efbeed55 100644 --- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h +++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h @@ -1,4 +1,4 @@ -/* $Id: tstRTR0MemUserKernel.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTR0MemUserKernel.h $ */ /** @file * IPRT R0 Testcase - User & Kernel Memory, common header. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp index 3f5e9de6d..dddcb775c 100644 --- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTR0MemUserKernelDriver.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTR0MemUserKernelDriver.cpp $ */ /** @file * IPRT R0 Testcase - Thread Preemption, driver program. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp b/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp index 26368f9eb..944180755 100644 --- a/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTR0SemMutex.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTR0SemMutex.cpp $ */ /** @file * IPRT R0 Testcase - Mutex Semaphores. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0SemMutex.h b/src/VBox/Runtime/testcase/tstRTR0SemMutex.h index 020383c60..ee5cf4d5e 100644 --- a/src/VBox/Runtime/testcase/tstRTR0SemMutex.h +++ b/src/VBox/Runtime/testcase/tstRTR0SemMutex.h @@ -1,4 +1,4 @@ -/* $Id: tstRTR0SemMutex.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTR0SemMutex.h $ */ /** @file * IPRT R0 Testcase - Mutex Semaphores, common header. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp index 10c5054d3..6ac25ff1f 100644 --- a/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTR0SemMutexDriver.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRTR0SemMutexDriver.cpp $ */ /** @file * IPRT R0 Testcase - Thread Preemption, driver program. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0Timer.cpp b/src/VBox/Runtime/testcase/tstRTR0Timer.cpp index 21992a5ea..4700ad5a7 100644 --- a/src/VBox/Runtime/testcase/tstRTR0Timer.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0Timer.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTR0Timer.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRTR0Timer.cpp $ */ /** @file * IPRT R0 Testcase - Timers. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0Timer.h b/src/VBox/Runtime/testcase/tstRTR0Timer.h index 5ecddd4cf..8699490f0 100644 --- a/src/VBox/Runtime/testcase/tstRTR0Timer.h +++ b/src/VBox/Runtime/testcase/tstRTR0Timer.h @@ -1,4 +1,4 @@ -/* $Id: tstRTR0Timer.h 32736 2010-09-23 16:19:46Z vboxsync $ */ +/* $Id: tstRTR0Timer.h $ */ /** @file * IPRT R0 Testcase - Timers, common header. */ diff --git a/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp index f0d190f8c..8b34cbd1a 100644 --- a/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTR0TimerDriver.cpp 32753 2010-09-24 09:57:49Z vboxsync $ */ +/* $Id: tstRTR0TimerDriver.cpp $ */ /** @file * IPRT R0 Testcase - Timers, driver program. */ diff --git a/src/VBox/Runtime/testcase/tstRTS3.cpp b/src/VBox/Runtime/testcase/tstRTS3.cpp index a5456df1b..6dda00540 100644 --- a/src/VBox/Runtime/testcase/tstRTS3.cpp +++ b/src/VBox/Runtime/testcase/tstRTS3.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTS3.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTS3.cpp $ */ /** @file * IPRT Testcase - Simple Storage Service (S3) Communication API */ diff --git a/src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp b/src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp index 598ae803b..3857a4c3e 100644 --- a/src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp +++ b/src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTSemEventMulti.cpp 32970 2010-10-07 10:08:00Z vboxsync $ */ +/* $Id: tstRTSemEventMulti.cpp $ */ /** @file * IPRT Testcase - Multiple Release Event Semaphores. */ diff --git a/src/VBox/Runtime/testcase/tstRTSemRW.cpp b/src/VBox/Runtime/testcase/tstRTSemRW.cpp index 7032f240b..06575bce2 100644 --- a/src/VBox/Runtime/testcase/tstRTSemRW.cpp +++ b/src/VBox/Runtime/testcase/tstRTSemRW.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTSemRW.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTSemRW.cpp $ */ /** @file * IPRT Testcase - Reader/Writer Semaphore. */ diff --git a/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp b/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp index 30aea892f..86169536c 100644 --- a/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp +++ b/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTSemXRoads.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTSemXRoads.cpp $ */ /** @file * IPRT Testcase - RTSemXRoads. */ diff --git a/src/VBox/Runtime/testcase/tstRTSort.cpp b/src/VBox/Runtime/testcase/tstRTSort.cpp index dff8aec79..0bc0e8371 100644 --- a/src/VBox/Runtime/testcase/tstRTSort.cpp +++ b/src/VBox/Runtime/testcase/tstRTSort.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTSort.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTSort.cpp $ */ /** @file * IPRT Testcase - Sorting. */ diff --git a/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp b/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp index 2ebcef989..6f49cb0eb 100644 --- a/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp +++ b/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTStrAlloc.cpp 33285 2010-10-21 09:41:51Z vboxsync $ */ +/* $Id: tstRTStrAlloc.cpp $ */ /** @file * IPRT Testcase - String allocation APIs and related manipulators. */ diff --git a/src/VBox/Runtime/testcase/tstRTStrCache.cpp b/src/VBox/Runtime/testcase/tstRTStrCache.cpp index 6078eb90b..ef466554b 100644 --- a/src/VBox/Runtime/testcase/tstRTStrCache.cpp +++ b/src/VBox/Runtime/testcase/tstRTStrCache.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTStrCache.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTStrCache.cpp $ */ /** @file * IPRT Testcase - StrCache. */ diff --git a/src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp b/src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp index 3b1f09e8d..36ab67683 100644 --- a/src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp +++ b/src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTStrCatCopy.cpp 33678 2010-11-02 10:30:46Z vboxsync $ */ +/* $Id: tstRTStrCatCopy.cpp $ */ /** @file * IPRT Testcase - String Concatenation and Copy. */ diff --git a/src/VBox/Runtime/testcase/tstRTStrFormat.cpp b/src/VBox/Runtime/testcase/tstRTStrFormat.cpp index 37bb36976..7af97859d 100644 --- a/src/VBox/Runtime/testcase/tstRTStrFormat.cpp +++ b/src/VBox/Runtime/testcase/tstRTStrFormat.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTStrFormat.cpp 37966 2011-07-14 13:39:15Z vboxsync $ */ +/* $Id: tstRTStrFormat.cpp $ */ /** @file * IPRT Testcase - String formatting. */ diff --git a/src/VBox/Runtime/testcase/tstRTStrVersion.cpp b/src/VBox/Runtime/testcase/tstRTStrVersion.cpp index fe85f0c5f..6f7ee8209 100644 --- a/src/VBox/Runtime/testcase/tstRTStrVersion.cpp +++ b/src/VBox/Runtime/testcase/tstRTStrVersion.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTStrVersion.cpp 37016 2011-05-09 17:48:43Z vboxsync $ */ +/* $Id: tstRTStrVersion.cpp $ */ /** @file * IPRT Testcase - Version String Comparison. */ diff --git a/src/VBox/Runtime/testcase/tstRTSymlink.cpp b/src/VBox/Runtime/testcase/tstRTSymlink.cpp index c284f368e..007db683a 100644 --- a/src/VBox/Runtime/testcase/tstRTSymlink.cpp +++ b/src/VBox/Runtime/testcase/tstRTSymlink.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTSymlink.cpp 33806 2010-11-05 17:20:15Z vboxsync $ */ +/* $Id: tstRTSymlink.cpp $ */ /** @file * IPRT Testcase - Symbolic Links. */ diff --git a/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp b/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp index 7e23ec58a..a92b22ba1 100644 --- a/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp +++ b/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTSystemQueryDmi.cpp 30320 2010-06-21 08:35:09Z vboxsync $ */ +/* $Id: tstRTSystemQueryDmi.cpp $ */ /** @file * IPRT Testcase - RTSystemQueryDmi*. */ diff --git a/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp b/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp index ec22f4095..d2febda33 100644 --- a/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp +++ b/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTSystemQueryOsInfo.cpp 30320 2010-06-21 08:35:09Z vboxsync $ */ +/* $Id: tstRTSystemQueryOsInfo.cpp $ */ /** @file * IPRT Testcase - RTSystemQueryOSInfo. */ diff --git a/src/VBox/Runtime/testcase/tstRTTemp.cpp b/src/VBox/Runtime/testcase/tstRTTemp.cpp index c3d107296..1b3b31a1d 100644 --- a/src/VBox/Runtime/testcase/tstRTTemp.cpp +++ b/src/VBox/Runtime/testcase/tstRTTemp.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTTemp.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRTTemp.cpp $ */ /** @file * IPRT Testcase - Temporary files and directories. */ diff --git a/src/VBox/Runtime/testcase/tstRTThreadExecutionTime.cpp b/src/VBox/Runtime/testcase/tstRTThreadExecutionTime.cpp index b5a814c53..4050791c9 100644 --- a/src/VBox/Runtime/testcase/tstRTThreadExecutionTime.cpp +++ b/src/VBox/Runtime/testcase/tstRTThreadExecutionTime.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTThreadExecutionTime.cpp 34629 2010-12-02 17:09:09Z vboxsync $ */ +/* $Id: tstRTThreadExecutionTime.cpp $ */ /** @file * IPRT Testcase - RTThreadGetExecution. */ diff --git a/src/VBox/Runtime/testcase/tstRTThreadPoke.cpp b/src/VBox/Runtime/testcase/tstRTThreadPoke.cpp index 2e2938e4d..47588db89 100644 --- a/src/VBox/Runtime/testcase/tstRTThreadPoke.cpp +++ b/src/VBox/Runtime/testcase/tstRTThreadPoke.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTThreadPoke.cpp 35351 2010-12-27 17:04:17Z vboxsync $ */ +/* $Id: tstRTThreadPoke.cpp $ */ /** @file * IPRT Testcase - RTThreadPoke. */ diff --git a/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp b/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp index 27ce88943..08f5cc90b 100644 --- a/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp +++ b/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTTimeSpec.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRTTimeSpec.cpp $ */ /** @file * IPRT - RTTimeSpec and PRTTIME tests. */ diff --git a/src/VBox/Runtime/testcase/tstRTUuid.cpp b/src/VBox/Runtime/testcase/tstRTUuid.cpp index 10bd5ecaf..692bcb941 100644 --- a/src/VBox/Runtime/testcase/tstRTUuid.cpp +++ b/src/VBox/Runtime/testcase/tstRTUuid.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTUuid.cpp 32996 2010-10-08 08:12:41Z vboxsync $ */ +/* $Id: tstRTUuid.cpp $ */ /** @file * IPRT Testcase - UUID. */ diff --git a/src/VBox/Runtime/testcase/tstRand.cpp b/src/VBox/Runtime/testcase/tstRand.cpp index 5f9277045..cf82e6e74 100644 --- a/src/VBox/Runtime/testcase/tstRand.cpp +++ b/src/VBox/Runtime/testcase/tstRand.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRand.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstRand.cpp $ */ /** @file * IPRT - Testcase for the RTRand API. */ diff --git a/src/VBox/Runtime/testcase/tstSemMutex.cpp b/src/VBox/Runtime/testcase/tstSemMutex.cpp index d99c75829..d3b6722c7 100644 --- a/src/VBox/Runtime/testcase/tstSemMutex.cpp +++ b/src/VBox/Runtime/testcase/tstSemMutex.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSemMutex.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstSemMutex.cpp $ */ /** @file * IPRT Testcase - Simple Mutex Semaphore Smoke Test. */ diff --git a/src/VBox/Runtime/testcase/tstSemPingPong.cpp b/src/VBox/Runtime/testcase/tstSemPingPong.cpp index 3a6032e81..c35564731 100644 --- a/src/VBox/Runtime/testcase/tstSemPingPong.cpp +++ b/src/VBox/Runtime/testcase/tstSemPingPong.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSemPingPong.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstSemPingPong.cpp $ */ /** @file * IPRT Testcase - RTSemPing/RTSemPong. */ diff --git a/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp b/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp index 8525cd9cb..f9f11cc64 100644 --- a/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp +++ b/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp @@ -1,4 +1,4 @@ -/* $Id: tstStrSimplePattern.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstStrSimplePattern.cpp $ */ /** @file * IPRT Testcase - RTStrSimplePattern. */ diff --git a/src/VBox/Runtime/testcase/tstStrToNum.cpp b/src/VBox/Runtime/testcase/tstStrToNum.cpp index 4cb516a04..4f73c7aad 100644 --- a/src/VBox/Runtime/testcase/tstStrToNum.cpp +++ b/src/VBox/Runtime/testcase/tstStrToNum.cpp @@ -1,4 +1,4 @@ -/* $Id: tstStrToNum.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstStrToNum.cpp $ */ /** @file * IPRT Testcase - String To Number Conversion. */ diff --git a/src/VBox/Runtime/testcase/tstTSC.cpp b/src/VBox/Runtime/testcase/tstTSC.cpp index b9d21f04d..eeee218a7 100644 --- a/src/VBox/Runtime/testcase/tstTSC.cpp +++ b/src/VBox/Runtime/testcase/tstTSC.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTSC.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstTSC.cpp $ */ /** @file * IPRT Testcase - SMP TSC testcase. */ diff --git a/src/VBox/Runtime/testcase/tstTermCallbacks.cpp b/src/VBox/Runtime/testcase/tstTermCallbacks.cpp index 7405145a3..e72e16b55 100644 --- a/src/VBox/Runtime/testcase/tstTermCallbacks.cpp +++ b/src/VBox/Runtime/testcase/tstTermCallbacks.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTermCallbacks.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstTermCallbacks.cpp $ */ /** @file * IPRT Testcase - Termination Callbacks. */ diff --git a/src/VBox/Runtime/testcase/tstThread-1.cpp b/src/VBox/Runtime/testcase/tstThread-1.cpp index 3fa81fafc..b83d2fa83 100644 --- a/src/VBox/Runtime/testcase/tstThread-1.cpp +++ b/src/VBox/Runtime/testcase/tstThread-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstThread-1.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstThread-1.cpp $ */ /** @file * IPRT Testcase - Thread Testcase no.1. */ diff --git a/src/VBox/Runtime/testcase/tstTime-2.cpp b/src/VBox/Runtime/testcase/tstTime-2.cpp index db46c5268..52277e253 100644 --- a/src/VBox/Runtime/testcase/tstTime-2.cpp +++ b/src/VBox/Runtime/testcase/tstTime-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTime-2.cpp 29279 2010-05-09 23:29:11Z vboxsync $ */ +/* $Id: tstTime-2.cpp $ */ /** @file * IPRT Testcase - Simple RTTime test. */ diff --git a/src/VBox/Runtime/testcase/tstTime-3.cpp b/src/VBox/Runtime/testcase/tstTime-3.cpp index 36936f30c..e5ba1e803 100644 --- a/src/VBox/Runtime/testcase/tstTime-3.cpp +++ b/src/VBox/Runtime/testcase/tstTime-3.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTime-3.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstTime-3.cpp $ */ /** @file * IPRT Testcase - Simple RTTime test. */ diff --git a/src/VBox/Runtime/testcase/tstTime-4.cpp b/src/VBox/Runtime/testcase/tstTime-4.cpp index 41b2857c9..06895b858 100644 --- a/src/VBox/Runtime/testcase/tstTime-4.cpp +++ b/src/VBox/Runtime/testcase/tstTime-4.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTime-4.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstTime-4.cpp $ */ /** @file * IPRT Testcase - Simple RTTime vs. RTTimeSystem test. */ diff --git a/src/VBox/Runtime/testcase/tstTime.cpp b/src/VBox/Runtime/testcase/tstTime.cpp index 8ff537a50..6396e4d04 100644 --- a/src/VBox/Runtime/testcase/tstTime.cpp +++ b/src/VBox/Runtime/testcase/tstTime.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTime.cpp 29279 2010-05-09 23:29:11Z vboxsync $ */ +/* $Id: tstTime.cpp $ */ /** @file * IPRT Testcase - Simple RTTime tests. */ diff --git a/src/VBox/Runtime/testcase/tstTimer.cpp b/src/VBox/Runtime/testcase/tstTimer.cpp index c2295987c..81175de86 100644 --- a/src/VBox/Runtime/testcase/tstTimer.cpp +++ b/src/VBox/Runtime/testcase/tstTimer.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTimer.cpp 32431 2010-09-11 18:02:17Z vboxsync $ */ +/* $Id: tstTimer.cpp $ */ /** @file * IPRT Testcase - Timers. */ diff --git a/src/VBox/Runtime/testcase/tstTimerLR.cpp b/src/VBox/Runtime/testcase/tstTimerLR.cpp index 5afca3c54..e8584fb25 100644 --- a/src/VBox/Runtime/testcase/tstTimerLR.cpp +++ b/src/VBox/Runtime/testcase/tstTimerLR.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTimerLR.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstTimerLR.cpp $ */ /** @file * IPRT Testcase - Low Resolution Timers. */ diff --git a/src/VBox/Runtime/testcase/tstUtf8.cpp b/src/VBox/Runtime/testcase/tstUtf8.cpp index f68586002..453115dc1 100644 --- a/src/VBox/Runtime/testcase/tstUtf8.cpp +++ b/src/VBox/Runtime/testcase/tstUtf8.cpp @@ -1,4 +1,4 @@ -/* $Id: tstUtf8.cpp 33595 2010-10-29 10:35:00Z vboxsync $ */ +/* $Id: tstUtf8.cpp $ */ /** @file * IPRT Testcase - UTF-8 and UTF-16 string conversions. */ diff --git a/src/VBox/Runtime/testcase/tstVector.cpp b/src/VBox/Runtime/testcase/tstVector.cpp index ecc07e6ab..943a0be9b 100644 --- a/src/VBox/Runtime/testcase/tstVector.cpp +++ b/src/VBox/Runtime/testcase/tstVector.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVector.cpp 37829 2011-07-08 08:35:47Z vboxsync $ */ +/* $Id: tstVector.cpp $ */ /** @file * IPRT Testcase - Vector container structure. */ diff --git a/src/VBox/Runtime/tools/Makefile.kmk b/src/VBox/Runtime/tools/Makefile.kmk index 51b953cac..684ecc244 100644 --- a/src/VBox/Runtime/tools/Makefile.kmk +++ b/src/VBox/Runtime/tools/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 34673 2010-12-03 00:51:42Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the IPRT tools. # diff --git a/src/VBox/Runtime/tools/RTGzip.cpp b/src/VBox/Runtime/tools/RTGzip.cpp index 0f771229c..197a74f63 100644 --- a/src/VBox/Runtime/tools/RTGzip.cpp +++ b/src/VBox/Runtime/tools/RTGzip.cpp @@ -1,4 +1,4 @@ -/* $Id: RTGzip.cpp 34464 2010-11-29 13:45:37Z vboxsync $ */ +/* $Id: RTGzip.cpp $ */ /** @file * IPRT - GZIP Utility. */ diff --git a/src/VBox/Runtime/tools/RTLdrFlt.cpp b/src/VBox/Runtime/tools/RTLdrFlt.cpp index 993475cef..9e3876da5 100644 --- a/src/VBox/Runtime/tools/RTLdrFlt.cpp +++ b/src/VBox/Runtime/tools/RTLdrFlt.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLdrFlt.cpp 34464 2010-11-29 13:45:37Z vboxsync $ */ +/* $Id: RTLdrFlt.cpp $ */ /** @file * IPRT - Utility for translating addresses into symbols+offset. */ @@ -149,7 +149,7 @@ int main(int argc, char **argv) break; case 'V': - RTPrintf("$Revision: 34464 $"); + RTPrintf("$Revision: 68240 $"); return RTEXITCODE_SUCCESS; case VINF_GETOPT_NOT_OPTION: diff --git a/src/VBox/Runtime/tools/RTManifest.cpp b/src/VBox/Runtime/tools/RTManifest.cpp index e31133f49..385d271b9 100644 --- a/src/VBox/Runtime/tools/RTManifest.cpp +++ b/src/VBox/Runtime/tools/RTManifest.cpp @@ -1,4 +1,4 @@ -/* $Id: RTManifest.cpp 34466 2010-11-29 15:00:56Z vboxsync $ */ +/* $Id: RTManifest.cpp $ */ /** @file * IPRT - Manifest Utility. */ diff --git a/src/VBox/Runtime/tools/RTTar.cpp b/src/VBox/Runtime/tools/RTTar.cpp index a44d4f5b9..34e53ca9d 100644 --- a/src/VBox/Runtime/tools/RTTar.cpp +++ b/src/VBox/Runtime/tools/RTTar.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTar.cpp 34464 2010-11-29 13:45:37Z vboxsync $ */ +/* $Id: RTTar.cpp $ */ /** @file * IPRT - TAR Utility. */ diff --git a/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp b/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp index c4cbd2356..0da4c41a0 100644 --- a/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp +++ b/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromWin32.cpp 33437 2010-10-25 16:28:14Z vboxsync $ */ +/* $Id: RTErrConvertFromWin32.cpp $ */ /** @file * IPRT - Convert win32 error codes to iprt status codes. */ diff --git a/src/VBox/Runtime/win/errmsgwin.cpp b/src/VBox/Runtime/win/errmsgwin.cpp index fed8a0a82..0f5c54466 100644 --- a/src/VBox/Runtime/win/errmsgwin.cpp +++ b/src/VBox/Runtime/win/errmsgwin.cpp @@ -1,4 +1,4 @@ -/* $Id: errmsgwin.cpp 35445 2011-01-10 11:05:23Z vboxsync $ */ +/* $Id: errmsgwin.cpp $ */ /** @file * IPRT - Status code messages. */ diff --git a/src/VBox/Storage/DMG.cpp b/src/VBox/Storage/DMG.cpp index 8a8afd353..e0b44873f 100644 --- a/src/VBox/Storage/DMG.cpp +++ b/src/VBox/Storage/DMG.cpp @@ -1,4 +1,4 @@ -/* $Id: DMG.cpp 36633 2011-04-08 21:43:41Z vboxsync $ */ +/* $Id: DMG.cpp $ */ /** @file * VBoxDMG - Interpreter for Apple Disk Images (DMG). */ diff --git a/src/VBox/Storage/ISCSI.cpp b/src/VBox/Storage/ISCSI.cpp index 172c4f379..da91ddef4 100644 --- a/src/VBox/Storage/ISCSI.cpp +++ b/src/VBox/Storage/ISCSI.cpp @@ -1,4 +1,4 @@ -/* $Id: ISCSI.cpp 37688 2011-06-29 15:26:05Z vboxsync $ */ +/* $Id: ISCSI.cpp $ */ /** @file * iSCSI initiator driver, VD backend. */ diff --git a/src/VBox/Storage/Makefile.kmk b/src/VBox/Storage/Makefile.kmk index b4850d183..41978c061 100644 --- a/src/VBox/Storage/Makefile.kmk +++ b/src/VBox/Storage/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 33586 2010-10-28 22:00:52Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Storage library. # diff --git a/src/VBox/Storage/Parallels.cpp b/src/VBox/Storage/Parallels.cpp index 8d89ffc53..3aa03c3ed 100644 --- a/src/VBox/Storage/Parallels.cpp +++ b/src/VBox/Storage/Parallels.cpp @@ -1,4 +1,4 @@ -/* $Id: Parallels.cpp 38413 2011-08-11 11:18:44Z vboxsync $ */ +/* $Id: Parallels.cpp $ */ /** @file * * Parallels hdd disk image, core code. diff --git a/src/VBox/Storage/RAW.cpp b/src/VBox/Storage/RAW.cpp index e3807cde5..fb872c800 100644 --- a/src/VBox/Storage/RAW.cpp +++ b/src/VBox/Storage/RAW.cpp @@ -1,4 +1,4 @@ -/* $Id: RAW.cpp 38333 2011-08-05 15:37:03Z vboxsync $ */ +/* $Id: RAW.cpp $ */ /** @file * RawHDDCore - Raw Disk image, Core Code. */ diff --git a/src/VBox/Storage/VCICache.cpp b/src/VBox/Storage/VCICache.cpp index de60fd04b..2b84e1837 100644 --- a/src/VBox/Storage/VCICache.cpp +++ b/src/VBox/Storage/VCICache.cpp @@ -1,4 +1,4 @@ -/* $Id: VCICache.cpp 33745 2010-11-03 18:31:53Z vboxsync $ */ +/* $Id: VCICache.cpp $ */ /** @file * VCICacheCore - VirtualBox Cache Image, Core Code. */ diff --git a/src/VBox/Storage/VD.cpp b/src/VBox/Storage/VD.cpp index 25a1bda3f..3d0201c37 100644 --- a/src/VBox/Storage/VD.cpp +++ b/src/VBox/Storage/VD.cpp @@ -1,4 +1,4 @@ -/* $Id: VD.cpp 38449 2011-08-14 10:53:13Z vboxsync $ */ +/* $Id: VD.cpp $ */ /** @file * VBoxHDD - VBox HDD Container implementation. */ diff --git a/src/VBox/Storage/VDICore.h b/src/VBox/Storage/VDICore.h index 0240db2ea..1ae42ed89 100644 --- a/src/VBox/Storage/VDICore.h +++ b/src/VBox/Storage/VDICore.h @@ -1,4 +1,4 @@ -/* $Id: VDICore.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VDICore.h $ */ /** @file * Virtual Disk Image (VDI), Core Code Header (internal). */ diff --git a/src/VBox/Storage/VHD.cpp b/src/VBox/Storage/VHD.cpp index f136b272c..ebe23020c 100644 --- a/src/VBox/Storage/VHD.cpp +++ b/src/VBox/Storage/VHD.cpp @@ -1,4 +1,4 @@ -/* $Id: VHD.cpp 37737 2011-07-02 20:12:28Z vboxsync $ */ +/* $Id: VHD.cpp $ */ /** @file * VHD Disk image, Core Code. */ @@ -1652,83 +1652,81 @@ static int vhdRead(void *pBackendData, uint64_t uOffset, void *pvBuf, LogFlowFunc(("cBlockAllocationTableEntry=%u cBatEntryIndex=%u\n", cBlockAllocationTableEntry, cBATEntryIndex)); LogFlowFunc(("BlockAllocationEntry=%u\n", pImage->pBlockAllocationTable[cBlockAllocationTableEntry])); - /* - * If the block is not allocated the content of the entry is ~0 - */ - if (pImage->pBlockAllocationTable[cBlockAllocationTableEntry] == ~0U) - { - /* Return block size as read. */ - *pcbActuallyRead = RT_MIN(cbBuf, pImage->cSectorsPerDataBlock * VHD_SECTOR_SIZE); - rc = VERR_VD_BLOCK_FREE; - goto out; - } - - uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * VHD_SECTOR_SIZE; - LogFlowFunc(("uVhdOffset=%llu cbBuf=%u\n", uVhdOffset, cbBuf)); /* * Clip read range to remain in this data block. */ cbBuf = RT_MIN(cbBuf, (pImage->cbDataBlock - (cBATEntryIndex * VHD_SECTOR_SIZE))); - /* Read in the block's bitmap. */ - rc = vhdFileReadSync(pImage, - ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry]) * VHD_SECTOR_SIZE, - pImage->pu8Bitmap, pImage->cbDataBlockBitmap, - NULL); - if (RT_SUCCESS(rc)) + /* + * If the block is not allocated the content of the entry is ~0 + */ + if (pImage->pBlockAllocationTable[cBlockAllocationTableEntry] == ~0U) + rc = VERR_VD_BLOCK_FREE; + else { - uint32_t cSectors = 0; + uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * VHD_SECTOR_SIZE; + LogFlowFunc(("uVhdOffset=%llu cbBuf=%u\n", uVhdOffset, cbBuf)); - if (vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + /* Read in the block's bitmap. */ + rc = vhdFileReadSync(pImage, + ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry]) * VHD_SECTOR_SIZE, + pImage->pu8Bitmap, pImage->cbDataBlockBitmap, + NULL); + if (RT_SUCCESS(rc)) { - cBATEntryIndex++; - cSectors = 1; + uint32_t cSectors = 0; - /* - * The first sector being read is marked dirty, read as much as we - * can from child. Note that only sectors that are marked dirty - * must be read from child. - */ - while ( (cSectors < (cbBuf / VHD_SECTOR_SIZE)) - && vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + if (vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) { cBATEntryIndex++; - cSectors++; - } - - cbBuf = cSectors * VHD_SECTOR_SIZE; + cSectors = 1; + + /* + * The first sector being read is marked dirty, read as much as we + * can from child. Note that only sectors that are marked dirty + * must be read from child. + */ + while ( (cSectors < (cbBuf / VHD_SECTOR_SIZE)) + && vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + { + cBATEntryIndex++; + cSectors++; + } - LogFlowFunc(("uVhdOffset=%llu cbBuf=%u\n", uVhdOffset, cbBuf)); - rc = vhdFileReadSync(pImage, uVhdOffset, pvBuf, cbBuf, NULL); - } - else - { - /* - * The first sector being read is marked clean, so we should read from - * our parent instead, but only as much as there are the following - * clean sectors, because the block may still contain dirty sectors - * further on. We just need to compute the number of clean sectors - * and pass it to our caller along with the notification that they - * should be read from the parent. - */ - cBATEntryIndex++; - cSectors = 1; + cbBuf = cSectors * VHD_SECTOR_SIZE; - while ( (cSectors < (cbBuf / VHD_SECTOR_SIZE)) - && !vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + LogFlowFunc(("uVhdOffset=%llu cbBuf=%u\n", uVhdOffset, cbBuf)); + rc = vhdFileReadSync(pImage, uVhdOffset, pvBuf, cbBuf, NULL); + } + else { + /* + * The first sector being read is marked clean, so we should read from + * our parent instead, but only as much as there are the following + * clean sectors, because the block may still contain dirty sectors + * further on. We just need to compute the number of clean sectors + * and pass it to our caller along with the notification that they + * should be read from the parent. + */ cBATEntryIndex++; - cSectors++; - } + cSectors = 1; - cbBuf = cSectors * VHD_SECTOR_SIZE; - LogFunc(("Sectors free: uVhdOffset=%llu cbBuf=%u\n", uVhdOffset, cbBuf)); - rc = VERR_VD_BLOCK_FREE; + while ( (cSectors < (cbBuf / VHD_SECTOR_SIZE)) + && !vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + { + cBATEntryIndex++; + cSectors++; + } + + cbBuf = cSectors * VHD_SECTOR_SIZE; + LogFunc(("Sectors free: uVhdOffset=%llu cbBuf=%u\n", uVhdOffset, cbBuf)); + rc = VERR_VD_BLOCK_FREE; + } } + else + AssertMsgFailed(("Reading block bitmap failed rc=%Rrc\n", rc)); } - else - AssertMsgFailed(("Reading block bitmap failed rc=%Rrc\n", rc)); } else { @@ -2488,84 +2486,82 @@ static int vhdAsyncRead(void *pBackendData, uint64_t uOffset, size_t cbRead, LogFlowFunc(("BlockAllocationEntry=%u\n", pImage->pBlockAllocationTable[cBlockAllocationTableEntry])); /* - * If the block is not allocated the content of the entry is ~0 - */ - if (pImage->pBlockAllocationTable[cBlockAllocationTableEntry] == ~0U) - { - /* Return block size as read. */ - *pcbActuallyRead = RT_MIN(cbRead, pImage->cSectorsPerDataBlock * VHD_SECTOR_SIZE); - return VERR_VD_BLOCK_FREE; - } - - uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * VHD_SECTOR_SIZE; - LogFlowFunc(("uVhdOffset=%llu cbRead=%u\n", uVhdOffset, cbRead)); - - /* * Clip read range to remain in this data block. */ cbRead = RT_MIN(cbRead, (pImage->cbDataBlock - (cBATEntryIndex * VHD_SECTOR_SIZE))); - /* Read in the block's bitmap. */ - PVDMETAXFER pMetaXfer; - rc = vhdFileReadMetaAsync(pImage, - ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry]) * VHD_SECTOR_SIZE, - pImage->pu8Bitmap, pImage->cbDataBlockBitmap, - pIoCtx, &pMetaXfer, NULL, NULL); - - if (RT_SUCCESS(rc)) + /* + * If the block is not allocated the content of the entry is ~0 + */ + if (pImage->pBlockAllocationTable[cBlockAllocationTableEntry] == ~0U) + rc = VERR_VD_BLOCK_FREE; + else { - uint32_t cSectors = 0; + uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * VHD_SECTOR_SIZE; + LogFlowFunc(("uVhdOffset=%llu cbRead=%u\n", uVhdOffset, cbRead)); - vhdFileMetaXferRelease(pImage, pMetaXfer); - if (vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + /* Read in the block's bitmap. */ + PVDMETAXFER pMetaXfer; + rc = vhdFileReadMetaAsync(pImage, + ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry]) * VHD_SECTOR_SIZE, + pImage->pu8Bitmap, pImage->cbDataBlockBitmap, + pIoCtx, &pMetaXfer, NULL, NULL); + + if (RT_SUCCESS(rc)) { - cBATEntryIndex++; - cSectors = 1; + uint32_t cSectors = 0; - /* - * The first sector being read is marked dirty, read as much as we - * can from child. Note that only sectors that are marked dirty - * must be read from child. - */ - while ( (cSectors < (cbRead / VHD_SECTOR_SIZE)) - && vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + vhdFileMetaXferRelease(pImage, pMetaXfer); + if (vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) { cBATEntryIndex++; - cSectors++; - } + cSectors = 1; + + /* + * The first sector being read is marked dirty, read as much as we + * can from child. Note that only sectors that are marked dirty + * must be read from child. + */ + while ( (cSectors < (cbRead / VHD_SECTOR_SIZE)) + && vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + { + cBATEntryIndex++; + cSectors++; + } - cbRead = cSectors * VHD_SECTOR_SIZE; + cbRead = cSectors * VHD_SECTOR_SIZE; - LogFlowFunc(("uVhdOffset=%llu cbRead=%u\n", uVhdOffset, cbRead)); - rc = vhdFileReadUserAsync(pImage, uVhdOffset, pIoCtx, cbRead); - } - else - { - /* - * The first sector being read is marked clean, so we should read from - * our parent instead, but only as much as there are the following - * clean sectors, because the block may still contain dirty sectors - * further on. We just need to compute the number of clean sectors - * and pass it to our caller along with the notification that they - * should be read from the parent. - */ - cBATEntryIndex++; - cSectors = 1; - - while ( (cSectors < (cbRead / VHD_SECTOR_SIZE)) - && !vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + LogFlowFunc(("uVhdOffset=%llu cbRead=%u\n", uVhdOffset, cbRead)); + rc = vhdFileReadUserAsync(pImage, uVhdOffset, pIoCtx, cbRead); + } + else { + /* + * The first sector being read is marked clean, so we should read from + * our parent instead, but only as much as there are the following + * clean sectors, because the block may still contain dirty sectors + * further on. We just need to compute the number of clean sectors + * and pass it to our caller along with the notification that they + * should be read from the parent. + */ cBATEntryIndex++; - cSectors++; - } + cSectors = 1; - cbRead = cSectors * VHD_SECTOR_SIZE; - LogFunc(("Sectors free: uVhdOffset=%llu cbRead=%u\n", uVhdOffset, cbRead)); - rc = VERR_VD_BLOCK_FREE; + while ( (cSectors < (cbRead / VHD_SECTOR_SIZE)) + && !vhdBlockBitmapSectorContainsData(pImage, cBATEntryIndex)) + { + cBATEntryIndex++; + cSectors++; + } + + cbRead = cSectors * VHD_SECTOR_SIZE; + LogFunc(("Sectors free: uVhdOffset=%llu cbRead=%u\n", uVhdOffset, cbRead)); + rc = VERR_VD_BLOCK_FREE; + } } + else + AssertMsg(rc == VERR_VD_NOT_ENOUGH_METADATA, ("Reading block bitmap failed rc=%Rrc\n", rc)); } - else - AssertMsg(rc == VERR_VD_NOT_ENOUGH_METADATA, ("Reading block bitmap failed rc=%Rrc\n", rc)); } else { diff --git a/src/VBox/Storage/VMDK.cpp b/src/VBox/Storage/VMDK.cpp index d0be1bbfa..628217f6b 100644 --- a/src/VBox/Storage/VMDK.cpp +++ b/src/VBox/Storage/VMDK.cpp @@ -1,4 +1,4 @@ -/* $Id: VMDK.cpp 38030 2011-07-18 15:42:12Z vboxsync $ */ +/* $Id: VMDK.cpp $ */ /** @file * VMDK disk image, core code. */ @@ -92,6 +92,11 @@ /** Marker for footer in streamOptimized images. */ #define VMDK_MARKER_FOOTER 3 +/** Marker for unknown purpose in streamOptimized images. + * Shows up in very recent images created by vSphere, but only sporadically. + * They "forgot" to document that one in the VMDK specification. */ +#define VMDK_MARKER_UNSPECIFIED 4 + /** Dummy marker for "don't check the marker value". */ #define VMDK_MARKER_IGNORE 0xffffffffU @@ -3956,7 +3961,7 @@ static int vmdkCreateRegularImage(PVMDKIMAGE pImage, uint64_t cbSize, if (pfnProgress) { rc = pfnProgress(pvUser, - uPercentStart + uOff * uPercentSpan / cbExtent); + uPercentStart + (cbOffset + uOff) * uPercentSpan / cbSize); if (RT_FAILURE(rc)) { RTMemFree(pvBuf); @@ -4023,11 +4028,12 @@ static int vmdkCreateRegularImage(PVMDKIMAGE pImage, uint64_t cbSize, return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new grain directory in '%s'"), pExtent->pszFullname); } + cbOffset += cbExtent; + if (RT_SUCCESS(rc) && pfnProgress) - pfnProgress(pvUser, uPercentStart + i * uPercentSpan / cExtents); + pfnProgress(pvUser, uPercentStart + cbOffset * uPercentSpan / cbSize); cbRemaining -= cbExtent; - cbOffset += cbExtent; } if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_ESX) @@ -5560,6 +5566,12 @@ static int vmdkStreamReadSequential(PVMDKIMAGE pImage, PVMDKEXTENT pExtent, case VMDK_MARKER_FOOTER: uGrainSectorAbs += 2; break; + case VMDK_MARKER_UNSPECIFIED: + /* Skip over the contents of the unspecified marker + * type 4 which exists in some vSphere created files. */ + /** @todo figure out what the payload means. */ + uGrainSectorAbs += 1; + break; default: AssertMsgFailed(("VMDK: corrupted marker, type=%#x\n", Marker.uType)); pExtent->uGrainSectorAbs = 0; diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index f935b05ff..feb51d732 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the storage device & driver testcases. # diff --git a/src/VBox/Storage/testcase/VDIoBackendMem.cpp b/src/VBox/Storage/testcase/VDIoBackendMem.cpp index ccd3bfd27..eee648748 100644 --- a/src/VBox/Storage/testcase/VDIoBackendMem.cpp +++ b/src/VBox/Storage/testcase/VDIoBackendMem.cpp @@ -1,4 +1,4 @@ -/** $Id: VDIoBackendMem.cpp 36131 2011-03-02 21:56:42Z vboxsync $ */ +/** $Id: VDIoBackendMem.cpp $ */ /** @file * * VBox HDD container test utility, async I/O memory backend diff --git a/src/VBox/Storage/testcase/VDIoBackendMem.h b/src/VBox/Storage/testcase/VDIoBackendMem.h index fc65972c3..89b16dc10 100644 --- a/src/VBox/Storage/testcase/VDIoBackendMem.h +++ b/src/VBox/Storage/testcase/VDIoBackendMem.h @@ -1,4 +1,4 @@ -/** $Id: VDIoBackendMem.h 35471 2011-01-10 21:10:19Z vboxsync $ */ +/** $Id: VDIoBackendMem.h $ */ /** @file * * VBox HDD container test utility, async I/O memory backend diff --git a/src/VBox/Storage/testcase/VDIoRnd.cpp b/src/VBox/Storage/testcase/VDIoRnd.cpp index e5f915dd9..a1bc9a0b6 100644 --- a/src/VBox/Storage/testcase/VDIoRnd.cpp +++ b/src/VBox/Storage/testcase/VDIoRnd.cpp @@ -1,4 +1,4 @@ -/* $Id: VDIoRnd.cpp 36529 2011-04-04 13:54:13Z vboxsync $ */ +/* $Id: VDIoRnd.cpp $ */ /** @file * VBox HDD container test utility - I/O data generator. */ diff --git a/src/VBox/Storage/testcase/VDMemDisk.cpp b/src/VBox/Storage/testcase/VDMemDisk.cpp index 29e8872ee..a92125025 100644 --- a/src/VBox/Storage/testcase/VDMemDisk.cpp +++ b/src/VBox/Storage/testcase/VDMemDisk.cpp @@ -1,4 +1,4 @@ -/** $Id: VDMemDisk.cpp 36635 2011-04-08 23:25:37Z vboxsync $ */ +/** $Id: VDMemDisk.cpp $ */ /** @file * * VBox HDD container test utility, memory disk/file. diff --git a/src/VBox/Storage/testcase/tstVD.cpp b/src/VBox/Storage/testcase/tstVD.cpp index 4e3a63b27..0ec5d4e58 100644 --- a/src/VBox/Storage/testcase/tstVD.cpp +++ b/src/VBox/Storage/testcase/tstVD.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVD.cpp 33567 2010-10-28 15:37:21Z vboxsync $ */ +/* $Id: tstVD.cpp $ */ /** @file * Simple VBox HDD container test utility. */ diff --git a/src/VBox/Storage/testcase/tstVDCompact.vd b/src/VBox/Storage/testcase/tstVDCompact.vd index 8c5eed189..9d511baa2 100644 --- a/src/VBox/Storage/testcase/tstVDCompact.vd +++ b/src/VBox/Storage/testcase/tstVDCompact.vd @@ -1,4 +1,4 @@ -# $Id: tstVDCompact.vd 36637 2011-04-09 12:17:40Z vboxsync $ +# $Id: tstVDCompact.vd $ # # Storage: Testcase for compacting disks. # diff --git a/src/VBox/Storage/testcase/tstVDCopy.vd b/src/VBox/Storage/testcase/tstVDCopy.vd index 93dc8dbcf..4c6594e2c 100644 --- a/src/VBox/Storage/testcase/tstVDCopy.vd +++ b/src/VBox/Storage/testcase/tstVDCopy.vd @@ -1,4 +1,4 @@ -# $Id: tstVDCopy.vd 38204 2011-07-27 16:14:59Z vboxsync $ +# $Id: tstVDCopy.vd $ # # Storage: Testcase for VDCopy with snapshots and optimizations. # diff --git a/src/VBox/Storage/testcase/tstVDIo.cpp b/src/VBox/Storage/testcase/tstVDIo.cpp index b003288dd..070a12e80 100644 --- a/src/VBox/Storage/testcase/tstVDIo.cpp +++ b/src/VBox/Storage/testcase/tstVDIo.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVDIo.cpp 38204 2011-07-27 16:14:59Z vboxsync $ */ +/* $Id: tstVDIo.cpp $ */ /** @file * * VBox HDD container test utility - I/O replay. diff --git a/src/VBox/Storage/testcase/tstVDIo.vd b/src/VBox/Storage/testcase/tstVDIo.vd index 943ebd4b1..3de94b16f 100644 --- a/src/VBox/Storage/testcase/tstVDIo.vd +++ b/src/VBox/Storage/testcase/tstVDIo.vd @@ -1,4 +1,4 @@ -# $Id: tstVDIo.vd 38413 2011-08-11 11:18:44Z vboxsync $ +# $Id: tstVDIo.vd $ # # Storage: Simple I/O testing for most backends. # diff --git a/src/VBox/Storage/testcase/tstVDShareable.cpp b/src/VBox/Storage/testcase/tstVDShareable.cpp index 137952909..328b6522e 100644 --- a/src/VBox/Storage/testcase/tstVDShareable.cpp +++ b/src/VBox/Storage/testcase/tstVDShareable.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVDShareable.cpp 33567 2010-10-28 15:37:21Z vboxsync $ */ +/* $Id: tstVDShareable.cpp $ */ /** @file * Simple VBox HDD container test utility for shareable images. */ diff --git a/src/VBox/Storage/testcase/tstVDShareable.vd b/src/VBox/Storage/testcase/tstVDShareable.vd index 103a9a453..b2f5cd0e4 100644 --- a/src/VBox/Storage/testcase/tstVDShareable.vd +++ b/src/VBox/Storage/testcase/tstVDShareable.vd @@ -1,4 +1,4 @@ -# $Id: tstVDShareable.vd 36131 2011-03-02 21:56:42Z vboxsync $ +# $Id: tstVDShareable.vd $ # # Storage: Testcase for shareable disks. # diff --git a/src/VBox/Storage/testcase/vbox-img.cpp b/src/VBox/Storage/testcase/vbox-img.cpp index 9130de614..c77447fe8 100644 --- a/src/VBox/Storage/testcase/vbox-img.cpp +++ b/src/VBox/Storage/testcase/vbox-img.cpp @@ -1,4 +1,4 @@ -/* $Id: vbox-img.cpp 33745 2010-11-03 18:31:53Z vboxsync $ */ +/* $Id: vbox-img.cpp $ */ /** @file * Standalone image manipulation tool */ diff --git a/src/VBox/VMM/Docs-CodingGuidelines.cpp b/src/VBox/VMM/Docs-CodingGuidelines.cpp index 9a5d4f2c5..e35ae72f9 100644 --- a/src/VBox/VMM/Docs-CodingGuidelines.cpp +++ b/src/VBox/VMM/Docs-CodingGuidelines.cpp @@ -1,4 +1,4 @@ -/* $Id: Docs-CodingGuidelines.cpp 35350 2010-12-27 16:57:10Z vboxsync $ */ +/* $Id: Docs-CodingGuidelines.cpp $ */ /** @file * VMM - Coding Guidelines. */ diff --git a/src/VBox/VMM/Docs-RawMode.cpp b/src/VBox/VMM/Docs-RawMode.cpp index 54ca7fdb3..662ea93d6 100644 --- a/src/VBox/VMM/Docs-RawMode.cpp +++ b/src/VBox/VMM/Docs-RawMode.cpp @@ -1,4 +1,4 @@ -/* $Id: Docs-RawMode.cpp 35350 2010-12-27 16:57:10Z vboxsync $ */ +/* $Id: Docs-RawMode.cpp $ */ /** @file * This file contains the documentation of the raw-mode execution. */ diff --git a/src/VBox/VMM/Makefile.kmk b/src/VBox/VMM/Makefile.kmk index 263f041a1..1d1323de0 100644 --- a/src/VBox/VMM/Makefile.kmk +++ b/src/VBox/VMM/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VMM. # diff --git a/src/VBox/VMM/VMMAll/CPUMAllA.asm b/src/VBox/VMM/VMMAll/CPUMAllA.asm index 58515c358..ac050d063 100644 --- a/src/VBox/VMM/VMMAll/CPUMAllA.asm +++ b/src/VBox/VMM/VMMAll/CPUMAllA.asm @@ -1,4 +1,4 @@ -; $Id: CPUMAllA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: CPUMAllA.asm $ ;; @file ; CPUM - Guest Context Assembly Routines. ; diff --git a/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp b/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp index 72a505b11..a4d4109dc 100644 --- a/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp +++ b/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMAllRegs.cpp 37136 2011-05-18 14:45:47Z vboxsync $ */ +/* $Id: CPUMAllRegs.cpp $ */ /** @file * CPUM - CPU Monitor(/Manager) - Getters and Setters. */ @@ -2340,6 +2340,10 @@ VMMDECL(uint32_t) CPUMGetGuestCPL(PVMCPU pVCpu, PCPUMCTXCORE pCtxCore) * * This only seems to apply to AMD-V; in the VT-x case we *do* need to look * at SS. (ACP2 regression during install after a far call to ring 2) + * + * Seems it isn't necessiarly true for newer AMD-V CPUs even, we have + * to move the VMCB.guest.u8CPL into Attr.n.u2Dpl to make this (and + * other) code work right. So, forget CS.DPL, always use SS.DPL. */ if (RT_LIKELY(pVCpu->cpum.s.Guest.cr0 & X86_CR0_PE)) { diff --git a/src/VBox/VMM/VMMAll/CPUMStack.cpp b/src/VBox/VMM/VMMAll/CPUMStack.cpp index 12112a228..31506e4b7 100644 --- a/src/VBox/VMM/VMMAll/CPUMStack.cpp +++ b/src/VBox/VMM/VMMAll/CPUMStack.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMStack.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: CPUMStack.cpp $ */ /** @file * CPUM - CPU Monitor(/Manager) - Stack manipulation. */ diff --git a/src/VBox/VMM/VMMAll/CSAMAll.cpp b/src/VBox/VMM/VMMAll/CSAMAll.cpp index 73a10ee1a..8f5b4742a 100644 --- a/src/VBox/VMM/VMMAll/CSAMAll.cpp +++ b/src/VBox/VMM/VMMAll/CSAMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: CSAMAll.cpp 35348 2010-12-27 16:35:23Z vboxsync $ */ +/* $Id: CSAMAll.cpp $ */ /** @file * CSAM - Guest OS Code Scanning and Analysis Manager - Any Context */ diff --git a/src/VBox/VMM/VMMAll/DBGFAll.cpp b/src/VBox/VMM/VMMAll/DBGFAll.cpp index f5742250b..090a78598 100644 --- a/src/VBox/VMM/VMMAll/DBGFAll.cpp +++ b/src/VBox/VMM/VMMAll/DBGFAll.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFAll.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFAll.cpp $ */ /** @file * DBGF - Debugger Facility, All Context Code. */ diff --git a/src/VBox/VMM/VMMAll/EMAll.cpp b/src/VBox/VMM/VMMAll/EMAll.cpp index a3859175f..3e23f6e47 100644 --- a/src/VBox/VMM/VMMAll/EMAll.cpp +++ b/src/VBox/VMM/VMMAll/EMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: EMAll.cpp 37731 2011-07-01 13:51:57Z vboxsync $ */ +/* $Id: EMAll.cpp $ */ /** @file * EM - Execution Monitor(/Manager) - All contexts */ diff --git a/src/VBox/VMM/VMMAll/EMAllA.asm b/src/VBox/VMM/VMMAll/EMAllA.asm index 39ea98787..bb1eee820 100644 --- a/src/VBox/VMM/VMMAll/EMAllA.asm +++ b/src/VBox/VMM/VMMAll/EMAllA.asm @@ -1,4 +1,4 @@ -; $Id: EMAllA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: EMAllA.asm $ ;; @file ; EM Assembly Routines. ; diff --git a/src/VBox/VMM/VMMAll/FTMAll.cpp b/src/VBox/VMM/VMMAll/FTMAll.cpp index e90326239..943dadb54 100644 --- a/src/VBox/VMM/VMMAll/FTMAll.cpp +++ b/src/VBox/VMM/VMMAll/FTMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: FTMAll.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: FTMAll.cpp $ */ /** @file * FTM - Fault Tolerance Manager - All contexts */ diff --git a/src/VBox/VMM/VMMAll/HWACCMAll.cpp b/src/VBox/VMM/VMMAll/HWACCMAll.cpp index bafe3666b..1901a0d27 100644 --- a/src/VBox/VMM/VMMAll/HWACCMAll.cpp +++ b/src/VBox/VMM/VMMAll/HWACCMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: HWACCMAll.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: HWACCMAll.cpp $ */ /** @file * HWACCM - All contexts. */ diff --git a/src/VBox/VMM/VMMAll/IEMAll.cpp b/src/VBox/VMM/VMMAll/IEMAll.cpp index 159db83cb..17d52c79d 100644 --- a/src/VBox/VMM/VMMAll/IEMAll.cpp +++ b/src/VBox/VMM/VMMAll/IEMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: IEMAll.cpp 38077 2011-07-19 17:15:29Z vboxsync $ */ +/* $Id: IEMAll.cpp $ */ /** @file * IEM - Interpreted Execution Manager - All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/IEMAllAImpl.asm b/src/VBox/VMM/VMMAll/IEMAllAImpl.asm index 6bd173d6f..36470b4fb 100644 --- a/src/VBox/VMM/VMMAll/IEMAllAImpl.asm +++ b/src/VBox/VMM/VMMAll/IEMAllAImpl.asm @@ -1,4 +1,4 @@ -; $Id: IEMAllAImpl.asm 38026 2011-07-18 15:02:15Z vboxsync $ +; $Id: IEMAllAImpl.asm $ ;; @file ; IEM - Instruction Implementation in Assembly. ; diff --git a/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp b/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp index 45fc1e871..3c3ebc199 100644 --- a/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp +++ b/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp @@ -1,4 +1,4 @@ -/* $Id: IEMAllAImplC.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: IEMAllAImplC.cpp $ */ /** @file * IEM - Instruction Implementation in Assembly, portable C variant. */ diff --git a/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h b/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h index ef26504f0..e36868654 100644 --- a/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h +++ b/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h @@ -1,4 +1,4 @@ -/* $Id: IEMAllCImpl.cpp.h 38079 2011-07-19 17:25:00Z vboxsync $ */ +/* $Id: IEMAllCImpl.cpp.h $ */ /** @file * IEM - Instruction Implementation in C/C++ (code include). */ diff --git a/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h b/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h index 76ef8d156..13acdbb3d 100644 --- a/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h +++ b/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h @@ -1,4 +1,4 @@ -/* $Id: IEMAllCImplStrInstr.cpp.h 38092 2011-07-21 11:59:24Z vboxsync $ */ +/* $Id: IEMAllCImplStrInstr.cpp.h $ */ /** @file * IEM - String Instruction Implementation Code Template. */ diff --git a/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h b/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h index a1d331b49..58cc86de7 100644 --- a/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h +++ b/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h @@ -1,4 +1,4 @@ -/* $Id: IEMAllInstructions.cpp.h 38084 2011-07-20 16:45:23Z vboxsync $ */ +/* $Id: IEMAllInstructions.cpp.h $ */ /** @file * IEM - Instruction Decoding and Emulation. */ diff --git a/src/VBox/VMM/VMMAll/IOMAll.cpp b/src/VBox/VMM/VMMAll/IOMAll.cpp index 07dbcd59d..a8f7cdf7e 100644 --- a/src/VBox/VMM/VMMAll/IOMAll.cpp +++ b/src/VBox/VMM/VMMAll/IOMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: IOMAll.cpp 37467 2011-06-15 13:08:45Z vboxsync $ */ +/* $Id: IOMAll.cpp $ */ /** @file * IOM - Input / Output Monitor - Any Context. */ diff --git a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp index a6aa548fb..97f4fbbe2 100644 --- a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp +++ b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp @@ -1,4 +1,4 @@ -/* $Id: IOMAllMMIO.cpp 37467 2011-06-15 13:08:45Z vboxsync $ */ +/* $Id: IOMAllMMIO.cpp $ */ /** @file * IOM - Input / Output Monitor - Any Context, MMIO & String I/O. */ @@ -303,7 +303,7 @@ DECLINLINE(int) iomRamWrite(PVMCPU pVCpu, PCPUMCTXCORE pCtxCore, RTGCPTR GCPtrDs } -#if defined(IOM_WITH_MOVS_SUPPORT) && 0 /* locking prevents this from working */ +#if defined(IOM_WITH_MOVS_SUPPORT) && 0 /* locking prevents this from working. has buggy ecx handling. */ /** * [REP] MOVSB * [REP] MOVSW @@ -547,6 +547,25 @@ static int iomInterpretMOVS(PVM pVM, bool fWriteAccess, PCPUMCTXCORE pRegFrame, /** + * Gets the address / opcode mask corresponding to the given CPU mode. + * + * @returns Mask. + * @param enmCpuMode CPU mode. + */ +static uint64_t iomDisModeToMask(DISCPUMODE enmCpuMode) +{ + switch (enmCpuMode) + { + case CPUMODE_16BIT: return UINT16_MAX; + case CPUMODE_32BIT: return UINT32_MAX; + case CPUMODE_64BIT: return UINT64_MAX; + default: + AssertFailedReturn(UINT32_MAX); + } +} + + +/** * [REP] STOSB * [REP] STOSW * [REP] STOSD @@ -571,9 +590,10 @@ static int iomInterpretSTOS(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFaul return VINF_IOM_HC_MMIO_READ_WRITE; /** @todo -> REM instead of HC */ /* - * Get bytes/words/dwords count to copy. + * Get bytes/words/dwords/qwords count to copy. */ - uint32_t cTransfers = 1; + uint64_t const fAddrMask = iomDisModeToMask(pCpu->addrmode); + RTGCUINTREG cTransfers = 1; if (pCpu->prefix & PREFIX_REP) { #ifndef IN_RC @@ -582,10 +602,7 @@ static int iomInterpretSTOS(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFaul return VINF_EM_RAW_EMULATE_INSTR; #endif - cTransfers = pRegFrame->ecx; - if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT) - cTransfers &= 0xffff; - + cTransfers = pRegFrame->rcx & fAddrMask; if (!cTransfers) return VINF_SUCCESS; } @@ -606,9 +623,9 @@ static int iomInterpretSTOS(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFaul RTGCPHYS Phys = GCPhysFault; - uint32_t u32Data = pRegFrame->eax; int rc; - if (pRange->CTX_SUFF(pfnFillCallback)) + if ( pRange->CTX_SUFF(pfnFillCallback) + && cb <= 4 /* can only fill 32-bit values */) { /* * Use the fill callback. @@ -617,25 +634,30 @@ static int iomInterpretSTOS(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFaul if (offIncrement > 0) { /* addr++ variant. */ - rc = pRange->CTX_SUFF(pfnFillCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), Phys, u32Data, cb, cTransfers); + rc = pRange->CTX_SUFF(pfnFillCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), Phys, + pRegFrame->eax, cb, cTransfers); if (rc == VINF_SUCCESS) { /* Update registers. */ - pRegFrame->rdi += cTransfers << SIZE_2_SHIFT(cb); + pRegFrame->rdi = ((pRegFrame->rdi + (cTransfers << SIZE_2_SHIFT(cb))) & fAddrMask) + | (pRegFrame->rdi & ~fAddrMask); if (pCpu->prefix & PREFIX_REP) - pRegFrame->ecx = 0; + pRegFrame->rcx &= ~fAddrMask; } } else { /* addr-- variant. */ - rc = pRange->CTX_SUFF(pfnFillCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), Phys - ((cTransfers - 1) << SIZE_2_SHIFT(cb)), u32Data, cb, cTransfers); + rc = pRange->CTX_SUFF(pfnFillCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), + Phys - ((cTransfers - 1) << SIZE_2_SHIFT(cb)), + pRegFrame->eax, cb, cTransfers); if (rc == VINF_SUCCESS) { /* Update registers. */ - pRegFrame->rdi -= cTransfers << SIZE_2_SHIFT(cb); + pRegFrame->rdi = ((pRegFrame->rdi - (cTransfers << SIZE_2_SHIFT(cb))) & fAddrMask) + | (pRegFrame->rdi & ~fAddrMask); if (pCpu->prefix & PREFIX_REP) - pRegFrame->ecx = 0; + pRegFrame->rcx &= ~fAddrMask; } } } @@ -645,22 +667,25 @@ static int iomInterpretSTOS(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFaul * Use the write callback. */ Assert(pRange->CTX_SUFF(pfnWriteCallback) || !pRange->pfnWriteCallbackR3); + uint64_t u64Data = pRegFrame->rax; /* fill loop. */ do { - rc = iomMMIODoWrite(pVM, pRange, Phys, &u32Data, cb); + rc = iomMMIODoWrite(pVM, pRange, Phys, &u64Data, cb); if (rc != VINF_SUCCESS) break; Phys += offIncrement; - pRegFrame->rdi += offIncrement; + pRegFrame->rdi = ((pRegFrame->rdi + offIncrement) & fAddrMask) + | (pRegFrame->rdi & ~fAddrMask); cTransfers--; } while (cTransfers); - /* Update ecx on exit. */ + /* Update rcx on exit. */ if (pCpu->prefix & PREFIX_REP) - pRegFrame->ecx = cTransfers; + pRegFrame->rcx = (cTransfers & fAddrMask) + | (pRegFrame->rcx & ~fAddrMask); } /* @@ -710,7 +735,11 @@ static int iomInterpretLODS(PVM pVM, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFaul */ int rc = iomMMIODoRead(pVM, pRange, GCPhysFault, &pRegFrame->rax, cb); if (rc == VINF_SUCCESS) - pRegFrame->rsi += offIncrement; + { + uint64_t const fAddrMask = iomDisModeToMask(pCpu->addrmode); + pRegFrame->rsi = ((pRegFrame->rsi + offIncrement) & fAddrMask) + | (pRegFrame->rsi & ~fAddrMask); + } /* * Work statistics and return. @@ -1657,9 +1686,11 @@ VMMDECL(VBOXSTRICTRC) IOMMMIOWrite(PVM pVM, RTGCPHYS GCPhys, uint32_t u32Value, * @param pRegFrame Pointer to CPUMCTXCORE guest registers structure. * @param uPort IO Port * @param uPrefix IO instruction prefix + * @param enmAddrMode The address mode. * @param cbTransfer Size of transfer unit */ -VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, uint32_t cbTransfer) +VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, + DISCPUMODE enmAddrMode, uint32_t cbTransfer) { STAM_COUNTER_INC(&pVM->iom.s.StatInstIns); @@ -1676,6 +1707,7 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_ /* * Get bytes/words/dwords count to transfer. */ + uint64_t const fAddrMask = iomDisModeToMask(enmAddrMode); RTGCUINTREG cTransfers = 1; if (uPrefix & PREFIX_REP) { @@ -1684,18 +1716,14 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_ && pRegFrame->rcx >= _4G) return VINF_EM_RAW_EMULATE_INSTR; #endif - cTransfers = pRegFrame->ecx; - - if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT) - cTransfers &= 0xffff; - + cTransfers = pRegFrame->rcx & fAddrMask; if (!cTransfers) return VINF_SUCCESS; } /* Convert destination address es:edi. */ RTGCPTR GCPtrDst; - int rc2 = SELMToFlatEx(pVM, DIS_SELREG_ES, pRegFrame, (RTGCPTR)pRegFrame->rdi, + int rc2 = SELMToFlatEx(pVM, DIS_SELREG_ES, pRegFrame, pRegFrame->rdi & fAddrMask, SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL, &GCPtrDst); if (RT_FAILURE(rc2)) @@ -1705,8 +1733,7 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_ } /* Access verification first; we can't recover from traps inside this instruction, as the port read cannot be repeated. */ - uint32_t cpl = CPUMGetGuestCPL(pVCpu, pRegFrame); - + uint32_t const cpl = CPUMGetGuestCPL(pVCpu, pRegFrame); rc2 = PGMVerifyAccess(pVCpu, (RTGCUINTPTR)GCPtrDst, cTransfers * cbTransfer, X86_PTE_RW | ((cpl == 3) ? X86_PTE_US : 0)); if (rc2 != VINF_SUCCESS) @@ -1724,7 +1751,8 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_ const RTGCUINTREG cTransfersOrg = cTransfers; rcStrict = IOMIOPortReadString(pVM, uPort, &GCPtrDst, &cTransfers, cbTransfer); AssertRC(VBOXSTRICTRC_VAL(rcStrict)); Assert(cTransfers <= cTransfersOrg); - pRegFrame->rdi += (cTransfersOrg - cTransfers) * cbTransfer; + pRegFrame->rdi = ((pRegFrame->rdi + (cTransfersOrg - cTransfers) * cbTransfer) & fAddrMask) + | (pRegFrame->rdi & ~fAddrMask); } #ifdef IN_RC @@ -1739,16 +1767,18 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_ rc2 = iomRamWrite(pVCpu, pRegFrame, GCPtrDst, &u32Value, cbTransfer); Assert(rc2 == VINF_SUCCESS); NOREF(rc2); GCPtrDst = (RTGCPTR)((RTGCUINTPTR)GCPtrDst + cbTransfer); - pRegFrame->rdi += cbTransfer; + pRegFrame->rdi = ((pRegFrame->rdi + cbTransfer) & fAddrMask) + | (pRegFrame->rdi & ~fAddrMask); cTransfers--; } #ifdef IN_RC MMGCRamDeregisterTrapHandler(pVM); #endif - /* Update ecx on exit. */ + /* Update rcx on exit. */ if (uPrefix & PREFIX_REP) - pRegFrame->ecx = cTransfers; + pRegFrame->rcx = (cTransfers & fAddrMask) + | (pRegFrame->rcx & ~fAddrMask); AssertMsg(rcStrict == VINF_SUCCESS || rcStrict == VINF_IOM_HC_IOPORT_READ || (rcStrict >= VINF_EM_FIRST && rcStrict <= VINF_EM_LAST) || RT_FAILURE(rcStrict), ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict))); return rcStrict; @@ -1794,7 +1824,7 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUST return rcStrict; } - return IOMInterpretINSEx(pVM, pRegFrame, Port, pCpu->prefix, cb); + return IOMInterpretINSEx(pVM, pRegFrame, Port, pCpu->prefix, pCpu->addrmode, cb); } @@ -1818,9 +1848,11 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUST * @param pRegFrame Pointer to CPUMCTXCORE guest registers structure. * @param uPort IO Port * @param uPrefix IO instruction prefix + * @param enmAddrMode The address mode. * @param cbTransfer Size of transfer unit */ -VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, uint32_t cbTransfer) +VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, + DISCPUMODE enmAddrMode, uint32_t cbTransfer) { STAM_COUNTER_INC(&pVM->iom.s.StatInstOuts); @@ -1837,6 +1869,7 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32 /* * Get bytes/words/dwords count to transfer. */ + uint64_t const fAddrMask = iomDisModeToMask(enmAddrMode); RTGCUINTREG cTransfers = 1; if (uPrefix & PREFIX_REP) { @@ -1845,17 +1878,14 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32 && pRegFrame->rcx >= _4G) return VINF_EM_RAW_EMULATE_INSTR; #endif - cTransfers = pRegFrame->ecx; - if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_16BIT) - cTransfers &= 0xffff; - + cTransfers = pRegFrame->rcx & fAddrMask; if (!cTransfers) return VINF_SUCCESS; } /* Convert source address ds:esi. */ RTGCPTR GCPtrSrc; - int rc2 = SELMToFlatEx(pVM, DIS_SELREG_DS, pRegFrame, (RTGCPTR)pRegFrame->rsi, + int rc2 = SELMToFlatEx(pVM, DIS_SELREG_DS, pRegFrame, pRegFrame->rsi & fAddrMask, SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL, &GCPtrSrc); if (RT_FAILURE(rc2)) @@ -1865,7 +1895,7 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32 } /* Access verification first; we currently can't recover properly from traps inside this instruction */ - uint32_t cpl = CPUMGetGuestCPL(pVCpu, pRegFrame); + uint32_t const cpl = CPUMGetGuestCPL(pVCpu, pRegFrame); rc2 = PGMVerifyAccess(pVCpu, (RTGCUINTPTR)GCPtrSrc, cTransfers * cbTransfer, (cpl == 3) ? X86_PTE_US : 0); if (rc2 != VINF_SUCCESS) @@ -1885,7 +1915,8 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32 const RTGCUINTREG cTransfersOrg = cTransfers; rcStrict = IOMIOPortWriteString(pVM, uPort, &GCPtrSrc, &cTransfers, cbTransfer); AssertRC(VBOXSTRICTRC_VAL(rcStrict)); Assert(cTransfers <= cTransfersOrg); - pRegFrame->rsi += (cTransfersOrg - cTransfers) * cbTransfer; + pRegFrame->rsi = ((pRegFrame->rsi + (cTransfersOrg - cTransfers) * cbTransfer) & fAddrMask) + | (pRegFrame->rsi & ~fAddrMask); } #ifdef IN_RC @@ -1902,7 +1933,8 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32 if (!IOM_SUCCESS(rcStrict)) break; GCPtrSrc = (RTGCPTR)((RTUINTPTR)GCPtrSrc + cbTransfer); - pRegFrame->rsi += cbTransfer; + pRegFrame->rsi = ((pRegFrame->rsi + cbTransfer) & fAddrMask) + | (pRegFrame->rsi & ~fAddrMask); cTransfers--; } @@ -1910,9 +1942,10 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PCPUMCTXCORE pRegFrame, uint32 MMGCRamDeregisterTrapHandler(pVM); #endif - /* Update ecx on exit. */ + /* Update rcx on exit. */ if (uPrefix & PREFIX_REP) - pRegFrame->ecx = cTransfers; + pRegFrame->rcx = (cTransfers & fAddrMask) + | (pRegFrame->rcx & ~fAddrMask); AssertMsg(rcStrict == VINF_SUCCESS || rcStrict == VINF_IOM_HC_IOPORT_WRITE || (rcStrict >= VINF_EM_FIRST && rcStrict <= VINF_EM_LAST) || RT_FAILURE(rcStrict), ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict))); return rcStrict; @@ -1960,7 +1993,7 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTS(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUS return rcStrict; } - return IOMInterpretOUTSEx(pVM, pRegFrame, Port, pCpu->prefix, cb); + return IOMInterpretOUTSEx(pVM, pRegFrame, Port, pCpu->prefix, pCpu->addrmode, cb); } #ifndef IN_RC diff --git a/src/VBox/VMM/VMMAll/MMAll.cpp b/src/VBox/VMM/VMMAll/MMAll.cpp index 4620cdbb2..7057700e8 100644 --- a/src/VBox/VMM/VMMAll/MMAll.cpp +++ b/src/VBox/VMM/VMMAll/MMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: MMAll.cpp 35410 2011-01-05 17:21:11Z vboxsync $ */ +/* $Id: MMAll.cpp $ */ /** @file * MM - Memory Manager - Any Context. */ diff --git a/src/VBox/VMM/VMMAll/MMAllHyper.cpp b/src/VBox/VMM/VMMAll/MMAllHyper.cpp index 52010a2e9..88d1a1449 100644 --- a/src/VBox/VMM/VMMAll/MMAllHyper.cpp +++ b/src/VBox/VMM/VMMAll/MMAllHyper.cpp @@ -1,4 +1,4 @@ -/* $Id: MMAllHyper.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: MMAllHyper.cpp $ */ /** @file * MM - Memory Manager - Hypervisor Memory Area, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp index 4357f7d28..af56bd2a9 100644 --- a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp +++ b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp @@ -1,4 +1,4 @@ -/* $Id: MMAllPagePool.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: MMAllPagePool.cpp $ */ /** @file * MM - Memory Manager - Page Pool. * diff --git a/src/VBox/VMM/VMMAll/PATMAll.cpp b/src/VBox/VMM/VMMAll/PATMAll.cpp index 1e975f11e..f7b7b11ec 100644 --- a/src/VBox/VMM/VMMAll/PATMAll.cpp +++ b/src/VBox/VMM/VMMAll/PATMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMAll.cpp 35348 2010-12-27 16:35:23Z vboxsync $ */ +/* $Id: PATMAll.cpp $ */ /** @file * PATM - The Patch Manager, all contexts. */ diff --git a/src/VBox/VMM/VMMAll/PDMAll.cpp b/src/VBox/VMM/VMMAll/PDMAll.cpp index 3a385f3f1..445c26890 100644 --- a/src/VBox/VMM/VMMAll/PDMAll.cpp +++ b/src/VBox/VMM/VMMAll/PDMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAll.cpp 37475 2011-06-15 16:42:55Z vboxsync $ */ +/* $Id: PDMAll.cpp $ */ /** @file * PDM Critical Sections */ diff --git a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp index dee31e3d7..ed2fc747e 100644 --- a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp +++ b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAllCritSect.cpp 38081 2011-07-20 14:21:36Z vboxsync $ */ +/* $Id: PDMAllCritSect.cpp $ */ /** @file * PDM - Critical Sections, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp index 824f54ce3..e81b49b57 100644 --- a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp +++ b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAllQueue.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: PDMAllQueue.cpp $ */ /** @file * PDM Queue - Transport data and tasks to EMT and R3. */ diff --git a/src/VBox/VMM/VMMAll/PGMAll.cpp b/src/VBox/VMM/VMMAll/PGMAll.cpp index 620dab8a1..de7fec925 100644 --- a/src/VBox/VMM/VMMAll/PGMAll.cpp +++ b/src/VBox/VMM/VMMAll/PGMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAll.cpp 37452 2011-06-14 18:13:48Z vboxsync $ */ +/* $Id: PGMAll.cpp $ */ /** @file * PGM - Page Manager and Monitor - All context code. */ @@ -1623,21 +1623,57 @@ int pgmGstLazyMapPml4(PVMCPU pVCpu, PX86PML4 *ppPml4) } #endif + /** - * Gets the specified page directory pointer table entry. + * Gets the PAE PDPEs values cached by the CPU. * - * @returns PDP entry - * @param pVCpu VMCPU handle. - * @param iPdpt PDPT index + * @returns VBox status code. + * @param pVCpu The virtual CPU. + * @param paPdpes Where to return the four PDPEs. The array + * pointed to must have 4 entries. */ -VMMDECL(int) PGMGstQueryPaePDPtr(PVMCPU pVCpu, unsigned iPdpt, PX86PDPE pPdpe) +VMM_INT_DECL(int) PGMGstGetPaePdpes(PVMCPU pVCpu, PX86PDPE paPdpes) { - Assert(iPdpt <= 3); - PX86PDPT pPdpt; - int rc = pgmGstGetPaePDPTPtrEx(pVCpu, &pPdpt); - if (RT_SUCCESS(rc)) - *pPdpe = pPdpt->a[iPdpt & 3]; - return rc; + Assert(pVCpu->pgm.s.enmShadowMode == PGMMODE_EPT); + + paPdpes[0] = pVCpu->pgm.s.aGstPaePdpeRegs[0]; + paPdpes[1] = pVCpu->pgm.s.aGstPaePdpeRegs[1]; + paPdpes[2] = pVCpu->pgm.s.aGstPaePdpeRegs[2]; + paPdpes[3] = pVCpu->pgm.s.aGstPaePdpeRegs[3]; + return VINF_SUCCESS; +} + + +/** + * Sets the PAE PDPEs values cached by the CPU. + * + * @remarks This must be called *AFTER* PGMUpdateCR3. + * + * @returns VBox status code. + * @param pVCpu The virtual CPU. + * @param paPdpes The four PDPE values. The array pointed to + * must have exactly 4 entries. + */ +VMM_INT_DECL(int) PGMGstUpdatePaePdpes(PVMCPU pVCpu, PCX86PDPE paPdpes) +{ + Assert(pVCpu->pgm.s.enmShadowMode == PGMMODE_EPT); + + for (unsigned i = 0; i < RT_ELEMENTS(pVCpu->pgm.s.aGstPaePdpeRegs); i++) + { + if (pVCpu->pgm.s.aGstPaePdpeRegs[i].u != paPdpes[i].u) + { + pVCpu->pgm.s.aGstPaePdpeRegs[i] = paPdpes[i]; + + /* Force lazy remapping if it changed in any way. */ + pVCpu->pgm.s.apGstPaePDsR3[i] = 0; +# ifndef VBOX_WITH_2X_4GB_ADDR_SPACE + pVCpu->pgm.s.apGstPaePDsR0[i] = 0; +# endif + pVCpu->pgm.s.apGstPaePDsRC[i] = 0; + pVCpu->pgm.s.aGCPhysGstPaePDs[i] = NIL_RTGCPHYS; + } + } + return VINF_SUCCESS; } diff --git a/src/VBox/VMM/VMMAll/PGMAllBth.h b/src/VBox/VMM/VMMAll/PGMAllBth.h index 9a5017871..bb19759ae 100644 --- a/src/VBox/VMM/VMMAll/PGMAllBth.h +++ b/src/VBox/VMM/VMMAll/PGMAllBth.h @@ -1,4 +1,4 @@ -/* $Id: PGMAllBth.h 38086 2011-07-21 08:55:54Z vboxsync $ */ +/* $Id: PGMAllBth.h $ */ /** @file * VBox - Page Manager, Shadow+Guest Paging Template - All context code. * @@ -4458,6 +4458,7 @@ PGM_BTH_DECL(int, MapCR3)(PVMCPU pVCpu, RTGCPHYS GCPhysCR3) RTGCPTR GCPtr = pVM->pgm.s.GCPtrCR3Mapping + PAGE_SIZE; for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++, GCPtr += PAGE_SIZE) { + pVCpu->pgm.s.aGstPaePdpeRegs[i].u = pGuestPDPT->a[i].u; if (pGuestPDPT->a[i].n.u1Present) { RTHCPTR HCPtr; diff --git a/src/VBox/VMM/VMMAll/PGMAllGst.h b/src/VBox/VMM/VMMAll/PGMAllGst.h index d16279817..7a1605fb5 100644 --- a/src/VBox/VMM/VMMAll/PGMAllGst.h +++ b/src/VBox/VMM/VMMAll/PGMAllGst.h @@ -1,4 +1,4 @@ -/* $Id: PGMAllGst.h 36891 2011-04-29 13:22:57Z vboxsync $ */ +/* $Id: PGMAllGst.h $ */ /** @file * VBox - Page Manager, Guest Paging Template - All context code. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp index 16943f082..ca5172f3c 100644 --- a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAllHandler.cpp 37354 2011-06-07 15:05:32Z vboxsync $ */ +/* $Id: PGMAllHandler.cpp $ */ /** @file * PGM - Page Manager / Monitor, Access Handlers. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllMap.cpp b/src/VBox/VMM/VMMAll/PGMAllMap.cpp index 450893c27..861534b5a 100644 --- a/src/VBox/VMM/VMMAll/PGMAllMap.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllMap.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAllMap.cpp 38325 2011-08-05 14:11:58Z vboxsync $ */ +/* $Id: PGMAllMap.cpp $ */ /** @file * PGM - Page Manager and Monitor - All context code. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp index b3a6b0b58..2a71b361f 100644 --- a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAllPhys.cpp 37360 2011-06-07 17:28:20Z vboxsync $ */ +/* $Id: PGMAllPhys.cpp $ */ /** @file * PGM - Page Manager and Monitor, Physical Memory Addressing. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllPool.cpp b/src/VBox/VMM/VMMAll/PGMAllPool.cpp index 6aec28541..fb4381684 100644 --- a/src/VBox/VMM/VMMAll/PGMAllPool.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllPool.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAllPool.cpp 37354 2011-06-07 15:05:32Z vboxsync $ */ +/* $Id: PGMAllPool.cpp $ */ /** @file * PGM Shadow Page Pool. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllShw.h b/src/VBox/VMM/VMMAll/PGMAllShw.h index a5f43b39d..5aab685a0 100644 --- a/src/VBox/VMM/VMMAll/PGMAllShw.h +++ b/src/VBox/VMM/VMMAll/PGMAllShw.h @@ -1,4 +1,4 @@ -/* $Id: PGMAllShw.h 37354 2011-06-07 15:05:32Z vboxsync $ */ +/* $Id: PGMAllShw.h $ */ /** @file * VBox - Page Manager, Shadow Paging Template - All context code. */ diff --git a/src/VBox/VMM/VMMAll/REMAll.cpp b/src/VBox/VMM/VMMAll/REMAll.cpp index b0d633737..261415aee 100644 --- a/src/VBox/VMM/VMMAll/REMAll.cpp +++ b/src/VBox/VMM/VMMAll/REMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: REMAll.cpp 37702 2011-06-30 10:09:59Z vboxsync $ */ +/* $Id: REMAll.cpp $ */ /** @file * REM - Recompiled Execution Monitor, all Contexts part. */ diff --git a/src/VBox/VMM/VMMAll/SELMAll.cpp b/src/VBox/VMM/VMMAll/SELMAll.cpp index 3e2506524..9a75e9911 100644 --- a/src/VBox/VMM/VMMAll/SELMAll.cpp +++ b/src/VBox/VMM/VMMAll/SELMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: SELMAll.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: SELMAll.cpp $ */ /** @file * SELM All contexts. */ diff --git a/src/VBox/VMM/VMMAll/TMAll.cpp b/src/VBox/VMM/VMMAll/TMAll.cpp index e9d1763ac..ba2c2fd4b 100644 --- a/src/VBox/VMM/VMMAll/TMAll.cpp +++ b/src/VBox/VMM/VMMAll/TMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: TMAll.cpp 37527 2011-06-17 10:18:02Z vboxsync $ */ +/* $Id: TMAll.cpp $ */ /** @file * TM - Timeout Manager, all contexts. */ diff --git a/src/VBox/VMM/VMMAll/TMAllCpu.cpp b/src/VBox/VMM/VMMAll/TMAllCpu.cpp index 69c3fa64c..f16cb6330 100644 --- a/src/VBox/VMM/VMMAll/TMAllCpu.cpp +++ b/src/VBox/VMM/VMMAll/TMAllCpu.cpp @@ -1,4 +1,4 @@ -/* $Id: TMAllCpu.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: TMAllCpu.cpp $ */ /** @file * TM - Timeout Manager, CPU Time, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/TMAllReal.cpp b/src/VBox/VMM/VMMAll/TMAllReal.cpp index bb3412982..ecd02f163 100644 --- a/src/VBox/VMM/VMMAll/TMAllReal.cpp +++ b/src/VBox/VMM/VMMAll/TMAllReal.cpp @@ -1,4 +1,4 @@ -/* $Id: TMAllReal.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: TMAllReal.cpp $ */ /** @file * TM - Timeout Manager, Real Time, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp index c312f65df..da9cbd11f 100644 --- a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp +++ b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp @@ -1,4 +1,4 @@ -/* $Id: TMAllVirtual.cpp 37527 2011-06-17 10:18:02Z vboxsync $ */ +/* $Id: TMAllVirtual.cpp $ */ /** @file * TM - Timeout Manager, Virtual Time, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/TRPMAll.cpp b/src/VBox/VMM/VMMAll/TRPMAll.cpp index a8353bfac..7d22c22f0 100644 --- a/src/VBox/VMM/VMMAll/TRPMAll.cpp +++ b/src/VBox/VMM/VMMAll/TRPMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPMAll.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: TRPMAll.cpp $ */ /** @file * TRPM - Trap Monitor - Any Context. */ diff --git a/src/VBox/VMM/VMMAll/VMAll.cpp b/src/VBox/VMM/VMMAll/VMAll.cpp index 272b819af..1d8623af2 100644 --- a/src/VBox/VMM/VMMAll/VMAll.cpp +++ b/src/VBox/VMM/VMMAll/VMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: VMAll.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VMAll.cpp $ */ /** @file * VM - Virtual Machine All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/VMMAll.cpp b/src/VBox/VMM/VMMAll/VMMAll.cpp index 65e839cc1..6aa4cfbd1 100644 --- a/src/VBox/VMM/VMMAll/VMMAll.cpp +++ b/src/VBox/VMM/VMMAll/VMMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMAll.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VMMAll.cpp $ */ /** @file * VMM All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/VMMAllA.asm b/src/VBox/VMM/VMMAll/VMMAllA.asm index 7c9e5e361..dae37ada3 100644 --- a/src/VBox/VMM/VMMAll/VMMAllA.asm +++ b/src/VBox/VMM/VMMAll/VMMAllA.asm @@ -1,4 +1,4 @@ -; $Id: VMMAllA.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: VMMAllA.asm $ ;; @file ; VMM - All Contexts Assembly Routines. ; diff --git a/src/VBox/VMM/VMMR0/CPUMR0.cpp b/src/VBox/VMM/VMMR0/CPUMR0.cpp index 758ad1d0a..ebf3d64be 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0.cpp +++ b/src/VBox/VMM/VMMR0/CPUMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMR0.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: CPUMR0.cpp $ */ /** @file * CPUM - Host Context Ring 0. */ diff --git a/src/VBox/VMM/VMMR0/CPUMR0A.asm b/src/VBox/VMM/VMMR0/CPUMR0A.asm index 13d791185..aa09beac7 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0A.asm +++ b/src/VBox/VMM/VMMR0/CPUMR0A.asm @@ -1,4 +1,4 @@ -; $Id: CPUMR0A.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: CPUMR0A.asm $ ;; @file ; CPUM - Guest Context Assembly Routines. ; diff --git a/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm b/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm index c16d489d4..1a4b58683 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm +++ b/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm @@ -1,4 +1,4 @@ -; $Id: CPUMR0UnusedA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: CPUMR0UnusedA.asm $ ;; @file ; CPUM - Guest Context Assembly Routines. ; diff --git a/src/VBox/VMM/VMMR0/GMMR0.cpp b/src/VBox/VMM/VMMR0/GMMR0.cpp index dad21cf16..cc522c008 100644 --- a/src/VBox/VMM/VMMR0/GMMR0.cpp +++ b/src/VBox/VMM/VMMR0/GMMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: GMMR0.cpp 38072 2011-07-19 14:53:11Z vboxsync $ */ +/* $Id: GMMR0.cpp $ */ /** @file * GMM - Global Memory Manager. */ @@ -2550,6 +2550,9 @@ static int gmmR0AllocatePagesNew(PGMM pGMM, PGVM pGVM, uint32_t cPages, PGMMPAGE /* Free empty chunks. */ /** @todo */ + + /* return the fail status on failure */ + return rc; } return VINF_SUCCESS; } diff --git a/src/VBox/VMM/VMMR0/GMMR0Internal.h b/src/VBox/VMM/VMMR0/GMMR0Internal.h index 8c4b2d867..5dbfd70db 100644 --- a/src/VBox/VMM/VMMR0/GMMR0Internal.h +++ b/src/VBox/VMM/VMMR0/GMMR0Internal.h @@ -1,4 +1,4 @@ -/* $Id: GMMR0Internal.h 37248 2011-05-30 10:02:24Z vboxsync $ */ +/* $Id: GMMR0Internal.h $ */ /** @file * GMM - The Global Memory Manager, Internal Header. */ diff --git a/src/VBox/VMM/VMMR0/GVMMR0.cpp b/src/VBox/VMM/VMMR0/GVMMR0.cpp index e08830329..1e993034e 100644 --- a/src/VBox/VMM/VMMR0/GVMMR0.cpp +++ b/src/VBox/VMM/VMMR0/GVMMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: GVMMR0.cpp 37465 2011-06-15 10:07:58Z vboxsync $ */ +/* $Id: GVMMR0.cpp $ */ /** @file * GVMM - Global VM Manager. */ diff --git a/src/VBox/VMM/VMMR0/GVMMR0Internal.h b/src/VBox/VMM/VMMR0/GVMMR0Internal.h index 053257206..40b1b0003 100644 --- a/src/VBox/VMM/VMMR0/GVMMR0Internal.h +++ b/src/VBox/VMM/VMMR0/GVMMR0Internal.h @@ -1,4 +1,4 @@ -/* $Id: GVMMR0Internal.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: GVMMR0Internal.h $ */ /** @file * GVMM - The Global VM Manager, Internal header. */ diff --git a/src/VBox/VMM/VMMR0/HWACCMR0.cpp b/src/VBox/VMM/VMMR0/HWACCMR0.cpp index b7a0120eb..88db4e40d 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0.cpp +++ b/src/VBox/VMM/VMMR0/HWACCMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: HWACCMR0.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: HWACCMR0.cpp $ */ /** @file * Hardware Assisted Virtualization Manager - Host Context Ring-0. */ diff --git a/src/VBox/VMM/VMMR0/HWACCMR0A.asm b/src/VBox/VMM/VMMR0/HWACCMR0A.asm index 1804b457b..aa258ffd6 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0A.asm +++ b/src/VBox/VMM/VMMR0/HWACCMR0A.asm @@ -1,4 +1,4 @@ -; $Id: HWACCMR0A.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: HWACCMR0A.asm $ ;; @file ; VMXM - R0 vmx helpers ; diff --git a/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac b/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac index 7e301d03a..13a9e1bbf 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac +++ b/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac @@ -1,4 +1,4 @@ -; $Id: HWACCMR0Mixed.mac 30414 2010-06-24 08:46:18Z vboxsync $ +; $Id: HWACCMR0Mixed.mac $ ;; @file ; HWACCMR0Mixed.mac - Stuff that darwin needs to build two versions of. ; diff --git a/src/VBox/VMM/VMMR0/HWSVMR0.cpp b/src/VBox/VMM/VMMR0/HWSVMR0.cpp index 14ffa594d..43985f6b5 100644 --- a/src/VBox/VMM/VMMR0/HWSVMR0.cpp +++ b/src/VBox/VMM/VMMR0/HWSVMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: HWSVMR0.cpp 38243 2011-07-31 20:36:00Z vboxsync $ */ +/* $Id: HWSVMR0.cpp $ */ /** @file * HWACCM SVM - Host Context Ring 0. */ @@ -862,7 +862,7 @@ VMMR0DECL(int) SVMR0LoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) pVMCB->guest.u64RFlags = pCtx->eflags.u32; /* Set CPL */ - pVMCB->guest.u8CPL = pCtx->csHid.Attr.n.u2Dpl; + pVMCB->guest.u8CPL = pCtx->ssHid.Attr.n.u2Dpl; /* RAX/EAX too, as VMRUN uses RAX as an implicit parameter. */ pVMCB->guest.u64RAX = pCtx->rax; @@ -1091,7 +1091,7 @@ ResumeExecution: * * Note! Interrupts must be disabled done *before* we check for TLB flushes; TLB * shootdowns rely on this. - */ + */ uOldEFlags = ASMIntDisableFlags(); if (RTThreadPreemptIsPending(NIL_RTTHREAD)) { @@ -2223,13 +2223,13 @@ ResumeExecution: { Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, IoExitInfo.n.u16Port, uIOSize)); STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite); - rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->prefix, uIOSize); + rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->prefix, pDis->addrmode, uIOSize); } else { Log2(("IOMInterpretINSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, IoExitInfo.n.u16Port, uIOSize)); STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead); - rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->prefix, uIOSize); + rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->prefix, pDis->addrmode, uIOSize); } } else diff --git a/src/VBox/VMM/VMMR0/HWSVMR0.h b/src/VBox/VMM/VMMR0/HWSVMR0.h index 7562d6370..a7ee69781 100644 --- a/src/VBox/VMM/VMMR0/HWSVMR0.h +++ b/src/VBox/VMM/VMMR0/HWSVMR0.h @@ -1,4 +1,4 @@ -/* $Id: HWSVMR0.h 37320 2011-06-03 15:05:36Z vboxsync $ */ +/* $Id: HWSVMR0.h $ */ /** @file * HWACCM AMD-V - Internal header file. */ diff --git a/src/VBox/VMM/VMMR0/HWVMXR0.cpp b/src/VBox/VMM/VMMR0/HWVMXR0.cpp index 6bb9dc772..60126d338 100644 --- a/src/VBox/VMM/VMMR0/HWVMXR0.cpp +++ b/src/VBox/VMM/VMMR0/HWVMXR0.cpp @@ -1,4 +1,4 @@ -/* $Id: HWVMXR0.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: HWVMXR0.cpp $ */ /** @file * HWACCM VMX - Host Context Ring 0. */ @@ -1234,31 +1234,58 @@ VMMR0DECL(int) VMXR0SaveHostState(PVM pVM, PVMCPU pVCpu) } /** - * Prefetch the 4 PDPT pointers (PAE and nested paging only) + * Loads the 4 PDPEs into the guest state when nested paging is used and the + * guest operates in PAE mode. * * @returns VINF_SUCCESS or fatal error. - * @param pVM The VM to operate on. * @param pVCpu The VMCPU to operate on. * @param pCtx Guest context */ -static int vmxR0PrefetchPAEPdptrs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) +static int hmR0VmxLoadPaePdpes(PVMCPU pVCpu, PCPUMCTX pCtx) { if (CPUMIsGuestInPAEModeEx(pCtx)) { - for (unsigned i=0;i<4;i++) - { - X86PDPE Pdpe; - int rc = PGMGstQueryPaePDPtr(pVCpu, i, &Pdpe); - AssertRCReturn(rc, rc); + X86PDPE aPdpes[4]; + int rc = PGMGstGetPaePdpes(pVCpu, &aPdpes[0]); + AssertRCReturn(rc, rc); - rc = VMXWriteVMCS64(VMX_VMCS_GUEST_PDPTR0_FULL + i*2, Pdpe.u); - AssertRC(rc); - } + rc = VMXWriteVMCS64(VMX_VMCS_GUEST_PDPTR0_FULL, aPdpes[0].u); AssertRCReturn(rc, rc); + rc = VMXWriteVMCS64(VMX_VMCS_GUEST_PDPTR1_FULL, aPdpes[1].u); AssertRCReturn(rc, rc); + rc = VMXWriteVMCS64(VMX_VMCS_GUEST_PDPTR2_FULL, aPdpes[2].u); AssertRCReturn(rc, rc); + rc = VMXWriteVMCS64(VMX_VMCS_GUEST_PDPTR3_FULL, aPdpes[3].u); AssertRCReturn(rc, rc); } return VINF_SUCCESS; } /** + * Saves the 4 PDPEs into the guest state when nested paging is used and the + * guest operates in PAE mode. + * + * @returns VINF_SUCCESS or fatal error. + * @param pVCpu The VMCPU to operate on. + * @param pCtx Guest context + * + * @remarks Tell PGM about CR3 changes before calling this helper. + */ +static int hmR0VmxSavePaePdpes(PVMCPU pVCpu, PCPUMCTX pCtx) +{ + if (CPUMIsGuestInPAEModeEx(pCtx)) + { + int rc; + X86PDPE aPdpes[4]; + rc = VMXReadVMCS64(VMX_VMCS_GUEST_PDPTR0_FULL, &aPdpes[0].u); AssertRCReturn(rc, rc); + rc = VMXReadVMCS64(VMX_VMCS_GUEST_PDPTR1_FULL, &aPdpes[1].u); AssertRCReturn(rc, rc); + rc = VMXReadVMCS64(VMX_VMCS_GUEST_PDPTR2_FULL, &aPdpes[2].u); AssertRCReturn(rc, rc); + rc = VMXReadVMCS64(VMX_VMCS_GUEST_PDPTR3_FULL, &aPdpes[3].u); AssertRCReturn(rc, rc); + + rc = PGMGstUpdatePaePdpes(pVCpu, &aPdpes[0]); + AssertRCReturn(rc, rc); + } + return VINF_SUCCESS; +} + + +/** * Update the exception bitmap according to the current CPU state * * @param pVM The VM to operate on. @@ -1751,8 +1778,7 @@ VMMR0DECL(int) VMXR0LoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) { /* Save the real guest CR3 in VMX_VMCS_GUEST_CR3 */ val = pCtx->cr3; - /* Prefetch the four PDPT entries in PAE mode. */ - rc = vmxR0PrefetchPAEPdptrs(pVM, pVCpu, pCtx); + rc = hmR0VmxLoadPaePdpes(pVCpu, pCtx); AssertRCReturn(rc, rc); } } @@ -2026,8 +2052,7 @@ DECLINLINE(int) VMXR0SaveGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) CPUMSetGuestCR3(pVCpu, val); PGMUpdateCR3(pVCpu, val); } - /* Prefetch the four PDPT entries in PAE mode. */ - rc = vmxR0PrefetchPAEPdptrs(pVM, pVCpu, pCtx); + rc = hmR0VmxSavePaePdpes(pVCpu, pCtx); AssertRCReturn(rc, rc); } @@ -2159,8 +2184,10 @@ static void vmxR0SetupTLBEPT(PVM pVM, PVMCPU pVCpu) /* Force a TLB flush on VM entry. */ pVCpu->hwaccm.s.fForceTLBFlush = true; } - else - Assert(!pCpu->fFlushTLB); + /* Disabled because this has triggered every time I have suspended my + * laptop with a VM running for the past three months or more. */ + // else + // Assert(!pCpu->fFlushTLB); /* Check for tlb shootdown flushes. */ if (VMCPU_FF_TESTANDCLEAR(pVCpu, VMCPU_FF_TLB_FLUSH)) @@ -3855,13 +3882,13 @@ ResumeExecution: { Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, cbSize)); STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite); - rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), uPort, pDis->prefix, cbSize); + rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), uPort, pDis->prefix, pDis->addrmode, cbSize); } else { Log2(("IOMInterpretINSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, cbSize)); STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead); - rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), uPort, pDis->prefix, cbSize); + rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), uPort, pDis->prefix, pDis->addrmode, cbSize); } } else diff --git a/src/VBox/VMM/VMMR0/HWVMXR0.h b/src/VBox/VMM/VMMR0/HWVMXR0.h index f37c4eaa9..40c966e11 100644 --- a/src/VBox/VMM/VMMR0/HWVMXR0.h +++ b/src/VBox/VMM/VMMR0/HWVMXR0.h @@ -1,4 +1,4 @@ -/* $Id: HWVMXR0.h 37320 2011-06-03 15:05:36Z vboxsync $ */ +/* $Id: HWVMXR0.h $ */ /** @file * HWACCM VT-x - Internal header file. */ diff --git a/src/VBox/VMM/VMMR0/PDMR0Device.cpp b/src/VBox/VMM/VMMR0/PDMR0Device.cpp index f81aed729..c6884df3e 100644 --- a/src/VBox/VMM/VMMR0/PDMR0Device.cpp +++ b/src/VBox/VMM/VMMR0/PDMR0Device.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMR0Device.cpp 37410 2011-06-10 15:11:40Z vboxsync $ */ +/* $Id: PDMR0Device.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, R0 Device parts. */ diff --git a/src/VBox/VMM/VMMR0/PDMR0Driver.cpp b/src/VBox/VMM/VMMR0/PDMR0Driver.cpp index 8d0e704a7..728712c5d 100644 --- a/src/VBox/VMM/VMMR0/PDMR0Driver.cpp +++ b/src/VBox/VMM/VMMR0/PDMR0Driver.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMR0Driver.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: PDMR0Driver.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, R0 Driver parts. */ diff --git a/src/VBox/VMM/VMMR0/PGMR0.cpp b/src/VBox/VMM/VMMR0/PGMR0.cpp index c2b2ced20..5e8ab2816 100644 --- a/src/VBox/VMM/VMMR0/PGMR0.cpp +++ b/src/VBox/VMM/VMMR0/PGMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMR0.cpp 37950 2011-07-14 10:13:39Z vboxsync $ */ +/* $Id: PGMR0.cpp $ */ /** @file * PGM - Page Manager and Monitor, Ring-0. */ diff --git a/src/VBox/VMM/VMMR0/PGMR0Bth.h b/src/VBox/VMM/VMMR0/PGMR0Bth.h index 6ec721147..6c0bb8de3 100644 --- a/src/VBox/VMM/VMMR0/PGMR0Bth.h +++ b/src/VBox/VMM/VMMR0/PGMR0Bth.h @@ -1,4 +1,4 @@ -/* $Id: PGMR0Bth.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: PGMR0Bth.h $ */ /** @file * VBox - Page Manager / Monitor, Shadow+Guest Paging Template. */ diff --git a/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp b/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp index 2156e2242..120428c7d 100644 --- a/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp +++ b/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMR0SharedPage.cpp 37354 2011-06-07 15:05:32Z vboxsync $ */ +/* $Id: PGMR0SharedPage.cpp $ */ /** @file * PGM - Page Manager and Monitor, Page Sharing, Ring-0. */ diff --git a/src/VBox/VMM/VMMR0/TRPMR0.cpp b/src/VBox/VMM/VMMR0/TRPMR0.cpp index c3b5e7a74..9255772ed 100644 --- a/src/VBox/VMM/VMMR0/TRPMR0.cpp +++ b/src/VBox/VMM/VMMR0/TRPMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPMR0.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: TRPMR0.cpp $ */ /** @file * TRPM - The Trap Monitor - HC Ring 0 */ diff --git a/src/VBox/VMM/VMMR0/TRPMR0A.asm b/src/VBox/VMM/VMMR0/TRPMR0A.asm index fe321b272..64da5a371 100644 --- a/src/VBox/VMM/VMMR0/TRPMR0A.asm +++ b/src/VBox/VMM/VMMR0/TRPMR0A.asm @@ -1,4 +1,4 @@ -; $Id: TRPMR0A.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: TRPMR0A.asm $ ;; @file ; TRPM - Host Context Ring-0 ; diff --git a/src/VBox/VMM/VMMR0/VMMR0.cpp b/src/VBox/VMM/VMMR0/VMMR0.cpp index 321558a59..0382ddcd8 100644 --- a/src/VBox/VMM/VMMR0/VMMR0.cpp +++ b/src/VBox/VMM/VMMR0/VMMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMR0.cpp 37584 2011-06-22 09:54:26Z vboxsync $ */ +/* $Id: VMMR0.cpp $ */ /** @file * VMM - Host Context Ring 0. */ diff --git a/src/VBox/VMM/VMMR0/VMMR0.def b/src/VBox/VMM/VMMR0/VMMR0.def index 16a57ab84..d91f10fad 100644 --- a/src/VBox/VMM/VMMR0/VMMR0.def +++ b/src/VBox/VMM/VMMR0/VMMR0.def @@ -1,4 +1,4 @@ -; $Id: VMMR0.def 37454 2011-06-14 19:18:56Z vboxsync $ +; $Id: VMMR0.def $ ;; @file ; VMM Ring 0 DLL - Definition file. diff --git a/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm b/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm index 31ef955ef..de685b949 100644 --- a/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm +++ b/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm @@ -1,4 +1,4 @@ -; $Id: VMMR0JmpA-amd64.asm 37227 2011-05-26 18:35:59Z vboxsync $ +; $Id: VMMR0JmpA-amd64.asm $ ;; @file ; VMM - R0 SetJmp / LongJmp routines for AMD64. ; diff --git a/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm b/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm index 1e263d8ba..76a0cb9ea 100644 --- a/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm +++ b/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm @@ -1,4 +1,4 @@ -; $Id: VMMR0JmpA-x86.asm 35334 2010-12-27 12:27:46Z vboxsync $ +; $Id: VMMR0JmpA-x86.asm $ ;; @file ; VMM - R0 SetJmp / LongJmp routines for X86. ; diff --git a/src/VBox/VMM/VMMR3/CFGM.cpp b/src/VBox/VMM/VMMR3/CFGM.cpp index 5a744d16d..27ce599f9 100644 --- a/src/VBox/VMM/VMMR3/CFGM.cpp +++ b/src/VBox/VMM/VMMR3/CFGM.cpp @@ -1,4 +1,4 @@ -/* $Id: CFGM.cpp 36819 2011-04-22 19:40:04Z vboxsync $ */ +/* $Id: CFGM.cpp $ */ /** @file * CFGM - Configuration Manager. */ diff --git a/src/VBox/VMM/VMMR3/CPUM.cpp b/src/VBox/VMM/VMMR3/CPUM.cpp index af2df7d86..13dbf173a 100644 --- a/src/VBox/VMM/VMMR3/CPUM.cpp +++ b/src/VBox/VMM/VMMR3/CPUM.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUM.cpp 37136 2011-05-18 14:45:47Z vboxsync $ */ +/* $Id: CPUM.cpp $ */ /** @file * CPUM - CPU Monitor / Manager. */ diff --git a/src/VBox/VMM/VMMR3/CPUMDbg.cpp b/src/VBox/VMM/VMMR3/CPUMDbg.cpp index c2d8dc9f3..63154584d 100644 --- a/src/VBox/VMM/VMMR3/CPUMDbg.cpp +++ b/src/VBox/VMM/VMMR3/CPUMDbg.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMDbg.cpp 35625 2011-01-19 11:17:34Z vboxsync $ */ +/* $Id: CPUMDbg.cpp $ */ /** @file * CPUM - CPU Monitor / Manager, Debugger & Debugging APIs. */ diff --git a/src/VBox/VMM/VMMR3/CSAM.cpp b/src/VBox/VMM/VMMR3/CSAM.cpp index 9ff6885d4..ff8fc5b7b 100644 --- a/src/VBox/VMM/VMMR3/CSAM.cpp +++ b/src/VBox/VMM/VMMR3/CSAM.cpp @@ -1,4 +1,4 @@ -/* $Id: CSAM.cpp 36969 2011-05-05 08:59:43Z vboxsync $ */ +/* $Id: CSAM.cpp $ */ /** @file * CSAM - Guest OS Code Scanning and Analysis Manager */ diff --git a/src/VBox/VMM/VMMR3/DBGF.cpp b/src/VBox/VMM/VMMR3/DBGF.cpp index 4902a5987..c20c51934 100644 --- a/src/VBox/VMM/VMMR3/DBGF.cpp +++ b/src/VBox/VMM/VMMR3/DBGF.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGF.cpp 37410 2011-06-10 15:11:40Z vboxsync $ */ +/* $Id: DBGF.cpp $ */ /** @file * DBGF - Debugger Facility. */ diff --git a/src/VBox/VMM/VMMR3/DBGFAddr.cpp b/src/VBox/VMM/VMMR3/DBGFAddr.cpp index f957e5eea..7c39093c1 100644 --- a/src/VBox/VMM/VMMR3/DBGFAddr.cpp +++ b/src/VBox/VMM/VMMR3/DBGFAddr.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFAddr.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFAddr.cpp $ */ /** @file * DBGF - Debugger Facility, Mixed Address Methods. */ diff --git a/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp b/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp index a5f569c36..b41d5250b 100644 --- a/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp +++ b/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFAddrSpace.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFAddrSpace.cpp $ */ /** @file * DBGF - Debugger Facility, Address Space Management. */ diff --git a/src/VBox/VMM/VMMR3/DBGFBp.cpp b/src/VBox/VMM/VMMR3/DBGFBp.cpp index 4df1c5b3a..5c590ac02 100644 --- a/src/VBox/VMM/VMMR3/DBGFBp.cpp +++ b/src/VBox/VMM/VMMR3/DBGFBp.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFBp.cpp 35694 2011-01-24 17:35:59Z vboxsync $ */ +/* $Id: DBGFBp.cpp $ */ /** @file * DBGF - Debugger Facility, Breakpoint Management. */ diff --git a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp index d850599a2..a6c0dfe18 100644 --- a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp +++ b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFCoreWrite.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFCoreWrite.cpp $ */ /** @file * DBGF - Debugger Facility, Guest Core Dump. */ diff --git a/src/VBox/VMM/VMMR3/DBGFCpu.cpp b/src/VBox/VMM/VMMR3/DBGFCpu.cpp index 14a235e1f..9f8efd6e0 100644 --- a/src/VBox/VMM/VMMR3/DBGFCpu.cpp +++ b/src/VBox/VMM/VMMR3/DBGFCpu.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFCpu.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFCpu.cpp $ */ /** @file * DBGF - Debugger Facility, CPU State Accessors. */ diff --git a/src/VBox/VMM/VMMR3/DBGFDisas.cpp b/src/VBox/VMM/VMMR3/DBGFDisas.cpp index c722c320c..b7fefac45 100644 --- a/src/VBox/VMM/VMMR3/DBGFDisas.cpp +++ b/src/VBox/VMM/VMMR3/DBGFDisas.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFDisas.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFDisas.cpp $ */ /** @file * DBGF - Debugger Facility, Disassembler. */ diff --git a/src/VBox/VMM/VMMR3/DBGFInfo.cpp b/src/VBox/VMM/VMMR3/DBGFInfo.cpp index aed5b7eec..0a48ff3cc 100644 --- a/src/VBox/VMM/VMMR3/DBGFInfo.cpp +++ b/src/VBox/VMM/VMMR3/DBGFInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFInfo.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFInfo.cpp $ */ /** @file * DBGF - Debugger Facility, Info. */ diff --git a/src/VBox/VMM/VMMR3/DBGFLog.cpp b/src/VBox/VMM/VMMR3/DBGFLog.cpp index f8162dba1..3af43f63f 100644 --- a/src/VBox/VMM/VMMR3/DBGFLog.cpp +++ b/src/VBox/VMM/VMMR3/DBGFLog.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFLog.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFLog.cpp $ */ /** @file * DBGF - Debugger Facility, Log Manager. */ diff --git a/src/VBox/VMM/VMMR3/DBGFMem.cpp b/src/VBox/VMM/VMMR3/DBGFMem.cpp index ea2eeb90b..ee6747a9c 100644 --- a/src/VBox/VMM/VMMR3/DBGFMem.cpp +++ b/src/VBox/VMM/VMMR3/DBGFMem.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFMem.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFMem.cpp $ */ /** @file * DBGF - Debugger Facility, Memory Methods. */ diff --git a/src/VBox/VMM/VMMR3/DBGFModule.cpp b/src/VBox/VMM/VMMR3/DBGFModule.cpp index 2b3675e2f..d17cbf650 100644 --- a/src/VBox/VMM/VMMR3/DBGFModule.cpp +++ b/src/VBox/VMM/VMMR3/DBGFModule.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFModule.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFModule.cpp $ */ /** @file * DBGF - Debugger Facility, Module & Segment Management. */ diff --git a/src/VBox/VMM/VMMR3/DBGFOS.cpp b/src/VBox/VMM/VMMR3/DBGFOS.cpp index 4a5407d42..103c4e657 100644 --- a/src/VBox/VMM/VMMR3/DBGFOS.cpp +++ b/src/VBox/VMM/VMMR3/DBGFOS.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFOS.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFOS.cpp $ */ /** @file * DBGF - Debugger Facility, Guest OS Diggers. */ diff --git a/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp b/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp index a52573f57..11fe9a43b 100644 --- a/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp +++ b/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFR3Trace.cpp 37410 2011-06-10 15:11:40Z vboxsync $ */ +/* $Id: DBGFR3Trace.cpp $ */ /** @file * DBGF - Debugger Facility, Tracing. */ diff --git a/src/VBox/VMM/VMMR3/DBGFReg.cpp b/src/VBox/VMM/VMMR3/DBGFReg.cpp index 79e595843..a72c00801 100644 --- a/src/VBox/VMM/VMMR3/DBGFReg.cpp +++ b/src/VBox/VMM/VMMR3/DBGFReg.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFReg.cpp 36826 2011-04-23 23:12:54Z vboxsync $ */ +/* $Id: DBGFReg.cpp $ */ /** @file * DBGF - Debugger Facility, Register Methods. */ diff --git a/src/VBox/VMM/VMMR3/DBGFStack.cpp b/src/VBox/VMM/VMMR3/DBGFStack.cpp index 6faf7cbeb..9e64374b5 100644 --- a/src/VBox/VMM/VMMR3/DBGFStack.cpp +++ b/src/VBox/VMM/VMMR3/DBGFStack.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFStack.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFStack.cpp $ */ /** @file * DBGF - Debugger Facility, Call Stack Analyser. */ diff --git a/src/VBox/VMM/VMMR3/DBGFSym.cpp b/src/VBox/VMM/VMMR3/DBGFSym.cpp index 7299058e4..bfbcd76a3 100644 --- a/src/VBox/VMM/VMMR3/DBGFSym.cpp +++ b/src/VBox/VMM/VMMR3/DBGFSym.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFSym.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFSym.cpp $ */ /** @file * DBGF - Debugger Facility, Symbol Management. */ diff --git a/src/VBox/VMM/VMMR3/EM.cpp b/src/VBox/VMM/VMMR3/EM.cpp index 9d5ec4916..a65b0a04a 100644 --- a/src/VBox/VMM/VMMR3/EM.cpp +++ b/src/VBox/VMM/VMMR3/EM.cpp @@ -1,4 +1,4 @@ -/* $Id: EM.cpp 38378 2011-08-09 13:37:41Z vboxsync $ */ +/* $Id: EM.cpp $ */ /** @file * EM - Execution Monitor / Manager. */ diff --git a/src/VBox/VMM/VMMR3/EMHwaccm.cpp b/src/VBox/VMM/VMMR3/EMHwaccm.cpp index a5122a2bc..740d6861a 100644 --- a/src/VBox/VMM/VMMR3/EMHwaccm.cpp +++ b/src/VBox/VMM/VMMR3/EMHwaccm.cpp @@ -1,4 +1,4 @@ -/* $Id: EMHwaccm.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: EMHwaccm.cpp $ */ /** @file * EM - Execution Monitor / Manager - hardware virtualization */ diff --git a/src/VBox/VMM/VMMR3/EMRaw.cpp b/src/VBox/VMM/VMMR3/EMRaw.cpp index a744a8773..3b3cf7cbe 100644 --- a/src/VBox/VMM/VMMR3/EMRaw.cpp +++ b/src/VBox/VMM/VMMR3/EMRaw.cpp @@ -1,4 +1,4 @@ -/* $Id: EMRaw.cpp 38324 2011-08-05 14:02:53Z vboxsync $ */ +/* $Id: EMRaw.cpp $ */ /** @file * EM - Execution Monitor / Manager - software virtualization diff --git a/src/VBox/VMM/VMMR3/FTM.cpp b/src/VBox/VMM/VMMR3/FTM.cpp index 67c66e0ea..baff39bc7 100644 --- a/src/VBox/VMM/VMMR3/FTM.cpp +++ b/src/VBox/VMM/VMMR3/FTM.cpp @@ -1,4 +1,4 @@ -/* $Id: FTM.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: FTM.cpp $ */ /** @file * FTM - Fault Tolerance Manager */ diff --git a/src/VBox/VMM/VMMR3/GMM.cpp b/src/VBox/VMM/VMMR3/GMM.cpp index db6c073f5..258c49278 100644 --- a/src/VBox/VMM/VMMR3/GMM.cpp +++ b/src/VBox/VMM/VMMR3/GMM.cpp @@ -1,4 +1,4 @@ -/* $Id: GMM.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: GMM.cpp $ */ /** @file * GMM - Global Memory Manager, ring-3 request wrappers. */ diff --git a/src/VBox/VMM/VMMR3/HWACCM.cpp b/src/VBox/VMM/VMMR3/HWACCM.cpp index a7a9d028e..5aa1844f3 100644 --- a/src/VBox/VMM/VMMR3/HWACCM.cpp +++ b/src/VBox/VMM/VMMR3/HWACCM.cpp @@ -1,4 +1,4 @@ -/* $Id: HWACCM.cpp 37323 2011-06-03 16:20:06Z vboxsync $ */ +/* $Id: HWACCM.cpp $ */ /** @file * HWACCM - Intel/AMD VM Hardware Support Manager */ diff --git a/src/VBox/VMM/VMMR3/IEMR3.cpp b/src/VBox/VMM/VMMR3/IEMR3.cpp index a244c4241..3bcb16b56 100644 --- a/src/VBox/VMM/VMMR3/IEMR3.cpp +++ b/src/VBox/VMM/VMMR3/IEMR3.cpp @@ -1,4 +1,4 @@ -/* $Id: IEMR3.cpp 36788 2011-04-21 09:33:24Z vboxsync $ */ +/* $Id: IEMR3.cpp $ */ /** @file * IEM - Interpreted Execution Manager. */ diff --git a/src/VBox/VMM/VMMR3/IOM.cpp b/src/VBox/VMM/VMMR3/IOM.cpp index 96e1e4857..3eb3c5abb 100644 --- a/src/VBox/VMM/VMMR3/IOM.cpp +++ b/src/VBox/VMM/VMMR3/IOM.cpp @@ -1,4 +1,4 @@ -/* $Id: IOM.cpp 37467 2011-06-15 13:08:45Z vboxsync $ */ +/* $Id: IOM.cpp $ */ /** @file * IOM - Input / Output Monitor. */ diff --git a/src/VBox/VMM/VMMR3/MM.cpp b/src/VBox/VMM/VMMR3/MM.cpp index a05035116..b33e79581 100644 --- a/src/VBox/VMM/VMMR3/MM.cpp +++ b/src/VBox/VMM/VMMR3/MM.cpp @@ -1,4 +1,4 @@ -/* $Id: MM.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: MM.cpp $ */ /** @file * MM - Memory Manager. */ diff --git a/src/VBox/VMM/VMMR3/MMHeap.cpp b/src/VBox/VMM/VMMR3/MMHeap.cpp index 69e18acd1..1162b0c51 100644 --- a/src/VBox/VMM/VMMR3/MMHeap.cpp +++ b/src/VBox/VMM/VMMR3/MMHeap.cpp @@ -1,4 +1,4 @@ -/* $Id: MMHeap.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: MMHeap.cpp $ */ /** @file * MM - Memory Manager - Heap. */ diff --git a/src/VBox/VMM/VMMR3/MMHyper.cpp b/src/VBox/VMM/VMMR3/MMHyper.cpp index 989036c2a..a56a347fb 100644 --- a/src/VBox/VMM/VMMR3/MMHyper.cpp +++ b/src/VBox/VMM/VMMR3/MMHyper.cpp @@ -1,4 +1,4 @@ -/* $Id: MMHyper.cpp 36960 2011-05-04 16:08:29Z vboxsync $ */ +/* $Id: MMHyper.cpp $ */ /** @file * MM - Memory Manager - Hypervisor Memory Area. */ diff --git a/src/VBox/VMM/VMMR3/MMPagePool.cpp b/src/VBox/VMM/VMMR3/MMPagePool.cpp index 0636ce985..85e8213ae 100644 --- a/src/VBox/VMM/VMMR3/MMPagePool.cpp +++ b/src/VBox/VMM/VMMR3/MMPagePool.cpp @@ -1,4 +1,4 @@ -/* $Id: MMPagePool.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: MMPagePool.cpp $ */ /** @file * MM - Memory Manager - Page Pool. */ diff --git a/src/VBox/VMM/VMMR3/MMUkHeap.cpp b/src/VBox/VMM/VMMR3/MMUkHeap.cpp index 6f49232ee..0b8761fc8 100644 --- a/src/VBox/VMM/VMMR3/MMUkHeap.cpp +++ b/src/VBox/VMM/VMMR3/MMUkHeap.cpp @@ -1,4 +1,4 @@ -/* $Id: MMUkHeap.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: MMUkHeap.cpp $ */ /** @file * MM - Memory Manager - Ring-3 Heap with kernel accessible mapping. */ diff --git a/src/VBox/VMM/VMMR3/PATM.cpp b/src/VBox/VMM/VMMR3/PATM.cpp index 5198089b4..3ce8c6a4b 100644 --- a/src/VBox/VMM/VMMR3/PATM.cpp +++ b/src/VBox/VMM/VMMR3/PATM.cpp @@ -1,4 +1,4 @@ -/* $Id: PATM.cpp 36969 2011-05-05 08:59:43Z vboxsync $ */ +/* $Id: PATM.cpp $ */ /** @file * PATM - Dynamic Guest OS Patching Manager * diff --git a/src/VBox/VMM/VMMR3/PATMA.asm b/src/VBox/VMM/VMMR3/PATMA.asm index 5e30f67d0..cb10d6db1 100644 --- a/src/VBox/VMM/VMMR3/PATMA.asm +++ b/src/VBox/VMM/VMMR3/PATMA.asm @@ -1,4 +1,4 @@ -; $Id: PATMA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: PATMA.asm $ ;; @file ; PATM Assembly Routines. ; diff --git a/src/VBox/VMM/VMMR3/PATMA.mac b/src/VBox/VMM/VMMR3/PATMA.mac index 46c50a4d4..d6e0d3c63 100644 --- a/src/VBox/VMM/VMMR3/PATMA.mac +++ b/src/VBox/VMM/VMMR3/PATMA.mac @@ -1,4 +1,4 @@ -; $Id: PATMA.mac 35348 2010-12-27 16:35:23Z vboxsync $ +; $Id: PATMA.mac $ ;; @file ; PATM macros & definitions (identical to PATMA.h!!) ; diff --git a/src/VBox/VMM/VMMR3/PATMGuest.cpp b/src/VBox/VMM/VMMR3/PATMGuest.cpp index 9231aa50d..345a828f0 100644 --- a/src/VBox/VMM/VMMR3/PATMGuest.cpp +++ b/src/VBox/VMM/VMMR3/PATMGuest.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMGuest.cpp 35348 2010-12-27 16:35:23Z vboxsync $ */ +/* $Id: PATMGuest.cpp $ */ /** @file * PATMGuest - Guest OS Patching Manager (non-generic) */ diff --git a/src/VBox/VMM/VMMR3/PATMPatch.cpp b/src/VBox/VMM/VMMR3/PATMPatch.cpp index 72e775431..3f93c1740 100644 --- a/src/VBox/VMM/VMMR3/PATMPatch.cpp +++ b/src/VBox/VMM/VMMR3/PATMPatch.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMPatch.cpp 35348 2010-12-27 16:35:23Z vboxsync $ */ +/* $Id: PATMPatch.cpp $ */ /** @file * PATMPatch - Dynamic Guest OS Instruction patches * diff --git a/src/VBox/VMM/VMMR3/PATMPatch.h b/src/VBox/VMM/VMMR3/PATMPatch.h index e3a2f7638..eb859ab5a 100644 --- a/src/VBox/VMM/VMMR3/PATMPatch.h +++ b/src/VBox/VMM/VMMR3/PATMPatch.h @@ -1,4 +1,4 @@ -/* $Id: PATMPatch.h 35348 2010-12-27 16:35:23Z vboxsync $ */ +/* $Id: PATMPatch.h $ */ /** @file * PATMPatch - Internal header file. */ diff --git a/src/VBox/VMM/VMMR3/PATMSSM.cpp b/src/VBox/VMM/VMMR3/PATMSSM.cpp index 844464f16..118ac3907 100644 --- a/src/VBox/VMM/VMMR3/PATMSSM.cpp +++ b/src/VBox/VMM/VMMR3/PATMSSM.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMSSM.cpp 36669 2011-04-14 12:21:43Z vboxsync $ */ +/* $Id: PATMSSM.cpp $ */ /** @file * PATMSSM - Dynamic Guest OS Patching Manager; Save and load state * diff --git a/src/VBox/VMM/VMMR3/PDM.cpp b/src/VBox/VMM/VMMR3/PDM.cpp index f4bbd230a..e2b60df6d 100644 --- a/src/VBox/VMM/VMMR3/PDM.cpp +++ b/src/VBox/VMM/VMMR3/PDM.cpp @@ -1,4 +1,4 @@ -/* $Id: PDM.cpp 37466 2011-06-15 12:44:16Z vboxsync $ */ +/* $Id: PDM.cpp $ */ /** @file * PDM - Pluggable Device Manager. */ diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp index 3b6960592..44eb39f11 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAsyncCompletion.cpp 36001 2011-02-16 21:21:39Z vboxsync $ */ +/* $Id: PDMAsyncCompletion.cpp $ */ /** @file * PDM Async I/O - Transport data asynchronous in R3 using EMT. */ diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp index 4e8c55ccd..fa0b4c446 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAsyncCompletionFile.cpp 37597 2011-06-22 20:54:05Z vboxsync $ */ +/* $Id: PDMAsyncCompletionFile.cpp $ */ /** @file * PDM Async I/O - Transport data asynchronous in R3 using EMT. */ diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp index 60280110c..8fcd7d549 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAsyncCompletionFileFailsafe.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: PDMAsyncCompletionFileFailsafe.cpp $ */ /** @file * PDM Async I/O - Transport data asynchronous in R3 using EMT. * Simple File I/O manager. diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp index d4e45aae5..f959e4dd3 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAsyncCompletionFileNormal.cpp 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: PDMAsyncCompletionFileNormal.cpp $ */ /** @file * PDM Async I/O - Transport data asynchronous in R3 using EMT. * Async File I/O manager. diff --git a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp index 3a6b7080a..498389cc9 100644 --- a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp +++ b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMBlkCache.cpp 37933 2011-07-13 22:57:20Z vboxsync $ */ +/* $Id: PDMBlkCache.cpp $ */ /** @file * PDM Block Cache. */ diff --git a/src/VBox/VMM/VMMR3/PDMCritSect.cpp b/src/VBox/VMM/VMMR3/PDMCritSect.cpp index 6943726d4..399e0ec80 100644 --- a/src/VBox/VMM/VMMR3/PDMCritSect.cpp +++ b/src/VBox/VMM/VMMR3/PDMCritSect.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMCritSect.cpp 37466 2011-06-15 12:44:16Z vboxsync $ */ +/* $Id: PDMCritSect.cpp $ */ /** @file * PDM - Critical Sections, Ring-3. */ diff --git a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp index 5d7851080..0a2e7365b 100644 --- a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp +++ b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMDevHlp.cpp 37466 2011-06-15 12:44:16Z vboxsync $ */ +/* $Id: PDMDevHlp.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, Device Helpers. */ diff --git a/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp index e42599b9d..6a82da07e 100644 --- a/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp +++ b/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMDevMiscHlp.cpp 36820 2011-04-22 19:40:29Z vboxsync $ */ +/* $Id: PDMDevMiscHlp.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, Misc. Device Helpers. */ diff --git a/src/VBox/VMM/VMMR3/PDMDevice.cpp b/src/VBox/VMM/VMMR3/PDMDevice.cpp index 8ce97ed28..6542329c3 100644 --- a/src/VBox/VMM/VMMR3/PDMDevice.cpp +++ b/src/VBox/VMM/VMMR3/PDMDevice.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMDevice.cpp 37812 2011-07-07 09:56:42Z vboxsync $ */ +/* $Id: PDMDevice.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, Device parts. */ diff --git a/src/VBox/VMM/VMMR3/PDMDriver.cpp b/src/VBox/VMM/VMMR3/PDMDriver.cpp index 9fa5f4661..6187532d4 100644 --- a/src/VBox/VMM/VMMR3/PDMDriver.cpp +++ b/src/VBox/VMM/VMMR3/PDMDriver.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMDriver.cpp 37418 2011-06-11 08:22:10Z vboxsync $ */ +/* $Id: PDMDriver.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, Driver parts. */ diff --git a/src/VBox/VMM/VMMR3/PDMLdr.cpp b/src/VBox/VMM/VMMR3/PDMLdr.cpp index d2871e7a6..00d7458ce 100644 --- a/src/VBox/VMM/VMMR3/PDMLdr.cpp +++ b/src/VBox/VMM/VMMR3/PDMLdr.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMLdr.cpp 37443 2011-06-14 14:34:11Z vboxsync $ */ +/* $Id: PDMLdr.cpp $ */ /** @file * PDM - Pluggable Device Manager, module loader. */ diff --git a/src/VBox/VMM/VMMR3/PDMQueue.cpp b/src/VBox/VMM/VMMR3/PDMQueue.cpp index afb16ca3e..7827e0d3e 100644 --- a/src/VBox/VMM/VMMR3/PDMQueue.cpp +++ b/src/VBox/VMM/VMMR3/PDMQueue.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMQueue.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: PDMQueue.cpp $ */ /** @file * PDM Queue - Transport data and tasks to EMT and R3. */ diff --git a/src/VBox/VMM/VMMR3/PDMThread.cpp b/src/VBox/VMM/VMMR3/PDMThread.cpp index 997e4c2b8..02aa7aef0 100644 --- a/src/VBox/VMM/VMMR3/PDMThread.cpp +++ b/src/VBox/VMM/VMMR3/PDMThread.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMThread.cpp 36437 2011-03-25 15:36:59Z vboxsync $ */ +/* $Id: PDMThread.cpp $ */ /** @file * PDM Thread - VM Thread Management. */ diff --git a/src/VBox/VMM/VMMR3/PDMUsb.cpp b/src/VBox/VMM/VMMR3/PDMUsb.cpp index ad221a2ef..c3aca715b 100644 --- a/src/VBox/VMM/VMMR3/PDMUsb.cpp +++ b/src/VBox/VMM/VMMR3/PDMUsb.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMUsb.cpp 37879 2011-07-12 04:35:53Z vboxsync $ */ +/* $Id: PDMUsb.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, USB part. */ diff --git a/src/VBox/VMM/VMMR3/PGM.cpp b/src/VBox/VMM/VMMR3/PGM.cpp index 0c2c5c1f7..8a1c2e4a7 100644 --- a/src/VBox/VMM/VMMR3/PGM.cpp +++ b/src/VBox/VMM/VMMR3/PGM.cpp @@ -1,4 +1,4 @@ -/* $Id: PGM.cpp 37803 2011-07-06 14:45:27Z vboxsync $ */ +/* $Id: PGM.cpp $ */ /** @file * PGM - Page Manager and Monitor. (Mixing stuff here, not good?) */ @@ -1243,6 +1243,7 @@ VMMR3DECL(int) PGMR3Init(PVM pVM) #endif pPGM->apGstPaePDsRC[i] = NIL_RTRCPTR; pPGM->aGCPhysGstPaePDs[i] = NIL_RTGCPHYS; + pPGM->aGstPaePdpeRegs[i].u = UINT64_MAX; pPGM->aGCPhysGstPaePDsMonitored[i] = NIL_RTGCPHYS; } @@ -1595,6 +1596,27 @@ static int pgmR3InitPaging(PVM pVM) MMPage2Phys(pVM, pVM->pgm.s.apInterPaePDs[0]), MMPage2Phys(pVM, pVM->pgm.s.apInterPaePDs[1]), MMPage2Phys(pVM, pVM->pgm.s.apInterPaePDs[2]), MMPage2Phys(pVM, pVM->pgm.s.apInterPaePDs[3]), MMPage2Phys(pVM, pVM->pgm.s.pInterPaePDPT64))); #endif + + /* + * Log the host paging mode. It may come in handy. + */ + const char *pszHostMode; + switch (pVM->pgm.s.enmHostMode) + { + case SUPPAGINGMODE_32_BIT: pszHostMode = "32-bit"; break; + case SUPPAGINGMODE_32_BIT_GLOBAL: pszHostMode = "32-bit+PGE"; break; + case SUPPAGINGMODE_PAE: pszHostMode = "PAE"; break; + case SUPPAGINGMODE_PAE_GLOBAL: pszHostMode = "PAE+PGE"; break; + case SUPPAGINGMODE_PAE_NX: pszHostMode = "PAE+NXE"; break; + case SUPPAGINGMODE_PAE_GLOBAL_NX: pszHostMode = "PAE+PGE+NXE"; break; + case SUPPAGINGMODE_AMD64: pszHostMode = "AMD64"; break; + case SUPPAGINGMODE_AMD64_GLOBAL: pszHostMode = "AMD64+PGE"; break; + case SUPPAGINGMODE_AMD64_NX: pszHostMode = "AMD64+NX"; break; + case SUPPAGINGMODE_AMD64_GLOBAL_NX: pszHostMode = "AMD64+PGE+NX"; break; + default: pszHostMode = "???"; break; + } + LogRel(("Host paging mode: %s\n", pszHostMode)); + return VINF_SUCCESS; } diff --git a/src/VBox/VMM/VMMR3/PGMBth.h b/src/VBox/VMM/VMMR3/PGMBth.h index ac4cb0240..7b39c6b94 100644 --- a/src/VBox/VMM/VMMR3/PGMBth.h +++ b/src/VBox/VMM/VMMR3/PGMBth.h @@ -1,4 +1,4 @@ -/* $Id: PGMBth.h 35333 2010-12-27 12:10:56Z vboxsync $ */ +/* $Id: PGMBth.h $ */ /** @file * VBox - Page Manager / Monitor, Shadow+Guest Paging Template. */ diff --git a/src/VBox/VMM/VMMR3/PGMDbg.cpp b/src/VBox/VMM/VMMR3/PGMDbg.cpp index fb7b15f8f..720d5876a 100644 --- a/src/VBox/VMM/VMMR3/PGMDbg.cpp +++ b/src/VBox/VMM/VMMR3/PGMDbg.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMDbg.cpp 37187 2011-05-23 16:11:11Z vboxsync $ */ +/* $Id: PGMDbg.cpp $ */ /** @file * PGM - Page Manager and Monitor - Debugger & Debugging APIs. */ diff --git a/src/VBox/VMM/VMMR3/PGMGst.h b/src/VBox/VMM/VMMR3/PGMGst.h index cc0773fd1..d0b38d85e 100644 --- a/src/VBox/VMM/VMMR3/PGMGst.h +++ b/src/VBox/VMM/VMMR3/PGMGst.h @@ -1,4 +1,4 @@ -/* $Id: PGMGst.h 35333 2010-12-27 12:10:56Z vboxsync $ */ +/* $Id: PGMGst.h $ */ /** @file * VBox - Page Manager / Monitor, Guest Paging Template. */ diff --git a/src/VBox/VMM/VMMR3/PGMHandler.cpp b/src/VBox/VMM/VMMR3/PGMHandler.cpp index b712b17e6..6f438c80d 100644 --- a/src/VBox/VMM/VMMR3/PGMHandler.cpp +++ b/src/VBox/VMM/VMMR3/PGMHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMHandler.cpp 36891 2011-04-29 13:22:57Z vboxsync $ */ +/* $Id: PGMHandler.cpp $ */ /** @file * PGM - Page Manager / Monitor, Access Handlers. */ diff --git a/src/VBox/VMM/VMMR3/PGMMap.cpp b/src/VBox/VMM/VMMR3/PGMMap.cpp index 52e249a1b..41d170e5f 100644 --- a/src/VBox/VMM/VMMR3/PGMMap.cpp +++ b/src/VBox/VMM/VMMR3/PGMMap.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMMap.cpp 36891 2011-04-29 13:22:57Z vboxsync $ */ +/* $Id: PGMMap.cpp $ */ /** @file * PGM - Page Manager, Guest Context Mappings. */ diff --git a/src/VBox/VMM/VMMR3/PGMPhys.cpp b/src/VBox/VMM/VMMR3/PGMPhys.cpp index eccb018d2..e84e6d1f9 100644 --- a/src/VBox/VMM/VMMR3/PGMPhys.cpp +++ b/src/VBox/VMM/VMMR3/PGMPhys.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMPhys.cpp 38320 2011-08-04 19:16:53Z vboxsync $ */ +/* $Id: PGMPhys.cpp $ */ /** @file * PGM - Page Manager and Monitor, Physical Memory Addressing. */ diff --git a/src/VBox/VMM/VMMR3/PGMPhysRWTmpl.h b/src/VBox/VMM/VMMR3/PGMPhysRWTmpl.h index d4feb1ed6..0078b65e4 100644 --- a/src/VBox/VMM/VMMR3/PGMPhysRWTmpl.h +++ b/src/VBox/VMM/VMMR3/PGMPhysRWTmpl.h @@ -1,4 +1,4 @@ -/* $Id: PGMPhysRWTmpl.h 35333 2010-12-27 12:10:56Z vboxsync $ */ +/* $Id: PGMPhysRWTmpl.h $ */ /** @file * PGM - Page Manager and Monitor, Physical Memory Access Template. */ diff --git a/src/VBox/VMM/VMMR3/PGMPool.cpp b/src/VBox/VMM/VMMR3/PGMPool.cpp index bee61a1f6..2cf9e929a 100644 --- a/src/VBox/VMM/VMMR3/PGMPool.cpp +++ b/src/VBox/VMM/VMMR3/PGMPool.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMPool.cpp 37354 2011-06-07 15:05:32Z vboxsync $ */ +/* $Id: PGMPool.cpp $ */ /** @file * PGM Shadow Page Pool. */ diff --git a/src/VBox/VMM/VMMR3/PGMSavedState.cpp b/src/VBox/VMM/VMMR3/PGMSavedState.cpp index bf1bae6d8..3ead1d888 100644 --- a/src/VBox/VMM/VMMR3/PGMSavedState.cpp +++ b/src/VBox/VMM/VMMR3/PGMSavedState.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMSavedState.cpp 37354 2011-06-07 15:05:32Z vboxsync $ */ +/* $Id: PGMSavedState.cpp $ */ /** @file * PGM - Page Manager and Monitor, The Saved State Part. */ @@ -45,9 +45,10 @@ /******************************************************************************* * Defined Constants And Macros * *******************************************************************************/ -/** Saved state data unit version. - * @todo remove the guest mappings from the saved state at next version change! */ -#define PGM_SAVED_STATE_VERSION 13 +/** Saved state data unit version. */ +#define PGM_SAVED_STATE_VERSION 14 +/** Saved state data unit version before the PAE PDPE registers. */ +#define PGM_SAVED_STATE_VERSION_PRE_PAE 13 /** Saved state data unit version after this includes ballooned page flags in * the state (see #5515). */ #define PGM_SAVED_STATE_VERSION_BALLOON_BROKEN 12 @@ -154,6 +155,18 @@ static const SSMFIELD s_aPGMCpuFields[] = SSMFIELD_ENTRY( PGMCPU, fA20Enabled), SSMFIELD_ENTRY_GCPHYS( PGMCPU, GCPhysA20Mask), SSMFIELD_ENTRY( PGMCPU, enmGuestMode), + SSMFIELD_ENTRY( PGMCPU, aGCPhysGstPaePDs[0]), + SSMFIELD_ENTRY( PGMCPU, aGCPhysGstPaePDs[1]), + SSMFIELD_ENTRY( PGMCPU, aGCPhysGstPaePDs[2]), + SSMFIELD_ENTRY( PGMCPU, aGCPhysGstPaePDs[3]), + SSMFIELD_ENTRY_TERM() +}; + +static const SSMFIELD s_aPGMCpuFieldsPrePae[] = +{ + SSMFIELD_ENTRY( PGMCPU, fA20Enabled), + SSMFIELD_ENTRY_GCPHYS( PGMCPU, GCPhysA20Mask), + SSMFIELD_ENTRY( PGMCPU, enmGuestMode), SSMFIELD_ENTRY_TERM() }; @@ -2030,9 +2043,8 @@ static DECLCALLBACK(int) pgmR3LivePrep(PVM pVM, PSSMHANDLE pSSM) */ static DECLCALLBACK(int) pgmR3SaveExec(PVM pVM, PSSMHANDLE pSSM) { - int rc; - unsigned i; - PPGM pPGM = &pVM->pgm.s; + int rc = VINF_SUCCESS; + PPGM pPGM = &pVM->pgm.s; /* * Lock PGM and set the no-more-writes indicator. @@ -2049,20 +2061,7 @@ static DECLCALLBACK(int) pgmR3SaveExec(PVM pVM, PSSMHANDLE pSSM) pVM->pgm.s.fMappingsFixed = fMappingsFixed; for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++) - SSMR3PutStruct(pSSM, &pVM->aCpus[idCpu].pgm.s, &s_aPGMCpuFields[0]); - - /* - * The guest mappings. - */ - i = 0; - for (PPGMMAPPING pMapping = pPGM->pMappingsR3; pMapping; pMapping = pMapping->pNextR3, i++) - { - SSMR3PutU32( pSSM, i); - SSMR3PutStrZ( pSSM, pMapping->pszDesc); /* This is the best unique id we have... */ - SSMR3PutGCPtr( pSSM, pMapping->GCPtr); - SSMR3PutGCUIntPtr(pSSM, pMapping->cPTs); - } - rc = SSMR3PutU32(pSSM, ~0); /* terminator. */ + rc = SSMR3PutStruct(pSSM, &pVM->aCpus[idCpu].pgm.s, &s_aPGMCpuFields[0]); /* * Save the (remainder of the) memory. @@ -2948,7 +2947,10 @@ static int pgmR3LoadFinalLocked(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion) for (VMCPUID i = 0; i < pVM->cCpus; i++) { - rc = SSMR3GetStruct(pSSM, &pVM->aCpus[i].pgm.s, &s_aPGMCpuFields[0]); + if (uVersion <= PGM_SAVED_STATE_VERSION_PRE_PAE) + rc = SSMR3GetStruct(pSSM, &pVM->aCpus[i].pgm.s, &s_aPGMCpuFieldsPrePae[0]); + else + rc = SSMR3GetStruct(pSSM, &pVM->aCpus[i].pgm.s, &s_aPGMCpuFields[0]); AssertLogRelRCReturn(rc, rc); } } @@ -3004,25 +3006,27 @@ static int pgmR3LoadFinalLocked(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion) /* * The guest mappings - skipped now, see re-fixation in the caller. */ - uint32_t i = 0; - for (;; i++) + if (uVersion <= PGM_SAVED_STATE_VERSION_PRE_PAE) { - rc = SSMR3GetU32(pSSM, &u32Sep); /* sequence number */ - if (RT_FAILURE(rc)) - return rc; - if (u32Sep == ~0U) - break; - AssertMsgReturn(u32Sep == i, ("u32Sep=%#x i=%#x\n", u32Sep, i), VERR_SSM_DATA_UNIT_FORMAT_CHANGED); + for (uint32_t i = 0; ; i++) + { + rc = SSMR3GetU32(pSSM, &u32Sep); /* sequence number */ + if (RT_FAILURE(rc)) + return rc; + if (u32Sep == ~0U) + break; + AssertMsgReturn(u32Sep == i, ("u32Sep=%#x i=%#x\n", u32Sep, i), VERR_SSM_DATA_UNIT_FORMAT_CHANGED); - char szDesc[256]; - rc = SSMR3GetStrZ(pSSM, szDesc, sizeof(szDesc)); - if (RT_FAILURE(rc)) - return rc; - RTGCPTR GCPtrIgnore; - SSMR3GetGCPtr(pSSM, &GCPtrIgnore); /* GCPtr */ - rc = SSMR3GetGCPtr(pSSM, &GCPtrIgnore); /* cPTs */ - if (RT_FAILURE(rc)) - return rc; + char szDesc[256]; + rc = SSMR3GetStrZ(pSSM, szDesc, sizeof(szDesc)); + if (RT_FAILURE(rc)) + return rc; + RTGCPTR GCPtrIgnore; + SSMR3GetGCPtr(pSSM, &GCPtrIgnore); /* GCPtr */ + rc = SSMR3GetGCPtr(pSSM, &GCPtrIgnore); /* cPTs */ + if (RT_FAILURE(rc)) + return rc; + } } /* @@ -3081,10 +3085,12 @@ static DECLCALLBACK(int) pgmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, */ if ( ( uPass != SSM_PASS_FINAL && uVersion != PGM_SAVED_STATE_VERSION + && uVersion != PGM_SAVED_STATE_VERSION_PRE_PAE && uVersion != PGM_SAVED_STATE_VERSION_BALLOON_BROKEN && uVersion != PGM_SAVED_STATE_VERSION_PRE_BALLOON && uVersion != PGM_SAVED_STATE_VERSION_NO_RAM_CFG) || ( uVersion != PGM_SAVED_STATE_VERSION + && uVersion != PGM_SAVED_STATE_VERSION_PRE_PAE && uVersion != PGM_SAVED_STATE_VERSION_BALLOON_BROKEN && uVersion != PGM_SAVED_STATE_VERSION_PRE_BALLOON && uVersion != PGM_SAVED_STATE_VERSION_NO_RAM_CFG @@ -3140,6 +3146,11 @@ static DECLCALLBACK(int) pgmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL); VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3); pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_UPDATE_PAGE_BIT_VIRTUAL; + /** @todo For guest PAE, we might get the wrong + * aGCPhysGstPaePDs values now. We should used the + * saved ones... Postponing this since it nothing new + * and PAE/PDPTR needs some general readjusting, see + * @bugref{#5880}. */ } pgmR3HandlerPhysicalUpdateAll(pVM); diff --git a/src/VBox/VMM/VMMR3/PGMSharedPage.cpp b/src/VBox/VMM/VMMR3/PGMSharedPage.cpp index e5de60de6..756fd92c7 100644 --- a/src/VBox/VMM/VMMR3/PGMSharedPage.cpp +++ b/src/VBox/VMM/VMMR3/PGMSharedPage.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMSharedPage.cpp 36891 2011-04-29 13:22:57Z vboxsync $ */ +/* $Id: PGMSharedPage.cpp $ */ /** @file * PGM - Page Manager and Monitor, Shared page handling */ diff --git a/src/VBox/VMM/VMMR3/PGMShw.h b/src/VBox/VMM/VMMR3/PGMShw.h index 769ef0b26..8b4934f55 100644 --- a/src/VBox/VMM/VMMR3/PGMShw.h +++ b/src/VBox/VMM/VMMR3/PGMShw.h @@ -1,4 +1,4 @@ -/* $Id: PGMShw.h 35333 2010-12-27 12:10:56Z vboxsync $ */ +/* $Id: PGMShw.h $ */ /** @file * VBox - Page Manager / Monitor, Shadow Paging Template. */ diff --git a/src/VBox/VMM/VMMR3/SELM.cpp b/src/VBox/VMM/VMMR3/SELM.cpp index 68b0b9c63..538fe290b 100644 --- a/src/VBox/VMM/VMMR3/SELM.cpp +++ b/src/VBox/VMM/VMMR3/SELM.cpp @@ -1,4 +1,4 @@ -/* $Id: SELM.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: SELM.cpp $ */ /** @file * SELM - The Selector Manager. */ diff --git a/src/VBox/VMM/VMMR3/SSM.cpp b/src/VBox/VMM/VMMR3/SSM.cpp index b4369e844..a6034176c 100644 --- a/src/VBox/VMM/VMMR3/SSM.cpp +++ b/src/VBox/VMM/VMMR3/SSM.cpp @@ -1,4 +1,4 @@ -/* $Id: SSM.cpp 37026 2011-05-10 12:19:55Z vboxsync $ */ +/* $Id: SSM.cpp $ */ /** @file * SSM - Saved State Manager. */ diff --git a/src/VBox/VMM/VMMR3/STAM.cpp b/src/VBox/VMM/VMMR3/STAM.cpp index 825b58d50..a6a4eb055 100644 --- a/src/VBox/VMM/VMMR3/STAM.cpp +++ b/src/VBox/VMM/VMMR3/STAM.cpp @@ -1,4 +1,4 @@ -/* $Id: STAM.cpp 35696 2011-01-24 18:03:33Z vboxsync $ */ +/* $Id: STAM.cpp $ */ /** @file * STAM - The Statistics Manager. */ diff --git a/src/VBox/VMM/VMMR3/TM.cpp b/src/VBox/VMM/VMMR3/TM.cpp index cdfe3c529..0701d9d86 100644 --- a/src/VBox/VMM/VMMR3/TM.cpp +++ b/src/VBox/VMM/VMMR3/TM.cpp @@ -1,4 +1,4 @@ -/* $Id: TM.cpp 37527 2011-06-17 10:18:02Z vboxsync $ */ +/* $Id: TM.cpp $ */ /** @file * TM - Time Manager. */ diff --git a/src/VBox/VMM/VMMR3/TRPM.cpp b/src/VBox/VMM/VMMR3/TRPM.cpp index acac235a8..0db13800c 100644 --- a/src/VBox/VMM/VMMR3/TRPM.cpp +++ b/src/VBox/VMM/VMMR3/TRPM.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPM.cpp 38378 2011-08-09 13:37:41Z vboxsync $ */ +/* $Id: TRPM.cpp $ */ /** @file * TRPM - The Trap Monitor. */ diff --git a/src/VBox/VMM/VMMR3/VBoxVMMDeps.cpp b/src/VBox/VMM/VMMR3/VBoxVMMDeps.cpp index 54e6a9e83..d36136595 100644 --- a/src/VBox/VMM/VMMR3/VBoxVMMDeps.cpp +++ b/src/VBox/VMM/VMMR3/VBoxVMMDeps.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxVMMDeps.cpp 35410 2011-01-05 17:21:11Z vboxsync $ */ +/* $Id: VBoxVMMDeps.cpp $ */ /** @file * VBoxVMM link dependencies - drag all we want into the link! */ diff --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp index 114dd6508..f565296ee 100644 --- a/src/VBox/VMM/VMMR3/VM.cpp +++ b/src/VBox/VMM/VMMR3/VM.cpp @@ -1,4 +1,4 @@ -/* $Id: VM.cpp 38229 2011-07-28 17:41:41Z vboxsync $ */ +/* $Id: VM.cpp $ */ /** @file * VM - Virtual Machine */ diff --git a/src/VBox/VMM/VMMR3/VMEmt.cpp b/src/VBox/VMM/VMMR3/VMEmt.cpp index 15d6e289d..6465544dd 100644 --- a/src/VBox/VMM/VMMR3/VMEmt.cpp +++ b/src/VBox/VMM/VMMR3/VMEmt.cpp @@ -1,4 +1,4 @@ -/* $Id: VMEmt.cpp 36437 2011-03-25 15:36:59Z vboxsync $ */ +/* $Id: VMEmt.cpp $ */ /** @file * VM - Virtual Machine, The Emulation Thread. */ diff --git a/src/VBox/VMM/VMMR3/VMM.cpp b/src/VBox/VMM/VMMR3/VMM.cpp index f0e8eeec5..1b9ccebf9 100644 --- a/src/VBox/VMM/VMMR3/VMM.cpp +++ b/src/VBox/VMM/VMMR3/VMM.cpp @@ -1,4 +1,4 @@ -/* $Id: VMM.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: VMM.cpp $ */ /** @file * VMM - The Virtual Machine Monitor Core. */ diff --git a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp index c6f8e9e0c..dde2929ff 100644 --- a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp +++ b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMGuruMeditation.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VMMGuruMeditation.cpp $ */ /** @file * VMM - The Virtual Machine Monitor, Guru Meditation Code. */ diff --git a/src/VBox/VMM/VMMR3/VMMR3.def b/src/VBox/VMM/VMMR3/VMMR3.def index f5016727e..981c7e5bd 100644 --- a/src/VBox/VMM/VMMR3/VMMR3.def +++ b/src/VBox/VMM/VMMR3/VMMR3.def @@ -1,4 +1,4 @@ -; $Id: VMMR3.def 37529 2011-06-17 11:14:05Z vboxsync $ +; $Id: VMMR3.def $ ;; @file ; VMM Ring-3 Context DLL - Definition file. diff --git a/src/VBox/VMM/VMMR3/VMMSwitcher.cpp b/src/VBox/VMM/VMMR3/VMMSwitcher.cpp index ef9aac54f..fa4596cb5 100644 --- a/src/VBox/VMM/VMMR3/VMMSwitcher.cpp +++ b/src/VBox/VMM/VMMR3/VMMSwitcher.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMSwitcher.cpp 36415 2011-03-24 18:20:04Z vboxsync $ */ +/* $Id: VMMSwitcher.cpp $ */ /** @file * VMM - The Virtual Machine Monitor, World Switcher(s). */ diff --git a/src/VBox/VMM/VMMR3/VMMTests.cpp b/src/VBox/VMM/VMMR3/VMMTests.cpp index 78a10f25b..41a97197b 100644 --- a/src/VBox/VMM/VMMR3/VMMTests.cpp +++ b/src/VBox/VMM/VMMR3/VMMTests.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMTests.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: VMMTests.cpp $ */ /** @file * VMM - The Virtual Machine Monitor Core, Tests. */ diff --git a/src/VBox/VMM/VMMR3/VMReq.cpp b/src/VBox/VMM/VMMR3/VMReq.cpp index eca0bf4bf..d50e24c02 100644 --- a/src/VBox/VMM/VMMR3/VMReq.cpp +++ b/src/VBox/VMM/VMMR3/VMReq.cpp @@ -1,4 +1,4 @@ -/* $Id: VMReq.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VMReq.cpp $ */ /** @file * VM - Virtual Machine */ diff --git a/src/VBox/VMM/VMMRC/CPUMRC.cpp b/src/VBox/VMM/VMMRC/CPUMRC.cpp index 09cef651f..a5a1a1e2f 100644 --- a/src/VBox/VMM/VMMRC/CPUMRC.cpp +++ b/src/VBox/VMM/VMMRC/CPUMRC.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMRC.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: CPUMRC.cpp $ */ /** @file * CPUM - Guest Context Code. */ diff --git a/src/VBox/VMM/VMMRC/CPUMRCA.asm b/src/VBox/VMM/VMMRC/CPUMRCA.asm index 7ea458901..b594e27e4 100644 --- a/src/VBox/VMM/VMMRC/CPUMRCA.asm +++ b/src/VBox/VMM/VMMRC/CPUMRCA.asm @@ -1,4 +1,4 @@ -; $Id: CPUMRCA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: CPUMRCA.asm $ ;; @file ; CPUM - Guest Context Assembly Routines. ; diff --git a/src/VBox/VMM/VMMRC/CSAMRC.cpp b/src/VBox/VMM/VMMRC/CSAMRC.cpp index 8099b6467..6b6b1a9ac 100644 --- a/src/VBox/VMM/VMMRC/CSAMRC.cpp +++ b/src/VBox/VMM/VMMRC/CSAMRC.cpp @@ -1,4 +1,4 @@ -/* $Id: CSAMRC.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: CSAMRC.cpp $ */ /** @file * CSAM - Guest OS Code Scanning and Analysis Manager - Any Context */ diff --git a/src/VBox/VMM/VMMRC/EMRCA.asm b/src/VBox/VMM/VMMRC/EMRCA.asm index b7b2ed324..f295c55aa 100644 --- a/src/VBox/VMM/VMMRC/EMRCA.asm +++ b/src/VBox/VMM/VMMRC/EMRCA.asm @@ -1,4 +1,4 @@ -; $Id: EMRCA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: EMRCA.asm $ ;; @file ; EM Assembly Routines. ; diff --git a/src/VBox/VMM/VMMRC/HWACCMRCA.asm b/src/VBox/VMM/VMMRC/HWACCMRCA.asm index e142ea093..0cac630a5 100644 --- a/src/VBox/VMM/VMMRC/HWACCMRCA.asm +++ b/src/VBox/VMM/VMMRC/HWACCMRCA.asm @@ -1,4 +1,4 @@ -; $Id: HWACCMRCA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: HWACCMRCA.asm $ ;; @file ; VMXM - GC vmx helpers ; diff --git a/src/VBox/VMM/VMMRC/IOMRC.cpp b/src/VBox/VMM/VMMRC/IOMRC.cpp index eb51a09fb..22db910ab 100644 --- a/src/VBox/VMM/VMMRC/IOMRC.cpp +++ b/src/VBox/VMM/VMMRC/IOMRC.cpp @@ -1,4 +1,4 @@ -/* $Id: IOMRC.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: IOMRC.cpp $ */ /** @file * IOM - Input / Output Monitor - Guest Context. */ diff --git a/src/VBox/VMM/VMMRC/MMRamRC.cpp b/src/VBox/VMM/VMMRC/MMRamRC.cpp index 8d4e33eef..7658de497 100644 --- a/src/VBox/VMM/VMMRC/MMRamRC.cpp +++ b/src/VBox/VMM/VMMRC/MMRamRC.cpp @@ -1,4 +1,4 @@ -/* $Id: MMRamRC.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: MMRamRC.cpp $ */ /** @file * MMRamGC - Guest Context Ram access Routines, pair for MMRamGCA.asm. */ diff --git a/src/VBox/VMM/VMMRC/MMRamRCA.asm b/src/VBox/VMM/VMMRC/MMRamRCA.asm index 0e450ccbb..ad89ca2e0 100644 --- a/src/VBox/VMM/VMMRC/MMRamRCA.asm +++ b/src/VBox/VMM/VMMRC/MMRamRCA.asm @@ -1,4 +1,4 @@ -; $Id: MMRamRCA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: MMRamRCA.asm $ ;; @file ; MMRamGCA - Guest Context Ram access Assembly Routines. ; diff --git a/src/VBox/VMM/VMMRC/PATMRC.cpp b/src/VBox/VMM/VMMRC/PATMRC.cpp index 076f30401..7ef86a3ee 100644 --- a/src/VBox/VMM/VMMRC/PATMRC.cpp +++ b/src/VBox/VMM/VMMRC/PATMRC.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMRC.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: PATMRC.cpp $ */ /** @file * PATM - Dynamic Guest OS Patching Manager - Guest Context */ diff --git a/src/VBox/VMM/VMMRC/PDMRCDevice.cpp b/src/VBox/VMM/VMMRC/PDMRCDevice.cpp index a84feea0a..b507cd36b 100644 --- a/src/VBox/VMM/VMMRC/PDMRCDevice.cpp +++ b/src/VBox/VMM/VMMRC/PDMRCDevice.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMRCDevice.cpp 37410 2011-06-10 15:11:40Z vboxsync $ */ +/* $Id: PDMRCDevice.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, RC Device parts. */ diff --git a/src/VBox/VMM/VMMRC/PGMRC.cpp b/src/VBox/VMM/VMMRC/PGMRC.cpp index 334558d8f..c90d09712 100644 --- a/src/VBox/VMM/VMMRC/PGMRC.cpp +++ b/src/VBox/VMM/VMMRC/PGMRC.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMRC.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: PGMRC.cpp $ */ /** @file * PGM - Page Monitor, Guest Context. */ diff --git a/src/VBox/VMM/VMMRC/PGMRCBth.h b/src/VBox/VMM/VMMRC/PGMRCBth.h index a4c94ddb5..fd0060354 100644 --- a/src/VBox/VMM/VMMRC/PGMRCBth.h +++ b/src/VBox/VMM/VMMRC/PGMRCBth.h @@ -1,4 +1,4 @@ -/* $Id: PGMRCBth.h 35335 2010-12-27 12:34:40Z vboxsync $ */ +/* $Id: PGMRCBth.h $ */ /** @file * VBox - Page Manager, Shadow+Guest Paging Template - Guest Context. */ diff --git a/src/VBox/VMM/VMMRC/PGMRCGst.h b/src/VBox/VMM/VMMRC/PGMRCGst.h index 476a67c14..bf06afd26 100644 --- a/src/VBox/VMM/VMMRC/PGMRCGst.h +++ b/src/VBox/VMM/VMMRC/PGMRCGst.h @@ -1,4 +1,4 @@ -/* $Id: PGMRCGst.h 35335 2010-12-27 12:34:40Z vboxsync $ */ +/* $Id: PGMRCGst.h $ */ /** @file * VBox - Page Manager, Guest Paging Template - Guest Context. */ diff --git a/src/VBox/VMM/VMMRC/PGMRCShw.h b/src/VBox/VMM/VMMRC/PGMRCShw.h index 478754cf1..265f1687d 100644 --- a/src/VBox/VMM/VMMRC/PGMRCShw.h +++ b/src/VBox/VMM/VMMRC/PGMRCShw.h @@ -1,4 +1,4 @@ -/* $Id: PGMRCShw.h 35335 2010-12-27 12:34:40Z vboxsync $ */ +/* $Id: PGMRCShw.h $ */ /** @file * VBox - Page Manager, Shadow Paging Template - Guest Context. */ diff --git a/src/VBox/VMM/VMMRC/SELMRC.cpp b/src/VBox/VMM/VMMRC/SELMRC.cpp index 670f1d410..6f9f2d4d7 100644 --- a/src/VBox/VMM/VMMRC/SELMRC.cpp +++ b/src/VBox/VMM/VMMRC/SELMRC.cpp @@ -1,4 +1,4 @@ -/* $Id: SELMRC.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: SELMRC.cpp $ */ /** @file * SELM - The Selector Manager, Guest Context. */ diff --git a/src/VBox/VMM/VMMRC/TRPMRC.cpp b/src/VBox/VMM/VMMRC/TRPMRC.cpp index 6d72d7aa7..9fedbfa2c 100644 --- a/src/VBox/VMM/VMMRC/TRPMRC.cpp +++ b/src/VBox/VMM/VMMRC/TRPMRC.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPMRC.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: TRPMRC.cpp $ */ /** @file * TRPM - The Trap Monitor, Guest Context */ diff --git a/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp b/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp index 977507684..962cbbce2 100644 --- a/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp +++ b/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPMRCHandlers.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: TRPMRCHandlers.cpp $ */ /** @file * TRPM - Guest Context Trap Handlers, CPP part */ diff --git a/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm b/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm index 761dbbbde..ff342a4d9 100644 --- a/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm +++ b/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm @@ -1,4 +1,4 @@ -; $Id: TRPMRCHandlersA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: TRPMRCHandlersA.asm $ ;; @file ; TRPM - Guest Context Trap Handlers ; diff --git a/src/VBox/VMM/VMMRC/VMMRC.cpp b/src/VBox/VMM/VMMRC/VMMRC.cpp index 9cc612252..af5dc25ef 100644 --- a/src/VBox/VMM/VMMRC/VMMRC.cpp +++ b/src/VBox/VMM/VMMRC/VMMRC.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMRC.cpp 35810 2011-02-01 13:00:24Z vboxsync $ */ +/* $Id: VMMRC.cpp $ */ /** @file * VMM - Raw-mode Context. */ diff --git a/src/VBox/VMM/VMMRC/VMMRC.def b/src/VBox/VMM/VMMRC/VMMRC.def index 5e4f3db3a..177e29176 100644 --- a/src/VBox/VMM/VMMRC/VMMRC.def +++ b/src/VBox/VMM/VMMRC/VMMRC.def @@ -1,4 +1,4 @@ -; $Id: VMMRC.def 37454 2011-06-14 19:18:56Z vboxsync $ +; $Id: VMMRC.def $ ;; @file ; VMM Raw-mode Context DLL - Definition file. diff --git a/src/VBox/VMM/VMMRC/VMMRC.mac b/src/VBox/VMM/VMMRC/VMMRC.mac index cdf1cd3e4..c7f26be27 100644 --- a/src/VBox/VMM/VMMRC/VMMRC.mac +++ b/src/VBox/VMM/VMMRC/VMMRC.mac @@ -1,4 +1,4 @@ -; $Id: VMMRC.mac 35335 2010-12-27 12:34:40Z vboxsync $ +; $Id: VMMRC.mac $ ;; @file ; VMMGC - Raw-mode Context Assembly Macros. ; diff --git a/src/VBox/VMM/VMMRC/VMMRC0.asm b/src/VBox/VMM/VMMRC/VMMRC0.asm index 71108d15d..ce8bb078f 100644 --- a/src/VBox/VMM/VMMRC/VMMRC0.asm +++ b/src/VBox/VMM/VMMRC/VMMRC0.asm @@ -1,4 +1,4 @@ -; $Id: VMMRC0.asm 35335 2010-12-27 12:34:40Z vboxsync $ +; $Id: VMMRC0.asm $ ;; @file ; VMMGC0 - The first object module in the link. ; diff --git a/src/VBox/VMM/VMMRC/VMMRC99.asm b/src/VBox/VMM/VMMRC/VMMRC99.asm index 3278fac5b..c34479da1 100644 --- a/src/VBox/VMM/VMMRC/VMMRC99.asm +++ b/src/VBox/VMM/VMMRC/VMMRC99.asm @@ -1,4 +1,4 @@ -; $Id: VMMRC99.asm 35335 2010-12-27 12:34:40Z vboxsync $ +; $Id: VMMRC99.asm $ ;; @file ; VMMGC99 - The last object module in the link. ; diff --git a/src/VBox/VMM/VMMRC/VMMRCA.asm b/src/VBox/VMM/VMMRC/VMMRCA.asm index 4c6a9e3b2..d374dff30 100644 --- a/src/VBox/VMM/VMMRC/VMMRCA.asm +++ b/src/VBox/VMM/VMMRC/VMMRCA.asm @@ -1,4 +1,4 @@ -; $Id: VMMRCA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: VMMRCA.asm $ ;; @file ; VMMGC - Raw-mode Context Virtual Machine Monitor assembly routines. ; diff --git a/src/VBox/VMM/VMMRC/VMMRCBuiltin.def b/src/VBox/VMM/VMMRC/VMMRCBuiltin.def index 40f78fdd7..c733ab3b3 100644 --- a/src/VBox/VMM/VMMRC/VMMRCBuiltin.def +++ b/src/VBox/VMM/VMMRC/VMMRCBuiltin.def @@ -1,4 +1,4 @@ -; $Id: VMMRCBuiltin.def 35345 2010-12-27 14:41:49Z vboxsync $ +; $Id: VMMRCBuiltin.def $ ;; @file ; VMM Raw-mode Context Builtin DLL - Definition file for generating import library. ; diff --git a/src/VBox/VMM/VMMRC/VMMRCDeps.cpp b/src/VBox/VMM/VMMRC/VMMRCDeps.cpp index 1734641f2..82819207c 100644 --- a/src/VBox/VMM/VMMRC/VMMRCDeps.cpp +++ b/src/VBox/VMM/VMMRC/VMMRCDeps.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMRCDeps.cpp 35335 2010-12-27 12:34:40Z vboxsync $ */ +/* $Id: VMMRCDeps.cpp $ */ /** @file * VMMGC Runtime Dependencies. */ diff --git a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp index 558cd823a..0cf065b8b 100644 --- a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp +++ b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFRZ.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: DBGFRZ.cpp $ */ /** @file * DBGF - Debugger Facility, RZ part. */ diff --git a/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp b/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp index 684bd108e..973799c60 100644 --- a/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp +++ b/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMRZDynMap.cpp 36627 2011-04-08 15:38:47Z vboxsync $ */ +/* $Id: PGMRZDynMap.cpp $ */ /** @file * PGM - Page Manager and Monitor, dynamic mapping cache. */ diff --git a/src/VBox/VMM/VMMRZ/VMMRZ.cpp b/src/VBox/VMM/VMMRZ/VMMRZ.cpp index d4dcab4ca..a61332c96 100644 --- a/src/VBox/VMM/VMMRZ/VMMRZ.cpp +++ b/src/VBox/VMM/VMMRZ/VMMRZ.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMRZ.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VMMRZ.cpp $ */ /** @file * VMM - Virtual Machine Monitor, Raw-mode and ring-0 context code. */ diff --git a/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm b/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm index c88a2f21e..5eaf28a59 100644 --- a/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm +++ b/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm @@ -1,4 +1,4 @@ -; $Id: 32BitTo32Bit.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: 32BitTo32Bit.asm $ ;; @file ; VMM - World Switchers, 32-Bit to 32-Bit. ; diff --git a/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm b/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm index 08578140d..d913f9176 100644 --- a/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm +++ b/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm @@ -1,4 +1,4 @@ -; $Id: 32BitToAMD64.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: 32BitToAMD64.asm $ ;; @file ; VMM - World Switchers, 32-Bit to AMD64 ; diff --git a/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm b/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm index 7b1730157..9c9d245e4 100644 --- a/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm +++ b/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm @@ -1,4 +1,4 @@ -; $Id: 32BitToPAE.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: 32BitToPAE.asm $ ;; @file ; VMM - World Switchers, 32-Bit to 32-Bit. ; diff --git a/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm b/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm index aad022088..ee7bc2636 100644 --- a/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm +++ b/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm @@ -1,4 +1,4 @@ -; $Id: AMD64To32Bit.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: AMD64To32Bit.asm $ ;; @file ; VMM - World Switchers, AMD64 to 32-bit ; diff --git a/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm b/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm index 8c87ec6f5..4878fc122 100644 --- a/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm +++ b/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm @@ -1,4 +1,4 @@ -; $Id: AMD64ToPAE.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: AMD64ToPAE.asm $ ;; @file ; VMM - World Switchers, PAE to PAE ; diff --git a/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac b/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac index c70f01751..6c1bfd114 100644 --- a/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac +++ b/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac @@ -1,4 +1,4 @@ -; $Id: AMD64andLegacy.mac 37969 2011-07-14 14:36:13Z vboxsync $ +; $Id: AMD64andLegacy.mac $ ;; @file ; VMM - World Switchers, template for AMD64 to PAE and 32-bit. ; diff --git a/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm b/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm index d2f2520a8..53913fbed 100644 --- a/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm +++ b/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm @@ -1,4 +1,4 @@ -; $Id: PAETo32Bit.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: PAETo32Bit.asm $ ;; @file ; VMM - World Switchers, PAE to PAE ; diff --git a/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm b/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm index 9f64ac03e..23c96e96b 100644 --- a/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm +++ b/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm @@ -1,4 +1,4 @@ -; $Id: PAEToAMD64.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: PAEToAMD64.asm $ ;; @file ; VMM - World Switchers, PAE to AMD64 ; diff --git a/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm b/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm index 661efa958..3aae14abd 100644 --- a/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm +++ b/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm @@ -1,4 +1,4 @@ -; $Id: PAEToPAE.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: PAEToPAE.asm $ ;; @file ; VMM - World Switchers, PAE to PAE ; diff --git a/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac b/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac index eef0e2393..38b382ff9 100644 --- a/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac +++ b/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac @@ -1,4 +1,4 @@ -; $Id: PAEand32Bit.mac 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: PAEand32Bit.mac $ ;; @file ; VMM - World Switchers, template for PAE and 32-Bit. ; diff --git a/src/VBox/VMM/include/CFGMInternal.h b/src/VBox/VMM/include/CFGMInternal.h index 9249ffac9..2d33bc6d5 100644 --- a/src/VBox/VMM/include/CFGMInternal.h +++ b/src/VBox/VMM/include/CFGMInternal.h @@ -1,4 +1,4 @@ -/* $Id: CFGMInternal.h 35333 2010-12-27 12:10:56Z vboxsync $ */ +/* $Id: CFGMInternal.h $ */ /** @file * CFGM - Internal header file. */ diff --git a/src/VBox/VMM/include/CPUMInternal.h b/src/VBox/VMM/include/CPUMInternal.h index 66c7fe4b9..d18088f3f 100644 --- a/src/VBox/VMM/include/CPUMInternal.h +++ b/src/VBox/VMM/include/CPUMInternal.h @@ -1,4 +1,4 @@ -/* $Id: CPUMInternal.h 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: CPUMInternal.h $ */ /** @file * CPUM - Internal header file. */ diff --git a/src/VBox/VMM/include/CPUMInternal.mac b/src/VBox/VMM/include/CPUMInternal.mac index cd927f747..3e30a88ed 100644 --- a/src/VBox/VMM/include/CPUMInternal.mac +++ b/src/VBox/VMM/include/CPUMInternal.mac @@ -1,4 +1,4 @@ -; $Id: CPUMInternal.mac 35333 2010-12-27 12:10:56Z vboxsync $ +; $Id: CPUMInternal.mac $ ;; @file ; CPUM - Internal header file (asm). ; diff --git a/src/VBox/VMM/include/CSAMInternal.h b/src/VBox/VMM/include/CSAMInternal.h index 92d286023..e34346e99 100644 --- a/src/VBox/VMM/include/CSAMInternal.h +++ b/src/VBox/VMM/include/CSAMInternal.h @@ -1,4 +1,4 @@ -/* $Id: CSAMInternal.h 35348 2010-12-27 16:35:23Z vboxsync $ */ +/* $Id: CSAMInternal.h $ */ /** @file * CSAM - Internal header file. */ diff --git a/src/VBox/VMM/include/DBGFInternal.h b/src/VBox/VMM/include/DBGFInternal.h index 704bb129f..605b5b7c6 100644 --- a/src/VBox/VMM/include/DBGFInternal.h +++ b/src/VBox/VMM/include/DBGFInternal.h @@ -1,4 +1,4 @@ -/* $Id: DBGFInternal.h 37410 2011-06-10 15:11:40Z vboxsync $ */ +/* $Id: DBGFInternal.h $ */ /** @file * DBGF - Internal header file. */ diff --git a/src/VBox/VMM/include/EMHandleRCTmpl.h b/src/VBox/VMM/include/EMHandleRCTmpl.h index 2a1af78e7..7eb50bedb 100644 --- a/src/VBox/VMM/include/EMHandleRCTmpl.h +++ b/src/VBox/VMM/include/EMHandleRCTmpl.h @@ -1,4 +1,4 @@ -/* $Id: EMHandleRCTmpl.h 35333 2010-12-27 12:10:56Z vboxsync $ */ +/* $Id: EMHandleRCTmpl.h $ */ /** @file * EM - emR3[Raw|Hwaccm]HandleRC template. */ diff --git a/src/VBox/VMM/include/EMInternal.h b/src/VBox/VMM/include/EMInternal.h index bcdb3a3af..8ce4e9d8a 100644 --- a/src/VBox/VMM/include/EMInternal.h +++ b/src/VBox/VMM/include/EMInternal.h @@ -1,4 +1,4 @@ -/* $Id: EMInternal.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: EMInternal.h $ */ /** @file * EM - Internal header file. */ diff --git a/src/VBox/VMM/include/FTMInternal.h b/src/VBox/VMM/include/FTMInternal.h index a67daac0a..6b442f16a 100644 --- a/src/VBox/VMM/include/FTMInternal.h +++ b/src/VBox/VMM/include/FTMInternal.h @@ -1,4 +1,4 @@ -/* $Id: FTMInternal.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: FTMInternal.h $ */ /** @file * FTM - Internal header file. */ diff --git a/src/VBox/VMM/include/HWACCMInternal.h b/src/VBox/VMM/include/HWACCMInternal.h index 82fb37219..aaca54c29 100644 --- a/src/VBox/VMM/include/HWACCMInternal.h +++ b/src/VBox/VMM/include/HWACCMInternal.h @@ -1,4 +1,4 @@ -/* $Id: HWACCMInternal.h 37386 2011-06-08 15:15:11Z vboxsync $ */ +/* $Id: HWACCMInternal.h $ */ /** @file * HM - Internal header file. */ diff --git a/src/VBox/VMM/include/HWACCMInternal.mac b/src/VBox/VMM/include/HWACCMInternal.mac index 2b1549dc3..6779db3c4 100644 --- a/src/VBox/VMM/include/HWACCMInternal.mac +++ b/src/VBox/VMM/include/HWACCMInternal.mac @@ -1,4 +1,4 @@ -;$Id: HWACCMInternal.mac 37323 2011-06-03 16:20:06Z vboxsync $ +;$Id: HWACCMInternal.mac $ ;; @file ; HWACCM - Internal header file. ; diff --git a/src/VBox/VMM/include/IEMInternal.h b/src/VBox/VMM/include/IEMInternal.h index e47bf0d6f..c2d6d38f1 100644 --- a/src/VBox/VMM/include/IEMInternal.h +++ b/src/VBox/VMM/include/IEMInternal.h @@ -1,4 +1,4 @@ -/* $Id: IEMInternal.h 37423 2011-06-12 18:37:56Z vboxsync $ */ +/* $Id: IEMInternal.h $ */ /** @file * IEM - Internal header file. */ diff --git a/src/VBox/VMM/include/IOMInline.h b/src/VBox/VMM/include/IOMInline.h index b6e86b925..289d92686 100644 --- a/src/VBox/VMM/include/IOMInline.h +++ b/src/VBox/VMM/include/IOMInline.h @@ -1,4 +1,4 @@ -/* $Id: IOMInline.h 37467 2011-06-15 13:08:45Z vboxsync $ */ +/* $Id: IOMInline.h $ */ /** @file * IOM - Inlined functions. */ diff --git a/src/VBox/VMM/include/IOMInternal.h b/src/VBox/VMM/include/IOMInternal.h index dcfaa8ad1..e12bac6c4 100644 --- a/src/VBox/VMM/include/IOMInternal.h +++ b/src/VBox/VMM/include/IOMInternal.h @@ -1,4 +1,4 @@ -/* $Id: IOMInternal.h 37467 2011-06-15 13:08:45Z vboxsync $ */ +/* $Id: IOMInternal.h $ */ /** @file * IOM - Internal header file. */ diff --git a/src/VBox/VMM/include/MMInternal.h b/src/VBox/VMM/include/MMInternal.h index 832fe8aa0..581e68284 100644 --- a/src/VBox/VMM/include/MMInternal.h +++ b/src/VBox/VMM/include/MMInternal.h @@ -1,4 +1,4 @@ -/* $Id: MMInternal.h 37935 2011-07-13 23:12:42Z vboxsync $ */ +/* $Id: MMInternal.h $ */ /** @file * MM - Internal header file. */ diff --git a/src/VBox/VMM/include/PATMA.h b/src/VBox/VMM/include/PATMA.h index 87dc60868..0c5007808 100644 --- a/src/VBox/VMM/include/PATMA.h +++ b/src/VBox/VMM/include/PATMA.h @@ -1,4 +1,4 @@ -/* $Id: PATMA.h 35348 2010-12-27 16:35:23Z vboxsync $ */ +/* $Id: PATMA.h $ */ /** @file * PATM macros & definitions (identical to PATMA.mac!!) */ diff --git a/src/VBox/VMM/include/PATMInternal.h b/src/VBox/VMM/include/PATMInternal.h index fff644010..2e0972ce4 100644 --- a/src/VBox/VMM/include/PATMInternal.h +++ b/src/VBox/VMM/include/PATMInternal.h @@ -1,4 +1,4 @@ -/* $Id: PATMInternal.h 36801 2011-04-21 18:14:13Z vboxsync $ */ +/* $Id: PATMInternal.h $ */ /** @file * PATM - Internal header file. */ diff --git a/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h b/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h index 8054b1c6d..a86577319 100644 --- a/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h +++ b/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h @@ -1,4 +1,4 @@ -/* $Id: PDMAsyncCompletionFileInternal.h 37596 2011-06-22 19:30:06Z vboxsync $ */ +/* $Id: PDMAsyncCompletionFileInternal.h $ */ /** @file * PDM Async I/O - Transport data asynchronous in R3 using EMT. */ diff --git a/src/VBox/VMM/include/PDMAsyncCompletionInternal.h b/src/VBox/VMM/include/PDMAsyncCompletionInternal.h index 21e70d2f1..72867bcba 100644 --- a/src/VBox/VMM/include/PDMAsyncCompletionInternal.h +++ b/src/VBox/VMM/include/PDMAsyncCompletionInternal.h @@ -1,4 +1,4 @@ -/* $Id: PDMAsyncCompletionInternal.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: PDMAsyncCompletionInternal.h $ */ /** @file * PDM - Pluggable Device Manager, Async I/O Completion internal header. */ diff --git a/src/VBox/VMM/include/PDMBlkCacheInternal.h b/src/VBox/VMM/include/PDMBlkCacheInternal.h index c9155d712..67c558a15 100644 --- a/src/VBox/VMM/include/PDMBlkCacheInternal.h +++ b/src/VBox/VMM/include/PDMBlkCacheInternal.h @@ -1,4 +1,4 @@ -/* $Id: PDMBlkCacheInternal.h 37935 2011-07-13 23:12:42Z vboxsync $ */ +/* $Id: PDMBlkCacheInternal.h $ */ /** @file * PDM Block Cache. */ diff --git a/src/VBox/VMM/include/PDMInternal.h b/src/VBox/VMM/include/PDMInternal.h index 74bd66a1e..6614eb3ad 100644 --- a/src/VBox/VMM/include/PDMInternal.h +++ b/src/VBox/VMM/include/PDMInternal.h @@ -1,4 +1,4 @@ -/* $Id: PDMInternal.h 37836 2011-07-08 10:26:19Z vboxsync $ */ +/* $Id: PDMInternal.h $ */ /** @file * PDM - Internal header file. */ diff --git a/src/VBox/VMM/include/PGMGstDefs.h b/src/VBox/VMM/include/PGMGstDefs.h index 6c3302da8..c03e96d47 100644 --- a/src/VBox/VMM/include/PGMGstDefs.h +++ b/src/VBox/VMM/include/PGMGstDefs.h @@ -1,4 +1,4 @@ -/* $Id: PGMGstDefs.h 36891 2011-04-29 13:22:57Z vboxsync $ */ +/* $Id: PGMGstDefs.h $ */ /** @file * VBox - Page Manager, Guest Paging Template - All context code. */ diff --git a/src/VBox/VMM/include/PGMInline.h b/src/VBox/VMM/include/PGMInline.h index 9f5eace56..a04f754f8 100644 --- a/src/VBox/VMM/include/PGMInline.h +++ b/src/VBox/VMM/include/PGMInline.h @@ -1,4 +1,4 @@ -/* $Id: PGMInline.h 37354 2011-06-07 15:05:32Z vboxsync $ */ +/* $Id: PGMInline.h $ */ /** @file * PGM - Inlined functions. */ diff --git a/src/VBox/VMM/include/PGMInternal.h b/src/VBox/VMM/include/PGMInternal.h index 51332e021..0e945eeab 100644 --- a/src/VBox/VMM/include/PGMInternal.h +++ b/src/VBox/VMM/include/PGMInternal.h @@ -1,4 +1,4 @@ -/* $Id: PGMInternal.h 37370 2011-06-08 08:29:42Z vboxsync $ */ +/* $Id: PGMInternal.h $ */ /** @file * PGM - Internal header file. */ @@ -3648,8 +3648,11 @@ typedef struct PGMCPU * Unlike the R3/R0 array the first entry can be accessed as a 2048 entry PD. * These don't have to be up-to-date - use pgmGstGetPaePD() to access them. */ RCPTRTYPE(PX86PDPAE) apGstPaePDsRC[4]; - /** The physical addresses of the guest page directories (PAE) pointed to by apGstPagePDsHC/GC. */ + /** The physical addresses of the guest page directories (PAE) pointed to by apGstPagePDsHC/GC. + * @todo Remove this and use aGstPaePdpeRegs instead? */ RTGCPHYS aGCPhysGstPaePDs[4]; + /** The values of the 4 PDPE CPU registers (PAE). */ + X86PDPE aGstPaePdpeRegs[4]; /** The physical addresses of the monitored guest page directories (PAE). */ RTGCPHYS aGCPhysGstPaePDsMonitored[4]; /** Mask containing the MBZ PTE bits. */ diff --git a/src/VBox/VMM/include/REMInternal.h b/src/VBox/VMM/include/REMInternal.h index edc9c83fe..2dbf86d04 100644 --- a/src/VBox/VMM/include/REMInternal.h +++ b/src/VBox/VMM/include/REMInternal.h @@ -1,4 +1,4 @@ -/* $Id: REMInternal.h 37702 2011-06-30 10:09:59Z vboxsync $ */ +/* $Id: REMInternal.h $ */ /** @file * REM - Internal header file. */ diff --git a/src/VBox/VMM/include/SELMInternal.h b/src/VBox/VMM/include/SELMInternal.h index 150cfac59..fd97c24fb 100644 --- a/src/VBox/VMM/include/SELMInternal.h +++ b/src/VBox/VMM/include/SELMInternal.h @@ -1,4 +1,4 @@ -/* $Id: SELMInternal.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: SELMInternal.h $ */ /** @file * SELM - Internal header file. */ diff --git a/src/VBox/VMM/include/SSMInternal.h b/src/VBox/VMM/include/SSMInternal.h index d00e6ff7e..d1f8752ad 100644 --- a/src/VBox/VMM/include/SSMInternal.h +++ b/src/VBox/VMM/include/SSMInternal.h @@ -1,4 +1,4 @@ -/* $Id: SSMInternal.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: SSMInternal.h $ */ /** @file * SSM - Internal header file. */ diff --git a/src/VBox/VMM/include/STAMInternal.h b/src/VBox/VMM/include/STAMInternal.h index 8db31b338..eeae65724 100644 --- a/src/VBox/VMM/include/STAMInternal.h +++ b/src/VBox/VMM/include/STAMInternal.h @@ -1,4 +1,4 @@ -/* $Id: STAMInternal.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: STAMInternal.h $ */ /** @file * STAM Internal Header. */ diff --git a/src/VBox/VMM/include/TMInline.h b/src/VBox/VMM/include/TMInline.h index 82f69031a..a73324b18 100644 --- a/src/VBox/VMM/include/TMInline.h +++ b/src/VBox/VMM/include/TMInline.h @@ -1,4 +1,4 @@ -/* $Id: TMInline.h 37517 2011-06-16 19:24:00Z vboxsync $ */ +/* $Id: TMInline.h $ */ /** @file * TM - Common Inlined functions. */ diff --git a/src/VBox/VMM/include/TMInternal.h b/src/VBox/VMM/include/TMInternal.h index 27d88003e..164e5341a 100644 --- a/src/VBox/VMM/include/TMInternal.h +++ b/src/VBox/VMM/include/TMInternal.h @@ -1,4 +1,4 @@ -/* $Id: TMInternal.h 37527 2011-06-17 10:18:02Z vboxsync $ */ +/* $Id: TMInternal.h $ */ /** @file * TM - Internal header file. */ diff --git a/src/VBox/VMM/include/TRPMInternal.h b/src/VBox/VMM/include/TRPMInternal.h index c6ecc9e57..0520ca050 100644 --- a/src/VBox/VMM/include/TRPMInternal.h +++ b/src/VBox/VMM/include/TRPMInternal.h @@ -1,4 +1,4 @@ -/* $Id: TRPMInternal.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: TRPMInternal.h $ */ /** @file * TRPM - Internal header file. */ diff --git a/src/VBox/VMM/include/TRPMInternal.mac b/src/VBox/VMM/include/TRPMInternal.mac index ae7b97437..a9c34c805 100644 --- a/src/VBox/VMM/include/TRPMInternal.mac +++ b/src/VBox/VMM/include/TRPMInternal.mac @@ -1,4 +1,4 @@ -; $Id: TRPMInternal.mac 35346 2010-12-27 16:13:13Z vboxsync $ +; $Id: TRPMInternal.mac $ ;; @file ; TRPM - Internal header file. ; diff --git a/src/VBox/VMM/include/VMInternal.h b/src/VBox/VMM/include/VMInternal.h index 5ea061d2c..bee16b40a 100644 --- a/src/VBox/VMM/include/VMInternal.h +++ b/src/VBox/VMM/include/VMInternal.h @@ -1,4 +1,4 @@ -/* $Id: VMInternal.h 36041 2011-02-21 16:04:53Z vboxsync $ */ +/* $Id: VMInternal.h $ */ /** @file * VM - Internal header file. */ diff --git a/src/VBox/VMM/include/VMMInternal.h b/src/VBox/VMM/include/VMMInternal.h index 71136d2a5..9ad45c1bf 100644 --- a/src/VBox/VMM/include/VMMInternal.h +++ b/src/VBox/VMM/include/VMMInternal.h @@ -1,4 +1,4 @@ -/* $Id: VMMInternal.h 37452 2011-06-14 18:13:48Z vboxsync $ */ +/* $Id: VMMInternal.h $ */ /** @file * VMM - Internal header file. */ diff --git a/src/VBox/VMM/include/VMMInternal.mac b/src/VBox/VMM/include/VMMInternal.mac index 4780e380c..b7899d9a6 100644 --- a/src/VBox/VMM/include/VMMInternal.mac +++ b/src/VBox/VMM/include/VMMInternal.mac @@ -1,4 +1,4 @@ -; $Id: VMMInternal.mac 35333 2010-12-27 12:10:56Z vboxsync $ +; $Id: VMMInternal.mac $ ;; @file ; VMM - Internal header file. ; diff --git a/src/VBox/VMM/include/VMMSwitcher.h b/src/VBox/VMM/include/VMMSwitcher.h index 9762aff33..a0d296c89 100644 --- a/src/VBox/VMM/include/VMMSwitcher.h +++ b/src/VBox/VMM/include/VMMSwitcher.h @@ -1,4 +1,4 @@ -/* $Id: VMMSwitcher.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: VMMSwitcher.h $ */ /** @file * VMM - World Switchers. */ diff --git a/src/VBox/VMM/include/VMMSwitcher.mac b/src/VBox/VMM/include/VMMSwitcher.mac index 5685a456d..244ce3337 100644 --- a/src/VBox/VMM/include/VMMSwitcher.mac +++ b/src/VBox/VMM/include/VMMSwitcher.mac @@ -1,4 +1,4 @@ -; $Id: VMMSwitcher.mac 35333 2010-12-27 12:10:56Z vboxsync $ +; $Id: VMMSwitcher.mac $ ;; @file ; VMM - World Switchers. ; diff --git a/src/VBox/VMM/include/internal/em.h b/src/VBox/VMM/include/internal/em.h index ccadd97b0..2d63f0b0b 100644 --- a/src/VBox/VMM/include/internal/em.h +++ b/src/VBox/VMM/include/internal/em.h @@ -1,4 +1,4 @@ -/* $Id: em.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: em.h $ */ /** @file * EM - Internal VMM header file. */ diff --git a/src/VBox/VMM/include/internal/pgm.h b/src/VBox/VMM/include/internal/pgm.h index aa86631e5..42f043f6e 100644 --- a/src/VBox/VMM/include/internal/pgm.h +++ b/src/VBox/VMM/include/internal/pgm.h @@ -1,4 +1,4 @@ -/* $Id: pgm.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: pgm.h $ */ /** @file * PGM - Internal VMM header file. */ diff --git a/src/VBox/VMM/include/internal/vm.h b/src/VBox/VMM/include/internal/vm.h index 4b5dace98..a3bc6ce6a 100644 --- a/src/VBox/VMM/include/internal/vm.h +++ b/src/VBox/VMM/include/internal/vm.h @@ -1,4 +1,4 @@ -/* $Id: vm.h 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: vm.h $ */ /** @file * VM - Internal VMM header file. */ diff --git a/src/VBox/VMM/pure_test.sh b/src/VBox/VMM/pure_test.sh index 9542f1ae9..1d0a2a433 100755 --- a/src/VBox/VMM/pure_test.sh +++ b/src/VBox/VMM/pure_test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: pure_test.sh 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: pure_test.sh $ ## @file # pure_test.sh - test the effect of __attribute__((pure)) on a set of # functions. diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk index a961d3567..e9c74e122 100644 --- a/src/VBox/VMM/testcase/Makefile.kmk +++ b/src/VBox/VMM/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VMM testcases. # diff --git a/src/VBox/VMM/testcase/mkdsk.sh b/src/VBox/VMM/testcase/mkdsk.sh index 0e55746de..0e55746de 100644..100755 --- a/src/VBox/VMM/testcase/mkdsk.sh +++ b/src/VBox/VMM/testcase/mkdsk.sh diff --git a/src/VBox/VMM/testcase/tstAnimate.cpp b/src/VBox/VMM/testcase/tstAnimate.cpp index d6c8f1975..2b225cadb 100644 --- a/src/VBox/VMM/testcase/tstAnimate.cpp +++ b/src/VBox/VMM/testcase/tstAnimate.cpp @@ -1,4 +1,4 @@ -/* $Id: tstAnimate.cpp 38324 2011-08-05 14:02:53Z vboxsync $ */ +/* $Id: tstAnimate.cpp $ */ /** @file * VBox Animation Testcase / Tool. */ diff --git a/src/VBox/VMM/testcase/tstAsmStructs.cpp b/src/VBox/VMM/testcase/tstAsmStructs.cpp index b28479dcb..e74a9a839 100644 --- a/src/VBox/VMM/testcase/tstAsmStructs.cpp +++ b/src/VBox/VMM/testcase/tstAsmStructs.cpp @@ -1,4 +1,4 @@ -/* $Id: tstAsmStructs.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstAsmStructs.cpp $ */ /** @file * Testcase for checking offsets in the assembly structures shared with C/C++. */ diff --git a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm index ce0c4b736..95747e6d7 100644 --- a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm +++ b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmStructsAsm.asm 35346 2010-12-27 16:13:13Z vboxsync $ +; $Id: tstAsmStructsAsm.asm $ ;; @file ; Assembly / C structure layout testcase. ; diff --git a/src/VBox/VMM/testcase/tstCFGM.cpp b/src/VBox/VMM/testcase/tstCFGM.cpp index 792ac9df4..8a7af1296 100644 --- a/src/VBox/VMM/testcase/tstCFGM.cpp +++ b/src/VBox/VMM/testcase/tstCFGM.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCFGM.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstCFGM.cpp $ */ /** @file * Testcase for CFGM. */ diff --git a/src/VBox/VMM/testcase/tstCompiler.cpp b/src/VBox/VMM/testcase/tstCompiler.cpp index ca942f6d5..bbed6bc93 100644 --- a/src/VBox/VMM/testcase/tstCompiler.cpp +++ b/src/VBox/VMM/testcase/tstCompiler.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCompiler.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: tstCompiler.cpp $ */ /** @file * Testing how the compiler deals with various things. * diff --git a/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp b/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp index 1d2e121dc..2105764d1 100644 --- a/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp +++ b/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCompressionBenchmark.cpp 33550 2010-10-28 10:53:57Z vboxsync $ */ +/* $Id: tstCompressionBenchmark.cpp $ */ /** @file * Compression Benchmark for SSM and PGM. */ diff --git a/src/VBox/VMM/testcase/tstGlobalConfig.cpp b/src/VBox/VMM/testcase/tstGlobalConfig.cpp index 134873cba..f87701a14 100644 --- a/src/VBox/VMM/testcase/tstGlobalConfig.cpp +++ b/src/VBox/VMM/testcase/tstGlobalConfig.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGlobalConfig.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstGlobalConfig.cpp $ */ /** @file * Ring-3 Management program for the GCFGM mock-up. */ diff --git a/src/VBox/VMM/testcase/tstHelp.h b/src/VBox/VMM/testcase/tstHelp.h index c727a2c52..f4403d840 100644 --- a/src/VBox/VMM/testcase/tstHelp.h +++ b/src/VBox/VMM/testcase/tstHelp.h @@ -1,4 +1,4 @@ -/* $Id: tstHelp.h 36931 2011-05-03 13:34:43Z vboxsync $ */ +/* $Id: tstHelp.h $ */ /** @file * VMM testcase - Helper stuff. */ diff --git a/src/VBox/VMM/testcase/tstIEMCheckMc.cpp b/src/VBox/VMM/testcase/tstIEMCheckMc.cpp index a0f9d8c23..14d269423 100644 --- a/src/VBox/VMM/testcase/tstIEMCheckMc.cpp +++ b/src/VBox/VMM/testcase/tstIEMCheckMc.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIEMCheckMc.cpp 38077 2011-07-19 17:15:29Z vboxsync $ */ +/* $Id: tstIEMCheckMc.cpp $ */ /** @file * IEM Testcase - Check the "Microcode". */ diff --git a/src/VBox/VMM/testcase/tstInstrEmul.cpp b/src/VBox/VMM/testcase/tstInstrEmul.cpp index 1caeab2b1..4e9b9ce69 100644 --- a/src/VBox/VMM/testcase/tstInstrEmul.cpp +++ b/src/VBox/VMM/testcase/tstInstrEmul.cpp @@ -1,4 +1,4 @@ -/* $Id: tstInstrEmul.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstInstrEmul.cpp $ */ /** @file * Micro Testcase, checking emulation of certain instructions */ diff --git a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp index d119d5dd5..4ba08e835 100644 --- a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp +++ b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMMHyperHeap.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstMMHyperHeap.cpp $ */ /** @file * MM Hypervisor Heap testcase. */ diff --git a/src/VBox/VMM/testcase/tstMicro.cpp b/src/VBox/VMM/testcase/tstMicro.cpp index abd23771b..f8e0bcd44 100644 --- a/src/VBox/VMM/testcase/tstMicro.cpp +++ b/src/VBox/VMM/testcase/tstMicro.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMicro.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstMicro.cpp $ */ /** @file * Micro Testcase, profiling special CPU operations. */ diff --git a/src/VBox/VMM/testcase/tstMicro.h b/src/VBox/VMM/testcase/tstMicro.h index 5120946cc..3473c365a 100644 --- a/src/VBox/VMM/testcase/tstMicro.h +++ b/src/VBox/VMM/testcase/tstMicro.h @@ -1,4 +1,4 @@ -/* $Id: tstMicro.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: tstMicro.h $ */ /** @file * Micro Testcase, profiling special CPU operations. */ diff --git a/src/VBox/VMM/testcase/tstMicro.mac b/src/VBox/VMM/testcase/tstMicro.mac index 4b75e41e8..92e50ca31 100644 --- a/src/VBox/VMM/testcase/tstMicro.mac +++ b/src/VBox/VMM/testcase/tstMicro.mac @@ -1,4 +1,4 @@ -; $Id: tstMicro.mac 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: tstMicro.mac $ ;; @file ; Micro Testcase, profiling special CPU operations. ; diff --git a/src/VBox/VMM/testcase/tstMicroRC.cpp b/src/VBox/VMM/testcase/tstMicroRC.cpp index a43461c78..a1a719363 100644 --- a/src/VBox/VMM/testcase/tstMicroRC.cpp +++ b/src/VBox/VMM/testcase/tstMicroRC.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMicroRC.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstMicroRC.cpp $ */ /** @file * Micro Testcase, profiling special CPU operations - GC Code (hacks). */ diff --git a/src/VBox/VMM/testcase/tstMicroRCA.asm b/src/VBox/VMM/testcase/tstMicroRCA.asm index 4383af17e..6fa361486 100644 --- a/src/VBox/VMM/testcase/tstMicroRCA.asm +++ b/src/VBox/VMM/testcase/tstMicroRCA.asm @@ -1,4 +1,4 @@ -; $Id: tstMicroRCA.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: tstMicroRCA.asm $ ;; @file ; tstMicroRCA ; diff --git a/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp b/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp index e3513ebbf..e54d0c184 100644 --- a/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp +++ b/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPDMAsyncCompletion.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstPDMAsyncCompletion.cpp $ */ /** @file * PDM Asynchronous Completion Testcase. * diff --git a/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp b/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp index fb28df5e9..25fa67995 100644 --- a/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp +++ b/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPDMAsyncCompletionStress.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstPDMAsyncCompletionStress.cpp $ */ /** @file * PDM Asynchronous Completion Stresstest. * diff --git a/src/VBox/VMM/testcase/tstSSM.cpp b/src/VBox/VMM/testcase/tstSSM.cpp index ccebc89ef..4908e4fa8 100644 --- a/src/VBox/VMM/testcase/tstSSM.cpp +++ b/src/VBox/VMM/testcase/tstSSM.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSSM.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstSSM.cpp $ */ /** @file * Saved State Manager Testcase. */ diff --git a/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp b/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp index 497a7d0ed..b50877027 100644 --- a/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp +++ b/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMM-HwAccm.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstVMM-HwAccm.cpp $ */ /** @file * VMM Testcase. */ diff --git a/src/VBox/VMM/testcase/tstVMM.cpp b/src/VBox/VMM/testcase/tstVMM.cpp index 88413e5b1..f1dd26770 100644 --- a/src/VBox/VMM/testcase/tstVMM.cpp +++ b/src/VBox/VMM/testcase/tstVMM.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMM.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstVMM.cpp $ */ /** @file * VMM Testcase. */ diff --git a/src/VBox/VMM/testcase/tstVMMFork.cpp b/src/VBox/VMM/testcase/tstVMMFork.cpp index d30eaea6d..04ed9167e 100644 --- a/src/VBox/VMM/testcase/tstVMMFork.cpp +++ b/src/VBox/VMM/testcase/tstVMMFork.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMMFork.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstVMMFork.cpp $ */ /** @file * VMM Fork Test. */ diff --git a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp index 2dc2dcf90..7ec223968 100644 --- a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp +++ b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMMR0CallHost-1.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstVMMR0CallHost-1.cpp $ */ /** @file * Testcase for the VMMR0JMPBUF operations. */ diff --git a/src/VBox/VMM/testcase/tstVMREQ.cpp b/src/VBox/VMM/testcase/tstVMREQ.cpp index 3e6c2c9d6..34cf1de79 100644 --- a/src/VBox/VMM/testcase/tstVMREQ.cpp +++ b/src/VBox/VMM/testcase/tstVMREQ.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMREQ.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */ +/* $Id: tstVMREQ.cpp $ */ /** @file * VMM Testcase. */ diff --git a/src/VBox/VMM/testcase/tstVMStructRC.cpp b/src/VBox/VMM/testcase/tstVMStructRC.cpp index 04df377cb..b40a537f5 100644 --- a/src/VBox/VMM/testcase/tstVMStructRC.cpp +++ b/src/VBox/VMM/testcase/tstVMStructRC.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMStructRC.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: tstVMStructRC.cpp $ */ /** @file * tstVMMStructRC - Generate structure member and size checks from the * RC perspective. diff --git a/src/VBox/VMM/testcase/tstVMStructSize.cpp b/src/VBox/VMM/testcase/tstVMStructSize.cpp index 75c93b91a..bd5cb1552 100644 --- a/src/VBox/VMM/testcase/tstVMStructSize.cpp +++ b/src/VBox/VMM/testcase/tstVMStructSize.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMStructSize.cpp 37955 2011-07-14 12:23:02Z vboxsync $ */ +/* $Id: tstVMStructSize.cpp $ */ /** @file * tstVMStructSize - testcase for check structure sizes/alignment * and to verify that HC and GC uses the same diff --git a/src/VBox/VMM/testcase/tstX86-1.cpp b/src/VBox/VMM/testcase/tstX86-1.cpp index 6904bf4ab..d69e2288a 100644 --- a/src/VBox/VMM/testcase/tstX86-1.cpp +++ b/src/VBox/VMM/testcase/tstX86-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstX86-1.cpp 36865 2011-04-28 00:59:50Z vboxsync $ */ +/* $Id: tstX86-1.cpp $ */ /** @file * X86 instruction set exploration/testcase #1. */ diff --git a/src/VBox/VMM/testcase/tstX86-1A.asm b/src/VBox/VMM/testcase/tstX86-1A.asm index 191a643e9..ca2971f86 100644 --- a/src/VBox/VMM/testcase/tstX86-1A.asm +++ b/src/VBox/VMM/testcase/tstX86-1A.asm @@ -1,4 +1,4 @@ -; $Id: tstX86-1A.asm 37955 2011-07-14 12:23:02Z vboxsync $ +; $Id: tstX86-1A.asm $ ;; @file ; X86 instruction set testcase #1. ; diff --git a/src/apps/Makefile.kmk b/src/apps/Makefile.kmk index 8af2b784e..9185c0b59 100644 --- a/src/apps/Makefile.kmk +++ b/src/apps/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the external apps. # diff --git a/src/apps/adpctl/Makefile.kmk b/src/apps/adpctl/Makefile.kmk index 2da986505..27e4d9a3e 100644 --- a/src/apps/adpctl/Makefile.kmk +++ b/src/apps/adpctl/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxAdpCtl # diff --git a/src/apps/adpctl/VBoxNetAdpCtl.cpp b/src/apps/adpctl/VBoxNetAdpCtl.cpp index f0de042b3..b2a231de8 100644 --- a/src/apps/adpctl/VBoxNetAdpCtl.cpp +++ b/src/apps/adpctl/VBoxNetAdpCtl.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetAdpCtl.cpp 35819 2011-02-01 20:21:53Z vboxsync $ */ +/* $Id: VBoxNetAdpCtl.cpp $ */ /** @file * Apps - VBoxAdpCtl, Configuration tool for vboxnetX adapters. */ diff --git a/src/apps/svnsync-vbox/Makefile.kmk b/src/apps/svnsync-vbox/Makefile.kmk index 1b4b9d595..52d2578aa 100644 --- a/src/apps/svnsync-vbox/Makefile.kmk +++ b/src/apps/svnsync-vbox/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 31666 2010-08-13 15:55:20Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for svnsync-vbox. # diff --git a/src/apps/svnsync-vbox/main.c b/src/apps/svnsync-vbox/main.c index 968d25d4e..e94893e72 100644 --- a/src/apps/svnsync-vbox/main.c +++ b/src/apps/svnsync-vbox/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: main.c $ */ /** @file * svnsync tool. Modified by Oracle. */ diff --git a/src/apps/svnsync-vbox/svn_private_config.h b/src/apps/svnsync-vbox/svn_private_config.h index f912682e2..37128777f 100644 --- a/src/apps/svnsync-vbox/svn_private_config.h +++ b/src/apps/svnsync-vbox/svn_private_config.h @@ -1,4 +1,4 @@ -/* $Id: svn_private_config.h 29684 2010-05-20 11:30:05Z vboxsync $ */ +/* $Id: svn_private_config.h $ */ /** @file * */ diff --git a/src/apps/tunctl/Makefile.kmk b/src/apps/tunctl/Makefile.kmk index dd288b31e..63ff5dda2 100644 --- a/src/apps/tunctl/Makefile.kmk +++ b/src/apps/tunctl/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxTunctl # diff --git a/src/bldprogs/Makefile.kmk b/src/bldprogs/Makefile.kmk index 7811bdafc..b4fd13932 100644 --- a/src/bldprogs/Makefile.kmk +++ b/src/bldprogs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 34484 2010-11-29 17:45:20Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for various generic build tools (there is currently only one of them). # diff --git a/src/bldprogs/bin2c.c b/src/bldprogs/bin2c.c index d30fe4fcd..a0a973ce8 100644 --- a/src/bldprogs/bin2c.c +++ b/src/bldprogs/bin2c.c @@ -1,4 +1,4 @@ -/* $Id: bin2c.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: bin2c.c $ */ /** @file * bin2c - Binary 2 C Structure Converter. */ diff --git a/src/bldprogs/biossums.c b/src/bldprogs/biossums.c index 063d02368..e179f6493 100644 --- a/src/bldprogs/biossums.c +++ b/src/bldprogs/biossums.c @@ -1,4 +1,4 @@ -/* $Id: biossums.c 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: biossums.c $ */ /** @file * Tool for modifying a BIOS image to write the BIOS checksum. */ diff --git a/src/bldprogs/checkUndefined.sh b/src/bldprogs/checkUndefined.sh index 16a5a463e..16a5a463e 100644..100755 --- a/src/bldprogs/checkUndefined.sh +++ b/src/bldprogs/checkUndefined.sh diff --git a/src/bldprogs/deftoimp.sed b/src/bldprogs/deftoimp.sed index be5fbe268..56b4de322 100644 --- a/src/bldprogs/deftoimp.sed +++ b/src/bldprogs/deftoimp.sed @@ -1,4 +1,4 @@ -# $Id: deftoimp.sed 34662 2010-12-02 21:51:17Z vboxsync $ +# $Id: deftoimp.sed $ ## @file # SED script for generating a dummy .c from a windows .def file. # diff --git a/src/bldprogs/preload.cpp b/src/bldprogs/preload.cpp index 0ec2e0f29..07def9a04 100644 --- a/src/bldprogs/preload.cpp +++ b/src/bldprogs/preload.cpp @@ -1,4 +1,4 @@ -/* $Id: preload.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: preload.cpp $ */ /** @file * bin2c - Binary 2 C Structure Converter. */ @@ -146,7 +146,7 @@ int main(int argc, char **argv) if ( !strcmp(argv[i], "--version") || !strcmp(argv[i], "-V")) { - printf("$Revision: 28800 $\n"); + printf("$Revision: 60692 $\n"); return 0; } fprintf(stderr, "syntax error: unknown option '%s'\n", argv[i]); diff --git a/src/bldprogs/scm.cpp b/src/bldprogs/scm.cpp index fbf2283f6..261980fbe 100644 --- a/src/bldprogs/scm.cpp +++ b/src/bldprogs/scm.cpp @@ -1,4 +1,4 @@ -/* $Id: scm.cpp 35404 2011-01-05 11:32:29Z vboxsync $ */ +/* $Id: scm.cpp $ */ /** @file * IPRT Testcase / Tool - Source Code Massager. */ @@ -4090,7 +4090,7 @@ int main(int argc, char **argv) case 'V': { /* The following is assuming that svn does it's job here. */ - static const char s_szRev[] = "$Revision: 35404 $"; + static const char s_szRev[] = "$Revision: 69268 $"; const char *psz = RTStrStripL(strchr(s_szRev, ' ')); RTPrintf("r%.*s\n", strchr(psz, ' ') - psz, psz); return 0; diff --git a/src/libs/Makefile.kmk b/src/libs/Makefile.kmk index 1ed004436..770d54920 100644 --- a/src/libs/Makefile.kmk +++ b/src/libs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38386 2011-08-09 17:34:15Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the external libraries. # diff --git a/src/libs/kStuff/Makefile.kmk b/src/libs/kStuff/Makefile.kmk index 0ed8fb193..93d299500 100644 --- a/src/libs/kStuff/Makefile.kmk +++ b/src/libs/kStuff/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for kStuff, for statically linking into VBoxRT. # diff --git a/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp b/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp index b4cf74cf9..6684bf33e 100644 --- a/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpAlloc-iprt.cpp 35288 2010-12-22 09:14:54Z vboxsync $ */ +/* $Id: kHlpAlloc-iprt.cpp $ */ /** @file * kHlpAlloc - Memory Allocation, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kHlpAssert-iprt.cpp b/src/libs/kStuff/iprt/kHlpAssert-iprt.cpp index 2faf3b64c..406bc3e85 100644 --- a/src/libs/kStuff/iprt/kHlpAssert-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpAssert-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpAssert-iprt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: kHlpAssert-iprt.cpp $ */ /** @file * kHlpEnv - Assertions, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp b/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp index b2119f771..17661ca7c 100644 --- a/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpEnv-iprt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: kHlpEnv-iprt.cpp $ */ /** @file * kHlpEnv - Environment Manipulation, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kHlpPage-iprt.cpp b/src/libs/kStuff/iprt/kHlpPage-iprt.cpp index 2372d343d..b808d9978 100644 --- a/src/libs/kStuff/iprt/kHlpPage-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpPage-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpPage-iprt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: kHlpPage-iprt.cpp $ */ /** @file * kHlpPage - Page Memory Allocation, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kHlpString-iprt.cpp b/src/libs/kStuff/iprt/kHlpString-iprt.cpp index 6ecffb6c7..0c74fa55a 100644 --- a/src/libs/kStuff/iprt/kHlpString-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpString-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpString-iprt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: kHlpString-iprt.cpp $ */ /** @file * kHlpString - String And Memory Routines, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kRdrFile-iprt.cpp b/src/libs/kStuff/iprt/kRdrFile-iprt.cpp index 697bf1594..2d8907332 100644 --- a/src/libs/kStuff/iprt/kRdrFile-iprt.cpp +++ b/src/libs/kStuff/iprt/kRdrFile-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kRdrFile-iprt.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: kRdrFile-iprt.cpp $ */ /** @file * IPRT - kRdr Backend. */ diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk index 44088fad0..afa08fd25 100644 --- a/src/libs/liblzf-3.4/Makefile.kmk +++ b/src/libs/liblzf-3.4/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 32382 2010-09-10 09:53:03Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for liblzf. # diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk index c2e646d0a..a892ebecc 100644 --- a/src/libs/xpcom18a4/Config.kmk +++ b/src/libs/xpcom18a4/Config.kmk @@ -1,4 +1,4 @@ -# $Id: Config.kmk 35440 2011-01-09 23:43:10Z vboxsync $ +# $Id: Config.kmk $ ## @file # XPCOM kBuild Configuration file. # diff --git a/src/libs/xpcom18a4/Makefile.kmk b/src/libs/xpcom18a4/Makefile.kmk index f28a30633..bc77f341e 100644 --- a/src/libs/xpcom18a4/Makefile.kmk +++ b/src/libs/xpcom18a4/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for XPCOM. # @@ -470,10 +470,17 @@ else libIDL_config_libs := $(shell $(VBOX_LIBIDL_CONFIG) --libs) xpidl_CFLAGS = \ $(libIDL_config_cflags) + ifeq ($(BUILD_PLATFORM),linux) + xpidl_LDFLAGS = \ + $(filter-out -l%,$(libIDL_config_libs)) + else xpidl_LDFLAGS = \ $(libIDL_config_libs) + endif xpidl_LDFLAGS.linux = \ $(VBOX_LD_as_needed) + xpidl_LIBS.linux += \ + $(subst -l,,$(filter -l%,$(libIDL_config_libs))) endif # diff --git a/src/libs/xpcom18a4/java/Makefile.kmk b/src/libs/xpcom18a4/java/Makefile.kmk index 14a4e58b0..368796709 100644 --- a/src/libs/xpcom18a4/java/Makefile.kmk +++ b/src/libs/xpcom18a4/java/Makefile.kmk @@ -1,10 +1,10 @@ -# $Id: Makefile.kmk 38093 2011-07-21 12:45:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for Java bindings # # -# Copyright (C) 2010 Oracle Corporation +# Copyright (C) 2010-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -175,6 +175,7 @@ $(VBOX_JXPCOM_GEN)/jxpcomglue.list: \ $(QUIET)$(VBOX_XSLTPROC) \ --stringparam G_vboxApiSuffix $(VBOX_API_SUFFIX) \ --stringparam G_vboxGlueStyle xpcom \ + --stringparam G_vboxDirPrefix "" \ -o $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl $< $(QUIET)$(VBOX_FILESPLIT) $(VBOX_JXPCOM_GEN)/java/glue/merged.file $(VBOX_JXPCOM_GEN)/java/glue/ $(QUIET)echo $(VBOX_JXPCOM_GEN)/java/glue/*.java > $@ diff --git a/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp b/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp index dc7a0ffda..35b59b6d6 100644 --- a/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp +++ b/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp @@ -703,6 +703,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut, // extract IID string from Java string const char* str = env->GetStringUTFChars(data, nsnull); if (!str) { + delete iid; rv = NS_ERROR_OUT_OF_MEMORY; break; } diff --git a/src/libs/xpcom18a4/java/src/org/virtualbox/VBoxObjectBase.java b/src/libs/xpcom18a4/java/src/org/virtualbox/VBoxObjectBase.java index 4e3fda9a5..7a01dd48d 100644 --- a/src/libs/xpcom18a4/java/src/org/virtualbox/VBoxObjectBase.java +++ b/src/libs/xpcom18a4/java/src/org/virtualbox/VBoxObjectBase.java @@ -1,4 +1,4 @@ -/* $Id: VBoxObjectBase.java 29233 2010-05-07 19:52:15Z vboxsync $ */ +/* $Id: VBoxObjectBase.java $ */ /* * Copyright (C) 2010 Oracle Corporation * diff --git a/src/libs/xpcom18a4/java/tools/gen-nsError.pl b/src/libs/xpcom18a4/java/tools/gen-nsError.pl index da866b83b..da866b83b 100644..100755 --- a/src/libs/xpcom18a4/java/tools/gen-nsError.pl +++ b/src/libs/xpcom18a4/java/tools/gen-nsError.pl diff --git a/src/libs/xpcom18a4/nsprpub/Makefile.in b/src/libs/xpcom18a4/nsprpub/Makefile.in index 9273b16db..9273b16db 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/Makefile.in diff --git a/src/libs/xpcom18a4/nsprpub/admin/explode.pl b/src/libs/xpcom18a4/nsprpub/admin/explode.pl index 881f21b9b..881f21b9b 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/admin/explode.pl +++ b/src/libs/xpcom18a4/nsprpub/admin/explode.pl diff --git a/src/libs/xpcom18a4/nsprpub/admin/makeTargetDirs.sh b/src/libs/xpcom18a4/nsprpub/admin/makeTargetDirs.sh index 4250ce4a0..4250ce4a0 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/admin/makeTargetDirs.sh +++ b/src/libs/xpcom18a4/nsprpub/admin/makeTargetDirs.sh diff --git a/src/libs/xpcom18a4/nsprpub/admin/repackage.sh b/src/libs/xpcom18a4/nsprpub/admin/repackage.sh index 37ba0e163..37ba0e163 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/admin/repackage.sh +++ b/src/libs/xpcom18a4/nsprpub/admin/repackage.sh diff --git a/src/libs/xpcom18a4/nsprpub/admin/symlinks.sh b/src/libs/xpcom18a4/nsprpub/admin/symlinks.sh index f90582e2d..f90582e2d 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/admin/symlinks.sh +++ b/src/libs/xpcom18a4/nsprpub/admin/symlinks.sh diff --git a/src/libs/xpcom18a4/nsprpub/config/Makefile.in b/src/libs/xpcom18a4/nsprpub/config/Makefile.in index 1b83ffa56..1b83ffa56 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/config/Makefile.in diff --git a/src/libs/xpcom18a4/nsprpub/config/config.mk b/src/libs/xpcom18a4/nsprpub/config/config.mk index 697a6015d..697a6015d 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/config.mk +++ b/src/libs/xpcom18a4/nsprpub/config/config.mk diff --git a/src/libs/xpcom18a4/nsprpub/config/nfspwd.pl b/src/libs/xpcom18a4/nsprpub/config/nfspwd.pl index 947b822ae..947b822ae 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/nfspwd.pl +++ b/src/libs/xpcom18a4/nsprpub/config/nfspwd.pl diff --git a/src/libs/xpcom18a4/nsprpub/config/nspr-config.in b/src/libs/xpcom18a4/nsprpub/config/nspr-config.in index e9e186791..e9e186791 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/nspr-config.in +++ b/src/libs/xpcom18a4/nsprpub/config/nspr-config.in diff --git a/src/libs/xpcom18a4/nsprpub/config/rules.mk b/src/libs/xpcom18a4/nsprpub/config/rules.mk index bba50ee75..bba50ee75 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/rules.mk +++ b/src/libs/xpcom18a4/nsprpub/config/rules.mk diff --git a/src/libs/xpcom18a4/nsprpub/configure b/src/libs/xpcom18a4/nsprpub/configure index 2046d79f6..2046d79f6 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/configure +++ b/src/libs/xpcom18a4/nsprpub/configure diff --git a/src/libs/xpcom18a4/nsprpub/pkg/linux/Makefile.in b/src/libs/xpcom18a4/nsprpub/pkg/linux/Makefile.in index 09edb474b..630af186b 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/linux/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/pkg/linux/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in 1 vboxsync $" +#ident "$Id: Makefile.in $" # MOD_DEPTH = ../.. diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.com b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.com index 511e5913b..32de8a9ba 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.com +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.com @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.com 1 vboxsync $" +#ident "$Id: Makefile.com $" # MACH = $(shell mach) diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.in b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.in index 53ac721f5..0c2d2e317 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in 1 vboxsync $" +#ident "$Id: Makefile.in $" # MOD_DEPTH = ../.. diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.targ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.targ index b5ea1586b..9c49cf206 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.targ +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.targ @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.targ 1 vboxsync $" +#ident "$Id: Makefile.targ $" # pkginfo: pkginfo.tmpl ../awk_pkginfo diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/Makefile.in b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/Makefile.in index 66885f029..ab54db6fb 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in 1 vboxsync $" +#ident "$Id: Makefile.in $" # MOD_DEPTH = ../../.. diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/depend b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/depend index 47748f629..57bc554e3 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/depend +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/depend @@ -1,7 +1,7 @@ # Copyright 2002 Microsystems, Inc. All Rights Reserved. # Use is subject to license terms. # -# $Id: depend 1 vboxsync $ +# $Id: depend $ # # This package information file defines software dependencies associated # with the pkg. You can define three types of pkg dependencies with this file: diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl index d387aa5dc..431ef37a0 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: pkginfo.tmpl 1 vboxsync $" +#ident "$Id: pkginfo.tmpl $" # # # This required package information file describes characteristics of the diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_com b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_com index d7c4366ca..e92c4e513 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_com +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_com @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_com 1 vboxsync $" +#ident "$Id: prototype_com $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_i386 b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_i386 index 652e25a1f..76b920168 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_i386 +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_i386 @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_i386 1 vboxsync $" +#ident "$Id: prototype_i386 $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_sparc b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_sparc index ae0a7032e..4da58b010 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_sparc +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_sparc @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_sparc 1 vboxsync $" +#ident "$Id: prototype_sparc $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/Makefile.in b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/Makefile.in index 66885f029..ab54db6fb 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in 1 vboxsync $" +#ident "$Id: Makefile.in $" # MOD_DEPTH = ../../.. diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/depend b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/depend index 027675ef6..5be1ecd98 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/depend +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/depend @@ -1,7 +1,7 @@ # Copyright 2002 Microsystems, Inc. All Rights Reserved. # Use is subject to license terms. # -# $Id: depend 1 vboxsync $ +# $Id: depend $ # # This package information file defines software dependencies associated # with the pkg. You can define three types of pkg dependencies with this file: diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl index f7504a307..0b13c5be4 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: pkginfo.tmpl 1 vboxsync $" +#ident "$Id: pkginfo.tmpl $" # # # This required package information file describes characteristics of the diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_com b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_com index ac92436fd..700d61ca9 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_com +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_com @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_com 1 vboxsync $" +#ident "$Id: prototype_com $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_sparc b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_sparc index 26e6d7d70..cd3da1210 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_sparc +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_sparc @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_sparc 1 vboxsync $" +#ident "$Id: prototype_sparc $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh b/src/libs/xpcom18a4/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh index 80d6fab36..b01645e47 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh @@ -1,6 +1,6 @@ #!/usr/bin/ksh -p # -#ident "$Id: bld_awk_pkginfo.ksh 1 vboxsync $" +#ident "$Id: bld_awk_pkginfo.ksh $" # # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. diff --git a/src/libs/xpcom18a4/nsprpub/pr/include/md/_iprt_atomic.h b/src/libs/xpcom18a4/nsprpub/pr/include/md/_iprt_atomic.h index 729f3973b..949604978 100644 --- a/src/libs/xpcom18a4/nsprpub/pr/include/md/_iprt_atomic.h +++ b/src/libs/xpcom18a4/nsprpub/pr/include/md/_iprt_atomic.h @@ -1,4 +1,4 @@ -/* $Id: _iprt_atomic.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: _iprt_atomic.h $ */ /** @file * IPRT Atomic Operation, for including into a system config header. */ diff --git a/src/libs/xpcom18a4/nsprpub/pr/src/misc/compile-et.pl b/src/libs/xpcom18a4/nsprpub/pr/src/misc/compile-et.pl index 9f0d90bc1..9f0d90bc1 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pr/src/misc/compile-et.pl +++ b/src/libs/xpcom18a4/nsprpub/pr/src/misc/compile-et.pl diff --git a/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.ksh b/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.ksh index 3af86d394..3af86d394 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.ksh +++ b/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.ksh diff --git a/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.sh b/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.sh index bb4a65eba..bb4a65eba 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.sh +++ b/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.sh diff --git a/src/libs/xpcom18a4/nsprpub/pr/tests/runy2ktests.ksh b/src/libs/xpcom18a4/nsprpub/pr/tests/runy2ktests.ksh index e7a325019..e7a325019 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pr/tests/runy2ktests.ksh +++ b/src/libs/xpcom18a4/nsprpub/pr/tests/runy2ktests.ksh diff --git a/src/libs/xpcom18a4/python/Makefile.kmk b/src/libs/xpcom18a4/python/Makefile.kmk index fe2aac6f2..efe3f69ac 100644 --- a/src/libs/xpcom18a4/python/Makefile.kmk +++ b/src/libs/xpcom18a4/python/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38093 2011-07-21 12:45:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for Python bindings # diff --git a/src/libs/xpcom18a4/python/src/VariantUtils.cpp b/src/libs/xpcom18a4/python/src/VariantUtils.cpp index 2cdc5553b..0c864ec46 100644 --- a/src/libs/xpcom18a4/python/src/VariantUtils.cpp +++ b/src/libs/xpcom18a4/python/src/VariantUtils.cpp @@ -1115,7 +1115,7 @@ PRBool PyXPCOM_InterfaceVariantHelper::Init(PyObject *obParams) // If not, its really an internal error rather than the user. if (PySequence_Length(m_pyparams) != total_params_needed) { #ifdef VBOX - PyErr_Format(PyExc_ValueError, "The type descriptions indicate %d args are needed, but %u were provided", + PyErr_Format(PyExc_ValueError, "The type descriptions indicate %d args are needed, but %ld were provided", total_params_needed, PySequence_Length(m_pyparams)); #else PyErr_Format(PyExc_ValueError, "The type descriptions indicate %d args are needed, but %d were provided", diff --git a/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/genstubs.pl b/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/genstubs.pl index b8962930d..b8962930d 100644..100755 --- a/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/genstubs.pl +++ b/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/genstubs.pl diff --git a/src/libs/xpcom18a4/xpcom/tools/analyze-xpcom-log.pl b/src/libs/xpcom18a4/xpcom/tools/analyze-xpcom-log.pl index 81ccb2123..81ccb2123 100644..100755 --- a/src/libs/xpcom18a4/xpcom/tools/analyze-xpcom-log.pl +++ b/src/libs/xpcom18a4/xpcom/tools/analyze-xpcom-log.pl diff --git a/src/recompiler/Makefile.kmk b/src/recompiler/Makefile.kmk index 5d478c2d9..19f052dc9 100644 --- a/src/recompiler/Makefile.kmk +++ b/src/recompiler/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 38082 2011-07-20 14:26:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # The Recompiler Sub-Makefile. # diff --git a/src/recompiler/Sun/config-host.h b/src/recompiler/Sun/config-host.h index 0c1288404..6768e9474 100644 --- a/src/recompiler/Sun/config-host.h +++ b/src/recompiler/Sun/config-host.h @@ -1,4 +1,4 @@ -/* $Id: config-host.h 37689 2011-06-29 16:01:23Z vboxsync $ */ +/* $Id: config-host.h $ */ /** @file * Sun host config - maintained by hand */ diff --git a/src/recompiler/Sun/config.h b/src/recompiler/Sun/config.h index 4e95d9148..79276c59b 100644 --- a/src/recompiler/Sun/config.h +++ b/src/recompiler/Sun/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h 36175 2011-03-04 16:21:09Z vboxsync $ */ +/* $Id: config.h $ */ /** @file * Sun config - Maintained by hand */ diff --git a/src/recompiler/Sun/crt/stdio.h b/src/recompiler/Sun/crt/stdio.h index 344a41378..ae14a4a14 100644 --- a/src/recompiler/Sun/crt/stdio.h +++ b/src/recompiler/Sun/crt/stdio.h @@ -1,4 +1,4 @@ -/* $Id: stdio.h 28800 2010-04-27 08:22:32Z vboxsync $ */ +/* $Id: stdio.h $ */ /** @file * Our minimal stdio */ diff --git a/src/recompiler/Sun/deftoimp.sed b/src/recompiler/Sun/deftoimp.sed index bbd8707fb..089a0d99b 100644 --- a/src/recompiler/Sun/deftoimp.sed +++ b/src/recompiler/Sun/deftoimp.sed @@ -1,4 +1,4 @@ -# $Id: deftoimp.sed 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: deftoimp.sed $ ## @file # SED script for generating a dummy .so from a windows .def file. # diff --git a/src/recompiler/Sun/kvm.h b/src/recompiler/Sun/kvm.h index dc203a645..153043b7b 100644 --- a/src/recompiler/Sun/kvm.h +++ b/src/recompiler/Sun/kvm.h @@ -1,4 +1,4 @@ -/* $Id: kvm.h 37675 2011-06-29 07:07:14Z vboxsync $ */ +/* $Id: kvm.h $ */ /** @file * VBox Recompiler - kvm stub header. */ diff --git a/src/recompiler/Sun/testmath.c b/src/recompiler/Sun/testmath.c index 83a39af5e..bc1d36157 100644 --- a/src/recompiler/Sun/testmath.c +++ b/src/recompiler/Sun/testmath.c @@ -1,4 +1,4 @@ -/* $Id: testmath.c 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: testmath.c $ */ /** @file * Testcase for the no-crt math stuff. */ diff --git a/src/recompiler/VBoxREM.def b/src/recompiler/VBoxREM.def index 836abd5e1..3d6d07b96 100644 --- a/src/recompiler/VBoxREM.def +++ b/src/recompiler/VBoxREM.def @@ -1,4 +1,4 @@ -; $Id: VBoxREM.def 38320 2011-08-04 19:16:53Z vboxsync $ +; $Id: VBoxREM.def $ ;; @file ; VBoxREM Definition File. ; diff --git a/src/recompiler/VBoxREMWrapper.cpp b/src/recompiler/VBoxREMWrapper.cpp index d4cb9167f..ef93cbedf 100644 --- a/src/recompiler/VBoxREMWrapper.cpp +++ b/src/recompiler/VBoxREMWrapper.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxREMWrapper.cpp 38364 2011-08-08 19:12:29Z vboxsync $ */ +/* $Id: VBoxREMWrapper.cpp $ */ /** @file * * VBoxREM Win64 DLL Wrapper. diff --git a/src/recompiler/VBoxREMWrapperA.asm b/src/recompiler/VBoxREMWrapperA.asm index 675145b9e..ba7cc770a 100644 --- a/src/recompiler/VBoxREMWrapperA.asm +++ b/src/recompiler/VBoxREMWrapperA.asm @@ -1,4 +1,4 @@ -; $Id: VBoxREMWrapperA.asm 28800 2010-04-27 08:22:32Z vboxsync $ +; $Id: VBoxREMWrapperA.asm $ ;; @file ; VBoxREM Wrapper, Assembly routines and wrapper Templates. ; diff --git a/src/recompiler/VBoxRecompiler.c b/src/recompiler/VBoxRecompiler.c index ec29c6a85..cfd10f5c8 100644 --- a/src/recompiler/VBoxRecompiler.c +++ b/src/recompiler/VBoxRecompiler.c @@ -1,4 +1,4 @@ -/* $Id: VBoxRecompiler.c 38326 2011-08-05 14:35:08Z vboxsync $ */ +/* $Id: VBoxRecompiler.c $ */ /** @file * VBox Recompiler - QEMU. */ diff --git a/src/testcase/Makefile.kmk b/src/testcase/Makefile.kmk index ea3b0a19d..128838a07 100644 --- a/src/testcase/Makefile.kmk +++ b/src/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for misc testcases. # diff --git a/src/testcase/tstRunTestcases.cpp b/src/testcase/tstRunTestcases.cpp index 4168b45bd..277b0a1ad 100644 --- a/src/testcase/tstRunTestcases.cpp +++ b/src/testcase/tstRunTestcases.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRunTestcases.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */ +/* $Id: tstRunTestcases.cpp $ */ /** @file * tstRunTestcases - Driver program for running VBox testcase (tst* testcase/tst*). */ |
