virsh: use N_ rather than gettext_noop

With N_() in place, we can use it for a smaller file.

* doc/api-extension/0008-Step-8-of-8-Add-virsh-support.patch:
Replace all uses of gettext_noop with N_.
* tools/virsh.c: Likewise, throughout the file.

docs/api_extension/0008-Step-8-of-8-Add-virsh-support.patch

@@ -11,24 +11,23 @@ diff --git a/src/virsh.c b/src/virsh.c
 index cb32ede..ab2a2b7 100644
 --- a/src/virsh.c
 +++ b/src/virsh.c
-@@ -2962,6 +2962,107 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd)
+@@ -2962,6 +2962,106 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd)
  
  
  /*
 + * "nodedev-create" command
 + */
 +static const vshCmdInfo info_node_device_create[] = {
-+    {"help", gettext_noop("create a device defined "
-+                          "by an XML file on the node")},
-+    {"desc", gettext_noop("Create a device on the node.  Note that this "
-+                          "command creates devices on the physical host "
-+                          "that can then be assigned to a virtual machine.")},
++    {"help", N_("create a device defined by an XML file on the node")},
++    {"desc", N_("Create a device on the node.  Note that this "
++                "command creates devices on the physical host "
++                "that can then be assigned to a virtual machine.")},
 +    {NULL, NULL}
 +};
 +
 +static const vshCmdOptDef opts_node_device_create[] = {
 +    {"file", VSH_OT_DATA, VSH_OFLAG_REQ,
-+     gettext_noop("file containing an XML description of the device")},
++     N_("file containing an XML description of the device")},
 +    {NULL, 0, 0, NULL}
 +};
 +
@@ -72,15 +71,15 @@ index cb32ede..ab2a2b7 100644
 + * "nodedev-destroy" command
 + */
 +static const vshCmdInfo info_node_device_destroy[] = {
-+    {"help", gettext_noop("destroy a device on the node")},
-+    {"desc", gettext_noop("Destroy a device on the node.  Note that this "
-+                          "command destroys devices on the physical host ")},
++    {"help", N_("destroy a device on the node")},
++    {"desc", N_("Destroy a device on the node.  Note that this "
++                "command destroys devices on the physical host")},
 +    {NULL, NULL}
 +};
 +
 +static const vshCmdOptDef opts_node_device_destroy[] = {
 +    {"name", VSH_OT_DATA, VSH_OFLAG_REQ,
-+     gettext_noop("name of the device to be destroyed")},
++     N_("name of the device to be destroyed")},
 +    {NULL, 0, 0, NULL}
 +};
 +

tools/virsh.c

@@ -407,14 +407,14 @@ out:
  * "help" command
  */
 static const vshCmdInfo info_help[] = {
-    {"help", gettext_noop("print help")},
-    {"desc", gettext_noop("Prints global help or command specific help.")},
+    {"help", N_("print help")},
+    {"desc", N_("Prints global help or command specific help.")},
 
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_help[] = {
-    {"command", VSH_OT_DATA, 0, gettext_noop("name of command")},
+    {"command", VSH_OT_DATA, 0, N_("name of command")},
     {NULL, 0, 0, NULL}
 };
 
@@ -439,15 +439,15 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd)
  * "autostart" command
  */
 static const vshCmdInfo info_autostart[] = {
-    {"help", gettext_noop("autostart a domain")},
+    {"help", N_("autostart a domain")},
     {"desc",
-     gettext_noop("Configure a domain to be automatically started at boot.")},
+     N_("Configure a domain to be automatically started at boot.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_autostart[] = {
-    {"domain",  VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")},
+    {"domain",  VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"disable", VSH_OT_BOOL, 0, N_("disable autostarting")},
     {NULL, 0, 0, NULL}
 };
 
@@ -488,15 +488,15 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd)
  * "connect" command
  */
 static const vshCmdInfo info_connect[] = {
-    {"help", gettext_noop("(re)connect to hypervisor")},
+    {"help", N_("(re)connect to hypervisor")},
     {"desc",
-     gettext_noop("Connect to local hypervisor. This is built-in command after shell start up.")},
+     N_("Connect to local hypervisor. This is built-in command after shell start up.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_connect[] = {
-    {"name",     VSH_OT_DATA, 0, gettext_noop("hypervisor connection URI")},
-    {"readonly", VSH_OT_BOOL, 0, gettext_noop("read-only connection")},
+    {"name",     VSH_OT_DATA, 0, N_("hypervisor connection URI")},
+    {"readonly", VSH_OT_BOOL, 0, N_("read-only connection")},
     {NULL, 0, 0, NULL}
 };
 
@@ -537,14 +537,14 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd)
  * "console" command
  */
 static const vshCmdInfo info_console[] = {
-    {"help", gettext_noop("connect to the guest console")},
+    {"help", N_("connect to the guest console")},
     {"desc",
-     gettext_noop("Connect the virtual serial console for the guest")},
+     N_("Connect the virtual serial console for the guest")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_console[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -646,14 +646,14 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd)
  * "list" command
  */
 static const vshCmdInfo info_list[] = {
-    {"help", gettext_noop("list domains")},
-    {"desc", gettext_noop("Returns list of domains.")},
+    {"help", N_("list domains")},
+    {"desc", N_("Returns list of domains.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_list[] = {
-    {"inactive", VSH_OT_BOOL, 0, gettext_noop("list inactive domains")},
-    {"all", VSH_OT_BOOL, 0, gettext_noop("list inactive & active domains")},
+    {"inactive", VSH_OT_BOOL, 0, N_("list inactive domains")},
+    {"all", VSH_OT_BOOL, 0, N_("list inactive & active domains")},
     {NULL, 0, 0, NULL}
 };
 
@@ -763,13 +763,13 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "domstate" command
  */
 static const vshCmdInfo info_domstate[] = {
-    {"help", gettext_noop("domain state")},
-    {"desc", gettext_noop("Returns state about a domain.")},
+    {"help", N_("domain state")},
+    {"desc", N_("Returns state about a domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_domstate[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -799,14 +799,14 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd)
 /* "domblkstat" command
  */
 static const vshCmdInfo info_domblkstat[] = {
-    {"help", gettext_noop("get device block stats for a domain")},
-    {"desc", gettext_noop("Get device block stats for a running domain.")},
+    {"help", N_("get device block stats for a domain")},
+    {"desc", N_("Get device block stats for a running domain.")},
     {NULL,NULL}
 };
 
 static const vshCmdOptDef opts_domblkstat[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("block device")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")},
     {NULL, 0, 0, NULL}
 };
 
@@ -856,14 +856,14 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd)
 /* "domifstat" command
  */
 static const vshCmdInfo info_domifstat[] = {
-    {"help", gettext_noop("get network interface stats for a domain")},
-    {"desc", gettext_noop("Get network interface stats for a running domain.")},
+    {"help", N_("get network interface stats for a domain")},
+    {"desc", N_("Get network interface stats for a running domain.")},
     {NULL,NULL}
 };
 
 static const vshCmdOptDef opts_domifstat[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface device")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface device")},
     {NULL, 0, 0, NULL}
 };
 
@@ -923,13 +923,13 @@ cmdDomIfstat (vshControl *ctl, const vshCmd *cmd)
  * "dommemstats" command
  */
 static const vshCmdInfo info_dommemstat[] = {
-    {"help", gettext_noop("get memory statistics for a domain")},
-    {"desc", gettext_noop("Get memory statistics for a runnng domain.")},
+    {"help", N_("get memory statistics for a domain")},
+    {"desc", N_("Get memory statistics for a runnng domain.")},
     {NULL,NULL}
 };
 
 static const vshCmdOptDef opts_dommemstat[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -977,13 +977,13 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd)
  * "suspend" command
  */
 static const vshCmdInfo info_suspend[] = {
-    {"help", gettext_noop("suspend a domain")},
-    {"desc", gettext_noop("Suspend a running domain.")},
+    {"help", N_("suspend a domain")},
+    {"desc", N_("Suspend a running domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_suspend[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1015,15 +1015,15 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd)
  * "create" command
  */
 static const vshCmdInfo info_create[] = {
-    {"help", gettext_noop("create a domain from an XML file")},
-    {"desc", gettext_noop("Create a domain.")},
+    {"help", N_("create a domain from an XML file")},
+    {"desc", N_("Create a domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_create[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML domain description")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML domain description")},
 #ifndef WIN32
-    {"console", VSH_OT_BOOL, 0, gettext_noop("attach to console after creation")},
+    {"console", VSH_OT_BOOL, 0, N_("attach to console after creation")},
 #endif
     {NULL, 0, 0, NULL}
 };
@@ -1072,13 +1072,13 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd)
  * "define" command
  */
 static const vshCmdInfo info_define[] = {
-    {"help", gettext_noop("define (but don't start) a domain from an XML file")},
-    {"desc", gettext_noop("Define a domain.")},
+    {"help", N_("define (but don't start) a domain from an XML file")},
+    {"desc", N_("Define a domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_define[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML domain description")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML domain description")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1119,13 +1119,13 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd)
  * "undefine" command
  */
 static const vshCmdInfo info_undefine[] = {
-    {"help", gettext_noop("undefine an inactive domain")},
-    {"desc", gettext_noop("Undefine the configuration for an inactive domain.")},
+    {"help", N_("undefine an inactive domain")},
+    {"desc", N_("Undefine the configuration for an inactive domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_undefine[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1175,15 +1175,15 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
  * "start" command
  */
 static const vshCmdInfo info_start[] = {
-    {"help", gettext_noop("start a (previously defined) inactive domain")},
-    {"desc", gettext_noop("Start a domain.")},
+    {"help", N_("start a (previously defined) inactive domain")},
+    {"desc", N_("Start a domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_start[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("name of the inactive domain")},
 #ifndef WIN32
-    {"console", VSH_OT_BOOL, 0, gettext_noop("attach to console after creation")},
+    {"console", VSH_OT_BOOL, 0, N_("attach to console after creation")},
 #endif
     {NULL, 0, 0, NULL}
 };
@@ -1228,14 +1228,14 @@ cmdStart(vshControl *ctl, const vshCmd *cmd)
  * "save" command
  */
 static const vshCmdInfo info_save[] = {
-    {"help", gettext_noop("save a domain state to a file")},
-    {"desc", gettext_noop("Save a running domain.")},
+    {"help", N_("save a domain state to a file")},
+    {"desc", N_("Save a running domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_save[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("where to save the data")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to save the data")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1271,16 +1271,16 @@ cmdSave(vshControl *ctl, const vshCmd *cmd)
  * "schedinfo" command
  */
 static const vshCmdInfo info_schedinfo[] = {
-    {"help", gettext_noop("show/set scheduler parameters")},
-    {"desc", gettext_noop("Show/Set scheduler parameters.")},
+    {"help", N_("show/set scheduler parameters")},
+    {"desc", N_("Show/Set scheduler parameters.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_schedinfo[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"set", VSH_OT_STRING, VSH_OFLAG_NONE, gettext_noop("parameter=value")},
-    {"weight", VSH_OT_INT, VSH_OFLAG_NONE, gettext_noop("weight for XEN_CREDIT")},
-    {"cap", VSH_OT_INT, VSH_OFLAG_NONE, gettext_noop("cap for XEN_CREDIT")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"set", VSH_OT_STRING, VSH_OFLAG_NONE, N_("parameter=value")},
+    {"weight", VSH_OT_INT, VSH_OFLAG_NONE, N_("weight for XEN_CREDIT")},
+    {"cap", VSH_OT_INT, VSH_OFLAG_NONE, N_("cap for XEN_CREDIT")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1477,13 +1477,13 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
  * "restore" command
  */
 static const vshCmdInfo info_restore[] = {
-    {"help", gettext_noop("restore a domain from a saved state in a file")},
-    {"desc", gettext_noop("Restore a domain.")},
+    {"help", N_("restore a domain from a saved state in a file")},
+    {"desc", N_("Restore a domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_restore[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("the state to restore")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("the state to restore")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1514,16 +1514,16 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
  * "dump" command
  */
 static const vshCmdInfo info_dump[] = {
-    {"help", gettext_noop("dump the core of a domain to a file for analysis")},
-    {"desc", gettext_noop("Core dump a domain.")},
+    {"help", N_("dump the core of a domain to a file for analysis")},
+    {"desc", N_("Core dump a domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_dump[] = {
-    {"live", VSH_OT_BOOL, 0, gettext_noop("perform a live core dump if supported")},
-    {"crash", VSH_OT_BOOL, 0, gettext_noop("crash the domain after core dump")},
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("where to dump the core")},
+    {"live", VSH_OT_BOOL, 0, N_("perform a live core dump if supported")},
+    {"crash", VSH_OT_BOOL, 0, N_("crash the domain after core dump")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to dump the core")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1565,13 +1565,13 @@ cmdDump(vshControl *ctl, const vshCmd *cmd)
  * "resume" command
  */
 static const vshCmdInfo info_resume[] = {
-    {"help", gettext_noop("resume a domain")},
-    {"desc", gettext_noop("Resume a previously suspended domain.")},
+    {"help", N_("resume a domain")},
+    {"desc", N_("Resume a previously suspended domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_resume[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1603,13 +1603,13 @@ cmdResume(vshControl *ctl, const vshCmd *cmd)
  * "shutdown" command
  */
 static const vshCmdInfo info_shutdown[] = {
-    {"help", gettext_noop("gracefully shutdown a domain")},
-    {"desc", gettext_noop("Run shutdown in the target domain.")},
+    {"help", N_("gracefully shutdown a domain")},
+    {"desc", N_("Run shutdown in the target domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_shutdown[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1641,13 +1641,13 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd)
  * "reboot" command
  */
 static const vshCmdInfo info_reboot[] = {
-    {"help", gettext_noop("reboot a domain")},
-    {"desc", gettext_noop("Run a reboot command in the target domain.")},
+    {"help", N_("reboot a domain")},
+    {"desc", N_("Run a reboot command in the target domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_reboot[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1679,13 +1679,13 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd)
  * "destroy" command
  */
 static const vshCmdInfo info_destroy[] = {
-    {"help", gettext_noop("destroy a domain")},
-    {"desc", gettext_noop("Destroy a given domain.")},
+    {"help", N_("destroy a domain")},
+    {"desc", N_("Destroy a given domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_destroy[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1717,13 +1717,13 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd)
  * "dominfo" command
  */
 static const vshCmdInfo info_dominfo[] = {
-    {"help", gettext_noop("domain information")},
-    {"desc", gettext_noop("Returns basic information about the domain.")},
+    {"help", N_("domain information")},
+    {"desc", N_("Returns basic information about the domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_dominfo[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1825,13 +1825,13 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd)
  * "domjobinfo" command
  */
 static const vshCmdInfo info_domjobinfo[] = {
-    {"help", gettext_noop("domain job information")},
-    {"desc", gettext_noop("Returns information about jobs running on a domain.")},
+    {"help", N_("domain job information")},
+    {"desc", N_("Returns information about jobs running on a domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_domjobinfo[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1910,13 +1910,13 @@ cleanup:
  * "domjobabort" command
  */
 static const vshCmdInfo info_domjobabort[] = {
-    {"help", gettext_noop("abort active domain job")},
-    {"desc", gettext_noop("Aborts the currently running domain job")},
+    {"help", N_("abort active domain job")},
+    {"desc", N_("Aborts the currently running domain job")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_domjobabort[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1946,13 +1946,13 @@ cleanup:
  * "freecell" command
  */
 static const vshCmdInfo info_freecell[] = {
-    {"help", gettext_noop("NUMA free memory")},
-    {"desc", gettext_noop("display available free memory for the NUMA cell.")},
+    {"help", N_("NUMA free memory")},
+    {"desc", N_("display available free memory for the NUMA cell.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_freecell[] = {
-    {"cellno", VSH_OT_DATA, 0, gettext_noop("NUMA cell number")},
+    {"cellno", VSH_OT_DATA, 0, N_("NUMA cell number")},
     {NULL, 0, 0, NULL}
 };
 
@@ -1989,13 +1989,13 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd)
  * "vcpuinfo" command
  */
 static const vshCmdInfo info_vcpuinfo[] = {
-    {"help", gettext_noop("domain vcpu information")},
-    {"desc", gettext_noop("Returns basic information about the domain virtual CPUs.")},
+    {"help", N_("domain vcpu information")},
+    {"desc", N_("Returns basic information about the domain virtual CPUs.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vcpuinfo[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2075,15 +2075,15 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
  * "vcpupin" command
  */
 static const vshCmdInfo info_vcpupin[] = {
-    {"help", gettext_noop("control domain vcpu affinity")},
-    {"desc", gettext_noop("Pin domain VCPUs to host physical CPUs.")},
+    {"help", N_("control domain vcpu affinity")},
+    {"desc", N_("Pin domain VCPUs to host physical CPUs.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vcpupin[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"vcpu", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("vcpu number")},
-    {"cpulist", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("host cpu number(s) (comma separated)")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"vcpu", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vcpu number")},
+    {"cpulist", VSH_OT_DATA, VSH_OFLAG_REQ, N_("host cpu number(s) (comma separated)")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2212,14 +2212,14 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd)
  * "setvcpus" command
  */
 static const vshCmdInfo info_setvcpus[] = {
-    {"help", gettext_noop("change number of virtual CPUs")},
-    {"desc", gettext_noop("Change the number of virtual CPUs in the guest domain.")},
+    {"help", N_("change number of virtual CPUs")},
+    {"desc", N_("Change the number of virtual CPUs in the guest domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_setvcpus[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"count", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("number of virtual CPUs")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"count", VSH_OT_DATA, VSH_OFLAG_REQ, N_("number of virtual CPUs")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2268,14 +2268,14 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd)
  * "setmemory" command
  */
 static const vshCmdInfo info_setmem[] = {
-    {"help", gettext_noop("change memory allocation")},
-    {"desc", gettext_noop("Change the current memory allocation in the guest domain.")},
+    {"help", N_("change memory allocation")},
+    {"desc", N_("Change the current memory allocation in the guest domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_setmem[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"kilobytes", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("number of kilobytes of memory")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"kilobytes", VSH_OT_DATA, VSH_OFLAG_REQ, N_("number of kilobytes of memory")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2324,14 +2324,14 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd)
  * "setmaxmem" command
  */
 static const vshCmdInfo info_setmaxmem[] = {
-    {"help", gettext_noop("change maximum memory limit")},
-    {"desc", gettext_noop("Change the maximum memory allocation limit in the guest domain.")},
+    {"help", N_("change maximum memory limit")},
+    {"desc", N_("Change the maximum memory allocation limit in the guest domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_setmaxmem[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"kilobytes", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("maximum memory limit in kilobytes")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"kilobytes", VSH_OT_DATA, VSH_OFLAG_REQ, N_("maximum memory limit in kilobytes")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2383,8 +2383,8 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd)
  * "nodeinfo" command
  */
 static const vshCmdInfo info_nodeinfo[] = {
-    {"help", gettext_noop("node information")},
-    {"desc", gettext_noop("Returns basic information about the node.")},
+    {"help", N_("node information")},
+    {"desc", N_("Returns basic information about the node.")},
     {NULL, NULL}
 };
 
@@ -2416,8 +2416,8 @@ cmdNodeinfo(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "capabilities" command
  */
 static const vshCmdInfo info_capabilities[] = {
-    {"help", gettext_noop("capabilities")},
-    {"desc", gettext_noop("Returns capabilities of hypervisor/driver.")},
+    {"help", N_("capabilities")},
+    {"desc", N_("Returns capabilities of hypervisor/driver.")},
     {NULL, NULL}
 };
 
@@ -2443,15 +2443,15 @@ cmdCapabilities (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "dumpxml" command
  */
 static const vshCmdInfo info_dumpxml[] = {
-    {"help", gettext_noop("domain information in XML")},
-    {"desc", gettext_noop("Output the domain information as an XML dump to stdout.")},
+    {"help", N_("domain information in XML")},
+    {"desc", N_("Output the domain information as an XML dump to stdout.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_dumpxml[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"inactive", VSH_OT_BOOL, 0, gettext_noop("show inactive defined XML")},
-    {"security-info", VSH_OT_BOOL, 0, gettext_noop("include security sensitive information in XML dump")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"inactive", VSH_OT_BOOL, 0, N_("show inactive defined XML")},
+    {"security-info", VSH_OT_BOOL, 0, N_("include security sensitive information in XML dump")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2492,14 +2492,14 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd)
  * "domxml-from-native" command
  */
 static const vshCmdInfo info_domxmlfromnative[] = {
-    {"help", gettext_noop("Convert native config to domain XML")},
-    {"desc", gettext_noop("Convert native guest configuration format to domain XML format.")},
+    {"help", N_("Convert native config to domain XML")},
+    {"desc", N_("Convert native guest configuration format to domain XML format.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_domxmlfromnative[] = {
-    {"format", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("source config data format")},
-    {"config", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("config data file to import from")},
+    {"format", VSH_OT_DATA, VSH_OFLAG_REQ, N_("source config data format")},
+    {"config", VSH_OT_DATA, VSH_OFLAG_REQ, N_("config data file to import from")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2538,14 +2538,14 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd)
  * "domxml-to-native" command
  */
 static const vshCmdInfo info_domxmltonative[] = {
-    {"help", gettext_noop("Convert domain XML to native config")},
-    {"desc", gettext_noop("Convert domain XML config to a native guest configuration format.")},
+    {"help", N_("Convert domain XML to native config")},
+    {"desc", N_("Convert domain XML config to a native guest configuration format.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_domxmltonative[] = {
-    {"format", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("target config data type format")},
-    {"xml", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("xml data file to export from")},
+    {"format", VSH_OT_DATA, VSH_OFLAG_REQ, N_("target config data type format")},
+    {"xml", VSH_OT_DATA, VSH_OFLAG_REQ, N_("xml data file to export from")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2584,13 +2584,13 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd)
  * "domname" command
  */
 static const vshCmdInfo info_domname[] = {
-    {"help", gettext_noop("convert a domain id or UUID to domain name")},
+    {"help", N_("convert a domain id or UUID to domain name")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_domname[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2614,13 +2614,13 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd)
  * "domid" command
  */
 static const vshCmdInfo info_domid[] = {
-    {"help", gettext_noop("convert a domain name or UUID to domain id")},
+    {"help", N_("convert a domain name or UUID to domain id")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_domid[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2649,13 +2649,13 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd)
  * "domuuid" command
  */
 static const vshCmdInfo info_domuuid[] = {
-    {"help", gettext_noop("convert a domain name or id to domain UUID")},
+    {"help", N_("convert a domain name or id to domain UUID")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_domuuid[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain id or name")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain id or name")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2684,23 +2684,23 @@ cmdDomuuid(vshControl *ctl, const vshCmd *cmd)
  * "migrate" command
  */
 static const vshCmdInfo info_migrate[] = {
-    {"help", gettext_noop("migrate domain to another host")},
-    {"desc", gettext_noop("Migrate domain to another host.  Add --live for live migration.")},
+    {"help", N_("migrate domain to another host")},
+    {"desc", N_("Migrate domain to another host.  Add --live for live migration.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_migrate[] = {
-    {"live", VSH_OT_BOOL, 0, gettext_noop("live migration")},
-    {"p2p", VSH_OT_BOOL, 0, gettext_noop("peer-2-peer migration")},
-    {"direct", VSH_OT_BOOL, 0, gettext_noop("direct migration")},
-    {"tunnelled", VSH_OT_BOOL, 0, gettext_noop("tunnelled migration")},
-    {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist VM on destination")},
-    {"undefinesource", VSH_OT_BOOL, 0, gettext_noop("undefine VM on source")},
-    {"suspend", VSH_OT_BOOL, 0, gettext_noop("do not restart the domain on the destination host")},
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"desturi", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("connection URI of the destination host")},
-    {"migrateuri", VSH_OT_DATA, 0, gettext_noop("migration URI, usually can be omitted")},
-    {"dname", VSH_OT_DATA, 0, gettext_noop("rename to new name during migration (if supported)")},
+    {"live", VSH_OT_BOOL, 0, N_("live migration")},
+    {"p2p", VSH_OT_BOOL, 0, N_("peer-2-peer migration")},
+    {"direct", VSH_OT_BOOL, 0, N_("direct migration")},
+    {"tunnelled", VSH_OT_BOOL, 0, N_("tunnelled migration")},
+    {"persistent", VSH_OT_BOOL, 0, N_("persist VM on destination")},
+    {"undefinesource", VSH_OT_BOOL, 0, N_("undefine VM on source")},
+    {"suspend", VSH_OT_BOOL, 0, N_("do not restart the domain on the destination host")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"desturi", VSH_OT_DATA, VSH_OFLAG_REQ, N_("connection URI of the destination host")},
+    {"migrateuri", VSH_OT_DATA, 0, N_("migration URI, usually can be omitted")},
+    {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2781,15 +2781,15 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd)
  * "net-autostart" command
  */
 static const vshCmdInfo info_network_autostart[] = {
-    {"help", gettext_noop("autostart a network")},
+    {"help", N_("autostart a network")},
     {"desc",
-     gettext_noop("Configure a network to be automatically started at boot.")},
+     N_("Configure a network to be automatically started at boot.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_autostart[] = {
-    {"network",  VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name or uuid")},
-    {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")},
+    {"network",  VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name or uuid")},
+    {"disable", VSH_OT_BOOL, 0, N_("disable autostarting")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2830,13 +2830,13 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd)
  * "net-create" command
  */
 static const vshCmdInfo info_network_create[] = {
-    {"help", gettext_noop("create a network from an XML file")},
-    {"desc", gettext_noop("Create a network.")},
+    {"help", N_("create a network from an XML file")},
+    {"desc", N_("Create a network.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_create[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML network description")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML network description")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2878,13 +2878,13 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd)
  * "net-define" command
  */
 static const vshCmdInfo info_network_define[] = {
-    {"help", gettext_noop("define (but don't start) a network from an XML file")},
-    {"desc", gettext_noop("Define a network.")},
+    {"help", N_("define (but don't start) a network from an XML file")},
+    {"desc", N_("Define a network.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_define[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML network description")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML network description")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2926,13 +2926,13 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd)
  * "net-destroy" command
  */
 static const vshCmdInfo info_network_destroy[] = {
-    {"help", gettext_noop("destroy a network")},
-    {"desc", gettext_noop("Destroy a given network.")},
+    {"help", N_("destroy a network")},
+    {"desc", N_("Destroy a given network.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_destroy[] = {
-    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name, id or uuid")},
+    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -2965,13 +2965,13 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd)
  * "net-dumpxml" command
  */
 static const vshCmdInfo info_network_dumpxml[] = {
-    {"help", gettext_noop("network information in XML")},
-    {"desc", gettext_noop("Output the network information as an XML dump to stdout.")},
+    {"help", N_("network information in XML")},
+    {"desc", N_("Output the network information as an XML dump to stdout.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_dumpxml[] = {
-    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name, id or uuid")},
+    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3005,13 +3005,13 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd)
  * "iface-edit" command
  */
 static const vshCmdInfo info_interface_edit[] = {
-    {"help", gettext_noop("edit XML configuration for a physical host interface")},
-    {"desc", gettext_noop("Edit the XML configuration for a physical host interface.")},
+    {"help", N_("edit XML configuration for a physical host interface")},
+    {"desc", N_("Edit the XML configuration for a physical host interface.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_edit[] = {
-    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")},
+    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface name or MAC address")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3105,14 +3105,14 @@ cleanup:
  * "net-list" command
  */
 static const vshCmdInfo info_network_list[] = {
-    {"help", gettext_noop("list networks")},
-    {"desc", gettext_noop("Returns list of networks.")},
+    {"help", N_("list networks")},
+    {"desc", N_("Returns list of networks.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_list[] = {
-    {"inactive", VSH_OT_BOOL, 0, gettext_noop("list inactive networks")},
-    {"all", VSH_OT_BOOL, 0, gettext_noop("list inactive & active networks")},
+    {"inactive", VSH_OT_BOOL, 0, N_("list inactive networks")},
+    {"all", VSH_OT_BOOL, 0, N_("list inactive & active networks")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3232,13 +3232,13 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "net-name" command
  */
 static const vshCmdInfo info_network_name[] = {
-    {"help", gettext_noop("convert a network UUID to network name")},
+    {"help", N_("convert a network UUID to network name")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_name[] = {
-    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network uuid")},
+    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3263,13 +3263,13 @@ cmdNetworkName(vshControl *ctl, const vshCmd *cmd)
  * "net-start" command
  */
 static const vshCmdInfo info_network_start[] = {
-    {"help", gettext_noop("start a (previously defined) inactive network")},
-    {"desc", gettext_noop("Start a network.")},
+    {"help", N_("start a (previously defined) inactive network")},
+    {"desc", N_("Start a network.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_start[] = {
-    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive network")},
+    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("name of the inactive network")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3302,13 +3302,13 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd)
  * "net-undefine" command
  */
 static const vshCmdInfo info_network_undefine[] = {
-    {"help", gettext_noop("undefine an inactive network")},
-    {"desc", gettext_noop("Undefine the configuration for an inactive network.")},
+    {"help", N_("undefine an inactive network")},
+    {"desc", N_("Undefine the configuration for an inactive network.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_undefine[] = {
-    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name or uuid")},
+    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3341,13 +3341,13 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd)
  * "net-uuid" command
  */
 static const vshCmdInfo info_network_uuid[] = {
-    {"help", gettext_noop("convert a network name to network UUID")},
+    {"help", N_("convert a network name to network UUID")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_uuid[] = {
-    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name")},
+    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3379,14 +3379,14 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd)
  * "iface-list" command
  */
 static const vshCmdInfo info_interface_list[] = {
-    {"help", gettext_noop("list physical host interfaces")},
-    {"desc", gettext_noop("Returns list of physical host interfaces.")},
+    {"help", N_("list physical host interfaces")},
+    {"desc", N_("Returns list of physical host interfaces.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_list[] = {
-    {"inactive", VSH_OT_BOOL, 0, gettext_noop("list inactive interfaces")},
-    {"all", VSH_OT_BOOL, 0, gettext_noop("list inactive & active interfaces")},
+    {"inactive", VSH_OT_BOOL, 0, N_("list inactive interfaces")},
+    {"all", VSH_OT_BOOL, 0, N_("list inactive & active interfaces")},
     {NULL, 0, 0, NULL}
 };
 static int
@@ -3491,13 +3491,13 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "iface-name" command
  */
 static const vshCmdInfo info_interface_name[] = {
-    {"help", gettext_noop("convert an interface MAC address to interface name")},
+    {"help", N_("convert an interface MAC address to interface name")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_name[] = {
-    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface mac")},
+    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface mac")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3521,13 +3521,13 @@ cmdInterfaceName(vshControl *ctl, const vshCmd *cmd)
  * "iface-mac" command
  */
 static const vshCmdInfo info_interface_mac[] = {
-    {"help", gettext_noop("convert an interface name to interface MAC address")},
+    {"help", N_("convert an interface name to interface MAC address")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_mac[] = {
-    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name")},
+    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface name")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3551,14 +3551,14 @@ cmdInterfaceMAC(vshControl *ctl, const vshCmd *cmd)
  * "iface-dumpxml" command
  */
 static const vshCmdInfo info_interface_dumpxml[] = {
-    {"help", gettext_noop("interface information in XML")},
-    {"desc", gettext_noop("Output the physical host interface information as an XML dump to stdout.")},
+    {"help", N_("interface information in XML")},
+    {"desc", N_("Output the physical host interface information as an XML dump to stdout.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_dumpxml[] = {
-    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")},
-    {"inactive", VSH_OT_BOOL, 0, gettext_noop("show inactive defined XML")},
+    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface name or MAC address")},
+    {"inactive", VSH_OT_BOOL, 0, N_("show inactive defined XML")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3596,13 +3596,13 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd)
  * "iface-define" command
  */
 static const vshCmdInfo info_interface_define[] = {
-    {"help", gettext_noop("define (but don't start) a physical host interface from an XML file")},
-    {"desc", gettext_noop("Define a physical host interface.")},
+    {"help", N_("define (but don't start) a physical host interface from an XML file")},
+    {"desc", N_("Define a physical host interface.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_define[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML interface description")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML interface description")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3643,13 +3643,13 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd)
  * "iface-undefine" command
  */
 static const vshCmdInfo info_interface_undefine[] = {
-    {"help", gettext_noop("undefine a physical host interface (remove it from configuration)")},
-    {"desc", gettext_noop("undefine an interface.")},
+    {"help", N_("undefine a physical host interface (remove it from configuration)")},
+    {"desc", N_("undefine an interface.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_undefine[] = {
-    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")},
+    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface name or MAC address")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3681,13 +3681,13 @@ cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd)
  * "iface-start" command
  */
 static const vshCmdInfo info_interface_start[] = {
-    {"help", gettext_noop("start a physical host interface (enable it / \"if-up\")")},
-    {"desc", gettext_noop("start a physical host interface.")},
+    {"help", N_("start a physical host interface (enable it / \"if-up\")")},
+    {"desc", N_("start a physical host interface.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_start[] = {
-    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")},
+    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface name or MAC address")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3719,13 +3719,13 @@ cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd)
  * "iface-destroy" command
  */
 static const vshCmdInfo info_interface_destroy[] = {
-    {"help", gettext_noop("destroy a physical host interface (disable it / \"if-down\")")},
-    {"desc", gettext_noop("destroy a physical host interface.")},
+    {"help", N_("destroy a physical host interface (disable it / \"if-down\")")},
+    {"desc", N_("destroy a physical host interface.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_interface_destroy[] = {
-    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")},
+    {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface name or MAC address")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3758,15 +3758,15 @@ cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd)
  * "pool-autostart" command
  */
 static const vshCmdInfo info_pool_autostart[] = {
-    {"help", gettext_noop("autostart a pool")},
+    {"help", N_("autostart a pool")},
     {"desc",
-     gettext_noop("Configure a pool to be automatically started at boot.")},
+     N_("Configure a pool to be automatically started at boot.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_autostart[] = {
-    {"pool",  VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
-    {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")},
+    {"pool",  VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
+    {"disable", VSH_OT_BOOL, 0, N_("disable autostarting")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3807,14 +3807,14 @@ cmdPoolAutostart(vshControl *ctl, const vshCmd *cmd)
  * "pool-create" command
  */
 static const vshCmdInfo info_pool_create[] = {
-    {"help", gettext_noop("create a pool from an XML file")},
-    {"desc", gettext_noop("Create a pool.")},
+    {"help", N_("create a pool from an XML file")},
+    {"desc", N_("Create a pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_create[] = {
     {"file", VSH_OT_DATA, VSH_OFLAG_REQ,
-     gettext_noop("file containing an XML pool description")},
+     N_("file containing an XML pool description")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3856,9 +3856,9 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd)
  * "nodedev-create" command
  */
 static const vshCmdInfo info_node_device_create[] = {
-    {"help", gettext_noop("create a device defined "
+    {"help", N_("create a device defined "
                           "by an XML file on the node")},
-    {"desc", gettext_noop("Create a device on the node.  Note that this "
+    {"desc", N_("Create a device on the node.  Note that this "
                           "command creates devices on the physical host "
                           "that can then be assigned to a virtual machine.")},
     {NULL, NULL}
@@ -3866,7 +3866,7 @@ static const vshCmdInfo info_node_device_create[] = {
 
 static const vshCmdOptDef opts_node_device_create[] = {
     {"file", VSH_OT_DATA, VSH_OFLAG_REQ,
-     gettext_noop("file containing an XML description of the device")},
+     N_("file containing an XML description of the device")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3911,15 +3911,15 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd)
  * "nodedev-destroy" command
  */
 static const vshCmdInfo info_node_device_destroy[] = {
-    {"help", gettext_noop("destroy a device on the node")},
-    {"desc", gettext_noop("Destroy a device on the node.  Note that this "
+    {"help", N_("destroy a device on the node")},
+    {"desc", N_("Destroy a device on the node.  Note that this "
                           "command destroys devices on the physical host ")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_node_device_destroy[] = {
     {"name", VSH_OT_DATA, VSH_OFLAG_REQ,
-     gettext_noop("name of the device to be destroyed")},
+     N_("name of the device to be destroyed")},
     {NULL, 0, 0, NULL}
 };
 
@@ -3958,14 +3958,14 @@ cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd)
  * XML Building helper for pool-define-as and pool-create-as
  */
 static const vshCmdOptDef opts_pool_X_as[] = {
-    {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the pool")},
-    {"print-xml", VSH_OT_BOOL, 0, gettext_noop("print XML document, but don't define/create")},
-    {"type", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("type of the pool")},
-    {"source-host", VSH_OT_DATA, 0, gettext_noop("source-host for underlying storage")},
-    {"source-path", VSH_OT_DATA, 0, gettext_noop("source path for underlying storage")},
-    {"source-dev", VSH_OT_DATA, 0, gettext_noop("source device for underlying storage")},
-    {"source-name", VSH_OT_DATA, 0, gettext_noop("source name for underlying storage")},
-    {"target", VSH_OT_DATA, 0, gettext_noop("target for underlying storage")},
+    {"name", VSH_OT_DATA, VSH_OFLAG_REQ, N_("name of the pool")},
+    {"print-xml", VSH_OT_BOOL, 0, N_("print XML document, but don't define/create")},
+    {"type", VSH_OT_DATA, VSH_OFLAG_REQ, N_("type of the pool")},
+    {"source-host", VSH_OT_DATA, 0, N_("source-host for underlying storage")},
+    {"source-path", VSH_OT_DATA, 0, N_("source path for underlying storage")},
+    {"source-dev", VSH_OT_DATA, 0, N_("source device for underlying storage")},
+    {"source-name", VSH_OT_DATA, 0, N_("source name for underlying storage")},
+    {"target", VSH_OT_DATA, 0, N_("target for underlying storage")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4029,8 +4029,8 @@ cleanup:
  * "pool-create-as" command
  */
 static const vshCmdInfo info_pool_create_as[] = {
-    {"help", gettext_noop("create a pool from a set of args")},
-    {"desc", gettext_noop("Create a pool.")},
+    {"help", N_("create a pool from a set of args")},
+    {"desc", N_("Create a pool.")},
     {NULL, NULL}
 };
 
@@ -4070,13 +4070,13 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd)
  * "pool-define" command
  */
 static const vshCmdInfo info_pool_define[] = {
-    {"help", gettext_noop("define (but don't start) a pool from an XML file")},
-    {"desc", gettext_noop("Define a pool.")},
+    {"help", N_("define (but don't start) a pool from an XML file")},
+    {"desc", N_("Define a pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_define[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML pool description")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML pool description")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4118,8 +4118,8 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd)
  * "pool-define-as" command
  */
 static const vshCmdInfo info_pool_define_as[] = {
-    {"help", gettext_noop("define a pool from a set of args")},
-    {"desc", gettext_noop("Define a pool.")},
+    {"help", N_("define a pool from a set of args")},
+    {"desc", N_("Define a pool.")},
     {NULL, NULL}
 };
 
@@ -4159,13 +4159,13 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd)
  * "pool-build" command
  */
 static const vshCmdInfo info_pool_build[] = {
-    {"help", gettext_noop("build a pool")},
-    {"desc", gettext_noop("Build a given pool.")},
+    {"help", N_("build a pool")},
+    {"desc", N_("Build a given pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_build[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4199,13 +4199,13 @@ cmdPoolBuild(vshControl *ctl, const vshCmd *cmd)
  * "pool-destroy" command
  */
 static const vshCmdInfo info_pool_destroy[] = {
-    {"help", gettext_noop("destroy a pool")},
-    {"desc", gettext_noop("Destroy a given pool.")},
+    {"help", N_("destroy a pool")},
+    {"desc", N_("Destroy a given pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_destroy[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4238,13 +4238,13 @@ cmdPoolDestroy(vshControl *ctl, const vshCmd *cmd)
  * "pool-delete" command
  */
 static const vshCmdInfo info_pool_delete[] = {
-    {"help", gettext_noop("delete a pool")},
-    {"desc", gettext_noop("Delete a given pool.")},
+    {"help", N_("delete a pool")},
+    {"desc", N_("Delete a given pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_delete[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4277,13 +4277,13 @@ cmdPoolDelete(vshControl *ctl, const vshCmd *cmd)
  * "pool-refresh" command
  */
 static const vshCmdInfo info_pool_refresh[] = {
-    {"help", gettext_noop("refresh a pool")},
-    {"desc", gettext_noop("Refresh a given pool.")},
+    {"help", N_("refresh a pool")},
+    {"desc", N_("Refresh a given pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_refresh[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4316,13 +4316,13 @@ cmdPoolRefresh(vshControl *ctl, const vshCmd *cmd)
  * "pool-dumpxml" command
  */
 static const vshCmdInfo info_pool_dumpxml[] = {
-    {"help", gettext_noop("pool information in XML")},
-    {"desc", gettext_noop("Output the pool information as an XML dump to stdout.")},
+    {"help", N_("pool information in XML")},
+    {"desc", N_("Output the pool information as an XML dump to stdout.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_dumpxml[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4356,14 +4356,14 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd)
  * "pool-list" command
  */
 static const vshCmdInfo info_pool_list[] = {
-    {"help", gettext_noop("list pools")},
-    {"desc", gettext_noop("Returns list of pools.")},
+    {"help", N_("list pools")},
+    {"desc", N_("Returns list of pools.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_list[] = {
-    {"inactive", VSH_OT_BOOL, 0, gettext_noop("list inactive pools")},
-    {"all", VSH_OT_BOOL, 0, gettext_noop("list inactive & active pools")},
+    {"inactive", VSH_OT_BOOL, 0, N_("list inactive pools")},
+    {"all", VSH_OT_BOOL, 0, N_("list inactive & active pools")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4478,16 +4478,16 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "find-storage-pool-sources-as" command
  */
 static const vshCmdInfo info_find_storage_pool_sources_as[] = {
-    {"help", gettext_noop("find potential storage pool sources")},
-    {"desc", gettext_noop("Returns XML <sources> document.")},
+    {"help", N_("find potential storage pool sources")},
+    {"desc", N_("Returns XML <sources> document.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_find_storage_pool_sources_as[] = {
     {"type", VSH_OT_DATA, VSH_OFLAG_REQ,
-     gettext_noop("type of storage pool sources to find")},
-    {"host", VSH_OT_DATA, VSH_OFLAG_NONE, gettext_noop("optional host to query")},
-    {"port", VSH_OT_DATA, VSH_OFLAG_NONE, gettext_noop("optional port to query")},
+     N_("type of storage pool sources to find")},
+    {"host", VSH_OT_DATA, VSH_OFLAG_NONE, N_("optional host to query")},
+    {"port", VSH_OT_DATA, VSH_OFLAG_NONE, N_("optional port to query")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4558,16 +4558,16 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED)
  * "find-storage-pool-sources" command
  */
 static const vshCmdInfo info_find_storage_pool_sources[] = {
-    {"help", gettext_noop("discover potential storage pool sources")},
-    {"desc", gettext_noop("Returns XML <sources> document.")},
+    {"help", N_("discover potential storage pool sources")},
+    {"desc", N_("Returns XML <sources> document.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_find_storage_pool_sources[] = {
     {"type", VSH_OT_DATA, VSH_OFLAG_REQ,
-     gettext_noop("type of storage pool sources to discover")},
+     N_("type of storage pool sources to discover")},
     {"srcSpec", VSH_OT_DATA, VSH_OFLAG_NONE,
-     gettext_noop("optional file of source xml to query for pools")},
+     N_("optional file of source xml to query for pools")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4608,13 +4608,13 @@ cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED)
  * "pool-info" command
  */
 static const vshCmdInfo info_pool_info[] = {
-    {"help", gettext_noop("storage pool information")},
-    {"desc", gettext_noop("Returns basic information about the storage pool.")},
+    {"help", N_("storage pool information")},
+    {"desc", N_("Returns basic information about the storage pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_info[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4683,13 +4683,13 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd)
  * "pool-name" command
  */
 static const vshCmdInfo info_pool_name[] = {
-    {"help", gettext_noop("convert a pool UUID to pool name")},
+    {"help", N_("convert a pool UUID to pool name")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_name[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4714,13 +4714,13 @@ cmdPoolName(vshControl *ctl, const vshCmd *cmd)
  * "pool-start" command
  */
 static const vshCmdInfo info_pool_start[] = {
-    {"help", gettext_noop("start a (previously defined) inactive pool")},
-    {"desc", gettext_noop("Start a pool.")},
+    {"help", N_("start a (previously defined) inactive pool")},
+    {"desc", N_("Start a pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_start[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive pool")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("name of the inactive pool")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4753,17 +4753,17 @@ cmdPoolStart(vshControl *ctl, const vshCmd *cmd)
  * "vol-create-as" command
  */
 static const vshCmdInfo info_vol_create_as[] = {
-    {"help", gettext_noop("create a volume from a set of args")},
-    {"desc", gettext_noop("Create a vol.")},
+    {"help", N_("create a volume from a set of args")},
+    {"desc", N_("Create a vol.")},
     {NULL, NULL}
 };
 
 static const 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 volume")},
-    {"capacity", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("size of the vol with optional k,M,G,T suffix")},
-    {"allocation", VSH_OT_STRING, 0, gettext_noop("initial allocation size with optional k,M,G,T suffix")},
-    {"format", VSH_OT_STRING, 0, gettext_noop("file format type raw,bochs,qcow,qcow2,vmdk")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name")},
+    {"name", VSH_OT_DATA, VSH_OFLAG_REQ, N_("name of the volume")},
+    {"capacity", VSH_OT_DATA, VSH_OFLAG_REQ, N_("size of the vol with optional k,M,G,T suffix")},
+    {"allocation", VSH_OT_STRING, 0, N_("initial allocation size with optional k,M,G,T suffix")},
+    {"format", VSH_OT_STRING, 0, N_("file format type raw,bochs,qcow,qcow2,vmdk")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4873,13 +4873,13 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd)
  * "pool-undefine" command
  */
 static const vshCmdInfo info_pool_undefine[] = {
-    {"help", gettext_noop("undefine an inactive pool")},
-    {"desc", gettext_noop("Undefine the configuration for an inactive pool.")},
+    {"help", N_("undefine an inactive pool")},
+    {"desc", N_("Undefine the configuration for an inactive pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_undefine[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4912,13 +4912,13 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd)
  * "pool-uuid" command
  */
 static const vshCmdInfo info_pool_uuid[] = {
-    {"help", gettext_noop("convert a pool name to pool UUID")},
+    {"help", N_("convert a pool name to pool UUID")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_uuid[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name")},
     {NULL, 0, 0, NULL}
 };
 
@@ -4949,14 +4949,14 @@ cmdPoolUuid(vshControl *ctl, const vshCmd *cmd)
  * "vol-create" command
  */
 static const vshCmdInfo info_vol_create[] = {
-    {"help", gettext_noop("create a vol from an XML file")},
-    {"desc", gettext_noop("Create a vol.")},
+    {"help", N_("create a vol from an XML file")},
+    {"desc", N_("Create a vol.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_create[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name")},
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML vol description")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML vol description")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5007,16 +5007,16 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd)
  * "vol-create-from" command
  */
 static const vshCmdInfo info_vol_create_from[] = {
-    {"help", gettext_noop("create a vol, using another volume as input")},
-    {"desc", gettext_noop("Create a vol from an existing volume.")},
+    {"help", N_("create a vol, using another volume as input")},
+    {"desc", N_("Create a vol from an existing volume.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_create_from[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name")},
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML vol description")},
-    {"inputpool", VSH_OT_STRING, 0, gettext_noop("pool name or uuid of the input volume's pool")},
-    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("input vol name or key")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML vol description")},
+    {"inputpool", VSH_OT_STRING, 0, N_("pool name or uuid of the input volume's pool")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("input vol name or key")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5106,15 +5106,15 @@ cleanup:
  * "vol-clone" command
  */
 static const vshCmdInfo info_vol_clone[] = {
-    {"help", gettext_noop("clone a volume.")},
-    {"desc", gettext_noop("Clone an existing volume.")},
+    {"help", N_("clone a volume.")},
+    {"desc", N_("Clone an existing volume.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_clone[] = {
-    {"pool", VSH_OT_STRING, 0, gettext_noop("pool name or uuid")},
-    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("orig vol name or key")},
-    {"newname", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("clone name")},
+    {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("orig vol name or key")},
+    {"newname", VSH_OT_DATA, VSH_OFLAG_REQ, N_("clone name")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5183,14 +5183,14 @@ cleanup:
  * "vol-delete" command
  */
 static const vshCmdInfo info_vol_delete[] = {
-    {"help", gettext_noop("delete a vol")},
-    {"desc", gettext_noop("Delete a given vol.")},
+    {"help", N_("delete a vol")},
+    {"desc", N_("Delete a given vol.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_delete[] = {
-    {"pool", VSH_OT_STRING, 0, gettext_noop("pool name or uuid")},
-    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("vol name, key or path")},
+    {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5224,14 +5224,14 @@ cmdVolDelete(vshControl *ctl, const vshCmd *cmd)
  * "vol-info" command
  */
 static const vshCmdInfo info_vol_info[] = {
-    {"help", gettext_noop("storage vol information")},
-    {"desc", gettext_noop("Returns basic information about the storage vol.")},
+    {"help", N_("storage vol information")},
+    {"desc", N_("Returns basic information about the storage vol.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_info[] = {
-    {"pool", VSH_OT_STRING, 0, gettext_noop("pool name or uuid")},
-    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("vol name, key or path")},
+    {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5275,14 +5275,14 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd)
  * "vol-dumpxml" command
  */
 static const vshCmdInfo info_vol_dumpxml[] = {
-    {"help", gettext_noop("vol information in XML")},
-    {"desc", gettext_noop("Output the vol information as an XML dump to stdout.")},
+    {"help", N_("vol information in XML")},
+    {"desc", N_("Output the vol information as an XML dump to stdout.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_dumpxml[] = {
-    {"pool", VSH_OT_STRING, 0, gettext_noop("pool name or uuid")},
-    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("vol name, key or path")},
+    {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name, key or path")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5316,13 +5316,13 @@ cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd)
  * "vol-list" command
  */
 static const vshCmdInfo info_vol_list[] = {
-    {"help", gettext_noop("list vols")},
-    {"desc", gettext_noop("Returns list of vols by pool.")},
+    {"help", N_("list vols")},
+    {"desc", N_("Returns list of vols by pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_list[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5394,13 +5394,13 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "vol-name" command
  */
 static const vshCmdInfo info_vol_name[] = {
-    {"help", gettext_noop("convert a vol UUID to vol name")},
+    {"help", N_("convert a vol UUID to vol name")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_name[] = {
-    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("vol key or path")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol key or path")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5427,13 +5427,13 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd)
  * "vol-key" command
  */
 static const vshCmdInfo info_vol_key[] = {
-    {"help", gettext_noop("convert a vol UUID to vol key")},
+    {"help", N_("convert a vol UUID to vol key")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_key[] = {
-    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("vol uuid")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5460,14 +5460,14 @@ cmdVolKey(vshControl *ctl, const vshCmd *cmd)
  * "vol-path" command
  */
 static const vshCmdInfo info_vol_path[] = {
-    {"help", gettext_noop("convert a vol UUID to vol path")},
+    {"help", N_("convert a vol UUID to vol path")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vol_path[] = {
-    {"pool", VSH_OT_STRING, 0, gettext_noop("pool name or uuid")},
-    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("vol name or key")},
+    {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")},
+    {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol name or key")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5494,13 +5494,13 @@ cmdVolPath(vshControl *ctl, const vshCmd *cmd)
  * "secret-define" command
  */
 static const vshCmdInfo info_secret_define[] = {
-    {"help", gettext_noop("define or modify a secret from an XML file")},
-    {"desc", gettext_noop("Define or modify a secret.")},
+    {"help", N_("define or modify a secret from an XML file")},
+    {"desc", N_("Define or modify a secret.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_secret_define[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing secret attributes in XML")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing secret attributes in XML")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5542,13 +5542,13 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd)
  * "secret-dumpxml" command
  */
 static const vshCmdInfo info_secret_dumpxml[] = {
-    {"help", gettext_noop("secret attributes in XML")},
-    {"desc", gettext_noop("Output attributes of a secret as an XML dump to stdout.")},
+    {"help", N_("secret attributes in XML")},
+    {"desc", N_("Output attributes of a secret as an XML dump to stdout.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_secret_dumpxml[] = {
-    {"secret", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("secret UUID")},
+    {"secret", VSH_OT_DATA, VSH_OFLAG_REQ, N_("secret UUID")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5582,14 +5582,14 @@ cleanup:
  * "secret-set-value" command
  */
 static const vshCmdInfo info_secret_set_value[] = {
-    {"help", gettext_noop("set a secret value")},
-    {"desc", gettext_noop("Set a secret value.")},
+    {"help", N_("set a secret value")},
+    {"desc", N_("Set a secret value.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_secret_set_value[] = {
-    {"secret", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("secret UUID")},
-    {"base64", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("base64-encoded secret value")},
+    {"secret", VSH_OT_DATA, VSH_OFLAG_REQ, N_("secret UUID")},
+    {"base64", VSH_OT_DATA, VSH_OFLAG_REQ, N_("base64-encoded secret value")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5641,13 +5641,13 @@ cleanup:
  * "secret-get-value" command
  */
 static const vshCmdInfo info_secret_get_value[] = {
-    {"help", gettext_noop("Output a secret value")},
-    {"desc", gettext_noop("Output a secret value to stdout.")},
+    {"help", N_("Output a secret value")},
+    {"desc", N_("Output a secret value to stdout.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_secret_get_value[] = {
-    {"secret", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("secret UUID")},
+    {"secret", VSH_OT_DATA, VSH_OFLAG_REQ, N_("secret UUID")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5693,13 +5693,13 @@ cleanup:
  * "secret-undefine" command
  */
 static const vshCmdInfo info_secret_undefine[] = {
-    {"help", gettext_noop("undefine a secret")},
-    {"desc", gettext_noop("Undefine a secret.")},
+    {"help", N_("undefine a secret")},
+    {"desc", N_("Undefine a secret.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_secret_undefine[] = {
-    {"secret", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("secret UUID")},
+    {"secret", VSH_OT_DATA, VSH_OFLAG_REQ, N_("secret UUID")},
     {NULL, 0, 0, NULL}
 };
 
@@ -5733,8 +5733,8 @@ cleanup:
  * "secret-list" command
  */
 static const vshCmdInfo info_secret_list[] = {
-    {"help", gettext_noop("list secrets")},
-    {"desc", gettext_noop("Returns a list of secrets")},
+    {"help", N_("list secrets")},
+    {"desc", N_("Returns a list of secrets")},
     {NULL, NULL}
 };
 
@@ -5801,8 +5801,8 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "version" command
  */
 static const vshCmdInfo info_version[] = {
-    {"help", gettext_noop("show version")},
-    {"desc", gettext_noop("Display the system version information.")},
+    {"help", N_("show version")},
+    {"desc", N_("Display the system version information.")},
     {NULL, NULL}
 };
 
@@ -5880,14 +5880,14 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "nodedev-list" command
  */
 static const vshCmdInfo info_node_list_devices[] = {
-    {"help", gettext_noop("enumerate devices on this host")},
+    {"help", N_("enumerate devices on this host")},
     {"desc", ""},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_node_list_devices[] = {
-    {"tree", VSH_OT_BOOL, 0, gettext_noop("list devices in a tree")},
-    {"cap", VSH_OT_STRING, VSH_OFLAG_NONE, gettext_noop("capability name")},
+    {"tree", VSH_OT_BOOL, 0, N_("list devices in a tree")},
+    {"cap", VSH_OT_STRING, VSH_OFLAG_NONE, N_("capability name")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6048,14 +6048,14 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "nodedev-dumpxml" command
  */
 static const vshCmdInfo info_node_device_dumpxml[] = {
-    {"help", gettext_noop("node device details in XML")},
-    {"desc", gettext_noop("Output the node device details as an XML dump to stdout.")},
+    {"help", N_("node device details in XML")},
+    {"desc", N_("Output the node device details as an XML dump to stdout.")},
     {NULL, NULL}
 };
 
 
 static const vshCmdOptDef opts_node_device_dumpxml[] = {
-    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("device key")},
+    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("device key")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6091,14 +6091,14 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd)
  * "nodedev-dettach" command
  */
 static const vshCmdInfo info_node_device_dettach[] = {
-    {"help", gettext_noop("dettach node device from its device driver")},
-    {"desc", gettext_noop("Dettach node device from its device driver before assigning to a domain.")},
+    {"help", N_("dettach node device from its device driver")},
+    {"desc", N_("Dettach node device from its device driver before assigning to a domain.")},
     {NULL, NULL}
 };
 
 
 static const vshCmdOptDef opts_node_device_dettach[] = {
-    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("device key")},
+    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("device key")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6132,14 +6132,14 @@ cmdNodeDeviceDettach (vshControl *ctl, const vshCmd *cmd)
  * "nodedev-reattach" command
  */
 static const vshCmdInfo info_node_device_reattach[] = {
-    {"help", gettext_noop("reattach node device to its device driver")},
-    {"desc", gettext_noop("Reattach node device to its device driver once released by the domain.")},
+    {"help", N_("reattach node device to its device driver")},
+    {"desc", N_("Reattach node device to its device driver once released by the domain.")},
     {NULL, NULL}
 };
 
 
 static const vshCmdOptDef opts_node_device_reattach[] = {
-    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("device key")},
+    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("device key")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6173,14 +6173,14 @@ cmdNodeDeviceReAttach (vshControl *ctl, const vshCmd *cmd)
  * "nodedev-reset" command
  */
 static const vshCmdInfo info_node_device_reset[] = {
-    {"help", gettext_noop("reset node device")},
-    {"desc", gettext_noop("Reset node device before or after assigning to a domain.")},
+    {"help", N_("reset node device")},
+    {"desc", N_("Reset node device before or after assigning to a domain.")},
     {NULL, NULL}
 };
 
 
 static const vshCmdOptDef opts_node_device_reset[] = {
-    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("device key")},
+    {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("device key")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6214,7 +6214,7 @@ cmdNodeDeviceReset (vshControl *ctl, const vshCmd *cmd)
  * "hostkey" command
  */
 static const vshCmdInfo info_hostname[] = {
-    {"help", gettext_noop("print the hypervisor hostname")},
+    {"help", N_("print the hypervisor hostname")},
     {"desc", ""},
     {NULL, NULL}
 };
@@ -6243,7 +6243,7 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "uri" command
  */
 static const vshCmdInfo info_uri[] = {
-    {"help", gettext_noop("print the hypervisor canonical URI")},
+    {"help", N_("print the hypervisor canonical URI")},
     {"desc", ""},
     {NULL, NULL}
 };
@@ -6272,13 +6272,13 @@ cmdURI (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "vncdisplay" command
  */
 static const vshCmdInfo info_vncdisplay[] = {
-    {"help", gettext_noop("vnc display")},
-    {"desc", gettext_noop("Output the IP address and port number for the VNC display.")},
+    {"help", N_("vnc display")},
+    {"desc", N_("Output the IP address and port number for the VNC display.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_vncdisplay[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6347,13 +6347,13 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd)
  * "ttyconsole" command
  */
 static const vshCmdInfo info_ttyconsole[] = {
-    {"help", gettext_noop("tty console")},
-    {"desc", gettext_noop("Output the device for the TTY console.")},
+    {"help", N_("tty console")},
+    {"desc", N_("Output the device for the TTY console.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_ttyconsole[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6408,15 +6408,15 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd)
  * "attach-device" command
  */
 static const vshCmdInfo info_attach_device[] = {
-    {"help", gettext_noop("attach device from an XML file")},
-    {"desc", gettext_noop("Attach device from an XML <file>.")},
+    {"help", N_("attach device from an XML file")},
+    {"desc", N_("Attach device from an XML <file>.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_attach_device[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"file",   VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("XML file")},
-    {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist device attachment")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"file",   VSH_OT_DATA, VSH_OFLAG_REQ, N_("XML file")},
+    {"persistent", VSH_OT_BOOL, 0, N_("persist device attachment")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6475,15 +6475,15 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd)
  * "detach-device" command
  */
 static const vshCmdInfo info_detach_device[] = {
-    {"help", gettext_noop("detach device from an XML file")},
-    {"desc", gettext_noop("Detach device from an XML <file>")},
+    {"help", N_("detach device from an XML file")},
+    {"desc", N_("Detach device from an XML <file>")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_detach_device[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"file",   VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("XML file")},
-    {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist device detachment")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"file",   VSH_OT_DATA, VSH_OFLAG_REQ, N_("XML file")},
+    {"persistent", VSH_OT_BOOL, 0, N_("persist device detachment")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6542,19 +6542,19 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd)
  * "attach-interface" command
  */
 static const vshCmdInfo info_attach_interface[] = {
-    {"help", gettext_noop("attach network interface")},
-    {"desc", gettext_noop("Attach new network interface.")},
+    {"help", N_("attach network interface")},
+    {"desc", N_("Attach new network interface.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_attach_interface[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"type",   VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network interface type")},
-    {"source", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("source of network interface")},
-    {"target", VSH_OT_DATA, 0, gettext_noop("target network name")},
-    {"mac",    VSH_OT_DATA, 0, gettext_noop("MAC address")},
-    {"script", VSH_OT_DATA, 0, gettext_noop("script used to bridge network interface")},
-    {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist interface attachment")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"type",   VSH_OT_DATA, VSH_OFLAG_REQ, N_("network interface type")},
+    {"source", VSH_OT_DATA, VSH_OFLAG_REQ, N_("source of network interface")},
+    {"target", VSH_OT_DATA, 0, N_("target network name")},
+    {"mac",    VSH_OT_DATA, 0, N_("MAC address")},
+    {"script", VSH_OT_DATA, 0, N_("script used to bridge network interface")},
+    {"persistent", VSH_OT_BOOL, 0, N_("persist interface attachment")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6669,16 +6669,16 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
  * "detach-interface" command
  */
 static const vshCmdInfo info_detach_interface[] = {
-    {"help", gettext_noop("detach network interface")},
-    {"desc", gettext_noop("Detach network interface.")},
+    {"help", N_("detach network interface")},
+    {"desc", N_("Detach network interface.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_detach_interface[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"type",   VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network interface type")},
-    {"mac",    VSH_OT_STRING, 0, gettext_noop("MAC address")},
-    {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist interface detachment")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"type",   VSH_OT_DATA, VSH_OFLAG_REQ, N_("network interface type")},
+    {"mac",    VSH_OT_STRING, 0, N_("MAC address")},
+    {"persistent", VSH_OT_BOOL, 0, N_("persist interface detachment")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6802,20 +6802,20 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd)
  * "attach-disk" command
  */
 static const vshCmdInfo info_attach_disk[] = {
-    {"help", gettext_noop("attach disk device")},
-    {"desc", gettext_noop("Attach new disk device.")},
+    {"help", N_("attach disk device")},
+    {"desc", N_("Attach new disk device.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_attach_disk[] = {
-    {"domain",  VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"source",  VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("source of disk device")},
-    {"target",  VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("target of disk device")},
-    {"driver",    VSH_OT_STRING, 0, gettext_noop("driver of disk device")},
-    {"subdriver", VSH_OT_STRING, 0, gettext_noop("subdriver of disk device")},
-    {"type",    VSH_OT_STRING, 0, gettext_noop("target device type")},
-    {"mode",    VSH_OT_STRING, 0, gettext_noop("mode of device reading and writing")},
-    {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist disk attachment")},
+    {"domain",  VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"source",  VSH_OT_DATA, VSH_OFLAG_REQ, N_("source of disk device")},
+    {"target",  VSH_OT_DATA, VSH_OFLAG_REQ, N_("target of disk device")},
+    {"driver",    VSH_OT_STRING, 0, N_("driver of disk device")},
+    {"subdriver", VSH_OT_STRING, 0, N_("subdriver of disk device")},
+    {"type",    VSH_OT_STRING, 0, N_("target device type")},
+    {"mode",    VSH_OT_STRING, 0, N_("mode of device reading and writing")},
+    {"persistent", VSH_OT_BOOL, 0, N_("persist disk attachment")},
     {NULL, 0, 0, NULL}
 };
 
@@ -6971,15 +6971,15 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
  * "detach-disk" command
  */
 static const vshCmdInfo info_detach_disk[] = {
-    {"help", gettext_noop("detach disk device")},
-    {"desc", gettext_noop("Detach disk device.")},
+    {"help", N_("detach disk device")},
+    {"desc", N_("Detach disk device.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_detach_disk[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
-    {"target", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("target of disk device")},
-    {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist disk detachment")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
+    {"target", VSH_OT_DATA, VSH_OFLAG_REQ, N_("target of disk device")},
+    {"persistent", VSH_OT_BOOL, 0, N_("persist disk detachment")},
     {NULL, 0, 0, NULL}
 };
 
@@ -7096,13 +7096,13 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd)
  * "cpu-compare" command
  */
 static const vshCmdInfo info_cpu_compare[] = {
-    {"help", gettext_noop("compare host CPU with a CPU described by an XML file")},
-    {"desc", gettext_noop("compare CPU with host CPU")},
+    {"help", N_("compare host CPU with a CPU described by an XML file")},
+    {"desc", N_("compare CPU with host CPU")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_cpu_compare[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML CPU description")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing an XML CPU description")},
     {NULL, 0, 0, NULL}
 };
 
@@ -7160,13 +7160,13 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd)
  * "cpu-baseline" command
  */
 static const vshCmdInfo info_cpu_baseline[] = {
-    {"help", gettext_noop("compute baseline CPU")},
-    {"desc", gettext_noop("Compute baseline CPU for a set of given CPUs.")},
+    {"help", N_("compute baseline CPU")},
+    {"desc", N_("Compute baseline CPU for a set of given CPUs.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_cpu_baseline[] = {
-    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing XML CPU descriptions")},
+    {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("file containing XML CPU descriptions")},
     {NULL, 0, 0, NULL}
 };
 
@@ -7396,13 +7396,13 @@ editReadBackFile (vshControl *ctl, const char *filename)
  * "cd" command
  */
 static const vshCmdInfo info_cd[] = {
-    {"help", gettext_noop("change the current directory")},
-    {"desc", gettext_noop("Change the current directory.")},
+    {"help", N_("change the current directory")},
+    {"desc", N_("Change the current directory.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_cd[] = {
-    {"dir", VSH_OT_DATA, 0, gettext_noop("directory to switch to (default: home or else root)")},
+    {"dir", VSH_OT_DATA, 0, N_("directory to switch to (default: home or else root)")},
     {NULL, 0, 0, NULL}
 };
 
@@ -7440,8 +7440,8 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "pwd" command
  */
 static const vshCmdInfo info_pwd[] = {
-    {"help", gettext_noop("print the current directory")},
-    {"desc", gettext_noop("Print the current directory.")},
+    {"help", N_("print the current directory")},
+    {"desc", N_("Print the current directory.")},
     {NULL, NULL}
 };
 
@@ -7478,13 +7478,13 @@ cmdPwd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
  * "edit" command
  */
 static const vshCmdInfo info_edit[] = {
-    {"help", gettext_noop("edit XML configuration for a domain")},
-    {"desc", gettext_noop("Edit the XML configuration for a domain.")},
+    {"help", N_("edit XML configuration for a domain")},
+    {"desc", N_("Edit the XML configuration for a domain.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_edit[] = {
-    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")},
+    {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -7581,13 +7581,13 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd)
  * "net-edit" command
  */
 static const vshCmdInfo info_network_edit[] = {
-    {"help", gettext_noop("edit XML configuration for a network")},
-    {"desc", gettext_noop("Edit the XML configuration for a network.")},
+    {"help", N_("edit XML configuration for a network")},
+    {"desc", N_("Edit the XML configuration for a network.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_network_edit[] = {
-    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name, id or uuid")},
+    {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name, id or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -7598,13 +7598,13 @@ static const vshCmdOptDef opts_network_edit[] = {
  * "pool-edit" command
  */
 static const vshCmdInfo info_pool_edit[] = {
-    {"help", gettext_noop("edit XML configuration for a storage pool")},
-    {"desc", gettext_noop("Edit the XML configuration for a storage pool.")},
+    {"help", N_("edit XML configuration for a storage pool")},
+    {"desc", N_("Edit the XML configuration for a storage pool.")},
     {NULL, NULL}
 };
 
 static const vshCmdOptDef opts_pool_edit[] = {
-    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name or uuid")},
+    {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")},
     {NULL, 0, 0, NULL}
 };
 
@@ -7615,7 +7615,7 @@ static const vshCmdOptDef opts_pool_edit[] = {
  * "quit" command
  */
 static const vshCmdInfo info_quit[] = {
-    {"help", gettext_noop("quit this interactive terminal")},
+    {"help", N_("quit this interactive terminal")},
     {"desc", ""},
     {NULL, NULL}
 };
@@ -8592,21 +8592,21 @@ vshDomainStateToString(int state)
 {
     switch (state) {
     case VIR_DOMAIN_RUNNING:
-        return gettext_noop("running");
+        return N_("running");
     case VIR_DOMAIN_BLOCKED:
-        return gettext_noop("idle");
+        return N_("idle");
     case VIR_DOMAIN_PAUSED:
-        return gettext_noop("paused");
+        return N_("paused");
     case VIR_DOMAIN_SHUTDOWN:
-        return gettext_noop("in shutdown");
+        return N_("in shutdown");
     case VIR_DOMAIN_SHUTOFF:
-        return gettext_noop("shut off");
+        return N_("shut off");
     case VIR_DOMAIN_CRASHED:
-        return gettext_noop("crashed");
+        return N_("crashed");
     default:
         ;/*FALLTHROUGH*/
     }
-    return gettext_noop("no state");  /* = dom0 state */
+    return N_("no state");  /* = dom0 state */
 }
 
 static const char *
@@ -8614,15 +8614,15 @@ vshDomainVcpuStateToString(int state)
 {
     switch (state) {
     case VIR_VCPU_OFFLINE:
-        return gettext_noop("offline");
+        return N_("offline");
     case VIR_VCPU_BLOCKED:
-        return gettext_noop("idle");
+        return N_("idle");
     case VIR_VCPU_RUNNING:
-        return gettext_noop("running");
+        return N_("running");
     default:
         ;/*FALLTHROUGH*/
     }
-    return gettext_noop("no state");
+    return N_("no state");
 }
 
 static int