Internationalization documentation changes.

diff --git a/ChangeLog b/ChangeLog
index 2623beabafa3fd73a76ce5408adf53e270f972b3..ae920796b582214a8390fd391502dc3e0ab27c20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-29  Bruno Haible  <bruno@clisp.org>
+
+       Internationalization documentation changes.
+       * doc/automake.texi (A POT file's _SOURCES): Don't mention wildcards.
+       (Message catalog translations): Suggest downloaded translations as a
+       complement, not as an alternative, to included translations.
+       Suggested by Ralf Wildenhues.
+
 2010-08-29  Bruno Haible  <bruno@clisp.org>
 
        Internationalization documentation fixes.

diff --git a/doc/automake.texi b/doc/automake.texi
index c9990d0342f339baa71c228340c0989020042774..aa4a4190ef97655ffe728c2b56d490b72dcbe76d 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7523,8 +7523,12 @@ program
 @code{xgettext} scans a set of source files.  The default set of sources
 is the union of all _SOURCES variables in the same @code{Makefile.am},
 except for @code{BUILT_SOURCES}.  You can also specify the set of sources
-explicitly, through a _SOURCES variable and optionally a
-_SOURCES_EXCLUDE variable.  Both variables may include wildcards.
+explicitly, through a _SOURCES
+variable.
+@c ----- Wildcards are not supported for now.
+@c variable and optionally a
+@c _SOURCES_EXCLUDE variable.  Both variables may include wildcards.
+@c ----- End of commented text
 
 This example lists the source files explicitly:
 
@@ -7533,16 +7537,18 @@ locale_POTS = po/maude.pot
 po_maude_pot_SOURCES = src/maude.c src/util.c
 @end smallexample
 
-This example uses wildcards.  @code{**} stands for recursion across all
-subdirectories.  But note that only files known to Automake will be
-selected.  If you have other, unrelated files in the file system, they
-will not be selected, even if they match the wildcard.
-
-@smallexample
-locale_POTS = po/maude.pot
-po_maude_pot_SOURCES = src/**/*.c
-po_maude_pot_SOURCES_EXCLUDE = src/version.c
-@end smallexample
+@c ----- Wildcards are not supported for now.
+@c This example uses wildcards.  @code{**} stands for recursion across all
+@c subdirectories.  But note that only files known to Automake will be
+@c selected.  If you have other, unrelated files in the file system, they
+@c will not be selected, even if they match the wildcard.
+@c
+@c @smallexample
+@c locale_POTS = po/maude.pot
+@c po_maude_pot_SOURCES = src/**/*.c
+@c po_maude_pot_SOURCES_EXCLUDE = src/version.c
+@c @end smallexample
+@c ----- End of commented text
 
 When a C file is automatically generated by a tool, like @code{flex} or
 @code{bison}, that doesn't introduce translatable strings by itself,
@@ -7701,19 +7707,12 @@ This variable should contain the list of languages for which a
 translation is present, using the notation @var{ll} or @var{ll}_@var{CC}.
 
 @cindex message catalogs, download
-Alternatively, you can also have the translation downloaded from a
-translation project when the package is built.  This has the advantage
-that translations that were complete after the package was released can
-be included.  It has two drawbacks, however:
-
-@itemize
-@item
-No translations can be installed if the build machine does not have a
-connection to the Internet.
-@item
-No translations can be installed if the GNU gettext tools are not
-installed on the build machine.
-@end itemize
+You can also have the translations downloaded from a translation project
+when the package is built.  This has the advantage that translations that
+were completed after the package was released can be included.  Note,
+however, that if the build machine does not have a connection to the
+Internet or does not have the GNU gettext tools installed, only the
+translations that are included in the tarball can be installed.
 
 @vindex TP_URL
 @vindex _TP_URL
@@ -7724,6 +7723,7 @@ variable, or both.  Example:
 
 @smallexample
 locale_POTS = po/maude.pot
+po_maude_pot_LINGUAS = de fr de_AT nl
 po_maude_pot_TP_URL = http://translationproject.org/latest/
 po_maude_pot_TP_RSYNC_URI = translationproject.org::tp/latest/
 @end smallexample