From 8fb97bd54a94ca000895f40cdae2017993e6bcb9 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 11 Jul 2005 21:58:32 +0000 Subject: (COPYRIGHT_YEAR): New constant. (version_etc_va): Use parameterized copyright notice. Reword to conform to the current GNU coding standards. --- lib/version-etc.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/version-etc.c b/lib/version-etc.c index f7a68d4e3..f27f6a43a 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -35,6 +35,8 @@ #include "gettext.h" #define _(msgid) gettext (msgid) +enum { COPYRIGHT_YEAR = 2005 }; + /* Like version_etc, below, but with the NULL-terminated author list provided via a variable of type va_list. */ void @@ -64,6 +66,20 @@ version_etc_va (FILE *stream, else fprintf (stream, "%s %s\n", package, version); + /* TRANSLATORS: Translate "(C)" to the copyright symbol + (C-in-a-circle), if this symbol is available in the user's + locale. Otherwise, do not translate "(C)"; leave it as-is. */ + fprintf (stream, version_etc_copyright, _("(C)"), COPYRIGHT_YEAR); + + fputs (_("\ +\n\ +This is free software. You may redistribute copies of it under the terms of\n\ +the GNU General Public License .\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ +\n\ +"), + stream); + switch (n_authors) { case 0: @@ -135,15 +151,6 @@ Written by %s, %s, %s,\n%s, %s, %s, %s,\n%s, %s, and others.\n"), break; } va_end (authors); - putc ('\n', stream); - - fputs (version_etc_copyright, stream); - putc ('\n', stream); - - fputs (_("\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"), - stream); } -- cgit v1.2.3-54-g00ecf