Update.

2004-08-04  Jakub Jelinek  <jakub@redhat.com>

	* hesiod/hesiod.c (__hesiod_res_get): Use calloc instead of malloc +
	memset.
	(__hesiod_res_set): Free nsaddrs.

	* include/resolv.h (__res_maybe_init): Add prototype.
	* resolv/resolv.h (struct __res_state): Add _u._ext.initstamp field.
	* resolv/Versions (libc): Add __res_maybe_init@@GLIBC_PRIVATE.
	* resolv/res_libc.c (__res_initstamp, lock): New variables.
	(res_init): Increase __res_initstamp.
	(__res_maybe_init): New function.
	* resolv/res_init.c (__res_vinit): Initialize _u._ext.initstamp.
	* hesiod/hesiod.c (__hesiod_res_get): Use __res_maybe_init instead
	of RES_INIT check and {res_ninit,__res_ninit,res_init} call.
	* sysdeps/posix/getaddrinfo.c (gaih_inet): Likewise.
	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r,
	_nss_dns_gethostbyaddr_r): Likewise.
	* resolv/nss_dns/dns-network.c (_nss_dns_getnetbyname_r,
	_nss_dns_getnetbyaddr_r): Likewise.
	* resolv/gethnamaddr.c (gethostbyname, gethostbyname2,
	gethostbyaddr): Likewise.
	* resolv/res_data.c (fp_nquery, res_mkquery, res_mkupdate,
	res_isourserver, res_sendsigned, res_update, res_search,
	res_querydomain): Likewise.
	* nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)): Likewise.
	* nss/digits_dots.c (__nss_hostname_digits_dots): Likewise.
	* nss/getnssent_r.c (__nss_setent, __nss_endent, __nss_getent_r):
	Likewise.

	* sysdeps/posix/getaddrinfo.c (gaih_inet): Set ai_family for
	V4-mapped IPv6 addresses and req->ai_family==AF_INET.
	Reported by A. Guru <a.guru@sympatico.ca>.

	* po/pl.po: Likewise.
	characters than necessary.

diff --git a/ChangeLog b/ChangeLog
index 9ab1176..89f938b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,48 @@
+2004-08-04  Jakub Jelinek  <jakub@redhat.com>
+
+       * hesiod/hesiod.c (__hesiod_res_get): Use calloc instead of malloc +
+       memset.
+       (__hesiod_res_set): Free nsaddrs.
+
+       * include/resolv.h (__res_maybe_init): Add prototype.
+       * resolv/resolv.h (struct __res_state): Add _u._ext.initstamp field.
+       * resolv/Versions (libc): Add __res_maybe_init@@GLIBC_PRIVATE.
+       * resolv/res_libc.c (__res_initstamp, lock): New variables.
+       (res_init): Increase __res_initstamp.
+       (__res_maybe_init): New function.
+       * resolv/res_init.c (__res_vinit): Initialize _u._ext.initstamp.
+       * hesiod/hesiod.c (__hesiod_res_get): Use __res_maybe_init instead
+       of RES_INIT check and {res_ninit,__res_ninit,res_init} call.
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Likewise.
+       * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r,
+       _nss_dns_gethostbyaddr_r): Likewise.
+       * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyname_r,
+       _nss_dns_getnetbyaddr_r): Likewise.
+       * resolv/gethnamaddr.c (gethostbyname, gethostbyname2,
+       gethostbyaddr): Likewise.
+       * resolv/res_data.c (fp_nquery, res_mkquery, res_mkupdate,
+       res_isourserver, res_sendsigned, res_update, res_search,
+       res_querydomain): Likewise.
+       * nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)): Likewise.
+       * nss/digits_dots.c (__nss_hostname_digits_dots): Likewise.
+       * nss/getnssent_r.c (__nss_setent, __nss_endent, __nss_getent_r):
+       Likewise.
+
 2004-08-05  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Set ai_family for
+       V4-mapped IPv6 addresses and req->ai_family==AF_INET.
+       Reported by A. Guru <a.guru@sympatico.ca>.
+
        * po/sv.po: Update from translation team.
        * po/sk.po: Likewise.
+       * po/pl.po: Likewise.
 
 2004-08-04  Jakub Jelinek  <jakub@redhat.com>
            Ulrich Drepper  <drepper@redhat.com>
 
        * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Don't read more input
-       character than necessary.
+       characters than necessary.
 
 2004-08-05  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/hesiod/hesiod.c b/hesiod/hesiod.c
index 630c71f..7fffb31 100644 (file)
--- a/hesiod/hesiod.c
+++ b/hesiod/hesiod.c
@@ -448,10 +448,9 @@ __hesiod_res_get(void *context) {
 
        if (!ctx->res) {
                struct __res_state *res;
-               res = (struct __res_state *)malloc(sizeof *res);
+               res = (struct __res_state *)calloc(1, sizeof *res);
                if (res == NULL)
                        return (NULL);
-               memset(res, 0, sizeof *res);
                __hesiod_res_set(ctx, res, free);
        }
 
@@ -465,6 +464,12 @@ __hesiod_res_set(void *context, struct __res_state *res,
 
        if (ctx->res && ctx->free_res) {
                res_nclose(ctx->res);
+               if ((ctx->res->options & RES_INIT) && ctx->res->nscount > 0) {
+                       for (int ns = 0; ns < MAXNS; ns++) {
+                               free (ctx->res->_u._ext.nsaddrs[ns]);
+                               ctx->res->_u._ext.nsaddrs[ns] = NULL;
+                       }
+               }
                (*ctx->free_res)(ctx->res);
        }
 
@@ -478,8 +483,7 @@ init(struct hesiod_p *ctx) {
        if (!ctx->res && !__hesiod_res_get(ctx))
                return (-1);
 
-       if (((ctx->res->options & RES_INIT) == 0) &&
-           (res_ninit(ctx->res) == -1))
+       if (__res_maybe_init (ctx->res, 0) == -1)
                return (-1);
 
        return (0);

diff --git a/include/resolv.h b/include/resolv.h
index 0437753..d62a8ff 100644 (file)
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -31,6 +31,7 @@ extern struct __res_state _res;
 
 /* Now define the internal interfaces.  */
 extern int __res_vinit (res_state, int);
+extern int __res_maybe_init (res_state, int);
 extern void _sethtent (int);
 extern void _endhtent (void);
 extern struct hostent *_gethtent (void);
@@ -46,6 +47,7 @@ extern void res_send_setrhook (res_send_rhook __hook);
 extern int res_ourserver_p (const res_state __statp,
                            const struct sockaddr_in6 *__inp);
 libc_hidden_proto (__res_ninit)
+libc_hidden_proto (__res_maybe_init)
 libc_hidden_proto (__res_nclose)
 libc_hidden_proto (__res_randomid)
 libc_hidden_proto (__res_state)

diff --git a/nss/digits_dots.c b/nss/digits_dots.c
index 1720794..9576dd5 100644 (file)
--- a/nss/digits_dots.c
+++ b/nss/digits_dots.c
@@ -43,7 +43,7 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
 
   /* We have to test for the use of IPv6 which can only be done by
      examining `_res'.  */
-  if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+  if (__res_maybe_init (&_res, 0) == -1)
     {
       if (h_errnop)
        *h_errnop = NETDB_INTERNAL;

diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 6338aa5..9e425ce 100644 (file)
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -182,7 +182,7 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
 #ifdef NEED__RES
          /* The resolver code will really be used so we have to
             initialize it.  */
-         if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+         if (__res_maybe_init (&_res, 0) == -1)
            {
              *h_errnop = NETDB_INTERNAL;
              *result = NULL;

diff --git a/nss/getnssent_r.c b/nss/getnssent_r.c
index 7545b80..a0cfa72 100644 (file)
--- a/nss/getnssent_r.c
+++ b/nss/getnssent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000,02 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -60,8 +60,7 @@ __nss_setent (const char *func_name, db_lookup_function lookup_fct,
   } fct;
   int no_more;
 
-  if (res && (_res.options & RES_INIT) == 0
-      && __res_ninit (&_res) == -1)
+  if (res && __res_maybe_init (&_res, 0) == -1)
     {
       __set_h_errno (NETDB_INTERNAL);
       return;
@@ -104,8 +103,7 @@ __nss_endent (const char *func_name, db_lookup_function lookup_fct,
   } fct;
   int no_more;
 
-  if (res && (_res.options & RES_INIT) == 0
-      && __res_ninit (&_res) == -1)
+  if (res && __res_maybe_init (&_res, 0) == -1)
     {
       __set_h_errno (NETDB_INTERNAL);
       return;
@@ -145,8 +143,7 @@ __nss_getent_r (const char *getent_func_name,
   int no_more;
   enum nss_status status;
 
-  if (res && (_res.options & RES_INIT) == 0
-      && __res_ninit (&_res) == -1)
+  if (res && __res_maybe_init (&_res, 0) == -1)
     {
       *h_errnop = NETDB_INTERNAL;
       *result = NULL;

diff --git a/po/pl.po b/po/pl.po
index c35c60c..84914a1 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,13 +1,13 @@
 # Polish translation for GNU libc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
 # Pawe³ Krawczyk <kravietz@ceti.pl>, 1996,97,98,99.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2002,2003.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2002, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.3.2\n"
-"POT-Creation-Date: 2003-02-22 15:34-0800\n"
-"PO-Revision-Date: 2003-03-06 00:54+0100\n"
+"Project-Id-Version: libc 2.3.3\n"
+"POT-Creation-Date: 2004-08-05 09:16+0200\n"
+"PO-Revision-Date: 2004-08-06 00:01+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -179,12 +179,12 @@ msgstr "nie mo
 msgid "cannot read header from `%s'"
 msgstr "nie mo¿na przeczytaæ nag³ówka z `%s'"
 
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:293 catgets/gencat.c:288
+#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:295 catgets/gencat.c:288
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "nie mo¿na otworzyæ pliku wej¶ciowego `%s'"
 
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:311
+#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:313
 #, c-format
 msgid "error while closing input `%s'"
 msgstr "b³±d podczas zamykania wej¶cia `%s'"
@@ -194,16 +194,16 @@ msgstr "b
 msgid "illegal input sequence at position %Zd"
 msgstr "b³êdna sekwencja wej¶ciowa na pozycji %Zd"
 
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:503
+#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:506
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "niekompletny znak lub sekwencja steruj±ca na koñcu bufora"
 
-#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:546
-#: iconv/iconv_prog.c:582
+#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:549
+#: iconv/iconv_prog.c:585
 msgid "error while reading the input"
 msgstr "b³±d podczas czytania danych wej¶ciowych"
 
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:564
+#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:567
 msgid "unable to allocate buffer for input"
 msgstr "przydzielenie bufora dla danych wej¶ciowych by³o niemo¿liwe"
 
@@ -255,47 +255,47 @@ msgstr "Konwersja podanych plik
 msgid "[FILE...]"
 msgstr "[PLIK...]"
 
-#: iconv/iconv_prog.c:199
+#: iconv/iconv_prog.c:201
 msgid "cannot open output file"
 msgstr "nie mo¿na otworzyæ pliku wyj¶ciowego"
 
-#: iconv/iconv_prog.c:241
+#: iconv/iconv_prog.c:243
 #, c-format
 msgid "conversion from `%s' and to `%s' are not supported"
 msgstr "konwersja z `%s' oraz do `%s' nie jest obs³ugiwana"
 
-#: iconv/iconv_prog.c:246
+#: iconv/iconv_prog.c:248
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr "konwersja z `%s' nie jest obs³ugiwana"
 
-#: iconv/iconv_prog.c:253
+#: iconv/iconv_prog.c:255
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr "konwersja do `%s' nie jest obs³ugiwana"
 
-#: iconv/iconv_prog.c:257
+#: iconv/iconv_prog.c:259
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr "konwersja z `%s' do `%s' nie jest obs³ugiwana"
 
-#: iconv/iconv_prog.c:263
+#: iconv/iconv_prog.c:265
 msgid "failed to start conversion processing"
 msgstr "nie uda³o siê rozpocz±æ konwersji"
 
-#: iconv/iconv_prog.c:358
+#: iconv/iconv_prog.c:360
 msgid "error while closing output file"
 msgstr "b³±d podczas zamykania pliku wyj¶ciowego"
 
-#: iconv/iconv_prog.c:407 iconv/iconvconfig.c:357 locale/programs/locale.c:274
+#: iconv/iconv_prog.c:409 iconv/iconvconfig.c:357 locale/programs/locale.c:279
 #: locale/programs/localedef.c:372 catgets/gencat.c:233
 #: malloc/memusagestat.c:602 debug/pcprofiledump.c:199
 msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
 msgstr "Prosimy zg³aszaæ b³êdy za pomoc± skryptu `glibcbug' na adres <bugs@gnu.org>.\n"
 
-#: iconv/iconv_prog.c:421 iconv/iconvconfig.c:371 locale/programs/locale.c:287
-#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:910
-#: nss/getent.c:74 nscd/nscd.c:330 nscd/nscd_nischeck.c:90 elf/ldconfig.c:271
+#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:371 locale/programs/locale.c:292
+#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:913
+#: nss/getent.c:74 nscd/nscd.c:355 nscd/nscd_nischeck.c:90 elf/ldconfig.c:274
 #: elf/sprof.c:349
 #, c-format
 msgid ""
@@ -309,33 +309,33 @@ msgstr ""
 "SPRZEDA¯Y lub PRZYDATNO¦CI DO KONKRETNYCH ZASTOSOWAÑ.\n"
 
 # w %s wchodzi nazwisko autora danego programu/procedury -PK
-#: iconv/iconv_prog.c:426 iconv/iconvconfig.c:376 locale/programs/locale.c:292
-#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:915
-#: nss/getent.c:79 nscd/nscd.c:335 nscd/nscd_nischeck.c:95 elf/ldconfig.c:276
+#: iconv/iconv_prog.c:428 iconv/iconvconfig.c:376 locale/programs/locale.c:297
+#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:918
+#: nss/getent.c:79 nscd/nscd.c:360 nscd/nscd_nischeck.c:95 elf/ldconfig.c:279
 #: elf/sprof.c:355
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autorem jest %s.\n"
 
-#: iconv/iconv_prog.c:456 iconv/iconv_prog.c:482
+#: iconv/iconv_prog.c:458 iconv/iconv_prog.c:484
 msgid "conversion stopped due to problem in writing the output"
 msgstr "konwersja przerwana z powodu problemu z zapisaniem wyników"
 
-#: iconv/iconv_prog.c:499
+#: iconv/iconv_prog.c:502
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "b³êdna sekwencja wej¶ciowa na pozycji %ld"
 
-#: iconv/iconv_prog.c:507
+#: iconv/iconv_prog.c:510
 msgid "internal error (illegal descriptor)"
 msgstr "b³±d wewnêtrzny (nieprawid³owy deskryptor)"
 
-#: iconv/iconv_prog.c:510
+#: iconv/iconv_prog.c:513
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "nieznany b³±d iconv() %d"
 
-#: iconv/iconv_prog.c:753
+#: iconv/iconv_prog.c:756
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -380,164 +380,164 @@ msgstr "nie mo
 msgid "cannot read character map directory `%s'"
 msgstr "nie mo¿na odczytaæ katalogu mapy znaków `%s'"
 
-#: locale/programs/charmap.c:135
+#: locale/programs/charmap.c:136
 #, c-format
 msgid "character map file `%s' not found"
 msgstr "nie znaleziono pliku tablicy znaków `%s'"
 
-#: locale/programs/charmap.c:193
+#: locale/programs/charmap.c:194
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "nie znaleziono domy¶lnej tablicy znaków `%s'"
 
-#: locale/programs/charmap.c:255
+#: locale/programs/charmap.c:257
 #, c-format
 msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr "tablica znaków `%s' niekompatybilna z ASCII, lokalizacja niekompatybilna z ISO C\n"
 
-#: locale/programs/charmap.c:332
+#: locale/programs/charmap.c:336
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> musi byæ wiêkszy ni¿ <mb_cur_min>\n"
 
-#: locale/programs/charmap.c:352 locale/programs/charmap.c:369
+#: locale/programs/charmap.c:356 locale/programs/charmap.c:373
 #: locale/programs/repertoire.c:175
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "b³±d sk³adni w prologu: %s"
 
-#: locale/programs/charmap.c:353
+#: locale/programs/charmap.c:357
 msgid "invalid definition"
 msgstr "niepoprawna definicja"
 
-#: locale/programs/charmap.c:370 locale/programs/locfile.c:126
+#: locale/programs/charmap.c:374 locale/programs/locfile.c:126
 #: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
 msgid "bad argument"
 msgstr "b³êdny argument"
 
-#: locale/programs/charmap.c:398
+#: locale/programs/charmap.c:402
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "powtórzona definicja <%s>"
 
-#: locale/programs/charmap.c:405
+#: locale/programs/charmap.c:409
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "warto¶æ <%s> musi wynosiæ 1 lub wiêcej"
 
-#: locale/programs/charmap.c:417
+#: locale/programs/charmap.c:421
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "warto¶æ <%s> musi byæ wiêksza lub równa warto¶ci <%s>"
 
-#: locale/programs/charmap.c:440 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:444 locale/programs/repertoire.c:184
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "argument <%s> musi byæ pojedynczym znakiem"
 
-#: locale/programs/charmap.c:466
+#: locale/programs/charmap.c:470
 msgid "character sets with locking states are not supported"
 msgstr "zestawy znaków ze stanami blokowania nie s± obs³ugiwane"
 
-#: locale/programs/charmap.c:493 locale/programs/charmap.c:547
-#: locale/programs/charmap.c:579 locale/programs/charmap.c:673
-#: locale/programs/charmap.c:728 locale/programs/charmap.c:769
-#: locale/programs/charmap.c:810
+#: locale/programs/charmap.c:497 locale/programs/charmap.c:551
+#: locale/programs/charmap.c:583 locale/programs/charmap.c:677
+#: locale/programs/charmap.c:732 locale/programs/charmap.c:773
+#: locale/programs/charmap.c:814
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "b³±d sk³adni w definicji %s: %s"
 
-#: locale/programs/charmap.c:494 locale/programs/charmap.c:674
-#: locale/programs/charmap.c:770 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:498 locale/programs/charmap.c:678
+#: locale/programs/charmap.c:774 locale/programs/repertoire.c:231
 msgid "no symbolic name given"
 msgstr "brak nazwy symbolicznej"
 
-#: locale/programs/charmap.c:548
+#: locale/programs/charmap.c:552
 msgid "invalid encoding given"
 msgstr "niepoprawne kodowanie"
 
-#: locale/programs/charmap.c:557
+#: locale/programs/charmap.c:561
 msgid "too few bytes in character encoding"
 msgstr "za ma³o bajtów w kodzie znaku"
 
-#: locale/programs/charmap.c:559
+#: locale/programs/charmap.c:563
 msgid "too many bytes in character encoding"
 msgstr "za du¿o bajtów w kodzie znaku"
 
-#: locale/programs/charmap.c:581 locale/programs/charmap.c:729
-#: locale/programs/charmap.c:812 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:585 locale/programs/charmap.c:733
+#: locale/programs/charmap.c:816 locale/programs/repertoire.c:297
 msgid "no symbolic name given for end of range"
 msgstr "brak nazwy symbolicznej dla koñca przedzia³u"
 
-#: locale/programs/charmap.c:605 locale/programs/locfile.h:96
+#: locale/programs/charmap.c:609 locale/programs/locfile.c:818
 #: locale/programs/repertoire.c:314
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "definicja `%1$s' musi koñczyæ siê wyra¿eniem `END %1$s'"
 
-#: locale/programs/charmap.c:638
+#: locale/programs/charmap.c:642
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "po definicji CHARMAP mog± wystêpowaæ tylko definicje WIDTH"
 
-#: locale/programs/charmap.c:646 locale/programs/charmap.c:709
+#: locale/programs/charmap.c:650 locale/programs/charmap.c:713
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "warto¶æ %s musi byæ liczb± ca³kowit±"
 
 # state machine = finite state machine =
 # automat skoñczony -PK
-#: locale/programs/charmap.c:837
+#: locale/programs/charmap.c:841
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: b³±d w automacie skoñczonym"
 
-#: locale/programs/charmap.c:845 locale/programs/ld-address.c:605
-#: locale/programs/ld-collate.c:2635 locale/programs/ld-collate.c:3793
-#: locale/programs/ld-ctype.c:2216 locale/programs/ld-ctype.c:2977
+#: locale/programs/charmap.c:849 locale/programs/ld-address.c:605
+#: locale/programs/ld-collate.c:2650 locale/programs/ld-collate.c:3818
+#: locale/programs/ld-ctype.c:2225 locale/programs/ld-ctype.c:2994
 #: locale/programs/ld-identification.c:469
 #: locale/programs/ld-measurement.c:255 locale/programs/ld-messages.c:349
-#: locale/programs/ld-monetary.c:952 locale/programs/ld-name.c:324
+#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:324
 #: locale/programs/ld-numeric.c:392 locale/programs/ld-paper.c:258
-#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1217
-#: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
+#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1219
+#: locale/programs/locfile.c:825 locale/programs/repertoire.c:325
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: przedwczesny koniec pliku"
 
-#: locale/programs/charmap.c:864 locale/programs/charmap.c:875
+#: locale/programs/charmap.c:868 locale/programs/charmap.c:879
 #, c-format
 msgid "unknown character `%s'"
 msgstr "nieznany znak `%s'"
 
-#: locale/programs/charmap.c:883
+#: locale/programs/charmap.c:887
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "liczba bajtów dla sekwencji bajtów pocz±tku i koñca przedzia³u jest ró¿na: %d i %d"
 
-#: locale/programs/charmap.c:987 locale/programs/ld-collate.c:2915
+#: locale/programs/charmap.c:991 locale/programs/ld-collate.c:2930
 #: locale/programs/repertoire.c:420
 msgid "invalid names for character range"
 msgstr "nieprawid³owe nazwy dla przedzia³u znaków"
 
-#: locale/programs/charmap.c:999 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1003 locale/programs/repertoire.c:432
 msgid "hexadecimal range format should use only capital characters"
 msgstr "w szesnastkowym formacie przedzia³u powinny byæ u¿ywane wielkie litery"
 
-#: locale/programs/charmap.c:1017
+#: locale/programs/charmap.c:1021
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
 msgstr "<%s> i <%s> nie s± poprawnymi nazwami dla przedzia³u"
 
-#: locale/programs/charmap.c:1023
+#: locale/programs/charmap.c:1027
 msgid "upper limit in range is not higher then lower limit"
 msgstr "górna granica przedzia³u nie jest wiêksza ni¿ dolna"
 
-#: locale/programs/charmap.c:1081
+#: locale/programs/charmap.c:1085
 msgid "resulting bytes for range not representable."
 msgstr "wynikowe bajty dla przedzia³u nie mog± zostaæ wyra¿one."
 
-#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1519
-#: locale/programs/ld-ctype.c:416 locale/programs/ld-identification.c:134
+#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1534
+#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:134
 #: locale/programs/ld-measurement.c:95 locale/programs/ld-messages.c:98
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:95
 #: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:92
@@ -551,8 +551,8 @@ msgstr "Nie znaleziono definicji dla kategorii %s"
 #: locale/programs/ld-address.c:290 locale/programs/ld-address.c:309
 #: locale/programs/ld-address.c:322 locale/programs/ld-identification.c:147
 #: locale/programs/ld-measurement.c:106 locale/programs/ld-monetary.c:206
-#: locale/programs/ld-monetary.c:244 locale/programs/ld-monetary.c:260
-#: locale/programs/ld-monetary.c:272 locale/programs/ld-name.c:106
+#: locale/programs/ld-monetary.c:250 locale/programs/ld-monetary.c:266
+#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:106
 #: locale/programs/ld-name.c:143 locale/programs/ld-numeric.c:113
 #: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:103
 #: locale/programs/ld-paper.c:112 locale/programs/ld-telephone.c:106
@@ -596,515 +596,515 @@ msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: liczbowy kod kraju `%d' jest niepoprawny"
 
 #: locale/programs/ld-address.c:497 locale/programs/ld-address.c:534
-#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2592
+#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2601
 #: locale/programs/ld-identification.c:365
 #: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:302
-#: locale/programs/ld-monetary.c:694 locale/programs/ld-monetary.c:729
-#: locale/programs/ld-monetary.c:770 locale/programs/ld-name.c:281
+#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735
+#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:281
 #: locale/programs/ld-numeric.c:264 locale/programs/ld-paper.c:225
-#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1106
-#: locale/programs/ld-time.c:1148
+#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1108
+#: locale/programs/ld-time.c:1150
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s: pole `%s' zadeklarowane wiêcej ni¿ raz"
 
 #: locale/programs/ld-address.c:501 locale/programs/ld-address.c:539
 #: locale/programs/ld-identification.c:369 locale/programs/ld-messages.c:312
-#: locale/programs/ld-monetary.c:698 locale/programs/ld-monetary.c:733
+#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739
 #: locale/programs/ld-name.c:285 locale/programs/ld-numeric.c:268
-#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1000
-#: locale/programs/ld-time.c:1069 locale/programs/ld-time.c:1111
+#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1002
+#: locale/programs/ld-time.c:1071 locale/programs/ld-time.c:1113
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: nieznany znak w polu `%s'"
 
-#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3775
-#: locale/programs/ld-ctype.c:2957 locale/programs/ld-identification.c:450
+#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3800
+#: locale/programs/ld-ctype.c:2974 locale/programs/ld-identification.c:450
 #: locale/programs/ld-measurement.c:236 locale/programs/ld-messages.c:331
-#: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:306
+#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:306
 #: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:240
-#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1199
+#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1201
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: niekompletna linia `END'"
 
-#: locale/programs/ld-address.c:589 locale/programs/ld-collate.c:2638
-#: locale/programs/ld-collate.c:3777 locale/programs/ld-ctype.c:2219
-#: locale/programs/ld-ctype.c:2960 locale/programs/ld-identification.c:453
+#: locale/programs/ld-address.c:589 locale/programs/ld-collate.c:2653
+#: locale/programs/ld-collate.c:3802 locale/programs/ld-ctype.c:2228
+#: locale/programs/ld-ctype.c:2977 locale/programs/ld-identification.c:453
 #: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
-#: locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:308
+#: locale/programs/ld-monetary.c:942 locale/programs/ld-name.c:308
 #: locale/programs/ld-numeric.c:376 locale/programs/ld-paper.c:242
-#: locale/programs/ld-telephone.c:314 locale/programs/ld-time.c:1201
+#: locale/programs/ld-telephone.c:314 locale/programs/ld-time.c:1203
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: definicja nie koñczy siê przez `END %1$s'"
 
-#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:520
-#: locale/programs/ld-collate.c:572 locale/programs/ld-collate.c:869
-#: locale/programs/ld-collate.c:882 locale/programs/ld-collate.c:2625
-#: locale/programs/ld-collate.c:3784 locale/programs/ld-ctype.c:1947
-#: locale/programs/ld-ctype.c:2206 locale/programs/ld-ctype.c:2782
-#: locale/programs/ld-ctype.c:2968 locale/programs/ld-identification.c:460
+#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:523
+#: locale/programs/ld-collate.c:575 locale/programs/ld-collate.c:871
+#: locale/programs/ld-collate.c:884 locale/programs/ld-collate.c:2640
+#: locale/programs/ld-collate.c:3809 locale/programs/ld-ctype.c:1956
+#: locale/programs/ld-ctype.c:2215 locale/programs/ld-ctype.c:2799
+#: locale/programs/ld-ctype.c:2985 locale/programs/ld-identification.c:460
 #: locale/programs/ld-measurement.c:246 locale/programs/ld-messages.c:340
-#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:315
+#: locale/programs/ld-monetary.c:949 locale/programs/ld-name.c:315
 #: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:249
-#: locale/programs/ld-telephone.c:321 locale/programs/ld-time.c:1208
+#: locale/programs/ld-telephone.c:321 locale/programs/ld-time.c:1210
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: b³±d sk³adni"
 
-#: locale/programs/ld-collate.c:395
+#: locale/programs/ld-collate.c:398
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' ju¿ zdefiniowany w tablicy znaków"
 
-#: locale/programs/ld-collate.c:404
+#: locale/programs/ld-collate.c:407
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' ju¿ zdefiniowany w repertuarze"
 
-#: locale/programs/ld-collate.c:411
+#: locale/programs/ld-collate.c:414
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' ju¿ zdefiniowany jako symbol scalaj±cy"
 
-#: locale/programs/ld-collate.c:418
+#: locale/programs/ld-collate.c:421
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' ju¿ zdefiniowany jako element scalaj±cy"
 
-#: locale/programs/ld-collate.c:449 locale/programs/ld-collate.c:475
+#: locale/programs/ld-collate.c:452 locale/programs/ld-collate.c:478
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: porz±dki `forward' i `backward' wykluczaj± siê wzajemnie"
 
-#: locale/programs/ld-collate.c:459 locale/programs/ld-collate.c:485
-#: locale/programs/ld-collate.c:501
+#: locale/programs/ld-collate.c:462 locale/programs/ld-collate.c:488
+#: locale/programs/ld-collate.c:504
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' wyst±pi³o wiêcej ni¿ raz w definicji wagi %d"
 
-#: locale/programs/ld-collate.c:557
+#: locale/programs/ld-collate.c:560
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: zbyt du¿o regu³; pierwszy wpis mia³ tylko %d"
 
-#: locale/programs/ld-collate.c:593
+#: locale/programs/ld-collate.c:596
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: za ma³o regu³ sortowania"
 
-#: locale/programs/ld-collate.c:759
+#: locale/programs/ld-collate.c:761
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: pusty ³añcuch wagi jest niedozwolony"
 
 # ellipsis = wyrzutnia jezykowa - sprawdzilem. nawet pamietam ze cos takiego
 # istnieje ze szkoly, ale za cholere nie pamietam co to jest ;) -PK
-#: locale/programs/ld-collate.c:854
+#: locale/programs/ld-collate.c:856
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: wagi musz± u¿ywaæ jako nazwy tego samego symbolu wyrzutni"
 
-#: locale/programs/ld-collate.c:910
+#: locale/programs/ld-collate.c:912
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: zbyt du¿o warto¶ci"
 
-#: locale/programs/ld-collate.c:1023 locale/programs/ld-collate.c:1194
+#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "porz±dek dla `%.*s' zosta³ ju¿ zdefiniowany w %s:%Zu"
 
-#: locale/programs/ld-collate.c:1073
+#: locale/programs/ld-collate.c:1081
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: pocz±tkowy i koñcowy symbol przedzia³u musz± byæ znakami"
 
-#: locale/programs/ld-collate.c:1100
+#: locale/programs/ld-collate.c:1108
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: sekwencje bajtów pierwszego i ostatniego znaku musz± mieæ tê sam± d³ugo¶æ"
 
-#: locale/programs/ld-collate.c:1142
+#: locale/programs/ld-collate.c:1150
 #, c-format
 msgid "%s: byte sequence of first character of sequence is not lower than that of the last character"
 msgstr "%s: sekwencja bajtów pierwszego znaku sekwencji nie jest mniejsza ni¿ ostatniego znaku"
 
-#: locale/programs/ld-collate.c:1263
+#: locale/programs/ld-collate.c:1275
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: wyrzutnia symbolicznego przedzia³u nie mo¿e byæ bezpo¶rednio po `order_start'"
 
-#: locale/programs/ld-collate.c:1267
+#: locale/programs/ld-collate.c:1279
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: wyrzutnia symbolicznego przedzia³u nie mo¿e byæ bezpo¶rednio przed `order_end'"
 
-#: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
+#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
 msgid "`%s' and `%.*s' are no valid names for symbolic range"
 msgstr "`%s' i `%.*s' nie s± poprawnymi nazwami dla symbolicznego przedzia³u"
 
-#: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
+#: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: porz±dek dla `%.*s' zosta³ ju¿ zdefiniowany w %s:%Zu"
 
-#: locale/programs/ld-collate.c:1342
+#: locale/programs/ld-collate.c:1357
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' musi byæ znakiem"
 
-#: locale/programs/ld-collate.c:1535
+#: locale/programs/ld-collate.c:1550
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position' musi byæ u¿yte dla konkretnego poziomu we wszystkich sekcjach lub ¿adnej"
 
-#: locale/programs/ld-collate.c:1560
+#: locale/programs/ld-collate.c:1575
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "nie zdefiniowany symbol `%s'"
 
-#: locale/programs/ld-collate.c:1636 locale/programs/ld-collate.c:1742
+#: locale/programs/ld-collate.c:1651 locale/programs/ld-collate.c:1757
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "symbol `%s' ma to samo kodowanie co"
 
-#: locale/programs/ld-collate.c:1640 locale/programs/ld-collate.c:1746
+#: locale/programs/ld-collate.c:1655 locale/programs/ld-collate.c:1761
 #, c-format
 msgid "symbol `%s'"
 msgstr "symbol `%s'"
 
-#: locale/programs/ld-collate.c:1788
+#: locale/programs/ld-collate.c:1803
 msgid "no definition of `UNDEFINED'"
 msgstr "brak definicji `UNDEFINED'"
 
-#: locale/programs/ld-collate.c:1817
+#: locale/programs/ld-collate.c:1832
 msgid "too many errors; giving up"
 msgstr "zbyt du¿o b³êdów; poddajê siê"
 
-#: locale/programs/ld-collate.c:2720
+#: locale/programs/ld-collate.c:2735
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: powtórzona definicja `%s'"
 
-#: locale/programs/ld-collate.c:2756
+#: locale/programs/ld-collate.c:2771
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: powtórzona deklaracja sekcji `%s'"
 
-#: locale/programs/ld-collate.c:2895
+#: locale/programs/ld-collate.c:2910
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: nieznany znak w nazwie symbolu scalaj±cego"
 
-#: locale/programs/ld-collate.c:3027
+#: locale/programs/ld-collate.c:3042
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: nieznany znak w nazwie definicji równowa¿no¶ci"
 
-#: locale/programs/ld-collate.c:3040
+#: locale/programs/ld-collate.c:3055
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: nieznany znak w warto¶ci definicji równowa¿no¶ci"
 
-#: locale/programs/ld-collate.c:3050
+#: locale/programs/ld-collate.c:3065
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: nieznany symbol `%s' w definicji równowa¿no¶ci"
 
-#: locale/programs/ld-collate.c:3059
+#: locale/programs/ld-collate.c:3074
 msgid "error while adding equivalent collating symbol"
 msgstr "b³±d podczas dodawania równowa¿nego symbolu scalaj±cego"
 
-#: locale/programs/ld-collate.c:3089
+#: locale/programs/ld-collate.c:3104
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "powtórzona definicja skryptu `%s'"
 
-#: locale/programs/ld-collate.c:3137
+#: locale/programs/ld-collate.c:3152
 #, c-format
 msgid "%s: unknown section name `%s'"
 msgstr "%s: nieznana nazwa sekcji `%s'"
 
-#: locale/programs/ld-collate.c:3165
+#: locale/programs/ld-collate.c:3180
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: wielokrotna definicja porz±dku dla sekcji `%s'"
 
-#: locale/programs/ld-collate.c:3190
+#: locale/programs/ld-collate.c:3205
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: b³êdna liczba regu³ sortowania"
 
-#: locale/programs/ld-collate.c:3217
+#: locale/programs/ld-collate.c:3232
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: wielokrotna definicja porz±dku dla nie nazwanej sekcji"
 
-#: locale/programs/ld-collate.c:3271 locale/programs/ld-collate.c:3394
-#: locale/programs/ld-collate.c:3753
+#: locale/programs/ld-collate.c:3286 locale/programs/ld-collate.c:3414
+#: locale/programs/ld-collate.c:3778
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: brak s³owa kluczowego `order_end'"
 
-#: locale/programs/ld-collate.c:3329
+#: locale/programs/ld-collate.c:3347
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: porz±dek dla symbolu scalaj±cego %.*s jeszcze nie zdefiniowany"
 
-#: locale/programs/ld-collate.c:3345
+#: locale/programs/ld-collate.c:3365
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: porz±dek dla elementu scalaj±cego %.*s jeszcze nie zdefiniowany"
 
-#: locale/programs/ld-collate.c:3356
+#: locale/programs/ld-collate.c:3376
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: nie mo¿na zmieniæ porz±dku po %.*s: nieznany symbol"
 
-#: locale/programs/ld-collate.c:3408 locale/programs/ld-collate.c:3765
+#: locale/programs/ld-collate.c:3428 locale/programs/ld-collate.c:3790
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: brak s³owa kluczowego `reorder-end'"
 
-#: locale/programs/ld-collate.c:3442 locale/programs/ld-collate.c:3637
+#: locale/programs/ld-collate.c:3462 locale/programs/ld-collate.c:3662
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: nieznana sekcja `%.*s'"
 
-#: locale/programs/ld-collate.c:3507
+#: locale/programs/ld-collate.c:3527
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: b³êdny symbol <%.*s>"
 
-#: locale/programs/ld-collate.c:3700
+#: locale/programs/ld-collate.c:3725
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: nie mo¿na u¿yæ `%s' jako koñca przedzia³u wyrzutni"
 
-#: locale/programs/ld-collate.c:3749
+#: locale/programs/ld-collate.c:3774
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: pusty opis kategorii niedozwolony"
 
-#: locale/programs/ld-collate.c:3768
+#: locale/programs/ld-collate.c:3793
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: brak s³owa kluczowego `reorder-sections-end'"
 
-#: locale/programs/ld-ctype.c:435
+#: locale/programs/ld-ctype.c:440
 msgid "No character set name specified in charmap"
 msgstr "Brak nazwy zestawu znaków w tablicy znaków"
 
-#: locale/programs/ld-ctype.c:464
+#: locale/programs/ld-ctype.c:469
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "znak L'\\u%0*x' z klasy `%s' musi byæ w klasie `%s'"
 
-#: locale/programs/ld-ctype.c:479
+#: locale/programs/ld-ctype.c:484
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "znak L'\\u%0*x' z klasy `%s' nie mo¿e byæ w klasie `%s'"
 
-#: locale/programs/ld-ctype.c:493 locale/programs/ld-ctype.c:551
+#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "b³±d wewnêtrzny w %s, linia %u"
 
-#: locale/programs/ld-ctype.c:522
+#: locale/programs/ld-ctype.c:527
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "znak '%s' z klasy `%s' musi byæ w klasie `%s'"
 
-#: locale/programs/ld-ctype.c:538
+#: locale/programs/ld-ctype.c:543
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "znak '%s' z klasy `%s' nie mo¿e byæ w klasie `%s'"
 
-#: locale/programs/ld-ctype.c:568 locale/programs/ld-ctype.c:606
+#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "znak <SP> nie jest w klasie `%s'"
 
-#: locale/programs/ld-ctype.c:580 locale/programs/ld-ctype.c:617
+#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "znak <SP> nie mo¿e byæ w klasie `%s'"
 
-#: locale/programs/ld-ctype.c:595
+#: locale/programs/ld-ctype.c:600
 msgid "character <SP> not defined in character map"
 msgstr "znak <SP> nie zdefiniowany w tablicy znaków"
 
-#: locale/programs/ld-ctype.c:709
+#: locale/programs/ld-ctype.c:714
 msgid "`digit' category has not entries in groups of ten"
 msgstr "kategoria `digit' nie ma wpisów w grupach po dziesiêæ"
 
-#: locale/programs/ld-ctype.c:758
+#: locale/programs/ld-ctype.c:763
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr "brak cyfr wej¶ciowych ani ¿adnej ze standardowych nazw w tablicy znaków"
 
-#: locale/programs/ld-ctype.c:823
+#: locale/programs/ld-ctype.c:828
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "nie wszystkie znaki u¿yte w `outdigit' s± dostêpne w tablicy znaków"
 
-#: locale/programs/ld-ctype.c:840
+#: locale/programs/ld-ctype.c:845
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "nie wszystkie znaki u¿yte w `outdigit' s± dostêpne w repertuarze"
 
-#: locale/programs/ld-ctype.c:1235
+#: locale/programs/ld-ctype.c:1244
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "klasa znaków `%s' jest ju¿ zdefiniowana"
 
-#: locale/programs/ld-ctype.c:1241
+#: locale/programs/ld-ctype.c:1250
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "ograniczenie implementacji: dozwolone maksymalnie %Zd klas znaków"
 
-#: locale/programs/ld-ctype.c:1267
+#: locale/programs/ld-ctype.c:1276
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "tablica znaków `%s' jest ju¿ zdefiniowana"
 
-#: locale/programs/ld-ctype.c:1273
+#: locale/programs/ld-ctype.c:1282
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "ograniczenie implementacji: dozwolone maksymalnie %d tablic znaków"
 
-#: locale/programs/ld-ctype.c:1538 locale/programs/ld-ctype.c:1663
-#: locale/programs/ld-ctype.c:1769 locale/programs/ld-ctype.c:2455
-#: locale/programs/ld-ctype.c:3443
+#: locale/programs/ld-ctype.c:1547 locale/programs/ld-ctype.c:1672
+#: locale/programs/ld-ctype.c:1778 locale/programs/ld-ctype.c:2464
+#: locale/programs/ld-ctype.c:3460
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: pole `%s' nie zawiera dok³adnie dziesiêciu elementów"
 
-#: locale/programs/ld-ctype.c:1566 locale/programs/ld-ctype.c:2137
+#: locale/programs/ld-ctype.c:1575 locale/programs/ld-ctype.c:2146
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "warto¶æ-do <U%0*X> przedzia³u jest mniejsza ni¿ warto¶æ-od <U%0*X>"
 
-#: locale/programs/ld-ctype.c:1693
+#: locale/programs/ld-ctype.c:1702
 msgid "start and end character sequence of range must have the same length"
 msgstr "pocz±tkowa i koñcowa sekwencja znaków przedzia³u musz± mieæ tê sam± d³ugo¶æ"
 
-#: locale/programs/ld-ctype.c:1700
+#: locale/programs/ld-ctype.c:1709
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "sekwencja znaków warto¶æ-do jest mniejsza ni¿ sekwencja warto¶æ-od"
 
-#: locale/programs/ld-ctype.c:2057 locale/programs/ld-ctype.c:2108
+#: locale/programs/ld-ctype.c:2066 locale/programs/ld-ctype.c:2117
 msgid "premature end of `translit_ignore' definition"
 msgstr "przedwczesny koniec definicji `translit_ignore'"
 
-#: locale/programs/ld-ctype.c:2063 locale/programs/ld-ctype.c:2114
-#: locale/programs/ld-ctype.c:2156
+#: locale/programs/ld-ctype.c:2072 locale/programs/ld-ctype.c:2123
+#: locale/programs/ld-ctype.c:2165
 msgid "syntax error"
 msgstr "b³±d sk³adni"
 
-#: locale/programs/ld-ctype.c:2287
+#: locale/programs/ld-ctype.c:2296
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s: b³±d sk³adni w definicji nowej klasy znaków"
 
-#: locale/programs/ld-ctype.c:2302
+#: locale/programs/ld-ctype.c:2311
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s: b³±d sk³adni w definicji nowej tablicy znaków"
 
-#: locale/programs/ld-ctype.c:2477
+#: locale/programs/ld-ctype.c:2486
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "przedzia³ wyrzutni musi byæ oznaczony dwoma argumentami tego samego typu"
 
-#: locale/programs/ld-ctype.c:2486
+#: locale/programs/ld-ctype.c:2495
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr "dla warto¶ci przedzia³u bêd±cych nazwami nie mo¿na u¿yæ bezwzglêdnej wyrzutni `...'"
 
-#: locale/programs/ld-ctype.c:2501
+#: locale/programs/ld-ctype.c:2510
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr "dla warto¶ci przedzia³u w kodzie UCS trzeba u¿yæ wyrzutni szesnastkowej `..'"
 
-#: locale/programs/ld-ctype.c:2515
+#: locale/programs/ld-ctype.c:2524
 msgid "with character code range values one must use the absolute ellipsis `...'"
 msgstr "dla warto¶ci przedzia³u z kodami znaków trzeba u¿yæ bezwzglêdnej wyrzutni `...'"
 
-#: locale/programs/ld-ctype.c:2666
+#: locale/programs/ld-ctype.c:2675
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "powtórzona definicja odwzorowania `%s'"
 
-#: locale/programs/ld-ctype.c:2744 locale/programs/ld-ctype.c:2888
+#: locale/programs/ld-ctype.c:2761 locale/programs/ld-ctype.c:2905
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s: sekcja `translit_start' nie koñczy siê przez `translit_end'"
 
-#: locale/programs/ld-ctype.c:2839
+#: locale/programs/ld-ctype.c:2856
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: powtórzona definicja `default_missing'"
 
-#: locale/programs/ld-ctype.c:2844
+#: locale/programs/ld-ctype.c:2861
 msgid "previous definition was here"
 msgstr "tutaj by³a poprzednia definicja"
 
-#: locale/programs/ld-ctype.c:2866
+#: locale/programs/ld-ctype.c:2883
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr "%s: nie znaleziono daj±cej siê wyraziæ definicji `default_missing'"
 
-#: locale/programs/ld-ctype.c:3019
+#: locale/programs/ld-ctype.c:3036
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
 msgstr "%s: znak `%s', wymagany jako domy¶lny, nie zosta³ zdefiniowany w tablicy znaków"
 
-#: locale/programs/ld-ctype.c:3024 locale/programs/ld-ctype.c:3108
-#: locale/programs/ld-ctype.c:3128 locale/programs/ld-ctype.c:3149
-#: locale/programs/ld-ctype.c:3170 locale/programs/ld-ctype.c:3191
-#: locale/programs/ld-ctype.c:3212 locale/programs/ld-ctype.c:3252
-#: locale/programs/ld-ctype.c:3273 locale/programs/ld-ctype.c:3340
+#: locale/programs/ld-ctype.c:3041 locale/programs/ld-ctype.c:3125
+#: locale/programs/ld-ctype.c:3145 locale/programs/ld-ctype.c:3166
+#: locale/programs/ld-ctype.c:3187 locale/programs/ld-ctype.c:3208
+#: locale/programs/ld-ctype.c:3229 locale/programs/ld-ctype.c:3269
+#: locale/programs/ld-ctype.c:3290 locale/programs/ld-ctype.c:3357
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: znak `%s' z tablicy znaków nie mo¿e byæ wyra¿ony w jednym bajcie"
 
-#: locale/programs/ld-ctype.c:3103 locale/programs/ld-ctype.c:3123
-#: locale/programs/ld-ctype.c:3165 locale/programs/ld-ctype.c:3186
-#: locale/programs/ld-ctype.c:3207 locale/programs/ld-ctype.c:3247
-#: locale/programs/ld-ctype.c:3268 locale/programs/ld-ctype.c:3335
-#: locale/programs/ld-ctype.c:3377 locale/programs/ld-ctype.c:3402
+#: locale/programs/ld-ctype.c:3120 locale/programs/ld-ctype.c:3140
+#: locale/programs/ld-ctype.c:3182 locale/programs/ld-ctype.c:3203
+#: locale/programs/ld-ctype.c:3224 locale/programs/ld-ctype.c:3264
+#: locale/programs/ld-ctype.c:3285 locale/programs/ld-ctype.c:3352
+#: locale/programs/ld-ctype.c:3394 locale/programs/ld-ctype.c:3419
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: znak `%s', wymagany jako domy¶lny, nie zosta³ zdefiniowany"
 
-#: locale/programs/ld-ctype.c:3144
+#: locale/programs/ld-ctype.c:3161
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr "znak `%s', wymagany jako domy¶lny, nie zosta³ zdefiniowany"
 
-#: locale/programs/ld-ctype.c:3384 locale/programs/ld-ctype.c:3409
+#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: znak `%s', wymagany jako domy¶lny, nie mo¿e byæ wyra¿ony w jednym bajcie"
 
-#: locale/programs/ld-ctype.c:3464
+#: locale/programs/ld-ctype.c:3481
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "brak definicji cyfr wyj¶ciowych ani ¿adnej standardowej nazwy w tablicy znaków"
 
-#: locale/programs/ld-ctype.c:3755
+#: locale/programs/ld-ctype.c:3772
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: dane do transliteracji z lokalizacji `%s' niedostêpne"
 
-#: locale/programs/ld-ctype.c:3851
+#: locale/programs/ld-ctype.c:3868
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: tablica dla klasy \"%s\": %lu bajtów\n"
 
-#: locale/programs/ld-ctype.c:3920
+#: locale/programs/ld-ctype.c:3937
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s: tablica dla odwzorowania \"%s\": %lu bajtów\n"
 
-#: locale/programs/ld-ctype.c:4053
+#: locale/programs/ld-ctype.c:4070
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s: tablica dla szeroko¶ci: %lu bajtów\n"
@@ -1144,37 +1144,37 @@ msgstr "%s: brak poprawnego wyra
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr "%s: warto¶æ pola `int_curr_symbol' ma z³± d³ugo¶æ"
 
-#: locale/programs/ld-monetary.c:232
+#: locale/programs/ld-monetary.c:237
 #, c-format
 msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
 msgstr "%s: warto¶æ pola `int_curr_symbol' nie jest zgodna z nazwami ISO 4217"
 
-#: locale/programs/ld-monetary.c:250 locale/programs/ld-numeric.c:119
+#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:119
 #, c-format
 msgid "%s: value for field `%s' must not be the empty string"
 msgstr "%s: warto¶æ pola `%s' nie mo¿e byæ ³añcuchem pustym"
 
-#: locale/programs/ld-monetary.c:278 locale/programs/ld-monetary.c:308
+#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
 msgstr "%s: warto¶æ pola `%s' musi mie¶ciæ siê w przedziale %d...%d"
 
-#: locale/programs/ld-monetary.c:740 locale/programs/ld-numeric.c:275
+#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:275
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s: warto¶æ pola `%s' musi byæ pojedynczym znakiem"
 
-#: locale/programs/ld-monetary.c:837 locale/programs/ld-numeric.c:319
+#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:319
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1' musi byæ ostatnim elementem w polu `%s'"
 
-#: locale/programs/ld-monetary.c:859 locale/programs/ld-numeric.c:340
+#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:340
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: warto¶ci pola `%s' musz± byæ mniejsze ni¿ 127"
 
-#: locale/programs/ld-monetary.c:902
+#: locale/programs/ld-monetary.c:908
 msgid "conversion rate value cannot be zero"
 msgstr "warto¶æ stopnia konwersji nie mo¿e byæ zerem"
 
@@ -1259,62 +1259,62 @@ msgstr "%s: warto
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: warto¶ci w polu `%s' nie mog± byæ wiêksze ni¿ %d"
 
-#: locale/programs/ld-time.c:984
+#: locale/programs/ld-time.c:986
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr "%s: zbyt ma³o warto¶ci w polu `%s'"
 
-#: locale/programs/ld-time.c:1029
+#: locale/programs/ld-time.c:1031
 msgid "extra trailing semicolon"
 msgstr "nadmiarowy ¶rednik na koñcu"
 
-#: locale/programs/ld-time.c:1032
+#: locale/programs/ld-time.c:1034
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr "%s: zbyt du¿o warto¶ci w polu `%s'"
 
-#: locale/programs/linereader.c:275
+#: locale/programs/linereader.c:130
+msgid "trailing garbage at end of line"
+msgstr "¶mieci na koñcu linii"
+
+#: locale/programs/linereader.c:304
 msgid "garbage at end of number"
 msgstr "¶mieci na koñcu liczby"
 
-#: locale/programs/linereader.c:387
+#: locale/programs/linereader.c:416
 msgid "garbage at end of character code specification"
 msgstr "¶mieci na koñcu specyfikacji kodu znaku"
 
-#: locale/programs/linereader.c:473
+#: locale/programs/linereader.c:502
 msgid "unterminated symbolic name"
 msgstr "nie zakoñczona nazwa symboliczna"
 
-#: locale/programs/linereader.c:537 catgets/gencat.c:1195
+#: locale/programs/linereader.c:566 catgets/gencat.c:1195
 msgid "invalid escape sequence"
 msgstr "b³êdna sekwencja escape"
 
-#: locale/programs/linereader.c:600
+#: locale/programs/linereader.c:629
 msgid "illegal escape sequence at end of string"
 msgstr "niepoprawna sekwencja escape na koñcu ³añcucha"
 
-#: locale/programs/linereader.c:604 locale/programs/linereader.c:832
+#: locale/programs/linereader.c:633 locale/programs/linereader.c:861
 msgid "unterminated string"
 msgstr "nie zakoñczony ³añcuch"
 
-#: locale/programs/linereader.c:646
+#: locale/programs/linereader.c:675
 msgid "non-symbolic character value should not be used"
 msgstr "nie symboliczna warto¶æ znaku nie powinna byæ u¿yta"
 
-#: locale/programs/linereader.c:793
+#: locale/programs/linereader.c:822
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "brak symbolu `%.*s' w tablicy znaków"
 
-#: locale/programs/linereader.c:814
+#: locale/programs/linereader.c:843
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "brak symbolu `%.*s' w tablicy repertuaru"
 
-#: locale/programs/linereader.h:162
-msgid "trailing garbage at end of line"
-msgstr "¶mieci na koñcu linii"
-
 #: locale/programs/locale.c:75
 msgid "System information:"
 msgstr "Informacja o systemie:"
@@ -1355,7 +1355,23 @@ msgstr ""
 "NAZWA\n"
 "[-a|-m]"
 
-#: locale/programs/locale.c:512
+#: locale/programs/locale.c:195
+msgid "Cannot set LC_CTYPE to default locale"
+msgstr "Nie mo¿na ustawiæ LC_CTYPE na domy¶ln± lokalizacjê"
+
+#: locale/programs/locale.c:197
+msgid "Cannot set LC_MESSAGES to default locale"
+msgstr "Nie mo¿na ustawiæ LC_MESSAGES na domy¶ln± lokalizacjê"
+
+#: locale/programs/locale.c:210
+msgid "Cannot set LC_COLLATE to default locale"
+msgstr "Nie mo¿na ustawiæ LC_COLLATE na domy¶ln± lokalizacjê"
+
+#: locale/programs/locale.c:226
+msgid "Cannot set LC_ALL to default locale"
+msgstr "Nie mo¿na ustawiæ LC_ALL na domy¶ln± lokalizacjê"
+
+#: locale/programs/locale.c:517
 msgid "while preparing output"
 msgstr "podczas przygotowywania wyników"
 
@@ -1623,15 +1639,15 @@ msgstr "niepowodzenie podczas zapisu danych dla kategorii `%s'"
 msgid "cannot create output file `%s' for category `%s'"
 msgstr "nie mo¿na utworzyæ pliku wyj¶ciowego `%s' dla kategorii `%s'"
 
-#: locale/programs/locfile.h:59
+#: locale/programs/locfile.c:781
 msgid "expect string argument for `copy'"
 msgstr "spodziewanym argumentem dla `copy' jest ³añcuch"
 
-#: locale/programs/locfile.h:63
+#: locale/programs/locfile.c:785
 msgid "locale name should consist only of portable characters"
 msgstr "nazwa lokalizacji powinna sk³adaæ siê wy³±cznie ze znaków przeno¶nych"
 
-#: locale/programs/locfile.h:82
+#: locale/programs/locfile.c:804
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "¿adne inne s³owo kluczowe nie powinno wystêpowaæ razem z `copy'"
 
@@ -1664,7 +1680,7 @@ msgid "upper limit in range is not smaller then lower limit"
 msgstr "górna granica przedzia³u nie jest mniejsza ni¿ dolna"
 
 #: locale/programs/xmalloc.c:70 malloc/obstack.c:505 malloc/obstack.c:508
-#: posix/getconf.c:1002
+#: posix/getconf.c:1007
 msgid "memory exhausted"
 msgstr "pamiêæ wyczerpana"
 
@@ -1690,7 +1706,7 @@ msgstr "Pierwszy 
 msgid "Another string for testing."
 msgstr "Inny ³añcuch do testów."
 
-#: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:84
+#: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:88
 msgid "NAME"
 msgstr "NAZWA"
 
@@ -1794,11 +1810,12 @@ msgid "cannot determine escape character"
 msgstr "nie mo¿na okre¶liæ znaku escape"
 
 #: stdlib/../sysdeps/unix/sysv/linux/ia64/makecontext.c:63
+#, c-format
 msgid "makecontext: does not know how to handle more than 8 arguments\n"
 msgstr "makecontext: nie wiadomo jak obs³u¿yæ wiêcej ni¿ 8 argumentów\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:12 posix/regcomp.c:133
-#: nis/nis_error.c:29 nis/ypclnt.c:787 nis/ypclnt.c:861
+#: stdio-common/../sysdeps/gnu/errlist.c:12 posix/regcomp.c:147
+#: nis/nis_error.c:29 nis/ypclnt.c:778 nis/ypclnt.c:852
 msgid "Success"
 msgstr "Sukces"
 
@@ -1896,7 +1913,7 @@ msgstr "Nie mo
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
 #: stdio-common/../sysdeps/gnu/errlist.c:149
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:43
-#: nis/nis_error.c:39 nis/ypclnt.c:817
+#: nis/nis_error.c:39 nis/ypclnt.c:808
 msgid "Permission denied"
 msgstr "Brak dostêpu"
 
@@ -2989,6 +3006,14 @@ msgstr "Wysy
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%sNieznany sygna³ %d\n"
 
+#: dlfcn/dlinfo.c:51
+msgid "RTLD_SELF used in code not dynamically loaded"
+msgstr "RTLD_SELF wyst±pi³o w kodzie nie ³adowanym dynamicznie"
+
+#: dlfcn/dlinfo.c:61
+msgid "unsupported dlinfo request"
+msgstr "nieobs³ugiwane ¿±danie dlinfo"
+
 #: malloc/mcheck.c:346
 msgid "memory is consistent, library is buggy\n"
 msgstr "pamiêæ jest spójna, biblioteka zawiera b³êdy\n"
@@ -3055,347 +3080,364 @@ msgstr "Sygna
 msgid "Unknown signal %d"
 msgstr "Nieznany sygna³ %d"
 
-#: timezone/zdump.c:175
+#: timezone/zdump.c:176
 #, c-format
-msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
-msgstr "%s: sk³adnia: %s [ -v ] [ -c rok ] nazwa_strefy...\n"
+msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
+msgstr "%s: sk³adnia: %s [ --version ] [ -v ] [ -c rok ] nazwa_strefy...\n"
 
-#: timezone/zdump.c:268
+#: timezone/zdump.c:269
 msgid "Error writing standard output"
 msgstr "B³±d podczas pisania na standardowe wyj¶cie"
 
-#: timezone/zic.c:365
+#: timezone/zic.c:361
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: Brak pamiêci: %s\n"
 
-#: timezone/zic.c:390 misc/error.c:127 misc/error.c:155
+#: timezone/zic.c:386 misc/error.c:129 misc/error.c:157
 msgid "Unknown system error"
 msgstr "Nieznany b³±d systemowy"
 
-#: timezone/zic.c:424
+#: timezone/zic.c:420
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", linia %d: %s"
 
-#: timezone/zic.c:427
+#: timezone/zic.c:423
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (regu³a z \"%s\", linia %d)"
 
-#: timezone/zic.c:439
+#: timezone/zic.c:435
 msgid "warning: "
 msgstr "uwaga: "
 
-#: timezone/zic.c:449
+#: timezone/zic.c:445
 #, c-format
 msgid ""
-"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"%s: usage is %s [ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 msgstr ""
-"%s: sk³adnia: %s [ -s ] [ -v ] [ -l czas_lokalny ] [ -p regu³y_POSIX ] \\\n"
-"\t[ -d katalog ] [ -L sek_przestêpne ] [ -y yearistype ] [ plik ...]\n"
+"%s: sk³adnia: %s [ --version ] [ -s ] [ -v ] [ -l czas_lokalny ] \\\n"
+"\t[ -p regu³y_POSIX ] [ -d katalog ] [ -L sek_przestêpne ] \\\n"
+"\t[ -y yearistype ] [ plik ...]\n"
 
-#: timezone/zic.c:491
+#: timezone/zic.c:492
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: Podano wiêcej ni¿ jedn± opcjê -d\n"
 
-#: timezone/zic.c:501
+#: timezone/zic.c:502
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: Podano wiêcej ni¿ jedn± opcjê -l\n"
 
-#: timezone/zic.c:511
+#: timezone/zic.c:512
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: Podano wiêcej ni¿ jedn± opcjê -p\n"
 
-#: timezone/zic.c:521
+#: timezone/zic.c:522
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: Podano wiêcej ni¿ jedn± opcjê -y\n"
 
-#: timezone/zic.c:531
+#: timezone/zic.c:532
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: Podano wiêcej ni¿ jedn± opcjê -L\n"
 
-#: timezone/zic.c:638
+#: timezone/zic.c:639
 #, c-format
 msgid "%s: Can't unlink  %s: %s\n"
 msgstr "%s: Nie mo¿na usun±æ %s: %s\n"
 
-#: timezone/zic.c:645
+#: timezone/zic.c:646
 msgid "hard link failed, symbolic link used"
 msgstr "stworzenie dowi±zania zwyk³ego nie powiod³o siê, u¿yto symbolicznego"
 
-#: timezone/zic.c:653
+#: timezone/zic.c:654
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: Nie mo¿na dowi±zaæ %s do %s: %s\n"
 
-#: timezone/zic.c:751 timezone/zic.c:753
+#: timezone/zic.c:752 timezone/zic.c:754
 msgid "same rule name in multiple files"
 msgstr "ta sama nazwa nazwa regu³y w ró¿nych plikach"
 
-#: timezone/zic.c:794
+#: timezone/zic.c:795
 msgid "unruly zone"
 msgstr "strefa bez regu³"
 
-#: timezone/zic.c:801
+#: timezone/zic.c:802
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s w strefie dla której nie zdefiniowano regu³"
 
-#: timezone/zic.c:822
+#: timezone/zic.c:823
 msgid "standard input"
 msgstr "standardowe wej¶cie"
 
-#: timezone/zic.c:827
+#: timezone/zic.c:828
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: Nie mo¿na otworzyæ %s: %s\n"
 
-#: timezone/zic.c:838
+#: timezone/zic.c:839
 msgid "line too long"
 msgstr "za d³uga linia"
 
-#: timezone/zic.c:858
+#: timezone/zic.c:859
 msgid "input line of unknown type"
 msgstr "nieznany typ linii wej¶ciowej"
 
-#: timezone/zic.c:874
+#: timezone/zic.c:875
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: linia Leap nie znajduje siê w pliku sekund przestêpnych %s\n"
 
-#: timezone/zic.c:881 timezone/zic.c:1295 timezone/zic.c:1320
+#: timezone/zic.c:882 timezone/zic.c:1297 timezone/zic.c:1322
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: panika: B³êdna l-warto¶æ %d\n"
 
-#: timezone/zic.c:889
+#: timezone/zic.c:890
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: B³±d odczytu %s\n"
 
-#: timezone/zic.c:896
+#: timezone/zic.c:897
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: B³±d podczas zamykania %s: %s\n"
 
-#: timezone/zic.c:901
+#: timezone/zic.c:902
 msgid "expected continuation line not found"
 msgstr "brak spodziewanej linii kontynuacji"
 
-#: timezone/zic.c:957
+#: timezone/zic.c:958
 msgid "wrong number of fields on Rule line"
 msgstr "z³a liczba pól w linii Rule"
 
-#: timezone/zic.c:961
+#: timezone/zic.c:962
 msgid "nameless rule"
 msgstr "bezimienna regu³a"
 
-#: timezone/zic.c:966
+#: timezone/zic.c:967
 msgid "invalid saved time"
 msgstr "b³êdny czas oszczêdno¶ci"
 
-#: timezone/zic.c:985
+#: timezone/zic.c:986
 msgid "wrong number of fields on Zone line"
 msgstr "z³a liczba pól w linii Zone"
 
-#: timezone/zic.c:991
+#: timezone/zic.c:992
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "Linia \"Zone %s\" i opcja -l wykluczaj± siê wzajemnie"
 
-#: timezone/zic.c:999
+#: timezone/zic.c:1000
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "Linia \"Zone %s\" i opcja -p wykluczaj± siê wzajemnie"
 
-#: timezone/zic.c:1011
+#: timezone/zic.c:1012
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "powtórzona nazwa strefy %s (plik \"%s\", linia %d)"
 
-#: timezone/zic.c:1027
+#: timezone/zic.c:1028
 msgid "wrong number of fields on Zone continuation line"
 msgstr "z³a liczba pól w linii kontynuacji Zone"
 
-#: timezone/zic.c:1067
+#: timezone/zic.c:1068
 msgid "invalid UTC offset"
 msgstr "nieprawid³owe przesuniêcie UTC"
 
-#: timezone/zic.c:1070
+#: timezone/zic.c:1071
 msgid "invalid abbreviation format"
 msgstr "nieprawid³owy format skrótu"
 
-#: timezone/zic.c:1096
+#: timezone/zic.c:1097
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "Czas koñcowy linii kontynuacji Zone nie jest po czasie koñcowym poprzedniej linii"
 
-#: timezone/zic.c:1123
+#: timezone/zic.c:1124
 msgid "wrong number of fields on Leap line"
 msgstr "z³a liczba pól w linii Leap"
 
-#: timezone/zic.c:1132
+#: timezone/zic.c:1133
 msgid "invalid leaping year"
 msgstr "nieprawid³owy rok przestêpny"
 
-#: timezone/zic.c:1147 timezone/zic.c:1250
+#: timezone/zic.c:1148 timezone/zic.c:1252
 msgid "invalid month name"
 msgstr "nieprawid³owa nazwa miesi±ca"
 
-#: timezone/zic.c:1160 timezone/zic.c:1372 timezone/zic.c:1386
+#: timezone/zic.c:1161 timezone/zic.c:1374 timezone/zic.c:1388
 msgid "invalid day of month"
 msgstr "nieprawid³owy dzieñ miesi±ca"
 
-#: timezone/zic.c:1165
+#: timezone/zic.c:1166
 msgid "time before zero"
 msgstr "czas przed zerem"
 
-#: timezone/zic.c:1173 timezone/zic.c:2049 timezone/zic.c:2068
-msgid "time overflow"
-msgstr "przepe³nienie czasu"
+#: timezone/zic.c:1170
+msgid "time too small"
+msgstr "czas zbyt ma³y"
+
+#: timezone/zic.c:1174
+msgid "time too large"
+msgstr "czas zbyt du¿y"
 
-#: timezone/zic.c:1176 timezone/zic.c:1279
+#: timezone/zic.c:1178 timezone/zic.c:1281
 msgid "invalid time of day"
 msgstr "nieprawid³owa pora dnia"
 
-#: timezone/zic.c:1195
+#: timezone/zic.c:1197
 msgid "illegal CORRECTION field on Leap line"
 msgstr "b³êdne pole CORRECTION w linii Leap"
 
-#: timezone/zic.c:1199
+#: timezone/zic.c:1201
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "b³êdne pole Rolling/Stationary w linii Leap"
 
-#: timezone/zic.c:1214
+#: timezone/zic.c:1216
 msgid "wrong number of fields on Link line"
 msgstr "z³a liczba pól w linii Link"
 
-#: timezone/zic.c:1218
+#: timezone/zic.c:1220
 msgid "blank FROM field on Link line"
 msgstr "puste pole FROM w linii Link"
 
-#: timezone/zic.c:1222
+#: timezone/zic.c:1224
 msgid "blank TO field on Link line"
 msgstr "puste pole TO w linii Link"
 
-#: timezone/zic.c:1299
+#: timezone/zic.c:1301
 msgid "invalid starting year"
 msgstr "nieprawid³owy rok pocz±tkowy"
 
-#: timezone/zic.c:1303 timezone/zic.c:1328
+#: timezone/zic.c:1305
 msgid "starting year too low to be represented"
 msgstr "rok pocz±tkowy jest zbyt ma³y"
 
-#: timezone/zic.c:1305 timezone/zic.c:1330
+#: timezone/zic.c:1307
 msgid "starting year too high to be represented"
 msgstr "rok pocz±tkowy jest zbyt du¿y"
 
-#: timezone/zic.c:1324
+#: timezone/zic.c:1326
 msgid "invalid ending year"
 msgstr "nieprawid³owy rok koñcowy"
 
-#: timezone/zic.c:1333
+#: timezone/zic.c:1330
+msgid "ending year too low to be represented"
+msgstr "rok koñcowy jest zbyt ma³y"
+
+#: timezone/zic.c:1332
+msgid "ending year too high to be represented"
+msgstr "rok koñcowy jest zbyt du¿y"
+
+#: timezone/zic.c:1335
 msgid "starting year greater than ending year"
 msgstr "rok pocz±tkowy jest pó¼niejszy ni¿ koñcowy"
 
-#: timezone/zic.c:1340
+#: timezone/zic.c:1342
 msgid "typed single year"
 msgstr "podano pojedynczy rok"
 
-#: timezone/zic.c:1377
+#: timezone/zic.c:1379
 msgid "invalid weekday name"
 msgstr "nieprawid³owa nazwa dnia tygodnia"
 
-#: timezone/zic.c:1492
+#: timezone/zic.c:1494
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: Nie mo¿na usun±æ %s: %s\n"
 
-#: timezone/zic.c:1502
+#: timezone/zic.c:1504
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: Nie mo¿na utworzyæ %s: %s\n"
 
-#: timezone/zic.c:1568
+#: timezone/zic.c:1570
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: B³±d podczas zapisu do %s\n"
 
 # jak ladnie przetlumaczyc ten until time? -PK
-#: timezone/zic.c:1758
+#: timezone/zic.c:1760
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "nie mo¿na okre¶liæ skrótu strefy czasowej po koñcu przedzia³u czasu"
 
-#: timezone/zic.c:1801
+#: timezone/zic.c:1803
 msgid "too many transitions?!"
 msgstr "za du¿o konwersji?!"
 
-#: timezone/zic.c:1820
+#: timezone/zic.c:1822
 msgid "internal error - addtype called with bad isdst"
 msgstr "b³±d wewnêtrzny - addtype wywo³ane z b³êdnym isdst"
 
-#: timezone/zic.c:1824
+#: timezone/zic.c:1826
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "b³±d wewnêtrzny - addtype wywo³ane z b³êdnym ttisstd"
 
-#: timezone/zic.c:1828
+#: timezone/zic.c:1830
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "b³±d wewnêtrzny - addtype wywo³ane z b³êdnym ttisgmt"
 
-#: timezone/zic.c:1847
+#: timezone/zic.c:1849
 msgid "too many local time types"
 msgstr "za du¿o lokalnych typów czasu"
 
-#: timezone/zic.c:1875
+#: timezone/zic.c:1877
 msgid "too many leap seconds"
 msgstr "za du¿o sekund przestêpnych"
 
-#: timezone/zic.c:1881
+#: timezone/zic.c:1883
 msgid "repeated leap second moment"
 msgstr "powtórzona chwila wystêpowania sekund przestêpnych"
 
-#: timezone/zic.c:1933
+#: timezone/zic.c:1935
 msgid "Wild result from command execution"
 msgstr "Osobliwy wynik wykonania polecenia"
 
-#: timezone/zic.c:1934
+#: timezone/zic.c:1936
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: polecenie `%s' zwróci³o %d\n"
 
-#: timezone/zic.c:2029
+#: timezone/zic.c:2031
 msgid "Odd number of quotation marks"
 msgstr "Nieparzysta liczba cudzys³owów"
 
-#: timezone/zic.c:2115
+#: timezone/zic.c:2051 timezone/zic.c:2070
+msgid "time overflow"
+msgstr "przepe³nienie czasu"
+
+#: timezone/zic.c:2117
 msgid "use of 2/29 in non leap-year"
 msgstr "u¿ycie 2/29 w roku nieprzestêpnym"
 
-#: timezone/zic.c:2149
+#: timezone/zic.c:2151
 msgid "no day in month matches rule"
 msgstr "¿aden z dni miesi±ca nie pasuje do regu³y"
 
-#: timezone/zic.c:2172
+#: timezone/zic.c:2175
 msgid "too many, or too long, time zone abbreviations"
 msgstr "za d³ugie lub za du¿o skrótów stref czasowych"
 
-#: timezone/zic.c:2213
+#: timezone/zic.c:2216
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: Nie mo¿na utworzyæ katalogu %s: %s\n"
 
-#: timezone/zic.c:2235
+#: timezone/zic.c:2238
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d niepoprawnie rozszerzy³ znak\n"
 
-#: posix/../sysdeps/generic/wordexp.c:1801
+#: posix/../sysdeps/generic/wordexp.c:1797
 msgid "parameter null or not set"
 msgstr "parametr pusty lub nie ustawiony"
 
@@ -3463,249 +3505,249 @@ msgstr "Wszystkie 
 msgid "Interrupted by a signal"
 msgstr "Przerwane przez sygna³"
 
-#: posix/getconf.c:889
+#: posix/getconf.c:892
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
 msgstr "Sk³adnia: %s [-v specyfikacja] nazwa_zmiennej [¶cie¿ka]\n"
 
-#: posix/getconf.c:947
+#: posix/getconf.c:950
 #, c-format
 msgid "unknown specification \"%s\""
 msgstr "nieznana specyfikacja \"%s\""
 
-#: posix/getconf.c:974 posix/getconf.c:990
+#: posix/getconf.c:979 posix/getconf.c:995
 msgid "undefined"
 msgstr "niezdefiniowana"
 
-#: posix/getconf.c:1012
+#: posix/getconf.c:1017
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "Nierozpoznana zmienna `%s'"
 
-#: posix/getopt.c:692 posix/getopt.c:704
+#: posix/getopt.c:692 posix/getopt.c:711
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opcja `%s' jest niejednoznaczna\n"
 
-#: posix/getopt.c:737 posix/getopt.c:741
+#: posix/getopt.c:744 posix/getopt.c:748
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentów\n"
 
-#: posix/getopt.c:750 posix/getopt.c:755
+#: posix/getopt.c:757 posix/getopt.c:762
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentów\n"
 
-#: posix/getopt.c:791 posix/getopt.c:804 posix/getopt.c:1093
-#: posix/getopt.c:1106
+#: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159
+#: posix/getopt.c:1181
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcja `%s' musi mieæ argument\n"
 
-#: posix/getopt.c:842 posix/getopt.c:845
+#: posix/getopt.c:867 posix/getopt.c:870
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: nieznana opcja `--%s'\n"
 
-#: posix/getopt.c:853 posix/getopt.c:856
+#: posix/getopt.c:878 posix/getopt.c:881
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: nieznana opcja `%c%s'\n"
 
-#: posix/getopt.c:903 posix/getopt.c:906
+#: posix/getopt.c:936 posix/getopt.c:939
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: niew³a¶ciwa opcja -- %c\n"
 
-#: posix/getopt.c:912 posix/getopt.c:915
+#: posix/getopt.c:945 posix/getopt.c:948
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: b³êdna opcja -- %c\n"
 
-#: posix/getopt.c:962 posix/getopt.c:973 posix/getopt.c:1159
-#: posix/getopt.c:1172
+#: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234
+#: posix/getopt.c:1255
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcja musi mieæ argument -- %c\n"
 
-#: posix/getopt.c:1025 posix/getopt.c:1036
+#: posix/getopt.c:1074 posix/getopt.c:1093
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
 
-#: posix/getopt.c:1060 posix/getopt.c:1072
+#: posix/getopt.c:1117 posix/getopt.c:1138
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentów\n"
 
-#: posix/regcomp.c:136
+#: posix/regcomp.c:150
 msgid "No match"
 msgstr "Nic nie pasuje"
 
-#: posix/regcomp.c:139
+#: posix/regcomp.c:153
 msgid "Invalid regular expression"
 msgstr "B³êdne wyra¿enie regularne"
 
-#: posix/regcomp.c:142
+#: posix/regcomp.c:156
 msgid "Invalid collation character"
 msgstr "B³êdny znak sortowany"
 
-#: posix/regcomp.c:145
+#: posix/regcomp.c:159
 msgid "Invalid character class name"
 msgstr "B³êdna nazwa klasy znaku"
 
-#: posix/regcomp.c:148
+#: posix/regcomp.c:162
 msgid "Trailing backslash"
 msgstr "Koñcz±cy znak `\\'"
 
-#: posix/regcomp.c:151
+#: posix/regcomp.c:165
 msgid "Invalid back reference"
 msgstr "B³êdny odno¶nik wstecz"
 
-#: posix/regcomp.c:154
+#: posix/regcomp.c:168
 msgid "Unmatched [ or [^"
 msgstr "Niesparowane [ lub [^"
 
-#: posix/regcomp.c:157
+#: posix/regcomp.c:171
 msgid "Unmatched ( or \\("
 msgstr "Niesparowane ( lub \\("
 
-#: posix/regcomp.c:160
+#: posix/regcomp.c:174
 msgid "Unmatched \\{"
 msgstr "Niesparowane \\{"
 
-#: posix/regcomp.c:163
+#: posix/regcomp.c:177
 msgid "Invalid content of \\{\\}"
 msgstr "B³êdna zawarto¶æ \\{\\}"
 
-#: posix/regcomp.c:166
+#: posix/regcomp.c:180
 msgid "Invalid range end"
 msgstr "B³êdny koniec zakresu"
 
-#: posix/regcomp.c:169
+#: posix/regcomp.c:183
 msgid "Memory exhausted"
 msgstr "Pamiêæ wyczerpana"
 
-#: posix/regcomp.c:172
+#: posix/regcomp.c:186
 msgid "Invalid preceding regular expression"
 msgstr "B³êdne poprzedzaj±ce wyra¿enie regularne"
 
-#: posix/regcomp.c:175
+#: posix/regcomp.c:189
 msgid "Premature end of regular expression"
 msgstr "Niespodziewany koniec wyra¿enia regularnego"
 
-#: posix/regcomp.c:178
+#: posix/regcomp.c:192
 msgid "Regular expression too big"
 msgstr "Wyra¿enie regularne jest za du¿e"
 
-#: posix/regcomp.c:181
+#: posix/regcomp.c:195
 msgid "Unmatched ) or \\)"
 msgstr "Niesparowane ) lub \\)"
 
-#: posix/regcomp.c:615
+#: posix/regcomp.c:661
 msgid "No previous regular expression"
 msgstr "Brak wyra¿enia regularnego"
 
-#: argp/argp-help.c:213
+#: argp/argp-help.c:224
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: parametr ARGP_HELP_FMT wymaga podania warto¶ci"
 
-#: argp/argp-help.c:222
+#: argp/argp-help.c:233
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT"
 
-#: argp/argp-help.c:234
+#: argp/argp-help.c:245
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "B³êdne dane w ARGP_HELP_FMT: %s"
 
-#: argp/argp-help.c:1189
+#: argp/argp-help.c:1205
 msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
 msgstr "Argumenty obowi±zkowe lub opcjonalne dla d³ugich opcji s± równie¿ obowi±zkowe lub opcjonalne dla odpowiednich krótkich opcji."
 
-#: argp/argp-help.c:1572
+#: argp/argp-help.c:1592
 msgid "Usage:"
 msgstr "Sk³adnia:"
 
-#: argp/argp-help.c:1576
+#: argp/argp-help.c:1596
 msgid "  or: "
 msgstr "    lub: "
 
-#: argp/argp-help.c:1588
+#: argp/argp-help.c:1608
 msgid " [OPTION...]"
 msgstr " [OPCJA...]"
 
-#: argp/argp-help.c:1615
+#: argp/argp-help.c:1635
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Polecenie `%s --help' lub `%s --usage' pozwoli uzyskaæ wiêcej informacji.\n"
 
-#: argp/argp-help.c:1643
+#: argp/argp-help.c:1663
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Prosimy zg³aszaæ b³êdy na adres %s.\n"
 
-#: argp/argp-parse.c:100
+#: argp/argp-parse.c:115
 msgid "Give this help list"
 msgstr "Wy¶wietlenie tego tekstu pomocy"
 
-#: argp/argp-parse.c:101
+#: argp/argp-parse.c:116
 msgid "Give a short usage message"
 msgstr "Wy¶wietlenie krótkiej informacji o sk³adni polecenia"
 
-#: argp/argp-parse.c:102
+#: argp/argp-parse.c:117
 msgid "Set the program name"
 msgstr "Okre¶lenie nazwy programu"
 
-#: argp/argp-parse.c:104
+#: argp/argp-parse.c:119
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "Zatrzymanie na SECS sekund (domy¶lnie 3600)"
 
-#: argp/argp-parse.c:161
+#: argp/argp-parse.c:180
 msgid "Print program version"
 msgstr "Wy¶wietlenie wersji programu"
 
-#: argp/argp-parse.c:177
+#: argp/argp-parse.c:196
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(B£¡D PROGRAMU) Nieznana wersja?!"
 
-#: argp/argp-parse.c:653
+#: argp/argp-parse.c:672
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Za du¿o argumentów\n"
 
-#: argp/argp-parse.c:794
+#: argp/argp-parse.c:813
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(B£¡D PROGRAMU) Opcja powinna zostaæ rozpoznana?!"
 
-#: resolv/herror.c:67
+#: resolv/herror.c:68
 msgid "Resolver Error 0 (no error)"
 msgstr "B³±d rozwi±zywania nazw 0 (brak b³êdu)"
 
-#: resolv/herror.c:68
+#: resolv/herror.c:69
 msgid "Unknown host"
 msgstr "Nieznany host"
 
-#: resolv/herror.c:69
+#: resolv/herror.c:70
 msgid "Host name lookup failure"
 msgstr "Odnalezienie nazwy urz±dzenia jest niemo¿liwe"
 
-#: resolv/herror.c:70
+#: resolv/herror.c:71
 msgid "Unknown server error"
 msgstr "Nieznany b³±d serwera"
 
-#: resolv/herror.c:71
+#: resolv/herror.c:72
 msgid "No address associated with name"
 msgstr "Brak adresu zwi±zanego z nazw±"
 
-#: resolv/herror.c:107
+#: resolv/herror.c:108
 msgid "Resolver internal error"
 msgstr "B³±d wewnêtrzny biblioteki rozwi±zuj±cej nazwy"
 
-#: resolv/herror.c:110
+#: resolv/herror.c:111
 msgid "Unknown resolver error"
 msgstr "Nieznany b³±d biblioteki rozwi±zuj±cej nazwy"
 
@@ -3757,24 +3799,24 @@ msgstr "baza [klucz ...]"
 msgid "Service configuration to be used"
 msgstr "U¿ycie tej konfiguracji us³ugi rozwi±zywania nazw"
 
-#: nss/getent.c:136 nss/getent.c:308
+#: nss/getent.c:136 nss/getent.c:375
 #, c-format
 msgid "Enumeration not supported on %s\n"
 msgstr "Wyliczanie nie obs³ugiwane dla %s\n"
 
-#: nss/getent.c:732
+#: nss/getent.c:800
 msgid "getent - get entries from administrative database."
 msgstr "getent - wy¶wietlenie wpisów z baz administracyjnych."
 
-#: nss/getent.c:733
+#: nss/getent.c:801
 msgid "Supported databases:"
 msgstr "Obs³ugiwane bazy danych:"
 
-#: nss/getent.c:790 nscd/nscd.c:124 nscd/nscd_nischeck.c:64
+#: nss/getent.c:858 nscd/nscd.c:131 nscd/nscd_nischeck.c:64
 msgid "wrong number of arguments"
 msgstr "z³a liczba argumentów"
 
-#: nss/getent.c:800
+#: nss/getent.c:868
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "Nieznana baza `%s'\n"
@@ -4119,10 +4161,12 @@ msgid "illegal nettype :`%s'\n"
 msgstr "b³êdny typ sieci :'%s'\n"
 
 #: sunrpc/rpc_main.c:1104
+#, c-format
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: za du¿o definicji\n"
 
 #: sunrpc/rpc_main.c:1116
+#, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr "rpcgen: b³êdne kodowanie arglist\n"
 
@@ -4134,6 +4178,7 @@ msgid "file `%s' already exists and may be overwritten\n"
 msgstr "plik `%s' ju¿ istnieje i mo¿e zostaæ nadpisany\n"
 
 #: sunrpc/rpc_main.c:1194
+#, c-format
 msgid "Cannot specify more than one input file!\n"
 msgstr "Mo¿na podaæ tylko jeden plik wej¶ciowy!\n"
 
@@ -4142,6 +4187,7 @@ msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr "Ta implementacja nie obs³uguje kodu w nowym stylu ani bezpiecznego dla w±tków!\n"
 
 #: sunrpc/rpc_main.c:1373
+#, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "Nie mo¿na u¿ywaæ flagi id_sieci z flag± inetd!\n"
 
@@ -4154,10 +4200,12 @@ msgid "Cannot use table flags with newstyle!\n"
 msgstr "Nowa sk³adnia opcji nie pozwala na u¿ywanie flagi table!\n"
 
 #: sunrpc/rpc_main.c:1411
+#, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "flagi generowania szablonów wymagaj± podania \"pliku_we\".\n"
 
 #: sunrpc/rpc_main.c:1416
+#, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "Nie mo¿na podaæ wiêcej ni¿ jednej flagi generowania pliku!\n"
 
@@ -4350,31 +4398,31 @@ msgstr "svcudp_create: brak pami
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create: xp_pad jest za ma³e na IP_PKTINFO\n"
 
-#: sunrpc/svc_udp.c:471
+#: sunrpc/svc_udp.c:493
 msgid "enablecache: cache already enabled"
 msgstr "enablecache: bufor jest ju¿ aktywny"
 
-#: sunrpc/svc_udp.c:477
+#: sunrpc/svc_udp.c:499
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache: nie mo¿na przydzieliæ bufora"
 
-#: sunrpc/svc_udp.c:485
+#: sunrpc/svc_udp.c:507
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache: nie mo¿na przydzieliæ danych bufora"
 
-#: sunrpc/svc_udp.c:492
+#: sunrpc/svc_udp.c:514
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: nie mo¿na przydzieliæ kolejki dla bufora"
 
-#: sunrpc/svc_udp.c:528
+#: sunrpc/svc_udp.c:550
 msgid "cache_set: victim not found"
 msgstr "cache_set: nie znaleziono wpisu mo¿liwego do powtórnego wykorzystania"
 
-#: sunrpc/svc_udp.c:539
+#: sunrpc/svc_udp.c:561
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set: przydzielenie pamiêci dla nowego wpisu jest niemo¿liwe"
 
-#: sunrpc/svc_udp.c:545
+#: sunrpc/svc_udp.c:567
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: nie mo¿na przydzieliæ nowego rpc_buffer"
 
@@ -4398,7 +4446,7 @@ msgstr "svc_unix: makefd_xprt: brak pami
 msgid "xdr_bytes: out of memory\n"
 msgstr "xdr_bytes: brak pamiêci\n"
 
-#: sunrpc/xdr.c:725 sunrpc/xdr.c:728
+#: sunrpc/xdr.c:728 sunrpc/xdr.c:731
 msgid "xdr_string: out of memory\n"
 msgstr "xdr_string: brak pamiêci\n"
 
@@ -4817,6 +4865,7 @@ msgid "Access Rights : "
 msgstr "Prawa dostêpu : "
 
 #: nis/nis_print.c:326
+#, c-format
 msgid ""
 "\n"
 "Time to Live  : "
@@ -4908,221 +4957,222 @@ msgstr "    Brak domniemanych nie-cz
 msgid "    No recursive nonmembers\n"
 msgstr "   Brak rekursywnych nie-cz³onków\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:96
-#: nis/nss_nisplus/nisplus-publickey.c:172
+#: nis/nss_nisplus/nisplus-publickey.c:101
+#: nis/nss_nisplus/nisplus-publickey.c:182
 #, c-format
 msgid "DES entry for netname %s not unique\n"
 msgstr "Pozycja DES dla sieci %s nie jest unikalna\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:208
+#: nis/nss_nisplus/nisplus-publickey.c:218
 #, c-format
 msgid "netname2user: missing group id list in `%s'."
 msgstr "netname2user: brak listy identyfikatorów grup w `%s'."
 
-#: nis/nss_nisplus/nisplus-publickey.c:285
-#: nis/nss_nisplus/nisplus-publickey.c:291
-#: nis/nss_nisplus/nisplus-publickey.c:350
-#: nis/nss_nisplus/nisplus-publickey.c:359
+#: nis/nss_nisplus/nisplus-publickey.c:300
+#: nis/nss_nisplus/nisplus-publickey.c:306
+#: nis/nss_nisplus/nisplus-publickey.c:370
+#: nis/nss_nisplus/nisplus-publickey.c:379
 #, c-format
 msgid "netname2user: (nis+ lookup): %s\n"
 msgstr "netname2user: (odwzorowanie nis+): %s\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:304
+#: nis/nss_nisplus/nisplus-publickey.c:319
 #, c-format
 msgid "netname2user: DES entry for %s in directory %s not unique"
 msgstr "netname2user: wpis DES dla %s w katalogu %s nie jest unikalny"
 
 # XXX principal = nadzorca, troche lame -PK
-#: nis/nss_nisplus/nisplus-publickey.c:322
+#: nis/nss_nisplus/nisplus-publickey.c:337
 #, c-format
 msgid "netname2user: principal name `%s' too long"
 msgstr "name2user: nazwa nadzorcy `%s' jest zbyt d³uga"
 
-#: nis/nss_nisplus/nisplus-publickey.c:372
+#: nis/nss_nisplus/nisplus-publickey.c:392
 #, c-format
 msgid "netname2user: LOCAL entry for %s in directory %s not unique"
 msgstr "netname2user: wpis LOKALNY dla %s w katalogu %s nie jest unikalny"
 
-#: nis/nss_nisplus/nisplus-publickey.c:379
+#: nis/nss_nisplus/nisplus-publickey.c:399
 msgid "netname2user: should not have uid 0"
 msgstr "netname2user: UID 0 nie powinien wyst±piæ"
 
-#: nis/ypclnt.c:174
+#: nis/ypclnt.c:171
 #, c-format
 msgid "YPBINDPROC_DOMAIN: %s\n"
 msgstr "YPBINDPROC_DOMAIN: %s\n"
 
-#: nis/ypclnt.c:789
+#: nis/ypclnt.c:780
 msgid "Request arguments bad"
 msgstr "Argumenty ¿±dania s± b³êdne"
 
-#: nis/ypclnt.c:791
+#: nis/ypclnt.c:782
 msgid "RPC failure on NIS operation"
 msgstr "B³±d RPC podczas operacji NIS"
 
-#: nis/ypclnt.c:793
+#: nis/ypclnt.c:784
 msgid "Can't bind to server which serves this domain"
 msgstr "Nie mo¿na po³±czyæ siê z serwerem dla tej domeny"
 
-#: nis/ypclnt.c:795
+#: nis/ypclnt.c:786
 msgid "No such map in server's domain"
 msgstr "Brak takiej mapy w domenie serwera"
 
-#: nis/ypclnt.c:797
+#: nis/ypclnt.c:788
 msgid "No such key in map"
 msgstr "Brak takiego klucza w mapie"
 
-#: nis/ypclnt.c:799
+#: nis/ypclnt.c:790
 msgid "Internal NIS error"
 msgstr "B³±d wewnêtrzny NIS"
 
-#: nis/ypclnt.c:801
+#: nis/ypclnt.c:792
 msgid "Local resource allocation failure"
 msgstr "Wyst±pi³ b³±d podczas przydzielania lokalnych zasobów"
 
-#: nis/ypclnt.c:803
+#: nis/ypclnt.c:794
 msgid "No more records in map database"
 msgstr "Nie ma wiêcej rekordów w mapie"
 
-#: nis/ypclnt.c:805
+#: nis/ypclnt.c:796
 msgid "Can't communicate with portmapper"
 msgstr "Komunikacja z portmapperem jest niemo¿liwa"
 
-#: nis/ypclnt.c:807
+#: nis/ypclnt.c:798
 msgid "Can't communicate with ypbind"
 msgstr "Komunikacja z ypbind jest niemo¿liwa"
 
-#: nis/ypclnt.c:809
+#: nis/ypclnt.c:800
 msgid "Can't communicate with ypserv"
 msgstr "Komunikacja z ypserv jest niemo¿liwa"
 
-#: nis/ypclnt.c:811
+#: nis/ypclnt.c:802
 msgid "Local domain name not set"
 msgstr "Lokalna domena nie jest ustawiona"
 
-#: nis/ypclnt.c:813
+#: nis/ypclnt.c:804
 msgid "NIS map database is bad"
 msgstr "Mapa NIS zawiera b³êdy"
 
-#: nis/ypclnt.c:815
+#: nis/ypclnt.c:806
 msgid "NIS client/server version mismatch - can't supply service"
 msgstr "Niezgodno¶æ wersji miêdzy klientem i serwerem NIS - us³uga niemo¿liwa"
 
-#: nis/ypclnt.c:819
+#: nis/ypclnt.c:810
 msgid "Database is busy"
 msgstr "Baza danych jest zajêta"
 
-#: nis/ypclnt.c:821
+#: nis/ypclnt.c:812
 msgid "Unknown NIS error code"
 msgstr "Nieznany kod b³êdu NIS"
 
-#: nis/ypclnt.c:863
+#: nis/ypclnt.c:854
 msgid "Internal ypbind error"
 msgstr "B³±d wewnêtrzny ypbind"
 
-#: nis/ypclnt.c:865
+#: nis/ypclnt.c:856
 msgid "Domain not bound"
 msgstr "Domena nie zosta³a zwi±zana"
 
-#: nis/ypclnt.c:867
+#: nis/ypclnt.c:858
 msgid "System resource allocation failure"
 msgstr "Wyst±pi³ b³±d podczas przydzielania zasobów systemowych"
 
-#: nis/ypclnt.c:869
+#: nis/ypclnt.c:860
 msgid "Unknown ypbind error"
 msgstr "Nieznany b³±d ypbind"
 
-#: nis/ypclnt.c:908
+#: nis/ypclnt.c:899
 msgid "yp_update: cannot convert host to netname\n"
 msgstr "yp_update: nie mo¿na przekonwertowaæ nazwy hosta na nazwê sieci\n"
 
-#: nis/ypclnt.c:920
+#: nis/ypclnt.c:911
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: nie mo¿na uzyskaæ adresu serwera\n"
 
-#: nscd/cache.c:88
+#: nscd/cache.c:94
 msgid "while allocating hash table entry"
 msgstr "b³±d podczas wstawiania do tablicy mieszaj±cej"
 
-#: nscd/cache.c:150 nscd/connections.c:187
+#: nscd/cache.c:162 nscd/connections.c:184
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "znalezienie pliku bazy danych `%s' jest niemo¿liwe: %s"
 
-#: nscd/connections.c:146
-msgid "cannot read configuration file; this is fatal"
-msgstr "nie mo¿na przeczytaæ pliku konfiguracyjnego; koniec pracy"
-
-#: nscd/connections.c:153
+#: nscd/connections.c:150
 msgid "Cannot run nscd in secure mode as unprivileged user"
 msgstr "Nie mo¿na uruchomiæ nscd w trybie bezpiecznym jako u¿ytkownik nieuprzywilejowany"
 
-#: nscd/connections.c:175
+#: nscd/connections.c:172
 #, c-format
 msgid "while allocating cache: %s"
 msgstr "podczas przydzielania bufora: %s"
 
-#: nscd/connections.c:200
+#: nscd/connections.c:197
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "nie mo¿na otworzyæ gniazda: %s"
 
-#: nscd/connections.c:218
+#: nscd/connections.c:215
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "nie mo¿na otworzyæ gniazda do przyjmowania po³±czeñ: %s"
 
 #: nscd/connections.c:260
 #, c-format
-msgid "handle_request: request received (Version = %d)"
-msgstr "handle_request: odebrano ¿±danie (Wersja = %d)"
-
-#: nscd/connections.c:266
-#, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "nie mo¿na obs³u¿yæ ¿±dañ w starej wersji %d; aktualna wersja to %d"
 
-#: nscd/connections.c:304 nscd/connections.c:326
+#: nscd/connections.c:298 nscd/connections.c:324
 #, c-format
 msgid "cannot write result: %s"
 msgstr "nie mo¿na zapisaæ wyniku: %s"
 
-#: nscd/connections.c:405 nscd/connections.c:499
+#: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
 msgid "error getting callers id: %s"
 msgstr "b³±d podczas pobierania identyfikatorów wywo³uj±cych: %s"
 
-#: nscd/connections.c:471
+#: nscd/connections.c:485
 #, c-format
 msgid "while accepting connection: %s"
 msgstr "podczas przyjmowania po³±czenia: %s"
 
-#: nscd/connections.c:482
+#: nscd/connections.c:498
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "skrócony odczyt podczas czytania ¿±dania: `%s'"
 
-#: nscd/connections.c:518
+#: nscd/connections.c:542
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "d³ugo¶æ klucza w ¿±daniu zbyt du¿a: %d"
 
-#: nscd/connections.c:532
+#: nscd/connections.c:556
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "skrócony odczyt podczas czytania klucza ¿±dania: %s"
 
-#: nscd/connections.c:591 nscd/connections.c:592 nscd/connections.c:611
-#: nscd/connections.c:624 nscd/connections.c:630 nscd/connections.c:637
+#: nscd/connections.c:566
+#, c-format
+msgid "handle_request: request received (Version = %d) from PID %ld"
+msgstr "handle_request: odebrano ¿±danie (Wersja = %d) od procesu %ld"
+
+#: nscd/connections.c:571
+#, c-format
+msgid "handle_request: request received (Version = %d)"
+msgstr "handle_request: odebrano ¿±danie (Wersja = %d)"
+
+#: nscd/connections.c:635 nscd/connections.c:636 nscd/connections.c:655
+#: nscd/connections.c:668 nscd/connections.c:674 nscd/connections.c:681
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "Uruchomienie nscd jako u¿ytkownik '%s' nie powiod³o siê"
 
-#: nscd/connections.c:612
+#: nscd/connections.c:656
 msgid "getgrouplist failed"
 msgstr "getgrouplist nie powiod³o siê"
 
-#: nscd/connections.c:625
+#: nscd/connections.c:669
 msgid "setgroups failed"
 msgstr "setgroups nie powiod³o"
 
@@ -5134,122 +5184,135 @@ msgstr "podczas przydzielania kopii klucza"
 msgid "while allocating cache entry"
 msgstr "podczas przydzielania elementu bufora"
 
-#: nscd/grpcache.c:196 nscd/hstcache.c:282 nscd/pwdcache.c:192
+#: nscd/grpcache.c:197 nscd/hstcache.c:283 nscd/pwdcache.c:193
 #, c-format
 msgid "short write in %s: %s"
 msgstr "b³±d zapisu w %s: %s"
 
-#: nscd/grpcache.c:218
+#: nscd/grpcache.c:219
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "Nie znaleziono \"%s\" w buforze grup!"
 
-#: nscd/grpcache.c:284
+#: nscd/grpcache.c:285
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr "Nieprawid³owy liczbowy gid \"%s\"!"
 
-#: nscd/grpcache.c:291
+#: nscd/grpcache.c:292
 #, c-format
 msgid "Haven't found \"%d\" in group cache!"
 msgstr "Nie znaleziono \"%d\" w buforze grup!"
 
-#: nscd/hstcache.c:304 nscd/hstcache.c:370 nscd/hstcache.c:435
-#: nscd/hstcache.c:500
+#: nscd/hstcache.c:305 nscd/hstcache.c:371 nscd/hstcache.c:436
+#: nscd/hstcache.c:501
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "Nie znaleziono \"%s\" w buforze hostów!"
 
-#: nscd/nscd.c:85
+#: nscd/nscd.c:89
 msgid "Read configuration data from NAME"
 msgstr "Odczyt konfiguracji z pliku NAZWA"
 
-#: nscd/nscd.c:87
+#: nscd/nscd.c:91
 msgid "Do not fork and display messages on the current tty"
 msgstr "Nie przechodzenie w t³o i wy¶wietlanie komunikatów na bie¿±cym terminalu"
 
-#: nscd/nscd.c:88
+#: nscd/nscd.c:92
 msgid "NUMBER"
 msgstr "LICZBA"
 
-#: nscd/nscd.c:88
+#: nscd/nscd.c:92
 msgid "Start NUMBER threads"
 msgstr "Uruchomienie takiej LICZBY w±tków"
 
-#: nscd/nscd.c:89
+#: nscd/nscd.c:93
 msgid "Shut the server down"
 msgstr "Zakoñczenie pracy serwera"
 
-#: nscd/nscd.c:90
+#: nscd/nscd.c:94
 msgid "Print current configuration statistic"
 msgstr "Wy¶wietlenie aktualnych statystyk konfiguracji"
 
-#: nscd/nscd.c:91
+#: nscd/nscd.c:95
 msgid "TABLE"
 msgstr "TABLICA"
 
-#: nscd/nscd.c:92
+#: nscd/nscd.c:96
 msgid "Invalidate the specified cache"
 msgstr "Uniewa¿nienie podanego bufora"
 
-#: nscd/nscd.c:93
+#: nscd/nscd.c:97
 msgid "TABLE,yes"
 msgstr "TABLICA,yes"
 
-#: nscd/nscd.c:93
+#: nscd/nscd.c:97
 msgid "Use separate cache for each user"
 msgstr "U¿ycie oddzielnego bufora dla ka¿dego u¿ytkownika"
 
 # XXX moze zostawic oryginal albo zrobic ladniej -PK
-#: nscd/nscd.c:98
+#: nscd/nscd.c:102
 msgid "Name Service Cache Daemon."
 msgstr "Demon buforuj±cy us³ugi odwzorowania nazw."
 
-#: nscd/nscd.c:131
+#: nscd/nscd.c:141
+msgid "cannot read configuration file; this is fatal"
+msgstr "nie mo¿na przeczytaæ pliku konfiguracyjnego; koniec pracy"
+
+#: nscd/nscd.c:152
 msgid "already running"
 msgstr "jest ju¿ uruchomiony"
 
-#: nscd/nscd.c:243 nscd/nscd.c:263 nscd/nscd.c:269
+#: nscd/nscd.c:270 nscd/nscd.c:294 nscd/nscd_stat.c:132
 msgid "Only root is allowed to use this option!"
 msgstr "Tylko root mo¿e u¿ywaæ tej opcji!"
 
-#: nscd/nscd_conf.c:83
+#: nscd/nscd_conf.c:88
 #, c-format
 msgid "Parse error: %s"
 msgstr "B³±d analizowania: %s"
 
-#: nscd/nscd_conf.c:166
+#: nscd/nscd_conf.c:171
 #, c-format
 msgid "Could not create log file \"%s\""
 msgstr "Nie mo¿na utworzyæ pliku dziennika \"%s\""
 
-#: nscd/nscd_conf.c:182
+#: nscd/nscd_conf.c:187
 msgid "Must specify user name for server-user option"
 msgstr "Trzeba podaæ nazwê u¿ytkownika dla opcji server-user"
 
-#: nscd/nscd_conf.c:187
+#: nscd/nscd_conf.c:194
+msgid "Must specify user name for stat-user option"
+msgstr "Trzeba podaæ nazwê u¿ytkownika dla opcji stat-user"
+
+#: nscd/nscd_conf.c:205
 #, c-format
 msgid "Unknown option: %s %s %s"
 msgstr "Nieznana opcja: %s %s %s"
 
-#: nscd/nscd_stat.c:87
+#: nscd/nscd_stat.c:103
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr "nie mo¿na zapisaæ statystyk: %s"
 
-#: nscd/nscd_stat.c:105
+#: nscd/nscd_stat.c:128
+#, c-format
+msgid "Only root or %s is allowed to use this option!"
+msgstr "Tylko root lub %s mo¿e u¿ywaæ tej opcji!"
+
+#: nscd/nscd_stat.c:139
 msgid "nscd not running!\n"
 msgstr "nscd nie jest uruchomiony!\n"
 
-#: nscd/nscd_stat.c:116
+#: nscd/nscd_stat.c:150
 msgid "write incomplete"
 msgstr "zapis nie by³ kompletny"
 
-#: nscd/nscd_stat.c:128
+#: nscd/nscd_stat.c:162
 msgid "cannot read statistics data"
 msgstr "nie mo¿na odczytaæ danych statystycznych"
 
-#: nscd/nscd_stat.c:131
+#: nscd/nscd_stat.c:165
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -5260,61 +5323,96 @@ msgstr ""
 "\n"
 "%15d  poziom komunikatów diagnostycznych\n"
 
-#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148
+#: nscd/nscd_stat.c:189
+#, c-format
+msgid "%3ud %2uh %2um %2lus  server runtime\n"
+msgstr "%3ud %2uh %2um %2lus  czasu dzia³ania serwera\n"
+
+#: nscd/nscd_stat.c:192
+#, c-format
+msgid "    %2uh %2um %2lus  server runtime\n"
+msgstr "    %2uh %2um %2lus  czasu dzia³ania serwera\n"
+
+#: nscd/nscd_stat.c:194
+#, c-format
+msgid "        %2um %2lus  server runtime\n"
+msgstr "        %2um %2lus  czasu dzia³ania serwera\n"
+
+#: nscd/nscd_stat.c:196
+#, c-format
+msgid "            %2lus  server runtime\n"
+msgstr "            %2lus  czasu dzia³ania serwera\n"
+
+#: nscd/nscd_stat.c:198
+#, c-format
+msgid "%15lu  number of times clients had to wait\n"
+msgstr "%15lu  razy klienci musieli czekaæ\n"
+
+#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
 msgid "      no"
 msgstr "     nie"
 
-#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148
+#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
 msgid "     yes"
 msgstr "     tak"
 
-#: nscd/nscd_stat.c:154
+#: nscd/nscd_stat.c:221
 #, c-format
 msgid ""
 "\n"
 "%s cache:\n"
 "\n"
 "%15s  cache is enabled\n"
-"%15Zd  suggested size\n"
-"%15ld  seconds time to live for positive entries\n"
-"%15ld  seconds time to live for negative entries\n"
-"%15ld  cache hits on positive entries\n"
-"%15ld  cache hits on negative entries\n"
-"%15ld  cache misses on positive entries\n"
-"%15ld  cache misses on negative entries\n"
-"%15ld%% cache hit rate\n"
+"%15Zu  suggested size\n"
+"%15lu  seconds time to live for positive entries\n"
+"%15lu  seconds time to live for negative entries\n"
+"%15lu  cache hits on positive entries\n"
+"%15lu  cache hits on negative entries\n"
+"%15lu  cache misses on positive entries\n"
+"%15lu  cache misses on negative entries\n"
+"%15lu%% cache hit rate\n"
+"%15lu  current number of cached values\n"
+"%15lu  maximum number of cached values\n"
+"%15lu  maximum chain length searched\n"
+"%15lu  number of delays on rdlock\n"
+"%15lu  number of delays on wrlock\n"
 "%15s  check /etc/%s for changes\n"
 msgstr ""
 "\n"
 "bufor %s:\n"
 "\n"
 "%15s  bufor w³±czony\n"
-"%15Zd  zalecany rozmiar\n"
-"%15ld  sekund czasu przez który bêd± utrzymywane wpisy pozytywne\n"
-"%15ld  sekund czasu przez który bêd± utrzymywane wpisy negatywne\n"
-"%15ld  trafionych wpisów pozytywnych\n"
-"%15ld  trafionych wpisów negatywnych\n"
-"%15ld  nie trafionych wpisów pozytywnych\n"
-"%15ld  nie trafionych wpisów negatywnych\n"
-"%15ld%% procent trafieñ\n"
+"%15Zu  zalecany rozmiar\n"
+"%15lu  sekund czasu przez który bêd± utrzymywane wpisy pozytywne\n"
+"%15lu  sekund czasu przez który bêd± utrzymywane wpisy negatywne\n"
+"%15lu  trafionych wpisów pozytywnych\n"
+"%15lu  trafionych wpisów negatywnych\n"
+"%15lu  nie trafionych wpisów pozytywnych\n"
+"%15lu  nie trafionych wpisów negatywnych\n"
+"%15lu%% trafieñ\n"
+"%15lu  aktualnie pamiêtanych warto¶ci\n"
+"%15lu  maksymalnie pamiêtanych warto¶ci\n"
+"%15lu  maksymalna d³ugo¶æ szukanego ³añcucha\n"
+"%15lu  opó¼nieñ na rdlock\n"
+"%15lu  opó¼nieñ na wrlock\n"
 "%15s  sprawdzanie zmian w /etc/%s\n"
 
-#: nscd/pwdcache.c:214
+#: nscd/pwdcache.c:215
 #, c-format
 msgid "Haven't found \"%s\" in password cache!"
 msgstr "Nie znaleziono \"%s\" w buforze hase³!"
 
-#: nscd/pwdcache.c:280
+#: nscd/pwdcache.c:281
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
 msgstr "Nieprawid³owy liczbowy uid \"%s\"!"
 
-#: nscd/pwdcache.c:287
+#: nscd/pwdcache.c:288
 #, c-format
 msgid "Haven't found \"%d\" in password cache!"
 msgstr "Nie znaleziono \"%d\" w buforze hase³!"
 
-#: elf/../sysdeps/generic/dl-sysdep.c:357
+#: elf/../sysdeps/generic/dl-sysdep.c:422
 msgid "cannot create capability list"
 msgstr "nie mo¿na utworzyæ listy uprawnieñ"
 
@@ -5352,61 +5450,61 @@ msgstr "wi
 msgid "%s is for unknown machine %d.\n"
 msgstr "%s jest dla nieznanej maszyny %d.\n"
 
-#: elf/cache.c:69
+#: elf/cache.c:70
 msgid "unknown"
 msgstr "nieznany"
 
-#: elf/cache.c:105
+#: elf/cache.c:111
 msgid "Unknown OS"
 msgstr "Nieznany system"
 
-#: elf/cache.c:110
+#: elf/cache.c:116
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", ABI systemu: %s %d.%d.%d"
 
-#: elf/cache.c:136 elf/ldconfig.c:1045
+#: elf/cache.c:142 elf/ldconfig.c:1078
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Nie mo¿na otworzyæ pliku bufora %s\n"
 
-#: elf/cache.c:148
+#: elf/cache.c:154
 msgid "mmap of cache file failed.\n"
 msgstr "mmap pliku bufora nie powiod³o siê.\n"
 
-#: elf/cache.c:152 elf/cache.c:162
+#: elf/cache.c:158 elf/cache.c:168
 msgid "File is not a cache file.\n"
 msgstr "Plik nie jest plikiem bufora.\n"
 
-#: elf/cache.c:195 elf/cache.c:205
+#: elf/cache.c:201 elf/cache.c:211
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "Znaleziono %d bibliotek w buforze `%s'\n"
 
-#: elf/cache.c:392
+#: elf/cache.c:410
 #, c-format
 msgid "Can't remove old temporary cache file %s"
 msgstr "Nie mo¿na usun±æ starego tymczasowego pliku bufora %s"
 
-#: elf/cache.c:399
+#: elf/cache.c:417
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "Nie mo¿na utworzyæ tymczasowego pliku bufora %s"
 
-#: elf/cache.c:407 elf/cache.c:416 elf/cache.c:420
+#: elf/cache.c:425 elf/cache.c:434 elf/cache.c:438
 msgid "Writing of cache data failed"
 msgstr "Zapis danych bufora nie powiód³ siê"
 
-#: elf/cache.c:424
+#: elf/cache.c:442
 msgid "Writing of cache data failed."
 msgstr "Zapis danych bufora nie powiód³ siê."
 
-#: elf/cache.c:431
+#: elf/cache.c:449
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "Zmiana praw dostêpu %s na %#o nie powiod³a siê"
 
-#: elf/cache.c:436
+#: elf/cache.c:454
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "Zmiana nazwy %s na %s nie powiod³a siê"
@@ -5415,7 +5513,7 @@ msgstr "Zmiana nazwy %s na %s nie powiod
 msgid "shared object not open"
 msgstr "obiekt dzielony nie jest otwarty"
 
-#: elf/dl-close.c:486 elf/dl-open.c:444
+#: elf/dl-close.c:531 elf/dl-open.c:454
 msgid "TLS generation counter wrapped!  Please send report with the 'glibcbug' script."
 msgstr "Licznik generacji TLS przekrêci³ siê! Proszê wys³aæ raport skryptem 'glibcbug'."
 
@@ -5452,135 +5550,143 @@ msgstr "B
 msgid "error while loading shared libraries"
 msgstr "b³±d podczas wczytywania bibliotek dzielonych"
 
-#: elf/dl-load.c:339
+#: elf/dl-load.c:347
 msgid "cannot allocate name record"
 msgstr "nie mo¿na przydzieliæ pamiêci dla rekordu nazwy"
 
-#: elf/dl-load.c:441 elf/dl-load.c:520 elf/dl-load.c:612 elf/dl-load.c:707
+#: elf/dl-load.c:449 elf/dl-load.c:528 elf/dl-load.c:648 elf/dl-load.c:743
 msgid "cannot create cache for search path"
 msgstr "nie mo¿na utworzyæ bufora dla ¶cie¿ki przeszukiwania"
 
-#: elf/dl-load.c:543
+#: elf/dl-load.c:551
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "nie mo¿na utworzyæ kopii RUNPATH/RPATH"
 
-#: elf/dl-load.c:598
+#: elf/dl-load.c:634
 msgid "cannot create search path array"
 msgstr "nie mo¿na utworzyæ tablicy ¶cie¿ki przeszukiwania"
 
-#: elf/dl-load.c:794
+#: elf/dl-load.c:830
 msgid "cannot stat shared object"
 msgstr "nie mo¿na wykonaæ stat na obiekcie dzielonym"
 
-#: elf/dl-load.c:838
+#: elf/dl-load.c:874
 msgid "cannot open zero fill device"
 msgstr "nie mo¿na otworzyæ urz±dzenia wype³niaj±cego zerami"
 
-#: elf/dl-load.c:847 elf/dl-load.c:1902
+#: elf/dl-load.c:883 elf/dl-load.c:1929
 msgid "cannot create shared object descriptor"
 msgstr "nie mo¿na utworzyæ deskryptora obiektu dzielonego"
 
-#: elf/dl-load.c:866 elf/dl-load.c:1398 elf/dl-load.c:1481
+#: elf/dl-load.c:902 elf/dl-load.c:1470 elf/dl-load.c:1553
 msgid "cannot read file data"
 msgstr "nie mo¿na odczytaæ danych z pliku"
 
-#: elf/dl-load.c:906
+#: elf/dl-load.c:946
 msgid "ELF load command alignment not page-aligned"
 msgstr "wyrównanie polecenia wczytania ELF nie wyrównane do granicy stron"
 
-#: elf/dl-load.c:913
+#: elf/dl-load.c:953
 msgid "ELF load command address/offset not properly aligned"
 msgstr "adres/przesuniêcie polecenia wczytania ELF niew³a¶ciwie wyrównane"
 
-#: elf/dl-load.c:988
+#: elf/dl-load.c:1037
 msgid "cannot allocate TLS data structures for initial thread"
 msgstr "nie mo¿na przydzieliæ struktur danych TLS dla pocz±tkowego w±tku"
 
-#: elf/dl-load.c:1012
+#: elf/dl-load.c:1061
 msgid "cannot handle TLS data"
 msgstr "nie mo¿na obs³u¿yæ danych TLS"
 
-#: elf/dl-load.c:1047
+#: elf/dl-load.c:1075
+msgid "object file has no loadable segments"
+msgstr "plik obiektu nie ma segmentów ³adowalnych"
+
+#: elf/dl-load.c:1110
 msgid "failed to map segment from shared object"
 msgstr "odwzorowanie segmentu z obiektu dzielonego nie powiod³o siê"
 
-#: elf/dl-load.c:1071
+#: elf/dl-load.c:1135
 msgid "cannot dynamically load executable"
 msgstr "nie mo¿na dynamicznie wczytaæ pliku wykonywalnego"
 
-#: elf/dl-load.c:1132
+#: elf/dl-load.c:1191
 msgid "cannot change memory protections"
 msgstr "nie mo¿na zmieniæ ochrony pamiêci"
 
-#: elf/dl-load.c:1151
+#: elf/dl-load.c:1210
 msgid "cannot map zero-fill pages"
 msgstr "nie mo¿na odwzorowaæ stron wype³nionych zerami"
 
-#: elf/dl-load.c:1169
+#: elf/dl-load.c:1228
 msgid "cannot allocate memory for program header"
 msgstr "nie mo¿na przydzieliæ pamiêci na nag³ówek programu"
 
-#: elf/dl-load.c:1200
+#: elf/dl-load.c:1259
 msgid "object file has no dynamic section"
 msgstr "plik obiektu nie ma sekcji dynamicznej"
 
-#: elf/dl-load.c:1240
+#: elf/dl-load.c:1299
 msgid "shared object cannot be dlopen()ed"
 msgstr "obiekt dzielony nie mo¿e byæ otwarty przez dlopen()"
 
-#: elf/dl-load.c:1263
+#: elf/dl-load.c:1322
 msgid "cannot create searchlist"
 msgstr "nie mo¿na utworzyæ listy przeszukiwañ"
 
-#: elf/dl-load.c:1398
+#: elf/dl-load.c:1352
+msgid "cannot enable executable stack as shared object requires"
+msgstr "nie mo¿na w³±czyæ wykonywalnego stosu wymaganego przez obiekt dzielony"
+
+#: elf/dl-load.c:1470
 msgid "file too short"
 msgstr "plik za krótki"
 
-#: elf/dl-load.c:1421
+#: elf/dl-load.c:1493
 msgid "invalid ELF header"
 msgstr "nieprawid³owy nag³ówek ELF"
 
-#: elf/dl-load.c:1430
+#: elf/dl-load.c:1502
 msgid "ELF file data encoding not big-endian"
 msgstr "kodowanie danych w pliku ELF nie jest big-endian"
 
-#: elf/dl-load.c:1432
+#: elf/dl-load.c:1504
 msgid "ELF file data encoding not little-endian"
 msgstr "kodowanie danych w pliku ELF nie jest little-endian"
 
-#: elf/dl-load.c:1436
+#: elf/dl-load.c:1508
 msgid "ELF file version ident does not match current one"
 msgstr "identyfikator wersji pliku ELF nie zgadza siê z aktualnym"
 
-#: elf/dl-load.c:1440
+#: elf/dl-load.c:1512
 msgid "ELF file OS ABI invalid"
 msgstr "niepoprawne ABI systemu w pliku ELF"
 
-#: elf/dl-load.c:1442
+#: elf/dl-load.c:1514
 msgid "ELF file ABI version invalid"
 msgstr "niepoprawna wersja ABI w pliku ELF"
 
-#: elf/dl-load.c:1445
+#: elf/dl-load.c:1517
 msgid "internal error"
 msgstr "b³±d wewnêtrzny"
 
-#: elf/dl-load.c:1452
+#: elf/dl-load.c:1524
 msgid "ELF file version does not match current one"
 msgstr "wersja pliku ELF nie zgadza siê z aktualn±"
 
-#: elf/dl-load.c:1460
+#: elf/dl-load.c:1532
 msgid "ELF file's phentsize not the expected size"
 msgstr "phentsize w pliku ELF nie jest oczekiwanym rozmiarem"
 
-#: elf/dl-load.c:1466
+#: elf/dl-load.c:1538
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "tylko ET_DYN i ET_EXEC mog± byæ wczytane"
 
-#: elf/dl-load.c:1917
+#: elf/dl-load.c:1944
 msgid "cannot open shared object file"
 msgstr "nie mo¿na otworzyæ pliku obiektu dzielonego"
 
-#: elf/dl-lookup.c:265 elf/dl-lookup.c:430
+#: elf/dl-lookup.c:265 elf/dl-lookup.c:443
 msgid "relocation error"
 msgstr "b³±d relokacji"
 
@@ -5592,37 +5698,37 @@ msgstr "nie mo
 msgid "empty dynamic string token substitution"
 msgstr "puste dynamiczne podstawienie znaku ³añcucha"
 
-#: elf/dl-open.c:351 elf/dl-open.c:362
+#: elf/dl-open.c:361 elf/dl-open.c:372
 msgid "cannot create scope list"
 msgstr "nie mo¿na utworzyæ listy zakresów"
 
-#: elf/dl-open.c:424
+#: elf/dl-open.c:434
 msgid "cannot create TLS data structures"
 msgstr "nie mo¿na utworzyæ struktur danych TLS"
 
-#: elf/dl-open.c:486
+#: elf/dl-open.c:496
 msgid "invalid mode for dlopen()"
 msgstr "b³êdny typ dla dlopen()"
 
-#: elf/dl-reloc.c:58
-msgid "shared object cannot be dlopen()ed: static TLS memory too small"
-msgstr "nie mo¿na wykonaæ dlopen() obiektu dzielonego: za ma³o statycznej pamiêci TLS"
+#: elf/dl-reloc.c:57
+msgid "cannot allocate memory in static TLS block"
+msgstr "nie mo¿na przydzieliæ pamiêci w statycznym bloku TLS"
 
-#: elf/dl-reloc.c:118
+#: elf/dl-reloc.c:176
 msgid "cannot make segment writable for relocation"
 msgstr "nie mo¿na uczyniæ segmentu zapisywalnym w celu relokacji"
 
-#: elf/dl-reloc.c:219
+#: elf/dl-reloc.c:277
 #, c-format
 msgid "%s: profiler found no PLTREL in object %s\n"
 msgstr "%s: profiler nie znalaz³ PLTREL w obiekcie %s\n"
 
-#: elf/dl-reloc.c:231
+#: elf/dl-reloc.c:289
 #, c-format
 msgid "%s: profiler out of memory shadowing PLTREL of %s\n"
 msgstr "%s: brak pamiêci profilera podczas przykrywania PLTREL z %s\n"
 
-#: elf/dl-reloc.c:246
+#: elf/dl-reloc.c:304
 msgid "cannot restore segment prot after reloc"
 msgstr "nie mo¿na odtworzyæ ochrony segmentu po relokacji"
 
@@ -5630,7 +5736,7 @@ msgstr "nie mo
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "RTLD_NEXT wyst±pi³o w kodzie nie ³adowanym dynamicznie"
 
-#: elf/dl-version.c:302
+#: elf/dl-version.c:303
 msgid "cannot allocate version reference table"
 msgstr "nie mo¿na przydzieliæ tablicy odniesieñ do wersji"
 
@@ -5674,143 +5780,148 @@ msgstr "R
 msgid "Format to use: new, old or compat (default)"
 msgstr "U¿ywany format: new, old lub compat (domy¶lny)"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "Konfiguracja powi±zañ dynamicznego linkera."
 
-#: elf/ldconfig.c:294
+#: elf/ldconfig.c:297
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "¦cie¿ka `%s' podana wiêcej ni¿ raz"
 
-#: elf/ldconfig.c:338
+#: elf/ldconfig.c:341
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s nie jest znanym rodzajem biblioteki"
 
-#: elf/ldconfig.c:356
+#: elf/ldconfig.c:361
 #, c-format
 msgid "Can't stat %s"
 msgstr "Nie mo¿na wykonaæ stat na %s"
 
-#: elf/ldconfig.c:426
+#: elf/ldconfig.c:431
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Nie mo¿na wykonaæ stat na %s\n"
 
-#: elf/ldconfig.c:436
+#: elf/ldconfig.c:441
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s nie jest dowi±zaniem symbolicznym\n"
 
-#: elf/ldconfig.c:455
+#: elf/ldconfig.c:460
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Nie mo¿na usun±æ %s"
 
-#: elf/ldconfig.c:461
+#: elf/ldconfig.c:466
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Nie mo¿na dowi±zaæ %s do %s"
 
-#: elf/ldconfig.c:467
+#: elf/ldconfig.c:472
 msgid " (changed)\n"
 msgstr " (zmieniono)\n"
 
-#: elf/ldconfig.c:469
+#: elf/ldconfig.c:474
 msgid " (SKIPPED)\n"
 msgstr " (POMINIÊTO)\n"
 
-#: elf/ldconfig.c:524
+#: elf/ldconfig.c:529
 #, c-format
 msgid "Can't find %s"
 msgstr "Nie mo¿na znale¼æ %s"
 
-#: elf/ldconfig.c:540
+#: elf/ldconfig.c:545
 #, c-format
 msgid "Can't lstat %s"
 msgstr "Nie mo¿na wykonaæ lstat na %s"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:552
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "Zignorowano plik %s poniewa¿ nie jest zwyk³ym plikiem."
 
-#: elf/ldconfig.c:555
+#: elf/ldconfig.c:560
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "Nie utworzono dowi±zania poniewa¿ nie znaleziono soname dla %s"
 
-#: elf/ldconfig.c:646
+#: elf/ldconfig.c:651
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Nie mo¿na otworzyæ katalogu %s"
 
-#: elf/ldconfig.c:701 elf/ldconfig.c:748
+#: elf/ldconfig.c:706 elf/ldconfig.c:753
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Nie mo¿na wykonaæ lstat na %s"
 
-#: elf/ldconfig.c:713
+#: elf/ldconfig.c:718
 #, c-format
 msgid "Cannot stat %s"
 msgstr "Nie mo¿na wykonaæ stat na %s"
 
-#: elf/ldconfig.c:770 elf/readlib.c:93
+#: elf/ldconfig.c:775 elf/readlib.c:92
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Nie znaleziono pliku wej¶ciowego %s.\n"
 
-#: elf/ldconfig.c:804
+#: elf/ldconfig.c:826
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "biblioteka libc5 %s w z³ym katalogu"
 
-#: elf/ldconfig.c:807
+#: elf/ldconfig.c:829
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "biblioteka libc6 %s w z³ym katalogu"
 
-#: elf/ldconfig.c:810
+#: elf/ldconfig.c:832
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "biblioteka libc4 %s w z³ym katalogu"
 
-#: elf/ldconfig.c:837
+#: elf/ldconfig.c:859
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "biblioteki %s i %s w katalogu %s maj± to samo soname ale inny rodzaj."
 
-#: elf/ldconfig.c:940
+#: elf/ldconfig.c:962
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Nie mo¿na otworzyæ pliku konfiguracyjnego %s"
 
-#: elf/ldconfig.c:1024
+#: elf/ldconfig.c:1033
+#, c-format
+msgid "relative path `%s' used to build cache"
+msgstr "u¿yto wzglêdnej ¶cie¿ki `%s' do utworzenia bufora"
+
+#: elf/ldconfig.c:1057
 msgid "Can't chdir to /"
 msgstr "Nie mo¿na przej¶æ do katalogu /"
 
-#: elf/ldconfig.c:1066
+#: elf/ldconfig.c:1099
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Nie mo¿na otworzyæ katalogu pliku bufora %s\n"
 
-#: elf/readlib.c:99
+#: elf/readlib.c:98
 #, c-format
 msgid "Cannot fstat file %s.\n"
 msgstr "Nie mo¿na wykonaæ fstat na pliku %s.\n"
 
-#: elf/readlib.c:109
+#: elf/readlib.c:108
 #, c-format
 msgid "File %s is too small, not checked."
 msgstr "Plik %s jest za ma³y, nie sprawdzony."
 
-#: elf/readlib.c:118
+#: elf/readlib.c:117
 #, c-format
 msgid "Cannot mmap file %s.\n"
 msgstr "Nie mo¿na wykonaæ mmap pliku %s.\n"
 
-#: elf/readlib.c:158
+#: elf/readlib.c:155
 #, c-format
 msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
 msgstr "%s nie jest plikiem ELF - ma z³e bajty magiczne na pocz±tku.\n"

diff --git a/resolv/Versions b/resolv/Versions
index 1a24d30..a809508 100644 (file)
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -38,6 +38,8 @@ libc {
     # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
     h_errno; __resp;
 %endif
+
+    __res_maybe_init;
   }
 }
 

diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c
index c93ca51..a02d0fb 100644 (file)
--- a/resolv/gethnamaddr.c
+++ b/resolv/gethnamaddr.c
@@ -493,10 +493,10 @@ gethostbyname(name)
 {
        struct hostent *hp;
 
-       if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1) {
+       if (__res_maybe_init (&_res, 0) == -1) {
                __set_h_errno (NETDB_INTERNAL);
                return (NULL);
-       }
+       }
        if (_res.options & RES_USE_INET6) {
                hp = gethostbyname2(name, AF_INET6);
                if (hp)
@@ -522,7 +522,7 @@ gethostbyname2(name, af)
        struct hostent *ret;
        extern struct hostent *_gethtbyname2();
 
-       if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1) {
+       if (__res_maybe_init (&_res, 0) == -1) {
                __set_h_errno (NETDB_INTERNAL);
                return (NULL);
        }
@@ -665,7 +665,7 @@ gethostbyaddr(addr, len, af)
 #endif /*SUNSECURITY*/
        extern struct hostent *_gethtbyaddr();
 
-       if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1) {
+       if (__res_maybe_init (&_res, 0) == -1) {
                __set_h_errno (NETDB_INTERNAL);
                return (NULL);
        }

diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index 0424cb9..91699cc 100644 (file)
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -145,7 +145,7 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
   int olderr = errno;
   enum nss_status status;
 
-  if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+  if (__res_maybe_init (&_res, 0) == -1)
     return NSS_STATUS_UNAVAIL;
 
   switch (af) {
@@ -263,7 +263,7 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
   int n, status;
   int olderr = errno;
 
-  if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+  if (__res_maybe_init (&_res, 0) == -1)
     return NSS_STATUS_UNAVAIL;
 
   if (af == AF_INET6 && len == IN6ADDRSZ

diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index efda486..a5d2c79 100644 (file)
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -120,7 +121,7 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
   char *qbuf;
   enum nss_status status;
 
-  if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+  if (__res_maybe_init (&_res, 0) == -1)
     return NSS_STATUS_UNAVAIL;
 
   qbuf = strdupa (name);
@@ -171,7 +172,7 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result,
   if (type != AF_INET)
     return NSS_STATUS_UNAVAIL;
 
-  if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+  if (__res_maybe_init (&_res, 0) == -1)
     return NSS_STATUS_UNAVAIL;
 
   net2 = (u_int32_t) net;

diff --git a/resolv/res_data.c b/resolv/res_data.c
index 7488ba7..2183e02 100644 (file)
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -141,7 +141,7 @@ fp_query(const u_char *msg, FILE *file) {
 
 void
 fp_nquery(const u_char *msg, int len, FILE *file) {
-       if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1)
+       if (__res_maybe_init (&_res, 0) == -1)
                return;
 
        res_pquery(&_res, msg, len, file);
@@ -157,7 +157,7 @@ res_mkquery(int op,                 /* opcode of query */
            u_char *buf,                /* buffer to put query */
            int buflen)                 /* size of buffer */
 {
-       if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+       if (__res_maybe_init (&_res, 1) == -1) {
                RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
                return (-1);
        }
@@ -169,7 +169,7 @@ res_mkquery(int op,                 /* opcode of query */
 #ifdef BIND_UPDATE
 int
 res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-       if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+       if (__res_maybe_init (&_res, 1) == -1) {
                RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
                return (-1);
        }
@@ -184,7 +184,7 @@ res_query(const char *name, /* domain name */
          u_char *answer,       /* buffer to put answer */
          int anslen)           /* size of answer buffer */
 {
-       if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+       if (__res_maybe_init (&_res, 1) == -1) {
                RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
                return (-1);
        }
@@ -208,7 +208,7 @@ res_isourserver(const struct sockaddr_in *inp) {
 
 int
 res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
-       if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+       if (__res_maybe_init (&_res, 1) == -1) {
                /* errno should have been set by res_init() in this case. */
                return (-1);
        }
@@ -221,7 +221,7 @@ int
 res_sendsigned(const u_char *buf, int buflen, ns_tsig_key *key,
               u_char *ans, int anssiz)
 {
-       if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+       if (__res_maybe_init (&_res, 1) == -1) {
                /* errno should have been set by res_init() in this case. */
                return (-1);
        }
@@ -249,7 +249,7 @@ res_close(void) {
 #ifdef BIND_UPDATE
 int
 res_update(ns_updrec *rrecp_in) {
-       if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+       if (__res_maybe_init (&_res, 1) == -1) {
                RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
                return (-1);
        }
@@ -264,7 +264,7 @@ res_search(const char *name,        /* domain name */
           u_char *answer,      /* buffer to put answer */
           int anslen)          /* size of answer */
 {
-       if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+       if (__res_maybe_init (&_res, 1) == -1) {
                RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
                return (-1);
        }
@@ -279,7 +279,7 @@ res_querydomain(const char *name,
                u_char *answer,         /* buffer to put answer */
                int anslen)             /* size of answer */
 {
-       if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+       if (__res_maybe_init (&_res, 1) == -1) {
                RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
                return (-1);
        }

diff --git a/resolv/res_init.c b/resolv/res_init.c
index d0559c3..078480c 100644 (file)
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -161,6 +161,10 @@ __res_vinit(res_state statp, int preinit) {
 #ifndef RFC1535
        int dots;
 #endif
+#ifdef _LIBC
+       extern unsigned long long int __res_initstamp attribute_hidden;
+       statp->_u._ext.initstamp = __res_initstamp;
+#endif
 
        if (!preinit) {
                statp->retrans = RES_TIMEOUT;

diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index 94bb2fd..b1047f0 100644 (file)
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -15,16 +15,31 @@
  * SOFTWARE.
  */
 
+#include <limits.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
+#include <bits/libc-lock.h>
 
 
 /* The following bit is copied from res_data.c (where it is #ifdef'ed
    out) since res_init() should go into libc.so but the rest of that
    file should not.  */
 
+unsigned long long int __res_initstamp attribute_hidden;
+/* We have atomic increment operations on 64-bit platforms.  */
+#if __WORDSIZE == 64
+# define atomicinclock(lock) (void) 0
+# define atomicincunlock(lock) (void) 0
+# define atomicinc(var) atomic_increment (&(var))
+#else
+__libc_lock_define_initialized (static, lock);
+# define atomicinclock(lock) __libc_lock_lock (lock)
+# define atomicincunlock(lock) __libc_lock_unlock (lock)
+# define atomicinc(var) ++var
+#endif
+
 int
 res_init(void) {
        extern int __res_vinit(res_state, int);
@@ -70,8 +85,45 @@ res_init(void) {
        if (!_res.id)
                _res.id = res_randomid();
 
+       atomicinclock (lock);
+       /* Request all threads to re-initialize their resolver states,
+          resolv.conf might have changed.  */
+       atomicinc (__res_initstamp);
+       atomicincunlock (lock);
+
        return (__res_vinit(&_res, 1));
 }
+
+/* Initialize resp if RES_INIT is not yet set or if res_init in some other
+   thread requested re-initializing.  */
+int
+__res_maybe_init (res_state resp, int preinit)
+{
+       if (resp->options & RES_INIT) {
+               if (__res_initstamp != resp->_u._ext.initstamp) {
+                       if (resp->nscount > 0) {
+                               __res_nclose (resp);
+                               for (int ns = 0; ns < MAXNS; ns++) {
+                                       free (resp->_u._ext.nsaddrs[ns]);
+                                       resp->_u._ext.nsaddrs[ns] = NULL;
+                               }
+                               return __res_vinit (resp, 1);
+                       }
+               }
+               return 0;
+       } else if (preinit) {
+               if (!resp->retrans)
+                       resp->retrans = RES_TIMEOUT;
+               if (!resp->retry)
+                       resp->retry = 4;
+               resp->options = RES_DEFAULT;
+               if (!resp->id)
+                       resp->id = res_randomid ();
+               return __res_vinit (resp, 1);
+       } else
+               return __res_ninit (resp);
+}
+libc_hidden_def (__res_maybe_init)
 \f
 /* This needs to be after the use of _res in res_init, above.  */
 #undef _res

diff --git a/resolv/resolv.h b/resolv/resolv.h
index 010d7dd..00eabe8 100644 (file)
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -134,6 +134,12 @@ struct __res_state {
                        u_int16_t               nscount6;
                        u_int16_t               nsinit;
                        struct sockaddr_in6     *nsaddrs[MAXNS];
+#ifdef _LIBC
+                       unsigned long long int  initstamp
+                         __attribute__((packed));
+#else
+                       unsigned int            _initstamp[2];
+#endif
                } _ext;
        } _u;
 };

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index e3986d9..a2972b1 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -604,8 +604,12 @@ gaih_inet (const char *name, const struct gaih_service *service,
            {
              if (req->ai_family == AF_UNSPEC || req->ai_family == AF_INET6)
                at->family = AF_INET6;
-             else if (IN6_IS_ADDR_V4MAPPED (at->addr))
-               *(uint32_t *) at->addr = ((uint32_t *) at->addr)[3];
+             else if (req->ai_family == AF_INET
+                      && IN6_IS_ADDR_V4MAPPED (at->addr))
+               {
+                 *(uint32_t *) at->addr = ((uint32_t *) at->addr)[3];
+                 at->family = AF_INET;
+               }
              else
                return -EAI_ADDRFAMILY;
 
@@ -662,7 +666,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
                no_more = __nss_database_lookup ("hosts", NULL,
                                                 "dns [!UNAVAIL=return] files", &nip);
 
-             if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1)
+             if (__res_maybe_init (&_res, 0) == -1)
                no_more = 1;
              old_res_options = _res.options;
              _res.options &= ~RES_USE_INET6;