diff options
Diffstat (limited to 'locale/programs')
-rw-r--r-- | locale/programs/charmap.c | 6 | ||||
-rw-r--r-- | locale/programs/ld-collate.c | 4 | ||||
-rw-r--r-- | locale/programs/ld-ctype.c | 11 | ||||
-rw-r--r-- | locale/programs/ld-monetary.c | 2 | ||||
-rw-r--r-- | locale/programs/ld-numeric.c | 2 | ||||
-rw-r--r-- | locale/programs/ld-time.c | 4 | ||||
-rw-r--r-- | locale/programs/locale.c | 4 | ||||
-rw-r--r-- | locale/programs/localedef.c | 4 | ||||
-rw-r--r-- | locale/programs/repertoire.c | 4 |
9 files changed, 22 insertions, 19 deletions
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index dbc1101..52a69de 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -607,7 +607,7 @@ character sets with locking states are not supported")); case 90: if (nowtok != expected_tok) lr_error (cmfile, _("\ -%1$s: definition does not end with `END %1$s'"), expected_str); +`%1$s' definition does not end with `END %1$s'"), expected_str); lr_ignore_rest (cmfile, nowtok == expected_tok); state = 91; @@ -1019,13 +1019,13 @@ hexadecimal range format should use only capital characters")); && errno == ERANGE) || *to_end != '\0') { - lr_error (lr, _("<%s> and <%s> are invalid names for range"), from, to); + lr_error (lr, _("<%s> and <%s> are illegal names for range"), from, to); return; } if (from_nr > to_nr) { - lr_error (lr, _("upper limit in range is smaller than lower limit")); + lr_error (lr, _("upper limit in range is not higher then lower limit")); return; } diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index af47279..cf1bff1 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1146,7 +1146,7 @@ handle_ellipsis (struct linereader *ldfile, const char *symstr, size_t symlen, { if (ret > 0) lr_error (ldfile, _("%s: byte sequence of first character of \ -range is not lower than that of the last character"), "LC_COLLATE"); +sequence is not lower than that of the last character"), "LC_COLLATE"); return; } @@ -1164,7 +1164,7 @@ range is not lower than that of the last character"), "LC_COLLATE"); struct element_t *elem; size_t namelen; - /* I don't think this can ever happen. */ + /* I don't this this can ever happen. */ assert (seq->name != NULL); namelen = strlen (seq->name); diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 69fc05f..40d5e4b 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1995-2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -1866,6 +1866,9 @@ find_translit (struct localedef_t *locale, const struct charmap_t *charmap, assert (locale != NULL); ctype = locale->categories[LC_CTYPE].ctype; + if (ctype == NULL) + return NULL; + if (ctype->translit != NULL) result = find_translit2 (ctype, charmap, wch); @@ -3036,7 +3039,7 @@ set_class_defaults (struct locale_ctype_t *ctype, { if (!be_quiet) WITH_CUR_LOCALE (error (0, 0, _("\ -%s: character `%s' not defined while needed as default value"), +%s: character `%s' not defined in charmap while needed as default value"), "LC_CTYPE", tmp)); } else if (seq->nbytes != 1) @@ -3161,8 +3164,8 @@ set_class_defaults (struct locale_ctype_t *ctype, { if (!be_quiet) WITH_CUR_LOCALE (error (0, 0, _("\ -%s: character `%s' not defined while needed as default value"), - "LC_CTYPE", "<newline>")); +character `%s' not defined while needed as default value"), + "<newline>")); } else if (seq->nbytes != 1) WITH_CUR_LOCALE (error (0, 0, _("\ diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c index d493a14..27636d6 100644 --- a/locale/programs/ld-monetary.c +++ b/locale/programs/ld-monetary.c @@ -252,7 +252,7 @@ not correspond to a valid name in ISO 4217"), else if (monetary->mon_decimal_point[0] == '\0' && ! be_quiet && ! nothing) { WITH_CUR_LOCALE (error (0, 0, _("\ -%s: value for field `%s' must not be an empty string"), +%s: value for field `%s' must not be the empty string"), "LC_MONETARY", "mon_decimal_point")); } if (monetary->mon_decimal_point_wc == L'\0') diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c index d7ffe75..a901c4d 100644 --- a/locale/programs/ld-numeric.c +++ b/locale/programs/ld-numeric.c @@ -115,7 +115,7 @@ No definition for %s category found"), "LC_NUMERIC")); else if (numeric->decimal_point[0] == '\0' && ! be_quiet && ! nothing) { WITH_CUR_LOCALE (error (0, 0, _("\ -%s: value for field `%s' must not be an empty string"), +%s: value for field `%s' must not be the empty string"), "LC_NUMERIC", "decimal_point")); } if (numeric->decimal_point_wc == L'\0') diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index 0d19350..bf51518 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -502,7 +502,7 @@ No definition for %s category found"), "LC_TIME")); time->first_weekday = 1; else if (time->first_weekday > time->week_ndays) WITH_CUR_LOCALE (error (0, 0, _("\ -%s: values for field `%s' must not be larger than %d"), +%s: values of field `%s' must not be larger than %d"), "LC_TIME", "first_weekday", 7)); if (time->first_workday == '\0') @@ -510,7 +510,7 @@ No definition for %s category found"), "LC_TIME")); time->first_workday = 1; else if (time->first_workday > time->week_ndays) WITH_CUR_LOCALE (error (0, 0, _("\ -%s: values for field `%s' must not be larger than %d"), +%s: values of field `%s' must not be larger than %d"), "LC_TIME", "first_workday", 7)); if (time->cal_direction == '\0') diff --git a/locale/programs/locale.c b/locale/programs/locale.c index cc3082d..a03974e 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -1,5 +1,5 @@ /* Implementation of the locale program according to POSIX 9945-2. - Copyright (C) 1995-1997, 1999-2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999-2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -275,7 +275,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ 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\ -"), "2007"); +"), "2006"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 04dcf8e..9c3acbe 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2004, 2005, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1995-2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -387,7 +387,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ 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\ -"), "2007"); +"), "2006"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c index b6c0a6a..e9bdf9e 100644 --- a/locale/programs/repertoire.c +++ b/locale/programs/repertoire.c @@ -311,7 +311,7 @@ argument to <%s> must be a single character"), case 90: if (nowtok != tok_charids) lr_error (repfile, _("\ -%1$s: definition does not end with `END %1$s'"), "CHARIDS"); +`%1$s' definition does not end with `END %1$s'"), "CHARIDS"); lr_ignore_rest (repfile, nowtok == tok_charids); break; @@ -453,7 +453,7 @@ hexadecimal range format should use only capital characters")); if (from_nr > to_nr) { - lr_error (lr, _("upper limit in range is smaller than lower limit")); + lr_error (lr, _("upper limit in range is not smaller then lower limit")); return; } |