Mark many more strings for translation.

* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.

ChangeLog

+Thu Mar 27 14:36:56 CET 2008 Jim Meyering <meyering@redhat.com>
+
+	Mark many more strings for translation.
+	* Makefile.maint (err_func_re): Add to the list and make it readable.
+	* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
+	* src/storage_backend.c: Fix comment.
+	* src/util.c (virFileLinkPointsTo): Mark a string.
+	* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
+	(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
+	(remoteDispatchDomainGetSchedulerType): Likewise.
+	(remoteDispatchDomainGetSchedulerParameters): Likewise.
+	(remoteDispatchDomainSetSchedulerParameters): Likewise.
+	(remoteDispatchDomainBlockStats): Likewise.
+	(remoteDispatchDomainInterfaceStats): Likewise.
+	(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
+	(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
+	(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
+	(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
+	(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
+	(remoteDispatchDomainGetVcpus): Likewise.
+	(remoteDispatchDomainMigratePerform): Likewise.
+	(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
+	(remoteDispatchDomainReboot, remoteDispatchDomainResume):
+	(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
+	(remoteDispatchDomainSetAutostart): Likewise.
+	(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
+	(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
+	(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
+	(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
+	(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
+	(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
+	(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
+	(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
+	(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
+	(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
+	(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
+	(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
+	(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
+	(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
+	(remoteDispatchStoragePoolGetAutostart): Likewise.
+	(remoteDispatchStoragePoolSetAutostart):
+	(remoteDispatchStoragePoolListVolumes):
+	(remoteDispatchStoragePoolNumOfVolumes):
+	(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
+	(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
+	(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
+	(remoteDispatchStorageVolLookupByName): Likewise.
+	* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
+	(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
+	(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
+	(qemudDomainGetOSType, qemudDomainSetMaxMemory):
+	(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
+	(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
+	(qemudDomainUndefine, qemudDomainChangeCDROM):
+	(qemudDomainAttachDevice, qemudDomainGetAutostart):
+	(qemudDomainSetAutostart, qemudDomainInterfaceStats):
+	(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
+	(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
+	(qemudNetworkDumpXML, qemudNetworkGetAutostart):
+	(qemudNetworkSetAutostart): Likewise.
+	* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
+	* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu):
+	Likewise.
+
 Thu Mar 27 10:30:12 CET 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/lxc_conf.c src/lxc_conf.h src/lxc_driver.c src/remote_internal.c:

Makefile.maint

@@ -298,8 +298,31 @@ sc_two_space_separator_in_usage:
 	    echo "$(ME): an option and its description"; \
 		1>&2; exit 1; } || :
 
-err_func_re = \
-(DISABLE_fprintf|qemudLog|(xmlRpc|vir(Xend|XML|Hash|Conf|Test|LibConn|StorageReport|lxc))Error)
+msg_gen_function =
+msg_gen_function += DISABLE_fprintf
+msg_gen_function += virXendError
+msg_gen_function += virXMLError
+msg_gen_function += virHashError
+msg_gen_function += virConfError
+msg_gen_function += virTestError
+msg_gen_function += virLibConnError
+msg_gen_function += virStorageReportError
+msg_gen_function += virxmlRpcError
+msg_gen_function += virLog
+msg_gen_function += qemudLog
+msg_gen_function += remoteDispatchError
+msg_gen_function += virStorageLog
+
+# msg_gen_function += xenXMError
+# msg_gen_function += virXenError
+# msg_gen_function += ReportError
+# msg_gen_function += testError
+# msg_gen_function += openvzLog
+# msg_gen_function += qemudReportError
+# msg_gen_function += error
+
+func_or := $(shell printf '$(msg_gen_function)'|tr -s '[[:space:]]' '|')
+func_re := ($(func_or))
 
 # Look for diagnostics that aren't marked for translation.
 # This won't find any for which error's format string is on a separate line.
@@ -308,12 +331,12 @@ err_func_re = \
 #    "%s", _("no storage vol w..."
 sc_unmarked_diagnostics:
 	@grep -nE							\
-	    '\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT)) \
+            '\<$(func_re) \([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT))	\
 	  | grep -v '_''(' &&						\
 	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
 	    exit 1; } || :
-	@{ grep     -nE '\<$(err_func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT));   \
-	   grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \
+	@{ grep     -nE '\<$(func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT));   \
+	   grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \
 	   | sed 's/_("[^"][^"]*"//;s/[	 ]"%s"//'			\
 	   | grep '[	 ]"' &&						\
 	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\

po/POTFILES.in

 gnulib/lib/gai_strerror.c
-qemud/remote.c
 qemud/qemud.c
+qemud/remote.c
 src/conf.c
 src/console.c
 src/hash.c
@@ -12,20 +12,22 @@ src/proxy_internal.c
 src/qemu_conf.c
 src/qemu_driver.c
 src/remote_internal.c
+src/sexpr.c
 src/storage_backend.c
+src/storage_backend_disk.c
 src/storage_backend_fs.c
-src/storage_backend_logical.c
 src/storage_backend_iscsi.c
-src/storage_backend_disk.c
+src/storage_backend_logical.c
 src/storage_conf.c
 src/storage_driver.c
-src/sexpr.c
 src/test.c
+src/util.c
 src/uuid.c
 src/virsh.c
 src/virterror.c
 src/xen_internal.c
 src/xend_internal.c
+src/xm_internal.c
 src/xml.c
 src/xmlrpc.c
 src/xs_internal.c

src/storage_backend.c

 /*
- * storage_backend.h: internal storage driver backend contract
+ * storage_backend.c: internal storage driver backend contract
  *
  * Copyright (C) 2007-2008 Red Hat, Inc.
  * Copyright (C) 2007-2008 Daniel P. Berrange

src/util.c

@@ -461,7 +461,7 @@ int
 virFileLinkPointsTo (const char *checkLink ATTRIBUTE_UNUSED,
                      const char *checkDest ATTRIBUTE_UNUSED)
 {
-    virLog ("%s: not implemented", __FUNCTION__);
+    virLog (_("%s: not implemented"), __FUNCTION__);
     return 0;
 }
 

src/virsh.c

@@ -1723,13 +1723,14 @@ cmdVcpupin(vshControl * ctl, vshCmd * cmd)
 
     vcpu = vshCommandOptInt(cmd, "vcpu", &vcpufound);
     if (!vcpufound) {
-        vshError(ctl, FALSE, _("vcpupin: Invalid or missing vCPU number."));
+        vshError(ctl, FALSE, "%s",
+                 _("vcpupin: Invalid or missing vCPU number."));
         virDomainFree(dom);
         return FALSE;
     }
 
     if (!(cpulist = vshCommandOptString(cmd, "cpulist", NULL))) {
-        vshError(ctl, FALSE, _("vcpupin: Missing cpulist"));
+        vshError(ctl, FALSE, "%s", _("vcpupin: Missing cpulist"));
         virDomainFree(dom);
         return FALSE;
     }
@@ -1740,7 +1741,7 @@ cmdVcpupin(vshControl * ctl, vshCmd * cmd)
     }
 
     if (virDomainGetInfo(dom, &info) != 0) {
-        vshError(ctl, FALSE, _("vcpupin: Invalid vCPU number."));
+        vshError(ctl, FALSE, "%s", _("vcpupin: Invalid vCPU number."));
         virDomainFree(dom);
         return FALSE;
     }
@@ -4475,7 +4476,7 @@ cmdAttachDevice(vshControl * ctl, vshCmd * cmd)
 
     from = vshCommandOptString(cmd, "file", &found);
     if (!found) {
-        vshError(ctl, FALSE, _("attach-device: Missing <file> option"));
+        vshError(ctl, FALSE, "%s", _("attach-device: Missing <file> option"));
         virDomainFree(dom);
         return FALSE;
     }
@@ -4532,7 +4533,7 @@ cmdDetachDevice(vshControl * ctl, vshCmd * cmd)
 
     from = vshCommandOptString(cmd, "file", &found);
     if (!found) {
-        vshError(ctl, FALSE, _("detach-device: Missing <file> option"));
+        vshError(ctl, FALSE, "%s", _("detach-device: Missing <file> option"));
         virDomainFree(dom);
         return FALSE;
     }

src/xm_internal.c

@@ -434,7 +434,8 @@ static int xenXMConfigCacheRefresh (virConnectPtr conn) {
                 virHashRemoveEntry(configCache, path, NULL);
             }
             free(entry);
-            xenXMError (conn, VIR_ERR_INTERNAL_ERROR, "xenXMConfigCacheRefresh: name");
+            xenXMError (conn, VIR_ERR_INTERNAL_ERROR,
+                        _("xenXMConfigCacheRefresh: name"));
             goto cleanup;
         }
 
@@ -444,7 +445,8 @@ static int xenXMConfigCacheRefresh (virConnectPtr conn) {
             if (virHashAddEntry(configCache, entry->filename, entry) < 0) {
                 virConfFree(entry->conf);
                 free(entry);
-                xenXMError (conn, VIR_ERR_INTERNAL_ERROR, "xenXMConfigCacheRefresh: virHashAddEntry");
+                xenXMError (conn, VIR_ERR_INTERNAL_ERROR,
+                            _("xenXMConfigCacheRefresh: virHashAddEntry"));
                 goto cleanup;
             }
         }
@@ -1254,21 +1256,23 @@ int xenXMDomainPinVcpu(virDomainPtr domain,
         return -1;
     }
     if (domain->conn->flags & VIR_CONNECT_RO) {
-        xenXMError (domain->conn, VIR_ERR_INVALID_ARG, "read only connection");
+        xenXMError (domain->conn, VIR_ERR_INVALID_ARG,
+                    _("read only connection"));
         return -1;
     }
     if (domain->id != -1) {
-        xenXMError (domain->conn, VIR_ERR_INVALID_ARG, "not inactive domain");
+        xenXMError (domain->conn, VIR_ERR_INVALID_ARG,
+                    _("not inactive domain"));
         return -1;
     }
 
     if (!(filename = virHashLookup(nameConfigMap, domain->name))) {
-        xenXMError (domain->conn, VIR_ERR_INTERNAL_ERROR, "virHashLookup");
+        xenXMError (domain->conn, VIR_ERR_INTERNAL_ERROR, _("virHashLookup"));
         return -1;
     }
     if (!(entry = virHashLookup(configCache, filename))) {
         xenXMError (domain->conn, VIR_ERR_INTERNAL_ERROR,
-                    "can't retrieve config file for domain");
+                    _("can't retrieve config file for domain"));
         return -1;
     }