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.

16 files changed, 842 insertions, 624 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ab1176b9d..89f938bd18 100644
--- 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 630c71f96f..7fffb310f1 100644
--- 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 0437753035..d62a8ff1e5 100644
--- 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 17207945b9..9576dd53b7 100644
--- 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 6338aa5905..9e425ce55e 100644
--- 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 7545b80c4a..a0cfa72bd2 100644
--- 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 c35c60cc4c..84914a140b 100644
--- 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żna otworzyć `%s'"
 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łąd podczas zamykania wejścia `%s'"
 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ów między różnymi metodami kodowania."
 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żna wygenerować pliku wyjściowego"
 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/pro