Update.

1998-12-23  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/ld-collate.c: Unify messages and correct typos.
	* locale/programs/ld-monetary.c: Likewise.
	* locale/programs/ld-numeric.c: Likewise.
	* locale/programs/ld-time.c: Likewise.
	* manual/errno.texi: Likewise.
	* nis/nis_error.c: Likewise.
	* nis/nis_print.c: Likewise.
	* nis/nss_nisplus/nisplus-publickey.c: Likewise.
	* sunrpc/rpc_main.c: Likewise.

9 files changed, 27 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e6a448fa9..152d76720b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,22 @@
+1998-12-23  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/programs/ld-collate.c: Unify messages and correct typos.
+	* locale/programs/ld-monetary.c: Likewise.
+	* locale/programs/ld-numeric.c: Likewise.
+	* locale/programs/ld-time.c: Likewise.
+	* manual/errno.texi: Likewise.
+	* nis/nis_error.c: Likewise.
+	* nis/nis_print.c: Likewise.
+	* nis/nss_nisplus/nisplus-publickey.c: Likewise.
+	* sunrpc/rpc_main.c: Likewise.
+
 1998-12-20  Philip Blundell  <philb@gnu.org>
 
 	* sysdeps/unix/sysv/linux/arm/sysdep.h (INLINE_SYSCALL): Add
 	implementation.
 	* sysdeps/unix/sysv/linux/arm/syscalls.list: Remove wrappers for
 	now-inlined calls.
-        
+
 1998-12-22  Philip Blundell  <pb@nexus.co.uk>
 
 	* sysdeps/unix/sysv/linux/arm/ioperm.c: New file.
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 5accaabfea..5d2cb57820 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1073,7 +1073,7 @@ collate_element_to (struct linereader *lr, struct localedef_t *locale,
 		  &not_used) >= 0)
     {
       lr_error (lr, _("symbol for multicharacter collating element "
-		      "`%.*s' duplicates other element definition"),
+		      "`%.*s' duplicates element definition"),
 		(int) code->val.str.len, code->val.str.start);
       return;
     }
diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c
index 4aede4691f..6c7c3c3cfd 100644
--- a/locale/programs/ld-monetary.c
+++ b/locale/programs/ld-monetary.c
@@ -119,7 +119,7 @@ monetary_finish (struct localedef_t *locale)
 
 #define TEST_ELEM(cat)							      \
   if (monetary->cat == NULL && !be_quiet)				      \
-    error (0, 0, _("field `%s' in category `%s' not defined"),		      \
+    error (0, 0, _("field `%s' in category `%s' undefined"),		      \
 	   #cat, "LC_MONETARY")
 
   TEST_ELEM (int_curr_symbol);
@@ -160,13 +160,13 @@ value for field `%s' in category `%s' must not be the empty string"),
     }
 
   if (monetary->mon_grouping_act == 0 && !be_quiet)
-    error (0, 0, _("field `%s' in category `%s' not defined"),
+    error (0, 0, _("field `%s' in category `%s' undefined"),
 	   "mon_grouping", "LC_MONETARY");
 
 #undef TEST_ELEM
 #define TEST_ELEM(cat, min, max)					      \
   if (monetary->cat == -2 && !be_quiet)					      \
-    error (0, 0, _("field `%s' in category `%s' not defined"),		      \
+    error (0, 0, _("field `%s' in category `%s' undefined"),		      \
 	   #cat, "LC_MONETARY");					      \
   else if ((monetary->cat < min || monetary->cat > max) && !be_quiet)	      \
     error (0, 0, _("\
diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c
index bbc575852d..4042d6eba6 100644
--- a/locale/programs/ld-numeric.c
+++ b/locale/programs/ld-numeric.c
@@ -78,7 +78,7 @@ numeric_finish (struct localedef_t *locale)
 
 #define TEST_ELEM(cat)							      \
   if (numeric->cat == NULL && !be_quiet)				      \
-    error (0, 0, _("field `%s' in category `%s' not defined"),		      \
+    error (0, 0, _("field `%s' in category `%s' undefined"),		      \
 	   #cat, "LC_NUMERIC")
 
   TEST_ELEM (decimal_point);
@@ -95,7 +95,7 @@ value for field `%s' in category `%s' must not be the empty string"),
     }
 
   if (numeric->grouping_act == 0 && !be_quiet)
-    error (0, 0, _("field `%s' in category `%s' not defined"),
+    error (0, 0, _("field `%s' in category `%s' undefined"),
 	   "grouping", "LC_NUMERIC");
 }
 
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index aa401627f2..399f7a77ab 100644
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -110,7 +110,7 @@ time_finish (struct localedef_t *locale)
 
 #define TESTARR_ELEM(cat, max)						      \
   if (time->cur_num_##cat == 0 && !be_quiet)				      \
-    error (0, 0, _("field `%s' in category `%s' not defined"),		      \
+    error (0, 0, _("field `%s' in category `%s' undefined"),		      \
 	   #cat, "LC_TIME");						      \
   else if (time->cur_num_##cat != max && !be_quiet)			      \
     error (0, 0, _("field `%s' in category `%s' has not enough values"),      \
@@ -124,7 +124,7 @@ time_finish (struct localedef_t *locale)
 
 #define TEST_ELEM(cat)							      \
   if (time->cat == NULL && !be_quiet)					      \
-    error (0, 0, _("field `%s' in category `%s' not defined"),		      \
+    error (0, 0, _("field `%s' in category `%s' undefined"),		      \
 	   #cat, "LC_TIME")
 
   TEST_ELEM (d_t_fmt);
diff --git a/manual/errno.texi b/manual/errno.texi
index cc937f9c03..a68f3bdbae 100644
--- a/manual/errno.texi
+++ b/manual/errno.texi
@@ -731,7 +731,7 @@ The file quota system is confused because there are too many users.
 @end deftypevr
 
 @comment errno.h
-@comment BSD: Disc quota exceeded
+@comment BSD: Disk quota exceeded
 @deftypevr Macro int EDQUOT
 @comment errno 69 @c DO NOT REMOVE
 The user's disk quota was exceeded.
diff --git a/nis/nis_error.c b/nis/nis_error.c
index ced0f716fd..d3216de21d 100644
--- a/nis/nis_error.c
+++ b/nis/nis_error.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Free Software Foundation, Inc.
+/* Copyright (c) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
@@ -52,7 +52,7 @@ static const char *nis_errlist[] =
   N_("Entry/Table type mismatch"),
   N_("Link Points to illegal name"),
   N_("Partial Success"),
-  N_("Too Many Attributes"),
+  N_("Too many Attributes"),
   N_("Error in RPC subsystem"),
   N_("Missing or malformed attribute"),
   N_("Named object is not searchable"),
diff --git a/nis/nis_print.c b/nis/nis_print.c
index 197d773ce1..4ad51b23ea 100644
--- a/nis/nis_print.c
+++ b/nis/nis_print.c
@@ -159,7 +159,7 @@ nis_print_directory (const directory_obj *dir)
   nis_server *sptr;
   unsigned int i;
 
-  printf (_("Name : '%s'\n"), dir->do_name);
+  printf (_("Name : `%s'\n"), dir->do_name);
   printf (_("Type : %s\n"), nis_nstype2str (dir->do_type));
   sptr = dir->do_servers.do_servers_val;
   for (i = 0; i < dir->do_servers.do_servers_len; i++)
diff --git a/nis/nss_nisplus/nisplus-publickey.c b/nis/nss_nisplus/nisplus-publickey.c
index 47062b4812..a9a8e186e0 100644
--- a/nis/nss_nisplus/nisplus-publickey.c
+++ b/nis/nss_nisplus/nisplus-publickey.c
@@ -191,7 +191,7 @@ parse_grp_str (const char *s, gid_t *gidp, int *gidlenp, gid_t *gidlist,
 
   if (!s || (!isdigit (*s)))
     {
-      syslog (LOG_ERR, _("netname2user: missing group id list in '%s'."), s);
+      syslog (LOG_ERR, _("netname2user: missing group id list in `%s'."), s);
       return NSS_STATUS_NOTFOUND;
     }
 
@@ -296,7 +296,7 @@ _nss_nisplus_netname2user (char netname[MAXNETNAMELEN + 1], uid_t *uidp,
   domain = nis_local_directory ();
   if ((strlen (principal) + strlen (domain) + 45) > (size_t) NIS_MAXNAMELEN)
     {
-      syslog (LOG_ERR, _("netname2user: principal name '%s' too long"),
+      syslog (LOG_ERR, _("netname2user: principal name `%s' too long"),
 	      principal);
       return NSS_STATUS_UNAVAIL;
     }