From nobody Fri Dec 19 06:33:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678464776; cv=none; d=zohomail.com; s=zohoarc; b=TRnwX+5W5GTPlzbOwd5KuhV3x5uvMr0uqPari1CfpzUjddQ2u0nm8JfUn9tDdZBALK2YUtrwnYLLib9qDbvWPeH4QNvRF3pNF2ROV3GJi6ZWj9fmUded0auBqZ7f1iTR7kkXFNfyWlkAPnk1srdhAjcFtucuVEfVpmjw3+ouExg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464776; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JrPVoqiitdI/3eREwljTEAOylYpI4FESS+wdRi+QHc8=; b=nQZXnl69nwD46jijS6AVyggXqlaLurkh6UzDyQ+6p0SLyUq3g3wtTm7p2QYtt1Z5yEPm5M3HDqMzvbKpOwpgYkYLRPjv7MnqTImUrNr2ouEz0EJnHs+SCwozi5VqiqIS30xCgyNcdvzgiHUxgWWd93+W9mjDaZIrEqHqewo9mQs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1678464776654543.7077459750427; Fri, 10 Mar 2023 08:12:56 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-227-4nUZjW1JP0qHWAbD211MOg-1; Fri, 10 Mar 2023 11:11:40 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C8F73823DED; Fri, 10 Mar 2023 16:11:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEFFD1121339; Fri, 10 Mar 2023 16:11:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7D5161946A76; Fri, 10 Mar 2023 16:11:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 27F761946587 for ; Fri, 10 Mar 2023 16:11:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0DFF72166B2A; Fri, 10 Mar 2023 16:11:09 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B8C52166B26 for ; Fri, 10 Mar 2023 16:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464775; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JrPVoqiitdI/3eREwljTEAOylYpI4FESS+wdRi+QHc8=; b=dAnvHFKKSkrfMhHXow4MEGjpP4cSAsoT2GvA6K49+6rruSiexdfnjZhEFcCkdpWBka7ddR N1yPqpdYWXXL+SxoA5oMwkIXC/f8shjjUdeoeUsLt6V95qOeJNvp0f3IsWu/p0Ww+JnCpR kaxdCf1D1kc4xVGrn2mOl9MY+YeebtE= X-MC-Unique: 4nUZjW1JP0qHWAbD211MOg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 43/51] vbox: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:59 +0100 Message-Id: <395044f75cb2eb2a124ccbe41cb82f7ca5c8e46d.1678463799.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678464777634100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/vbox/vbox_XPCOMCGlue.c | 6 +- src/vbox/vbox_common.c | 157 +++++++++++++++++----------------- src/vbox/vbox_network.c | 2 +- src/vbox/vbox_snapshot_conf.c | 12 +-- src/vbox/vbox_storage.c | 20 ++--- src/vbox/vbox_tmpl.c | 16 ++-- 6 files changed, 106 insertions(+), 107 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 77a3041612..688211d122 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -86,7 +86,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreM= issing, =20 if (!virFileExists(name)) { if (!ignoreMissing) - VIR_ERROR(_("Library '%s' doesn't exist"), name); + VIR_ERROR(_("Library '%1$s' doesn't exist"), name); =20 VIR_FREE(name); return -1; @@ -124,7 +124,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignor= eMissing, dlsym(hVBoxXPCOMC, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME); =20 if (pfnGetFunctions =3D=3D NULL) { - VIR_ERROR(_("Could not dlsym %s from '%s': %s"), + VIR_ERROR(_("Could not dlsym %1$s from '%2$s': %3$s"), VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, name, dlerror()); goto cleanup; } @@ -132,7 +132,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignor= eMissing, pVBoxFuncs_v2_2 =3D pfnGetFunctions(VBOX_XPCOMC_VERSION); =20 if (pVBoxFuncs_v2_2 =3D=3D NULL) { - VIR_ERROR(_("Calling %s from '%s' failed"), + VIR_ERROR(_("Calling %1$s from '%2$s' failed"), VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, name); goto cleanup; } diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 7aed421390..34ca0cc28c 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -493,7 +493,7 @@ vboxSetStorageController(virDomainControllerDef *contro= ller, case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: vboxReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The vbox driver does not support %s controller = type"), + _("The vbox driver does not support %1$s controlle= r type"), virDomainControllerTypeToString(controller->type)); return -1; } @@ -527,13 +527,13 @@ vboxSetStorageController(virDomainControllerDef *cont= roller, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DC390: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AM53C974: vboxReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The vbox driver does not support %s SCSI co= ntroller model"), + _("The vbox driver does not support %1$s SCSI = controller model"), virDomainControllerModelSCSITypeToString(contr= oller->model)); goto cleanup; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected SCSI controller model %d"), + _("Unexpected SCSI controller model %1$d"), controller->model); goto cleanup; } @@ -555,7 +555,7 @@ vboxSetStorageController(virDomainControllerDef *contro= ller, case VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST: case VIR_DOMAIN_CONTROLLER_MODEL_IDE_DEFAULT: vboxReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unexpected IDE controller model %d"), + _("Unexpected IDE controller model %1$d"), controller->model); goto cleanup; } @@ -570,7 +570,7 @@ vboxSetStorageController(virDomainControllerDef *contro= ller, =20 if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to add storage controller (name: %s, bus= Type: %d)"), + _("Failed to add storage controller (name: %1$s, b= usType: %2$d)"), debugName, vboxBusType); goto cleanup; } @@ -883,7 +883,7 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr = conn, int id) * starts from 1, so refuse id =3D=3D 0, and adjust the rest */ if (id =3D=3D 0) { vboxReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id %d"), id); + _("no domain with matching id %1$d"), id); return NULL; } id =3D id - 1; @@ -1163,7 +1163,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDrive= r *data, IMachine *machine) =20 if (type !=3D VIR_STORAGE_TYPE_FILE) { vboxReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported storage type %s, the only suppo= rted type is %s"), + _("Unsupported storage type %1$s, the only sup= ported type is %2$s"), virStorageTypeToString(type), virStorageTypeToString(VIR_STORAGE_TYPE_FILE)); ret =3D -1; @@ -1197,7 +1197,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDrive= r *data, IMachine *machine) case VIR_DOMAIN_DISK_DEVICE_LUN: case VIR_DOMAIN_DISK_DEVICE_LAST: vboxReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The vbox driver does not support %s disk de= vice"), + _("The vbox driver does not support %1$s disk = device"), virDomainDiskDeviceTypeToString(disk->device)); ret =3D -1; goto cleanup; @@ -1238,7 +1238,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDrive= r *data, IMachine *machine) case VIR_DOMAIN_DISK_BUS_NONE: case VIR_DOMAIN_DISK_BUS_LAST: vboxReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The vbox driver does not support %s bus typ= e"), + _("The vbox driver does not support %1$s bus t= ype"), virDomainDiskBusTypeToString(disk->bus)); ret =3D -1; goto cleanup; @@ -1269,7 +1269,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDrive= r *data, IMachine *machine) =20 if (!medium) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to open the following disk/dvd/f= loppy to the machine: %s"), + _("Failed to open the following disk/dvd/f= loppy to the machine: %1$s"), src); ret =3D -1; goto cleanup; @@ -1278,7 +1278,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDrive= r *data, IMachine *machine) rc =3D gVBoxAPI.UIMedium.GetId(medium, &mediumUUID); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Can't get the UUID of the file to be at= tached as harddisk/dvd/floppy: %s"), + _("Can't get the UUID of the file to be at= tached as harddisk/dvd/floppy: %1$s"), src); ret =3D -1; goto cleanup; @@ -1313,7 +1313,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDrive= r *data, IMachine *machine) =20 if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not attach the file as harddisk/dvd/f= loppy: %s"), + _("Could not attach the file as harddisk/dvd/f= loppy: %1$s"), src); ret =3D -1; goto cleanup; @@ -1983,7 +1983,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags VIR_DIV_UP(def->mem.cur_balloon,= 1024)); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not set the memory size of the domain to:= %llu Kb"), + _("could not set the memory size of the domain to:= %1$llu Kb"), def->mem.cur_balloon); } =20 @@ -1994,7 +1994,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags rc =3D gVBoxAPI.UIMachine.SetCPUCount(machine, virDomainDefGetVcpusMax= (def)); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not set the number of virtual CPUs to: %u= "), + _("could not set the number of virtual CPUs to: %1= $u"), virDomainDefGetVcpusMax(def)); } =20 @@ -2003,7 +2003,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags VIR_TRISTATE_SWITCH_ON); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not change PAE status to: %s"), + _("could not change PAE status to: %1$s"), (def->features[VIR_DOMAIN_FEATURE_PAE] =3D=3D VIR_= TRISTATE_SWITCH_ON) ? _("Enabled") : _("Disabled")); } @@ -2015,7 +2015,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags VIR_TRISTATE_SWITCH_ON= ); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not change ACPI status to: %s"), + _("could not change ACPI status to: %1$s"), (def->features[VIR_DOMAIN_FEATURE_ACPI] =3D=3D= VIR_TRISTATE_SWITCH_ON) ? _("Enabled") : _("Disabled")); } @@ -2024,7 +2024,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags VIR_TRISTATE_SWITCH_= ON); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not change APIC status to: %s"), + _("could not change APIC status to: %1$s"), (def->features[VIR_DOMAIN_FEATURE_APIC] =3D=3D= VIR_TRISTATE_SWITCH_ON) ? _("Enabled") : _("Disabled")); } @@ -2829,7 +2829,7 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsi= gned long memory) ret =3D 0; } else { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not set the memory size of the domain= to: %lu Kb"), + _("could not set the memory size of the domain= to: %1$lu Kb"), memory); } } @@ -2967,7 +2967,7 @@ static int vboxDomainSetVcpusFlags(virDomainPtr dom, = unsigned int nvcpus, return ret; =20 if (flags !=3D VIR_DOMAIN_AFFECT_LIVE) { - vboxReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"= ), flags); + vboxReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%1$x= )"), flags); return -1; } =20 @@ -2984,17 +2984,17 @@ static int vboxDomainSetVcpusFlags(virDomainPtr dom= , unsigned int nvcpus, ret =3D 0; } else { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not set the number of cpus of the= domain to: %u"), + _("could not set the number of cpus of the= domain to: %1$u"), CPUCount); } VBOX_RELEASE(machine); } else { vboxReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id %d"), dom->id); + _("no domain with matching id %1$d"), dom->id); } } else { vboxReportError(VIR_ERR_NO_DOMAIN, - _("can't open session to the domain with id %d"), = dom->id); + _("can't open session to the domain with id %1$d")= , dom->id); } gVBoxAPI.UISession.Close(data->vboxSession); =20 @@ -3018,7 +3018,7 @@ static int vboxDomainGetVcpusFlags(virDomainPtr dom, = unsigned int flags) return ret; =20 if (flags !=3D (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { - vboxReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"= ), flags); + vboxReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%1$x= )"), flags); return -1; } =20 @@ -3233,7 +3233,7 @@ vboxDumpStorageControllers(virDomainDef *def, IMachin= e *machine) cont =3D virDomainDefAddController(def, type, -1, model); if (!cont) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to add %s controller type definit= ion"), + _("Failed to add %1$s controller type defin= ition"), virDomainControllerTypeToString(type)); goto cleanup; } @@ -3391,7 +3391,7 @@ vboxDumpDisks(virDomainDef *def, struct _vboxDriver *= data, IMachine *machine) =20 if (!disk->dst) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not generate medium name for the disk= at: port:%d, slot:%d"), + _("Could not generate medium name for the disk= at: port:%1$d, slot:%2$d"), devicePort, deviceSlot); goto cleanup; } @@ -3469,7 +3469,7 @@ vboxDumpDisks(virDomainDef *def, struct _vboxDriver *= data, IMachine *machine) case DeviceType_SharedFolder: case DeviceType_Null: vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unsupported vbox device type: %d"), deviceT= ype); + _("Unsupported vbox device type: %1$d"), devic= eType); goto cleanup; } =20 @@ -4351,7 +4351,7 @@ vboxDomainAttachDeviceImpl(virDomainPtr dom, =20 if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not attach shared folder '%s'"), + _("could not attach shared folder '%1$s'"), dev->data.fs->dst); ret =3D -1; } else { @@ -4365,7 +4365,7 @@ vboxDomainAttachDeviceImpl(virDomainPtr dom, VBOX_RELEASE(machine); =20 if (ret =3D=3D -VIR_ERR_ARGUMENT_UNSUPPORTED) { - vboxReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("Unsupported d= evice type %d"), dev->type); + vboxReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("Unsupported d= evice type %1$d"), dev->type); ret =3D -1; } } @@ -4469,7 +4469,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, c= onst char *xml) =20 if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not detach shared folder '%s'"), + _("could not detach shared folder '%1$s'"), dev->data.fs->dst); } else { ret =3D 0; @@ -4481,7 +4481,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, c= onst char *xml) VBOX_RELEASE(machine); =20 if (ret =3D=3D -VIR_ERR_ARGUMENT_UNSUPPORTED) { - vboxReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("Unsupported d= evice type %d"), dev->type); + vboxReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("Unsupported d= evice type %1$d"), dev->type); ret =3D -1; } } @@ -4786,7 +4786,7 @@ vboxSnapshotRedefine(virDomainPtr dom, */ if (unlink(currentSnapshotXmlFilePath) < 0) { virReportSystemError(errno, - _("Unable to delete file %s"), currentSna= pshotXmlFilePath); + _("Unable to delete file %1$s"), currentS= napshotXmlFilePath); goto cleanup; } } @@ -4942,7 +4942,7 @@ vboxSnapshotRedefine(virDomainPtr dom, gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode); if (RC_FAILED(resultCode)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Error while closing medium, rc=3D%0= 8x"), + _("Error while closing medium, rc=3D%1= $08x"), resultCode.uResultCode); VIR_FREE(locationUtf8); goto cleanup; @@ -5160,7 +5160,7 @@ vboxSnapshotRedefine(virDomainPtr dom, &searchResultTab); if (resultSize !=3D it + 1) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find UUID %s"), searchRes= ultTab[it]); + _("Unable to find UUID %1$s"), searchR= esultTab[it]); goto cleanup; } =20 @@ -5249,7 +5249,7 @@ vboxSnapshotRedefine(virDomainPtr dom, gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode); if (RC_FAILED(resultCode)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Error while creating diff storage, rc= =3D%08x"), + _("Error while creating diff storage, rc= =3D%1$08x"), resultCode.uResultCode); goto cleanup; } @@ -5294,7 +5294,7 @@ vboxSnapshotRedefine(virDomainPtr dom, &searchResultTab); if (resultSize !=3D it + 1) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find UUID %s"), searchResultT= ab[it]); + _("Unable to find UUID %1$s"), searchResul= tTab[it]); goto cleanup; } =20 @@ -5480,7 +5480,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom, rc =3D gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not open VirtualBox session with domain %= s"), + _("could not open VirtualBox session with domain %= 1$s"), dom->name); goto cleanup; } @@ -5494,7 +5494,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom, rc =3D gVBoxAPI.UIConsole.TakeSnapshot(console, name, description, &pr= ogress); if (NS_FAILED(rc) || !progress) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not take snapshot of domain %s"), dom->na= me); + _("could not take snapshot of domain %1$s"), dom->= name); goto cleanup; } =20 @@ -5502,14 +5502,14 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom, gVBoxAPI.UIProgress.GetResultCode(progress, &result); if (RC_FAILED(result)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not take snapshot of domain %s"), dom->na= me); + _("could not take snapshot of domain %1$s"), dom->= name); goto cleanup; } =20 rc =3D gVBoxAPI.UIMachine.GetCurrentSnapshot(machine, &snapshot); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get current snapshot of domain %s"), + _("could not get current snapshot of domain %1$s"), dom->name); goto cleanup; } @@ -5544,7 +5544,7 @@ vboxDomainSnapshotGetAll(virDomainPtr dom, rc =3D gVBoxAPI.UIMachine.GetSnapshotCount(machine, &count); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get snapshot count for domain %s"), + _("could not get snapshot count for domain %1$s"), dom->name); goto error; } @@ -5557,7 +5557,7 @@ vboxDomainSnapshotGetAll(virDomainPtr dom, rc =3D gVBoxAPI.UIMachine.FindSnapshot(machine, &empty, list); if (NS_FAILED(rc) || !list[0]) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get root snapshot for domain %s"), + _("could not get root snapshot for domain %1$s"), dom->name); goto error; } @@ -5570,7 +5570,7 @@ vboxDomainSnapshotGetAll(virDomainPtr dom, =20 if (!list[next]) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected number of snapshots < %u"), coun= t); + _("unexpected number of snapshots < %1$u"), co= unt); goto error; } =20 @@ -5587,7 +5587,7 @@ vboxDomainSnapshotGetAll(virDomainPtr dom, continue; if (top =3D=3D count) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected number of snapshots > %u"), = count); + _("unexpected number of snapshots > %1$u")= , count); gVBoxAPI.UArray.vboxArrayRelease(&children); goto error; } @@ -5647,7 +5647,7 @@ vboxDomainSnapshotGet(struct _vboxDriver *data, =20 if (!snapshot) { vboxReportError(VIR_ERR_OPERATION_INVALID, - _("domain %s has no snapshots with name %s"), + _("domain %1$s has no snapshots with name %2$s"), dom->name, name); goto cleanup; } @@ -6066,7 +6066,7 @@ vboxSnapshotGetReadOnlyDisks(virDomainSnapshotDef *de= f, sdCount); if (!defdom->disks[diskCount]->dst) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not generate medium name for the disk= at: port:%d, slot:%d"), devicePort, deviceSlot); + _("Could not generate medium name for the disk= at: port:%1$d, slot:%2$d"), devicePort, deviceSlot); ret =3D -1; goto cleanup; } @@ -6188,7 +6188,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSn= apshotPtr snapshot, rc =3D gVBoxAPI.UISnapshot.GetDescription(snap, &str16); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get description of snapshot %s"), + _("could not get description of snapshot %1$s"), snapshot->name); goto cleanup; } @@ -6202,7 +6202,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSn= apshotPtr snapshot, rc =3D gVBoxAPI.UISnapshot.GetTimeStamp(snap, ×tamp); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get creation time of snapshot %s"), + _("could not get creation time of snapshot %1$s"), snapshot->name); goto cleanup; } @@ -6212,7 +6212,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSn= apshotPtr snapshot, rc =3D gVBoxAPI.UISnapshot.GetParent(snap, &parent); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get parent of snapshot %s"), + _("could not get parent of snapshot %1$s"), snapshot->name); goto cleanup; } @@ -6220,7 +6220,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSn= apshotPtr snapshot, rc =3D gVBoxAPI.UISnapshot.GetName(parent, &str16); if (NS_FAILED(rc) || !str16) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get name of parent of snapshot %s= "), + _("could not get name of parent of snapshot %1= $s"), snapshot->name); goto cleanup; } @@ -6233,7 +6233,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSn= apshotPtr snapshot, rc =3D gVBoxAPI.UISnapshot.GetOnline(snap, &online); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get online state of snapshot %s"), + _("could not get online state of snapshot %1$s"), snapshot->name); goto cleanup; } @@ -6281,7 +6281,7 @@ static int vboxDomainSnapshotNum(virDomainPtr dom, un= signed int flags) rc =3D gVBoxAPI.UIMachine.GetSnapshotCount(machine, &snapshotCount); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get snapshot count for domain %s"), + _("could not get snapshot count for domain %1$s"), dom->name); goto cleanup; } @@ -6331,7 +6331,7 @@ static int vboxDomainSnapshotListNames(virDomainPtr d= om, char **names, rc =3D gVBoxAPI.UIMachine.FindSnapshot(machine, &empty, snapshots); if (NS_FAILED(rc) || !snapshots[0]) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get root snapshot for domain %s"), + _("could not get root snapshot for domain %1$s= "), dom->name); goto cleanup; } @@ -6469,13 +6469,13 @@ vboxDomainSnapshotGetParent(virDomainSnapshotPtr sn= apshot, rc =3D gVBoxAPI.UISnapshot.GetParent(snap, &parent); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get parent of snapshot %s"), + _("could not get parent of snapshot %1$s"), snapshot->name); goto cleanup; } if (!parent) { vboxReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("snapshot '%s' does not have a parent"), + _("snapshot '%1$s' does not have a parent"), snapshot->name); goto cleanup; } @@ -6483,7 +6483,7 @@ vboxDomainSnapshotGetParent(virDomainSnapshotPtr snap= shot, rc =3D gVBoxAPI.UISnapshot.GetName(parent, &nameUtf16); if (NS_FAILED(rc) || !nameUtf16) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get name of parent of snapshot %s"), + _("could not get name of parent of snapshot %1$s"), snapshot->name); goto cleanup; } @@ -6671,7 +6671,7 @@ static int vboxDomainRevertToSnapshot(virDomainSnapsh= otPtr snapshot, rc =3D gVBoxAPI.UISnapshot.GetOnline(newSnapshot, &online); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get online state of snapshot %s"), + _("could not get online state of snapshot %1$s"), snapshot->name); goto cleanup; } @@ -6679,7 +6679,7 @@ static int vboxDomainRevertToSnapshot(virDomainSnapsh= otPtr snapshot, rc =3D gVBoxAPI.UIMachine.GetCurrentSnapshot(machine, &prevSnapshot); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get current snapshot of domain %s"), + _("could not get current snapshot of domain %1$s"), dom->name); goto cleanup; } @@ -6976,7 +6976,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode); if (RC_FAILED(resultCode)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Error while creating diff storage, = rc=3D%08x"), + _("Error while creating diff storage, = rc=3D%1$08x"), resultCode.uResultCode); goto cleanup; } @@ -7021,7 +7021,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) &searchResultTab); if (resultSize !=3D it + 1) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find UUID %s"), searchRes= ultTab[it]); + _("Unable to find UUID %1$s"), searchR= esultTab[it]); goto cleanup; } =20 @@ -7050,7 +7050,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) def->parent.dom->dis= ks[it]->src->path); if (!uuidRO) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("No such disk in media registry %s"), + _("No such disk in media registry %1$s= "), def->parent.dom->disks[it]->src->path); goto cleanup; } @@ -7061,7 +7061,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) &searchResultTab); if (resultSize !=3D it + 1) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find UUID %s"), + _("Unable to find UUID %1$s"), searchResultTab[it]); goto cleanup; } @@ -7085,12 +7085,12 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnaps= hotPtr snapshot) def->disks[it].src->= path); if (!uuidRW) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find UUID for location %s"), def-= >disks[it].src->path); + _("Unable to find UUID for location %1$s"), de= f->disks[it].src->path); goto cleanup; } if (virVBoxSnapshotConfRemoveHardDisk(snapshotMachineDesc->mediaRe= gistry, uuidRW) < 0) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to remove disk from media registry. = uuid =3D %s"), uuidRW); + _("Unable to remove disk from media registry. = uuid =3D %1$s"), uuidRW); goto cleanup; } } @@ -7102,12 +7102,12 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnaps= hotPtr snapshot) def->parent.dom-= >disks[it]->src->path); if (!uuidRO) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find UUID for location %s"), = def->parent.dom->disks[it]->src->path); + _("Unable to find UUID for location %1$s")= , def->parent.dom->disks[it]->src->path); goto cleanup; } if (virVBoxSnapshotConfRemoveHardDisk(snapshotMachineDesc->med= iaRegistry, uuidRO) < 0) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to remove disk from media regist= ry. uuid =3D %s"), uuidRO); + _("Unable to remove disk from media regist= ry. uuid =3D %1$s"), uuidRO); goto cleanup; } } @@ -7146,7 +7146,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode); if (RC_FAILED(resultCode)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Error while closing medium, rc=3D%08x"), + _("Error while closing medium, rc=3D%1$08x= "), resultCode.uResultCode); goto cleanup; } @@ -7167,7 +7167,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) /* removing the snapshot */ if (virVBoxSnapshotConfRemoveSnapshot(snapshotMachineDesc, def->parent= .name) < 0) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to remove snapshot %s"), def->parent.nam= e); + _("Unable to remove snapshot %1$s"), def->parent.n= ame); goto cleanup; } =20 @@ -7288,7 +7288,7 @@ static int vboxDomainSnapshotDelete(virDomainSnapshot= Ptr snapshot, rc =3D gVBoxAPI.UISession.GetConsole(data->vboxSession, &console); if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("could not open VirtualBox session with domain %= s"), + _("could not open VirtualBox session with domain %= 1$s"), dom->name); goto cleanup; } @@ -7342,7 +7342,7 @@ vboxDomainScreenshot(virDomainPtr dom, =20 if (screen >=3D max_screen) { vboxReportError(VIR_ERR_INVALID_ARG, - _("screen ID higher than monitor count (%d)"), max= _screen); + _("screen ID higher than monitor count (%1$d)"), m= ax_screen); VBOX_RELEASE(machine); return NULL; } @@ -7356,7 +7356,7 @@ vboxDomainScreenshot(virDomainPtr dom, tmp =3D g_strdup_printf("%s/vbox.screendump.XXXXXX", cacheDir); =20 if ((tmp_fd =3D g_mkstemp_full(tmp, O_RDWR | O_CLOEXEC, S_IRUSR | S_IW= USR)) =3D=3D -1) { - virReportSystemError(errno, _("g_mkstemp(\"%s\") failed"), tmp); + virReportSystemError(errno, _("g_mkstemp(\"%1$s\") failed"), tmp); VBOX_RELEASE(machine); return NULL; } @@ -7399,13 +7399,12 @@ vboxDomainScreenshot(virDomainPtr dom, =20 if (safewrite(tmp_fd, (char *) screenData, screenDataSize) < 0) { - virReportSystemError(errno, _("unable to write data " - "to '%s'"), tmp); + virReportSystemError(errno, _("unable to write data to= '%1$s'"), tmp); goto endjob; } =20 if (VIR_CLOSE(tmp_fd) < 0) { - virReportSystemError(errno, _("unable to close %s"), t= mp); + virReportSystemError(errno, _("unable to close %1$s"),= tmp); goto endjob; } =20 @@ -7764,7 +7763,7 @@ vboxDomainSendKey(virDomainPtr dom, keyDownCodes[i]); if (keycode < 0) { vboxReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot translate keycode %u of %s codes= et to xt keycode"), + _("cannot translate keycode %1$u of %2$s c= odeset to xt keycode"), keyDownCodes[i], virKeycodeSetTypeToString(codeset)); goto cleanup; @@ -7782,7 +7781,7 @@ vboxDomainSendKey(virDomainPtr dom, =20 if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_OPERATION_FAILED, - _("Unable to open VirtualBox session with domain %= s"), + _("Unable to open VirtualBox session with domain %= 1$s"), dom->name); goto cleanup; } @@ -7791,7 +7790,7 @@ vboxDomainSendKey(virDomainPtr dom, =20 if (NS_FAILED(rc) || !console) { vboxReportError(VIR_ERR_OPERATION_FAILED, - _("Unable to get Console object for domain %s"), + _("Unable to get Console object for domain %1$s"), dom->name); goto cleanup; } @@ -7800,7 +7799,7 @@ vboxDomainSendKey(virDomainPtr dom, =20 if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_OPERATION_FAILED, - _("Unable to get Keyboard object for domain %s"), + _("Unable to get Keyboard object for domain %1$s"), dom->name); goto cleanup; } @@ -7810,7 +7809,7 @@ vboxDomainSendKey(virDomainPtr dom, =20 if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_OPERATION_FAILED, - _("Unable to send keyboard scancodes for domain %s= "), + _("Unable to send keyboard scancodes for domain %1= $s"), dom->name); goto cleanup; } @@ -7825,7 +7824,7 @@ vboxDomainSendKey(virDomainPtr dom, =20 if (NS_FAILED(rc)) { vboxReportError(VIR_ERR_OPERATION_FAILED, - _("Unable to send keyboard scan codes to domain %s= "), + _("Unable to send keyboard scan codes to domain %1= $s"), dom->name); goto cleanup; } diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index 111bb7144a..31ab51f5e1 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -643,7 +643,7 @@ vboxNetworkUndefineDestroy(virNetworkPtr network, bool = removeinterface) gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode); if (RC_FAILED(resultCode)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Error while removing hostonly network interf= ace, rc=3D%08x"), + _("Error while removing hostonly network interf= ace, rc=3D%1$08x"), resultCode.uResultCode); goto cleanup; } diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 2f3f48d688..d761676db0 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -594,7 +594,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, BAD_CAST "vbox", BAD_CAST VBOX_SETTINGS_NS) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Failed to register xml namespace '%s'"), + _("Failed to register xml namespace '%1$s'"), VBOX_SETTINGS_NS); goto cleanup; } @@ -757,7 +757,7 @@ virVBoxSnapshotConfAddSnapshotToXmlMachine(virVBoxSnaps= hotConfSnapshot *snapshot parentSnapshot =3D virVBoxSnapshotConfSnapshotByName(machine->snap= shot, snapshotParentName); if (parentSnapshot =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find the snapshot %s"), snapshotPa= rentName); + _("Unable to find the snapshot %1$s"), snapshot= ParentName); return -1; } VIR_EXPAND_N(parentSnapshot->children, parentSnapshot->nchildren, = 1); @@ -841,7 +841,7 @@ virVBoxSnapshotConfRemoveSnapshot(virVBoxSnapshotConfMa= chine *machine, snapshot =3D virVBoxSnapshotConfSnapshotByName(machine->snapshot, snap= shotName); if (snapshot =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find the snapshot with name %s"), snap= shotName); + _("Unable to find the snapshot with name %1$s"), sn= apshotName); return -1; } if (snapshot->nchildren > 0) { @@ -902,7 +902,7 @@ virVBoxSnapshotConfRemoveHardDisk(virVBoxSnapshotConfMe= diaRegistry *mediaRegistr } if (hardDisk =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find the hard disk with uuid %s"), uui= d); + _("Unable to find the hard disk with uuid %1$s"), u= uid); return -1; } if (hardDisk->parent =3D=3D NULL) { @@ -1181,7 +1181,7 @@ virVBoxSnapshotConfIsCurrentSnapshot(virVBoxSnapshotC= onfMachine *machine, snapshot =3D virVBoxSnapshotConfSnapshotByName(machine->snapshot, snap= shotName); if (snapshot =3D=3D NULL) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("Unable to find the snapshot %s"), snapshotName); + _("Unable to find the snapshot %1$s"), snapshotName= ); return 0; } return STREQ(snapshot->uuid, machine->currentSnapshot); @@ -1337,7 +1337,7 @@ virVBoxSnapshotConfRemoveFakeDisks(virVBoxSnapshotCon= fMachine *machine) if (strstr(diskList[i]->location, "fake") !=3D NULL) { if (virVBoxSnapshotConfRemoveHardDisk(machine->mediaRegistry, = diskList[i]->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to remove hard disk %s from media= registry"), + _("Unable to remove hard disk %1$s from med= ia registry"), diskList[i]->location); goto cleanup; } diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 27d8a474f2..41b19a9c62 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -97,7 +97,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr = pool) gVBoxAPI.UArray.handleGetHardDisks(d= ata->vboxObj)); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get number of volumes in the pool: %s,= rc=3D%08x"), + _("could not get number of volumes in the pool: %1$= s, rc=3D%2$08x"), pool->name, (unsigned)rc); return -1; } @@ -135,7 +135,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char= **const names, int nname gVBoxAPI.UArray.handleGetHardDisks(d= ata->vboxObj)); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get the volume list in the pool: %s, r= c=3D%08x"), + _("could not get the volume list in the pool: %1$s,= rc=3D%2$08x"), pool->name, (unsigned)rc); return -1; } @@ -267,7 +267,7 @@ vboxStorageVolLookupByKey(virConnectPtr conn, const cha= r *key) =20 if (virUUIDParse(key, uuid) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Could not parse UUID from '%s'"), key); + _("Could not parse UUID from '%1$s'"), key); return NULL; } =20 @@ -457,7 +457,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, rc =3D gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, hddFormatUt= f16, hddNameUtf16, &hardDisk); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not create harddisk, rc=3D%08x"), + _("Could not create harddisk, rc=3D%1$08x"), (unsigned)rc); goto cleanup; } @@ -470,7 +470,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, rc =3D gVBoxAPI.UIMedium.CreateBaseStorage(hardDisk, logicalSize, vari= ant, &progress); if (NS_FAILED(rc) || !progress) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not create base storage, rc=3D%08x"), + _("Could not create base storage, rc=3D%1$08x"), (unsigned)rc); goto cleanup; } @@ -479,7 +479,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, gVBoxAPI.UIProgress.GetResultCode(progress, &resultCode); if (RC_FAILED(resultCode)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not create base storage, rc=3D%08x"), + _("Could not create base storage, rc=3D%1$08x"), (unsigned)resultCode.uResultCode); goto cleanup; } @@ -525,7 +525,7 @@ static int vboxStorageVolDelete(virStorageVolPtr vol, u= nsigned int flags) =20 if (virUUIDParse(vol->key, uuid) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Could not parse UUID from '%s'"), vol->key); + _("Could not parse UUID from '%1$s'"), vol->key); return -1; } =20 @@ -676,7 +676,7 @@ static int vboxStorageVolGetInfo(virStorageVolPtr vol, = virStorageVolInfoPtr info =20 if (virUUIDParse(vol->key, uuid) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Could not parse UUID from '%s'"), vol->key); + _("Could not parse UUID from '%1$s'"), vol->key); return ret; } =20 @@ -737,7 +737,7 @@ static char *vboxStorageVolGetXMLDesc(virStorageVolPtr = vol, unsigned int flags) =20 if (virUUIDParse(vol->key, uuid) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Could not parse UUID from '%s'"), vol->key); + _("Could not parse UUID from '%1$s'"), vol->key); return ret; } =20 @@ -818,7 +818,7 @@ static char *vboxStorageVolGetPath(virStorageVolPtr vol) =20 if (virUUIDParse(vol->key, uuid) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Could not parse UUID from '%s'"), vol->key); + _("Could not parse UUID from '%1$s'"), vol->key); return ret; } =20 diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 3db8557c53..908625e702 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -317,14 +317,14 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, if (state >=3D MachineState_FirstOnline && state <=3D MachineState_LastOnline) { virReportError(VIR_ERR_OPERATION_INVALID, - _("domain %s is already running"), dom->name); + _("domain %1$s is already running"), dom->name); goto cleanup; } =20 rc =3D machine->vtbl->LockMachine(machine, data->vboxSession, LockType= _Write); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not open VirtualBox session with domain %s= "), + _("could not open VirtualBox session with domain %1= $s"), dom->name); goto cleanup; } @@ -337,7 +337,7 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, _("cannot restore domain snapshot for running d= omain")); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not restore snapshot for domain %s"), + _("could not restore snapshot for domain %1$s"), dom->name); } goto cleanup; @@ -347,7 +347,7 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, progress->vtbl->GetResultCode(progress, &result); if (NS_FAILED(result)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not restore snapshot for domain %s"), dom-= >name); + _("could not restore snapshot for domain %1$s"), do= m->name); goto cleanup; } =20 @@ -1118,7 +1118,7 @@ _consoleSaveState(IConsole *console, IProgress **prog= ress) rc =3D machine->vtbl->SaveState(machine, progress); else virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to get machine from console. (error %d)")= , rc); + _("unable to get machine from console. (error %1$d)= "), rc); =20 return rc; } @@ -1176,7 +1176,7 @@ _consoleTakeSnapshot(IConsole *console, PRUnichar *na= me, rc =3D machine->vtbl->TakeSnapshot(machine, name, description, bpa= use, &id, progress); else virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to get machine from console. (error %d)")= , rc); + _("unable to get machine from console. (error %1$d)= "), rc); =20 VBOX_RELEASE(machine); return rc; @@ -1194,7 +1194,7 @@ _consoleDeleteSnapshot(IConsole *console, vboxIID *ii= d, IProgress **progress) rc =3D machine->vtbl->DeleteSnapshot(machine, iid->value, progress= ); else virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to get machine from console. (error %d)")= , rc); + _("unable to get machine from console. (error %1$d)= "), rc); =20 VBOX_RELEASE(machine); =20 @@ -1584,7 +1584,7 @@ _vrdeServerGetPorts(struct _vboxDriver *data, IVRDESe= rver *VRDEServer, =20 if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to read RDP port value, rc=3D%08x"), + _("Failed to read RDP port value, rc=3D%1$08x"), (unsigned) rc); goto cleanup; } --=20 2.39.2