diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-01-17 08:39:58 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-01-17 08:39:58 +0000 |
commit | 3c8333780571c599b97ac94f359c76e5c51434c7 (patch) | |
tree | 450633c50edeea61dbe75ca90d0166906b98ced4 /locale/programs/ld-collate.c | |
parent | ebf282c9cfe083f0ace9a05d6aa421b6e32cc2f6 (diff) | |
download | glibc-3c8333780571c599b97ac94f359c76e5c51434c7.tar glibc-3c8333780571c599b97ac94f359c76e5c51434c7.tar.gz glibc-3c8333780571c599b97ac94f359c76e5c51434c7.tar.bz2 glibc-3c8333780571c599b97ac94f359c76e5c51434c7.zip |
Update.
2000-01-17 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/repertoire.c (repertoire_read): Don't print
error message when repertoire map is missing.
(repertoire_complain): Print error message for missing map, but only
once.
* locale/programs/repertoire.h (repertoire_complain): Add prototype.
* locale/programs/linereader.c (get_string): Prefer getting names
from charseq entries. Try finding Uxxxxxxxx names in charmap
before trying to map from repertoire.
Diffstat (limited to 'locale/programs/ld-collate.c')
-rw-r--r-- | locale/programs/ld-collate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 2cbea388b2..a9f42fe3fc 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -1514,7 +1514,7 @@ collate_finish (struct localedef_t *locale, struct charmap_t *charmap) to symbols with the same byte sequence. It is of course an error. */ error_at_line (0, 0, (*eptr)->file, (*eptr)->line, - _("symbol `%s' has same encoding as"), + _("symbol `%s' has the same encoding as"), (*eptr)->name); error_at_line (0, 0, runp->file, runp->line, _("symbol `%s'"), runp->name); @@ -1691,7 +1691,7 @@ Computing table size for collation table might take a while..."), to symbols with the same byte sequence. It is of course an error. */ error_at_line (0, 0, (*eptr)->file, (*eptr)->line, - _("symbol `%s' has same encoding as"), + _("symbol `%s' has the same encoding as"), (*eptr)->name); error_at_line (0, 0, runp->file, runp->line, _("symbol `%s'"), runp->name); |