From 1f7daf0508d8c0a41989cf964d6335cb4e522ea0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 14 Apr 2011 00:15:29 +0200 Subject: [PATCH] Fix description of --use-first in msgcat documentation. --- gettext-tools/doc/ChangeLog | 6 ++++++ gettext-tools/doc/msgcat.texi | 6 +++--- gettext-tools/doc/msgcomm.texi | 2 +- gettext-tools/src/ChangeLog | 6 ++++++ gettext-tools/src/msgcat.c | 8 ++++---- gettext-tools/src/msgcomm.c | 4 ++-- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index 68d2312c2..ba2c3a0b7 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,9 @@ +2011-04-13 Bruno Haible + + * msgcat.texi: Fix description of --use-first. + * msgcomm.texi: Fix typo. + Reported by Matthijs Kooijman. + 2010-12-14 Bruno Haible * xgettext.texi: Mention that -L also supports Shell. diff --git a/gettext-tools/doc/msgcat.texi b/gettext-tools/doc/msgcat.texi index 07e07ad16..5b6b09587 100644 --- 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 72e0aad99..29ef820b6 100644 --- 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 3b3bb5d88..79da9f09d 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,9 @@ +2011-04-13 Bruno Haible + + * msgcat.c (usage): Fix description of --use-first. + * msgcomm.c (usage): Fix typo. + Reported by Matthijs Kooijman. + 2011-06-04 Bruno Haible Update after __attibute__ is no longer defined by gnulib. diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c index ad2f39c8f..948cbb01f 100644 --- 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 , 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 02c16560f..ac5e6f9ec 100644 --- 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 @@ -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\ ")); -- 2.47.2