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.
This commit is contained in:
Ulrich Drepper 1998-12-23 13:13:49 +00:00
parent edb570bb87
commit f1f0edfe2c
9 changed files with 27 additions and 15 deletions

View File

@ -1,3 +1,15 @@
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> 1998-12-20 Philip Blundell <philb@gnu.org>
* sysdeps/unix/sysv/linux/arm/sysdep.h (INLINE_SYSCALL): Add * sysdeps/unix/sysv/linux/arm/sysdep.h (INLINE_SYSCALL): Add

View File

@ -1073,7 +1073,7 @@ collate_element_to (struct linereader *lr, struct localedef_t *locale,
&not_used) >= 0) &not_used) >= 0)
{ {
lr_error (lr, _("symbol for multicharacter collating element " 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); (int) code->val.str.len, code->val.str.start);
return; return;
} }

View File

@ -119,7 +119,7 @@ monetary_finish (struct localedef_t *locale)
#define TEST_ELEM(cat) \ #define TEST_ELEM(cat) \
if (monetary->cat == NULL && !be_quiet) \ 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") #cat, "LC_MONETARY")
TEST_ELEM (int_curr_symbol); 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) 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"); "mon_grouping", "LC_MONETARY");
#undef TEST_ELEM #undef TEST_ELEM
#define TEST_ELEM(cat, min, max) \ #define TEST_ELEM(cat, min, max) \
if (monetary->cat == -2 && !be_quiet) \ 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"); \ #cat, "LC_MONETARY"); \
else if ((monetary->cat < min || monetary->cat > max) && !be_quiet) \ else if ((monetary->cat < min || monetary->cat > max) && !be_quiet) \
error (0, 0, _("\ error (0, 0, _("\

View File

@ -78,7 +78,7 @@ numeric_finish (struct localedef_t *locale)
#define TEST_ELEM(cat) \ #define TEST_ELEM(cat) \
if (numeric->cat == NULL && !be_quiet) \ 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") #cat, "LC_NUMERIC")
TEST_ELEM (decimal_point); 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) 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"); "grouping", "LC_NUMERIC");
} }

View File

@ -110,7 +110,7 @@ time_finish (struct localedef_t *locale)
#define TESTARR_ELEM(cat, max) \ #define TESTARR_ELEM(cat, max) \
if (time->cur_num_##cat == 0 && !be_quiet) \ 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"); \ #cat, "LC_TIME"); \
else if (time->cur_num_##cat != max && !be_quiet) \ else if (time->cur_num_##cat != max && !be_quiet) \
error (0, 0, _("field `%s' in category `%s' has not enough values"), \ 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) \ #define TEST_ELEM(cat) \
if (time->cat == NULL && !be_quiet) \ 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") #cat, "LC_TIME")
TEST_ELEM (d_t_fmt); TEST_ELEM (d_t_fmt);

View File

@ -731,7 +731,7 @@ The file quota system is confused because there are too many users.
@end deftypevr @end deftypevr
@comment errno.h @comment errno.h
@comment BSD: Disc quota exceeded @comment BSD: Disk quota exceeded
@deftypevr Macro int EDQUOT @deftypevr Macro int EDQUOT
@comment errno 69 @c DO NOT REMOVE @comment errno 69 @c DO NOT REMOVE
The user's disk quota was exceeded. The user's disk quota was exceeded.

View File

@ -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. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. 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_("Entry/Table type mismatch"),
N_("Link Points to illegal name"), N_("Link Points to illegal name"),
N_("Partial Success"), N_("Partial Success"),
N_("Too Many Attributes"), N_("Too many Attributes"),
N_("Error in RPC subsystem"), N_("Error in RPC subsystem"),
N_("Missing or malformed attribute"), N_("Missing or malformed attribute"),
N_("Named object is not searchable"), N_("Named object is not searchable"),

View File

@ -159,7 +159,7 @@ nis_print_directory (const directory_obj *dir)
nis_server *sptr; nis_server *sptr;
unsigned int i; 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)); printf (_("Type : %s\n"), nis_nstype2str (dir->do_type));
sptr = dir->do_servers.do_servers_val; sptr = dir->do_servers.do_servers_val;
for (i = 0; i < dir->do_servers.do_servers_len; i++) for (i = 0; i < dir->do_servers.do_servers_len; i++)

View File

@ -191,7 +191,7 @@ parse_grp_str (const char *s, gid_t *gidp, int *gidlenp, gid_t *gidlist,
if (!s || (!isdigit (*s))) 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; return NSS_STATUS_NOTFOUND;
} }
@ -296,7 +296,7 @@ _nss_nisplus_netname2user (char netname[MAXNETNAMELEN + 1], uid_t *uidp,
domain = nis_local_directory (); domain = nis_local_directory ();
if ((strlen (principal) + strlen (domain) + 45) > (size_t) NIS_MAXNAMELEN) 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); principal);
return NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
} }