Internationalization of author names.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 7ca1fe4d18f5479f6cdf0476af98164e416c055f..2d686dfe1c182e1a664674764ae30e3ad6121206 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-02  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Test for strstr().
+       * Makefile.am (config.h_vms, config.h.msvc): Also define HAVE_STRSTR.
+
 2005-11-23  Bruno Haible  <bruno@clisp.org>
 
        Cygwin portability.

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 32516ae06cdaf96234b11ce5b53b7d2d176a5b26..e0917dcf65b175e41ecf7f6883d5c6da221d578c 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime directory of GNU gettext
-## Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
+## Copyright (C) 1995-1999, 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
@@ -89,6 +89,7 @@ config.h_vms: config.h.in ../version.sh
             -e 's/#undef HAVE_STRERROR$$/#define HAVE_STRERROR 1/' \
             -e 's/#undef HAVE_STRINGS_H$$/#define HAVE_STRINGS_H 1/' \
             -e 's/#undef HAVE_STRING_H$$/#define HAVE_STRING_H 1/' \
+            -e 's/#undef HAVE_STRSTR$$/#define HAVE_STRSTR 1/' \
             -e 's/#undef HAVE_STRTOUL$$/#define HAVE_STRTOUL 1/' \
             -e 's/#undef HAVE_SYS_PARAM_H$$/#define HAVE_SYS_PARAM_H 1/' \
             -e 's/#undef HAVE_SYS_STAT_H$$/#define HAVE_SYS_STAT_H 1/' \
@@ -154,6 +155,7 @@ config.h.msvc: config.h.in ../version.sh
            -e 's/#undef HAVE_STRDUP$$/#define HAVE_STRDUP 1/' \
            -e 's/#undef HAVE_STRERROR$$/#define HAVE_STRERROR 1/' \
            -e 's/#undef HAVE_STRING_H$$/#define HAVE_STRING_H 1/' \
+           -e 's/#undef HAVE_STRSTR$$/#define HAVE_STRSTR 1/' \
            -e 's/#undef HAVE_STRTOUL$$/#define HAVE_STRTOUL 1/' \
            -e 's/#undef HAVE_SYS_STAT_H$$/#define HAVE_SYS_STAT_H 1/' \
            -e 's/#undef HAVE_SYS_TYPES_H$$/#define HAVE_SYS_TYPES_H 1/' \

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 1e957ac554e62af4caf6ddf18e63d7e5f9877901..fbed7eb3c31ec102b8ec9b8529262aec065bb413 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -91,7 +91,7 @@ AC_TYPE_SIZE_T
 dnl Checks for library functions.
 gl_ALLOCSA
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([setlocale strerror])
+AC_CHECK_FUNCS([setlocale strerror strstr])
 AC_REPLACE_FUNCS([atexit memmove])
 gl_GETOPT
 gt_FUNC_SETENV

diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog
index 582c71124ada13fa76c39c25714d6431d17e0401..cb90a12e188992649fa056d2ebd568945a1d6207 100644 (file)
--- a/gettext-runtime/lib/ChangeLog
+++ b/gettext-runtime/lib/ChangeLog
@@ -1,3 +1,20 @@
+2006-04-02  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (libgrt_a_SOURCES): Add c-strcase*, gettext.h,
+       iconvstring.*, localcharset.*, propername.*, strstr.h.
+       (DEFS): Also define LIBDIR.
+       * Makefile.msvc (libdir): New variable.
+       (OBJECTS): Add c-strcasecmp.obj, iconvstring.obj, localcharset.obj,
+       propername.obj.
+       (c-strcasecmp.obj, iconvstring.obj, localcharset.obj, propername.obj):
+       New rules.
+       * Makefile.vms (prefix, exec_prefix, libdir): New variables.
+       (DEFS): Also define LIBDIR.
+       (OBJECTS): Add c-strcasecmp.obj, iconvstring.obj, localcharset.obj,
+       propername.obj.
+       (c-strcasecmp.obj, iconvstring.obj, localcharset.obj, propername.obj):
+       New rules.
+
 2005-07-25  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am: Remove rules depending on @STDBOOL_H@, @ALLOCA_H@,

diff --git a/gettext-runtime/lib/Makefile.am b/gettext-runtime/lib/Makefile.am
index 1262f538348c2feffa9260e67f7afff195fe496d..99eb137350247bae4f93be846e48922923086daf 100644 (file)
--- a/gettext-runtime/lib/Makefile.am
+++ b/gettext-runtime/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/lib 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
@@ -29,11 +29,17 @@ noinst_LIBRARIES = libgrt.a
 libgrt_a_SOURCES = \
   ../../gettext-tools/lib/allocsa.h ../../gettext-tools/lib/allocsa.c \
   ../../gettext-tools/lib/basename.h ../../gettext-tools/lib/basename.c \
+  ../../gettext-tools/lib/c-strcase.h ../../gettext-tools/lib/c-strcasecmp.c \
   ../../gettext-tools/lib/closeout.h ../../gettext-tools/lib/closeout.c \
   ../../gettext-tools/lib/exit.h \
   ../../gettext-tools/lib/fwriteerror.h ../../gettext-tools/lib/fwriteerror.c \
+  ../../gettext-tools/lib/gettext.h \
+  ../../gettext-tools/lib/iconvstring.h ../../gettext-tools/lib/iconvstring.c \
+  ../../gettext-tools/lib/localcharset.h ../../gettext-tools/lib/localcharset.c \
   ../../gettext-tools/lib/pathmax.h \
   ../../gettext-tools/lib/progname.h ../../gettext-tools/lib/progname.c ../../gettext-tools/lib/progreloc.c \
+  ../../gettext-tools/lib/propername.h ../../gettext-tools/lib/propername.c \
+  ../../gettext-tools/lib/strstr.h \
   ../../gettext-tools/lib/unlocked-io.h \
   ../../gettext-tools/lib/xalloc.h ../../gettext-tools/lib/xmalloc.c ../../gettext-tools/lib/xstrdup.c \
   ../../gettext-tools/lib/xreadlink.h ../../gettext-tools/lib/xreadlink.c
@@ -105,6 +111,11 @@ MOSTLYCLEANFILES += getopt.h
 # <<< gnulib module getopt.
 
 
+# >>> gnulib module localcharset.
+DEFS += -DLIBDIR=\"$(libdir)\"
+# <<< gnulib module localcharset.
+
+
 # VMS support.
 
 EXTRA_DIST += Makefile.vms

diff --git a/gettext-runtime/lib/Makefile.msvc b/gettext-runtime/lib/Makefile.msvc
index 930b22eada6fb6d66b16d286d69406edf89d9006..9f9c333ed1086b656a6069844bf0bd34c042551d 100644 (file)
--- a/gettext-runtime/lib/Makefile.msvc
+++ b/gettext-runtime/lib/Makefile.msvc
@@ -21,6 +21,8 @@ PREFIX = c:\usr
 
 # Directories used by "make install":
 prefix = $(PREFIX)
+exec_prefix = $(prefix)
+libdir = $(exec_prefix)\lib
 includedir = $(prefix)\include
 
 # Programs used by "make":
@@ -52,13 +54,16 @@ RM = -del
 
 SHELL = /bin/sh
 
-OBJECTS = basename.obj closeout.obj error.obj fwriteerror.obj getopt.obj getopt1.obj progname.obj progreloc.obj relocatable.obj xmalloc.obj xstrdup.obj
+OBJECTS = basename.obj c-strcasecmp.obj closeout.obj error.obj fwriteerror.obj getopt.obj getopt1.obj iconvstring.obj localcharset.obj progname.obj progreloc.obj propername.obj relocatable.obj xmalloc.obj xstrdup.obj
 
 all : grt.lib
 
 basename.obj : ..\..\gettext-tools\lib\basename.c
        $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\basename.c
 
+c-strcasecmp.obj : ..\..\gettext-tools\lib\c-strcasecmp.c
+       $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\c-strcasecmp.c
+
 closeout.obj : ..\..\gettext-tools\lib\closeout.c
        $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\closeout.c
 
@@ -74,12 +79,21 @@ getopt.obj : ..\..\gettext-tools\lib\getopt.c
 getopt1.obj : ..\..\gettext-tools\lib\getopt1.c
        $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\getopt1.c
 
+iconvstring.obj : ..\..\gettext-tools\lib\iconvstring.c
+       $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\iconvstring.c
+
+localcharset.obj : ..\..\gettext-tools\lib\localcharset.c
+       $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\localcharset.c
+
 progname.obj : ..\..\gettext-tools\lib\progname.c
        $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\progname.c
 
 progreloc.obj : ..\..\gettext-tools\lib\progreloc.c
        $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\progreloc.c
 
+propername.obj : ..\..\gettext-tools\lib\propername.c
+       $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\propername.c
+
 relocatable.obj : ..\..\gettext-tools\lib\relocatable.c
        $(CC) $(INCLUDES) $(CFLAGS) -c ..\..\gettext-tools\lib\relocatable.c
 

diff --git a/gettext-runtime/lib/Makefile.vms b/gettext-runtime/lib/Makefile.vms
index 06d450a494692f6c345ad4480389088c74b1093a..676ac5470be1e7e62a34c66ef982236723de5214 100644 (file)
--- a/gettext-runtime/lib/Makefile.vms
+++ b/gettext-runtime/lib/Makefile.vms
@@ -2,6 +2,11 @@
 
 #### Start of system configuration section. ####
 
+# Directories used by "make install":
+prefix = SYS$DATA:[
+exec_prefix = $(prefix)
+libdir = $(exec_prefix).lib
+
 # Programs used by "make":
 
 CC = cc
@@ -15,7 +20,7 @@ WARN_CFLAGS = /warning
 OPTIMFLAGS = /optimize
 
 CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS)
-DEFS = "VMS=1","HAVE_CONFIG_H=1"
+DEFS = "VMS=1","HAVE_CONFIG_H=1","LIBDIR=""$(libdir)]"""
 
 INCLUDES = /include=([],[-],[-.intl],[-.-.gettext-tools.lib])
 
@@ -27,7 +32,7 @@ RM = delete
 
 #### End of system configuration section. ####
 
-OBJECTS = basename.obj,closeout.obj,error.obj,fwriteerror.obj,getopt.obj,getopt1.obj,progname.obj,progreloc.obj,relocatable.obj,xmalloc.obj,xstrdup.obj
+OBJECTS = basename.obj,c-strcasecmp.obj,closeout.obj,error.obj,fwriteerror.obj,getopt.obj,getopt1.obj,iconvstring.obj,localcharset.obj,progname.obj,progreloc.obj,propername.obj,relocatable.obj,xmalloc.obj,xstrdup.obj
 
 all : grt.olb
        write sys$output "Nothing else to be done for 'all'."
@@ -35,6 +40,9 @@ all : grt.olb
 basename.obj : [-.-.gettext-tools.lib]basename.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]basename.c
 
+c-strcasecmp.obj : [-.-.gettext-tools.lib]c-strcasecmp.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]c-strcasecmp.c
+
 closeout.obj : [-.-.gettext-tools.lib]closeout.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]closeout.c
 
@@ -50,12 +58,21 @@ getopt.obj : [-.-.gettext-tools.lib]getopt.c
 getopt1.obj : [-.-.gettext-tools.lib]getopt1.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]getopt1.c
 
+iconvstring.obj : [-.-.gettext-tools.lib]iconvstring.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]iconvstring.c
+
+localcharset.obj : [-.-.gettext-tools.lib]localcharset.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]localcharset.c
+
 progname.obj : [-.-.gettext-tools.lib]progname.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]progname.c
 
 progreloc.obj : [-.-.gettext-tools.lib]progreloc.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]progreloc.c
 
+propername.obj : [-.-.gettext-tools.lib]propername.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]propername.c
+
 relocatable.obj : [-.-.gettext-tools.lib]relocatable.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]relocatable.c
 

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 5366bba8942c44ecdd59695dbce75c824cd8b5aa..2a651c67bba17158a5674a429862b91da0d01ff3 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-02  Bruno Haible  <bruno@clisp.org>
+
+       * Makevars (XGETTEXT_OPTIONS): Add keywords 'proper_name' and
+       'proper_name_utf8'.
+
 2005-10-18  Bruno Haible  <bruno@clisp.org>
 
        * Makevars (USE_MSGCTXT): New macro.

diff --git a/gettext-runtime/po/Makevars b/gettext-runtime/po/Makevars
index 6fa6b94f26c8d7aebc35b29995f34f5c5685359c..d29c4a9698135d897ebc09794ec03d91ba595904 100644 (file)
--- a/gettext-runtime/po/Makevars
+++ b/gettext-runtime/po/Makevars
@@ -11,6 +11,8 @@ top_builddir = ..
 XGETTEXT_OPTIONS = \
   --keyword=_ --flag=_:1:pass-c-format \
   --keyword=N_ --flag=N_:1:pass-c-format \
+  --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \
+  --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \
   --flag=error:3:c-format --flag=error_at_line:5:c-format
 
 # This is the copyright holder that gets inserted into the header of the

diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 7a18f35a105589bdad1a358fbce520b77b87adee..c9b182a50b75467704d62e15bad5d8764b889885 100644 (file)
--- 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 a506bc3eaa0fb97774c883cb1cc769f546919d63..54a98c9b2dafa3d303b5a40cfb450d6d0075f6c3 100644 (file)
--- 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 b655b041fa7ac5fd16903827fd74e344b95d7ade..c851267578754d763b0df686b06a9532bc8e4d86 100644 (file)
--- 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 9747275b744f29562c56e8d653ae1519a9502c68..bea3f5aececd8e4b92e27c860a9b5179bebdee79 100644 (file)
--- 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 ee81ddb1e37d02ee1f541697861e618ffed4311d..be021c920460d6599317eadf1497c5c0a0ef7000 100644 (file)
--- 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);
     }
 

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 740a1b94803cb316f8558b8cfac517b17b4ae85d..4b85c79c7a3dbecedfc5e6d34f1868f702f32785 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,15 @@
+2006-04-02  Bruno Haible  <bruno@clisp.org>
+
+       Support for non-ASCII author names.
+       * propername.h: New file.
+       * propername.c: New file.
+       * Makefile.am (libgettextlib_la_SOURCES): Add propername.h,
+       propername.c.
+       * Makefile.msvc (OBJECTS): Add propername.obj.
+       (propername.obj): New rule.
+       * Makefile.vms (OBJECTS): Add propername.obj.
+       (propername.obj): New rule.
+
 2006-03-28  Bruno Haible  <bruno@clisp.org>
 
        * iconvstring.h: New file.

diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index 8fa7373567babd6b08d53b2f899af0be2558106b..47d3a5277228d6488bb60228a4ff3c9e81e6381f 100644 (file)
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -67,6 +67,7 @@ libgettextlib_la_SOURCES = \
   pathname.h concatpath.c \
   pipe.h pipe.c w32spawn.h \
   progname.h progname.c progreloc.c \
+  propername.h propername.c \
   quote.h quote.c \
   quotearg.h quotearg.c \
   safe-read.h safe-read.c \
@@ -119,7 +120,7 @@ UNUSED_SOURCE = \
 libgettextlib_la_LIBADD = @LTLIBOBJS@
 
 # Need @LTLIBINTL@ because many source files use gettext().
-# Need @LTLIBICONV@ because linebreak.c uses iconv().
+# Need @LTLIBICONV@ because linebreak.c and iconvstring.c use iconv().
 libgettextlib_la_LDFLAGS = \
   -release @VERSION@ \
   @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@

diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc
index a4525ed54f5bf2009a9fdecf4a46ad07ae4fe079..cb6aa7c7affa05a18dbfb55e33bb1b65d310ce85 100644 (file)
--- a/gettext-tools/lib/Makefile.msvc
+++ b/gettext-tools/lib/Makefile.msvc
@@ -111,6 +111,7 @@ OBJECTS = \
   concatpath.obj \
   pipe.obj \
   progname.obj progreloc.obj \
+  propername.obj \
   quote.obj \
   quotearg.obj \
   safe-read.obj \
@@ -238,6 +239,9 @@ progname.obj : progname.c
 progreloc.obj : progreloc.c
        $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c progreloc.c
 
+propername.obj : propername.c
+       $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c propername.c
+
 quote.obj : quote.c
        $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c quote.c
 

diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms
index 41d6a2562d8ff4efb5b4c5d97cc45e9daf4564ce..6ec3730872ba2b7d098623187e947ecd16c827dd 100644 (file)
--- a/gettext-tools/lib/Makefile.vms
+++ b/gettext-tools/lib/Makefile.vms
@@ -69,6 +69,7 @@ OBJECTS = \
   concatpath.obj, \
   pipe.obj, \
   progname.obj, progreloc.obj, \
+  propername.obj, \
   quote.obj, \
   quotearg.obj, \
   safe-read.obj, \
@@ -200,6 +201,9 @@ progname.obj : progname.c
 progreloc.obj : progreloc.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) progreloc.c
 
+propername.obj : propername.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) propername.c
+
 quote.obj : quote.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) quote.c
 

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 9e77d56ba778125a347e0acf45ac16eaa5182623..6c0f967e02f68ed667f06927059030f269e28abe 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-02  Bruno Haible  <bruno@clisp.org>
+
+       * Makevars (XGETTEXT_OPTIONS): Add keywords 'proper_name' and
+       'proper_name_utf8'.
+
 2005-10-18  Bruno Haible  <bruno@clisp.org>
 
        * Makevars (USE_MSGCTXT): New macro.

diff --git a/gettext-tools/po/Makevars b/gettext-tools/po/Makevars
index 71d710115eeedd66ca5b75c342a69ec6ceb09b35..0c69cd8b3ae6fd88a46ac78aa218bae902116170 100644 (file)
--- a/gettext-tools/po/Makevars
+++ b/gettext-tools/po/Makevars
@@ -11,6 +11,8 @@ top_builddir = ..
 XGETTEXT_OPTIONS = \
   --keyword=_ --flag=_:1:pass-c-format \
   --keyword=N_ --flag=N_:1:pass-c-format \
+  --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \
+  --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \
   --flag=error:3:c-format --flag=error_at_line:5:c-format \
   --flag=asprintf:2:c-format --flag=vasprintf:2:c-format \
   --flag=xasprintf:1:c-format --flag=error_logger:1:c-format \

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 3567cd3804efcc3f1066719a35f32dca5cde6289..d91157a5b4f25befd1f5268041961f862b44937b 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,42 @@
+2006-04-02  Bruno Haible  <bruno@clisp.org>
+
+       * hostname.c: Include propername.h.
+       (main): Call proper_name.
+       * msgattrib.c: Include propername.h.
+       (main): Call proper_name.
+       * msgcat.c: Include propername.h.
+       (main): Call proper_name.
+       * msgcmp.c: Include propername.h.
+       (main): Call proper_name.
+       * msgcomm.c: Include propername.h.
+       (main): Call proper_name.
+       * msgconv.c: Include propername.h.
+       (main): Call proper_name.
+       * msgen.c: Include propername.h.
+       (main): Call proper_name.
+       * msgexec.c: Include propername.h.
+       (main): Call proper_name.
+       * msgfilter.c: Include propername.h.
+       (main): Call proper_name.
+       * msgfmt.c: Include propername.h.
+       (main): Call proper_name.
+       * msggrep.c: Include propername.h.
+       (main): Call proper_name.
+       * msginit.c: Include propername.h.
+       (main): Call proper_name.
+       * msgmerge.c: Include propername.h.
+       (main): Call proper_name.
+       * msgunfmt.c: Include propername.h.
+       (main): Call proper_name.
+       * msguniq.c: Include propername.h.
+       (main): Call proper_name.
+       * recode-sr-latin.c: Include propername.h.
+       (main): Call proper_name and proper_name_utf8.
+       * urlget.c: Include propername.h.
+       (main): Call proper_name.
+       * xgettext.c: Include propername.h.
+       (main): Call proper_name.
+
 2006-04-01  Bruno Haible  <bruno@clisp.org>
 
        * xgettext.c (main): Treat --keyword= like --keyword.

diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
index d27ed4849d84437767446095390f79806ec09d11..d6d497952fea49ea087fad9a32f34996c9167f7f 100644 (file)
--- a/gettext-tools/src/hostname.c
+++ b/gettext-tools/src/hostname.c
@@ -1,5 +1,5 @@
 /* Display hostname in various forms.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -90,6 +90,7 @@
 #include "basename.h"
 #include "xalloc.h"
 #include "exit.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -184,7 +185,7 @@ 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\
 "),
              "2001-2003");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index 1d38111a093b5db400d887b119a08956706b9602..ad22c1b19fc015deea7408aecf9162676f959dd1 100644 (file)
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -38,6 +38,7 @@
 #include "read-po.h"
 #include "write-po.h"
 #include "exit.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -314,7 +315,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index ba89bb0963db859e54f5eeace3c411dad075e2df..26b9f69fa3158b4a2d131c249029c8bbdaeaeb0e 100644 (file)
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -41,6 +41,7 @@
 #include "write-po.h"
 #include "msgl-cat.h"
 #include "exit.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -266,7 +267,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index 168ad97dbfa0ddfe0e582e9dded88225838a0b61..73c17fe202628cc8bc72458363161214be878bb9 100644 (file)
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -40,6 +40,7 @@
 #include "msgl-iconv.h"
 #include "strstr.h"
 #include "c-strcase.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -143,7 +144,7 @@ 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-1998, 2000-2006");
-      printf (_("Written by %s.\n"), "Peter Miller");
+      printf (_("Written by %s.\n"), proper_name ("Peter Miller"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index ed50ee486f9f79ceb76f0fbd5de289c8e0d88f14..933abb95d5e897dc0207e13d892d90df2348743d 100644 (file)
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -41,6 +41,7 @@
 #include "write-po.h"
 #include "msgl-cat.h"
 #include "exit.h"
+#include "propername.h"
 #include "gettext.h"
 
 
@@ -263,7 +264,7 @@ 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-1998, 2000-2006");
-      printf (_("Written by %s.\n"), "Peter Miller");
+      printf (_("Written by %s.\n"), proper_name ("Peter Miller"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index baa5845a2404ef9b08ac9027ef711803741ab5f7..89767a0ac390ff32322f2a5ce98111456863868f 100644 (file)
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -40,6 +40,7 @@
 #include "msgl-iconv.h"
 #include "localcharset.h"
 #include "exit.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -220,7 +221,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index be3c42761db4f4a85c8defbb3db6fb802882c155..9280e590f714723811bf9914afa36499a49b0003 100644 (file)
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -39,6 +39,7 @@
 #include "msgl-english.h"
 #include "write-po.h"
 #include "exit.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -206,7 +207,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index 051650a88cba507d92ada211dd3f2eee3081c8bd..7f095069f043aa928909bb7739d2f0c2dc7af175 100644 (file)
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -51,6 +51,7 @@
 #include "pipe.h"
 #include "wait-process.h"
 #include "xsetenv.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -180,7 +181,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index cb9fe9b7a0c12e85d2130c92758c9e6d6adcab9d..a5531d1a7c22ab9a47478a8cd12a14e20e06bcdb 100644 (file)
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -65,6 +65,7 @@
 #include "filters.h"
 #include "msgl-iconv.h"
 #include "po-charset.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -280,7 +281,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index e8d5653442333f54fd2691ddfc0369324cf53b57..7871687b0d2e0b1d5e1ec6fc03413597250ba1b8 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -46,13 +46,13 @@
 #include "write-resources.h"
 #include "write-tcl.h"
 #include "write-qt.h"
-
-#include "gettext.h"
+#include "propername.h"
 #include "message.h"
 #include "open-po.h"
 #include "read-po.h"
 #include "po-charset.h"
 #include "msgl-check.h"
+#include "gettext.h"
 
 #define _(str) gettext (str)
 
@@ -363,7 +363,7 @@ 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-1998, 2000-2006");
-      printf (_("Written by %s.\n"), "Ulrich Drepper");
+      printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
index 2ae25c983d837b1e6e2197c56cc743fa7c44ebe2..f9c340a6694ec2dc85ef9fbaf7983436ed7ac207 100644 (file)
--- a/gettext-tools/src/msggrep.c
+++ b/gettext-tools/src/msggrep.c
@@ -55,6 +55,7 @@
 #include "xallocsa.h"
 #include "exit.h"
 #include "libgrep.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -394,7 +395,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index afd12298c68b3aec6dd73d6281b40697ce1976fa..acd7d93138cbb724e8e760dd82ac5bcd78901c53 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -98,6 +98,7 @@
 #include "getline.h"
 #include "xsetenv.h"
 #include "str-list.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -272,7 +273,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 8c5d0688a99e9495f5252b5157dcf70fc109617c..42391304b67d7df4248f31d6cd5599799d22fb4f 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -54,6 +54,7 @@
 #include "plural-count.h"
 #include "backupfile.h"
 #include "copy-file.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -305,7 +306,7 @@ 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-1998, 2000-2006");
-      printf (_("Written by %s.\n"), "Peter Miller");
+      printf (_("Written by %s.\n"), proper_name ("Peter Miller"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c
index d301bcc1011f7ca8182550ab8de70d0dd6a77848..b82602efb413d308f7cf76dd61495bb034357d08 100644 (file)
--- a/gettext-tools/src/msgunfmt.c
+++ b/gettext-tools/src/msgunfmt.c
@@ -42,6 +42,7 @@
 #include "read-resources.h"
 #include "read-tcl.h"
 #include "write-po.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -249,7 +250,7 @@ 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-1998, 2000-2006");
-      printf (_("Written by %s.\n"), "Ulrich Drepper");
+      printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index f9b5a011c9dab69adedcc65193fe2d61398babb2..379bbdfa7bdf2260936826b00f4194c24ccb065a 100644 (file)
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -40,6 +40,7 @@
 #include "write-po.h"
 #include "msgl-cat.h"
 #include "exit.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -242,7 +243,7 @@ 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\
 "),
              "2001-2006");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c
index ef48945ea688ba4b0eca2e85b6781ed545fa59c6..a74bd909b1f3b8b6853703e78eecb4b549c8ac51 100644 (file)
--- a/gettext-tools/src/recode-sr-latin.c
+++ b/gettext-tools/src/recode-sr-latin.c
@@ -42,6 +42,7 @@
 #include "c-strcase.h"
 #include "iconvstring.h"
 #include "filters.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -113,7 +114,12 @@ 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\
 "),
              "2006");
-      printf (_("Written by %s and %s.\n"), "Danilo Segan", "Bruno Haible");
+      printf (_("Written by %s and %s.\n"),
+             /* TRANSLATORS: This is a proper name. The last name is
+                (with Unicode escapes) "\u0160egan" or (with HTML entities)
+                "Šegan".  */
+             proper_name_utf8 ("Danilo Segan", "Danilo \305\240egan"),
+             proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index 0f4f56ee4eaf1540e7cf2bc2922043f8c1cdd522..1d4ced1746ec4b1108671f6580ebbe37b67edf4e 100644 (file)
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -1,5 +1,5 @@
 /* Get the contents of an URL.
-   Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -44,6 +44,7 @@
 #include "javaexec.h"
 #include "exit.h"
 #include "binary-io.h"
+#include "propername.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -136,7 +137,7 @@ 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\
 "),
              "2001-2003");
-      printf (_("Written by %s.\n"), "Bruno Haible");
+      printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 2c0be2b158cfb687f641ce04375fc70177ea75c7..ba026592868a4bb2ac9fa86e10dea0a4743032ad 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -60,6 +60,7 @@
 #include "po-time.h"
 #include "write-po.h"
 #include "format.h"
+#include "propername.h"
 #include "gettext.h"
 
 /* A convenience macro.  I don't like writing gettext() every time.  */
@@ -515,7 +516,7 @@ 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-1998, 2000-2006");
-      printf (_("Written by %s.\n"), "Ulrich Drepper");
+      printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }
 

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 82b7d858b0e96e79c7020344371cb53ea73ea105..cdb8c57a25f83d30e83fd2b577e34167af97e23d 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-02  Bruno Haible  <bruno@clisp.org>
+
+       * tstgettext.c: Include propername.h.
+       (main): Call proper_name. Bump copyright year.
+       * tstngettext.c: Include propername.h.
+       (main): Call proper_name. Bump copyright year.
+
 2006-03-28  Bruno Haible  <bruno@clisp.org>
 
        * recode-sr-latin-1: New file.

diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c
index 9d1eacd55bd8ee0c33065cc658653082085f3f42..b6220a28ab4768db4e2d5ddcf2e63c910ec1e378 100644 (file)
--- a/gettext-tools/tests/tstgettext.c
+++ b/gettext-tools/tests/tstgettext.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,6 +34,7 @@
 #include "basename.h"
 #include "xalloc.h"
 #include "exit.h"
+#include "propername.h"
 #include "xsetenv.h"
 
 #define HAVE_SETLOCALE 1
@@ -161,8 +162,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-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c
index f49bdbbac9f684fa0eb4f6c79dc33a47b0f8cc92..39e4008991603a8cc22e9aad6c821887ccba48ef 100644 (file)
--- a/gettext-tools/tests/tstngettext.c
+++ b/gettext-tools/tests/tstngettext.c
@@ -1,5 +1,5 @@
 /* ngettext - retrieve plural form strings from message catalog and print them.
-   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
@@ -32,6 +32,7 @@
 #include "relocatable.h"
 #include "basename.h"
 #include "exit.h"
+#include "propername.h"
 #include "xsetenv.h"
 
 #define HAVE_SETLOCALE 1
@@ -137,8 +138,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);
     }