From a7892ee00089c17f79f9c985670548afbf8b7dcd Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Fri, 14 Mar 2008 15:21:15 +0000
Subject: [PATCH] String fixes #436620 * qemud/qemud.c src/virsh.c: fixing some
 user facing strings   problems pointed out by Francesco Tombolini should fix
 #436620 Daniel

---
 ChangeLog     |  5 +++++
 qemud/qemud.c |  2 +-
 src/virsh.c   | 10 +++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3335c13477..c05c39978b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 14 16:19:21 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+	* qemud/qemud.c src/virsh.c: fixing some user facing strings
+	  problems pointed out by Francesco Tombolini should fix #436620
+
 Fri Mar 14 11:01:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
 	* virsh.1 docs/apibuild.py docs/architecture.html docs/errors.html
diff --git a/qemud/qemud.c b/qemud/qemud.c
index 1224f6e875..4db9d32d7c 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -699,7 +699,7 @@ static int qemudInitPaths(struct qemud_server *server,
 
  snprintf_error:
     qemudLog(QEMUD_ERR,
-             "%s", _("Resulting path to long for buffer in qemudInitPaths()"));
+             "%s", _("Resulting path too long for buffer in qemudInitPaths()"));
     return -1;
 }
 
diff --git a/src/virsh.c b/src/virsh.c
index f74714b602..ec9da261d2 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -3204,7 +3204,7 @@ cmdPoolDelete(vshControl * ctl, vshCmd * cmd)
         return FALSE;
 
     if (virStoragePoolDelete(pool, 0) == 0) {
-        vshPrint(ctl, _("Pool %s deleteed\n"), name);
+        vshPrint(ctl, _("Pool %s deleted\n"), name);
     } else {
         vshError(ctl, FALSE, _("Failed to delete pool %s"), name);
         ret = FALSE;
@@ -3590,15 +3590,15 @@ cmdPoolStart(vshControl * ctl, vshCmd * cmd)
  * "vol-create-as" command
  */
 static vshCmdInfo info_vol_create_as[] = {
-    {"syntax", "create-as <pool> <name> <capacity>"},
-    {"help", gettext_noop("create a vol from a set of as")},
+    {"syntax", "vol-create-as <pool> <name> <capacity>"},
+    {"help", gettext_noop("create a volume from a set of args")},
     {"desc", gettext_noop("Create a vol.")},
     {NULL, NULL}
 };
 
 static vshCmdOptDef opts_vol_create_as[] = {
     {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name")},
-    {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the vol")},
+    {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the volume")},
     {"capacity", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("size of the vol with optional k,M,G,T suffix")},
     {"allocation", VSH_OT_DATA, 0, gettext_noop("initial allocation size with optional k,M,G,T suffix")},
     {"format", VSH_OT_DATA, 0, gettext_noop("file format type raw,bochs,qcow,qcow2,vmdk")},
@@ -3878,7 +3878,7 @@ cmdVolDelete(vshControl * ctl, vshCmd * cmd)
     }
 
     if (virStorageVolDelete(vol, 0) == 0) {
-        vshPrint(ctl, _("Vol %s deleteed\n"), name);
+        vshPrint(ctl, _("Vol %s deleted\n"), name);
     } else {
         vshError(ctl, FALSE, _("Failed to delete vol %s"), name);
         ret = FALSE;