From 3074e4cfad2286cf5c5e4aafa7fb6aecc576e6eb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 11 Jul 2005 21:58:02 +0000 Subject: [PATCH] * version-etc-fsf.c (version_etc_copyright): Parameterize the copyright symbol and the year. * version-etc.c (COPYRIGHT_YEAR): New constant. (version_etc_va): Use parameterized copyright notice. Reword to conform to the current GNU coding standards. --- lib/ChangeLog | 8 ++++++++ lib/version-etc-fsf.c | 6 ++++-- lib/version-etc.c | 25 ++++++++++++++++--------- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 57d736612..bf60743ce 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,11 @@ +2005-07-11 Paul Eggert + + * version-etc-fsf.c (version_etc_copyright): Parameterize the + copyright symbol and the year. + * version-etc.c (COPYRIGHT_YEAR): New constant. + (version_etc_va): Use parameterized copyright notice. + Reword to conform to the current GNU coding standards. + 2005-07-11 Simon Josefsson * size_max.h: New file. diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c index d5d6e2096..a91ab8687 100644 --- a/lib/version-etc-fsf.c +++ b/lib/version-etc-fsf.c @@ -27,5 +27,7 @@ /* Default copyright goes to the FSF. */ const char version_etc_copyright[] = - /* Do *not* mark this string for translation. */ - "Copyright (C) 2005 Free Software Foundation, Inc."; + /* Do *not* mark this string for translation. %s is a copyright + symbol suitable for this locale, and %d is the copyright + year. */ + "Copyright %s %d Free Software Foundation, Inc."; 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); } -- 2.11.0