From 0e7a56522983341d701f049b74e0a3b2f77497ac Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 7 Nov 2008 16:43:58 +0000 Subject: [PATCH] mark a few diagnostics for translation * src/lxc_conf.c (lxcLoadDriverConfig): Mark a diagnostic. * src/lxc_driver.c (lxcDomainStart): Likewise. * po/POTFILES.in: Add src/lxc_conf.c. * Makefile.maint (msg_gen_function): Add virReportErrorHelper and lxcError. --- ChangeLog | 7 +++++++ Makefile.maint | 3 ++- po/POTFILES.in | 1 + src/lxc_conf.c | 5 ++--- src/lxc_driver.c | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59a4fbb441..7bbee851e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ Thu Nov 6 20:45:42 CET 2008 Jim Meyering + mark a few diagnostics for translation + * src/lxc_conf.c (lxcLoadDriverConfig): Mark a diagnostic. + * src/lxc_driver.c (lxcDomainStart): Likewise. + * po/POTFILES.in: Add src/lxc_conf.c. + * Makefile.maint (msg_gen_function): Add virReportErrorHelper + and lxcError. + always compile iptables.c Avoid a build error when configuring --without-xen --without-qemu. * src/iptables.c [WITH_QEMU]: Don't #ifdef-out. diff --git a/Makefile.maint b/Makefile.maint index d85646928f..28b1c3f488 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -353,6 +353,8 @@ msg_gen_function += qemudReportError msg_gen_function += openvzLog msg_gen_function += openvzError msg_gen_function += virDomainReportError +msg_gen_function += virReportErrorHelper +msg_gen_function += lxcError # Uncomment the following and run "make syntax-check" to see diagnostics # that are not yet marked for translation, but that need to be rewritten @@ -360,7 +362,6 @@ msg_gen_function += virDomainReportError # msg_gen_function += error # msg_gen_function += virXenError # msg_gen_function += testError -# msg_gen_function += lxcError func_or := $(shell printf '$(msg_gen_function)'|tr -s '[[:space:]]' '|') func_re := ($(func_or)) diff --git a/po/POTFILES.in b/po/POTFILES.in index fdb34b5f45..3f8fdd2df0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,6 +7,7 @@ src/datatypes.c src/domain_conf.c src/iptables.c src/libvirt.c +src/lxc_conf.c src/lxc_container.c src/lxc_controller.c src/lxc_driver.c diff --git a/src/lxc_conf.c b/src/lxc_conf.c index 76f4e9dfba..0db9bb59b3 100644 --- a/src/lxc_conf.c +++ b/src/lxc_conf.c @@ -83,8 +83,7 @@ int lxcLoadDriverConfig(lxc_driver_t *driver) return 0; no_memory: - lxcError(NULL, NULL, VIR_ERR_NO_MEMORY, "configDir"); + lxcError(NULL, NULL, VIR_ERR_NO_MEMORY, + "%s", _("while loading LXC driver config")); return -1; } - - diff --git a/src/lxc_driver.c b/src/lxc_driver.c index 8bfd27d052..583c4ff8b1 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -857,7 +857,7 @@ static int lxcDomainStart(virDomainPtr dom) if (!vm) { lxcError(conn, dom, VIR_ERR_INVALID_DOMAIN, - "no domain with uuid"); + _("no domain named %s"), dom->name); goto cleanup; }