Internationalization of author names.

5 files changed, 25 insertions, 13 deletions

diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 7a18f35..c9b182a 100644
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-02  Bruno Haible  <bruno@clisp.org>
+
+	* envsubst.c: Include propername.h.
+	(main): Call proper_name. Bump copyright year.
+	* gettext.c: Include propername.h.
+	(main): Call proper_name. Bump copyright year.
+	* ngettext.c: Include propername.h.
+	(main): Call proper_name. Bump copyright year.
+	* Makefile.am (LDADD): Add LTLIBICONV.
+
 2005-12-19  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.sh.in: Fix behaviour when the sourceing script has a name
diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am
index a506bc3..54a98c9 100644
--- a/gettext-runtime/src/Makefile.am
+++ b/gettext-runtime/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/src subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2006 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
@@ -41,7 +41,8 @@ ngettext_SOURCES = ngettext.c
 envsubst_SOURCES = envsubst.c
 
 # Link dependencies.
-LDADD = ../lib/libgrt.a @LTLIBINTL@
+# Need @LTLIBICONV@ because iconvstring.c uses iconv().
+LDADD = ../lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@
 
 # Specify installation directory, for --enable-relocatable.
 gettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c
index b655b04..c851267 100644
--- a/gettext-runtime/src/envsubst.c
+++ b/gettext-runtime/src/envsubst.c
@@ -1,5 +1,5 @@
 /* Substitution of environment variables in shell format strings.
-   Copyright (C) 2003-2005 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@
 #include "basename.h"
 #include "xalloc.h"
 #include "exit.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -114,8 +115,8 @@ main (int argc, char *argv[])
 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\
 "),
-	      "2003-2005");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+	      "2003-2006");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 
diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c
index 9747275..bea3f5a 100644
--- a/gettext-runtime/src/gettext.c
+++ b/gettext-runtime/src/gettext.c
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #include "basename.h"
 #include "xalloc.h"
 #include "exit.h"
-
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -136,8 +136,8 @@ main (int argc, char *argv[])
 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\
 "),
-	      "1995-1997, 2000-2005");
-      printf (_("Written by %s.\n"), "Ulrich Drepper");
+	      "1995-1997, 2000-2006");
+      printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }
 
diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c
index ee81ddb..be021c9 100644
--- a/gettext-runtime/src/ngettext.c
+++ b/gettext-runtime/src/ngettext.c
@@ -1,5 +1,5 @@
 /* ngettext - retrieve plural form string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2006 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
@@ -34,7 +34,7 @@
 #include "basename.h"
 #include "xalloc.h"
 #include "exit.h"
-
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -126,8 +126,8 @@ main (int argc, char *argv[])
 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\
 "),
-	      "1995-1997, 2000-2005");
-      printf (_("Written by %s.\n"), "Ulrich Drepper");
+	      "1995-1997, 2000-2006");
+      printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }