X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fversion-etc.c;h=663aa8dcf003fe60c7b780db592fb8b3388317d3;hb=a76a349e949dfad5716eb3893052070b770e949f;hp=ba04db4821013fb790e6af997b9c0bbb8b0232b2;hpb=20c8c9cfb54174dc3246b57285ef8e0b8da7db48;p=gnulib.git

diff --git a/lib/version-etc.c b/lib/version-etc.c
index ba04db482..663aa8dcf 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -1,5 +1,5 @@
 /* Utility to help print --version output in a consistent format.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,22 +22,18 @@
 #endif
 
 #include <stdio.h>
+#include "unlocked-io.h"
 #include "version-etc.h"
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
 
 /* Default copyright goes to the FSF. */
 
-char* version_etc_copyright_fmt =
-  N_("Copyright (C) %s Free Software Foundation, Inc.");
+char* version_etc_copyright =
+  /* Do *not* mark this string for translation.  */
+  "Copyright (C) 2003 Free Software Foundation, Inc.";
 
-#define COPYRIGHT_YEAR "2001"
 
 /* Display the --version information the standard way.
 
@@ -61,7 +57,7 @@ version_etc (FILE *stream,
   fprintf (stream, _("Written by %s.\n"), authors);
   putc ('\n', stream);
 
-  fprintf (stream, _(version_etc_copyright_fmt), COPYRIGHT_YEAR);
+  fputs (version_etc_copyright, stream);
   putc ('\n', stream);
 
   fputs (_("\