Make sure that xgettext scans generated files for translatable strings, rather than just files stored in libvirt.git. * .gnulib: Update, for bootstrap and syntax-check fixes. * bootstrap: Resynchronize with gnulib. * cfg.mk (generated_files): Define. * po/POTFILES.in: Add more files with _(). --- As promised, here's the fix for the dropped translations in 3/3. * .gnulib 3864a29...a6676cc (53):
maintainer-makefile: make sc_po_check easier to tune fclose: guarantee behavior on seekable stdin fflush, fpurge: Relicense under LGPLv2+. rm exit module maint.mk: use info-gnu@ as the default only for a stable release assert-h: new module, which supports C1X-style static_assert fclose, fflush: Respect rules for use of AC_LIBOBJ. fflush, fseeko: Respect rules for use of AC_LIBOBJ. tzset: Relicense under LGPL. strtoimax, strtoumax: Relicense under LGPL. getgroups: Relicense under LGPL. nanosleep: Relicense under LGPL. futimens: Relicense under LGPL. fflush: Relicense under LGPL. tmpfile: Relicense under LGPL. isfinite: Relicense under LGPL. acosl..tanl: Relicense under LGPL. signal: Define sighandler_t. maint: remove useless REPLACE_*_H macros do-release-commit-and-tag: add option to specify branch Avoid unnecessary compilation units, through conditional dependencies. Support for conditional dependencies. test-getaddrinfo: report error information bootstrap: avoid build failure when $GZIP is set readme-release: new module with release instructions fflush: also replace fclose when fixing fflush fclose: add some tests fclose: reduce dependencies exit: drop remaining clients freading: relax license from LGPLv3+ to LGPLv2+ fchdir: Remove unused dependencies. gnulib-tool: Refactor. exit: Remove module. Update DEPENDENCIES. gnulib-tool: Reduce code duplication. Revert "netdb: Fix invalid C syntax." commit from 2011-04-30. fclose: don't fail on non-seekable input stream dup3: cleanup netdb: Make it work in C++ mode. New modules 'vfscanf', 'vscanf'. passfd: Add comments. sys_uio: Make <sys/uio.h> self-contained. sys_socket: Ensure 'struct iovec' definition. sys_uio: Protect definition of 'struct iovec'. manywarnings: fix indentation netdb: Fix invalid C syntax. manywarnings: add -Wno-missing-field-initializers if needed maint: indent ChangeLog with TAB consistently announce-gen: cosmetic improvement vc-list-files: indent with spaces, not TABs announce-gen: indent with spaces, not TABs quotearg: avoid uninitialized variable use maint.mk: remove unused VC-tag variable
.gnulib | 2 +- bootstrap | 7 +++++-- cfg.mk | 8 ++++++++ po/POTFILES.in | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index 3864a29..a6676cc 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 3864a29763baff1d01895a57f73729fd53cc5fbf +Subproject commit a6676cca6498ce67c5a3c8d7221b8d6c30b61dc4 diff --git a/bootstrap b/bootstrap index 7cbb5dc..d91611b 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2011-04-05.18; # UTC +scriptversion=2011-05-03.08; # UTC # Bootstrap this package from checked-out sources. @@ -421,7 +421,10 @@ check_versions() { # Honor $APP variables ($TAR, $AUTOCONF, etc.) appvar=`echo $app | tr '[a-z]-' '[A-Z]_'` test "$appvar" = TAR && appvar=AMTAR - eval "app=\${$appvar-$app}" + case $appvar in + GZIP) ;; # Do not use $GZIP: it contains gzip options. + *) eval "app=\${$appvar-$app}" ;; + esac inst_ver=$(get_version $app) if [ ! "$inst_ver" ]; then echo "$me: Error: '$app' not found" >&2 diff --git a/cfg.mk b/cfg.mk index 1deb6ba..9ae3f42 100644 --- a/cfg.mk +++ b/cfg.mk @@ -28,6 +28,14 @@ url_dir_list = \ # We use .gnulib, not gnulib. gnulib_dir = $(srcdir)/.gnulib +# List of additional files that we want to pick up in our POTFILES.in +# This is all gnulib files, as well as generated files for RPC code. +generated_files = \ + $(srcdir)/daemon/*_dispatch_*.h \ + $(srcdir)/src/remote/*_client_bodies.h \ + $(srcdir)/src/remote/*_protocol.[ch] \ + $(srcdir)/gnulib/lib/*.[ch] + # Tests not to run as part of "make distcheck". local-checks-to-skip = \ changelog-check \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 766f8f6..96180d5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,9 @@ daemon/dispatch.c daemon/libvirtd.c daemon/remote.c +daemon/remote_dispatch_bodies.h daemon/stream.c +gnulib/lib/gai_strerror.c src/conf/cpu_conf.c src/conf/domain_conf.c src/conf/domain_event.c @@ -63,6 +65,7 @@ src/qemu/qemu_monitor.c src/qemu/qemu_monitor_json.c src/qemu/qemu_monitor_text.c src/qemu/qemu_process.c +src/remote/remote_client_bodies.h src/remote/remote_driver.c src/secret/secret_driver.c src/security/security_apparmor.c -- 1.7.4.4