diff options
author | Felix Geyer <debfx-pkg@fobos.de> | 2010-10-12 15:58:30 +0200 |
---|---|---|
committer | Felix Geyer <debfx-pkg@fobos.de> | 2010-10-12 15:58:30 +0200 |
commit | 7f230f4ac2a1b544b47ded0584c22822b9bd65d7 (patch) | |
tree | ee5808929787047784013befd706131196a30d1d /src/VBox/Frontends | |
parent | adf97a4e6386ea334ce8d77f0cde3b92454b9fa5 (diff) | |
download | virtualbox-7f230f4ac2a1b544b47ded0584c22822b9bd65d7.tar.gz |
Imported Upstream version 3.2.10-dfsgupstream/3.2.10-dfsg
Diffstat (limited to 'src/VBox/Frontends')
39 files changed, 491 insertions, 448 deletions
diff --git a/src/VBox/Frontends/VBoxBFE/AutoCaller.h b/src/VBox/Frontends/VBoxBFE/AutoCaller.h index e429d6773..a9818f821 100644 --- a/src/VBox/Frontends/VBoxBFE/AutoCaller.h +++ b/src/VBox/Frontends/VBoxBFE/AutoCaller.h @@ -43,6 +43,12 @@ public: int rc() { return S_OK; } }; +class AutoReadLock +{ +public: + AutoReadLock(VirtualBoxBase *) {} +}; + class AutoWriteLock { public: diff --git a/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h b/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h index 1bd2ce053..e1caace6e 100644 --- a/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h +++ b/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h @@ -149,8 +149,8 @@ public: bool initialized() { return mfInitialized; } virtual void progressInfo(PVM pVM, unsigned uPercent, void *pvUser) = 0; virtual void resetKeys(void) = 0; - virtual VMMDev *getVMMDev() = 0; - virtual Display *getDisplay() = 0; + virtual VMMDev *getVMMDev() = 0; + virtual Display *getDisplay() = 0; protected: HKEYSTATE enmHKeyState; diff --git a/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp b/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp index 136616e69..5ebbf798f 100644 --- a/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp +++ b/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp @@ -39,6 +39,7 @@ #include <VBox/param.h> #include <VBox/pdm.h> #include <VBox/log.h> +#include <VBox/version.h> #include <iprt/path.h> #include <iprt/string.h> #include <iprt/initterm.h> @@ -1312,7 +1313,7 @@ void SDLConsole::updateTitlebar() char pszTitle[1024]; RTStrPrintf(pszTitle, sizeof(pszTitle), - "Sun VirtualBox%s%s", + VBOX_PRODUCT "%s%s", g_uProgressPercent == ~0U && machineState == VMSTATE_SUSPENDED ? " - [Paused]" : "", mfInputGrab ? " - [Input captured]": ""); @@ -1344,7 +1345,7 @@ void SDLConsole::updateTitlebar() } #endif /* DEBUG */ - SDL_WM_SetCaption(pszTitle, "Sun vXM VirtualBox"); + SDL_WM_SetCaption(pszTitle, VBOX_PRODUCT); } /** @@ -1355,8 +1356,8 @@ void SDLConsole::updateTitlebarProgress(const char *pszStr, int iPercent) { char szTitle[256]; AssertMsg(iPercent >= 0 && iPercent <= 100, ("%d\n", iPercent)); - RTStrPrintf(szTitle, sizeof(szTitle), "Sun VirtualBox - %s %d%%...", pszStr, iPercent); - SDL_WM_SetCaption(szTitle, "Sun VirtualBox"); + RTStrPrintf(szTitle, sizeof(szTitle), VBOX_PRODUCT " - %s %d%%...", pszStr, iPercent); + SDL_WM_SetCaption(szTitle, VBOX_PRODUCT); } /** diff --git a/src/VBox/Frontends/VBoxBFE/SDLConsole.h b/src/VBox/Frontends/VBoxBFE/SDLConsole.h index 94ae71c4f..897faae6f 100644 --- a/src/VBox/Frontends/VBoxBFE/SDLConsole.h +++ b/src/VBox/Frontends/VBoxBFE/SDLConsole.h @@ -112,8 +112,8 @@ public: virtual void eventQuit(); virtual void resetCursor(); virtual void resetKeys(void); - virtual VMMDev *getVMMDev(); - virtual Display *getDisplay(); + virtual VMMDev *getVMMDev(); + virtual Display *getDisplay(); private: diff --git a/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp b/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp index a49add1ac..e26016d18 100644 --- a/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp +++ b/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -428,7 +428,7 @@ extern "C" DECLEXPORT(int) TrustedMain (int argc, char **argv, char **envp) #endif int rc = VINF_SUCCESS; - RTPrintf("Sun VirtualBox Simple SDL GUI built %s %s\n", __DATE__, __TIME__); + RTPrintf(VBOX_PRODUCT " Simple SDL GUI built %s %s\n", __DATE__, __TIME__); // less than one parameter is not possible if (argc < 2) diff --git a/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp b/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp index 6fe5ce19c..0fb08f1a5 100644 --- a/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp +++ b/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp @@ -56,7 +56,7 @@ typedef struct DRVMAINVMMDEV { /** Pointer to the VMMDev object. */ - VMMDev *pVMMDev; + VMMDev *pVMMDev; /** Pointer to the driver instance structure. */ PPDMDRVINS pDrvIns; /** Pointer to the VMMDev port interface of the driver/device above us. */ diff --git a/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp b/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp index c7bd4d34a..df5ad05c5 100644 --- a/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp +++ b/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp @@ -81,6 +81,9 @@ static ISession *gSession = NULL; static IConsole *gConsole = NULL; static EventQueue *gEventQ = NULL; +/* flag whether frontend should terminate */ +static volatile bool g_fTerminateFE = false; + #ifdef VBOX_WITH_VNC static VNCFB *g_pFramebufferVNC; #endif @@ -89,26 +92,6 @@ static VNCFB *g_pFramebufferVNC; //////////////////////////////////////////////////////////////////////////////// /** - * State change event. - */ -class StateChangeEvent : public Event -{ -public: - StateChangeEvent(MachineState_T state) : mState(state) {} -protected: - void *handler() - { - LogFlow(("VBoxHeadless: StateChangeEvent: %d\n", mState)); - /* post the termination event if the machine has been PoweredDown/Saved/Aborted */ - if (mState < MachineState_Running) - gEventQ->postEvent(NULL); - return 0; - } -private: - MachineState_T mState; -}; - -/** * Callback handler for VirtualBox events */ class VirtualBoxCallback : @@ -345,7 +328,13 @@ public: STDMETHOD(OnStateChange)(MachineState_T machineState) { - gEventQ->postEvent(new StateChangeEvent(machineState)); + /* Terminate any event wait operation if the machine has been + * PoweredDown/Saved/Aborted. */ + if (machineState < MachineState_Running) + { + g_fTerminateFE = true; + gEventQ->interruptEventQueueProcessing(); + } return S_OK; } @@ -1150,30 +1139,35 @@ extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp) ComPtr <IProgress> progress; CHECK_ERROR_BREAK(console, PowerUp(progress.asOutParam())); - /* wait for result because there can be errors */ - /** @todo The error handling here is kind of peculiar, anyone care - * to comment why this works just fine? */ + /* + * Wait for the result because there can be errors. + * + * It's vital to process events while waiting (teleportation deadlocks), + * so we'll poll for the completion instead of waiting on it. + */ for (;;) { - rc = progress->WaitForCompletion(500); - if (FAILED(rc)) - break; - - /* Processing events is vital for teleportation targets. */ - gEventQ->processEventQueue(0); - BOOL fCompleted; rc = progress->COMGETTER(Completed)(&fCompleted); if (FAILED(rc) || fCompleted) break; + + /* Process pending events, then wait for new ones. Note, this + * processes NULL events signalling event loop termination. */ + gEventQ->processEventQueue(0); + if (!g_fTerminateFE) + gEventQ->processEventQueue(500); } if (SUCCEEDED(progress->WaitForCompletion(-1))) { + /* Figure out if the operation completed with a failed status + * and print the error message. Terminate immediately, and let + * the cleanup code take care of potentially pending events. */ LONG progressRc; progress->COMGETTER(ResultCode)(&progressRc); rc = progressRc; - if (FAILED(progressRc)) + if (FAILED(rc)) { com::ProgressErrorInfo info(progress); if (info.isBasicAvailable()) @@ -1184,6 +1178,7 @@ extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp) { RTPrintf("Error: failed to start machine. No error message available!\n"); } + break; } } @@ -1202,10 +1197,9 @@ extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp) Log(("VBoxHeadless: Waiting for PowerDown...\n")); - Event *e; - - while (gEventQ->waitForEvent(&e) && e) - gEventQ->handleEvent(e); + while ( !g_fTerminateFE + && RT_SUCCESS(gEventQ->processEventQueue(RT_INDEFINITE_WAIT))) + /* nothing */ ; Log(("VBoxHeadless: event loop has terminated...\n")); diff --git a/src/VBox/Frontends/VBoxManage/Makefile.kmk b/src/VBox/Frontends/VBoxManage/Makefile.kmk index 6c19cd66c..2fa9d362c 100644 --- a/src/VBox/Frontends/VBoxManage/Makefile.kmk +++ b/src/VBox/Frontends/VBoxManage/Makefile.kmk @@ -24,36 +24,13 @@ ifdef VBOX_ONLY_DOCS VBoxManage_DEFS += VBOX_ONLY_DOCS VBoxManage_SOURCES = \ VBoxManage.cpp \ - VBoxManageHelp.cpp + VBoxManageHelp.cpp \ + $(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \ + $(if $(VBOX_WITH_GUEST_CONTROL),VBoxManageGuestCtrl.cpp) VBoxManage_LIBS += $(LIB_RUNTIME) else # !VBOX_ONLY_DOCS VBoxManage_TEMPLATE = VBOXMAINCLIENTEXE - VBoxManage_DEFS += \ - $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \ - $(if $(VBOX_WITH_VRDP), VBOX_WITH_VRDP) \ - $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \ - $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \ - $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \ - $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \ - $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \ - $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \ - $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \ - $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \ - $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \ - $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \ - $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \ - $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE) \ - $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM) VBoxManage_DEFS.win = _WIN32_WINNT=0x0500 - ifdef VBOX_DYNAMIC_NET_ATTACH - VBoxManage_DEFS += VBOX_DYNAMIC_NET_ATTACH - endif - ifdef VBOX_WITH_NETFLT - VBoxManage_DEFS += VBOX_WITH_NETFLT - endif - ifdef VBOX_WITH_VIDEOHWACCEL - VBoxManage_DEFS += VBOX_WITH_VIDEOHWACCEL - endif VBoxManage_SOURCES = \ VBoxManage.cpp \ VBoxInternalManage.cpp \ @@ -74,6 +51,27 @@ else # !VBOX_ONLY_DOCS VBoxManageStorageController.cpp \ VBoxManageUSB.cpp endif # !VBOX_ONLY_DOCS + +VBoxManage_DEFS += \ + $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \ + $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \ + $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \ + $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \ + $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \ + $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \ + $(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM) \ + $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \ + $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \ + $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \ + $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \ + $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \ + $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \ + $(if $(VBOX_WITH_VDE), VBOX_WITH_VDE) \ + $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \ + $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \ + $(if $(VBOX_WITH_VRDP), VBOX_WITH_VRDP) \ + $(if $(VBOX_DYNAMIC_NET_ATTACH), VBOX_DYNAMIC_NET_ATTACH) + ifneq ($(KBUILD_TARGET),win) # Workaround for buggy gcc-4.3 compilers, see # diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp index e3185164d..8e54fc296 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp @@ -291,7 +291,12 @@ int main(int argc, char *argv[]) { char *converted; RTStrCurrentCPToUtf8(&converted, argv[i]); - argv[i] = converted; + if (converted) + argv[i] = converted; + else + /* 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]); } do diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.h b/src/VBox/Frontends/VBoxManage/VBoxManage.h index c624df2be..1e9023bf0 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManage.h +++ b/src/VBox/Frontends/VBoxManage/VBoxManage.h @@ -163,12 +163,16 @@ int handleModifyVM(HandlerArg *a); /* VBoxManageGuestProp.cpp */ extern void usageGuestProperty(void); + +/* VBoxManageGuestCtrl.cpp */ +extern void usageGuestControl(void); + #ifndef VBOX_ONLY_DOCS +/* VBoxManageGuestProp.cpp */ extern int handleGuestProperty(HandlerArg *a); /* VBoxManageGuestCtrl.cpp */ extern int handleGuestControl(HandlerArg *a); -extern void usageGuestControl(void); /* VBoxManageVMInfo.cpp */ void showSnapshots(ComPtr<ISnapshot> &rootSnapshot, diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp index c8a57fe48..e043e8288 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp @@ -1,6 +1,6 @@ /* $Id: VBoxManageDisk.cpp $ */ /** @file - * VBoxManage - The disk delated commands. + * VBoxManage - The disk related commands. */ /* @@ -254,7 +254,7 @@ int handleCreateHardDisk(HandlerArg *a) } /* check the outcome */ - if ( !filename + if ( filename.isEmpty() || sizeMB == 0) return errorSyntax(USAGE_CREATEHD, "Parameters --filename and --size are required"); @@ -778,7 +778,8 @@ int handleConvertFromRaw(int argc, char *argv[]) if (!srcfilename) { srcfilename = ValueUnion.psz; -#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) +// If you change the OS list here don't forget to update VBoxManageHelp.cpp. +#ifndef RT_OS_WINDOWS fReadFromStdIn = !strcmp(srcfilename, "stdin"); #endif } @@ -1013,7 +1014,7 @@ int handleAddiSCSIDisk(HandlerArg *a) } /* check for required options */ - if (!server || !target) + if (server.isEmpty() || target.isEmpty()) return errorSyntax(USAGE_ADDISCSIDISK, "Parameters --server and --target are required"); do @@ -1203,7 +1204,7 @@ int handleShowHardDiskInfo(HandlerArg *a) Bstr description; hardDisk->COMGETTER(Description)(description.asOutParam()); - if (description) + if (!description.isEmpty()) { RTPrintf("Description: %lS\n", description.raw()); } diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp index d289b3ab0..38b0be559 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp @@ -20,6 +20,9 @@ * Header Files * *******************************************************************************/ #include "VBoxManage.h" +#include <iprt/stream.h> + +#ifndef VBOX_ONLY_DOCS #include <VBox/com/com.h> #include <VBox/com/string.h> @@ -35,7 +38,6 @@ #include <VBox/log.h> #include <iprt/asm.h> #include <iprt/getopt.h> -#include <iprt/stream.h> #include <iprt/string.h> #include <iprt/time.h> #include <iprt/thread.h> @@ -62,6 +64,8 @@ using namespace com; /** Set by the signal handler. */ static volatile bool g_fExecCanceled = false; +#endif /* !VBOX_ONLY_DOCS */ + void usageGuestControl(void) { RTPrintf("VBoxManage guestcontrol execute <vmname>|<uuid>\n" @@ -74,6 +78,8 @@ void usageGuestControl(void) "\n"); } +#ifndef VBOX_ONLY_DOCS + /** * Signal handler that sets g_fCanceled. * @@ -554,3 +560,5 @@ int handleGuestControl(HandlerArg *a) /* default: */ return errorSyntax(USAGE_GUESTCONTROL, "Incorrect parameters"); } + +#endif /* !VBOX_ONLY_DOCS */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp index 30d4cf051..00670cfdc 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-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; @@ -20,6 +20,9 @@ * Header Files * *******************************************************************************/ #include "VBoxManage.h" +#include <iprt/stream.h> + +#ifndef VBOX_ONLY_DOCS #include <VBox/com/com.h> #include <VBox/com/string.h> @@ -32,7 +35,6 @@ #include <VBox/log.h> #include <iprt/asm.h> -#include <iprt/stream.h> #include <iprt/string.h> #include <iprt/time.h> #include <iprt/thread.h> @@ -187,6 +189,8 @@ NS_DECL_CLASSINFO(GuestPropertyCallback) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(GuestPropertyCallback, IVirtualBoxCallback) #endif /* VBOX_WITH_XPCOM */ +#endif /* !VBOX_ONLY_DOCS */ + void usageGuestProperty(void) { RTPrintf("VBoxManage guestproperty get <vmname>|<uuid>\n" @@ -203,6 +207,8 @@ void usageGuestProperty(void) "\n"); } +#ifndef VBOX_ONLY_DOCS + static int handleGetGuestProperty(HandlerArg *a) { HRESULT rc = S_OK; @@ -240,11 +246,11 @@ static int handleGetGuestProperty(HandlerArg *a) Bstr flags; CHECK_ERROR(machine, GetGuestProperty(Bstr(a->argv[1]), value.asOutParam(), &u64Timestamp, flags.asOutParam())); - if (!value) + if (value.isEmpty()) RTPrintf("No value set!\n"); - if (value) + else RTPrintf("Value: %lS\n", value.raw()); - if (value && verbose) + if (!value.isEmpty() && verbose) { RTPrintf("Timestamp: %lld\n", u64Timestamp); RTPrintf("Flags: %lS\n", flags.raw()); @@ -516,3 +522,5 @@ int handleGuestProperty(HandlerArg *a) /* default: */ return errorSyntax(USAGE_GUESTPROPERTY, "Incorrect parameters"); } + +#endif /* !VBOX_ONLY_DOCS */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp index 485dbd00b..b43a035e9 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp @@ -163,6 +163,7 @@ void printUsage(USAGECATEGORY u64Cmd) " [--pae on|off]\n" " [--hpet on|off]\n" " [--hwvirtex on|off]\n" + " [--hwvirtexexcl on|off]\n" " [--nestedpaging on|off]\n" " [--largepages on|off]\n" " [--vtxvpid on|off]\n" @@ -511,9 +512,11 @@ void printUsage(USAGECATEGORY u64Cmd) RTPrintf("VBoxManage convertfromraw <filename> <outputfile>\n" " [--format VDI|VMDK|VHD]\n" " [--variant Standard,Fixed,Split2G,Stream,ESX]\n" +#ifndef RT_OS_WINDOWS "VBoxManage convertfromraw stdin <outputfile> <bytes>\n" " [--format VDI|VMDK|VHD]\n" " [--variant Standard,Fixed,Split2G,Stream,ESX]\n" +#endif "\n"); } diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp index 2ba5908c9..c32f3d6f3 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-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; @@ -230,7 +230,7 @@ int handleCreateVM(HandlerArg *a) else return errorSyntax(USAGE_CREATEVM, "Invalid parameter '%s'", Utf8Str(a->argv[i]).raw()); } - if (!name) + if (name.isEmpty()) return errorSyntax(USAGE_CREATEVM, "Parameter --name is required"); if (!baseFolder.isEmpty() && !settingsFile.isEmpty()) diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp index 9fa430857..e0de2d909 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-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; @@ -359,7 +359,7 @@ int handleUSBFilter (HandlerArg *a) || ( !cmd.mGlobal && !cmd.mMachine) || ( cmd.mGlobal - && cmd.mFilter.mRemote) + && !cmd.mFilter.mRemote.isEmpty()) ) { return errorSyntax(USAGE_USBFILTER_ADD, "Mandatory options not supplied"); diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp index 06d65e80d..216025bac 100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp @@ -4065,7 +4065,7 @@ static void UpdateTitlebar(TitlebarMode mode, uint32_t u32User) gMachine->COMGETTER(Name)(name.asOutParam()); RTStrPrintf(szTitle, sizeof(szTitle), "%s - " VBOX_PRODUCT, - name ? Utf8Str(name).raw() : "<noname>"); + !name.isEmpty() ? Utf8Str(name).raw() : "<noname>"); /* which mode are we in? */ switch (mode) diff --git a/src/VBox/Frontends/VBoxShell/vboxinfo.vb b/src/VBox/Frontends/VBoxShell/vboxinfo.vb index 87340beba..e0d79249a 100644 --- a/src/VBox/Frontends/VBoxShell/vboxinfo.vb +++ b/src/VBox/Frontends/VBoxShell/vboxinfo.vb @@ -1,5 +1,5 @@ '
-' Copyright (C) 2009 Sun Microsystems, Inc.
+' Copyright (C) 2009-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;
@@ -9,10 +9,6 @@ ' VirtualBox OSE distribution. VirtualBox OSE is distributed in the
' hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
'
-' Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
-' Clara, CA 95054 USA or visit http://www.sun.com if you need
-' additional information or have any questions.
-'
Imports System
Imports System.Drawing
Imports System.Windows.Forms
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index 340ca5fdb..dcc3c53b0 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -127,7 +127,8 @@ VirtualBox_DEFS += \ $(if $(VBOX_WITH_SOLARIS_OSS),VBOX_WITH_SOLARIS_OSS) \ $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \ $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \ - $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) + $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \ + $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI) ifdef VBOX_WITH_DEBUGGER_GUI VirtualBox_DEFS += VBOX_WITH_DEBUGGER_GUI if "$(KBUILD_TYPE)" != "release" @@ -236,6 +237,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) VirtualBox_LIBS.win += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib VirtualBox_LIBS.solaris += GL VirtualBox_LIBS.linux += GL + VirtualBox_LIBS.freebsd += GL endif # Headers containing definitions of classes that use the Q_OBJECT macro. @@ -821,7 +823,7 @@ endif # darwin # App for testing GL support # if defined(VBOX_WITH_VIDEOHWACCEL) - if1of ($(KBUILD_TARGET), win linux) + if1of ($(KBUILD_TARGET), win linux freebsd) LIBRARIES += VBoxOGL2D VBoxOGL2D_TEMPLATE = VBOXR3STATIC VBoxOGL2D_USES = qt4 diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc index d88c54dbd..02d66661a 100644 --- a/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc +++ b/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc @@ -228,6 +228,7 @@ <file alias="chipset_disabled_16px.png">images/chipset_disabled_16px.png</file> <file alias="chipset_disabled_32px.png">images/chipset_disabled_32px.png</file> <file alias="pin_16px.png">images/pin_16px.png</file> + <file alias="minimize_16px.png">images/minimize_16px.png</file> <file alias="restore_16px.png">images/restore_16px.png</file> <file alias="close_16px.png">images/close_16px.png</file> </qresource> diff --git a/src/VBox/Frontends/VirtualBox/images/minimize_16px.png b/src/VBox/Frontends/VirtualBox/images/minimize_16px.png Binary files differnew file mode 100644 index 000000000..611a5ddd9 --- /dev/null +++ b/src/VBox/Frontends/VirtualBox/images/minimize_16px.png diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts index 9e81e1fd5..4732720df 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts @@ -1297,11 +1297,6 @@ <source>The recommended base memory size is <b>%1</b> MB.</source> <translation>Die empfohlene Hauptspeichergröße beträgt <b>%1</b> MB.</translation> </message> - <message> - <source>MB</source> - <comment>size suffix MBytes=1024 KBytes</comment> - <translation>MB</translation> - </message> </context> <context> <name>UINewVMWzdPage4</name> @@ -1364,11 +1359,6 @@ <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>Klicken Sie auf <b>%1</b>, wenn alle oben angegebenen Einstellungen richtig sind. Damit wird eine neue virtuelle Maschine erzeugt.</p></p>Sie können diese und andere Einstellungen der virtuellen Maschine jederzeit im Dialog <b>Einstellungen</b> ausgehend vom Hauptfenster ändern.</p></translation> </message> - <message> - <source>MB</source> - <comment>size suffix MBytes=1024KBytes</comment> - <translation>MB</translation> - </message> </context> <context> <name>VBoxAboutDlg</name> @@ -1488,11 +1478,6 @@ <translation>Warnungen:</translation> </message> <message> - <source>MB</source> - <comment>size suffix MBytes=1024 KBytes</comment> - <translation>MB</translation> - </message> - <message> <source>Hard Disk Controller (SAS)</source> <translation>Festplatten-Controller SAS</translation> </message> @@ -1673,7 +1658,7 @@ </message> <message> <source>&Auto show Dock and Menubar in fullscreen</source> - <translation>&Automatisch zeige Dock && Menubar im Fullscreen-Modus</translation> + <translation>Dock && Menubar im Vollbildmodus &automatisch zeigen</translation> </message> </context> <context> @@ -3070,11 +3055,6 @@ <translation>Nested Paging</translation> </message> <message> - <source>^(?:(?:(\d+)(?:\s?(B|KB|MB|GB|TB|PB))?)|(?:(\d*)%1(\d{1,2})(?:\s?(KB|MB|GB|TB|PB))))$</source> - <comment>regexp for matching ####[.##] B|KB|MB|GB|TB|PB, %1=decimal point</comment> - <translation></translation> - </message> - <message> <source>B</source> <comment>size suffix Bytes</comment> <translation></translation> @@ -3107,7 +3087,7 @@ <message> <source>Shareable</source> <comment>DiskType</comment> - <translation type="unfinished"></translation> + <translation>Gemeinsam benutzbar</translation> </message> <message> <source>Unknown device</source> @@ -3119,6 +3099,11 @@ <comment>New Storage UI : Slot Name</comment> <translation>SAS-Port %1</translation> </message> + <message> + <source>MB</source> + <comment>size suffix MBytes=1024KBytes</comment> + <translation>MB</translation> + </message> </context> <context> <name>VBoxGlobalSettings</name> @@ -3383,6 +3368,10 @@ <source>Close VM</source> <translation>VM beenden</translation> </message> + <message> + <source>Minimize Window</source> + <translation>Anwendung minimieren</translation> + </message> </context> <context> <name>VBoxNetworkDialog</name> @@ -5136,6 +5125,14 @@ <source><qt>%1</qt></source> <translation></translation> </message> + <message> + <source>Specifies whether multiple simultaneous connections to the VM are permitted.</source> + <translation>Legt fest ob mehrere gleichzeitige Verbindungen zur VM erlaubt sind.</translation> + </message> + <message> + <source>Allow Multiple Connections</source> + <translation>Gleichzeitige Verbindungen erlauben</translation> + </message> </context> <context> <name>VBoxVMSettingsDlg</name> @@ -5145,7 +5142,7 @@ </message> <message> <source>Storage</source> - <translation>Plattenspeicher</translation> + <translation>Massenspeicher</translation> </message> <message> <source>Hard Disks</source> @@ -5204,10 +5201,6 @@ <translation>haben Sie ein 64-Bit-Gastbestriebssystem ausgewählt. Da solche Gäste Hardwarevirtualisierung benötigen (VT-x/AMD-V), wird diese VM-Einstellung automatisch aktiviert.</translation> </message> <message> - <source>you have selected a 64-bit guest OS type for this VM. VirtualBox does not currently support more than one virtual CPU for 64-bit guests executed on 32-bit hosts.</source> - <translation>haben Sie einen 64-Bit Gastbetriebssystem für diese VM ausgewählt. VirtualBox unterstützt momentan nur eine virtuelle CPU für 64-Bit-Gäste auf 32-Bit Hosts.</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>haben Sie 2D-Video-Beschleunigung aktiviert. Diese Funktion wird momentan nur für Windows-Gäste unterstützt und wird daher deaktiviert.</translation> </message> @@ -5514,10 +5507,6 @@ <translation>SAS-Controller</translation> </message> <message> - <source>Storage Controller</source> - <translation></translation> - </message> - <message> <source>Allows to use host I/O caching capabilities.</source> <translation>Benutze den Host-I/O-Cache.</translation> </message> @@ -5525,10 +5514,6 @@ <source>Use host I/O cache</source> <translation>Host I/O-Cache verwenden</translation> </message> - <message> - <source>Storage Controller 1</source> - <translation>Speicher-Controller 1</translation> - </message> </context> <context> <name>VBoxVMSettingsNetwork</name> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts index c0a89046d..5859bbc17 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts @@ -667,61 +667,61 @@ </message> <message> <source>Enter &Fullscreen Mode</source> - <translation type="unfinished"></translation> + <translation>&Teljes képernyőre váltás</translation> </message> <message> <source>Exit &Fullscreen Mode</source> - <translation type="unfinished"></translation> + <translation>Kilépés a &teljes képernyős módból</translation> </message> <message> <source>Switch to normal mode</source> - <translation type="unfinished"></translation> + <translation>Normál módra váltás</translation> </message> <message> <source>Enter Seam&less Mode</source> - <translation type="unfinished"></translation> + <translation>Váltás aszta&l-integrációs módra</translation> </message> <message> <source>Exit Seam&less Mode</source> - <translation type="unfinished"></translation> + <translation>Kilépés az aszta&l-integrációs módból</translation> </message> <message> <source>Enable &Guest Display Auto-resize</source> - <translation type="unfinished"></translation> + <translation>Vendé&g képernyőjének automata átméretezése</translation> </message> <message> <source>Disable &Guest Display Auto-resize</source> - <translation type="unfinished"></translation> + <translation>Vendé&g képernyőjének automata átméretezésének tiltása</translation> </message> <message> <source>Disable automatic resize of the guest display when the window is resized</source> - <translation type="unfinished"></translation> + <translation>Letiltja a vendég gép képernyőjének automatikus méretezesét az ablakának méretezésekor</translation> </message> <message> <source>&Enable Remote Display</source> - <translation type="unfinished"></translation> + <translation>Távoli képernyő &engedélyezése</translation> </message> <message> <source>Enable remote desktop (RDP) connections to this machine</source> - <translation type="unfinished"></translation> + <translation>RDP kapcsolatok engedélyezése ehhez a géphez</translation> </message> <message> <source>&Disable Remote Display</source> - <translation type="unfinished"></translation> + <translation>Távoli képernyő &tiltása</translation> </message> <message> <source>Disable remote desktop (RDP) connections to this machine</source> - <translation type="unfinished"></translation> + <translation>RDP kapcsolatok tiltása ehhez a géphez</translation> </message> <message> <source>Enable &Logging...</source> <comment>debug action</comment> - <translation type="unfinished"></translation> + <translation>Nap&lózás engedélyezése...</translation> </message> <message> <source>Disable &Logging...</source> <comment>debug action</comment> - <translation type="unfinished"></translation> + <translation>Nap&lózás tiltása...</translation> </message> </context> <context> @@ -7618,12 +7618,12 @@ to the system default language.</qt> <message> <source>&File</source> <comment>Mac OS X version</comment> - <translation type="unfinished">&Fájl</translation> + <translation>&Fájl</translation> </message> <message> <source>&File</source> <comment>Non Mac OS X version</comment> - <translation type="unfinished">&Fájl</translation> + <translation>&Fájl</translation> </message> </context> <context> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts index f0d378469..249d8e67e 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts @@ -107,7 +107,7 @@ <name>QIFileDialog</name> <message> <source>Select a directory</source> - <translation>Pasirinkti aplanką</translation> + <translation>Pasirinkti katalogą</translation> </message> <message> <source>Select a file</source> @@ -496,11 +496,11 @@ </message> <message> <source>&Devices</source> - <translation>Į&renginiai</translation> + <translation>Į&taisai</translation> </message> <message> <source>&CD/DVD Devices</source> - <translation>&CD/DVD įrenginiai</translation> + <translation>&CD/DVD įtaisai</translation> </message> <message> <source>&Floppy Devices</source> @@ -508,7 +508,7 @@ </message> <message> <source>&USB Devices</source> - <translation>&USB įrenginiai</translation> + <translation>&USB įtaisai</translation> </message> <message> <source>&Network Adapters...</source> @@ -722,6 +722,7 @@ </message> <message> <source>&Bucket:</source> + <translatorcomment>Virtual storage unit on a cloud-based bulk data storage, like Amazon S3.</translatorcomment> <translation type="unfinished"></translation> </message> <message> @@ -830,7 +831,7 @@ </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>Jei aukščiau esantys duomenys yra tinkami, spauskite mygtuką <b>Užbaigti</b>. Tuomet pasirinkta laikmena laikinai bus prijungta prie virtualios mašinos ir paleista.</p><p>Atminkite, kad užvėrus virtualią mašiną, ši laikmena bus atjungta, o įkrovos pirmenybė suteikta pirmajam standžiajam diskui.</p><p>Priklausomai nuo diegimo programos, gali tekti rankiniu būdu pašalinti (atjungti) laikmeną po sistemos persikrovimo, taip siekiant išvengti pakartotinio tos programos paleidimo. Tai galite padaryti pasirinkdami atitinkamą <b>Atjungti...</b> veiksmą iš <b>Įrenginių</b> meniu.</p></translation> + <translation><p>Jei aukščiau esantys duomenys yra tinkami, spauskite mygtuką <b>Užbaigti</b>. Tuomet pasirinkta laikmena laikinai bus prijungta prie virtualios mašinos ir paleista.</p><p>Atminkite, kad užvėrus virtualią mašiną, ši laikmena bus atjungta, o įkrovos pirmenybė suteikta pirmajam standžiajam diskui.</p><p>Priklausomai nuo diegimo programos, gali tekti rankiniu būdu pašalinti (atjungti) laikmeną po sistemos paleidimo iš naujo, taip siekiant išvengti pakartotinio tos programos paleidimo. Tai galite padaryti pasirinkdami atitinkamą <b>Atjungti...</b> veiksmą iš <b>Įtaisų</b> meniu.</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> @@ -842,7 +843,7 @@ </message> <message> <source>CD/DVD-ROM Device</source> - <translation>CD/DVD įrenginys</translation> + <translation>CD/DVD įtaisas</translation> </message> <message> <source>Type</source> @@ -945,13 +946,13 @@ <source><p style='white-space:pre'><nobr>Indicates the activity of the CD/DVD devices:</nobr>%1</p></source> <comment>CD/DVD tooltip </comment> - <translation><p style='white-space:pre'><nobr>Rodo CD/DVD įrenginių aktyvumą:</nobr>%1</p></translation> + <translation><p style='white-space:pre'><nobr>Rodo CD/DVD įtaisų aktyvumą:</nobr>%1</p></translation> </message> <message> <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy devices:</nobr>%1</p></source> <comment>FD tooltip </comment> - <translation><p style='white-space:pre'><nobr>Rodo diskelių įrenginių aktyvumą:</nobr>%1</p></translation> + <translation><p style='white-space:pre'><nobr>Rodo diskelių įtaisų aktyvumą:</nobr>%1</p></translation> </message> <message> <source><p style='white-space:pre'><nobr>Indicates the activity of the network interfaces:</nobr>%1</p></source> @@ -986,13 +987,13 @@ <source><p style='white-space:pre'><nobr>Indicates the activity of the attached USB devices:</nobr>%1</p></source> <comment>USB device tooltip </comment> - <translation><p style='white-space:pre'><nobr>Rodo prijungtų USB įrenginių aktyvumą:</nobr>%1</p></translation> + <translation><p style='white-space:pre'><nobr>Rodo prijungtų USB įtaisų aktyvumą:</nobr>%1</p></translation> </message> <message> <source><br><nobr><b>No USB devices attached</b></nobr></source> <comment>USB device tooltip </comment> - <translation><br><nobr><b>Neprijungtas joks USB įrenginys</b></nobr></translation> + <translation><br><nobr><b>Neprijungtas joks USB įtaisas</b></nobr></translation> </message> <message> <source><br><nobr><b>USB Controller is disabled</b></nobr></source> @@ -1065,7 +1066,7 @@ </message> <message> <source>Unmount CD/DVD Device</source> - <translation>Atjungti CD/DVD įrenginį</translation> + <translation>Atjungti CD/DVD įtaisą</translation> </message> <message> <source>More Floppy Images...</source> @@ -1073,7 +1074,7 @@ </message> <message> <source>Unmount Floppy Device</source> - <translation>Atjungti diskelių įrenginį</translation> + <translation>Atjungti diskelių įtaisą</translation> </message> <message> <source>No CD/DVD Devices Attached</source> @@ -1085,7 +1086,7 @@ </message> <message> <source>No Floppy Devices Attached</source> - <translation>Neprijungtas joks diskelių įrenginys</translation> + <translation>Neprijungtas joks diskelių įtaisas</translation> </message> <message> <source>No floppy devices attached to that VM</source> @@ -1093,11 +1094,11 @@ </message> <message> <source>No USB Devices Connected</source> - <translation>Neprijungtas joks USB įrenginys</translation> + <translation>Neprijungtas joks USB įtaisas</translation> </message> <message> <source>No supported devices connected to the host PC</source> - <translation>Prie kompiuterio nėra prijungtų palaikomų įrenginių</translation> + <translation>Prie kompiuterio nėra prijungtų palaikomų įtaisų</translation> </message> </context> <context> @@ -2104,7 +2105,7 @@ IPv6.</translation> <source>Unknown device %1:%2</source> <comment>USB device details </comment> - <translation>Nežinomas įrenginys %1:%2</translation> + <translation>Nežinomas įtaisas %1:%2</translation> </message> <message> <source><nobr>Vendor ID: %1</nobr><br><nobr>Product ID: %2</nobr><br><nobr>Revision: %3</nobr></source> @@ -2230,7 +2231,7 @@ IPv6.</translation> <source>Device Filters</source> <comment>details report (USB) </comment> - <translation>Įrenginių filtras</translation> + <translation>Įtaisų filtras</translation> </message> <message> <source>%1 (%2 active)</source> @@ -2362,11 +2363,13 @@ IPv6.</translation> <source>Immutable</source> <comment>DiskType </comment> - <translation>Nekintamas</translation> + <translatorcomment>the contents of immutable disk are read-only. Any data written by guest operating system to animmutable disk are stored in a separate diffirencing disk image. </translatorcomment> + <translation type="unfinished">Tik skaitomas</translation> </message> <message> <source>Writethrough</source> <comment>DiskType</comment> + <translatorcomment>Writetrough disk images allow read and write operations to be performed on the disk image. When virtual machine is powered off or reset, however, the state of disk image is not saved, thereby reverting to its original state next timethe virtual machine starts.</translatorcomment> <translation type="unfinished"></translation> </message> <message> @@ -2431,7 +2434,7 @@ IPv6.</translation> <message> <source>CoreAudio</source> <comment>AudioDriverType</comment> - <translation type="unfinished"></translation> + <translation>CoreAudio</translation> </message> <message> <source>Not attached</source> @@ -2442,7 +2445,7 @@ IPv6.</translation> <message> <source>NAT</source> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>NAT</translation> </message> <message> <source>Internal Network</source> @@ -2496,13 +2499,13 @@ IPv6.</translation> <source>Host To Guest</source> <comment>ClipboardType </comment> - <translation>Iš kompiuterio į svečią</translation> + <translation>Iš pagr. kompiuterio į svečią</translation> </message> <message> <source>Guest To Host</source> <comment>ClipboardType </comment> - <translation>Iš svečio į kompiuterį</translation> + <translation>Iš svečio į pagr. kompiuterį</translation> </message> <message> <source>Bidirectional</source> @@ -2562,13 +2565,13 @@ IPv6.</translation> <source>Host Pipe</source> <comment>PortMode </comment> - <translation>Kompiuterio kanalas</translation> + <translation>Pagr. kompiuterio kanalas</translation> </message> <message> <source>Host Device</source> <comment>PortMode </comment> - <translation>Kompiuterio įrenginys</translation> + <translation>Pagr. kompiuterio įtaisas</translation> </message> <message> <source>User-defined</source> @@ -2616,7 +2619,7 @@ IPv6.</translation> <source>Host Driver</source> <comment>details report (audio) </comment> - <translation>Kompiuterio tvarkyklė</translation> + <translation>Pagr. kompiuterio tvarkyklė</translation> </message> <message> <source>Controller</source> @@ -2838,7 +2841,7 @@ IPv6.</translation> <source>Differencing</source> <comment>DiskType </comment> - <translation>Vediniai</translation> + <translation>Vedinys</translation> </message> <message> <source>Nested Paging</source> @@ -2908,7 +2911,7 @@ IPv6.</translation> <message> <source>Bridged adapter, %1</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>Tinklų tiltas, %1</translation> </message> <message> <source>Host-only adapter, '%1'</source> @@ -2924,12 +2927,12 @@ IPv6.</translation> <message> <source>Bridged Adapter</source> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>Tinklų tiltas</translation> </message> <message> <source>Host-only Adapter</source> <comment>NetworkAttachmentType</comment> - <translation>Plokštė prisijungimui tik prie pagrindinio kompiuterio</translation> + <translation>Plokštė prisijungimui tik prie pagr. kompiuterio</translation> </message> <message> <source><nobr>%1 MB</nobr></source> @@ -3063,7 +3066,7 @@ IPv6.</translation> <source>Device %1</source> <comment>StorageBusDevice </comment> - <translation>%1 įrenginys</translation> + <translation>%1 įtaisas</translation> </message> <message> <source>IDE Primary Master</source> @@ -3105,7 +3108,7 @@ IPv6.</translation> <source>Floppy Device %1</source> <comment>New Storage UI : Slot Name </comment> - <translation>%1 diskelių įrenginys</translation> + <translation>%1 diskelių įtaisas</translation> </message> <message> <source>Paravirtualized Network (virtio-net)</source> @@ -3127,12 +3130,12 @@ IPv6.</translation> <message> <source>Host Drive '%1'</source> <comment>medium</comment> - <translation>Pagrindinio kompiuterio įrenginys „%1“</translation> + <translation>Pagrindinio kompiuterio įtaisas „%1“</translation> </message> <message> <source>Host Drive %1 (%2)</source> <comment>medium</comment> - <translation>Pagrindinio kompiuterio įrenginys %1 (%2)</translation> + <translation>Pagrindinio kompiuterio įtaisas %1 (%2)</translation> </message> <message> <source><p style=white-space:pre>Type (Format): %1 (%2)</p></source> @@ -3337,7 +3340,7 @@ IPv6.</translation> <message> <source>Unknown device</source> <comment>USB device details</comment> - <translation>Nežinomas įrenginys</translation> + <translation>Nežinomas įtaisas</translation> </message> <message> <source>SAS Port %1</source> @@ -3771,11 +3774,11 @@ IPv6.</translation> </message> <message> <source>Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.</source> - <translation>Nepavyko prijungti USB įrenginio <b>%1</b> prie virtualios mašinos <b>%2</b>.</translation> + <translation>Nepavyko prijungti USB įtaiso <b>%1</b> prie virtualios mašinos <b>%2</b>.</translation> </message> <message> <source>Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.</source> - <translation>Nepavyko atjungti USB įrenginio <b>%1</b> nuo virtualios mašinos <b>%2</b>.</translation> + <translation>Nepavyko atjungti USB įtaiso <b>%1</b> nuo virtualios mašinos <b>%2</b>.</translation> </message> <message> <source>Failed to create the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.</source> @@ -3869,7 +3872,7 @@ IPv6.</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>Nepavyksta rasti <b>%1</b> kalbos rinkmenos aplanke <b><nobr>%2</nobr></b>.</p><p>Laikinai bus naudojama sistemos numatytoji kalba. Eikite į <b>nuostatas</b> per <b>rinkmenos</b> meniu, esantį pagrindiniame VirtualBox lange, ir pasirinkite egzistuojančią kalbą <b>kalbos</b> kortelėje.</p></translation> + <translation><p>Nepavyksta rasti <b>%1</b> kalbos rinkmenos kataloge <b><nobr>%2</nobr></b>.</p><p>Laikinai bus naudojama sistemos numatytoji kalba. Eikite į <b>nuostatas</b> per <b>rinkmenos</b> meniu, esantį pagrindiniame VirtualBox lange, ir pasirinkite egzistuojančią kalbą <b>kalbos</b> kortelėje.</p></translation> </message> <message> <source><p>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> @@ -3877,15 +3880,15 @@ IPv6.</translation> </message> <message> <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source> - <translation><p>Įdiegtieji VirtualBox svečio papildiniai yra per seni: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Kai kurios funkcijos (pelės integravimas, svečio ekrano dydžio automatinis keitimas) gali neveikti tinkamai.</p><p>Atnaujinkite svečio papildinius iki tinkamos versijos nuspaudę <b>Įdiegti svečio papildinius</b> iš <b>įrenginių</b> meniu.</p></translation> + <translation><p>Įdiegtieji VirtualBox svečio papildiniai yra per seni: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Kai kurios funkcijos (pelės integravimas, svečio ekrano dydžio automatinis keitimas) gali neveikti tinkamai.</p><p>Atnaujinkite svečio papildinius iki tinkamos versijos nuspaudę <b>Įdiegti svečio papildinius</b> iš <b>įtaisų</b> meniu.</p></translation> </message> <message> <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source> - <translation><p>Įdiegtieji VirtualBox svečio papildiniai nėra patys naujausi: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Kai kurios funkcijos (pelės integravimas, svečio ekrano dydžio automatinis keitimas) gali neveikti tinkamai.</p><p>Patariama atnaujinti svečio papildinius iki tinkamos versijos nuspaudus <b>Įdiegti svečio papildinius</b> iš <b>įrenginių</b> meniu.</p></translation> + <translation><p>Įdiegtieji VirtualBox svečio papildiniai nėra patys naujausi: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Kai kurios funkcijos (pelės integravimas, svečio ekrano dydžio automatinis keitimas) gali neveikti tinkamai.</p><p>Patariama atnaujinti svečio papildinius iki tinkamos versijos nuspaudus <b>Įdiegti svečio papildinius</b> iš <b>įtaisų</b> meniu.</p></translation> </message> <message> <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source> - <translation><p>Įdiegtieji VirtualBox svečio papildiniai yra per nauji: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Negalima naudoti naujesnių svečio papildinių už versiją, kurią palaiko VirtualBox.</p><p>Atnaujinkite svečio papildinius iki tinkamos versijos nuspaudę <b>Įdiegti svečio papildinius</b> iš <b>įrenginių</b> meniu.</p></translation> + <translation><p>Įdiegtieji VirtualBox svečio papildiniai yra per nauji: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Negalima naudoti naujesnių svečio papildinių už versiją, kurią palaiko VirtualBox.</p><p>Atnaujinkite svečio papildinius iki tinkamos versijos nuspaudę <b>Įdiegti svečio papildinius</b> iš <b>įtaisų</b> meniu.</p></translation> </message> <message> <source>Failed to change the snapshot folder path of the virtual machine <b>%1<b> to <nobr><b>%2</b></nobr>.</source> @@ -4210,11 +4213,11 @@ IPv6.</translation> </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>Vienas ar keli virtualūs standieji diskai, CD/DVD ar diskelių įrenginiai nebepasiekiami. Todėl negalėsite naudotis tomis virtualiomis mašinomis, kurios naudoja tas laikmenas tol, kol jos nebus pasiekiamos.</p><p>Norėdami atverti virtualių laikmenų tvarkytuvę ir pamatyti tas laikmenas, spauskite <b>Tikrinti</b>, o norėdami nekreipti dėmesio į šį pranešimą, spauskite <b>Nepaisyti</b>.</p></translation> + <translation><p>Vienas ar keli virtualūs standieji diskai, CD/DVD ar diskelių įtaisai nebepasiekiami. Todėl negalėsite naudotis tomis virtualiomis mašinomis, kurios naudoja tas laikmenas tol, kol jos nebus pasiekiamos.</p><p>Norėdami atverti virtualių laikmenų tvarkytuvę ir pamatyti tas laikmenas, spauskite <b>Tikrinti</b>, o norėdami nekreipti dėmesio į šį pranešimą, spauskite <b>Nepaisyti</b>.</p></translation> </message> <message> <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr> 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 type="unfinished"></translation> + <translation><p>Virtualios mašinos veikimo metu įvyko kritinė klaida, tad mašina sustojo.</p><p>Norėdami gauti pagalbos, žiūrėkite „Bendruomenės“ (angl. „Community“) skyrių <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> svetainėje arba palaikymo kontrakte. Prašom pateikti <tt>VBox.log</tt> žurnalo rinkmenos turinį ir <tt>VBox.png</tt> paveiksliuką, kuriuos galite rasti <nobr><b>%1</b></nobr> kataloge, bei aprašyti, ką darėte, prieš atsirandant šiai klaidai. Beje, aukščiau nurodytas rinkmenas galite pasiekti iš pagrindinio VirtualBox lango<b>Mašinos</b> meniu pasirinke <b>Rodyti žurnalą</b>.</p><p>Jei norite išjungti mašiną, spauskite <b>Gerai</b>, o jei norite palikti derinimui, spauskite <b>Nepaisyti<b>. Atminkite, kad derinimui reikia specialių žinių ir įrankių, tad dabar patartina spausti <b>Gerai</b>.</p></translation> </message> <message> <source>The following files already exist:<br /><br />%1<br /><br />Are you sure you want to replace them? Replacing them will overwrite their contents.</source> @@ -4230,7 +4233,7 @@ IPv6.</translation> </message> <message> <source>Could not access USB on the host system, because neither the USB file system (usbfs) nor the DBus and hal services are currently available. If you wish to use host USB devices inside guest systems, you must correct this and restart VirtualBox.</source> - <translation>Nepavyksta pasiekti pagrindinio kompiuteryje esančių USB įrenginių, nes neprieinama nei USB rinkmenų sistema (usbfs), nei DBus su hal paslaugomis. Jei svečio sistemoje norite naudoti pagrindinio kompiuterio USB įrenginius, privalote pašalinti trūkumus ir iš naujo paleisti VirtualBox.</translation> + <translation>Nepavyksta pasiekti pagrindinio kompiuteryje esančių USB įtaisų, nes neprieinama nei USB rinkmenų sistema (usbfs), nei DBus su hal paslaugomis. Jei svečio sistemoje norite naudoti pagrindinio kompiuterio USB įtaisus, privalote pašalinti trūkumus ir iš naujo paleisti 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> @@ -4238,7 +4241,7 @@ IPv6.</translation> </message> <message> <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source> - <translation type="unfinished"></translation> + <translation><p>VT-x/AMD-V aparatinės įrangos spartimas įgalintas, bet neveiks. Jūsų 64 bitų svečio sistema neaptiks 64 bitų procesoriaus ir negalės pasileisti.</p><p>Įsitikinkite, ar tinkamai įgalinote VT-x/AMD-V per savo pagrindinio kompiuterio BIOS.</p></translation> </message> <message> <source>Close VM</source> @@ -4312,7 +4315,7 @@ IPv6.</translation> </message> <message> <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Certain guests (e.g. OS/2 and QNX) require this feature.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source> - <translation type="unfinished"></translation> + <translation><p>VT-x/AMD-V aparatinės įrangos spartimas įgalintas, bet neveiks. Kai kurioms svečio sistemoms (pvz., OS/2 ir QNX) reikia šios savybės.</p><p>Įsitikinkite, ar tinkamai įgalinote VT-x/AMD-V per savo pagrindinio kompiuterio BIOS.</p></translation> </message> <message> <source><p>Invalid e-mail address or password specified.</p></source> @@ -4332,7 +4335,7 @@ IPv6.</translation> </message> <message> <source>You seem to have the USBFS filesystem mounted at /sys/bus/usb/drivers. We strongly recommend that you change this, as it is a severe mis-configuration of your system which could cause USB devices to fail in unexpected ways.</source> - <translation type="unfinished"></translation> + <translation>Regis prie /sys/bus/usb/drivers prijungėte USBFS rinkmenų sistemą. Labai patariame pakeisti tokią būseną, nes tai gali būti rimta sistemos konfigūracijos problema, galinti lemti netikėtus USB įtaisų sutrikimus.</translation> </message> <message> <source>You are running an EXPERIMENTAL build of VirtualBox. This version is not suitable for production use.</source> @@ -4340,7 +4343,7 @@ IPv6.</translation> </message> <message> <source><p>Are you sure you want to restore snapshot <b>%1</b>? This will cause you to lose your current machine state, which cannot be recovered.</p></source> - <translation type="unfinished"></translation> + <translation><p>Tikrai atkurti momentinę kopiją <b>%1</b>? Tokiu atveju negrįžtamai prarasite dabartinę savo mašinos būseną.</p></translation> </message> <message> <source>Restore</source> @@ -4412,11 +4415,11 @@ IPv6.</translation> </message> <message> <source>Failed to eject the disk from the virtual drive. The drive may be locked by the guest operating system. Please check this and try again.</source> - <translation>Nepavyko išmesti disko iš virtualaus įrenginio. Įrenginį galbūt užblokavo svečio operacinė sistema. Patikrinkite ir bandykite iš naujo.</translation> + <translation>Nepavyko išmesti disko iš virtualaus įtaiso. Galbūt įtaisą užblokavo svečio operacinė sistema. Patikrinkite ir bandykite iš naujo.</translation> </message> <message> <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>Nepavyksta prijungti VirtualBox svečio papildinių diegimo CD atvaizdo prie virtualios mašinos <b>%1</b>, nes mašina neturi CD/DVD įrenginio.</p></translation> + <translation><p>Nepavyksta prijungti VirtualBox svečio papildinių diegimo CD atvaizdo prie virtualios mašinos <b>%1</b>, nes mašina neturi CD/DVD įtaiso.</p></translation> </message> <message> <source>E&xit</source> @@ -4468,17 +4471,17 @@ IPv6.</translation> <source>CD/DVD device</source> <comment>failed to attach ... </comment> - <translation>CD/DVD įrenginio</translation> + <translation>CD/DVD įtaiso</translation> </message> <message> <source>floppy device</source> <comment>failed to close ... </comment> - <translation>diskelių įrenginio</translation> + <translation>diskelių įtaiso</translation> </message> <message> <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>Tikrai pašalinti CD/DVD-ROM įrenginį?</p><p>Jei taip, negalėsite prijungti jokio CD ar ISO atvaizdo, negaėsite įdiegti svečio papildinių!</p></translation> + <translation><p>Tikrai pašalinti CD/DVD-ROM įtaisą?</p><p>Jei taip, negalėsite prijungti jokio CD ar ISO atvaizdo, negalėsite įdiegti svečio papildinių!</p></translation> </message> <message> <source>&Remove</source> @@ -4488,11 +4491,11 @@ IPv6.</translation> </message> <message> <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</source> - <translation type="unfinished"></translation> + <translation><p>VT-x/AMD-V aparatinės įrangos spartimo jūsų sistemoje nėra. Taigi 64 bitų svečio sistema neaptiks 64 bitų procesoriaus ir negalės pasileisti.</translation> </message> <message> <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Certain guests (e.g. OS/2 and QNX) require this feature and will fail to boot without it.</p></source> - <translation type="unfinished"></translation> + <translation><p>VT-x/AMD-V aparatinės įrangos spartimo jūsų sistemoje nėra. Kai kurioms svečio sistemoms (pvz., OS/2 ir QNX) reikia šios savybės; be jos sistema nepasileis.</p></translation> </message> <message> <source><p>Deleting the snapshot %1 will temporarily need more disk space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of disk space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source> @@ -4577,15 +4580,15 @@ IPv6.</translation> <name>VBoxScreenshotViewer</name> <message> <source>Screenshot of %1 (%2)</source> - <translation>%1 momentinis būvis (%2)</translation> + <translation>%1 nuotrauka (%2)</translation> </message> <message> <source>Click to view non-scaled screenshot.</source> - <translation type="unfinished"></translation> + <translation>Spragtelėkite, norėdami matyti tikro dydžio nuotrauką.</translation> </message> <message> <source>Click to view scaled screenshot.</source> - <translation type="unfinished"></translation> + <translation>Spragtelėkite, norėdami matyti pritaikyto dydžio nuotrauką.</translation> </message> </context> <context> @@ -5010,13 +5013,13 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> <source><no devices available></source> <comment>USB devices </comment> - <translation><nėra įrenginių></translation> + <translation><nėra įtaisų></translation> </message> <message> <source>No supported devices connected to the host PC</source> <comment>USB device tooltip </comment> - <translation>Prie kompiuterio nėra prijungtų palaikomų įrenginių</translation> + <translation>Prie kompiuterio nėra prijungtų palaikomų įtaisų</translation> </message> </context> <context> @@ -5210,11 +5213,11 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Storage Statistics</source> - <translation>Atminties įrenginių statistika</translation> + <translation>Atminties įtaisų statistika</translation> </message> <message> <source>No Storage Devices</source> - <translation>Atminties įrenginių nėra</translation> + <translation>Atminties įtaisų nėra</translation> </message> <message> <source>Network Statistics</source> @@ -5509,7 +5512,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</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>įgalinote USB HID (žmogaus sąsajos įrenginį). Jis neveiks tol, kol neįgalinsite USB emuliacijos. Todėl pastaroji bus įgalinta automatiškai po to, kai patvirtinsite VM nuostatas mygtuku „Gerai“.</translation> + <translation>įgalinote USB HID (žmogaus sąsajos įtaisą). Jis neveiks tol, kol neįgalinsite USB emuliacijos. Todėl pastaroji bus įgalinta automatiškai po to, kai patvirtinsite VM nuostatas mygtuku „Gerai“.</translation> </message> </context> <context> @@ -5556,7 +5559,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>If checked, any change to mounted CD/DVD or Floppy media performed during machine execution will be saved in the settings file in order to preserve the configuration of mounted media between runs.</source> - <translation>Jei pažymėta, bus įsimintas bet koks CD/DVD ar diskelių prijungimo pakeitimas mašinos veikimo metu. Šie pakeitimai bus įrašyti į nuostatas siekiant išlaikyti tą pačią pakeistą prijungtų įrenginių konfigūraciją sekantį kartą paleidus svečio OS.</translation> + <translation>Jei pažymėta, bus įsimintas bet koks CD/DVD ar diskelių prijungimo pakeitimas mašinos veikimo metu. Šie pakeitimai bus įrašyti į nuostatas siekiant išlaikyti tą pačią pakeistą prijungtų įtaisių konfigūraciją sekantį kartą paleidus svečio OS.</translation> </message> <message> <source>Removable Media:</source> @@ -5607,11 +5610,11 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source><nobr>Add&nbsp;CD/DVD&nbsp;Device</nobr></source> - <translation><nobr>Pridėti&nbsp;CD/DVD&nbsp;įrenginį</nobr></translation> + <translation><nobr>Pridėti&nbsp;CD/DVD&nbsp;įtaisą</nobr></translation> </message> <message> <source><nobr>Add&nbsp;Floppy&nbsp;Device</nobr></source> - <translation><nobr>Pridėti&nbsp;diskelių&nbsp;įrenginį</nobr></translation> + <translation><nobr>Pridėti&nbsp;diskelių&nbsp;įtaisą</nobr></translation> </message> <message> <source>No hard disk is selected for <i>%1</i>.</source> @@ -5647,7 +5650,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Add Attachment</source> - <translation>Pridėti įrenginį</translation> + <translation>Pridėti įtaisą</translation> </message> <message> <source>Add Hard Disk</source> @@ -5655,31 +5658,31 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Add CD/DVD Device</source> - <translation>pridėti CD/DVD įrenginį</translation> + <translation>Pridėti CD/DVD įtaisą</translation> </message> <message> <source>Add Floppy Device</source> - <translation>Pridėti diskelių įrenginį</translation> + <translation>Pridėti diskelių įtaisą</translation> </message> <message> <source>Remove Attachment</source> - <translation>Pašalinti įrenginį</translation> + <translation>Pašalinti įtaisą</translation> </message> <message> <source>Adds a new controller to the end of the Storage Tree.</source> - <translation type="unfinished"></translation> + <translation>Atminties įtaisų medžio gale prideda naują valdiklį.</translation> </message> <message> <source>Removes the controller highlighted in the Storage Tree.</source> - <translation type="unfinished"></translation> + <translation>Pašalina valdiklius, pažymėtus atminties įtaisų medyje.</translation> </message> <message> <source>Adds a new attachment to the Storage Tree using currently selected controller as parent.</source> - <translation type="unfinished"></translation> + <translation>Prie atminties įtaisų medžio prideda naują įtaisą pasirinktam valdikliui.</translation> </message> <message> <source>Removes the attachment highlighted in the Storage Tree.</source> - <translation type="unfinished"></translation> + <translation>Pašalina įtaisą, pažymėtą atminties įtaisų medyje.</translation> </message> <message> <source>IDE Controller</source> @@ -5703,7 +5706,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>&CD/DVD Device:</source> - <translation>&CD/DVD įrenginys:</translation> + <translation>&CD/DVD įtaisas:</translation> </message> <message> <source>&Floppy Device:</source> @@ -5715,7 +5718,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Contains all storage controllers for this machine and the virtual images and host drives attached to them.</source> - <translation type="unfinished"></translation> + <translation>Talpina visus šios mašinos atminties įtaisų valdiklius, virtualius atvaizdus ir prie jų priskirtus pagrindinio įtaisus.</translation> </message> <message> <source>Information</source> @@ -5723,7 +5726,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>The Storage Tree can contain several controllers of different types. This machine currently has no controllers.</source> - <translation type="unfinished"></translation> + <translation>Atminties įtaisų medis gali turėti kelis skirtingų tipų valdiklius. Šiuo metu ši mašina neturi jokio valdiklio.</translation> </message> <message> <source>Attributes</source> @@ -5735,7 +5738,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Changes the name of the storage controller currently selected in the Storage Tree.</source> - <translation type="unfinished"></translation> + <translation>Pakeičia pavadinimą to valdiklio, kuris yra pažymėtas atminties įtaisų medyje.</translation> </message> <message> <source>&Type:</source> @@ -5743,7 +5746,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Selects the sub-type of the storage controller currently selected in the Storage Tree.</source> - <translation type="unfinished"></translation> + <translation>Parenka potipį to valdiklio, kuris yra pažymėtas atminties įtaisų medyje.</translation> </message> <message> <source>S&lot:</source> @@ -5751,15 +5754,15 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Selects the slot on the storage controller used by this attachment. The available slots depend on the type of the controller and other attachments on it.</source> - <translation>Leidžia pasirinkti šio įrenginio lizdą atminties įtaisų valdiklyje. Galimi lizdai priklauso nuo valdiklio tipo ir nuo jau jam priskirtų įrenginių.</translation> + <translation>Leidžia pasirinkti šio įtaiso lizdą atminties įtaisų valdiklyje. Galimi lizdai priklauso nuo valdiklio tipo ir nuo jau jam priskirtų įtaisų.</translation> </message> <message> <source>Selects the virtual disk image or the host drive used by this attachment.</source> - <translation type="unfinished"></translation> + <translation>Šiam įtaisui parenka virtualaus disko atvaizdą arba pagrindinio kompiuterio atminties įtaisą.</translation> </message> <message> <source>Opens the Virtual Media Manager to select a virtual image for this attachment.</source> - <translation>Atveria virtualių laikmenų tvarkytuvę, leidžiančią pasirinkti virtualų atvaizdą šiam įrenginiui.</translation> + <translation>Atveria virtualių laikmenų tvarkytuvę, leidžiančią pasirinkti virtualų atvaizdą šiam įtaisui.</translation> </message> <message> <source>Open Virtual Media Manager</source> @@ -5771,7 +5774,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>When checked, allows the guest to send ATAPI commands directly to the host-drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</source> - <translation>Jei pažymėta, leidžia svečiui tiesiogiai siųsti ATAPI komandas į pagrindinio kompiuterio įrenginį. Pavyzdžiui, ši parinktis leidžia rašyti į pagrindinio kompiuterio CD/DVD iš virtualios mašinos. Atminkite, kad garso CD įrašymas iš virtualios mašinos dar nepalaikomas.</translation> + <translation>Jei pažymėta, leidžia svečiui tiesiogiai siųsti ATAPI komandas į pagrindinio kompiuterio įtaisą. Pavyzdžiui, ši parinktis leidžia rašyti į pagrindinio kompiuterio CD/DVD iš virtualios mašinos. Atminkite, kad garso CD įrašymas iš virtualios mašinos dar nepalaikomas.</translation> </message> <message> <source>&Passthrough</source> @@ -5854,7 +5857,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>no bridged network adapter is selected</source> - <translation type="unfinished"></translation> + <translation>nepasirinkta tinklo plokštė tiltiniam sujungimui</translation> </message> <message> <source>no internal network name is specified</source> @@ -5876,7 +5879,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Selects the name of the network adapter for <b>Bridged Adapter</b> or <b>Host-only Adapter</b> attachments and the name of the network <b>Internal Network</b> attachments.</source> - <translation type="unfinished"></translation> + <translation>Parenka <b>tinklų tilto</b> plokštę ar <b>plokštę prisijungimui tik prie pagrindinio kompiuterio</b> arba <b>vidinio tinklo</b> vardą.</translation> </message> <message> <source>A&dvanced</source> @@ -5933,7 +5936,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>&IRQ:</source> - <translation type="unfinished"></translation> + <translation>&IRQ:</translation> </message> <message> <source>I/O Po&rt:</source> @@ -5945,11 +5948,11 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Displays the host parallel device name.</source> - <translation>Rodo pagrindinio kopiuterio lygiagrečiųjų įrenginių pavadinimus.</translation> + <translation>Rodo pagrindinio kopiuterio lygiagrečiųjų įtaisų vardus.</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> - <translation type="unfinished"></translation> + <translation>Rodo šio lygiagrečiojo prievado IRQ numerį. Tai turi būti sveikasis skaičius iš intervalo nuo <tt>0</tt> iki <tt>255</tt>. Reikšmes, didesnes kaip <tt>15</tt>, galima naudoti tik jei šiai virtualiai mašinai įgalinta <b>IO APIC</b> nuostata.</translation> </message> <message> <source>Displays the base I/O port address of this parallel port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source> @@ -6103,7 +6106,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>&IRQ:</source> - <translation type="unfinished"></translation> + <translation>&IRQ:</translation> </message> <message> <source>I/O Po&rt:</source> @@ -6127,7 +6130,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</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>Rodo kelią iki nuosekliojo prievado kanalo pagrindiniame kompiuteryje, kai dirbama <b>Pagrindinio kompiuterio kanalo</b> veiksenoje, arba pagrindinio kompiuterio nuosekliojo įrenginio pavadinimą, kai dirbama <b>Pagrindinio kompiuterio įrenginio</b> veiksenoje.</translation> + <translation>Rodo kelią iki nuosekliojo prievado kanalo pagrindiniame kompiuteryje, kai dirbama <b>Pagrindinio kompiuterio kanalo</b> veiksenoje, arba pagrindinio kompiuterio nuosekliojo įtaiso vardą, kai dirbama <b>Pagrindinio kompiuterio įtaiso</b> veiksenoje.</translation> </message> <message> <source>Port/File &Path:</source> @@ -6135,7 +6138,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Displays the IRQ number of this serial port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>IO APIC</b> setting is enabled for this virtual machine.</source> - <translation type="unfinished"></translation> + <translation>Rodo šio nuosekliojo prievado IRQ numerį. Tai turi būti sveikasis skaičius iš intervalo nuo <tt>0</tt> iki <tt>255</tt>. Reikšmes, didesnes kaip <tt>15</tt>, galima naudoti tik jei šiai virtualiai mašinai įgalinta <b>IO APIC</b> nuostata.</translation> </message> <message> <source>Displays the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source> @@ -6215,7 +6218,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source> - <translation>Nurodo bandomų įkrauti įrenginių eiliškumą. Langeliuose kairėje pusėje įgalinkite arba uždrauskite pavienius įkrovimo įrenginius. Eiliškumą keisite elementus keldami arba nuleisdami.</translation> + <translation>Nurodo bandomų įkrauti įtaisų eiliškumą. Langeliuose kairėje pusėje įgalinkite arba uždrauskite pavienius paleidimo įtaisus. Eiliškumą keisite elementus keldami arba nuleisdami.</translation> </message> <message> <source>Move Down (Ctrl-Down)</source> @@ -6223,7 +6226,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Moves the selected boot device down.</source> - <translation>Nuleisti pasirinktą įrenginį žemiau.</translation> + <translation>Nuleisti pasirinktą įtaisą žemiau.</translation> </message> <message> <source>Move Up (Ctrl-Up)</source> @@ -6231,7 +6234,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Moves the selected boot device up.</source> - <translation>Kelti pasirinktą įrenginį aukščiau.</translation> + <translation>Kelti pasirinktą įtaisą aukščiau.</translation> </message> <message> <source>Extended Features:</source> @@ -6255,7 +6258,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine.</source> - <translation type="unfinished"></translation> + <translation>Pažymėjus, virtuali mašina galės naudoti pagrindinio kompiuterio procesoriaus fizinio adreso praplėtimo (PAE) funkciją.</translation> </message> <message> <source>Enable PA&E/NX</source> @@ -6301,7 +6304,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source> - <translation>Pažymėjus, RTC įrenginys laiką praneš pasauliniu formatu (UTC); priešingu atveju – vietiniu (pagrindinio kompiuterio) laiku. Unix sistemose aparatinis laikrodis paprastai nustatytas į pasaulinį.</translation> + <translation>Pažymėjus, RTC įtaisas laiką praneš pasauliniu formatu (UTC); priešingu atveju – vietiniu (pagrindinio kompiuterio) laiku. Unix sistemose aparatinis laikrodis paprastai nustatytas į pasaulinį.</translation> </message> <message> <source>Hardware clock in &UTC time</source> @@ -6328,7 +6331,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>A&dd Filter From Device</source> - <translation>P&ridėti filtrą iš įrenginio</translation> + <translation>P&ridėti filtrą iš įtaiso</translation> </message> <message> <source>&Edit Filter</source> @@ -6348,11 +6351,11 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Adds a new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source> - <translation type="unfinished"></translation> + <translation>Prideda naują USB filtrą, kurio visi laukeliai iš pradžių yra tušti. Atminkite, kad toks filtro atitikmenys bus visi USB įtaisai.</translation> </message> <message> <source>Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source> - <translation type="unfinished"></translation> + <translation>Pridama naują USB filtrą, kurio laukeliai užpildyti pasirinkto USB įtaiso, prijungto prie pagr. kompiuterio, reikšmėmis.</translation> </message> <message> <source>Edits the selected USB filter.</source> @@ -6386,7 +6389,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>When checked, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source> - <translation>Pažymėjus, įgalinamas šios mašinos virtualus USB EHCI valdiklis. USB EHCI valdiklis leidžia naudotis USB 2.0 įrenginiais.</translation> + <translation>Pažymėjus, įgalinamas šios mašinos virtualus USB EHCI valdiklis. USB EHCI valdiklis leidžia naudotis USB 2.0 įtaisais.</translation> </message> <message> <source>Enable USB 2.0 (E&HCI) Controller</source> @@ -6394,7 +6397,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>USB Device &Filters</source> - <translation>&USB įrenginių filtrai</translation> + <translation>&USB įtaisų filtrai</translation> </message> <message> <source>Lists all USB filters of this machine. The checkbox to the left defines whether the particular filter is enabled or not. Use the context menu or buttons to the right to add or remove USB filters.</source> @@ -6504,7 +6507,7 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation> </message> <message> <source>Defines an action performed by the host computer when a matching device is attached: give it up to the host OS (<i>Ignore</i>) or grab it for later usage by virtual machines (<i>Hold</i>).</source> - <translation>Nurodo veiksmą, kurį atlieka pagrindinis kompiuteris, kai prijungiamas atitinkamas įrenginys: palikti pagrindinio kompiuterio žinioje (<i>Nepaisyti</i>) arba atiduoti į virtualios mašinos valdymui (<i>Sulaikyti</i>).</translation> + <translation>Nurodo veiksmą, kurį atlieka pagrindinis kompiuteris, kai prijungiamas atitinkamas įtaisas: palikti pagrindinio kompiuterio žinioje (<i>Nepaisyti</i>) arba atiduoti į virtualios mašinos valdymui (<i>Sulaikyti</i>).</translation> </message> <message> <source>USB Filter Details</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts index c9aedc27a..bb29237e4 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts @@ -26,7 +26,7 @@ <message> <source>Oracle Corporation</source> <comment>Comma-separated list of translators</comment> - <translation>Daniel Nylander.</translation> + <translation>Daniel Nylander</translation> </message> </context> <context> @@ -411,7 +411,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 type="unfinished"></translation> + <translation>Använd <b>%1</b>-knappen för att gå till nästa sida i guiden och <b>%2</b>-knappen för att gå tillbaka till föregående sida. Du kan även trycka på <b>%3</b> om du vill avbryta körningen av denna guide.</p></translation> </message> </context> <context> @@ -633,61 +633,61 @@ </message> <message> <source>Enter &Fullscreen Mode</source> - <translation type="unfinished"></translation> + <translation>Gå in i &helskärmsläge</translation> </message> <message> <source>Exit &Fullscreen Mode</source> - <translation type="unfinished"></translation> + <translation>Lämna &helskärmsläge</translation> </message> <message> <source>Switch to normal mode</source> - <translation type="unfinished"></translation> + <translation>Växla till normalt läge</translation> </message> <message> <source>Enter Seam&less Mode</source> - <translation type="unfinished"></translation> + <translation>Gå in i söm&löst läge</translation> </message> <message> <source>Exit Seam&less Mode</source> - <translation type="unfinished"></translation> + <translation>Lämna söm&löst läge</translation> </message> <message> <source>Enable &Guest Display Auto-resize</source> - <translation type="unfinished"></translation> + <translation>Aktivera automatisk storleksändring för &gästskärm</translation> </message> <message> <source>Disable &Guest Display Auto-resize</source> - <translation type="unfinished"></translation> + <translation>Inaktivera automatisk storleksändring för &gästskärm</translation> </message> <message> <source>Disable automatic resize of the guest display when the window is resized</source> - <translation type="unfinished"></translation> + <translation>Inaktivera automatisk storleksändring för gästskärmen när fönstret ändrar storlek</translation> </message> <message> <source>&Enable Remote Display</source> - <translation type="unfinished"></translation> + <translation>&Aktivera fjärrskrivbord</translation> </message> <message> <source>Enable remote desktop (RDP) connections to this machine</source> - <translation type="unfinished"></translation> + <translation>Aktivera fjärrskrivningsanslutningar (RDP) till denna maskin</translation> </message> <message> <source>&Disable Remote Display</source> - <translation type="unfinished"></translation> + <translation>&Inaktivera fjärrskrivbord</translation> </message> <message> <source>Disable remote desktop (RDP) connections to this machine</source> - <translation type="unfinished"></translation> + <translation>Inaktivera fjärrskrivningsanslutningar (RDP) till denna maskin</translation> </message> <message> <source>Enable &Logging...</source> <comment>debug action</comment> - <translation type="unfinished"></translation> + <translation>Aktivera &loggning...</translation> </message> <message> <source>Disable &Logging...</source> <comment>debug action</comment> - <translation type="unfinished"></translation> + <translation>Inaktivera &loggning...</translation> </message> </context> <context> @@ -726,7 +726,7 @@ </message> <message> <source>The download process has been canceled by the user.</source> - <translation type="unfinished"></translation> + <translation>Hämtningsprocessen har avbrutits av användaren.</translation> </message> </context> <context> @@ -756,7 +756,7 @@ <name>UIDownloaderUserManual</name> <message> <source>Select folder to save User Manual to</source> - <translation type="unfinished"></translation> + <translation>Välj en mapp att spara användarhandboken i</translation> </message> </context> <context> @@ -902,116 +902,116 @@ p, li { white-space: pre-wrap; } <name>UIExportApplianceWzdPage1</name> <message> <source>Welcome to the Appliance Export Wizard!</source> - <translation type="unfinished">Välkommen till exportguiden för appliance!</translation> + <translation>Välkommen till exportguiden för appliance!</translation> </message> <message> <source><p>This wizard will guide you through the process of exporting an appliance.</p><p>%1</p><p>Please select the virtual machines that should be added to the appliance. You can select more than one. Please note that these machines have to be turned off before they can be exported.</p></source> - <translation type="unfinished"></translation> + <translation><p>Denna guiden hjälper dig genom processen att exportera en appliance.</p><p>%1</p><p>Välj de virtuella maskiner som ska läggas till i denna appliance. Du kan välja fler än en. Observera att dessa maskiner måste vara avstängda innan de kan exporteras.</p></translation> </message> </context> <context> <name>UIExportApplianceWzdPage2</name> <message> <source>Here you can change additional configuration values of the selected virtual machines. You can modify most of the properties shown by double-clicking on the items.</source> - <translation type="unfinished">Här kan du ändra ytterligare konfigurationsvärden för de valda virtuella maskinerna. Du kan ändra de flesta av de visade egenskaperna genom att dubbelklicka på dem.</translation> + <translation>Här kan du ändra ytterligare konfigurationsvärden för de valda virtuella maskinerna. Du kan ändra många av egenskaperna genom att dubbelklicka på dem.</translation> </message> <message> <source>Appliance Export Settings</source> - <translation type="unfinished">Exportinställningar för appliance</translation> + <translation>Exportinställningar för appliance</translation> </message> </context> <context> <name>UIExportApplianceWzdPage3</name> <message> <source>Please specify the target for the OVF export. You can choose between a local file system export, uploading the OVF to the Sun Cloud service or an S3 storage server.</source> - <translation type="unfinished">Ange målet för OVF-exporteringen. Du kan välja mellan en export till lokalt filsystem, skicka upp OVF-filen till Sun Cloud-tjänsten eller en S3-lagringsserver.</translation> + <translation>Ange målet för OVF-exporten. Du kan välja mellan en export till lokalt filsystem, skicka upp OVF-filen till Sun Cloud-tjänsten eller en S3-lagringsserver.</translation> </message> <message> <source>&Local Filesystem </source> - <translation type="unfinished">&Lokalt filsystem </translation> + <translation>&Lokalt filsystem </translation> </message> <message> <source>Sun &Cloud</source> - <translation type="unfinished">Sun &Cloud</translation> + <translation>Sun &Cloud</translation> </message> <message> <source>&Simple Storage System (S3)</source> - <translation type="unfinished">&Simple Storage System (S3)</translation> + <translation>&Simple Storage System (S3)</translation> </message> <message> <source>Appliance Export Settings</source> - <translation type="unfinished">Exportinställningar för appliance</translation> + <translation>Exportinställningar för appliance</translation> </message> </context> <context> <name>UIExportApplianceWzdPage4</name> <message> <source>&Username:</source> - <translation type="unfinished">&Användarnamn:</translation> + <translation>&Användarnamn:</translation> </message> <message> <source>&Password:</source> - <translation type="unfinished">&Lösenord:</translation> + <translation>&Lösenord:</translation> </message> <message> <source>&Hostname:</source> - <translation type="unfinished">&Värdnamn:</translation> + <translation>&Värdnamn:</translation> </message> <message> <source>&Bucket:</source> - <translation type="unfinished">&Bucket:</translation> + <translation>&Bucket:</translation> </message> <message> <source>&File:</source> - <translation type="unfinished">&Fil:</translation> + <translation>&Fil:</translation> </message> <message> <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source> - <translation type="unfinished">Skriv i gamla formatet OVF 0.9 för kompatibilitet med andra virtualiseringsprodukter.</translation> + <translation>Skriv i det äldre formatet OVF 0.9 för kompatibilitet med andra virtualiseringsprodukter.</translation> </message> <message> <source>&Write legacy OVF 0.9</source> - <translation type="unfinished">&Skriv i gamla OVF 0.9</translation> + <translation>&Skriv i äldre OVF 0.9</translation> </message> <message> <source>Appliance Export Settings</source> - <translation type="unfinished">Exportinställningar för appliance</translation> + <translation>Exportinställningar för appliance</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">Välj en fil att exportera till</translation> + <translation>Välj en fil att exportera till</translation> </message> <message> <source>Open Virtualization Format (%1)</source> - <translation type="unfinished">Open Virtualization Format (%1)</translation> + <translation>Open Virtualization Format (%1)</translation> </message> <message> <source>Please choose a filename to export the OVF to.</source> - <translation type="unfinished">Välj ett filnamn att exportera OVF-filen till.</translation> + <translation>Välj ett filnamn att exportera OVF-filen till.</translation> </message> <message> <source>Please complete the additional fields like the username, password and the bucket, and provide a filename for the OVF target.</source> - <translation type="unfinished">Färdigställ ytterligare fält såsom användarnamn, lösenord och bucket. Till sist behöver du ange ett filnamn för OVF-målet.</translation> + <translation>Färdigställ ytterligare fält såsom användarnamn, lösenord och bucket. Till sist behöver du ange ett filnamn för OVF-målet.</translation> </message> <message> <source>Please complete the additional fields like the username, password, hostname and the bucket, and provide a filename for the OVF target.</source> - <translation type="unfinished">Färdigställ ytterligare fält såsom användarnamn, lösenord, värdnamn och bucket. Till sist behöver du ange ett filnamn för OVF-målet.</translation> + <translation>Färdigställ ytterligare fält såsom användarnamn, lösenord, värdnamn och bucket. Till sist behöver du ange ett filnamn för OVF-målet.</translation> </message> <message> <source>Checking files ...</source> - <translation type="unfinished">Kontrollerar filer ...</translation> + <translation>Kontrollerar filer ...</translation> </message> <message> <source>Removing files ...</source> - <translation type="unfinished">Tar bort filer ...</translation> + <translation>Tar bort filer ...</translation> </message> <message> <source>Exporting Appliance ...</source> - <translation type="unfinished">Exporterar appliance ...</translation> + <translation>Exporterar appliance ...</translation> </message> </context> <context> @@ -1153,71 +1153,71 @@ p, li { white-space: pre-wrap; } <name>UIFirstRunWzdPage1</name> <message> <source>Welcome to the First Run Wizard!</source> - <translation type="unfinished">Välkommen till förstagångsguiden!</translation> + <translation>Välkommen till förstagångsguiden!</translation> </message> <message> <source><p>You have started a newly created virtual machine for the first time. This wizard will help you to perform the steps necessary for installing an operating system of your choice onto this virtual machine.</p><p>%1</p></source> - <translation type="unfinished"></translation> + <translation><p>Du har startat en nyligen skapad virtuell maskin för första gången. Denna guide hjälper dig att genomföra de steg som krävs för att installera ett operativsystem på denna virtuella maskin.</p><p>%1</p></translation> </message> <message> <source><p>You have started a newly created virtual machine for the first time. This wizard will help you to perform the steps necessary for booting an operating system of your choice on the virtual machine.</p><p>Note that you will not be able to install an operating system into this virtual machine right now because you did not attach any hard disk to it. If this is not what you want, you can cancel the execution of this wizard, select <b>Settings</b> from the <b>Machine</b> menu of the main VirtualBox window to access the settings dialog of this machine and change the hard disk configuration.</p><p>%1</p></source> - <translation type="unfinished"></translation> + <translation><p>Du har startat en nyligen skapad virtuell maskin för första gången. Denna guide hjälper dig att genomföra de steg som krävs för att starta upp ett operativsystem på den virtuella maskinen.</p><p>Observera att du inte kommer att kunna installera ett operativsystem på denna virtuella maskin just nu på grund av att du inte har anslutit någon hårddisk till den ännu. Om detta inte är vad du planerat så kan du avbryta körningen av denna guide. Välj sedan <b>Inställningar</b> från <b>Maskin</b>-menyn i huvudfönstret för VirtualBox för att komma åt inställningsdialogen för denna maskin och ändra hårddiskkonfigurationen.</p><p>%1</p></translation> </message> </context> <context> <name>UIFirstRunWzdPage2</name> <message> <source><p>Select the media which contains the setup program of the operating system you want to install. This media must be bootable, otherwise the setup program will not be able to start.</p></source> - <translation type="unfinished"><p>Välj det media som innehåller konfigurationsprogrammet för operativsystemet som du vill installera. Det här mediet måste vara startbart, annars kommer inte konfigurationsprogrammet att kunna starta.</p></translation> + <translation><p>Välj det media som innehåller konfigurationsprogrammet för operativsystemet som du vill installera. Det här mediet måste vara startbart, annars kommer inte konfigurationsprogrammet att kunna starta.</p></translation> </message> <message> <source><p>Select the media that contains the operating system you want to work with. This media must be bootable, otherwise the operating system will not be able to start.</p></source> - <translation type="unfinished"><p>Välj det media som innehåller operativsystemet som du vill arbeta med. Detta media måste vara startbart, annars kommer operativsystemet inte kunna starta upp.</p></translation> + <translation><p>Välj det media som innehåller operativsystemet som du vill arbeta med. Detta media måste vara startbart, annars kommer operativsystemet inte kunna starta upp.</p></translation> </message> <message> <source>Media Source</source> - <translation type="unfinished">Mediakälla</translation> + <translation>Mediakälla</translation> </message> <message> <source>Select Installation Media</source> - <translation type="unfinished">Välj installationsmedia</translation> + <translation>Välj installationsmedia</translation> </message> </context> <context> <name>UIFirstRunWzdPage3</name> <message> <source><p>You have selected the following media to boot from:</p></source> - <translation type="unfinished"><p>Du har valt följande media att starta upp från:</p></translation> + <translation><p>Du har valt följande media att starta upp från:</p></translation> </message> <message> <source><p>You have selected the following media to boot an operating system from:</p></source> - <translation type="unfinished"><p>Du har valt följande media att starta upp ett operativsystem från:</p></translation> + <translation><p>Du har valt följande media att starta upp ett operativsystem från:</p></translation> </message> <message> <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.</p><p>Please note that when you close the virtual machine, the specified media will be automatically unmounted and the boot device will be set back to the first hard disk.</p><p>Depending on the type of the setup program, you may need to manually 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 type="unfinished"><p>Om ovanstående är korrekt så kan du trycka på knappen <b>Färdigställ</b>. När du har tryckt på den så kommer valt media att temporärt monteras på den virtuella maskinen och maskinen kommer att starta körningen.</p><p>Observera att när du stänger den virtuella maskinen så kommer valt media att automatiskt avmonteras och uppstartsenheten kommer att ställas tillbaka till den första hårddisken.</p><p>Beroende på typ av konfigurationsprogram så kan du behöva att manuellt avmontera (mata ut) detta media efter att konfigurationsprogrammet startar om den virtuella maskinen för att förhindra att installationsprocessen startar en gång till. Du kan göra detta genom att välja den motsvarande <b>Avmontera...</b>-åtgärden i menyn <b>Enheter</b>.</p></translation> + <translation><p>Om ovanstående är korrekt så kan du trycka på knappen <b>Färdigställ</b>. När du har tryckt på den så kommer valt media att temporärt monteras på den virtuella maskinen och maskinen kommer att starta körningen.</p><p>Observera att när du stänger den virtuella maskinen så kommer valt media att automatiskt avmonteras och uppstartsenheten kommer att ställas tillbaka till den första hårddisken.</p><p>Beroende på typ av konfigurationsprogram så kan du behöva att manuellt avmontera (mata ut) detta media efter att konfigurationsprogrammet startar om den virtuella maskinen för att förhindra att installationsprocessen startar en gång till. Du kan göra detta genom att välja den motsvarande <b>Avmontera...</b>-åtgärden i menyn <b>Enheter</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 type="unfinished"><p>Om ovanstående är korrekt kan du trycka på knappen <b>Färdigställ</b>. När du trycker på den kommer det media som valts att monteras på den virtuella maskinen och maskinen kommer sedan att startas.</p></translation> + <translation><p>Om ovanstående är korrekt så kan du trycka på knappen <b>Färdigställ</b>. När du trycker på den så kommer det media som valts att monteras på den virtuella maskinen och maskinen kommer att påbörja körningen.</p></translation> </message> <message> <source>Summary</source> - <translation type="unfinished">Sammandrag</translation> + <translation>Sammandrag</translation> </message> <message> <source>CD/DVD-ROM Device</source> - <translation type="unfinished">CD/DVD-ROM-enhet</translation> + <translation>CD/DVD-ROM-enhet</translation> </message> <message> <source>Type</source> <comment>summary</comment> - <translation type="unfinished">Typ</translation> + <translation>Typ</translation> </message> <message> <source>Source</source> <comment>summary</comment> - <translation type="unfinished">Källa</translation> + <translation>Källa</translation> </message> </context> <context> @@ -1287,30 +1287,30 @@ p, li { white-space: pre-wrap; } <name>UIImportApplianceWzdPage1</name> <message> <source>Select an appliance to import</source> - <translation type="unfinished">Välj en appliance att importera</translation> + <translation>Välj en appliance att importera</translation> </message> <message> <source>Open Virtualization Format (%1)</source> - <translation type="unfinished">Open Virtualization Format (%1)</translation> + <translation>Open Virtualization Format (%1)</translation> </message> <message> <source>Welcome to the Appliance Import Wizard!</source> - <translation type="unfinished">Välkommen till importguiden för appliance!</translation> + <translation>Välkommen till importguiden för appliance!</translation> </message> <message> <source><p>This wizard will guide you through importing an appliance.</p><p>%1</p><p>VirtualBox currently supports importing appliances saved in the Open Virtualization Format (OVF). To continue, select the file to import below:</p></source> - <translation type="unfinished"></translation> + <translation><p>Denna guide hjälper dig genom processen att importera en appliance.</p><p>%1</p><p>VirtualBox har för närvarande stöd för att importera appliances sparade i Open Virtualization Format (OVF). Välj den fil som ska importeras nedan för att fortsätta:</p></translation> </message> </context> <context> <name>UIImportApplianceWzdPage2</name> <message> <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source> - <translation type="unfinished">Dessa är de virtuella maskinerna som beskrivs i din appliance med deras föreslagna mappningar för import till VirtualBox. Du kan ändra många av de egenskaper som visas genom att dubbelklicka på dem och inaktivera andra genom att använda kryssrutorna nedan.</translation> + <translation>Dessa är de virtuella maskinerna som finns i din appliance med deras föreslagna inställningar för de importerade VirtualBox-maskinerna. Du kan ändra många av de egenskaper som visas genom att dubbelklicka på dem och inaktivera andra genom att använda kryssrutorna nedan.</translation> </message> <message> <source>Appliance Import Settings</source> - <translation type="unfinished">Importinställningar för appliance</translation> + <translation>Importinställningar för appliance</translation> </message> </context> <context> @@ -1512,45 +1512,45 @@ p, li { white-space: pre-wrap; } <name>UIMiniProcessWidgetAdditions</name> <message> <source>Cancel</source> - <translation type="unfinished">Avbryt</translation> + <translation>Avbryt</translation> </message> <message> <source>Cancel the VirtualBox Guest Additions CD image download</source> - <translation type="unfinished">Avbryt hämtning av cd-avbildning för VirtualBox Gästtillägg</translation> + <translation>Avbryt hämtning av cd-avbildning för VirtualBox Gästtillägg</translation> </message> <message> <source>Downloading the VirtualBox Guest Additions CD image from <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished">Hämtar ner cd-avbildning för VirtualBox Gästtillägg från <nobr><b>%1</b>...</nobr></translation> + <translation>Hämtar ner cd-avbildning för VirtualBox Gästtillägg från <nobr><b>%1</b>...</nobr></translation> </message> </context> <context> <name>UIMiniProcessWidgetUserManual</name> <message> <source>Cancel</source> - <translation type="unfinished">Avbryt</translation> + <translation>Avbryt</translation> </message> <message> <source>Cancel the VirtualBox User Manual download</source> - <translation type="unfinished"></translation> + <translation>Avbryt hämtning av användarhandboken för VirtualBox</translation> </message> <message> <source>Downloading the VirtualBox User Manual</source> - <translation type="unfinished"></translation> + <translation>Hämtar användarhandboken för VirtualBox</translation> </message> <message> <source>Downloading the VirtualBox User Manual <nobr><b>%1</b>...</nobr></source> - <translation type="unfinished"></translation> + <translation>Hämtar användarhandboken för VirtualBox <nobr><b>%1</b>...</nobr></translation> </message> </context> <context> <name>UIMultiScreenLayout</name> <message> <source>Virtual Screen %1</source> - <translation type="unfinished"></translation> + <translation>Virtuell skärm %1</translation> </message> <message> <source>Use Host Screen %1</source> - <translation type="unfinished"></translation> + <translation>Använd värdskärm %1</translation> </message> </context> <context> @@ -1720,103 +1720,103 @@ p, li { white-space: pre-wrap; } <name>UINewHDWzdPage1</name> <message> <source>Welcome to the Create New Virtual Disk Wizard!</source> - <translation type="unfinished">Välkommen till guiden för att skapa ny virtuell disk!</translation> + <translation>Välkommen till guiden för att skapa ny virtuell disk!</translation> </message> <message> <source><p>This wizard will help you to create a new virtual hard disk for your virtual machine.</p><p>%1</p></source> - <translation type="unfinished"></translation> + <translation><p>Denna guide hjälper dig att skapa en ny virtuell hårddisk för din virtuella maskin.</p><p>%1</p></translation> </message> </context> <context> <name>UINewHDWzdPage2</name> <message> <source><p>Select the type of virtual hard disk you want to create.</p><p>A <b>dynamically expanding storage</b> initially occupies a very small amount of space on your physical hard disk. It will grow dynamically (up to the size specified) as the Guest OS claims disk space.</p><p>A <b>fixed-size storage</b> does not grow. It is stored in a file of approximately the same size as the size of the virtual hard disk. The creation of a fixed-size storage may take a long time depending on the storage size and the write performance of your harddisk.</p></source> - <translation type="unfinished"><p>Välj den typ av virtuell hårddisk som du vill skapa.</p><p>En <b>dynamiskt växande lagring</b> tar initialt upp en mycket liten mängd utrymme på din fysiska hårddisk. Den kommer att växa dynamiskt (upp till angiven storlek) allt eftersom gästoperativsystemet använder det lediga diskutrymmet.</p><p>En <b>lagring med fast storlek</b> växer inte. Den lagras i en fil av ungefär samma storlek som den virtuella hårddisken. Skapandet av en lagringsplats med fast storlek kan ta lång tid beroende på lagringsstorleken och skrivprestandan för din hårddisk.</p></translation> + <translation><p>Välj den typ av virtuell hårddisk som du vill skapa.</p><p>En <b>dynamiskt växande lagring</b> tar initialt upp en mycket liten mängd utrymme på din fysiska hårddisk. Den kommer att växa dynamiskt (upp till angiven storlek) allt eftersom gästoperativsystemet behöver diskutrymme.</p><p>En <b>lagring med fast storlek</b> växer inte. Den lagras i en fil av ungefär samma storlek som den virtuella hårddisken. Skapandet av en lagringsplats med fast storlek kan ta lång tid beroende på lagringsstorleken och skrivprestandan för din hårddisk.</p></translation> </message> <message> <source>Storage Type</source> - <translation type="unfinished">Lagringstyp</translation> + <translation>Lagringstyp</translation> </message> <message> <source>&Dynamically expanding storage</source> - <translation type="unfinished">&Dynamiskt växande lagring</translation> + <translation>&Dynamiskt växande lagring</translation> </message> <message> <source>&Fixed-size storage</source> - <translation type="unfinished">Lagring med &fast storlek</translation> + <translation>Lagring med &fast storlek</translation> </message> <message> <source>Hard Disk Storage Type</source> - <translation type="unfinished">Lagringstyp för hårddisk</translation> + <translation>Lagringstyp för hårddisk</translation> </message> </context> <context> <name>UINewHDWzdPage3</name> <message> <source><p>Press the <b>Select</b> button to select the location of a file to store the hard disk data or type a file name in the entry field.</p></source> - <translation type="unfinished"><p>Tryck på knappen <b>Välj</b> för att välja platsen för en fil att lagra hårddiskens data eller ange ett filnamn i inmatningsfältet.</p></translation> + <translation><p>Tryck på knappen <b>Välj</b> för att välja platsen för en fil att lagra hårddiskens data till eller ange ett filnamn i inmatningsfältet.</p></translation> </message> <message> <source>&Location</source> - <translation type="unfinished">&Plats</translation> + <translation>&Plats</translation> </message> <message> <source><p>Select the size of the virtual hard disk in megabytes. This size will be reported to the Guest OS as the maximum size of this hard disk.</p></source> - <translation type="unfinished"><p>Välj storleken för den virtuella hårddisken i megabyte. Denna storlek kommer att rapporteras till gästoperativsystemet som den maximala storleken för denna hårddisk.</p></translation> + <translation><p>Välj storleken för den virtuella hårddisken i megabyte. Denna storlek kommer att rapporteras till gästoperativsystemet som den maximala storleken för denna hårddisk.</p></translation> </message> <message> <source>&Size</source> - <translation type="unfinished">&Storlek</translation> + <translation>&Storlek</translation> </message> <message> <source>Virtual Disk Location and Size</source> - <translation type="unfinished">Plats och storlek för virtuell disk</translation> + <translation>Plats och storlek för virtuell disk</translation> </message> <message> <source>Select a file for the new hard disk image file</source> - <translation type="unfinished">Välj en fil för den nya hårddiskavbildningsfilen</translation> + <translation>Välj en fil för den nya hårddiskavbildningsfilen</translation> </message> <message> <source>Hard disk images (*.vdi)</source> - <translation type="unfinished">Hårddiskavbildningar (*.vdi)</translation> + <translation>Hårddiskavbildningar (*.vdi)</translation> </message> <message> <source><nobr>%1 (%2 B)</nobr></source> - <translation type="unfinished"></translation> + <translation><nobr>%1 (%2 B)</nobr></translation> </message> </context> <context> <name>UINewHDWzdPage4</name> <message> <source>You are going to create a new virtual hard disk with the following parameters:</source> - <translation type="unfinished">Du är på väg att skapa en ny virtuell hårddisk med följande parametrar:</translation> + <translation>Du är på väg att skapa en ny virtuell hårddisk med följande parametrar:</translation> </message> <message> <source>Summary</source> - <translation type="unfinished">Sammandrag</translation> + <translation>Sammandrag</translation> </message> <message> <source>%1 B</source> - <translation type="unfinished"></translation> + <translation>%1 B</translation> </message> <message> <source>Type</source> <comment>summary</comment> - <translation type="unfinished">Typ</translation> + <translation>Typ</translation> </message> <message> <source>Location</source> <comment>summary</comment> - <translation type="unfinished">Plats</translation> + <translation>Plats</translation> </message> <message> <source>Size</source> <comment>summary</comment> - <translation type="unfinished">Storlek</translation> + <translation>Storlek</translation> </message> <message> <source>If the above settings are correct, press the <b>%1</b> button. Once you press it, a new hard disk will be created.</source> - <translation type="unfinished"></translation> + <translation>Tryck på <b>%1</b>-knappen om ovanstående inställningar är korrekta. När du har tryckt på den kommer en ny hårddisk att skapas.</translation> </message> </context> <context> @@ -1967,65 +1967,65 @@ p, li { white-space: pre-wrap; } <name>UINewVMWzdPage1</name> <message> <source>Welcome to the New Virtual Machine Wizard!</source> - <translation type="unfinished">Välkommen till guiden för ny virtuell maskin!</translation> + <translation>Välkommen till guiden för ny virtuell maskin!</translation> </message> <message> <source><p>This wizard will guide you through the steps that are necessary to create a new virtual machine for VirtualBox.</p><p>%1</p></source> - <translation type="unfinished"></translation> + <translation><p>Denna guide hjälper dig genom de steg som krävs för att skapa en ny virtuell maskin för VirtualBox.</p><p>%1</p></translation> </message> </context> <context> <name>UINewVMWzdPage2</name> <message> <source><p>Enter a name for the new virtual machine and select the type of the guest operating system you plan to install onto the virtual machine.</p><p>The name of the virtual machine usually indicates its software and hardware configuration. It will be used by all VirtualBox components to identify your virtual machine.</p></source> - <translation type="unfinished"><p>Ange ett namn för den nya virtuella maskinen och välj vilken typ av gästoperativsystem som du planerar att installera på den virtuella maskinen.</p><p>Namnet på den virtuella maskinen brukar ofta indikera dess programvara och maskinvarukonfiguration. Det kommer att användas av alla VirtualBox-komponenter för att identifiera din virtuella maskin.</p></translation> + <translation><p>Ange ett namn för den nya virtuella maskinen och välj vilken typ av gästoperativsystem som du planerar att installera på den virtuella maskinen.</p><p>Namnet på den virtuella maskinen brukar ofta indikera dess programvara och maskinvarukonfiguration. Det kommer att användas av alla VirtualBox-komponenter för att identifiera din virtuella maskin.</p></translation> </message> <message> <source>N&ame</source> - <translation type="unfinished">N&amn</translation> + <translation>N&amn</translation> </message> <message> <source>OS &Type</source> - <translation type="unfinished">Operativsys&tem</translation> + <translation>Operativsys&tem</translation> </message> <message> <source>VM Name and OS Type</source> - <translation type="unfinished">Namn och operativsystem</translation> + <translation>Namn och operativsystem</translation> </message> </context> <context> <name>UINewVMWzdPage3</name> <message> <source><p>Select the amount of base memory (RAM) in megabytes to be allocated to the virtual machine.</p></source> - <translation type="unfinished"><p>Välj den mängd basminne (RAM) i megabyte som ska allokeras till den virtuella maskinen.</p></translation> + <translation><p>Välj den mängd basminne (RAM) i megabyte som ska allokeras till den virtuella maskinen.</p></translation> </message> <message> <source>Base &Memory Size</source> - <translation type="unfinished">Bas&minnesstorlek</translation> + <translation>Bas&minnesstorlek</translation> </message> <message> <source>MB</source> - <translation type="unfinished">MB</translation> + <translation>MB</translation> </message> <message> <source>Memory</source> - <translation type="unfinished">Minne</translation> + <translation>Minne</translation> </message> <message> <source>The recommended base memory size is <b>%1</b> MB.</source> - <translation type="unfinished">Den rekommenderade storleken på basminnet är <b>%1</b> MB.</translation> + <translation>Rekommenderad storlek för basminnet är <b>%1</b> MB.</translation> </message> <message> <source>MB</source> <comment>size suffix MBytes=1024 KBytes</comment> - <translation type="unfinished">MB</translation> + <translation>MB</translation> </message> </context> <context> <name>UINewVMWzdPage4</name> <message> <source><p>Select a hard disk image to be used as the boot hard disk of the virtual machine. You can either create a new hard disk using the <b>New</b> button or select an existing hard disk image from the drop-down list or by pressing the <b>Existing</b> button (to invoke the Virtual Media Manager dialog).</p><p>If you need a more complicated hard disk setup, you can also skip this step and attach hard disks later using the VM Settings dialog.</p></source> - <translation type="unfinished"><p>Välj en hårddiskavbildning att använda som uppstartshårddisk för den virtuella maskinen. Du kan antingen skapa en ny hårddisk med knappen <b>Ny</b> eller välja en befintlig hårddiskavbildning från rullgardinslistan eller genom att trycka på knappen <b>Befintlig</b> (för att anropa Hantera för virtuella media).</p><p>Om du behöver en mer komplicerad hårddiskkonfiguration kan du även hoppa över detta steg och ansluta hårddiskar senare via inställningarna för virtuella maskinen.</p></translation> + <translation><p>Välj en hårddiskavbildning att använda som uppstartshårddisk för den virtuella maskinen. Du kan antingen skapa en ny hårddisk med knappen <b>Ny</b> eller välja en befintlig hårddiskavbildning från rullgardinslistan eller genom att trycka på knappen <b>Befintlig</b> (för att anropa Hanterare för virtuella media).</p><p>Om du behöver en mer komplicerad hårddiskkonfiguration kan du även hoppa över detta steg och ansluta hårddiskar senare via inställningarna för virtuella maskinen.</p></translation> </message> <message> <source>Boot Hard &Disk (Primary Master)</source> @@ -2033,63 +2033,63 @@ p, li { white-space: pre-wrap; } </message> <message> <source>&Create new hard disk</source> - <translation type="unfinished">&Skapa ny hårddisk</translation> + <translation>&Skapa ny hårddisk</translation> </message> <message> <source>&Use existing hard disk</source> - <translation type="unfinished">&Använd befintlig hårddisk</translation> + <translation>&Använd befintlig hårddisk</translation> </message> <message> <source>Virtual Hard Disk</source> - <translation type="unfinished">Virtuell hårddisk</translation> + <translation>Virtuell hårddisk</translation> </message> <message> <source>The recommended size of the boot hard disk is <b>%1</b> MB.</source> - <translation type="unfinished">Den rekommenderade storleken på uppstartshårddisken är <b>%1</b> MB.</translation> + <translation>Rekommenderad storlek för uppstartshårddisken är <b>%1</b> MB.</translation> </message> <message> <source>Boot Hard &Disk</source> - <translation type="unfinished"></translation> + <translation>Uppstartshård&disk</translation> </message> </context> <context> <name>UINewVMWzdPage5</name> <message> <source><p>You are going to create a new virtual machine with the following parameters:</p></source> - <translation type="unfinished"><p>Du är på väg att skapa en ny virtuell maskin med följande parametrar:</p></translation> + <translation><p>Du är på väg att skapa en ny virtuell maskin med följande parametrar:</p></translation> </message> <message> <source>Summary</source> - <translation type="unfinished">Sammandrag</translation> + <translation>Sammandrag</translation> </message> <message> <source>Name</source> <comment>summary</comment> - <translation type="unfinished">Namn</translation> + <translation>Namn</translation> </message> <message> <source>OS Type</source> <comment>summary</comment> - <translation type="unfinished">Operativsystem</translation> + <translation>Operativsystem</translation> </message> <message> <source>Base Memory</source> <comment>summary</comment> - <translation type="unfinished">Basminne</translation> + <translation>Basminne</translation> </message> <message> <source>MB</source> <comment>size suffix MBytes=1024KBytes</comment> - <translation type="unfinished">MB</translation> + <translation>MB</translation> </message> <message> <source>Boot Hard Disk</source> <comment>summary</comment> - <translation type="unfinished">Uppstartshårddisk</translation> + <translation>Uppstartshårddisk</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> - <translation type="unfinished"></translation> + <translation><p>Tryck på <b>%1</b>-knappen om ovanstående är korrekt. När du trycker på den kommer en ny virtuell maskin att skapas. </p><p>Observera att du kan ändra dessa inställningar och alla andra inställningar för den skapade virtuella maskinen när som helst via <b>Inställningar</b>-dialogen som du kommer åt genom menyn i huvudfönstret.</p></translation> </message> </context> <context> @@ -2256,7 +2256,7 @@ Version %1</translation> <message> <source>MB</source> <comment>size suffix MBytes=1024 KBytes</comment> - <translation type="unfinished">MB</translation> + <translation>MB</translation> </message> <message> <source>MB</source> @@ -2265,7 +2265,7 @@ Version %1</translation> </message> <message> <source>Hard Disk Controller (SAS)</source> - <translation type="unfinished"></translation> + <translation>Hårddiskstyrkort (SAS)</translation> </message> </context> <context> @@ -3195,11 +3195,11 @@ Version %1</translation> </message> <message> <source>Reset Host Key</source> - <translation type="unfinished"></translation> + <translation>Nollställ värdtangent</translation> </message> <message> <source>Resets the key used as a Host Key in the VM window.</source> - <translation type="unfinished"></translation> + <translation>Nollställer tangenten som används för värdtangent i fönstret för virtuella maskiner.</translation> </message> </context> <context> @@ -4762,91 +4762,91 @@ Version %1</translation> <message> <source>Screens</source> <comment>details report</comment> - <translation type="unfinished"></translation> + <translation>Skärmar</translation> </message> <message> <source>VDE network, '%1'</source> <comment>details report (network)</comment> - <translation type="unfinished"></translation> + <translation>VDE-nätverk, "%1"</translation> </message> <message> <source>SAS</source> <comment>StorageBus</comment> - <translation type="unfinished"></translation> + <translation>SAS</translation> </message> <message> <source>VDE Adapter</source> <comment>NetworkAttachmentType</comment> - <translation type="unfinished"></translation> + <translation>VDE-adapter</translation> </message> <message> <source>LsiLogic SAS</source> <comment>StorageControllerType</comment> - <translation type="unfinished"></translation> + <translation>LsiLogic SAS</translation> </message> <message> <source>^(?:(?:(\d+)(?:\s?(B|KB|MB|GB|TB|PB))?)|(?:(\d*)%1(\d{1,2})(?:\s?(KB|MB|GB|TB|PB))))$</source> <comment>regexp for matching ####[.##] B|KB|MB|GB|TB|PB, %1=decimal point</comment> - <translation type="unfinished"></translation> + <translation>^(?:(?:(\d+)(?:\s?(B|KB|MB|GB|TB|PB))?)|(?:(\d*)%1(\d{1,2})(?:\s?(KB|MB|GB|TB|PB))))$</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>GB</translation> </message> <message> <source>TB</source> <comment>size suffix TBytes=1024 GBytes</comment> - <translation type="unfinished"></translation> + <translation>TB</translation> </message> <message> <source>PB</source> <comment>size suffix PBytes=1024 TBytes</comment> - <translation type="unfinished"></translation> + <translation>PB</translation> </message> <message> <source>Enabled</source> <comment>nested paging</comment> - <translation type="unfinished"></translation> + <translation>Aktiverad</translation> </message> <message> <source>Disabled</source> <comment>nested paging</comment> - <translation type="unfinished"></translation> + <translation>Inaktiverad</translation> </message> <message> <source>Nested Paging</source> - <translation type="unfinished">Nested Paging</translation> + <translation>Nested Paging</translation> </message> <message> <source>Shareable</source> <comment>DiskType</comment> - <translation type="unfinished"></translation> + <translation>Delningsbar</translation> </message> <message> <source>Unknown device</source> <comment>USB device details</comment> - <translation type="unfinished"></translation> + <translation>Okänd enhet</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> </context> <context> @@ -6226,51 +6226,51 @@ Version %1</translation> </message> <message> <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</source> - <translation type="unfinished"></translation> + <translation><p>VT-x/AMD-V maskinvaruacceleration är inte tillgängligt på ditt system. Ditt 64-bitars gästoperativsystem kommer inte kunna identifiera en 64-bitars processor och kommer inte kunna starta upp.</translation> </message> <message> <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Certain guests (e.g. OS/2 and QNX) require this feature and will fail to boot without it.</p></source> - <translation type="unfinished"></translation> + <translation><p>VT-x/AMD-V maskinvaruacceleration är inte tillgängligt på ditt system. Vissa gästoperativsystem (t.ex. OS/2 och QNX) kräver denna funktion och kommer inte kunna starta upp utan den.</p></translation> </message> <message> <source><p>Deleting the snapshot %1 will temporarily need more disk space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of disk space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source> - <translation type="unfinished"></translation> + <translation><p>Borttagning av ögonblicksbilden %1 kommer temporärt behöva mer diskutrymme. I värsta fall kommer storleken för avbildningen %2 att växa med %3, dock finns det bara %4 ledigt på detta filsystem.</p><p>Slut på diskutrymme under sammanslagningsåtgärden kan resultera i att avbildningen och konfigurationen skadas, alltså att den virtuella maskinen och dess data går förlorade.</p><p>Du kan fortsätta med borttagningen av ögonblicksbilden på egen risk.</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> - <translation type="unfinished"></translation> + <translation><p>Kunde inte ändra gästskärmen till denna värdskärm på grund av otillräckligt grafikminne på gästoperativsystemet.</p><p>Du bör konfigurera den virtuella maskinen till att ha minst <b>%1</b> grafikminne.</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><p>Press <b>Ignore</b> to switch the screen anyway or press <b>Cancel</b> to cancel the operation.</p></source> - <translation type="unfinished"></translation> + <translation><p>Kunde inte ändra gästskärmen till denna värdskärm på grund av otillräckligt grafikminne på gästoperativsystemet.</p><p>Du bör konfigurera den virtuella maskinen till att ha minst <b>%1</b> grafikminne.</p><p>Tryck på<b>Ignorera</b> för att växla till skärmen ändå eller tryck <b>Avbryt</b> för att avbryta åtgärden.</p></translation> </message> <message> <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 type="unfinished"></translation> + <translation><p>Kan inte växla gästskärmen till helskärmsläge. Du har fler virtuella skärmar konfigurerade än vad du har fysiska skärmar anslutna till din värd.</p><p>Minska antingen antalet virtuella skärmar i din konfiguration av den virtuella maskinen eller anslut ytterligare skärmar till din värd.</p></translation> </message> <message> <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 type="unfinished"></translation> + <translation><p>Kan inte växla gästskärmen till sömlöst läge. Du har fler virtuella skärmar konfigurerade än vad du har fysiska skärmar anslutna till din värd.</p><p>Minska antingen antalet virtuella skärmar i din konfiguration av den virtuella maskinen eller anslut ytterligare skärmar till din värd.</p></translation> </message> <message> <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 type="unfinished"></translation> + <translation><p>Kunde inte hitta användarhandboken för VirtualBox User <nobr><b>%1</b>.</nobr></p><p>Vill du hämta denna fil från Internet?</p></translation> </message> <message> <source><p>Are you sure you want to download the VirtualBox User Manual from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source> - <translation type="unfinished"></translation> + <translation><p>Är du säker på att du vill hämta användarhandboken för VirtualBox från <nobr><a href="%1">%2</a></nobr> (storlek %3 byte)?</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> - <translation type="unfinished"></translation> + <translation><p>Misslyckades med att hämta användarhandboken för VirtualBox från <nobr><a href="%1">%2</a>.</nobr></p><p>%3</p></translation> </message> <message> <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p></source> - <translation type="unfinished"></translation> + <translation><p>Användarhandboken för VirtualBox har hämtats från <nobr><a href="%1">%2</a></nobr> och sparats lokalt som <nobr><b>%3</b>.</nobr></p></translation> </message> <message> <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source> - <translation type="unfinished"></translation> + <translation><p>Användarhandboken för VirtualBox har hämtats från <nobr><a href="%1">%2</a></nobr> men kan inte sparas lokalt som <nobr><b>%3</b>.</nobr></p><p>Välj en annan plats för denna fil.</p></translation> </message> </context> <context> @@ -6678,12 +6678,12 @@ Version %1</translation> <message> <source>&File</source> <comment>Mac OS X version</comment> - <translation type="unfinished">&Arkiv</translation> + <translation>&Arkiv</translation> </message> <message> <source>&File</source> <comment>Non Mac OS X version</comment> - <translation type="unfinished">&Arkiv</translation> + <translation>&Arkiv</translation> </message> </context> <context> @@ -7529,15 +7529,15 @@ Version %1</translation> </message> <message> <source>Mo&nitor Count:</source> - <translation type="unfinished"></translation> + <translation>S&kärmantal:</translation> </message> <message> <source>Controls the amount of virtual monitors provided to the virtual machine.</source> - <translation type="unfinished"></translation> + <translation>Styr antalet virtuella skärmar som tillhandahålls den virtuella maskinen.</translation> </message> <message> <source><qt>%1</qt></source> - <translation type="unfinished"></translation> + <translation><qt>%1</qt></translation> </message> </context> <context> @@ -7628,7 +7628,7 @@ Version %1</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>du har aktiverat en USB HID (Human Interface Device). Detta kommer inte att fungera såvida inte USB-emulering även aktiveras. Detta sker automatiskt när du accepterar inställningarna för virtuella maskinen genom att trycka på OK-knappen.</translation> </message> </context> <context> @@ -8213,27 +8213,27 @@ Version %1</translation> </message> <message> <source>Allows to use host I/O caching capabilities.</source> - <translation type="unfinished"></translation> + <translation>Tillåter användning av värdförmågor för in/ut-mellanlagring.</translation> </message> <message> <source>Use host I/O cache</source> - <translation type="unfinished"></translation> + <translation>Använd in/ut-mellanlagring för värd</translation> </message> <message> <source>Add SAS Controller</source> - <translation type="unfinished"></translation> + <translation>Lägg till SAS-styrkort</translation> </message> <message> <source>SAS Controller</source> - <translation type="unfinished"></translation> + <translation>SAS-styrkort</translation> </message> <message> <source>Storage Controller</source> - <translation type="unfinished"></translation> + <translation>Lagringsstyrkort</translation> </message> <message> <source>Storage Controller 1</source> - <translation type="unfinished"></translation> + <translation>Lagringsstyrkort 1</translation> </message> </context> <context> @@ -8988,23 +8988,23 @@ serial ports</comment> </message> <message> <source>If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source> - <translation type="unfinished"></translation> + <translation>Om kryssad kommer RTC-enheten att rapportera tiden i UTC, om inte i lokaltid (värd). Unix förväntar sig oftast att maskinvaruklockan ställs in i UTC.</translation> </message> <message> <source>Hardware clock in &UTC time</source> - <translation type="unfinished"></translation> + <translation>Maskinvaruklocka i &UTC-tid</translation> </message> <message> <source>Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.</source> - <translation type="unfinished"></translation> + <translation>Styr antalet virtuella processorer i den virtuella maskinen. Du behöver stöd för maskinvaruvirtualisering på ditt värdsystem för att använda fler än en virtuell processor.</translation> </message> <message> <source>If checked, an absolute pointing device (a USB tablet) will be supported. Otherwise, only a standard PS/2 mouse will be emulated.</source> - <translation type="unfinished"></translation> + <translation>Om kryssad kommer en absolut pekenhet (en USB-ritbräda) att ges stöd för. Om inte kommer en standard PS/2-mus att emuleras.</translation> </message> <message> <source>Enable &absolute pointing device</source> - <translation type="unfinished"></translation> + <translation>Aktivera &absolut pekenhet</translation> </message> </context> <context> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts index 6cb12b74b..4230cca1a 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts @@ -417,7 +417,7 @@ </message> <message> <source>&Details (%1 of %2)</source> - <translation>明细 (%1/%2)(&D)</translation> + <translation>明细 (%2/%1)(&D)</translation> </message> </context> <context> diff --git a/src/VBox/Frontends/VirtualBox/nls/qt_hu.ts b/src/VBox/Frontends/VirtualBox/nls/qt_hu.ts index 9a1ea5c3b..d5e197d7f 100644 --- a/src/VBox/Frontends/VirtualBox/nls/qt_hu.ts +++ b/src/VBox/Frontends/VirtualBox/nls/qt_hu.ts @@ -2436,7 +2436,7 @@ Biztosan törlöd?</translation> </message> <message> <source>Unable to execute select statement</source> - <translation>A SELECT utasítás nem végrehajtható</translation> + <translation type="unfinished">A SELECT utasítás nem végrehajtható</translation> </message> <message> <source>Unable to execute statement</source> @@ -3248,11 +3248,11 @@ Válassz másik fájlnevet.</translation> </message> <message> <source>Page up</source> - <translation>Oldal felfelé</translation> + <translation>Egy oldalt fel</translation> </message> <message> <source>Page right</source> - <translation>Oldal jobbra</translation> + <translation>Egy oldalt jobbra</translation> </message> <message> <source>Page down</source> diff --git a/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h b/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h index ef2c8809a..8e82101d7 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h @@ -661,11 +661,8 @@ public: if (aIface) { mIface = NULL; -#if !defined (VBOX_WITH_XPCOM) - B::mRC = aIface->QueryInterface (_ATL_IIDOF (I), (void **) &mIface); -#else /* !defined (VBOX_WITH_XPCOM) */ - B::mRC = aIface->QueryInterface (NS_GET_IID (I), (void **) &mIface); -#endif /* !defined (VBOX_WITH_XPCOM) */ + B::mRC = aIface->QueryInterface (COM_IIDOF (I), (void **) &mIface); + release (aIface); } else { diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp index 0b65679d5..6427b1057 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp @@ -2971,8 +2971,8 @@ QString VBoxGlobal::languageCountryEnglish() const /** * Comma-separated list of authors of the currently installed translation. * Returns "Oracle Corporation" if no translation is installed or if the - * translation file is invalid, or if the translation is supplied by Sun - * Microsystems, inc. + * translation file is invalid, or if the translation is supplied by Oracle + * Corporation */ QString VBoxGlobal::languageTranslators() const { @@ -3352,14 +3352,14 @@ void VBoxGlobal::loadLanguage (const QString &aLangId) Assert (qtSysTr); if (qtSysTr && qtSysTr->load (languageFileName)) qApp->installTranslator (qtSysTr); - /* Note that the Qt translation supplied by Sun is always loaded + /* Note that the Qt translation supplied by Oracle is always loaded * afterwards to make sure it will take precedence over the system * translation (it may contain more decent variants of translation * that better correspond to VirtualBox UI). We need to load both * because a newer version of Qt may be installed on the user computer - * and the Sun version may not fully support it. We don't do it on + * and the Oracle version may not fully support it. We don't do it on * Win32 because we supply a Qt library there and therefore the - * Sun translation is always the best one. */ + * Oracle translation is always the best one. */ #endif languageFileName = nlsDir.absoluteFilePath (QString ("qt_") + sLoadedLangId + diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp index ef2b849dd..eb9da8b12 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp @@ -557,7 +557,7 @@ void UIMachineLogic::prepareDock() * this. */ QList<QAction*> actions = actionsPool()->action(UIActionIndex_Menu_Machine)->menu()->actions(); for (int i=0; i < actions.size(); ++i) - if (actions.at(i)->menuRole() == QAction::TextHeuristicRole) + if (actions.at(i)->menuRole() == QAction::NoRole) pDockMenu->addAction(actions.at(i)); pDockMenu->addSeparator(); diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp index 7c0d069b8..83175ffc5 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp @@ -1606,7 +1606,10 @@ bool UIMachineView::keyEvent(int iKey, uint8_t uScan, int fFlags, wchar_t *pUniK if (!XkbTranslateKeySym(display, &ks, 0, &ch, 1, NULL) == 1) ch = 0; if (ch) + { QChar c = QString::fromLocal8Bit(&ch, 1)[0]; + processed = machineLogic()->actionsPool()->processHotKey(QKeySequence((Qt::UNICODE_ACCEL + QChar(c).toUpper().unicode()))); + } } #elif defined (Q_WS_MAC) if (pUniKey && pUniKey[0] && !pUniKey[1]) @@ -2242,7 +2245,14 @@ bool UIMachineView::x11Event(XEvent *pEvent) flags |= KeyPrint; break; case XK_Pause: - flags |= KeyPause; + if (pEvent->xkey.state & ControlMask) /* Break */ + { + ks = XK_Break; + flags |= KeyExtended; + scan = 0x46; + } + else + flags |= KeyPause; break; } diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp index 0ed198750..568ba9d64 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp @@ -206,6 +206,7 @@ void UIMachineWindowFullscreen::prepareMiniToolBar() for (int i=0; i < actions.size(); ++i) menus << actions.at(i)->menu(); *m_pMiniToolBar << menus; + connect(m_pMiniToolBar, SIGNAL(minimizeAction()), this, SLOT(showMinimized())); connect(m_pMiniToolBar, SIGNAL(exitAction()), uisession()->actionsPool()->action(UIActionIndex_Toggle_Fullscreen), SLOT(trigger())); connect(m_pMiniToolBar, SIGNAL(closeAction()), diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp index 63828399b..5b0870676 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp @@ -255,6 +255,7 @@ void UIMachineWindowSeamless::prepareMiniToolBar() for (int i=0; i < actions.size(); ++i) menus << actions.at(i)->menu(); *m_pMiniToolBar << menus; + connect(m_pMiniToolBar, SIGNAL(minimizeAction()), this, SLOT(showMinimized())); connect(m_pMiniToolBar, SIGNAL(exitAction()), uisession()->actionsPool()->action(UIActionIndex_Toggle_Seamless), SLOT(trigger())); connect(m_pMiniToolBar, SIGNAL(closeAction()), diff --git a/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsUSB.cpp b/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsUSB.cpp index 69fe9d80a..e28d6e35d 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsUSB.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsUSB.cpp @@ -127,6 +127,10 @@ VBoxVMSettingsUSB::VBoxVMSettingsUSB (FilterType aType) /* Applying language settings */ retranslateUi(); + +#ifndef VBOX_WITH_EHCI + mCbUSB2->setHidden(true); +#endif } bool VBoxVMSettingsUSB::isOHCIEnabled() const diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp index 02211372d..725afe211 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp @@ -39,6 +39,7 @@ VBoxMiniToolBar::VBoxMiniToolBar(QWidget *pParent, Alignment alignment, bool fAc : VBoxToolBar(pParent) , m_pAutoHideAction(0) , m_pDisplayLabel(0) + , m_pMinimizeAction(0) , m_pRestoreAction(0) , m_pCloseAction(0) , m_fActive(fActive) @@ -94,6 +95,13 @@ VBoxMiniToolBar::VBoxMiniToolBar(QWidget *pParent, Alignment alignment, bool fAc /* Right label margin: */ m_LabelMargins << widgetForAction(addWidget(new QWidget(this))); + /* Minimize action: */ + m_pMinimizeAction = new QAction(this); + m_pMinimizeAction->setIcon(VBoxGlobal::iconSet(":/minimize_16px.png")); + m_pMinimizeAction->setToolTip(tr("Minimize Window")); + connect(m_pMinimizeAction, SIGNAL(triggered()), this, SIGNAL(minimizeAction())); + addAction(m_pMinimizeAction); + /* Exit action: */ m_pRestoreAction = new QAction(this); m_pRestoreAction->setIcon(VBoxGlobal::iconSet(":/restore_16px.png")); @@ -454,6 +462,8 @@ void VBoxMiniToolBar::setMouseTrackingEnabled(bool fEnabled) m_pDisplayLabel->setMouseTracking(fEnabled); if (m_pAutoHideAction && widgetForAction(m_pAutoHideAction)) widgetForAction(m_pAutoHideAction)->setMouseTracking(fEnabled); + if (m_pMinimizeAction && widgetForAction(m_pMinimizeAction)) + widgetForAction(m_pMinimizeAction)->setMouseTracking(fEnabled); if (m_pRestoreAction && widgetForAction(m_pRestoreAction)) widgetForAction(m_pRestoreAction)->setMouseTracking(fEnabled); if (m_pCloseAction && widgetForAction(m_pCloseAction)) diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.h b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.h index 91edd5ed7..03145a19f 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.h @@ -58,6 +58,7 @@ public: signals: + void minimizeAction(); void exitAction(); void closeAction(); void geometryUpdated(); @@ -83,6 +84,7 @@ private: QAction *m_pAutoHideAction; QLabel *m_pDisplayLabel; + QAction *m_pMinimizeAction; QAction *m_pRestoreAction; QAction *m_pCloseAction; diff --git a/src/VBox/Frontends/VirtualBox/src/win/VirtualBox.rc b/src/VBox/Frontends/VirtualBox/src/win/VirtualBox.rc index 0d1396097..a31e2d47a 100644 --- a/src/VBox/Frontends/VirtualBox/src/win/VirtualBox.rc +++ b/src/VBox/Frontends/VirtualBox/src/win/VirtualBox.rc @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-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; @@ -37,11 +37,11 @@ BEGIN BEGIN VALUE "CompanyName", VBOX_RC_COMPANY_NAME VALUE "FileDescription", "VirtualBox GUI\0" - VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" + VALUE "FileVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0" VALUE "InternalName", "VirtualBox.exe\0" VALUE "LegalCopyright", VBOX_RC_LEGAL_COPYRIGHT VALUE "OriginalFilename","VirtualBox.exe\0" - VALUE "ProductName", "Sun VirtualBox\0" + VALUE "ProductName", VBOX_PRODUCT "\0" VALUE "ProductVersion", VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0" END END diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp index 0811ff2c2..f2018da6d 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp @@ -195,7 +195,8 @@ bool UIImportApplianceWzdPage1::validatePage() /* Set the file path only if something had changed */ if (m_pFileSelector->isModified()) { - applianceWidget->setFile(m_pFileSelector->path()); + if (!applianceWidget->setFile(m_pFileSelector->path())) + return false; /* Reset the modified bit afterwards */ m_pFileSelector->resetModified(); } diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp index 5390999f6..74505e374 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp @@ -72,12 +72,12 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, /* Code names for Linux distributions */ - { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, - { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)", Qt::CaseInsensitive), "Ubuntu" }, - { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, - { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(sid)", Qt::CaseInsensitive), "Debian" }, - { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)).*64", Qt::CaseInsensitive), "Fedora_64" }, - { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)", Qt::CaseInsensitive), "Fedora" }, + { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, + { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)", Qt::CaseInsensitive), "Ubuntu" }, + { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, + { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "Debian" }, + { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)).*64", Qt::CaseInsensitive), "Fedora_64" }, + { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)", Qt::CaseInsensitive), "Fedora" }, /* Regular names of Linux distributions */ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, @@ -482,6 +482,8 @@ void UINewVMWzdPage4::getWithMediaManager() m_pDiskSelector->setCurrentItem(newId); } + hardDiskSourceChanged(); + m_pDiskSelector->setFocus(); } |