Fix description of --use-first in msgcat documentation.

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 68d2312c2377499336e996d2774e082fe6161516..ba2c3a0b7b484cc3e402232aae1dc052526884b4 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-13  Bruno Haible  <bruno@clisp.org>
+
+       * msgcat.texi: Fix description of --use-first.
+       * msgcomm.texi: Fix typo.
+       Reported by Matthijs Kooijman.
+
 2010-12-14  Bruno Haible  <bruno@clisp.org>
 
        * xgettext.texi: Mention that -L also supports Shell.

diff --git a/gettext-tools/doc/msgcat.texi b/gettext-tools/doc/msgcat.texi
index 07e07ad16ab63e12712d230c0e206d5ee6141434..5b6b0958761211d91094741a9b830d454190026e 100644 (file)
--- a/gettext-tools/doc/msgcat.texi
+++ b/gettext-tools/doc/msgcat.texi
@@ -12,9 +12,9 @@ By using the @code{--more-than} option, greater commonality may be requested
 before messages are printed.  Conversely, the @code{--less-than} option may be
 used to specify less commonality before messages are printed (i.e.@:
 @samp{--less-than=2} will only print the unique messages).  Translations,
-comments and extract comments will be cumulated, except that if
-@code{--use-first} is specified, they will be taken from the first PO file
-to define them.  File positions from all PO files will be cumulated.
+comments, extracted comments, and file positions will be cumulated, except that
+if @code{--use-first} is specified, they will be taken from the first PO file
+to define them.
 
 @subsection Input file location
 

diff --git a/gettext-tools/doc/msgcomm.texi b/gettext-tools/doc/msgcomm.texi
index 72e0aad990b0bbcef0523345ee1440c05bcdd1f4..29ef820b62d65549141c8d6d1b8caa967f432b01 100644 (file)
--- a/gettext-tools/doc/msgcomm.texi
+++ b/gettext-tools/doc/msgcomm.texi
@@ -11,7 +11,7 @@ By using the @code{--more-than} option, greater commonality may be requested
 before messages are printed.  Conversely, the @code{--less-than} option may be
 used to specify less commonality before messages are printed (i.e.@:
 @samp{--less-than=2} will only print the unique messages).  Translations,
-comments and extract comments will be preserved, but only from the first
+comments and extracted comments will be preserved, but only from the first
 PO file to define them.  File positions from all PO files will be
 cumulated.
 

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 3b3bb5d88ddb0ba2ff0ef95716c78ba3df4e4901..79da9f09db4f73594844987e5ed803bc8ff4101d 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-13  Bruno Haible  <bruno@clisp.org>
+
+       * msgcat.c (usage): Fix description of --use-first.
+       * msgcomm.c (usage): Fix typo.
+       Reported by Matthijs Kooijman.
+
 2011-06-04  Bruno Haible  <bruno@clisp.org>
 
        Update after __attibute__ is no longer defined by gnulib.

diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index ad2f39c8f1a80eea2c038e1dc0fcfeb536164efe..948cbb01f77d453ca46261d819ba48542a093b24 100644 (file)
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -1,5 +1,5 @@
 /* Concatenates several translation catalogs.
-   Copyright (C) 2001-2007, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -375,9 +375,9 @@ By using the --more-than option, greater commonality may be requested\n\
 before messages are printed.  Conversely, the --less-than option may be\n\
 used to specify less commonality before messages are printed (i.e.\n\
 --less-than=2 will only print the unique messages).  Translations,\n\
-comments and extract comments will be cumulated, except that if --use-first\n\
-is specified, they will be taken from the first PO file to define them.\n\
-File positions from all PO files will be cumulated.\n\
+comments, extracted comments, and file positions will be cumulated, except\n\
+that if --use-first is specified, they will be taken from the first PO file\n\
+to define them.\n\
 "));
       printf ("\n");
       printf (_("\

diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index 02c16560febc08ebd671965a9e0628fdca697f83..ac5e6f9ec6708679b6e0730cf24b64ee276ef38d 100644 (file)
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1997-1998, 2000-2007, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2000-2007, 2009-2011 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -366,7 +366,7 @@ By using the --more-than option, greater commonality may be requested\n\
 before messages are printed.  Conversely, the --less-than option may be\n\
 used to specify less commonality before messages are printed (i.e.\n\
 --less-than=2 will only print the unique messages).  Translations,\n\
-comments and extract comments will be preserved, but only from the first\n\
+comments and extracted comments will be preserved, but only from the first\n\
 PO file to define them.  File positions from all PO files will be\n\
 cumulated.\n\
 "));