From 42d7c593143c868dfce28182a34b10f8c9cf4e86 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 6 Oct 1999 18:22:29 +0000 Subject: [PATCH] Update. 1999-10-06 Ulrich Drepper * locale/programs/ld-ctype.c (ctype_read): Fix typos in last patch. 1999-10-05 Andreas Jaeger * locale/programs/ld-identification.c: Fix typo in comment. * locale/programs/ld-messages.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-name.c: Likewise. * locale/programs/ld-collate.c (read_lc_collate): Fix typo in comment. (collate_read): Remove unnecessary comparisons with ignore_content. * locale/programs/ld-ctype.c (ctype_finish): Loop only over actual assigned elements. (ctype_read): Remove unnecessary comparisons with ignore_content. Fix typos in comments. * locale/programs/ld-address.c (STR_ELEM): Remove unnecessary comparisons with ignore_content. * po/cs.po: Update. --- ChangeLog | 24 +++++++++++++++++++ locale/programs/ld-address.c | 2 +- locale/programs/ld-collate.c | 4 ++-- locale/programs/ld-ctype.c | 15 +++++++----- locale/programs/ld-identification.c | 2 +- locale/programs/ld-messages.c | 2 +- locale/programs/ld-monetary.c | 2 +- locale/programs/ld-name.c | 2 +- po/cs.po | 37 +++++++++++++++-------------- 9 files changed, 59 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9ae16aa41..a4b09c1e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,29 @@ +1999-10-06 Ulrich Drepper + + * locale/programs/ld-ctype.c (ctype_read): Fix typos in last patch. + +1999-10-05 Andreas Jaeger + + * locale/programs/ld-identification.c: Fix typo in comment. + * locale/programs/ld-messages.c: Likewise. + * locale/programs/ld-monetary.c: Likewise. + * locale/programs/ld-name.c: Likewise. + + * locale/programs/ld-collate.c (read_lc_collate): Fix typo in comment. + (collate_read): Remove unnecessary comparisons with ignore_content. + + * locale/programs/ld-ctype.c (ctype_finish): Loop only over actual + assigned elements. + (ctype_read): Remove unnecessary comparisons with ignore_content. + Fix typos in comments. + + * locale/programs/ld-address.c (STR_ELEM): Remove unnecessary + comparisons with ignore_content. + 1999-10-05 Ulrich Drepper + * po/cs.po: Update. + * time/time.h: Move __gmtime_r declaration to ... * include/time.h: ...here. diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c index 6dce62bf8f..35f7de89b4 100644 --- a/locale/programs/ld-address.c +++ b/locale/programs/ld-address.c @@ -453,7 +453,7 @@ address_read (struct linereader *ldfile, struct localedef_t *result, if (nowtok == tok_eof) break; - /* Ingore empty lines. */ + /* Ignore empty lines. */ if (nowtok == tok_eol) { now = lr_token (ldfile, charmap, NULL); diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 905700322f..27bba55ba9 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -678,7 +678,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, else { free (arg->val.str.startmb); - lr_ignore_rest (ldfile, 1); + lr_ignore_rest (ldfile, 0); } break; @@ -3135,7 +3135,7 @@ read_lc_collate (struct linereader *ldfile, struct localedef_t *result, if (nowtok == tok_eof) break; - /* Ingore empty lines. */ + /* Ignore empty lines. */ if (nowtok == tok_eol) { now = lr_token (ldfile, charmap, NULL); diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index c274c0ca48..ffc759b272 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -347,7 +347,7 @@ ctype_finish (struct localedef_t *locale, struct charmap_t *charmap) set_class_defaults (ctype, charmap, ctype->repertoire); /* Check according to table. */ - for (cnt = 0; cnt < ctype->class_collection_max; ++cnt) + for (cnt = 0; cnt < ctype->class_collection_act; ++cnt) { uint32_t tmp = ctype->class_collection[cnt]; @@ -549,7 +549,7 @@ character '%s' in class `%s' must not be in class `%s'"), } /* Check the input digits. There must be a multiple of ten available. - In each group I could be that one or the other character is missing. + In each group it could be that one or the other character is missing. In this case the whole group must be removed. */ cnt = 0; while (cnt < ctype->mbdigits_act) @@ -610,7 +610,7 @@ no input digits defined and none of the standard names in the charmap")); } /* Check the wide character input digits. There must be a multiple - of ten available. In each group I could be that one or the other + of ten available. In each group it could be that one or the other character is missing. In this case the whole group must be removed. */ cnt = 0; @@ -998,7 +998,7 @@ implementation limit: no more than %d character maps allowed"), /* We have to be prepared that TABLE, MAX, and ACT can be NULL. This - is possible if we only want ot extend the name array. */ + is possible if we only want to extend the name array. */ static uint32_t * find_idx (struct locale_ctype_t *ctype, uint32_t **table, size_t *max, size_t *act, uint32_t idx) @@ -1911,7 +1911,10 @@ with character code range values one must use the absolute ellipsis `...'")); /* Ignore the rest of the line if we don't need the input of this line. */ if (ignore_content) - break; + { + lr_ignore_rest (ldfile, 0); + break; + } handle_tok_digit: class_bit = _ISwdigit; @@ -2803,7 +2806,7 @@ allocate_arrays (struct locale_ctype_t *ctype, struct charmap_t *charmap, We use a very trivial hashing function to store the sparse table. CH % TABSIZE is used as an index. To solve multiple hits we have N planes. This guarantees a fixed search time for a - character [N / 2]. In the following code we determine the minmum + character [N / 2]. In the following code we determine the minimum value for TABSIZE * N, where TABSIZE >= 256. */ size_t min_total = UINT_MAX; size_t act_size = 256; diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c index b536ac8070..957f12caaa 100644 --- a/locale/programs/ld-identification.c +++ b/locale/programs/ld-identification.c @@ -328,7 +328,7 @@ identification_read (struct linereader *ldfile, struct localedef_t *result, if (nowtok == tok_eof) break; - /* Ingore empty lines. */ + /* Ignore empty lines. */ if (nowtok == tok_eol) { now = lr_token (ldfile, charmap, NULL); diff --git a/locale/programs/ld-messages.c b/locale/programs/ld-messages.c index 159c9c7897..a29cfeaaec 100644 --- a/locale/programs/ld-messages.c +++ b/locale/programs/ld-messages.c @@ -269,7 +269,7 @@ messages_read (struct linereader *ldfile, struct localedef_t *result, if (nowtok == tok_eof) break; - /* Ingore empty lines. */ + /* Ignore empty lines. */ if (nowtok == tok_eol) { now = lr_token (ldfile, charmap, NULL); diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c index 4a8990af57..f1b527c79a 100644 --- a/locale/programs/ld-monetary.c +++ b/locale/programs/ld-monetary.c @@ -614,7 +614,7 @@ monetary_read (struct linereader *ldfile, struct localedef_t *result, if (nowtok == tok_eof) break; - /* Ingore empty lines. */ + /* Ignore empty lines. */ if (nowtok == tok_eol) { now = lr_token (ldfile, charmap, NULL); diff --git a/locale/programs/ld-name.c b/locale/programs/ld-name.c index 4ab0916373..9419fdd4e3 100644 --- a/locale/programs/ld-name.c +++ b/locale/programs/ld-name.c @@ -250,7 +250,7 @@ name_read (struct linereader *ldfile, struct localedef_t *result, if (nowtok == tok_eof) break; - /* Ingore empty lines. */ + /* Ignore empty lines. */ if (nowtok == tok_eol) { now = lr_token (ldfile, charmap, NULL); diff --git a/po/cs.po b/po/cs.po index 97610bfb3e..636d23e854 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,6 +1,6 @@ # Czech translations for GNU libc. # Copyright (C) 1997 Free Software Foundation, Inc. -# Vladimir Michl , 1997. +# Vladimir Michl , 1997. # # Thanks to: # Petr Kolar @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: libc 2.1\n" "POT-Creation-Date: 1998-11-28 09:29-0800\n" -"PO-Revision-Date: 1999-01-14 18:57+01:00\n" -"Last-Translator: Vladimir Michl \n" +"PO-Revision-Date: 1999-09-26 21:59+02:00\n" +"Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" @@ -133,10 +133,10 @@ msgstr "Zaps #: catgets/gencat.c:115 msgid "" -"Generate message catalog.\\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" +"Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" "is -, output is written to standard output.\n" msgstr "" -" Generuje katalog zpráv.\\vJe-li VSTUPNÍ_SOUBOR -, vstup bude načten ze\n" +" Generuje katalog zpráv.\vJe-li VSTUPNÍ_SOUBOR -, vstup bude načten ze\n" "standardního vstupu. Je-li VÝSTUPNÍ_SOUBOR -, výstup bude zapsán na standardní\n" "výstup.\n" @@ -510,7 +510,7 @@ msgid "" "\n" " " msgstr "" -" Nasledující seznam obsahuje všechny známé znakové sady. To nutně neznamená,\n" +" Následující seznam obsahuje všechny známé znakové sady. To nutně neznamená,\n" "že všechny kombinace těchto názvů mohou být použity pro argumenty Z a DO.\n" "Jedna znaková sada může být uvedena pod vícerými názvy (přezdívkami).\n" " Některé z názvů nejsou obyčejné řetězce, ale regulární výrazy, které\n" @@ -2433,16 +2433,16 @@ msgid "Unmatched [ or [^" msgstr "Nepárová [ or [^" #: posix/regex.c:1020 -msgid "Unmatched ( or \\(" -msgstr "Nepárová ( or \\(" +msgid "Unmatched ( or \(" +msgstr "Nepárová ( or \(" #: posix/regex.c:1021 -msgid "Unmatched \\{" -msgstr "Nepárová \\{" +msgid "Unmatched \{" +msgstr "Nepárová \{" #: posix/regex.c:1022 -msgid "Invalid content of \\{\\}" -msgstr "Nepřípustný obsah \\{\\}" +msgid "Invalid content of \{\}" +msgstr "Nepřípustný obsah \{\}" #: posix/regex.c:1023 msgid "Invalid range end" @@ -2465,8 +2465,8 @@ msgid "Regular expression too big" msgstr "Regulární výraz je příliš velký" #: posix/regex.c:1028 -msgid "Unmatched ) or \\)" -msgstr "Nepárová ) or \\)" +msgid "Unmatched ) or \)" +msgstr "Nepárová ) or \)" #: posix/regex.c:5515 msgid "No previous regular expression" @@ -2922,11 +2922,12 @@ msgstr "Spojen msgid "Too many references: cannot splice" msgstr "Příliš mnoho odkazů - nelze spojit" +# Časový limit pro připojení vypršel #. TRANS A socket operation with a specified timeout received no response during #. TRANS the timeout period. #: stdio-common/../sysdeps/gnu/errlist.c:445 msgid "Connection timed out" -msgstr "Časový limit pro připojení vypršel" +msgstr "Spojení bylo příliš dlouho neaktivní" #. TRANS A remote host refused to allow the network connection (typically because #. TRANS it is not running the requested service). @@ -3774,14 +3775,14 @@ msgstr "Pou #, c-format msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n" msgstr "" -"\t%s [-abkCLNTM][-Dnázev[=hodnota]] [-i velikost] [-I [-K sekundy]]\n" +" %s [-abkCLNTM][-Dnázev[=hodnota]] [-i velikost] [-I [-K sekundy]]\n" " [-Y cesta] vst_soubor\n" #: sunrpc/rpc_main.c:1418 #, c-format msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n" msgstr "" -"\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o výst_soubor]\n" +" %s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o výst_soubor]\n" " [vst_soubor]\n" #: sunrpc/rpc_main.c:1420 @@ -4067,7 +4068,7 @@ msgstr " (pravidlo z \"%s\", #, c-format msgid "" "%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d directory ]\n" -"\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n" +" [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n" msgstr "" "%s: Použití: %s [ -s ] [ -v ] [ -l lokální_čas ]\n" " [ -p posixová_pravidla ] [ -d adresář ] [ -L přestupných_sekund ]\n"