提交 524ba58b 编写于 作者: Y Yuri Chornoivan 提交者: Eric Blake
上级 66ca7ce5
......@@ -213,6 +213,7 @@ Patches have also been contributed by:
Prerna Saxena <prerna@linux.vnet.ibm.com>
Michael Ellerman <michael@ellerman.id.au>
Rommer <rommer@active.by>
Yuri Chornoivan <yurchor@ukr.net>
[....send patches to get your name here....]
......
......@@ -7337,7 +7337,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a>
from virsh (Saori Fukuta), Coverage files (Daniel Berrange),
Solaris fixes (Mark Johnson), avoid [r]index calls (Richard Jones),
release information in Xen backend, virsh cpupin command cleanups
(Masayuki Sunou), xen:/// suppport as standard Xen URI (Richard Jones and
(Masayuki Sunou), xen:/// support as standard Xen URI (Richard Jones and
Daniel Berrange), improve driver selection/decline mechanism (Richard
Jones), error reporting on XML dump (Richard Jones), Remove unused
virDomainKernel structure (Richard Jones), daemon event loop event
......
......@@ -2941,7 +2941,7 @@ virDomainDiskDefParseXML(virCapsPtr caps,
if (authUUID != NULL && authUsage != NULL) {
virDomainReportError(VIR_ERR_XML_ERROR,
_("only one of uuid and usage can be specfied"));
_("only one of uuid and usage can be specified"));
goto error;
}
if (authUUID != NULL) {
......
......@@ -834,7 +834,7 @@ esxStorageVolumeLookupByKey(virConnectPtr conn, const char *key)
if (!priv->primary->hasQueryVirtualDiskUuid) {
ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
_("QueryVirtualDiskUuid not avialable, cannot lookup storage "
_("QueryVirtualDiskUuid not available, cannot lookup storage "
"volume by UUID"));
return NULL;
}
......
......@@ -1025,7 +1025,7 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char *
safe = strspn(entry->str, URI_ALIAS_CHARS);
if (safe < (offset - entry->str)) {
virLibConnError(VIR_ERR_CONF_SYNTAX,
_("Malformed 'uri_aliases' config entry '%s', aliases may only container 'a-Z, 0-9, _, -'"),
_("Malformed 'uri_aliases' config entry '%s', aliases may only contain 'a-Z, 0-9, _, -'"),
entry->str);
return -1;
}
......@@ -10659,10 +10659,10 @@ virInterfaceFree(virInterfacePtr iface)
* @conn: pointer to hypervisor connection
* @flags: flags, not used yet
*
* This functions creates a restore point to which one can return
* This function creates a restore point to which one can return
* later by calling virInterfaceChangeRollback(). This function should
* be called before any transaction with interface configuration.
* Once knowing, new configuration works, it can be commited via
* Once it is known that a new configuration works, it can be committed via
* virInterfaceChangeCommit(), which frees the restore point.
*
* If virInterfaceChangeBegin() is called when a transaction is
......
......@@ -892,7 +892,7 @@ qemuDomainObjEnterMonitorInternal(struct qemud_driver *driver,
if (asyncJob != QEMU_ASYNC_JOB_NONE) {
if (asyncJob != priv->job.asyncJob) {
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("unepxected async job %d"), asyncJob);
_("unexpected async job %d"), asyncJob);
return -1;
}
if (qemuDomainObjBeginJobInternal(driver, driver_locked, obj,
......
......@@ -2338,7 +2338,7 @@ int qemuMonitorJSONAddUSBDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
const char *path ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("usb_add not suppported in JSON mode"));
_("usb_add not supported in JSON mode"));
return -1;
}
......@@ -2348,7 +2348,7 @@ int qemuMonitorJSONAddUSBDeviceExact(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
int dev ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("usb_add not suppported in JSON mode"));
_("usb_add not supported in JSON mode"));
return -1;
}
......@@ -2358,7 +2358,7 @@ int qemuMonitorJSONAddUSBDeviceMatch(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
int product ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("usb_add not suppported in JSON mode"));
_("usb_add not supported in JSON mode"));
return -1;
}
......@@ -2368,7 +2368,7 @@ int qemuMonitorJSONAddPCIHostDevice(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress *guestAddr ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_add not suppported in JSON mode"));
_("pci_add not supported in JSON mode"));
return -1;
}
......@@ -2379,7 +2379,7 @@ int qemuMonitorJSONAddPCIDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress *guestAddr ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_add not suppported in JSON mode"));
_("pci_add not supported in JSON mode"));
return -1;
}
......@@ -2389,7 +2389,7 @@ int qemuMonitorJSONAddPCINetwork(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress *guestAddr ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_add not suppported in JSON mode"));
_("pci_add not supported in JSON mode"));
return -1;
}
......@@ -2398,7 +2398,7 @@ int qemuMonitorJSONRemovePCIDevice(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress *guestAddr ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_del not suppported in JSON mode"));
_("pci_del not supported in JSON mode"));
return -1;
}
......@@ -2655,7 +2655,7 @@ int qemuMonitorJSONAttachPCIDiskController(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainDevicePCIAddress *guestAddr ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("pci_add not suppported in JSON mode"));
_("pci_add not supported in JSON mode"));
return -1;
}
......@@ -2732,7 +2732,7 @@ int qemuMonitorJSONGetAllPCIAddresses(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
qemuMonitorPCIAddress **addrs ATTRIBUTE_UNUSED)
{
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("query-pci not suppported in JSON mode"));
_("query-pci not supported in JSON mode"));
return -1;
}
......@@ -3196,7 +3196,7 @@ static int qemuMonitorJSONGetBlockJobInfo(virJSONValuePtr reply,
if (data->type != VIR_JSON_TYPE_ARRAY) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("urecognized format of block job information"));
_("unrecognized format of block job information"));
return -1;
}
......
......@@ -3555,7 +3555,7 @@ static int testInterfaceChangeCommit(virConnectPtr conn,
if (!privconn->transaction_running) {
testError(VIR_ERR_OPERATION_INVALID, _("no transaction running, "
"nothing to be commited."));
"nothing to be committed."));
goto cleanup;
}
......
......@@ -900,7 +900,7 @@ int virNetDevValidateConfig(const char *ifname,
goto cleanup;
}
virReportSystemError(errno,
_("coud not get MAC address of interface %s"),
_("could not get MAC address of interface %s"),
ifname);
goto cleanup;
}
......@@ -1060,7 +1060,7 @@ int
virNetDevIsVirtualFunction(const char *ifname ATTRIBUTE_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to check virtual function status on this platfornm"));
_("Unable to check virtual function status on this platform"));
return -1;
}
......@@ -1070,7 +1070,7 @@ virNetDevGetVirtualFunctionIndex(const char *pfname ATTRIBUTE_UNUSED,
int *vf_index ATTRIBUTE_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get virtual function index on this platfornm"));
_("Unable to get virtual function index on this platform"));
return -1;
}
......@@ -1079,7 +1079,7 @@ virNetDevGetPhysicalFunction(const char *ifname ATTRIBUTE_UNUSED,
char **pfname ATTRIBUTE_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get physical function status on this platfornm"));
_("Unable to get physical function status on this platform"));
return -1;
}
#endif /* !__linux__ */
......@@ -948,7 +948,7 @@ static int vboxExtractVersion(vboxGlobalData *data) {
if (ret != 0)
vboxError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Cound not extract VirtualBox version"));
_("Could not extract VirtualBox version"));
return ret;
}
......
......@@ -1803,7 +1803,7 @@ cleanup:
*/
static const vshCmdInfo info_dommemstat[] = {
{"help", N_("get memory statistics for a domain")},
{"desc", N_("Get memory statistics for a runnng domain.")},
{"desc", N_("Get memory statistics for a running domain.")},
{NULL,NULL}
};
......@@ -6774,7 +6774,7 @@ static const vshCmdInfo info_block_job[] = {
static const vshCmdOptDef opts_block_job[] = {
{"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
{"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of disk")},
{"abort", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Abort the active job on the speficied disk")},
{"abort", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Abort the active job on the specified disk")},
{"info", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Get active job information for the specified disk")},
{"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Set the Bandwidth limit in MB/s")},
{NULL, 0, 0, NULL}
......@@ -8125,7 +8125,7 @@ cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd)
*/
static const vshCmdInfo info_interface_begin[] = {
{"help", N_("create a snapshot of current interfaces settings, "
"which can be later commited (iface-commit) or "
"which can be later committed (iface-commit) or "
"restored (iface-rollback)")},
{"desc", N_("Create a restore point for interfaces settings")},
{NULL, NULL}
......@@ -8508,7 +8508,7 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd)
}
if ((if_node = virXPathNode("./bridge/interface[2]", ctxt))) {
vshError(ctl, "%s", _("Multiple interfaecs attached to bridge"));
vshError(ctl, "%s", _("Multiple interfaces attached to bridge"));
goto cleanup;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册