summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-01-01 15:28:18 +0000
committerUlrich Drepper <drepper@redhat.com>1997-01-01 15:28:18 +0000
commit6bc31da01b1271826c8feefb5f0efdf22d64061c (patch)
tree14aacf79623cde45cda8b839a225609eb4873540
parentea971c878fda0a93a568732ca5a8a36524f77ec2 (diff)
downloadglibc-6bc31da01b1271826c8feefb5f0efdf22d64061c.tar.gz
glibc-6bc31da01b1271826c8feefb5f0efdf22d64061c.tar.xz
glibc-6bc31da01b1271826c8feefb5f0efdf22d64061c.zip
update from main archive 970101 cvs/libc-970102
Wed Jan  1 15:15:00 1997  Ulrich Drepper  <drepper@cygnus.com>

	* libio/Makefile (routines): Add fcloseall.
	* libio/fcloseall.c: New file.
	* libio/stdio.h [__USE_GNU]: Add prototype for fcloseall.
	* libio/iofclose.c: Don't close all streams when argument is NULL.

	* stdio/Makefile (routines): Add fcloseall.
	* stdio/fcloseall.c: New file.
	* stdio/stdio.h [__USE_GNU]: Add prototype for fcloseall.
	* stdio/fclose.c: Don't close all streams when argument is NULL.

	* manual/stdio.texi: Document fcloseall.

	* sysdeps/generic/abort.c: Call __fcloseall instead of fclose with
	NULL argument.

	* socket/sys/un.h (SUN_LEN): Add cast.

	* sunrpc/auth_unix.c (authunix_create): Change parameter types
	of uid, gid, and aup_gids to uid_t and gid_t respectively.
	(authunix_create_default): Likewise.
	(authunix_refresh): Correct cast for aup_gids assignment.
	* sunrpc/rpc/auth.h (authunix_create): Correct types in declaration.
	* sunrpc/rpc/auth_unix.h (struct authunix_parms): Correct field
	types to uid_t and gid_t respectively.
	(struct short_hand_verf): Likewise.
	Reported by Andreas Schwab.

	* sysdeps/ieee754/Makefile: New file.  Make sure ieee754.h gets
	installed.
	* sysdeps/ieee754/ieee754.h: Protect against multiple inclusion and
	use in C++ programs.

	* sysdeps/libm-i387/e_pow.S: New file.  Optimized ix87 assembler
	version of pow() function.
	* sysdeps/libm-i387/e_powf.S: New file.  Float version.
	* sysdeps/libm-i387/e_powl.S: New file.  Long double version.

	* sysdeps/libm-i387/s_expm1.S: New file.  Optimized ix87 assembler
	version of expm1() function.
	* sysdeps/libm-i387/s_expm1f.S: New file.  Float version.
	* sysdeps/libm-i387/s_expm1l.S: New file.  Long double version.

	* sysdeps/libm-i387/e_exp.S: Optimize handling of +-Inf.
	Better handling of computation stack from current NetBSD sources.
	* sysdeps/libm-i387/e_expf.S: Likewise.
	* sysdeps/libm-i387/e_expl.S: Likewise.

	* sysdeps/libm-i387/e_log.S: Use fstp instead of fincstp.
	* sysdeps/libm-i387/e_logf.S: Likewise.
	* sysdeps/libm-i387/e_logl.S: Likewise.
	* sysdeps/libm-i387/e_log10.S: Likewise.
	* sysdeps/libm-i387/e_log10f.S: Likewise.
	* sysdeps/libm-i387/e_log10l.S: Likewise.
	* sysdeps/libm-i387/s_asinh.S: Likewise.
	* sysdeps/libm-i387/s_asinhf.S: Likewise.
	* sysdeps/libm-i387/s_asinhl.S: Likewise.
	* sysdeps/libm-i387/s_significandl.S: Likewise.

	* sysdeps/libm-i387/s_ceil.S: Don't create stack frame.  Modify
	stack pointer directly.  Use 32 bit instead of 16 bit operations.
	* sysdeps/libm-i387/s_ceilf.S: Likewise.
	* sysdeps/libm-i387/s_ceill.S: Likewise.
	* sysdeps/libm-i387/s_floor.S: Likewise.
	* sysdeps/libm-i387/s_floorf.S: Likewise.
	* sysdeps/libm-i387/s_floorl.S: Likewise.

	* sysdeps/libm-ieee754/e_coshf.c (huge): Don't declare volatile.
	* sysdeps/libm-ieee754/e_expf.c: Likewise.
	* sysdeps/libm-ieee754/e_powf.c: Likewise.
	From current NetBSD sources.

	* sysdeps/libm-ieee754/e_hypot.c (__ieee754_hypot): Don't initialize
	`a' and `b' in definition.
	* sysdeps/libm-ieee754/e_hypotf.c: Likewise.

	* sysdeps/libm-ieee754/e_hypotl.c: New file.  Long double
	implementation.
	* sysdeps/libm-ieee754/e_sinhl.c: New file.  Long double
	implementation.
	* sysdeps/stub/e_hypotl.c: Removed.  We have a real version now.
	* sysdeps/stub/e_sinhl.c: Removed.

	* sysdeps/posix/sigpause.c (__sigpause): Use sigdelset instead of
	sigaddset.  Reported by Andreas Schwab.
	(__default_sigpause): New function.  Call __sigpause as BSD version.
	Make this the default function by providing alias sigpause.
	* sysdeps/stub/sigpause.c (__default_sigpause): New funciton.
	Simply fail.  Provide alias sigpause.

Wed Jan  1 12:34:54 1997  Ulrich Drepper  <drepper@cygnus.com>

	* po/es.po: Update for glibc-1.98.
	* po/fr.po: Likewise.
	* po/sv.po: New file.  Swedish translation.

Wed Jan  1 12:18:07 1997   MacGyver  <macgyver@tos.net>

	* values.h: Fix typos: use SHRT_MAX but SHORT_MAX and SHRT_MIN but
	SHORT_MIN.

Tue Dec 24 23:10:21 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makefile: Replace `stubs.h' by `gnu/stubs.h'.
	* features.h: Include <gnu/stubs.h> instead of <stubs.h>.

Tue Dec 24 22:16:55 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makefile (subdirs): Move `elf' last so that librtld.so isn't
	relinked in the `make others' pass if an add-on adds something to
	libc.

Mon Dec 23 21:23:16 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/abort-instr.h: New File.

Mon Dec 23 21:16:38 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/Makefile ($(subdir)=elf): Define CFLAGS-rtld.c
	to prevent warning.

Mon Dec 23 21:14:22 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* resolv/Makefile (subdirs-dirs): Define.

Mon Dec 23 20:56:49 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/gnu/utmpbits.h (struct utmp): Fix padding.

Mon Dec 30 11:05:11 1996  Ulrich Drepper  <drepper@cygnus.com>

	Update from ADO tzcode1996o.
	* time/difftime.c: De-ANSI-declfy.  Simplify computation of hibit
	according to ADO version.
	* time/zic.c: Correct typo is message.

	Update from ADO tzdata1996n.
	* time/asia: Updated.
	* time/australasia: Likewise.
	* time/europe: Likewise.
	* time/northamerica: Likewise.
	* time/southamerica: Likewise.
-rw-r--r--ChangeLog144
-rw-r--r--Makefile12
-rw-r--r--features.h6
-rw-r--r--libio/Makefile2
-rw-r--r--libio/fcloseall.c37
-rw-r--r--libio/iofclose.c33
-rw-r--r--libio/stdio.h3
-rw-r--r--manual/stdio.texi21
-rw-r--r--po/es.po1071
-rw-r--r--po/fr.po538
-rw-r--r--po/sv.po2828
-rw-r--r--resolv/Makefile1
-rw-r--r--socket/sys/un.h2
-rw-r--r--stdio/Makefile8
-rw-r--r--stdio/fclose.c22
-rw-r--r--stdio/fcloseall.c37
-rw-r--r--stdio/stdio.h8
-rw-r--r--sunrpc/auth_unix.c12
-rw-r--r--sunrpc/rpc/auth.h5
-rw-r--r--sunrpc/rpc/auth_unix.h24
-rw-r--r--sysdeps/generic/abort.c2
-rw-r--r--sysdeps/gnu/utmpbits.h2
-rw-r--r--sysdeps/ieee754/Makefile3
-rw-r--r--sysdeps/ieee754/ieee754.h11
-rw-r--r--sysdeps/libm-i387/e_exp.S21
-rw-r--r--sysdeps/libm-i387/e_expf.S19
-rw-r--r--sysdeps/libm-i387/e_expl.S19
-rw-r--r--sysdeps/libm-i387/e_log.S2
-rw-r--r--sysdeps/libm-i387/e_log10.S2
-rw-r--r--sysdeps/libm-i387/e_log10f.S2
-rw-r--r--sysdeps/libm-i387/e_log10l.S2
-rw-r--r--sysdeps/libm-i387/e_logf.S2
-rw-r--r--sysdeps/libm-i387/e_logl.S2
-rw-r--r--sysdeps/libm-i387/e_pow.S120
-rw-r--r--sysdeps/libm-i387/e_powf.S120
-rw-r--r--sysdeps/libm-i387/e_powl.S120
-rw-r--r--sysdeps/libm-i387/s_asinh.S2
-rw-r--r--sysdeps/libm-i387/s_asinhf.S2
-rw-r--r--sysdeps/libm-i387/s_asinhl.S2
-rw-r--r--sysdeps/libm-i387/s_ceil.S20
-rw-r--r--sysdeps/libm-i387/s_ceilf.S20
-rw-r--r--sysdeps/libm-i387/s_ceill.S20
-rw-r--r--sysdeps/libm-i387/s_expm1.S83
-rw-r--r--sysdeps/libm-i387/s_expm1f.S83
-rw-r--r--sysdeps/libm-i387/s_expm1l.S83
-rw-r--r--sysdeps/libm-i387/s_floor.S26
-rw-r--r--sysdeps/libm-i387/s_floorf.S26
-rw-r--r--sysdeps/libm-i387/s_floorl.S26
-rw-r--r--sysdeps/libm-i387/s_significandl.S2
-rw-r--r--sysdeps/libm-ieee754/e_coshf.c10
-rw-r--r--sysdeps/libm-ieee754/e_expf.c12
-rw-r--r--sysdeps/libm-ieee754/e_hypot.c24
-rw-r--r--sysdeps/libm-ieee754/e_hypotf.c6
-rw-r--r--sysdeps/libm-ieee754/e_hypotl.c133
-rw-r--r--sysdeps/libm-ieee754/e_powf.c4
-rw-r--r--sysdeps/libm-ieee754/e_sinhl.c91
-rw-r--r--sysdeps/m68k/Makefile10
-rw-r--r--sysdeps/posix/sigpause.c15
-rw-r--r--sysdeps/stub/e_hypotl.c11
-rw-r--r--sysdeps/stub/e_sinhl.c11
-rw-r--r--time/asia73
-rw-r--r--time/australasia10
-rw-r--r--time/difftime.c44
-rw-r--r--time/europe30
-rw-r--r--time/northamerica6
-rw-r--r--time/southamerica6
-rw-r--r--time/zic.c4
-rw-r--r--values.h4
68 files changed, 5224 insertions, 938 deletions
diff --git a/ChangeLog b/ChangeLog
index 03f06b09a2..06c925972a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,147 @@
+Wed Jan  1 15:15:00 1997  Ulrich Drepper  <drepper@cygnus.com>
+
+	* libio/Makefile (routines): Add fcloseall.
+	* libio/fcloseall.c: New file.
+	* libio/stdio.h [__USE_GNU]: Add prototype for fcloseall.
+	* libio/iofclose.c: Don't close all streams when argument is NULL.
+
+	* stdio/Makefile (routines): Add fcloseall.
+	* stdio/fcloseall.c: New file.
+	* stdio/stdio.h [__USE_GNU]: Add prototype for fcloseall.
+	* stdio/fclose.c: Don't close all streams when argument is NULL.
+
+	* manual/stdio.texi: Document fcloseall.
+
+	* sysdeps/generic/abort.c: Call __fcloseall instead of fclose with
+	NULL argument.
+
+	* socket/sys/un.h (SUN_LEN): Add cast.
+
+	* sunrpc/auth_unix.c (authunix_create): Change parameter types
+	of uid, gid, and aup_gids to uid_t and gid_t respectively.
+	(authunix_create_default): Likewise.
+	(authunix_refresh): Correct cast for aup_gids assignment.
+	* sunrpc/rpc/auth.h (authunix_create): Correct types in declaration.
+	* sunrpc/rpc/auth_unix.h (struct authunix_parms): Correct field
+	types to uid_t and gid_t respectively.
+	(struct short_hand_verf): Likewise.
+	Reported by Andreas Schwab.
+
+	* sysdeps/ieee754/Makefile: New file.  Make sure ieee754.h gets
+	installed.
+	* sysdeps/ieee754/ieee754.h: Protect against multiple inclusion and
+	use in C++ programs.
+
+	* sysdeps/libm-i387/e_pow.S: New file.  Optimized ix87 assembler
+	version of pow() function.
+	* sysdeps/libm-i387/e_powf.S: New file.  Float version.
+	* sysdeps/libm-i387/e_powl.S: New file.  Long double version.
+
+	* sysdeps/libm-i387/s_expm1.S: New file.  Optimized ix87 assembler
+	version of expm1() function.
+	* sysdeps/libm-i387/s_expm1f.S: New file.  Float version.
+	* sysdeps/libm-i387/s_expm1l.S: New file.  Long double version.
+
+	* sysdeps/libm-i387/e_exp.S: Optimize handling of +-Inf.
+	Better handling of computation stack from current NetBSD sources.
+	* sysdeps/libm-i387/e_expf.S: Likewise.
+	* sysdeps/libm-i387/e_expl.S: Likewise.
+
+	* sysdeps/libm-i387/e_log.S: Use fstp instead of fincstp.
+	* sysdeps/libm-i387/e_logf.S: Likewise.
+	* sysdeps/libm-i387/e_logl.S: Likewise.
+	* sysdeps/libm-i387/e_log10.S: Likewise.
+	* sysdeps/libm-i387/e_log10f.S: Likewise.
+	* sysdeps/libm-i387/e_log10l.S: Likewise.
+	* sysdeps/libm-i387/s_asinh.S: Likewise.
+	* sysdeps/libm-i387/s_asinhf.S: Likewise.
+	* sysdeps/libm-i387/s_asinhl.S: Likewise.
+	* sysdeps/libm-i387/s_significandl.S: Likewise.
+
+	* sysdeps/libm-i387/s_ceil.S: Don't create stack frame.  Modify
+	stack pointer directly.  Use 32 bit instead of 16 bit operations.
+	* sysdeps/libm-i387/s_ceilf.S: Likewise.
+	* sysdeps/libm-i387/s_ceill.S: Likewise.
+	* sysdeps/libm-i387/s_floor.S: Likewise.
+	* sysdeps/libm-i387/s_floorf.S: Likewise.
+	* sysdeps/libm-i387/s_floorl.S: Likewise.
+
+	* sysdeps/libm-ieee754/e_coshf.c (huge): Don't declare volatile.
+	* sysdeps/libm-ieee754/e_expf.c: Likewise.
+	* sysdeps/libm-ieee754/e_powf.c: Likewise.
+	From current NetBSD sources.
+
+	* sysdeps/libm-ieee754/e_hypot.c (__ieee754_hypot): Don't initialize
+	`a' and `b' in definition.
+	* sysdeps/libm-ieee754/e_hypotf.c: Likewise.
+
+	* sysdeps/libm-ieee754/e_hypotl.c: New file.  Long double
+	implementation.
+	* sysdeps/libm-ieee754/e_sinhl.c: New file.  Long double
+	implementation.
+	* sysdeps/stub/e_hypotl.c: Removed.  We have a real version now.
+	* sysdeps/stub/e_sinhl.c: Removed.
+
+	* sysdeps/posix/sigpause.c (__sigpause): Use sigdelset instead of
+	sigaddset.  Reported by Andreas Schwab.
+	(__default_sigpause): New function.  Call __sigpause as BSD version.
+	Make this the default function by providing alias sigpause.
+	* sysdeps/stub/sigpause.c (__default_sigpause): New funciton.
+	Simply fail.  Provide alias sigpause.
+
+Wed Jan  1 12:34:54 1997  Ulrich Drepper  <drepper@cygnus.com>
+
+	* po/es.po: Update for glibc-1.98.
+	* po/fr.po: Likewise.
+	* po/sv.po: New file.  Swedish translation.
+
+Wed Jan  1 12:18:07 1997   MacGyver  <macgyver@tos.net>
+
+	* values.h: Fix typos: use SHRT_MAX but SHORT_MAX and SHRT_MIN but
+	SHORT_MIN.
+
+Tue Dec 24 23:10:21 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makefile: Replace `stubs.h' by `gnu/stubs.h'.
+	* features.h: Include <gnu/stubs.h> instead of <stubs.h>.
+
+Tue Dec 24 22:16:55 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makefile (subdirs): Move `elf' last so that librtld.so isn't
+	relinked in the `make others' pass if an add-on adds something to
+	libc.
+
+Mon Dec 23 21:23:16 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/m68k/abort-instr.h: New File.
+
+Mon Dec 23 21:16:38 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/m68k/Makefile ($(subdir)=elf): Define CFLAGS-rtld.c
+	to prevent warning.
+
+Mon Dec 23 21:14:22 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* resolv/Makefile (subdirs-dirs): Define.
+
+Mon Dec 23 20:56:49 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/gnu/utmpbits.h (struct utmp): Fix padding.
+
+Mon Dec 30 11:05:11 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	Update from ADO tzcode1996o.
+	* time/difftime.c: De-ANSI-declfy.  Simplify computation of hibit
+	according to ADO version.
+	* time/zic.c: Correct typo is message.
+
+	Update from ADO tzdata1996n.
+	* time/asia: Updated.
+	* time/australasia: Likewise.
+	* time/europe: Likewise.
+	* time/northamerica: Likewise.
+	* time/southamerica: Likewise.
+
 Mon Dec 30 01:32:59 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* tme/localtime.c: Rewrite so that localtime_r does not call tzset,
diff --git a/Makefile b/Makefile
index db83529bdc..444962a005 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,8 @@ endif
 subdirs = csu assert ctype db locale intl catgets math setjmp signal stdlib \
 	  stdio-common $(stdio) $(malloc) string wcsmbs time dirent grp pwd \
 	  posix io termios resource misc login socket sysvipc gmon gnulib \
-	  wctype manual shadow md5-crypt nss $(sysdep-subdirs) elf po \
-	  $(add-ons)
+	  wctype manual shadow md5-crypt nss $(sysdep-subdirs) po \
+	  $(add-ons) elf
 export subdirs := $(subdirs)	# Benign, useless in GNU make before 3.63.
 
 # The mach and hurd subdirectories have many generated header files which
@@ -90,7 +90,7 @@ before-compile = $(objpfx)version-info.h
 echo-headers: subdir_echo-headers
 
 # What to install.
-install-others = $(includedir)/stubs.h
+install-others = $(includedir)/gnu/stubs.h
 ifeq (yes,$(build-shared))
 install-others += $(includedir)/gnu/lib-names.h
 endif
@@ -158,7 +158,7 @@ $(version.c-objects): $(objpfx)version-info.h
 
 # Makerules creates a file `stub-$(subdir)' for each subdirectory, which
 # contains `#define __stub_FUNCTION' for each function which is a stub.
-# Here we paste all of these together into <stubs.h>.
+# Here we paste all of these together into <gnu/stubs.h>.
 
 subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)stub-$(dir))
 
@@ -168,7 +168,7 @@ subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)stub-$(dir))
 # iterates over all the subdirs; subdir_install in each subdir depends on
 # the subdir's stubs file.  Having more direct dependencies would result in
 # extra iterations over the list for subdirs and many recursive makes.
-$(includedir)/stubs.h: subdir_install
+$(includedir)/gnu/stubs.h: subdir_install
 	@rm -f $(objpfx)stubs.h
 	(echo '/* This file is automatically generated.';\
 	 echo '   It defines a symbol `__stub_FUNCTION'\'' for each function';\
@@ -182,7 +182,7 @@ $(includedir)/stubs.h: subdir_install
 
 ifeq (yes,$(build-shared))
 
-# Like stubs.h the gnu/lib-names.h header is not used while building the
+# Like gnu/stubs.h the gnu/lib-names.h header is not used while building the
 # libc itself.  So we generate it while installing.
 $(includedir)/gnu/lib-names.h: $(common-objpfx)soversions.mk
 	@rm -f $(objpfx)lib-names.h
diff --git a/features.h b/features.h
index f1f248cc68..00cccc33de 100644
--- a/features.h
+++ b/features.h
@@ -208,15 +208,15 @@
 /* This is here only because every header file already includes this one.  */
 #ifndef _LIBC
 /* Get the definitions of all the appropriate `__stub_FUNCTION' symbols.
-   <stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
+   <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub
    which will always return failure (and set errno to ENOSYS).
 
-   We avoid including <stubs.h> when compiling the C library itself to
+   We avoid including <gnu/stubs.h> when compiling the C library itself to
    avoid a dependency loop.  stubs.h depends on every object file.  If
    this #include were done for the library source code, then every object
    file would depend on stubs.h.  */
 
-#include <stubs.h>
+#include <gnu/stubs.h>
 #endif
 
 #endif	/* features.h  */
diff --git a/libio/Makefile b/libio/Makefile
index 53a1d7d843..00eeb54fee 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -32,7 +32,7 @@ routines	:=							      \
 									      \
 	clearerr feof ferror fgetc fileno fputc freopen fseek getc getchar    \
 	memstream pclose putc putchar rewind setbuf setlinebuf vasprintf      \
-	vdprintf vscanf vsnprintf obprintf				      \
+	vdprintf vscanf vsnprintf obprintf fcloseall			      \
 									      \
 	libc_fatal
 
diff --git a/libio/fcloseall.c b/libio/fcloseall.c
new file mode 100644
index 0000000000..56233b0a5c
--- /dev/null
+++ b/libio/fcloseall.c
@@ -0,0 +1,37 @@
+/*
+Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
+
+This file is part of the GNU IO Library.  This library is free
+software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this library; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+As a special exception, if you link this library with files
+compiled with a GNU compiler to produce an executable, this does not cause
+the resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the executable file might be covered by the GNU General Public License. */
+
+#include "libioP.h"
+#ifdef __STDC__
+#include <stdlib.h>
+#endif
+
+int
+__fcloseall ()
+{
+  /* Close all streams.  */
+  _IO_cleanup ();
+  return 0;
+}
+weak_alias (__fcloseall, fcloseall)
diff --git a/libio/iofclose.c b/libio/iofclose.c
index 79a0543471..67fadbed2d 100644
--- a/libio/iofclose.c
+++ b/libio/iofclose.c
@@ -33,29 +33,20 @@ _IO_fclose (fp)
 {
   int status;
 
-  if (fp == NULL)
-    {
-      /* Close all streams.  */
-      _IO_cleanup ();
-      status = 0;
-    }
+  CHECK_FILE(fp, EOF);
+
+  _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
+  _IO_flockfile (fp);
+  if (fp->_IO_file_flags & _IO_IS_FILEBUF)
+    status = _IO_file_close_it (fp);
   else
+    status = fp->_flags & _IO_ERR_SEEN ? -1 : 0;
+  _IO_FINISH (fp);
+  _IO_cleanup_region_end (1);
+  if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr)
     {
-      CHECK_FILE(fp, EOF);
-
-      _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
-      _IO_flockfile (fp);
-      if (fp->_IO_file_flags & _IO_IS_FILEBUF)
-	status = _IO_file_close_it (fp);
-      else
-	status = fp->_flags & _IO_ERR_SEEN ? -1 : 0;
-      _IO_FINISH (fp);
-      _IO_cleanup_region_end (1);
-      if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr)
-	{
-	  fp->_IO_file_flags = 0;
-	  free(fp);
-	}
+      fp->_IO_file_flags = 0;
+      free(fp);
     }
 
   return status;
diff --git a/libio/stdio.h b/libio/stdio.h
index ba5fa5438e..e732fa6791 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -166,6 +166,9 @@ extern int __vsscanf __P ((__const char *, __const char *, _G_va_list));
 #endif
 
 #ifdef __USE_GNU
+extern int __fcloseall __P ((void));
+extern int fcloseall __P ((void));
+
 struct obstack;
 extern int obstack_vprintf __P ((struct obstack *__obstack,
 				 __const char *__fmt, _G_va_list));
diff --git a/manual/stdio.texi b/manual/stdio.texi
index 02236e3273..e922fd17d8 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -279,6 +279,27 @@ you are using NFS.
 The function @code{fclose} is declared in @file{stdio.h}.
 @end deftypefun
 
+To close all streams currently available the GNU C Library provides
+another function.
+
+@comment stdio.h
+@comment GNU
+@deftypefun int fcloseall (void)
+This function causes all open streams of the process to be closed and
+the connection to corresponding files to be broken.  All buffered data
+is written and any buffered inputis discarded.  The @code{fcloseall}
+function returns a value of @code{0} if all the files were closed
+successfully, and @code{EOF} if an error was detected.
+
+This function should be used in only in special situation, e.g., when an
+error occurred and the program must be aborted.  Normally each single
+stream should be closed separately so that problems with one stream can
+be identifier.  It is also problematic since the standard streams
+(@pxref{Standard Streams}) will also be closed.
+
+The function @code{fcloseall} is declared in @file{stdio.h}.
+@end deftypefun
+
 If the @code{main} function to your program returns, or if you call the
 @code{exit} function (@pxref{Normal Termination}), all open streams are
 automatically closed properly.  If your program terminates in any other
diff --git a/po/es.po b/po/es.po
index 963f668796..78f4f4d8b5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,11 +1,12 @@
 # Mensajes en español para GNU libc.
 # Copyright (C) 1996 Free Software Foundation, Inc.
 # Enrique Melero Gómez <justine@iprolink.ch>, 1996.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libc 1.96\n"
-"POT-Creation-Date: 1996-10-17 03:22+0200\n"
-"PO-Revision-Date: 1996-10-27 16:08 MET\n"
+"Project-Id-Version: GNU libc 1.98\n"
+"POT-Creation-Date: 1996-12-03 13:50+0100\n"
+"PO-Revision-Date: 1996-12-14 17:30+0100\n"
 "Last-Translator: Enrique Melero Gómez <justine@iprolink.ch>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +15,7 @@ msgstr ""
 
 #: sunrpc/rpcinfo.c:612
 msgid "       rpcinfo -b prognum versnum\n"
-msgstr "       rpcinfo -b númprog núnvers\n"
+msgstr "       rpcinfo -b númprog númvers\n"
 
 #: sunrpc/rpcinfo.c:613
 msgid "       rpcinfo -d prognum versnum\n"
@@ -28,9 +29,6 @@ msgstr "        rpcinfo -p [ host ]\n"
 msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
 msgstr "       rpcinfo [ -n númpuerto ] -t host númprog [ númvers ]\n"
 
-# ## Añado un espacio. sv
-# Sugerencia: port -> puerto. sv
-# Ok em+
 #: sunrpc/rpcinfo.c:517
 msgid "   program vers proto   port\n"
 msgstr "   programa vers proto   puerto\n"
@@ -44,14 +42,11 @@ msgstr " (regla desde \"%s\", línea %d)"
 msgid " done\n"
 msgstr " hecho\n"
 
-# ## Borro un "fuzzy" que había. sv
 #: time/zic.c:421
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", línea %d: %s"
 
-# ## Cambio "Zona" por "Zone". sv
-# ## Corrijo el nombre de la opción. sv
 #: time/zic.c:945
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
@@ -71,21 +66,28 @@ msgstr "%s en una zona sin reglas"
 #   que viene a decir algo así que las promesas no se han cumplido, o que
 #   las afirmaciones hechas no son ciertas.
 # ??? %s%s's correctos ?
-#: assert/assert.c:48
+#: assert/assert.c:46
 #, c-format
 msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
 msgstr "%s%s%s:%u: %s%sLa declaración `%s' no se cumple.\n"
 
-# ## ¿Qué tiene de malo "inesperado"? sv
-# ## Parece el nombre de película de los '50 em
-# ## ... y antes de que digas nada, a mí me encantan 
-# ## las películas de los 50 em+
-#: assert/assert-perr.c:46
+# ¿Qué tiene de malo "inesperado"? sv
+#
+# Parece el nombre de película de los '50 em
+# ... y antes de que digas nada, a mí me encantan
+# las películas de los 50 em
+#
+# Pero es que esa palabra *existe* y significa "no esperado".
+# ¿Por qué quieres empobrecer el idioma de esa forma?
+# ¿No podrías emplear la forma in-loquesea unas veces sí y otras no,
+# para darle variedad a la cosa? (Por ejemplo aquí sí, pues no te debe
+# recordar a una opción en silla de ruedas...). sv+
+#: assert/assert-perr.c:47
 #, c-format
 msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
 msgstr "%s%s%s:%u: %s%sError no esperado: %s.\n"
 
-#: stdio-common/psignal.c:48
+#: stdio-common/psignal.c:47
 #, c-format
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%sSeñal desconocida %d\n"
@@ -98,7 +100,7 @@ msgstr "%s: %d no extendió el signo correctamente\n"
 #: locale/programs/charmap.c:176
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
-msgstr "%s: <mb_cur_max> debe de ser más grande que <mb_cur_min>\n"
+msgstr "%s: <mb_cur_max> debe ser más grande que <mb_cur_min>\n"
 
 #: time/zic.c:1430
 #, c-format
@@ -110,8 +112,7 @@ msgstr "%s: No se puede crear %s: %s\n"
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s; No se puede crear el directorio %s: %s\n"
 
-# Sugerencia: hacer -> crear. sv
-# Aceptada em+
+# Sugerencia: "desde %s hasta %s" o bien "de %s a %s" pero no mezclar. sv+
 #: time/zic.c:612
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
@@ -142,11 +143,11 @@ msgstr "%s: Error al escribir %s\n"
 msgid "%s: Error writing standard output "
 msgstr "%s: Error al escribir en la salida estándar "
 
-# ¿¿ cómo se dirá eso ?? , pregunto en spanglish
+# ¿¿ cómo se dirá eso ??, pregunto en spanglish
 #
 # diría que la porción "de años bisiestos" sobra. sv
 #
-# Mejor dejarlo bien clarito. Despues de haberme enterado de 
+# Mejor dejarlo bien clarito. Después de haberme enterado de
 # qué diablos era eso ;)
 #
 # En ningún sitio dice que la línea de ajuste sea "de años bisiestos"
@@ -160,18 +161,18 @@ msgstr "%s: Error al escribir en la salida estándar "
 # Otra cosa: "en un archivo que no es el de" -> "en un archivo que no es de"
 # (sin "el"). Si no, da a entender que sólo puede haber uno,
 # y el original no da a entender eso. sv
-# 
+#
 # Varias cosas, según he entendido los ajustes en segundo se llaman
-# indiferentemente 'segundos itercalares' o 'segundos bisiestos'
-# el ajuste en sí es un ajuste de años bisiestos ( no son exáctamente 
-# un día ) . Por lo tanto Leap ( año bisiesto ) line , son las líneas
-# que caracterizan al leap seconds file, que podríamos llamarlo fichero
+# indiferentemente 'segundos intercalares' o 'segundos bisiestos'
+# el ajuste en sí es un ajuste de años bisiestos ( no son exactamente
+# un día ) . Por lo tanto Leap ( año bisiesto ) line, son las líneas
+# que caracterizan al leap seconds file, que podríamos llamarlo archivo
 # de ajuste de años bisiestos, archivo intercalar o incluso bisiestifile
 # De todas maneras creo que lo cambio, este mensaje, si alguna vez tengo
-# la mala suerte de que me aparezca, me acoxonaría, tal y como está 
-# redactado 
-# Segundo, según he visto en la documentación , solo existe un fichero
-# de leap lines , por eso pongo 'el'... em+  
+# la mala suerte de que me aparezca, me acoxonaría, tal y como está
+# redactado
+# Segundo, según he visto en la documentación, sólo existe un archivo
+# de leap lines, por eso pongo 'el'... em+
 #
 #: time/zic.c:830
 #, c-format
@@ -185,37 +186,26 @@ msgstr ""
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: Memoria agotada: %s\n"
 
-# Sugerencia: se especificó -> se ha especificado. sv
-# Aceptada em+
 #: time/zic.c:527
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: La opción -L se ha especificado más de una vez\n"
 
-# Lo mismo. sv
-# idem em+
 #: time/zic.c:487
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: La opción -d se ha especificado más de una vez\n"
 
-# Lo mismo. sv
-# jo em+
 #: time/zic.c:497
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: La opción -l se ha especificado más de una vez\n"
 
-# Lo mismo. sv
-# cachi en la mar em+
 #: time/zic.c:507
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: La opción -p se ha especificado más de una vez\n"
 
-# Lo mismo. sv
-# ahora mismo hago un search-replace em+
-# solo quedaba este ;(
 #: time/zic.c:517
 #, c-format
 msgid "%s: More than one -y option specified\n"
@@ -228,6 +218,7 @@ msgstr "%s: la orden fue '%s', el resultado fue %d\n"
 
 # FUZZY
 # ¿ Se le ocurre a alguien algo ? em+
+# Podría ser "error en el estado de la máquina" (?). sv+
 #: locale/programs/charmap.c:593 locale/programs/locfile.c:878
 #, c-format
 msgid "%s: error in state machine"
@@ -239,17 +230,21 @@ msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción no permitida -- %c\n"
 
 # ¿Qué tiene de malo "inválida"? sv
-# Jope, y que tiene de malo no válida ? 
+# Jopé, ¿y qué tiene de malo no válida ?
 # usuario inválido tiene un doble sentido claro
 # ya que uso usuario no válido me parece bien usar
 # tambien opción no válida, aunque solo sea de vez
-# en cuando em+
+# en cuando em
+#
+# Pues que *inválida* existe. Piensa en retroreferencia, por ejemplo.
+# Se puede poner retroreferencia porque significa referencia hacia atrás.
+# (Bueno, en este caso esa palabra se usa poco, pero inválida no). sv+
+#
 #: posix/getopt.c:690
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-# ## he cambiado esto de acuerdo con gettext y diffutils. sv
 #: posix/getopt.c:611
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
@@ -265,13 +260,11 @@ msgstr "%s: la opción `%s' es ambigua\n"
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
-# ## lo mismo de antes. sv
 #: posix/getopt.c:606
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 
-# ## lo mismo de antes. sv
 #: posix/getopt.c:786
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
@@ -287,8 +280,6 @@ msgstr "%s: la opción `-W %s' es ambigua\n"
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento --%c\n"
 
-# ## posibles traducciones de l_value: l_valor ó valor_l.
-# ## posiblemente la segunda aparezca en el K & R en español. sv
 #: time/zic.c:837 time/zic.c:1248 time/zic.c:1268
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
@@ -297,7 +288,7 @@ msgstr "%s: grave: valor_l no válido %d\n"
 #: locale/programs/charmap.c:600
 #, c-format
 msgid "%s: premature end of file"
-msgstr "%s: fin de fichero no esperado"
+msgstr "%s: fin de archivo no esperado"
 
 #: posix/getopt.c:661
 #, c-format
@@ -309,7 +300,6 @@ msgstr "%s: opción desconocida `%c%s'\n"
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción desconocida `--%s'\n"
 
-# ## Añado unos espacios donde decía "archivo ... " sv
 #: time/zic.c:446
 #, c-format
 msgid ""
@@ -350,22 +340,22 @@ msgstr "*entrada estándar*"
 msgid ".lib section in a.out corrupted"
 msgstr "la sección .lib en el a.out está corrompida"
 
-# Sugerencia: Añadir (fstat) después de información. sv
-#: inet/rcmd.c:328
+# ## Sugerencia: Añadir (fstat) después de información. sv
+#: inet/rcmd.c:358
 msgid ".rhosts fstat failed"
 msgstr "No se pudo obtener información (fstat) del archivo .rhosts"
 
-# Lo mismo con lstat. sv
-#: inet/rcmd.c:324
+# ## Lo mismo con lstat. sv
+#: inet/rcmd.c:354
 msgid ".rhosts lstat failed"
 msgstr "No se pudo obtener información (lstat) del archivo .rhosts"
 
 #  lo de regular no me gusta, pero ?
-#: inet/rcmd.c:326
+#: inet/rcmd.c:356
 msgid ".rhosts not regular file"
 msgstr ".rhosts no es un archivo regular"
 
-#: inet/rcmd.c:332
+#: inet/rcmd.c:362
 msgid ".rhosts writeable by other than owner"
 msgstr ".rhosts puede ser modificado por otros además del propietario"
 
@@ -381,7 +371,7 @@ msgstr "; causa ="
 #: locale/programs/ld-ctype.c:326
 #, c-format
 msgid "<SP> character must not be in class `%s'"
-msgstr "El carácter <SP> no debe de estar en la clase '%s'"
+msgstr "El carácter <SP> no debe estar en la clase '%s'"
 
 #: locale/programs/ld-ctype.c:317
 #, c-format
@@ -415,8 +405,8 @@ msgid "Address family not supported by protocol"
 msgstr "Esta familia de direcciones no está soportada por el protocolo"
 
 # FUZZY
-# Lo dejo fuzzy aposta, a ver que se os ocurre em+
-#: stdio-common/../sysdeps/gnu/errlist.c:714
+# Lo dejo fuzzy aposta, a ver qué se os ocurre em+
+#: stdio-common/../sysdeps/gnu/errlist.c:730
 msgid "Advertise error"
 msgstr "Error de advertencia"
 
@@ -433,7 +423,7 @@ msgstr "La lista de argumentos es demasiado larga"
 
 #: stdio-common/../sysdeps/gnu/errlist.c:770
 msgid "Attempting to link in too many shared libraries"
-msgstr "Se intenta enlazar en demasiadas librerías compartidas"
+msgstr "Se intenta enlazar en demasiadas bibliotecas compartidas"
 
 #: sunrpc/clnt_perr.c:276
 msgid "Authentication OK"
@@ -457,20 +447,25 @@ msgstr "Dirección incorrecta"
 msgid "Bad file descriptor"
 msgstr "Descriptor de archivo erróneo"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:682
+#: stdio-common/../sysdeps/gnu/errlist.c:718
 msgid "Bad font file format"
-msgstr "Formato de fichero fuente incorrecto"
+msgstr "Formato de archivo fuente incorrecto"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:610
+msgid "Bad message"
+msgstr "Mensaje erróneo"
 
 # ## Ya estamos ...
-# ¿ Dispositivo de bloques ? , ¿ cómo se le puede llamar a esto ?
-# ## al principio puse , 'se precisa de' pero me sonó mal
+# ¿ Dispositivo de bloques ?, ¿ cómo se le puede llamar a esto ?
+# ## al principio puse, 'se precisa de' pero me sonó mal
 # ## Pongo doble almohadilla a lo anterior, para que a nadie más se le ocurra... sv
 #
 # Creo que se pueden borrar los apóstrofos.
 # Parece que hay dos tipos de dispositivos:
 # Dispositivos de bloques y dispositivos de caracteres.
 # Supongo que así se llamarán en español. sv
-# yo los llamo así, desde luego em+
+# yo los llamo así, desde luego em
+# ## Entonces asunto concluído. sv+
 #. TRANS A file that isn't a block special file was given in a situation that
 #. TRANS requires one.  For example, trying to mount an ordinary file as a file
 #. TRANS system in Unix gives this error.
@@ -478,19 +473,19 @@ msgstr "Formato de fichero fuente incorrecto"
 msgid "Block device required"
 msgstr "Se requiere un dispositivo de bloques"
 
-#  ??? sinceramente creo , broadcast no habría que traducirlo
-#  pero si hubiese , que ?
+#  ??? sinceramente creo, broadcast no habría que traducirlo
+#  pero si hubiese, que ?
 #  después de ver los fuentes no consigo llegar a otra solución, sólo
-#  mensaje ( packet ?  ) broadcast , que creo que refleja bien
+#  mensaje ( packet ?  ) broadcast, que creo que refleja bien
 #  los errores que describen estos mensajes.
-#  Sugerencia: `broadcast'. sv
+# ## Sugerencia: `broadcast'. sv
 #  Creo que este mensaje está mal traducido ...
 #  habrá que echar mano a las fuentes em+
 #: sunrpc/pmap_rmt.c:337
 msgid "Broadcast select problem"
 msgstr "Problema en la selección del `broadcast'"
 
-#  Vi traducido pipe como tubo en un libro sobre pc/dos , y me horrorizó
+#  Vi traducido pipe como tubo en un libro sobre pc/dos, y me horrorizó
 #  menos mal que venía siempre la palabra `pipe' al lado entrecomillada
 #. TRANS Broken pipe; there is no process reading from the other end of a pipe.
 #. TRANS Every library function that returns this error code also generates a
@@ -509,7 +504,28 @@ msgstr "Rebasado el límite de tiempo de CPU"
 
 #: stdio-common/../sysdeps/gnu/errlist.c:758
 msgid "Can not access a needed shared library"
-msgstr "No se puede acceder a una librería compartida que se necesita"
+msgstr "No se puede acceder a una biblioteca compartida que se necesita"
+
+#: nis/ypclnt.c:637
+msgid "Can't bind to server which serves this domain"
+msgstr ""
+"Ha fallado la llamada a bind() con el servidor que sirve a este dominio"
+
+# ¡Necesitamos ayuda para "mapeador"!
+#
+# Sugerencia: to map -> asignar, map -> correspondencia. sv+
+#
+#: nis/ypclnt.c:649
+msgid "Can't communicate with portmapper"
+msgstr "no se puede comunicar con el mapeador de puertos (`portmapper')"
+
+#: nis/ypclnt.c:651
+msgid "Can't communicate with ypbind"
+msgstr "No se puede establecer comunicación con 'ypbind'"
+
+#: nis/ypclnt.c:653
+msgid "Can't communicate with ypserv"
+msgstr "No se puede establecer comunicación con 'ypserv'"
 
 #. TRANS No memory available.  The system cannot allocate more virtual memory
 #. TRANS because its capacity is full.
@@ -535,11 +551,11 @@ msgstr "No se puede crear `socket' para enviar un mensaje `broadcast' del rpc"
 
 #: stdio-common/../sysdeps/gnu/errlist.c:774
 msgid "Cannot exec a shared library directly"
-msgstr "No se puede ejecutar una librería compartida directamente"
+msgstr "No se puede ejecutar una biblioteca compartida directamente"
 
-# ???
-# ¿Qué tal "... recibir la respuesta al `broadcast'"?
-# Mucho mejor em+
+# ## ¿Qué tal "... recibir la respuesta al `broadcast'"?
+# ## Mucho mejor em
+# ## Gracias. sv+
 #: sunrpc/pmap_rmt.c:349
 msgid "Cannot receive reply to broadcast"
 msgstr "No se puede recibir la respuesta al `broadcast'"
@@ -553,20 +569,17 @@ msgstr "No se pudo registrar el servicio"
 msgid "Cannot send after transport endpoint shutdown"
 msgstr "No se puede enviar tras la destrucción del punto de destino"
 
-# ???
-# En todo caso. mandar -> enviar. sv
+# ## ???
+# ## En todo caso. mandar -> enviar. sv
 #: sunrpc/pmap_rmt.c:313
 msgid "Cannot send broadcast packet"
 msgstr "No se pudo enviar el mensaje `broadcast'"
 
-# ## ¿Y qué te parecería cambiar el orden? Así:
-# ## "No se pudo especificar la opción SO_BROADCAST para el `socket'" sv
-# ## Gracias.
 #: sunrpc/pmap_rmt.c:261
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "No se pudo especificar la opción SO_BROADCAST para el `socket'"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:622
+#: stdio-common/../sysdeps/gnu/errlist.c:658
 msgid "Channel number out of range"
 msgstr "Número de canal fuera de rango"
 
@@ -577,15 +590,15 @@ msgstr "El proceso hijo terminó"
 msgid "Client credential too weak"
 msgstr "Las credenciales del cliente son poco fiables"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:722
+#: stdio-common/../sysdeps/gnu/errlist.c:738
 msgid "Communication error on send"
 msgstr "Error de comunicación al enviar"
 
-#  ¿ qué diablos es esto ? , esperemos a tener las fuentes
-#  estupendo , este error parece mostrarse en dos ocasiones
+#  ¿ qué diablos es esto ?, esperemos a tener las fuentes
+#  estupendo, este error parece mostrarse en dos ocasiones
 # - Macro: int EIEIO
 #     Go home and have a glass of warm, dairy-fresh milk.
-#  Jochen tambien lo traduce asi.  em
+#  Jochen tambien lo traduce así.  em
 #. TRANS Go home and have a glass of warm, dairy-fresh milk.
 #: stdio-common/../sysdeps/gnu/errlist.c:601
 msgid "Computer bought the farm"
@@ -594,13 +607,13 @@ msgstr "El ordenador ha comprado una granja"
 #: locale/programs/ld-ctype.c:1197
 msgid "Computing table size for character classes might take a while..."
 msgstr ""
-"El cálculo del tamaño de la tabla de clases de caracteres podría tardar un \n"
+"El cálculo del tamaño de la tabla de clases de caracteres podría tardar un\n"
 "rato ..."
 
 # FUZZY
-# Collating, uff , lo he visto por lo menos 10 veces, en varios contextos 
+# Collating, uff, lo he visto por lo menos 10 veces, en varios contextos
 # diferentes. Uno de ellos en el de comparaciones de strings en el DM de DB2.
-# Podría traducirse tambien como 'uniones' o 'emparejamientos' ... em+ 
+# Podría traducirse tambien como 'uniones' o 'emparejamientos' ... em+
 #: locale/programs/ld-collate.c:327
 msgid "Computing table size for collation information might take a while..."
 msgstr ""
@@ -631,6 +644,8 @@ msgstr "Expiró el tiempo de conexión"
 msgid "Continued"
 msgstr "Continúa"
 
+# ## ¡¡Esto ya lo traduje en recode!! sv
+# ## Lo pongo igual.
 #: catgets/gencat.c:169 db/makedb.c:120 locale/programs/locale.c:187
 #: locale/programs/localedef.c:177
 #, c-format
@@ -640,9 +655,13 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"Este es software de libre distribución; vea las fuentes para ver las\n"
-"condiciones de duplicado. No existe NINGUNA garantía; tampoco incluso para\n"
-"su COMERCIABILIDAD o ADECUACIÓN para algún propósito en particular.\n"
+"Esto es software libre; vea el código fuente para las condiciones de copia.\n"
+"No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
+"FIN DETERMINADO.\n"
+
+#: nis/ypclnt.c:663
+msgid "Database is busy"
+msgstr "La base de datos está ocupada"
 
 #. TRANS No default destination address was set for the socket.  You get this
 #. TRANS error when you try to transmit data over a connectionless socket,
@@ -652,7 +671,7 @@ msgid "Destination address required"
 msgstr "Se debe especificar la dirección de destino"
 
 # FUZZY
-#: stdio-common/../sysdeps/gnu/errlist.c:686
+#: stdio-common/../sysdeps/gnu/errlist.c:638
 msgid "Device not a stream"
 msgstr "El dispositivo no es un `stream'"
 
@@ -676,28 +695,33 @@ msgstr "Dispositivo o recurso ocupado"
 #. TRANS this error occurs when you are trying to delete a directory.
 #: stdio-common/../sysdeps/gnu/errlist.c:468
 msgid "Directory not empty"
-msgstr "El directorio no está vacio"
+msgstr "El directorio no está vacío"
 
 #. TRANS The user's disk quota was exceeded.
 #: stdio-common/../sysdeps/gnu/errlist.c:486
 msgid "Disc quota exceeded"
 msgstr "Se ha excedido la cuota de disco"
 
+# FUZZY
+#: nis/ypclnt.c:709
+msgid "Domain not bound"
+msgstr "No se pudo conectar con el dominio"
+
 #: sunrpc/clnt_perr.c:254
 #, c-format
 msgid "Error %d"
 msgstr "Error %d"
 
-#: string/../sysdeps/mach/_strerror.c:43
+#: string/../sysdeps/mach/_strerror.c:52
 msgid "Error in unknown error system: "
 msgstr "Error de sistema desconocido: "
 
 #: inet/ruserpass.c:161
 msgid "Error: .netrc file is readable by others."
-msgstr "Error: el fichero .netrc es leible por otros usuarios."
+msgstr "Error: el archivo .netrc es leible por otros usuarios."
 
 # FUZZY em+
-#: stdio-common/../sysdeps/gnu/errlist.c:662
+#: stdio-common/../sysdeps/gnu/errlist.c:698
 msgid "Exchange full"
 msgstr "Intercambio lleno"
 
@@ -726,7 +750,7 @@ msgid "File exists"
 msgstr "El archivo existe"
 
 # FUZZY em+
-#: stdio-common/../sysdeps/gnu/errlist.c:678
+#: stdio-common/../sysdeps/gnu/errlist.c:714
 msgid "File locking deadlock error"
 msgstr "error `deadlock' al bloquear el archivo"
 
@@ -748,24 +772,15 @@ msgstr "Archivo demasiado grande"
 msgid "Floating point exception"
 msgstr "Excepción de coma flotante"
 
-# ¿No existe en español "implementar"? sv
-# ¿ Crees que es tan importante ? em
-# No, pero si el autor hubiera querido decir soportada, podría haber puesto
-# "supported". por eso creo que lo lógico sería:
-# supported -> soportada  e  implemented -> implementada.
-# "no soportado" tiene el matiz de que puede estar implementado pero si no
-# funciona no tienes a quien quejarte.
-# En cambio no implementada es que no está implementada. sv
-# Ok, me has convencido em
-# ¿No existe en español "implementar"? sv
-# ¿ Crees que es tan importante ? em
-# No, pero si el autor hubiera querido decir soportada, podría haber puesto
-# "supported". por eso creo que lo lógico sería:
-# supported -> soportada  e  implemented -> implementada.
-# "no soportado" tiene el matiz de que puede estar implementado pero si no
-# funciona no tienes a quien quejarte.
-# En cambio no implementada es que no está implementada. sv
-# Ok, me has convencido em
+# ## ¿No existe en español "implementar"? sv
+# ## ¿ Crees que es tan importante ? em
+# ## No, pero si el autor hubiera querido decir soportada, podría haber puesto
+# ## "supported". por eso creo que lo lógico sería:
+# ## supported -> soportada  e  implemented -> implementada.
+# ## "no soportado" tiene el matiz de que puede estar implementado pero si no
+# ## funciona no tienes a quien quejarte.
+# ## En cambio no implementada es que no está implementada. sv
+# ## Ok, me has convencido em
 #. TRANS Function not implemented.  Some functions have commands or options defined
 #. TRANS that might not be supported in all implementations, and this is the kind
 #. TRANS of error you get if you request them and they are not supported.
@@ -782,7 +797,7 @@ msgstr "Error injustificado"
 #  Mirado, efectivamente esto es una señal que habrá
 #  que dejarla con su nombre original ( entre paréntesis )
 msgid "Hangup"
-msgstr "Colgar ( hangup )"
+msgstr "Colgar (hangup)"
 
 # Otras posibilidades: El host está caído o está abajo.
 #
@@ -793,7 +808,7 @@ msgstr "Colgar ( hangup )"
 # En este caso creo que no se llegó a nada claro. De hecho la
 #  palabra host me parece equívoca, ya que da a entender
 #  cosas que no son. A un 'huésped' también se le llama
-#  host. Entonces ? , mejor usar siempre host
+#  host. Entonces ?, mejor usar siempre host
 #
 # Como te parezca, ¿Le ponemos apóstrofos ... ? `host'  sv
 #
@@ -801,11 +816,16 @@ msgstr "Colgar ( hangup )"
 #
 # Pues yo sí. No se deberían usar palabras inglesas alegremente, como
 # si fueran españolas. sv
+# ##
+# ## A esto no me has contestado todavía. sv
+# ##
+# ## Ni te lo voy a contestar, habrá que aceptar que el español
+# ## sigue Enrique-ciendose con nuevas palabras em
+# ## La frase anterior no me gusta NADA. sv+
 #
-# A esto no me has contestado todavía. sv
-#
-# Ni te lo voy a contestar, habrá que aceptar que el español 
-# sigue Enrique-ciendose con nuevas palabras em+
+# Enrique, ni tú ni yo somos nadie para inventarnos palabras.
+# Sé humilde y pon las palabras guiris con apóstrofos.
+# Y si no, pregúntale a Iñaky, verás como está de acuerdo conmigo. sv+
 #. TRANS The remote host for a requested network connection is down.
 #: stdio-common/../sysdeps/gnu/errlist.c:457
 msgid "Host is down"
@@ -818,12 +838,12 @@ msgstr "Nombre de host no encontrado"
 msgid "I/O possible"
 msgstr "Operación de entrada/salida permitida"
 
-#  ??? , siempre lo he usado como trap, nunca encontramos la palabra
-#  y es una señal estándar Unix , así que no creo conveniente tracucirla
+#  ???, siempre lo he usado como trap, nunca encontramos la palabra
+#  y es una señal estándar Unix, así que no creo conveniente traducirla
 msgid "IOT trap"
 msgstr "`trap' de IOT"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:618
+#: stdio-common/../sysdeps/gnu/errlist.c:614
 msgid "Identifier removed"
 msgstr "El identificador se ha eliminado"
 
@@ -833,7 +853,7 @@ msgid "Illegal Instruction"
 msgstr "Instrucción ilegal"
 
 # ¿"seek" no era "desplazamiento"? sv
-# Según el contexto no se puede saber a que se refiere
+# Según el contexto no se puede saber a qué se refiere
 # cambio ... por no permitida em+
 #. TRANS Invalid seek operation (such as on a pipe).
 #: stdio-common/../sysdeps/gnu/errlist.c:201
@@ -883,6 +903,18 @@ msgstr "Operación no válida para un proceso en segundo plano"
 msgid "Input/output error"
 msgstr "Error de entrada/salida"
 
+#  ??? lo mismo que arriba
+#: nis/ypclnt.c:643
+msgid "Internal NIS error"
+msgstr "Error interno del determinador de nombres"
+
+# FUZZY FUZZY
+# Esto se está poniendo imposible, estas funciones
+# nuevas ...
+#: nis/ypclnt.c:707
+msgid "Internal ypbind error"
+msgstr "Error en la llamada a bind para el servicio de páginas amarillas"
+
 msgid "Interrupt"
 msgstr "Interrupción"
 
@@ -898,7 +930,7 @@ msgid "Interrupted system call"
 msgstr "Llamada al sistema interrumpida"
 
 # FUZZY
-#: stdio-common/../sysdeps/gnu/errlist.c:610
+#: stdio-common/../sysdeps/gnu/errlist.c:654
 msgid "Interrupted system call should be restarted"
 msgstr "La llamada al sistema interrumpida debería volverse a iniciar"
 
@@ -940,7 +972,7 @@ msgstr "Contenido de \\{\\} inválido"
 msgid "Invalid cross-device link"
 msgstr "Enlace cruzado entre dispositivos no permitido"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:654
+#: stdio-common/../sysdeps/gnu/errlist.c:690
 msgid "Invalid exchange"
 msgstr "Intercambio no válido"
 
@@ -962,11 +994,11 @@ msgstr "Final de rango no válido"
 msgid "Invalid regular expression"
 msgstr "La expresión regular es errónea"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:670
+#: stdio-common/../sysdeps/gnu/errlist.c:706
 msgid "Invalid request code"
 msgstr "Código de petición incorrecto"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:658
+#: stdio-common/../sysdeps/gnu/errlist.c:694
 msgid "Invalid request descriptor"
 msgstr "El descriptor de archivo solicitado es erróneo"
 
@@ -974,8 +1006,8 @@ msgstr "El descriptor de archivo solicitado es erróneo"
 msgid "Invalid server verifier"
 msgstr "Verificación del servidor no válido"
 
-# Ranura no válida ? , creo que no hay traducción para slot :) em+
-#: stdio-common/../sysdeps/gnu/errlist.c:674
+# Ranura no válida ?, creo que no hay traducción para slot :) em+
+#: stdio-common/../sysdeps/gnu/errlist.c:710
 msgid "Invalid slot"
 msgstr "`slot' incorrecto"
 
@@ -985,44 +1017,53 @@ msgstr "`slot' incorrecto"
 msgid "Is a directory"
 msgstr "Es un directorio"
 
+# ## Añado el "de tipo" sv+
 # FUZZY em+
-# ¿ Será esto un `named pipe' ? ¿ cómo se traduce ? 
+# ¿ Será esto un `named pipe' ? ¿ cómo se traduce ?
 #: stdio-common/../sysdeps/gnu/errlist.c:794
 msgid "Is a named type file"
-msgstr "Es un fichero `named'"
+msgstr "Es un archivo de tipo `named'"
 
 #  A quien se le ocurra `matar' un proceso, que especifique con qué señal.
 #  En todo caso ` Terminado ( KILL ) ' sería apropiado. Ver fuentes
 msgid "Killed"
 msgstr "Terminado (killed)"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:650
+#: stdio-common/../sysdeps/gnu/errlist.c:686
 msgid "Level 2 halted"
 msgstr "Nivel 2 detenido"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:626
+#: stdio-common/../sysdeps/gnu/errlist.c:662
 msgid "Level 2 not synchronized"
 msgstr "Nivel 2 no sincronizado"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:630
+#: stdio-common/../sysdeps/gnu/errlist.c:666
 msgid "Level 3 halted"
 msgstr "Nivel 3 detenido"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:634
+#: stdio-common/../sysdeps/gnu/errlist.c:670
 msgid "Level 3 reset"
 msgstr "Nivel 3 restablecido"
 
 # FUZZY em+
-# ¿ qué significa esto ? 
-#: stdio-common/../sysdeps/gnu/errlist.c:710
+# ¿ qué significa esto ?
+#: stdio-common/../sysdeps/gnu/errlist.c:626
 msgid "Link has been severed"
-msgstr ""
+msgstr "En enlace se ha cortado"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:638
+#: stdio-common/../sysdeps/gnu/errlist.c:674
 msgid "Link number out of range"
 msgstr "Número de enlace fuera de rango"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:702
+#: nis/ypclnt.c:655
+msgid "Local domain name not set"
+msgstr "No se ha establecido el nombre del dominio local"
+
+#: nis/ypclnt.c:645
+msgid "Local resource allocation failure"
+msgstr "La asignación de recursos locales ha fallado"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:722
 msgid "Machine is not on the network"
 msgstr "La máquina no está en red"
 
@@ -1037,9 +1078,28 @@ msgid "Message too long"
 msgstr "Mensaje demasiado largo"
 
 # FUZZY em+
-#: stdio-common/../sysdeps/gnu/errlist.c:730
+# No tengo ni idea de qué es un HOP
+# este error, que ya lo vi en errno no
+# lo encuentro documentado
+#: stdio-common/../sysdeps/gnu/errlist.c:618
 msgid "Multihop attempted"
+msgstr "Se ha intentado un multihop"
+
+# No debe explicarse la terminología dentro de su propio contexto.
+# Creo que deberías borrar lo que hay entre paréntesis.
+# De verdad. sv+
+#: nis/ypclnt.c:659
+msgid "NIS client/server version mismatch - can't supply service"
 msgstr ""
+"La versión de NIS (sistema de información de la red) del servidor y del "
+"ciente\n"
+"no coinciden - no se puede proveer el servicio"
+
+# Aquí se podría poner "la tabla NIS". sv+
+# mapa es un palabro.
+#: nis/ypclnt.c:657
+msgid "NIS map data base is bad"
+msgstr "La base de datos del mapa NIS no es correcta"
 
 #: stdio-common/../sysdeps/gnu/errlist.c:746
 msgid "Name not unique on network"
@@ -1074,43 +1134,29 @@ msgid "Network is unreachable"
 msgstr "Es imposible conectar con la red"
 
 # FUZZY
-#: stdio-common/../sysdeps/gnu/errlist.c:646
+#: stdio-common/../sysdeps/gnu/errlist.c:682
 msgid "No CSI structure available"
 msgstr "No quedan estructuras CSI disponibles"
 
-# Ojo: ¿Solamente los archivos se pueden bloquear?
-# Propondría: "No quedan bloqueos disponibles" o algo así. sv
-#
-# Efectivamente puede que tengas razón , pero ...
-#  los dispositivos en UNIX son siempre archivos /dev :)  em
-#
-# Lo sé, lo sé, pero: Cuando bloqueas /dev/cua3, ¿dices que estás bloqueando un
-# archivo o que estás bloqueando el módem, que es un dispositivo? sv
-# Decir archivos podría traer equívocos, por más que formalmente todos
-# lo sean. sv
-#
-# ¿Y qué se te ocurre?, ¿poner bloquear archivos/dispositivos? em
-#
-# ( Pues mira, no estaría mal. sv )
-# A esto no me has contestado. sv
-#
-#  no quedan bloqueos me parece que no colabora a entender nada. em
-#  Miro la versión alemana.
-#  ??? ¿ locks ? ¿ cómo diablos ?
 #: stdio-common/../sysdeps/gnu/errlist.c:790
 msgid "No XENIX semaphores available"
-msgstr "No quedan semáforos XENIX disponibels"
+msgstr "No quedan semáforos XENIX disponibles"
 
-# Bueno, pero entonces pon "ninguna" en vez de "una", ¿no? sv
+# ## Pongo "ninguna" en vez de "una". sv+
 #: resolv/herror.c:77
 msgid "No address associated with name"
-msgstr "No existe una dirección asociada al nombre"
+msgstr "No existe ninguna dirección asociada al nombre"
 
 # FUZZY
-# anode o catode :) , qué diablos ? em+
-#: stdio-common/../sysdeps/gnu/errlist.c:666
+# anode o catode :), qué diablos ? em+
+#
+# Pongo esto provisionalmente, en electricidad se usan los términos
+# ánodo y cátodo para los polos positivo y negativo, pero no sé
+# si esto será lo mismo.
+# De cualquier forma, mantengo el FUZZY por si sale algo mejor. sv+
+#: stdio-common/../sysdeps/gnu/errlist.c:702
 msgid "No anode"
-msgstr ""
+msgstr "No hay ningún ánodo"
 
 # Memoria intermedia me parece una traducción óptima.
 # Desgraciadamente no tengo ningún diccionario de Castellano
@@ -1131,33 +1177,14 @@ msgstr "No queda espacio para memoria intermedia"
 msgid "No child processes"
 msgstr "Ningún proceso hijo"
 
-# Ojo: ¿Solamente los archivos se pueden bloquear?
-# Propondría: "No quedan bloqueos disponibles" o algo así. sv
-#
-# Efectivamente puede que tengas razón , pero ...
-#  los dispositivos en UNIX son siempre archivos /dev :)  em
-#
-# Lo sé, lo sé, pero: Cuando bloqueas /dev/cua3, ¿dices que estás bloqueando un
-# archivo o que estás bloqueando el módem, que es un dispositivo? sv
-# Decir archivos podría traer equívocos, por más que formalmente todos
-# lo sean. sv
-#
-# ¿Y qué se te ocurre?, ¿poner bloquear archivos/dispositivos? em
-#
-# ( Pues mira, no estaría mal. sv )
-# A esto no me has contestado. sv
-#
-#  no quedan bloqueos me parece que no colabora a entender nada. em
-#  Miro la versión alemana.
-#  ??? ¿ locks ? ¿ cómo diablos ?
-#: stdio-common/../sysdeps/gnu/errlist.c:690
+#: stdio-common/../sysdeps/gnu/errlist.c:622
 msgid "No data available"
-msgstr "No hay datos disponobles"
+msgstr "No hay datos disponibles"
 
 # Ojo: ¿Solamente los archivos se pueden bloquear?
 # Propondría: "No quedan bloqueos disponibles" o algo así. sv
 #
-# Efectivamente puede que tengas razón , pero ...
+# Efectivamente puede que tengas razón, pero ...
 #  los dispositivos en UNIX son siempre archivos /dev :)  em
 #
 # Lo sé, lo sé, pero: Cuando bloqueas /dev/cua3, ¿dices que estás bloqueando un
@@ -1185,34 +1212,50 @@ msgstr "No se pueden bloquear más archivos"
 msgid "No match"
 msgstr "Ninguna coincidencia"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:614
+#: stdio-common/../sysdeps/gnu/errlist.c:630
 msgid "No message of desired type"
 msgstr "Ningún mensaje del tipo deseado"
 
+# FUZZY
+# Bueno, bueno
+#: nis/ypclnt.c:647
+msgid "No more records in map database"
+msgstr "No hay más registros en la base de datos del mapa"
+
 #: posix/regex.c:5204
 msgid "No previous regular expression"
 msgstr "No existe una expresión regular anterior"
 
 # No me gusta "programa rpc". El rpc debería sobrar por el contexto. sv
-# A ver que te parece esto em+
+# A ver qué te parece esto em+
+# Igual de raro: Te repito la frase de César: "No hay que explicar
+# la terminología dentro de su propio contexto".
+# Con lo fácil que es poner:
+# "No se ha registrado ningún programa remoto.\n" sv+
 #: sunrpc/rpcinfo.c:515
 msgid "No remote programs registered.\n"
 msgstr "No existe ningún procedimiento rpc registrado en la máquina remota.\n"
 
 # Sugerencia: ninguna ruta. sv
-# Doppel verneinung , o doble negación , tambien
-# lo hacen en Bayern , bueno aquí es peor, porque
-# tienen la drei Fach Verneinung ( osea, tres veces ) em+
+# Doppel verneinung, o doble negación, también
+# lo hacen en Bayern, bueno aquí es peor, porque
+# tienen la drei Fach Verneinung ( o sea, tres veces ) em+
+#
+# Enrique, ¡se te olvida el español! :-|
+# En español es absolutamente correcto, y además queda mejor.
+# "No existe ninguna ruta hasta el host". sv+
 #. TRANS The remote host for a requested network connection is not reachable.
 #: stdio-common/../sysdeps/gnu/errlist.c:462
 msgid "No route to host"
 msgstr "No existe ruta hasta el host"
 
+# ## "No queda más espacio" queda muy raro en español.
+# ## Lo cambio. sv+
 #. TRANS No space left on device; write operation on a file failed because the
 #. TRANS disk is full.
 #: stdio-common/../sysdeps/gnu/errlist.c:196
 msgid "No space left on device"
-msgstr "No queda más espacio en el dispositivo"
+msgstr "No queda espacio en el dispositivo"
 
 #. TRANS No such file or directory.  This is a ``file doesn't exist'' error
 #. TRANS for ordinary files that are referenced in contexts where they are
@@ -1221,6 +1264,14 @@ msgstr "No queda más espacio en el dispositivo"
 msgid "No such file or directory"
 msgstr "No existe el archivo o el directorio"
 
+#: nis/ypclnt.c:641
+msgid "No such key in map"
+msgstr "No exite esta clave en el mapa"
+
+#: nis/ypclnt.c:639
+msgid "No such map in server's domain"
+msgstr "No existe este mapa en el dominio del servidor"
+
 # Sugerencia: No existe el proceso. sv
 # ¿ Porqué ?
 # Porque si "No such file or directory" se ha traducido por
@@ -1235,11 +1286,7 @@ msgstr "No existe tal proceso"
 
 #: stdio-common/../sysdeps/gnu/errlist.c:786
 msgid "Not a XENIX named type file"
-msgstr "No es un fichero XENIX del tipo `named'"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:738
-msgid "Not a data message"
-msgstr "No es un mensaje de datos"
+msgstr "No es un archivo XENIX del tipo `named'"
 
 #. TRANS A file that isn't a directory was specified when a directory is required.
 #: stdio-common/../sysdeps/gnu/errlist.c:140
@@ -1248,7 +1295,7 @@ msgstr "No es un directorio"
 
 #  fuentes
 # Sugerencia: Argumento numérico. sv
-# 
+#
 #. TRANS Domain error; used by mathematical functions when an argument value does
 #. TRANS not fall into the domain over which the function is defined.
 #: stdio-common/../sysdeps/gnu/errlist.c:228
@@ -1282,14 +1329,11 @@ msgstr "Número impar de comillas"
 msgid "Operation already in progress"
 msgstr "La operación ya se está llevando a cabo"
 
-# No te pases. Aquí se podría poner
-# "Operación no permitida" y no quedaría mal. sv
-# em+
 #. TRANS Operation not permitted; only the owner of the file (or other resource)
 #. TRANS or processes with special privileges can perform the operation.
 #: stdio-common/../sysdeps/gnu/errlist.c:12
 msgid "Operation not permitted"
-msgstr "Pperación no permitida"
+msgstr "Operación no permitida"
 
 #. TRANS The operation you requested is not supported.  Some socket functions
 #. TRANS don't make sense for all types of sockets, and others may not be
@@ -1328,18 +1372,18 @@ msgstr "Operación en curso"
 msgid "Operation would block"
 msgstr "La operación se bloquearía"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:698
+#: stdio-common/../sysdeps/gnu/errlist.c:634
 msgid "Out of streams resources"
 msgstr "Alcanzado el límite de recursos de `streams'"
 
-# FUZZY 
+# FUZZY
 # aquí va a haber coña em+
-#: stdio-common/../sysdeps/gnu/errlist.c:706
+#: stdio-common/../sysdeps/gnu/errlist.c:726
 msgid "Package not installed"
 msgstr "El paquete no está instalado"
 
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: stdio-common/../sysdeps/gnu/errlist.c:96
+#: nis/ypclnt.c:661 stdio-common/../sysdeps/gnu/errlist.c:96
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -1363,11 +1407,11 @@ msgstr "Fin no esperado de la expresión regular"
 msgid "Profiling timer expired"
 msgstr "El tiempo de CPU expiró"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:642
+#: stdio-common/../sysdeps/gnu/errlist.c:678
 msgid "Protocol driver not attached"
 msgstr "Protocolo no disponible"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:726
+#: stdio-common/../sysdeps/gnu/errlist.c:646
 msgid "Protocol error"
 msgstr "error de protocolo"
 
@@ -1394,22 +1438,29 @@ msgstr "Protocolo no soportado"
 msgid "Protocol wrong type for socket"
 msgstr "Tipo de protocolo incorrecto para el `socket'"
 
+# ## Podría ser también "Abandonar" sv+
 msgid "Quit"
 msgstr "Abandona"
 
 # FUZZY
-#: stdio-common/../sysdeps/gnu/errlist.c:734
+#: stdio-common/../sysdeps/gnu/errlist.c:742
 msgid "RFS specific error"
 msgstr "error específico de RFS"
 
-#  qué horror
-# Pues mira, quizá añadiendo dos puntos después del RPC mejoraría algo:
-# "RPC: procedimiento erróneo..." sv
+# ## qué horror
+# ## Pues mira, quizá añadiendo dos puntos después del RPC mejoraría algo:
+# ## "RPC: procedimiento erróneo..." sv
+# FIXME -> Comunicarlo al autor.
+# En inglés podría quedar también mejor.
 #. TRANS ???
 #: stdio-common/../sysdeps/gnu/errlist.c:527
 msgid "RPC bad procedure for program"
 msgstr "RPC: procedimiento erróneo para el programa"
 
+#: nis/ypclnt.c:635
+msgid "RPC failure on NIS operation"
+msgstr "Fallo RPC en una operación NIS"
+
 #. TRANS ???
 #: stdio-common/../sysdeps/gnu/errlist.c:517
 msgid "RPC program not available"
@@ -1442,7 +1493,7 @@ msgstr "RPC: Error de autentificación"
 #  y no lo consiguió. Es decir, que lo intentó ( pasado )
 #  En muchos de los mensajes de GNU se usa presente o pasado
 #  indiferentemente. Ya se sabe lo mal que les suena el pasado de can,
-#  sobre todo en frases afirmativas ( que no es el caso , pero bueno )
+#  sobre todo en frases afirmativas ( que no es el caso, pero bueno )
 #
 #: sunrpc/clnt_perr.c:169
 msgid "RPC: Can't decode result"
@@ -1452,7 +1503,7 @@ msgstr "RPC: No se pudo descodificar la respuesta"
 msgid "RPC: Can't encode arguments"
 msgstr "RPC: No se pudieron codificar los argumentos"
 
-#  ??? Falló, fracasó , pinchó ;-)
+#  ??? Falló, fracasó, pinchó ;-)
 #: sunrpc/clnt_perr.c:199
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC: Falló (error no especificado)"
@@ -1463,6 +1514,8 @@ msgstr "RPC: Versión incompatible de RPC"
 
 # Apuesto a que existe algo mejor que "mapeador". sv
 # Propón que yo dispondré em+
+# A ver:  Asignador.
+# (Al menos no es un palabro). sv+
 #: sunrpc/clnt_perr.c:195
 msgid "RPC: Port mapper failure"
 msgstr "RPC: Fallo del mapeador de puertos"
@@ -1473,18 +1526,20 @@ msgstr "RPC: Fallo del mapeador de puertos"
 # No sé lo que es el RPC, pero igual es un disparate "procedimiento rpc"
 # En estos casos, preferiría no añadir nada y no "arriesgar". sv
 #
-# Está bien, por homogeneizar todo un poco lo quitaré. Pero que conste que 
-# procedimiento rpc es perfectamente válido ( rcp: remote procedure call ) 
+# Está bien, por homogeneizar todo un poco lo quitaré. Pero que conste que
+# procedimiento rpc es perfectamente válido ( rcp: remote procedure call )
 # em
 #
 # Incluyo una cita de César Ballardini a ver qué te parece:
 # "no es necesario explicar la terminología obvia dentro de su contexto"
 # Creo que no hace falta poner rpc dos veces. El primero ya te avisa "de qué
-# va el rollo". sv
-# em+
+# va el rollo". sv+
+#
+# Por cierto, unavailable es NO disponible. Lo cambio.
+# Y quito el "rpc" sv+
 #: sunrpc/clnt_perr.c:185
 msgid "RPC: Procedure unavailable"
-msgstr "RPC: Procedimiento rpc disponible"
+msgstr "RPC: Procedimiento no disponible"
 
 #: sunrpc/clnt_perr.c:197
 msgid "RPC: Program not registered"
@@ -1515,7 +1570,7 @@ msgid "RPC: Timed out"
 msgstr "RPC: El tiempo expiró"
 
 # Me parece que incapaz expresa mejor lo que pasa. Intenta
-#  recibir , pero no puede. De la otra forma (no se puede recibir)
+#  recibir, pero no puede. De la otra forma (no se puede recibir)
 #  da la impresión de que ni siquiera se intenta
 # A lo mejor es que ni siquiera puede intentarlo ... sv
 #: sunrpc/clnt_perr.c:173
@@ -1535,6 +1590,11 @@ msgstr "RPC: Host desconocido"
 msgid "RPC: Unknown protocol"
 msgstr "RPC: Protocolo desconocido"
 
+#: elf/dlsym.c:49
+msgid "RTLD_NEXT used in code not dynamically loaded"
+msgstr ""
+"Se ha usado RTLD_NEXT en una parte del código que no se cargó dinámicamente"
+
 #. TRANS An attempt was made to modify something on a read-only file system.
 #: stdio-common/../sysdeps/gnu/errlist.c:206
 msgid "Read-only file system"
@@ -1544,6 +1604,7 @@ msgstr "Sistema de archivos de sólo lectura"
 msgid "Regular expression too big"
 msgstr "La expresión regular es demasiado grande"
 
+# Sugerencia: Error de E/S. sv+
 #: stdio-common/../sysdeps/gnu/errlist.c:798
 msgid "Remote I/O error"
 msgstr "Error de entrada/salida en la máquina remota"
@@ -1552,23 +1613,31 @@ msgstr "Error de entrada/salida en la máquina remota"
 msgid "Remote address changed"
 msgstr "La dirección remota ha cambiado"
 
+# ## Reescribo la frase, creo que no habías cogido el sentido. sv+
+# ## Antes decía:
+# ## "El password remoto o archivo make no es leible por los demás"
 #: inet/ruserpass.c:162
 msgid "Remove password or make file unreadable by others."
-msgstr "El password remoto o archivo make no es leible por los demás"
+msgstr "Elimine la contraseña o haga el archivo no legible por otros."
 
+# ## Lo cambio. Ver fileutils. sv+
 #: catgets/gencat.c:224 db/makedb.c:227 locale/programs/locale.c:257
 #: locale/programs/localedef.c:408
 msgid "Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"
-msgstr "Informe de bugs a <bug-glibc@prep.ai.mit.edu>.\n"
+msgstr "Comunicar `bugs' a <bug-glibc@prep.ai.mit.edu>.\n"
+
+#: nis/ypclnt.c:633
+msgid "Request arguments bad"
+msgstr "Los argumentos de la petición son incorrectos"
 
-#  ??? resolvedor , determinador , investigador , solucionador  ?
+#  ??? resolvedor, determinador, investigador, solucionador  ?
 # Me suena que quizá exista resolvedor. Habría que enterarse. sv
 #: resolv/herror.c:73
 msgid "Resolver Error 0 (no error)"
 msgstr "Error del determinador de nombres 0 (ningún error)"
 
 #  ??? lo mismo que arriba
-#: resolv/herror.c:115
+#: resolv/herror.c:117
 msgid "Resolver internal error"
 msgstr "Error interno del determinador de nombres"
 
@@ -1622,7 +1691,7 @@ msgstr "Recurso no disponible temporalmente"
 #  que no pertenece al programa. em
 # ¿Entonces dirías que está mal el original inglés? sv
 #  No, en inglés siempre se ha dicho así. Siempre he traducido
-#  Segmentation fault como violación de segmento. Consultémoslo ,
+#  Segmentation fault como violación de segmento. Consultémoslo,
 #  es un mensaje que se ve demasiado a menudo em
 msgid "Segmentation fault"
 msgstr "Violación de segmento"
@@ -1650,9 +1719,9 @@ msgstr "Tipo de `socket' no soportado"
 msgid "Software caused connection abort"
 msgstr "El programa provocó el fin de la conexión"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:718
+#: stdio-common/../sysdeps/gnu/errlist.c:734
 msgid "Srmount error"
-msgstr "Error de  `srmount'"
+msgstr "Error de `srmount'"
 
 # ?? sugerencias ?
 # Habrá que traducir el "handle" de alguna forma... sv
@@ -1660,7 +1729,7 @@ msgstr "Error de  `srmount'"
 # ¿No puede un archivo tener varios `handles'
 # y que unos estén bloqueados y otros no? sv
 #  En efecto la traducción es incorrecta, el uso de file handle
-#  en vez de file descriptor, debe de ser porque nos referimos a archivos
+#  en vez de file descriptor, debe ser porque nos referimos a archivos
 #  compartidos con NFS. Al igual que no se bloquean, sino que se stalan :)
 #
 #. TRANS Stale NFS file handle.  This indicates an internal confusion in the NFS
@@ -1688,11 +1757,11 @@ msgstr "Parado (requiere entrada de terminal)"
 msgid "Stopped (tty output)"
 msgstr "Parado (requiere salida por terminal)"
 
-# FUZZY FUZZY 
-# Esto no hay quien lo traduzca ! em+
+# FUZZY FUZZY
+# ¡ Esto no hay quien lo traduzca ! em+
 #: stdio-common/../sysdeps/gnu/errlist.c:778
 msgid "Streams pipe error"
-msgstr "Error en de Tubería de streams"
+msgstr "Error en de tubería de streams"
 
 # FUZZY
 # O me cojo otras traducciones o ando perdido em+
@@ -1704,10 +1773,15 @@ msgstr "La estructura necesita una limpieza"
 # me gustaría que hubiera otra palabra mejor. SV
 # Siempre me han gustado F&C ;-)
 # A mí también :-) sv
-#: posix/regex.c:940 stdio-common/../sysdeps/gnu/errlist.c:7
+#: nis/ypclnt.c:631 nis/ypclnt.c:705 posix/regex.c:940
+#: stdio-common/../sysdeps/gnu/errlist.c:7
 msgid "Success"
 msgstr "Conseguido"
 
+#: nis/ypclnt.c:711
+msgid "System resource allocation failure"
+msgstr "Fallo en la asignación de recursos del sistema"
+
 msgid "Terminated"
 msgstr "Terminado"
 
@@ -1720,7 +1794,7 @@ msgstr "Terminado"
 msgid "Text file busy"
 msgstr "El archivo de texto está ocupado"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:694
+#: stdio-common/../sysdeps/gnu/errlist.c:650
 msgid "Timer expired"
 msgstr "El temporizador llegó al final"
 
@@ -1809,16 +1883,14 @@ msgstr "El otro extremo ya está conectado"
 msgid "Transport endpoint is not connected"
 msgstr "El otro extremo de la conexión no está conectado"
 
-# ## Siguiendo los estándares de Spanish-GNU, he cambiado Intente por Pruebe.
-# ## Y si me dices que no, tengo ya a casi todo el equipo convencido :-) sv
 #: catgets/gencat.c:208 db/makedb.c:209 locale/programs/locale.c:241
 #: locale/programs/localedef.c:389
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
-# ## Sin embargo este no tiene nada que ver con el anterior. sv
-#: inet/rcmd.c:121
+# ## Nota: este no tiene nada que ver con el anterior. sv
+#: inet/rcmd.c:136
 #, c-format
 msgid "Trying %s...\n"
 msgstr "Intentando %s...\n"
@@ -1828,8 +1900,12 @@ msgstr "Intentando %s...\n"
 msgid "Unknown .netrc keyword %s"
 msgstr "palabra clave desconocida en .netrc %s"
 
-#: string/../sysdeps/generic/_strerror.c:36
-#: string/../sysdeps/mach/_strerror.c:58
+#: nis/ypclnt.c:665
+msgid "Unknown NIS error code"
+msgstr "Error del NIS desconocido"
+
+#: string/../sysdeps/generic/_strerror.c:44
+#: string/../sysdeps/mach/_strerror.c:67
 msgid "Unknown error "
 msgstr "Error desconocido "
 
@@ -1838,7 +1914,7 @@ msgstr "Error desconocido "
 msgid "Unknown host"
 msgstr "Host desconocido"
 
-#: resolv/herror.c:118
+#: resolv/herror.c:120
 msgid "Unknown resolver error"
 msgstr "Error del determinador de nombres desconocido"
 
@@ -1846,15 +1922,19 @@ msgstr "Error del determinador de nombres desconocido"
 msgid "Unknown server error"
 msgstr "Error del servidor desconocido"
 
-#: string/strsignal.c:40
+#: string/strsignal.c:41
 #, c-format
 msgid "Unknown signal %d"
 msgstr "Señal desconocida %d"
 
-#: misc/error.c:94
+#: misc/error.c:95
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
+#: nis/ypclnt.c:713
+msgid "Unknown ypbind error"
+msgstr "Error desconocido en la llamada a 'ypbind()'"
+
 #: posix/regex.c:948
 msgid "Unmatched ( or \\("
 msgstr "( ó \\( desemparejados"
@@ -1872,12 +1952,13 @@ msgid "Unmatched \\{"
 msgstr "\\{ desemparejado"
 
 # ## FUZZY. Este te dejo que se lo quites tú. sv
-# :) em+
-#: posix/getconf.c:191
+# ## :) em+
+#: posix/getconf.c:260
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "Variable desconocida `%s'"
 
+# Sugerencia: de E/S sv+
 #  ?? sigo pensando en una traducción para condición
 msgid "Urgent I/O condition"
 msgstr "Condición urgente de entrada/saluda"
@@ -1898,9 +1979,11 @@ msgid ""
 msgstr ""
 "Modo de empleo: %s [OPCIÓN]... -o ARCHIVO-SALIDA [ARCHIVO-ENTRADA]...\n"
 "                %s [OPCIÓN]... [ARCHIVO-SALIDA [ARCHIVO-ENTRADA]...]\n"
-"Los argumentos obligatorios para las opciones largas son también obligatorios\n"
+"Los argumentos obligatorios para las opciones largas son también "
+"obligatorios\n"
 "para las opciones cortas.\n"
-"   -H, --header         Crea un archivo de cabecera C con las definiciones de\n"
+"   -H, --header         Crea un archivo de cabecera C con las definiciones "
+"de\n"
 "                        los símbolos\n"
 "   -h, --help           Muestra esta ayuda y finaliza\n"
 "       --new            no usa el catálogo existente, crea un nuevo archivo\n"
@@ -1908,8 +1991,7 @@ msgstr ""
 "   -o, --output=ARCHIVO escribe el resultado en el archivo ARCHIVO\n"
 "   -V, --version        informa de la versión y finaliza\n"
 "Si ARCHIVO-ENTRADA es -, la entrada se lee de la entrada estándar.\n"
-"Si ARCHIVO-SALIDA es - , el resultado se escribe en la salida estándar.\n"
-"Informar de los bugs a <bug-glibc@prep.ai.mit.edu>\n"
+"Si ARCHIVO-SALIDA es -, el resultado se escribe en la salida estándar.\n"
 
 #: db/makedb.c:213
 #, c-format
@@ -1926,20 +2008,23 @@ msgid ""
 "  -V, --version       output version information and exit\n"
 "If INPUT-FILE is -, input is read from standard input.\n"
 msgstr ""
-"Modo de empleo: %s [OPCIÓN]...  ARCHIVO-ENTRADA ARCHIVO-SALIDA\n"
-"                %s [OPCIÓN]...  -o ARCHIVO-SALIDA ARCHIVO-ENTRADA \n"
-"                %s [OPCIÓN]...  -u ARCHIVO-ENTRADA\n"
-"Los argumentos obligatorios para las opciones largas son también obligatorios\n"
+"Modo de empleo: %s [OPCIÓN]... ARCHIVO-ENTRADA ARCHIVO-SALIDA\n"
+"                %s [OPCIÓN]... -o ARCHIVO-SALIDA ARCHIVO-ENTRADA\n"
+"                %s [OPCIÓN]... -u ARCHIVO-ENTRADA\n"
+"Los argumentos obligatorios para las opciones largas son también "
+"obligatorios\n"
 "para las opciones cortas.\n"
 "   -f, --fold-case      convierte las claves a minúsculas\n"
 "   -h, --help           Muestra esta ayuda y finaliza\n"
 "   -o, --output=ARCHIVO escribe el resultado en el archivo ARCHIVO\n"
 "       --quiet          no muestra mensajes al construir la base de datos\n"
-"   -u, --undo           muestra el contenido del fichero de datos, una\n"
+"   -u, --undo           muestra el contenido del archivo de datos, una\n"
 "                        entrada por línea\n"
 "   -V, --version        informa de la versión y finaliza\n"
 "Si ARCHIVO-ENTRADA es -, la entrada se lee de la entrada estándar.\n"
 
+# ## Cambio la frase final. Ten en cuenta que a lo mejor el nombre del
+# ## directorio se sale si no. sv+
 #: locale/programs/localedef.c:393
 #, c-format
 msgid ""
@@ -1958,23 +2043,27 @@ msgid ""
 "System's directory for character maps: %s\n"
 "                       locale files  : %s\n"
 msgstr ""
-"Modo de empleo: %s [OPCION]... nombre\n"
-"Los argumentos para las opciones largas son tambien obligatorios para las\n"
-"opciones cortas.\n"
-"  -c, --force                crea el resultado incluso si existieron mensajes\n"
+"Modo de empleo: %s [OPCIÓN]... nombre\n"
+"Los argumentos obligatorios para las opciones largas son también "
+"obligatorios\n"
+"para las opciones cortas.\n"
+"  -c, --force                crea el resultado incluso si existieron "
+"mensajes\n"
 "                             de aviso\n"
 "  -h, --help                 muestra esta ayuda y finaliza\n"
-"  -f, --charmap=ARCHIVO      los nombres símbólicos de caracteres se encuentran\n"
+"  -f, --charmap=ARCHIVO      los nombres símbólicos de caracteres se "
+"encuentran\n"
 "                             en ARCHIVO\n"
-"  -i, --inputfile=ARCHIVO    las definiciones fuente  se encuetran en ARCHIVO\n"
+"  -i, --inputfile=ARCHIVO    las definiciones fuente  se encuetran en "
+"ARCHIVO\n"
 "  -u, --code-set-name=NOMBRE especifica el conjunto de códigos para mapear\n"
 "                             los elementos ISO 10646\n"
 "  -v, --verbose              incrementa el número de mensajes mostrados\n"
 "  -V, --version              informa de la versión y finaliza\n"
-"      --posix                atiende estrictamente las especificaciones POSIX\n"
-"El directorio del sistema para los mapas de caracteres es: %s\n"
-"                               los archivos de locales es: %s\n"
-"    \n"
+"      --posix                atiende estrictamente las especificaciones "
+"POSIX\n"
+"Directorio del sistema para los mapas de caracteres: %s\n"
+"                            los archivos de locales: %s\n"
 
 #: locale/programs/locale.c:245
 #, c-format
@@ -1990,43 +2079,43 @@ msgid ""
 "  -c, --category-name   write names of selected categories\n"
 "  -k, --keyword-name    write names of selected keywords\n"
 msgstr ""
-"Modo de empleo: %s [OPCION]... nombre\n"
+"Modo de empleo: %s [OPCIÓN]... nombre\n"
 "Los argumentos para las opciones largas son tambien obligatorios para las\n"
 "opciones cortas.\n"
 "  -h, --help            muestra esta ayuda y finaliza\n"
 "  -V, --version         informa de la versión y finaliza\n"
 "\n"
-"  -a, --all-locales     muestra los nombres de todos los locales disponibles\n"
-"  -m, --charmaps        muestra los nombres de todos los mapas de caracteres\n"
+"  -a, --all-locales     muestra los nombres de todos los locales "
+"disponibles\n"
+"  -m, --charmaps        muestra los nombres de todos los mapas de "
+"caracteres\n"
 "                        disponibles\n"
 "\n"
 "  -c, --category-name   muestra los nombres de las categorías seleccionadas\n"
-"  -k, --keyword-name    muestra los nombres de los palabras clave seleccionadas\n"
+"  -k, --keyword-name    muestra los nombres de las palabras clave "
+"seleccionadas\n"
 
-#: posix/getconf.c:138
+#: posix/getconf.c:200
 #, c-format
 msgid "Usage: %s variable_name [pathname]\n"
 msgstr "Modo de empleo: %s nombre_de_variable [ruta]\n"
 
-# ## Sugerencia: programa -> numprog
 # Sugerencia: numprogr -> numprog. sv
 # Sugerencia: numpuerto -> númpuerto. sv
 # Sugerencia: numprog -> númprog. sv
-# OK, lo he cambiado en todo 
+# OK, lo he cambiado en todo
 #: sunrpc/rpcinfo.c:609
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 msgstr ""
 "Modo de empleo: rpcinfo [ -n númpuerto ] -u host progrnúm [ numversión ]\n"
 
-# ## ¿"user defined" no sería "definida por el usuario"? sv
-# ## Si , puede que sea mejor, lo cambio em
 msgid "User defined signal 1"
 msgstr "Señal definida por el usuario 1"
 
 msgid "User defined signal 2"
 msgstr "Señal definida por el usuario 2"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:742
+#: stdio-common/../sysdeps/gnu/errlist.c:642
 msgid "Value too large for defined data type"
 msgstr "Valor demasiado grande para el tipo de datos definido"
 
@@ -2047,6 +2136,23 @@ msgstr "Ventana cambiada"
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
+#: nis/ypclnt.c:146
+msgid "YPBINDPROC_DOMAIN: Internal error\n"
+msgstr "YPBINDPROC_DOMAIN: Error interno\n"
+
+#: nis/ypclnt.c:150
+#, c-format
+msgid "YPBINDPROC_DOMAIN: No server for domain %s\n"
+msgstr "YPBINDPROC_DOMAIN: No hay servidor para el dominio %s\n"
+
+#: nis/ypclnt.c:154
+msgid "YPBINDPROC_DOMAIN: Resource allocation failure\n"
+msgstr "YPBINDPROC_DOMAIN: Fallo en la asignación de recursos\n"
+
+#: nis/ypclnt.c:158
+msgid "YPBINDPROC_DOMAIN: Unknown error\n"
+msgstr "YPBINDPROC_DOMAIN: Error desconocido\n"
+
 # ?? Ni idea de como traducir esto
 # "Ciertamente expiraste durante este tiempo" em
 # this time es esta *vez* Pero como no acabo de verle el sentido a la frase
@@ -2059,9 +2165,11 @@ msgstr "Escrito por %s.\n"
 # Ok, traducido exactamente igual que lo tiene Jochen. Es ist keine Schuld
 #   von mir wenn es gar nicht stimmt.
 #
-# Sugerencia: "Ahora sí que te lo has cargado".
+# Sugerencia: "Ahora sí que te lo has cargado". sv+
 # (Preguntar a nuestros amigos americanos si se entiende).
-# (No sé pero me suena que "blew" no es muy fino). sv
+# (Es que me suena que "blew" no es muy fino, por eso romper es
+# demasiado suave).
+#
 #. TRANS You did @strong{what}?
 #: stdio-common/../sysdeps/gnu/errlist.c:596
 msgid "You really blew it this time"
@@ -2083,46 +2191,46 @@ msgstr "La definición `%1$s' no termina con `END %1$s'"
 #, c-format
 msgid "`-1' must be last entry in `%s' field in `%s' category"
 msgstr ""
-"`-1' tiene que ser la última especidicación en el campo `%s' de la "
+"`-1' tiene que ser la última especificación en el campo `%s' de la "
 "categoría\n"
 "`%s'"
 
 # FUZZY
-# entries ? debe de haber algo para eso
-# lo traducí antes como especificación , pero ... em+
-#: locale/programs/ld-collate.c:1651
+# entries ? debe haber algo para eso
+# lo traducí antes como especificación, pero ... em+
+#: locale/programs/ld-collate.c:1652
 msgid "`...' must only be used in `...' and `UNDEFINED' entries"
-msgstr "`...' debe de ser usado únicamente en las entradas `...' y `UNDEFINED'"
+msgstr "`...' debe ser usado únicamente en las entradas `...' y `UNDEFINED'"
 
 #: locale/programs/locfile.c:538
 msgid "`from' expected after first argument to `collating-element'"
 msgstr ""
 "Se esperaba `from' después del primer argumento para `collating-element'"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1109
 msgid ""
 "`from' string in collation element declaration contains unknown character"
 msgstr ""
 "La cadena de caracteres `from' en la declaración de elemento de unión "
 "contiene\n"
-"un caracter desconocico"
+"un carácter desconocido"
 
 #: locale/programs/charmap.c:267
 #, c-format
 msgid "argument to <%s> must be a single character"
-msgstr "el argumento para <%s> debe de ser un único carácter"
+msgstr "el argumento para <%s> debe ser un único carácter"
 
 #: locale/programs/locfile.c:215
 #, c-format
 msgid "argument to `%s' must be a single character"
-msgstr "el argumento para `%s' debe de ser un único carácter"
+msgstr "el argumento para `%s' debe ser un único carácter"
 
 #  ??? mariscalización ?
 #: sunrpc/auth_unix.c:322
 msgid "auth_none.c - Fatal marshalling problem"
 msgstr "auth_none.c - Problema muy grave con autorización marshall"
 
-#: inet/rcmd.c:330
+#: inet/rcmd.c:360
 msgid "bad .rhosts owner"
 msgstr "El propietario del archivo .rhosts no es válido"
 
@@ -2165,7 +2273,7 @@ msgstr "cache_set: no se encontró el objetivo"
 msgid "can't determine time zone abbrevation to use just after until time"
 msgstr ""
 "No se puede determinar la abreviación de zona horaria que se usará justo\n"
-"despues "
+"después"
 
 #: sunrpc/svc_simple.c:64
 #, c-format
@@ -2177,25 +2285,25 @@ msgstr "no se puede reasignar el procedimiento número %d\n"
 msgid "cannot `stat' locale file `%s'"
 msgstr "la llamada a `stat' falló en el archivo de locales `%s'"
 
-#: locale/programs/ld-collate.c:1313
+#: locale/programs/ld-collate.c:1314
 #, c-format
 msgid "cannot insert collation element `%.*s'"
-msgstr "no se puede insertar el elemento de unión`%.*s' "
+msgstr "no se puede insertar el elemento de unión `%.*s' "
 
-#: locale/programs/ld-collate.c:1492 locale/programs/ld-collate.c:1497
+#: locale/programs/ld-collate.c:1493 locale/programs/ld-collate.c:1498
 msgid "cannot insert into result table"
 msgstr "no se puede insertar el la tabla de resultados"
 
 # FUZZY
-#: locale/programs/ld-collate.c:1165 locale/programs/ld-collate.c:1207
+#: locale/programs/ld-collate.c:1166 locale/programs/ld-collate.c:1208
 #, c-format
 msgid "cannot insert new collating symbol definition: %s"
-msgstr "no se puede isertar la nueva definición para el símbolo de unión: %s"
+msgstr "no se puede insertar la nueva definición para el símbolo de unión: %s"
 
 #: db/makedb.c:161
 #, c-format
 msgid "cannot open database file `%s': %s"
-msgstr "no se puede abrir el fichero de datos `%s': %s"
+msgstr "no se puede abrir el archivo de datos `%s': %s"
 
 #: catgets/gencat.c:259 db/makedb.c:180
 #, c-format
@@ -2218,7 +2326,7 @@ msgid "cannot open output file `%s' for category `%s'"
 msgstr "no se puede abrir el archivo de salida `%s' para la categoría `%s'"
 
 # FUZZY
-#: locale/programs/ld-collate.c:1359
+#: locale/programs/ld-collate.c:1360
 msgid "cannot process order specification"
 msgstr "no se pueden procesar las especificaciones de orden"
 
@@ -2249,29 +2357,23 @@ msgstr "categoría de datos reclamada más de una vez, no debería de ocurrir"
 #: locale/programs/ld-ctype.c:265
 #, c-format
 msgid "character %s'%s' in class `%s' must be in class `%s'"
-msgstr "el carácter %s'%s' en la clase `%s' debe de estar en la clase `%s'"
+msgstr "el carácter %s'%s' en la clase `%s' debe estar en la clase `%s'"
 
 #: locale/programs/ld-ctype.c:289
 #, c-format
 msgid "character %s'%s' in class `%s' must not be in class `%s'"
-msgstr "el carácter %s'%s' en la clase `%s' no debe de estar en la clase `%s"
+msgstr "el carácter %s'%s' en la clase `%s' no debe estar en la clase `%s"
 
 #: locale/programs/ld-ctype.c:310
 msgid "character <SP> not defined in character map"
 msgstr "el carácter <SP> no está definido en el mapa de caracteres'"
 
-#: locale/programs/ld-ctype.c:1141
-#, c-format
-msgid "character `%c' not defined while needed as default value"
-msgstr ""
-"el carácter `%c' no está definido cuando se necesitó como valor por defecto"
-
 #: locale/programs/ld-ctype.c:939 locale/programs/ld-ctype.c:1002
 #: locale/programs/ld-ctype.c:1010 locale/programs/ld-ctype.c:1018
 #: locale/programs/ld-ctype.c:1026 locale/programs/ld-ctype.c:1034
 #: locale/programs/ld-ctype.c:1042 locale/programs/ld-ctype.c:1068
 #: locale/programs/ld-ctype.c:1076 locale/programs/ld-ctype.c:1114
-#: locale/programs/ld-ctype.c:1152
+#: locale/programs/ld-ctype.c:1141 locale/programs/ld-ctype.c:1152
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr ""
@@ -2296,21 +2398,23 @@ msgstr "el mapa de caracteres `%s' no se encontró"
 msgid "clnt_raw.c - Fatal header serialization error."
 msgstr "clnt_raw.c - Error grave en la secuencia de cabecera"
 
-#: locale/programs/ld-collate.c:1328
+#: locale/programs/ld-collate.c:1329
 #, c-format
 msgid "collation element `%.*s' appears more than once: ignore line"
-msgstr "el elemento de unión `%.*s' aparece más de una vez: pasando por alto la línea"
+msgstr ""
+"el elemento de unión `%.*s' aparece más de una vez: pasando por alto la línea"
 
-#: locale/programs/ld-collate.c:1346
-msgid "collation symbol `.*s' appears more than once: ignore line"
-msgstr "símbolo de unión `.*s' aparece más de una vez: descartando la línea"
+#: locale/programs/ld-collate.c:1347
+#, c-format
+msgid "collation symbol `%.*s' appears more than once: ignore line"
+msgstr "símbolo de unión `%.*s' aparece más de una vez: descartando la línea"
 
 #: locale/programs/locfile.c:522
 #, c-format
 msgid "collation symbol expected after `%s'"
 msgstr "símbolo de unión esperado después de `%s'"
 
-#: inet/rcmd.c:114
+#: inet/rcmd.c:129
 #, c-format
 msgid "connect to address %s: "
 msgstr "conexión a la dirección %s: "
@@ -2319,18 +2423,6 @@ msgstr "conexión a la dirección %s: "
 msgid "couldn't create an rpc server\n"
 msgstr "no se pudo crear un servidor rpc\n"
 
-# ## Antes decía: no se pudo crear un servidor rpc
-# ## Lo he cambiado por lo que ves. sv
-# ## Borro el "fuzzy". sv
-#: sunrpc/portmap.c:121
-msgid "couldn't do tcp_create\n"
-msgstr "no se ha podido ejecutar tcp_create\n"
-
-# ## Borro el fuzzy. sv
-#: sunrpc/portmap.c:99
-msgid "couldn't do udp_create\n"
-msgstr "no se pudo ejecutar udp_create\n"
-
 #: sunrpc/svc_simple.c:77
 #, c-format
 msgid "couldn't register prog %d vers %d\n"
@@ -2347,7 +2439,7 @@ msgid ""
 "direction flag in string %d in `era' field in category `%s' is not '+' nor "
 "'-'"
 msgstr ""
-"el indicador de dirección en la cadena %d en el campo `era' de la categoria\n"
+"el indicador de dirección en la cadena %d en el campo `era' de la categoría\n"
 "`%s' no es '+' o  '-'"
 
 #: locale/programs/ld-time.c:164
@@ -2356,7 +2448,7 @@ msgid ""
 "direction flag in string %d in `era' field in category `%s' is not a single "
 "character"
 msgstr ""
-"el indicador de dirección en la cadena %d en el campo `era' de la categoria\n"
+"el indicador de dirección en la cadena %d en el campo `era' de la categoría\n"
 "`%s' no es un único carácter"
 
 #: locale/programs/charset.c:87 locale/programs/charset.c:132
@@ -2364,13 +2456,11 @@ msgstr ""
 msgid "duplicate character name `%s'"
 msgstr "nombre de carácter duplicado `%s'"
 
-#: locale/programs/ld-collate.c:1140
+#: locale/programs/ld-collate.c:1141
 msgid "duplicate collating element definition"
 msgstr "definición duplicada del elemento de unión"
 
-# ¿No será "definición de conjunto duplicada"? sv
-# Esto no lo has visto todavía. sv
-#: locale/programs/ld-collate.c:1286
+#: locale/programs/ld-collate.c:1287
 #, c-format
 msgid "duplicate definition for character `%.*s'"
 msgstr "definición duplicada del carácter `%.*s"
@@ -2396,9 +2486,9 @@ msgstr "identificador de mensaje duplicado"
 msgid "duplicated message number"
 msgstr "número de mensaje duplicado"
 
-#: locale/programs/ld-collate.c:1695
+#: locale/programs/ld-collate.c:1696
 msgid "empty weight name: line ignored"
-msgstr "nombre de peso vacio: la línea se pasa por alto"
+msgstr "nombre de peso vacío: la línea se pasa por alto"
 
 #: sunrpc/svc_udp.c:348
 msgid "enablecache: cache already enabled"
@@ -2420,16 +2510,17 @@ msgstr "enablecache: no se pudo crear espacio para los datos del caché"
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: no se pudo crear espacio para la pila del caché"
 
-#: locale/programs/ld-collate.c:1418
+# ## ellipsis NO era elipse... sv+
+#: locale/programs/ld-collate.c:1419
 msgid "end point of ellipsis range is bigger then start"
 msgstr ""
-"el punto de final para el rango de la elipse es mayor que el de comienzo"
+"el punto de final para el rango de la elipsis es mayor que el de comienzo"
 
-#: locale/programs/ld-collate.c:1148
+#: locale/programs/ld-collate.c:1149
 msgid "error while inserting collation element into hash table"
 msgstr "error cuando se insertaba el elemento de unión en la tabla enlazada"
 
-#: locale/programs/ld-collate.c:1160
+#: locale/programs/ld-collate.c:1161
 msgid "error while inserting to hash table"
 msgstr "error al insertar en la tabla enlazada"
 
@@ -2437,8 +2528,6 @@ msgstr "error al insertar en la tabla enlazada"
 msgid "expect string argument for `copy'"
 msgstr "se espera un argumento de cadena de caracteres para `copy'"
 
-# Sugerencia: La línea de continuación *esperada*. sv
-# OK em+
 #: time/zic.c:856
 msgid "expected continuation line not found"
 msgstr "la línea de continuación esperada no se encuentra"
@@ -2451,12 +2540,12 @@ msgstr "error al escribir los datos para la categoría `%s'"
 #: locale/programs/ld-monetary.c:154 locale/programs/ld-numeric.c:95
 #, c-format
 msgid "field `%s' in category `%s' not defined"
-msgstr "el campo `%s' en la categoria `%s' no está definido"
+msgstr "el campo `%s' en la categoría `%s' no está definido"
 
 #: locale/programs/ld-messages.c:81 locale/programs/ld-messages.c:102
 #, c-format
 msgid "field `%s' in category `%s' undefined"
-msgstr "el campo `%s' el la categoría `%s' no se ha definido"
+msgstr "el campo `%s' en la categoría `%s' no se ha definido"
 
 #: locale/programs/locfile.c:547
 msgid "from-value of `collating-element' must be a string"
@@ -2480,7 +2569,7 @@ msgid ""
 "garbage at end of offset value in string %d in `era' field in category `%s'"
 msgstr ""
 "incongruencias al final del valor de desplazamiento en la cadena %d en el\n"
-"campo `era' de la categoria `%s'"
+"campo `era' de la categoría `%s'"
 
 #: locale/programs/ld-time.c:238
 #, c-format
@@ -2488,7 +2577,7 @@ msgid ""
 "garbage at end of starting date in string %d in `era' field in category `%s'"
 msgstr ""
 "incongruencias al final de la fecha de comienzo en la cadena %d en el\n"
-"campo `era' de la categoria `%s'"
+"campo `era' de la categoría `%s'"
 
 #: locale/programs/ld-time.c:310
 #, c-format
@@ -2496,7 +2585,7 @@ msgid ""
 "garbage at end of stopping date in string %d in `era' field in category `%s'"
 msgstr ""
 "incongruencias al final de la fecha de parada en la cadena %d en el<\n"
-"campo `era' de la categoria `%s'"
+"campo `era' de la categoría `%s'"
 
 #: sunrpc/get_myaddr.c:73
 msgid "get_myaddress: ioctl (get interface configuration)"
@@ -2510,11 +2599,11 @@ msgstr "El campo CORRECTION en la línea de año bisiesto no es válido"
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "Campo Rolling/Stationary no válido en la línea de año bisiesto"
 
-#: locale/programs/ld-collate.c:1766
+#: locale/programs/ld-collate.c:1767
 msgid "illegal character constant in string"
 msgstr "carácter no válido en el archivo: "
 
-#: locale/programs/ld-collate.c:1115
+#: locale/programs/ld-collate.c:1116
 msgid "illegal collation element"
 msgstr "elemento de unión no válido"
 
@@ -2539,7 +2628,7 @@ msgstr "nombres no permitidos para el rango de caracteres"
 msgid "illegal number for offset in string %d in `era' field in category `%s'"
 msgstr ""
 "número de desplazamiento no válido en la cadena %d en el campo `era' de la\n"
-"categoria `%s'"
+"categoría `%s'"
 
 #: catgets/gencat.c:351 catgets/gencat.c:428
 msgid "illegal set number"
@@ -2550,14 +2639,14 @@ msgstr "número de conjunto inválido"
 msgid "illegal starting date in string %d in `era' field in category `%s'"
 msgstr ""
 "fecha de comienzo no válida en la cadena %d en el campo `era' de la\n"
-"categoria `%s'"
+"categoría `%s'"
 
 #: locale/programs/ld-time.c:302
 #, c-format
 msgid "illegal stopping date in string %d in `era' field in category `%s'"
 msgstr ""
 "fecha de parada no válida en la cadena %d en el campo `era' de la\n"
-"categoria `%s'"
+"categoría `%s'"
 
 #: locale/programs/ld-ctype.c:807
 #, c-format
@@ -2600,8 +2689,7 @@ msgstr "error interno en %s, línea %u"
 msgid "invalid GMT offset"
 msgstr "desplazamiento GMT no válido"
 
-# ¿No será "abreviatura"? sv
-# ¿? A esto no me has contestado. sv
+# ¿No será "abreviatura"? sv+
 #: time/zic.c:1024
 msgid "invalid abbreviation format"
 msgstr "formato de abreviación incorrecto"
@@ -2634,20 +2722,17 @@ msgstr "año de comienzo no válido"
 msgid "invalid time of day"
 msgstr "hora del día no válida"
 
-# ## Antes tenías "nombre de la semana incorrecto" sv
-# ## Mandeeee ? em
-# ## Te lo prometo... sv
 #: time/zic.c:1318
 msgid "invalid weekday name"
 msgstr "nombre del día de la semana incorrecto"
 
-#: locale/programs/ld-collate.c:1411
+#: locale/programs/ld-collate.c:1412
 msgid "line after ellipsis must contain character definition"
 msgstr ""
 "la línea de después de la elipsis tiene que contener una definición de "
 "carácter"
 
-#: locale/programs/ld-collate.c:1390
+#: locale/programs/ld-collate.c:1391
 msgid "line before ellipsis does not contain definition for character constant"
 msgstr ""
 "la línea posterior a la elipsis no contiene una definición para una "
@@ -2667,7 +2752,7 @@ msgstr ""
 msgid "malformed line ignored"
 msgstr "línea incorrecta se ignoró"
 
-#  ??? y bien ? , alguna sugerencia ? , alborotada , retorcida, descolocada,
+#  ??? y bien ?, alguna sugerencia ?, alborotada, retorcida, descolocada,
 #  enrollada :)
 # ¿estropeada?       ¿alterada? <- votaría por ésta. sv
 #  Pues después de ver la traducción de Jochen estoy perdido
@@ -2684,11 +2769,15 @@ msgid "memory clobbered past end of allocated block"
 msgstr "memoria alterada pasado el final del bloque de memoria asignado"
 
 #: locale/programs/ld-collate.c:167 locale/programs/ld-collate.c:173
-#: locale/programs/ld-collate.c:177 locale/programs/ld-collate.c:1438
-#: locale/programs/ld-collate.c:1467 locale/programs/locfile.c:940
-#: locale/programs/xmalloc.c:68 posix/getconf.c:181
+#: locale/programs/ld-collate.c:177 locale/programs/ld-collate.c:1439
+#: locale/programs/ld-collate.c:1468 locale/programs/locfile.c:940
+#: locale/programs/xmalloc.c:68 posix/getconf.c:250
 msgid "memory exhausted"
-msgstr "Memoria agotada"
+msgstr "memoria agotada"
+
+#: malloc/obstack.c:425
+msgid "memory exhausted\n"
+msgstr "Memoria agotada\n"
 
 # biblioteca está recogida en la lista de pifias de Ángel Álvarez.
 #: malloc/mcheck.c:180
@@ -2700,14 +2789,14 @@ msgstr "no hay problemas con la memoria, la biblioteca tiene un bug"
 msgid "missing era format in string %d in `era' field in category `%s'"
 msgstr ""
 "nombre de era no encontrado en la cadena %d en el campo `era' de la\n"
-"categoria `%s'"
+"categoría `%s'"
 
 #: locale/programs/ld-time.c:337
 #, c-format
 msgid "missing era name in string %d in `era' fieldin category `%s'"
 msgstr ""
 "nomnbre de era no encontrado en la cadena %d en el campo `era' de la\n"
-"categoria `%s'"
+"categoría `%s'"
 
 #: time/zic.c:915
 msgid "nameless rule"
@@ -2723,7 +2812,7 @@ msgstr "el programa %d no fue registrado nunca\n"
 msgid "no correct regular expression for field `%s' in category `%s': %s"
 msgstr ""
 "falta una expresión regular correcta para el campo `%s' en la categoría "
-"`%s': \n"
+"`%s':\n"
 "%s'"
 
 # ## Antes tenías: "no hay día en la regla de coincidencia de mes" sv
@@ -2744,7 +2833,7 @@ msgstr "ninguna otra palabra clave debe ser especificada al usar `copy'"
 
 #: locale/programs/localedef.c:340
 msgid "no output file produced because warning were issued"
-msgstr "no se produjo fichero de salida debido a la existencia de warnings"
+msgstr "no se produjo archivo de salida debido a la existencia de warnings"
 
 #: locale/programs/charmap.c:315 locale/programs/charmap.c:466
 #: locale/programs/charmap.c:545
@@ -2766,19 +2855,6 @@ msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr ""
 "solo están permitidas definiciones WIDTH después de la una definición CHARMAP"
 
-#: sunrpc/portmap.c:451
-msgid "portmap CALLIT: cannot fork.\n"
-msgstr "portmap CALLIT: llamada a fork() sin éxito\n"
-
-# mapeador es *horroroso* sv
-#: sunrpc/portmap.c:94 sunrpc/portmap.c:116
-msgid "portmap cannot bind"
-msgstr "falló la llamada a bind() del mapeador de puertos `portmap' "
-
-#: sunrpc/portmap.c:86 sunrpc/portmap.c:112
-msgid "portmap cannot create socket"
-msgstr "el mapeador de puertos `portmap' no ha podido crear el `socket'"
-
 #: db/makedb.c:326
 #, c-format
 msgid "problems while reading `%s'"
@@ -2790,34 +2866,31 @@ msgstr "problemas mientras se leía `%s'"
 msgid "program %lu is not available\n"
 msgstr "el programa %lu no está disponible\n"
 
-# ## Borro un "fuzzy" que había. sv
 #: sunrpc/rpcinfo.c:245 sunrpc/rpcinfo.c:282 sunrpc/rpcinfo.c:371
 #: sunrpc/rpcinfo.c:408 sunrpc/rpcinfo.c:429 sunrpc/rpcinfo.c:462
 #, c-format
 msgid "program %lu version %lu is not available\n"
 msgstr "el programa %lu versión %lu no está disponible\n"
 
-# ## por similitud con los mensajes anteriores, añado verbo (y por tanto
-# ## "el" inicial a la frase. sv
-# Sugerencia: esperando -> a la espera. sv
+# Sugerencia: esperando -> a la espera. sv+
 #: sunrpc/rpcinfo.c:466
 #, c-format
 msgid "program %lu version %lu ready and waiting\n"
 msgstr "el programa %lu versión %lu está listo y esperando\n"
 
-#: inet/rcmd.c:157
+#: inet/rcmd.c:171
 #, c-format
-msgid "rcmd: select (setting up stderr): %s\n"
-msgstr "rcmd: select (activando la salida de error estándar): %s\n"
+msgid "rcmd: select (setting up stderr): %m\n"
+msgstr "rcmd: select (activando la salida de error estándar): %m\n"
 
-#: inet/rcmd.c:87
+#: inet/rcmd.c:103
 msgid "rcmd: socket: All ports in use\n"
 msgstr "rcmd: socket: Todos los puertos están siendo usados\n"
 
-#: inet/rcmd.c:144
+#: inet/rcmd.c:159
 #, c-format
-msgid "rcmd: write (setting up stderr): %s\n"
-msgstr "rcmd: write (activando la salida de error estándar): %s\n"
+msgid "rcmd: write (setting up stderr): %m\n"
+msgstr "rcmd: write (activando la salida de error estándar): %m\n"
 
 #: sunrpc/svc_simple.c:83
 msgid "registerrpc: out of memory\n"
@@ -2844,7 +2917,7 @@ msgstr "rpcinfo: el servicio `%s' es desconocido\n"
 msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
 msgstr "no se pudo borrar el registro para el programa %s versión %s\n"
 
-# Sugerencia: broadcast -> `broadcast'. sv
+# Sugerencia: broadcast -> `broadcast'. sv+
 #: sunrpc/rpcinfo.c:576
 #, c-format
 msgid "rpcinfo: broadcast failed: %s\n"
@@ -2861,22 +2934,18 @@ msgid "rpcinfo: can't contact portmapper: "
 msgstr ""
 "rpcinfo: no se puede comunicar con el mapeador de puertos (`portmapper'): "
 
-#: sunrpc/portmap.c:137
-msgid "run_svc returned unexpectedly\n"
-msgstr "run_svc terminó inesperadamente\n"
-
 #: time/zic.c:708 time/zic.c:710
 msgid "same rule name in multiple files"
-msgstr "mismo nombre de regla en varios ficheros"
+msgstr "mismo nombre de regla en varios archivos"
 
-#  ¿en la configuración del servicio? , ¿del circuito? , ¿o dejarlo así?
+#  ¿en la configuración del servicio?, ¿del circuito?, ¿o dejarlo así?
 #  Es de locos, estuve viendo las/los fuentes, preferí dejarlo así. em
-#: inet/rcmd.c:161
+#: inet/rcmd.c:174
 msgid "select: protocol failure in circuit setup\n"
 msgstr "select: fallo de protocolo al configurar el circuito\n"
 
 #  ??? lo mismo que arriba
-#: inet/rcmd.c:179
+#: inet/rcmd.c:192
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket: fallo de protocolo al configurar el circuito\n"
 
@@ -2884,7 +2953,7 @@ msgstr "socket: fallo de protocolo al configurar el circuito\n"
 msgid "sorting order `forward' and `backward' are mutually exclusive"
 msgstr "los órdenes `forward' y `backward' son mutuamente excluyentes"
 
-#: locale/programs/ld-collate.c:1567 locale/programs/ld-collate.c:1613
+#: locale/programs/ld-collate.c:1568 locale/programs/ld-collate.c:1614
 msgid ""
 "specification of sorting weight for collation symbol does not make sense"
 msgstr ""
@@ -2910,12 +2979,13 @@ msgstr ""
 msgid "starting year greater than ending year"
 msgstr "año de comienzo mayor que año de final"
 
+# ## Corregido el estropicio. sv+
 #: locale/programs/ld-time.c:328
 #, c-format
 msgid "stopping date is illegal in string %d in `era' field in category `%s'"
 msgstr ""
-"la fecha de final no es válida en la cadena %d del campo `era' de la\\n\"\n"
-"\"categoría `%s'"
+"la fecha de final no es válida en la cadena %d del campo `era' de la\n"
+"categoría `%s'"
 
 #: sunrpc/svc_tcp.c:201 sunrpc/svc_tcp.c:206
 msgid "svc_tcp: makefd_xprt: out of memory\n"
@@ -2941,7 +3011,7 @@ msgstr "svcudp_create - fallo en la ejecución de `getsockname'"
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create: problemas para crear el `socket'"
 
-#: locale/programs/ld-collate.c:1190
+#: locale/programs/ld-collate.c:1191
 #, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates element "
@@ -2950,7 +3020,7 @@ msgstr ""
 "el símbolo para el elemento de unión para multi-caracter `%.*s'  repite la\n"
 "definición de otro elemento"
 
-#: locale/programs/ld-collate.c:1063
+#: locale/programs/ld-collate.c:1064
 #, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates other element "
@@ -2960,7 +3030,7 @@ msgstr ""
 "definición\n"
 "de otro elemento"
 
-#: locale/programs/ld-collate.c:1199
+#: locale/programs/ld-collate.c:1200
 #, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates other symbol "
@@ -2970,7 +3040,7 @@ msgstr ""
 "definición\n"
 "de otro símbolo"
 
-#: locale/programs/ld-collate.c:1072
+#: locale/programs/ld-collate.c:1073
 #, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates symbol "
@@ -2980,7 +3050,7 @@ msgstr ""
 "definición\n"
 "repite la definición de otro símbolo"
 
-#: locale/programs/ld-collate.c:1054 locale/programs/ld-collate.c:1181
+#: locale/programs/ld-collate.c:1055 locale/programs/ld-collate.c:1182
 #, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates symbolic name "
@@ -2996,69 +3066,69 @@ msgstr ""
 #: locale/programs/charmap.c:576
 #, c-format
 msgid "syntax error in %s definition: %s"
-msgstr "error de sintáxis en ls definición de %s: %s"
+msgstr "error de sintaxis en ls definición de %s: %s"
 
 #: locale/programs/locfile.c:620
 msgid "syntax error in `order_start' directive"
-msgstr "error de sintáxis en la directiva  `order_start'"
+msgstr "error de sintaxis en la directiva  `order_start'"
 
 #: locale/programs/locfile.c:362
 msgid "syntax error in character class definition"
-msgstr "error de sintáxis en el nombre de clase de carácter"
+msgstr "error de sintaxis en el nombre de clase de carácter"
 
 #: locale/programs/locfile.c:420
 msgid "syntax error in character conversion definition"
-msgstr "error de sintáxis en la definición de la conversión de carácter"
+msgstr "error de sintaxis en la definición de la conversión de carácter"
 
 #: locale/programs/locfile.c:662
 msgid "syntax error in collating order definition"
-msgstr "error de sintáxis en la definición del orden de unión"
+msgstr "error de sintaxis en la definición del orden de unión"
 
 #: locale/programs/locfile.c:512
 msgid "syntax error in collation definition"
-msgstr "error de sintáxis en la definición de la unión"
+msgstr "error de sintaxis en la definición de la unión"
 
 #: locale/programs/locfile.c:335
 msgid "syntax error in definition of LC_CTYPE category"
-msgstr "error de sintáxis en una definición de categoría LC_CTYPE"
+msgstr "error de sintaxis en una definición de categoría LC_CTYPE"
 
 #: locale/programs/locfile.c:278
 msgid "syntax error in definition of new character class"
-msgstr "error de sintáxis en la definición de una nueva clase de carácter"
+msgstr "error de sintaxis en la definición de una nueva clase de carácter"
 
 #: locale/programs/locfile.c:288
 msgid "syntax error in definition of new character map"
-msgstr "error de sintáxis en la definición de un nuevo mapa de carácter"
+msgstr "error de sintaxis en la definición de un nuevo mapa de carácter"
 
 #: locale/programs/locfile.c:873
 msgid "syntax error in message locale definition"
-msgstr "error de sintáxis en la definición de local para mensajes"
+msgstr "error de sintaxis en la definición de local para mensajes"
 
 #: locale/programs/locfile.c:784
 msgid "syntax error in monetary locale definition"
-msgstr "error de sintáxis en la definición de local para moneda"
+msgstr "error de sintaxis en la definición de local para moneda"
 
 #: locale/programs/locfile.c:811
 msgid "syntax error in numeric locale definition"
-msgstr "error de sintáxis en la definición de local para números"
+msgstr "error de sintaxis en la definición de local para números"
 
 #: locale/programs/locfile.c:722
 msgid "syntax error in order specification"
-msgstr "error de sintáxis en la especificación de órden"
+msgstr "error de sintaxis en la especificación de orden"
 
 #: locale/programs/charmap.c:195 locale/programs/charmap.c:211
 #, c-format
 msgid "syntax error in prolog: %s"
-msgstr "error de sintáxis en el prólogo: %s"
+msgstr "error de sintaxis en el prólogo: %s"
 
 #: locale/programs/locfile.c:849
 msgid "syntax error in time locale definition"
-msgstr "error de sintáxis en la definición de local para la hora"
+msgstr "error de sintaxis en la definición de local para la hora"
 
 #: locale/programs/locfile.c:255
 msgid "syntax error: not inside a locale definition section"
 msgstr ""
-"error de sintáxis: no está dentro de una seción de definición para un local"
+"error de sintaxis: no está dentro de una seción de definición para un local"
 
 #: catgets/gencat.c:380 catgets/gencat.c:516 catgets/gencat.c:543
 msgid "this is the first definition"
@@ -3068,7 +3138,7 @@ msgstr "esta es la primera vez que aparece la definición"
 msgid "time before zero"
 msgstr "hora antes de cero"
 
-# Sugerencia: Desbordamiento de fecha. (?) sv
+# Sugerencia: Desbordamiento de fecha. (?) sv+
 #: time/zic.c:1127 time/zic.c:1959 time/zic.c:1978
 msgid "time overflow"
 msgstr "desbordamiento horario"
@@ -3098,19 +3168,22 @@ msgid "too many transitions?!"
 msgstr "¡¿demasiadas transiciones?!"
 
 # FUZZY
-# ¿ Qué puede ser esto ? em+ 
-#: locale/programs/ld-collate.c:1622
+# ¿ Qué puede ser esto ? em+
+#: locale/programs/ld-collate.c:1623
 msgid "too many weights"
 msgstr "¡demasiados pesos!"
 
-# Sugerencia: abreviaturas. sv
-# Ok em+
+# ## Sugerencia: abreviaturas. sv
+# ## Ok em+
 #: time/zic.c:2082
 msgid "too many, or too long, time zone abbreviations"
 msgstr "demasiadas o demasiado largas abreviaturas de zona horaria"
 
 # FUZZY
-# es una traducción un poco libre, ¿ que te parece ? em+
+# es una traducción un poco libre, ¿ qué te parece ? em+
+# Pues que en ninguna parte dice que las esté ignorando.
+# Solamente dice que hay basurilla al final.
+# Yo borraría el "ignorando". sv+
 #: locale/programs/linereader.h:146
 msgid "trailing garbage at end of line"
 msgstr "ignorando inconsistencias al final de la línea"
@@ -3120,7 +3193,7 @@ msgstr "ignorando inconsistencias al final de la línea"
 msgid "trouble replying to prog %d\n"
 msgstr "dificultades para responder al programa %d\n"
 
-#: locale/programs/ld-collate.c:1382
+#: locale/programs/ld-collate.c:1383
 msgid "two lines in a row containing `...' are not allowed"
 msgstr "no están permitidas dos líneas en una misma fila con `...'"
 
@@ -3128,6 +3201,10 @@ msgstr "no están permitidas dos líneas en una misma fila con `...'"
 msgid "typed single year"
 msgstr "tecleado un único año"
 
+#: posix/getconf.c:239
+msgid "undefined"
+msgstr "sin definir"
+
 #: locale/programs/charmap.c:617 locale/programs/charmap.c:628
 #, c-format
 msgid "unknown character `%s'"
@@ -3145,8 +3222,9 @@ msgstr "carácter no reconocido en el campo `%s' de la categoría `%s'"
 msgid "unknown collation directive"
 msgstr "la directiva de unión es desconocida"
 
-# descartada (?) sv
-# ¿ y asi ?  em+
+# ## descartada (?) sv
+# ## ¿ y así ?  em
+# ## por mí, vale. sv+
 #: catgets/gencat.c:477
 #, c-format
 msgid "unknown directive `%s': line ignored"
@@ -3161,9 +3239,9 @@ msgid "unknown signal"
 msgstr "señal desconocida"
 
 # descartada (?) sv
-# Me gusta más `pasada por alto '  em+
-#: locale/programs/ld-collate.c:1366 locale/programs/ld-collate.c:1557
-#: locale/programs/ld-collate.c:1731
+# Me gusta más `pasada por alto' em+
+#: locale/programs/ld-collate.c:1367 locale/programs/ld-collate.c:1558
+#: locale/programs/ld-collate.c:1732
 #, c-format
 msgid "unknown symbol `%.*s': line ignored"
 msgstr "símbolo desconocido `%.*s': línea descartada"
@@ -3184,7 +3262,7 @@ msgstr "cadena de caracteres sin terminar"
 msgid "unterminated symbolic name"
 msgstr "nombre simbólico sin terminar"
 
-#: locale/programs/ld-collate.c:1684
+#: locale/programs/ld-collate.c:1685
 msgid "unterminated weight name"
 msgstr "nombre de peso sin terminar"
 
@@ -3195,7 +3273,7 @@ msgstr "el límite superior del rango no es menor que el límite inferior"
 # A lo mejor si pones "veintinueve de febrero" o "29 de febrero"
 # se entiende mejor. no sé. sv
 # Si, estas pensando lo mismo que yo, 29 de febrero puede confundir, porque
-# en el fichero pondrá 2/29  em
+# en el archivo pondrá 2/29  em
 # Sugerencia: "uso de 2/29 ..." (usando sería "using") sv
 # Tienes razón em+
 #: time/zic.c:2025
@@ -3211,12 +3289,12 @@ msgstr "el valor para %s tiene que ser un número entero"
 #: locale/programs/charmap.c:233
 #, c-format
 msgid "value for <%s> must lie between 1 and 4"
-msgstr "el valor para <%s> debe de estar entre 1 y 4"
+msgstr "el valor para <%s> debe estar entre 1 y 4"
 
 #: locale/programs/ld-monetary.c:148 locale/programs/ld-numeric.c:89
 #, c-format
 msgid "value for field `%s' in category `%s' must not be the empty string"
-msgstr "el valor para el campo `%s' en la categoría `%s' no debe estar vacio "
+msgstr "el valor para el campo `%s' en la categoría `%s' no debe estar vacío"
 
 #: locale/programs/charmap.c:245
 msgid "value of <mb_cur_max> must be greater than the value of <mb_cur_min>"
@@ -3228,29 +3306,30 @@ msgid ""
 "value of field `int_curr_symbol' in category `LC_MONETARY' does not "
 "correspond to a valid name in ISO 4217"
 msgstr ""
-"el valor del campo `int_curr_symbol' en la categoría `LC_MONETARY' no se \n"
+"el valor del campo `int_curr_symbol' en la categoría `LC_MONETARY' no se\n"
 "corresponde con un nombre válido en ISO 4217"
 
 # FUZZY
-# ¿ Erronea ? em+
+# ¿ Errónea ? em+
+# También se puede poner equivocada. sv+
 #: locale/programs/ld-monetary.c:133
 msgid ""
 "value of field `int_curr_symbol' in category `LC_MONETARY' has wrong length"
 msgstr ""
-"el valor del campo `int_curr_symbol' en la categoria `LC_MONETARY' tiene\n"
+"el valor del campo `int_curr_symbol' en la categoría `LC_MONETARY' tiene\n"
 "una longitud errónea"
 
 #: locale/programs/ld-monetary.c:370 locale/programs/ld-numeric.c:199
 #, c-format
 msgid "values for field `%s' in category `%s' must be smaller than 127"
-msgstr "el valor para el campo `%s' en la categoría `%s' no debe de ser cero"
+msgstr "el valor para el campo `%s' en la categoría `%s' no debe ser cero"
 
 #: locale/programs/ld-monetary.c:366
 #, c-format
 msgid "values for field `%s' in category `%s' must not be zero"
-msgstr "el valor para el campo `%s' en la categoría `%s' no debe de ser cero"
+msgstr "el valor para el campo `%s' en la categoría `%s' no debe ser cero"
 
-#: login/setutent_r.c:47
+#: login/utmp_file.c:84
 msgid "while opening UTMP file"
 msgstr "al abrir el archivo UTMP"
 
@@ -3279,7 +3358,7 @@ msgstr "número incorrecto de argumentos"
 # O es mejor como digo, o no es mejor.
 # Si es mejor, ponlo en todos los sitios. Y si no, en ninguno.
 # Yo creo que es mucho mejor poner "número incorrecto ..."
-# Si no, queda como "al revés". sv
+# Si no, queda como "al revés". sv+
 #: time/zic.c:1077
 msgid "wrong number of fields on Leap line"
 msgstr "número incorrecto de campos en la línea de bisiesto ( Leap )"
@@ -3300,6 +3379,41 @@ msgstr "número de campos incorrecto en la línea de continuación de zona (Zone)"
 msgid "wrong number of fields on Zone line"
 msgstr "número de campos incorrecto en la línea de zona ( Zone )"
 
+#: nis/ypclnt.c:570
+msgid "yp_all: clnttcp_create failed"
+msgstr "yp_all: ha fallado la llamada a 'clnttcp_create()'"
+
+#: nis/ypclnt.c:772
+msgid "yp_update: cannot convert host to netname\n"
+msgstr "yp_update: no puede convertir el nombre del host a nombre de red\n"
+
+#: nis/ypclnt.c:784
+msgid "yp_update: cannot get server address\n"
+msgstr "yp_update: no se puede encontrar la dirección del servidor\n"
+
+#~ msgid "character `%c' not defined while needed as default value"
+#~ msgstr ""
+#~ "el carácter `%c' no está definido cuando se necesitó como valor por defecto"
+
+# ## Antes decía: no se pudo crear un servidor rpc
+# ## Lo he cambiado por lo que ves. sv
+# ## Borro el "fuzzy". sv
+#~ msgid "couldn't do tcp_create\n"
+#~ msgstr "no se ha podido ejecutar tcp_create\n"
+
+# ## Borro el fuzzy. sv
+#~ msgid "couldn't do udp_create\n"
+#~ msgstr "no se pudo ejecutar udp_create\n"
+
+#~ msgid "portmap CALLIT: cannot fork.\n"
+#~ msgstr "portmap CALLIT: llamada a fork() sin éxito\n"
+
+#~ msgid "portmap cannot create socket"
+#~ msgstr "el mapeador de puertos `portmap' no ha podido crear el `socket'"
+
+#~ msgid "run_svc returned unexpectedly\n"
+#~ msgstr "run_svc terminó inesperadamente\n"
+
 #~ msgid "       %s [-c | -h | -l | -m] [-o outfile] [infile]\n"
 #~ msgstr ""
 #~ "       %s [-c | -h | -l | -m] [-o archivo_salida] [archivo_entrada]\n"
@@ -3319,7 +3433,7 @@ msgstr "número de campos incorrecto en la línea de zona ( Zone )"
 # A los "arrays" les digo matrices. Igual en América se dice de otra forma.
 # Creo que habría que consultarlo. SV.
 # Echando mano de los fuentes, está claro que se refiere a un array de
-# caracteres, ¿ Cadena de caracteres ? , si claro. EM
+# caracteres, ¿ Cadena de caracteres ?, si claro. EM
 # Pues no, puede ser ambas cosas, o un array de caracteres, o una cadena.
 # ¿por qué te comes la palabra "declaración"?
 # ¿Qué tal "esperada una declaración de `array'"? sv
@@ -3382,14 +3496,14 @@ msgstr "número de campos incorrecto en la línea de zona ( Zone )"
 #~ msgstr "Modo de empleo: %s archivo_de_entrada\n"
 
 # "array" es "array"?
-# Lo miro con cuidado , los archivos rpc_*.c de la libc son especialmente
-# complicados. Sí , creo que se refiere a los aliases de servicios rpc, y
+# Lo miro con cuidado, los archivos rpc_*.c de la libc son especialmente
+# complicados. Sí, creo que se refiere a los aliases de servicios rpc, y
 # efectivamente es un array de longitud variable. No se me ocurriría
 # traducirlo de otra forma, yo no lo entendería mejor que así.
 # otra vez está ausente la "declaración", ¿no habría que ponerla ? sv
 # rpc_parse contiene las funciones para 'parsear' un archivo de config. em
 # Habrá que inventar algo para 'parsear' ... sv
-# Los alemanes dicen parsen , habe geparst  em , quizá comprobar
+# Los alemanes dicen parsen, habe geparst  em, quizá comprobar
 # sintaxis o interpretar ? ( parsear es ambas cosas juntas, no ? ) em
 # Creo que "examinar" podría valer, al menos para empezar. sv
 #
@@ -3401,63 +3515,16 @@ msgstr "número de campos incorrecto en la línea de zona ( Zone )"
 #~ msgstr ""
 #~ "voids sólo se permiten dentro de las definiciones de uniones y de programa"
 
+# ## Borro todos los errores reservados menos este.
+# ## Si aparecen otra vez le dices a Ulrich que ponga
+# ## "Reserved error %d", digo yo. sv+
+# ## Borra este mismo si te parece.
 #~ msgid "Reserved error 82"
 #~ msgstr "Error reservado 82"
 
-#~ msgid "Reserved error 83"
-#~ msgstr "Error reservado 83"
-
-#~ msgid "Reserved error 84"
-#~ msgstr "Error reservado 84"
-
-#~ msgid "Reserved error 85"
-#~ msgstr "Error reservado 85"
-
-#~ msgid "Reserved error 86"
-#~ msgstr "Error reservado 86"
-
-#~ msgid "Reserved error 87"
-#~ msgstr "Error reservado 87"
-
-#~ msgid "Reserved error 88"
-#~ msgstr "Error reservado 88"
-
-#~ msgid "Reserved error 89"
-#~ msgstr "Error reservado 89"
-
-#~ msgid "Reserved error 90"
-#~ msgstr "Error reservado 90"
-
-#~ msgid "Reserved error 91"
-#~ msgstr "Error reservado 91"
-
-#~ msgid "Reserved error 92"
-#~ msgstr "Error reservado 92"
-
-#~ msgid "Reserved error 93"
-#~ msgstr "Error reservado 93"
-
-#~ msgid "Reserved error 94"
-#~ msgstr "Error reservado 94"
-
-#~ msgid "Reserved error 95"
-#~ msgstr "Error reservado 95"
-
-#~ msgid "Reserved error 96"
-#~ msgstr "Error reservado 96"
-
-#~ msgid "Reserved error 97"
-#~ msgstr "Error reservado 97"
-
-#~ msgid "Reserved error 98"
-#~ msgstr "Error reservado 98"
-
-#~ msgid "Reserved error 99"
-#~ msgstr "Error reservado 99"
-
 # Probablemente la traducción de path sería algo así
 # como "ruta de búsqueda" sv
 # por cierto: ¿qué son los niveles de "remote"? sv
-# Niveles de profundidad ? , ver fuentes em ??
+# Niveles de profundidad ?, ver fuentes em ??
 #~ msgid "Too many levels of remote in path"
 #~ msgstr "Demasiados niveles en el `path'"
diff --git a/po/fr.po b/po/fr.po
index 20382f340f..92a272f70e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libc 1.96\n"
-"POT-Creation-Date: 1996-10-17 03:22+0200\n"
-"PO-Revision-Date: 1996-10-22 22:01 -0400\n"
+"Project-Id-Version: GNU libc 1.98\n"
+"POT-Creation-Date: 1996-12-03 13:50+0100\n"
+"PO-Revision-Date: 1996-12-12 22:46 -0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,7 @@ msgid "   program vers proto   port\n"
 msgstr "   program no_version protocole  no_port\n"
 
 #: time/zic.c:424
+#, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (règles de \"%s\", ligne %d)"
 
@@ -42,164 +43,204 @@ msgid " done\n"
 msgstr " complété.\n"
 
 #: time/zic.c:421
+#, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", ligne %d: %s."
 
 #: time/zic.c:945
+#, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "La ligne \"Zone %s\" et l'option -l sont mutuellement exclusives."
 
 #: time/zic.c:953
+#, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "La ligne \"Zone %s\" et l'option -p sont mutuellement exclusives."
 
 #: time/zic.c:758
+#, c-format
 msgid "%s in ruleless zone"
 msgstr "%s est dans une zone sans règle."
 
-#: assert/assert.c:48
+#: assert/assert.c:46
+#, c-format
 msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
 msgstr "%s%s%s:%u: %s%s l'assertion `%s' a échoué.\n"
 
-#: assert/assert-perr.c:46
+#: assert/assert-perr.c:47
+#, c-format
 msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
 msgstr "%s%s%s:%u: %s%s erreur imprévue: %s.\n"
 
-#: stdio-common/psignal.c:48
+#: stdio-common/psignal.c:47
+#, c-format
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%ssignal inconnu %d.\n"
 
 #: time/zic.c:2139
+#, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d n'a pas fait correctement l'expansion de la valeur signée.\n"
 
 #: locale/programs/charmap.c:176
+#, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> doit être plus grande que <mb_cur_min>.\n"
 
 #: time/zic.c:1430
+#, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: ne peut créer %s: %s.\n"
 
 #: time/zic.c:2118
+#, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: ne peut créer le répertoire %s: %s.\n"
 
 #: time/zic.c:612
+#, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: ne peut établir un lien entre %s et %s: %s.\n"
 
 #: time/zic.c:783
+#, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: ne peut ouvrir %s: %s.\n"
 
 #: time/zic.c:851
+#, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: erreur lors de la fermeture de %s: %s.\n"
 
 #: time/zic.c:845
+#, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: erreur de lecture de %s.\n"
 
 #: time/zic.c:1494
+#, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: erreur d'écriture de %s.\n"
 
 #: time/zdump.c:258
+#, c-format
 msgid "%s: Error writing standard output "
 msgstr "%s: erreur d'écriture sur la sortie standard."
 
 #: time/zic.c:830
+#, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr ""
 "%s: ligne de type `Leap' dans un fichier qui n'a pas\n"
 "de délai en secondes %s.\n"
 
 #: time/zic.c:362
+#, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: mémoire épuisée: %s.\n"
 
 #: time/zic.c:527
+#, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: option -L spécifiée plus d'une fois.\n"
 
 #: time/zic.c:487
+#, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: option -d spécifiée plus d'une fois.\n"
 
 #: time/zic.c:497
+#, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: option -l spécifiée plus d'une fois.\n"
 
 #: time/zic.c:507
+#, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: option -p spécifiée plus d'une fois.\n"
 
 #: time/zic.c:517
+#, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: option -y spécifiée plus d'une fois.\n"
 
 #: time/zic.c:1845
+#, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: la commande était '%s', le résultat était %d.\n"
 
 #: locale/programs/charmap.c:593 locale/programs/locfile.c:878
+#, c-format
 msgid "%s: error in state machine"
 msgstr "%s: erreur de l'automate à états finis."
 
 #: posix/getopt.c:687
+#, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: option illégale -- %c.\n"
 
 #: posix/getopt.c:690
+#, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: option invalide -- %c.\n"
 
 #: posix/getopt.c:611
+#, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'option `%c%s' ne permet pas de paramètre.\n"
 
 #: posix/getopt.c:582
+#, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: l'option `%s' est ambiguë.\n"
 
 #: posix/getopt.c:628 posix/getopt.c:801
+#, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'option `%s' requiert un paramètre.\n"
 
 #: posix/getopt.c:606
+#, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: l'option `--%s' ne permet pas de paramètre.\n"
 
 #: posix/getopt.c:786
+#, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option `-W %s' ne permet pas de paramètre.\n"
 
 #: posix/getopt.c:767
+#, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'option `-W %s' est ambiguë.\n"
 
 #: posix/getopt.c:721 posix/getopt.c:850
+#, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: l'option requiert un paramètre -- %c.\n"
 
 #: time/zic.c:837 time/zic.c:1248 time/zic.c:1268
+#, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: panique: valeur %d de type `l_value' invalide.\n"
 
 #: locale/programs/charmap.c:600
+#, c-format
 msgid "%s: premature end of file"
 msgstr "%s: fin prématurée de fichier."
 
 #: posix/getopt.c:661
+#, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: option non reconnue `%c%s'.\n"
 
 #: posix/getopt.c:657
+#, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: option non reconnue `--%s'.\n"
 
 #: time/zic.c:446
+#, c-format
 msgid ""
 "%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d "
 "directory ]\n"
@@ -210,10 +251,12 @@ msgstr ""
 "\t[ -L secondes_écoulées ] [ -y type_année ] [ fichier ... ]\n"
 
 #: time/zdump.c:165
+#, c-format
 msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: usage: %s [ -v ] [ -c seuil ] nom_de_zone ...\n"
 
 #: sunrpc/clnt_perr.c:125
+#, c-format
 msgid "(unknown authentication error - %d)"
 msgstr "(erreur inconnue d'authentification - %d)"
 
@@ -229,23 +272,24 @@ msgstr "*entrée standard*"
 msgid ".lib section in a.out corrupted"
 msgstr "La section .lib dans a.out est corrompue."
 
-#: inet/rcmd.c:328
+#: inet/rcmd.c:358
 msgid ".rhosts fstat failed"
 msgstr "Échec d'évaluation fstat() de .rhosts."
 
-#: inet/rcmd.c:324
+#: inet/rcmd.c:354
 msgid ".rhosts lstat failed"
 msgstr "Échec d'évaluation lstat() de .rhosts."
 
-#: inet/rcmd.c:326
+#: inet/rcmd.c:356
 msgid ".rhosts not regular file"
 msgstr ".rhosts n'est pas un fichier régulier."
 
-#: inet/rcmd.c:332
+#: inet/rcmd.c:362
 msgid ".rhosts writeable by other than owner"
 msgstr ".rhosts accessible en écriture par d'autres que le propriétaire."
 
 #: sunrpc/clnt_perr.c:112 sunrpc/clnt_perr.c:133
+#, c-format
 msgid "; low version = %lu, high version = %lu"
 msgstr "; version basse = %lu, version haute = %lu"
 
@@ -254,10 +298,12 @@ msgid "; why = "
 msgstr "; pourquoi = "
 
 #: locale/programs/ld-ctype.c:326
+#, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "Le caractère <SP> ne doit pas être dans la classe `%s'."
 
 #: locale/programs/ld-ctype.c:317
+#, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "Le caractère <SP> n'est pas dans la classe `%s'."
 
@@ -283,7 +329,7 @@ msgstr "Adresse déjà utilisée."
 msgid "Address family not supported by protocol"
 msgstr "Famille d'adresses non supportée par le protocole."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:714
+#: stdio-common/../sysdeps/gnu/errlist.c:730
 msgid "Advertise error"
 msgstr "Erreur d'annonce."
 
@@ -324,10 +370,14 @@ msgstr "Mauvaise adresse."
 msgid "Bad file descriptor"
 msgstr "Mauvais descripteur de fichier."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:682
+#: stdio-common/../sysdeps/gnu/errlist.c:718
 msgid "Bad font file format"
 msgstr "Mauvais format du fichier de fontes."
 
+#: stdio-common/../sysdeps/gnu/errlist.c:610
+msgid "Bad message"
+msgstr "Message invalide."
+
 #. TRANS A file that isn't a block special file was given in a situation that
 #. TRANS requires one.  For example, trying to mount an ordinary file as a file
 #. TRANS system in Unix gives this error.
@@ -358,6 +408,22 @@ msgstr "Temps limite expiré."
 msgid "Can not access a needed shared library"
 msgstr "Ne peut accéder à la librairie partagée demandée."
 
+#: nis/ypclnt.c:637
+msgid "Can't bind to server which serves this domain"
+msgstr "Ne peut établir un lien avec le serveur qui dessert ce domaine."
+
+#: nis/ypclnt.c:649
+msgid "Can't communicate with portmapper"
+msgstr "Ne peut communiquer avec le convertisseur de ports."
+
+#: nis/ypclnt.c:651
+msgid "Can't communicate with ypbind"
+msgstr "Ne peut communiquer par ypbind."
+
+#: nis/ypclnt.c:653
+msgid "Can't communicate with ypserv"
+msgstr "Ne peut communiquer par ypserv."
+
 #. TRANS No memory available.  The system cannot allocate more virtual memory
 #. TRANS because its capacity is full.
 #: stdio-common/../sysdeps/gnu/errlist.c:91
@@ -400,7 +466,7 @@ msgstr "Ne peut transmettre le paquet par diffusion."
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "Ne peut initialiser l'option `SO_BROADCAST' de socket."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:622
+#: stdio-common/../sysdeps/gnu/errlist.c:658
 msgid "Channel number out of range"
 msgstr "Numéro de canal en dehors des limites."
 
@@ -411,7 +477,7 @@ msgstr "Le processus `enfant' a terminé."
 msgid "Client credential too weak"
 msgstr "Identité du client peu fiable."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:722
+#: stdio-common/../sysdeps/gnu/errlist.c:738
 msgid "Communication error on send"
 msgstr "Erreur de communication lors de la transmission."
 
@@ -456,16 +522,20 @@ msgstr "Poursuite."
 
 #: catgets/gencat.c:169 db/makedb.c:120 locale/programs/locale.c:187
 #: locale/programs/localedef.c:177
+#, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Ce logiciel est gratuit; voir les fichiers source pour les conditions\n"
-"de reproduction.\n"
-"Aucune garantie n'est donnée; tant pour des raisons COMMERÇIALES que pour\n"
-"répondre à un BESOIN PARTICULIER.\n"
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Ce logiciel est gratuit; voir les sources pour les conditions de\n"
+"reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
+"COMMERÇIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
+
+#: nis/ypclnt.c:663
+msgid "Database is busy"
+msgstr "La base de données est occupée."
 
 #. TRANS No default destination address was set for the socket.  You get this
 #. TRANS error when you try to transmit data over a connectionless socket,
@@ -474,7 +544,7 @@ msgstr ""
 msgid "Destination address required"
 msgstr "Adresse de destination requise."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:686
+#: stdio-common/../sysdeps/gnu/errlist.c:638
 msgid "Device not a stream"
 msgstr "Le périphérique n'est pas de type `stream'."
 
@@ -505,11 +575,16 @@ msgstr "Le répertoire n'est pas vide."
 msgid "Disc quota exceeded"
 msgstr "Débordement du quota du disque."
 
+#: nis/ypclnt.c:709
+msgid "Domain not bound"
+msgstr "Le domaine n'est fixé."
+
 #: sunrpc/clnt_perr.c:254
+#, c-format
 msgid "Error %d"
 msgstr "Erreur %d"
 
-#: string/../sysdeps/mach/_strerror.c:43
+#: string/../sysdeps/mach/_strerror.c:52
 msgid "Error in unknown error system: "
 msgstr "Erreur provenant d'une erreur système inconnue: "
 
@@ -517,7 +592,7 @@ msgstr "Erreur provenant d'une erreur système inconnue: "
 msgid "Error: .netrc file is readable by others."
 msgstr "Erreur: le fichier .netrc est lisible par les autres."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:662
+#: stdio-common/../sysdeps/gnu/errlist.c:698
 msgid "Exchange full"
 msgstr "L'échangeur est plein."
 
@@ -545,7 +620,7 @@ msgstr "Le descripteur du fichier est dans un mauvais état."
 msgid "File exists"
 msgstr "Le fichier existe."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:678
+#: stdio-common/../sysdeps/gnu/errlist.c:714
 msgid "File locking deadlock error"
 msgstr "Erreur de verrou bloquant l'accès au fichier"
 
@@ -597,7 +672,7 @@ msgstr "E/S possible."
 msgid "IOT trap"
 msgstr "Trappe IOT."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:618
+#: stdio-common/../sysdeps/gnu/errlist.c:614
 msgid "Identifier removed"
 msgstr "Identificateur éliminé."
 
@@ -639,6 +714,14 @@ msgstr "Opération inappropriée pour un processus d'arrière-plan."
 msgid "Input/output error"
 msgstr "Erreur d'entrée/sortie."
 
+#: nis/ypclnt.c:643
+msgid "Internal NIS error"
+msgstr "Erreur interne de NIS."
+
+#: nis/ypclnt.c:707
+msgid "Internal ypbind error"
+msgstr "Erreur interne de ypbind."
+
 msgid "Interrupt"
 msgstr "Interruption."
 
@@ -653,7 +736,7 @@ msgstr "Interruption."
 msgid "Interrupted system call"
 msgstr "Appel système interrompu."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:610
+#: stdio-common/../sysdeps/gnu/errlist.c:654
 msgid "Interrupted system call should be restarted"
 msgstr "Appel système interrompu, il aurait dû être relancé."
 
@@ -694,7 +777,7 @@ msgstr "Contenu invalide de \\{\\}"
 msgid "Invalid cross-device link"
 msgstr "Lien croisé de périphéque invalide."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:654
+#: stdio-common/../sysdeps/gnu/errlist.c:690
 msgid "Invalid exchange"
 msgstr "Échange invalide."
 
@@ -716,11 +799,11 @@ msgstr "Fin d'intervalle invalide."
 msgid "Invalid regular expression"
 msgstr "Expression régulière invalide."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:670
+#: stdio-common/../sysdeps/gnu/errlist.c:706
 msgid "Invalid request code"
 msgstr "Requête de code invalide."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:658
+#: stdio-common/../sysdeps/gnu/errlist.c:694
 msgid "Invalid request descriptor"
 msgstr "Descripteur de requête invalide"
 
@@ -728,7 +811,7 @@ msgstr "Descripteur de requête invalide"
 msgid "Invalid server verifier"
 msgstr "Vérificateur du serveur invalide."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:674
+#: stdio-common/../sysdeps/gnu/errlist.c:710
 msgid "Invalid slot"
 msgstr "Dalot invalide."
 
@@ -745,31 +828,39 @@ msgstr "est un type de fichier nommé (named)."
 msgid "Killed"
 msgstr "Processus arrêté."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:650
+#: stdio-common/../sysdeps/gnu/errlist.c:686
 msgid "Level 2 halted"
 msgstr "Niveau 2 en halte."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:626
+#: stdio-common/../sysdeps/gnu/errlist.c:662
 msgid "Level 2 not synchronized"
 msgstr "Niveau 2 non synchronisé."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:630
+#: stdio-common/../sysdeps/gnu/errlist.c:666
 msgid "Level 3 halted"
 msgstr "Niveau 3 en halte."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:634
+#: stdio-common/../sysdeps/gnu/errlist.c:670
 msgid "Level 3 reset"
 msgstr "Niveau 3 réinitialisé."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:710
+#: stdio-common/../sysdeps/gnu/errlist.c:626
 msgid "Link has been severed"
 msgstr "Le lien a été endommagé."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:638
+#: stdio-common/../sysdeps/gnu/errlist.c:674
 msgid "Link number out of range"
 msgstr "Numéro du lien hors intervalle."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:702
+#: nis/ypclnt.c:655
+msgid "Local domain name not set"
+msgstr "Le nom du domaine local n'est pas initialisé."
+
+#: nis/ypclnt.c:645
+msgid "Local resource allocation failure"
+msgstr "Échec d'allocation de ressources locales."
+
+#: stdio-common/../sysdeps/gnu/errlist.c:722
 msgid "Machine is not on the network"
 msgstr "La machine cible n'est pas sur le réseau."
 
@@ -784,10 +875,18 @@ msgid "Message too long"
 msgstr "Message trop long."
 
 # MRO a verifier
-#: stdio-common/../sysdeps/gnu/errlist.c:730
+#: stdio-common/../sysdeps/gnu/errlist.c:618
 msgid "Multihop attempted"
 msgstr "Connexion par liens par noeuds multiples de relais tentée."
 
+#: nis/ypclnt.c:659
+msgid "NIS client/server version mismatch - can't supply service"
+msgstr "Non concrodance de la version client/serveur NIS - ne peut fournir le service."
+
+#: nis/ypclnt.c:657
+msgid "NIS map data base is bad"
+msgstr "La table de la base de données NIS est corrumpue."
+
 #: stdio-common/../sysdeps/gnu/errlist.c:746
 msgid "Name not unique on network"
 msgstr "Le nom n'est pas unique sur le réseau."
@@ -813,7 +912,7 @@ msgstr "Le réseau ne fonctionne pas."
 msgid "Network is unreachable"
 msgstr "Le réseau n'est pas accessible."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:646
+#: stdio-common/../sysdeps/gnu/errlist.c:682
 msgid "No CSI structure available"
 msgstr "Aucune structure CSI disponible."
 
@@ -826,7 +925,7 @@ msgid "No address associated with name"
 msgstr "Aucune adresse associée avec le nom."
 
 # MRO a verifier
-#: stdio-common/../sysdeps/gnu/errlist.c:666
+#: stdio-common/../sysdeps/gnu/errlist.c:702
 msgid "No anode"
 msgstr "Aucune `anode' disponible."
 
@@ -844,7 +943,7 @@ msgstr "Aucun espace tampon disponible."
 msgid "No child processes"
 msgstr "Aucun processus enfant."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:690
+#: stdio-common/../sysdeps/gnu/errlist.c:622
 msgid "No data available"
 msgstr "Aucune donnée disponible."
 
@@ -860,10 +959,14 @@ msgstr "Aucun verrou disponible."
 msgid "No match"
 msgstr "Pas de concordance."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:614
+#: stdio-common/../sysdeps/gnu/errlist.c:630
 msgid "No message of desired type"
 msgstr "Aucun message du type désiré."
 
+#: nis/ypclnt.c:647
+msgid "No more records in map database"
+msgstr "Aucun autre enregistrement dans la table de la base de données."
+
 #: posix/regex.c:5204
 msgid "No previous regular expression"
 msgstr "Aucune expression régulière ne précède."
@@ -890,6 +993,14 @@ msgstr "Aucun espace disponible sur le périphérique."
 msgid "No such file or directory"
 msgstr "Aucun fichier ou répertoire de ce type."
 
+#: nis/ypclnt.c:641
+msgid "No such key in map"
+msgstr "Cette clé n'est pas dans la table."
+
+#: nis/ypclnt.c:639
+msgid "No such map in server's domain"
+msgstr "Cette table n'est pas dans le domaine du serveur."
+
 #. TRANS No process matches the specified process ID.
 #: stdio-common/../sysdeps/gnu/errlist.c:24
 msgid "No such process"
@@ -899,10 +1010,6 @@ msgstr "Aucun processus de ce type."
 msgid "Not a XENIX named type file"
 msgstr "Aucun fichier de type XENIX named."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:738
-msgid "Not a data message"
-msgstr "N'est pas un message de données."
-
 #. TRANS A file that isn't a directory was specified when a directory is required.
 #: stdio-common/../sysdeps/gnu/errlist.c:140
 msgid "Not a directory"
@@ -981,16 +1088,16 @@ msgstr "Opération maintenant en cours."
 msgid "Operation would block"
 msgstr "L'opération pourrait se bloquer."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:698
+#: stdio-common/../sysdeps/gnu/errlist.c:634
 msgid "Out of streams resources"
 msgstr "Aucune autre ressource de type streams disponible."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:706
+#: stdio-common/../sysdeps/gnu/errlist.c:726
 msgid "Package not installed"
 msgstr "Le package n'est pas installé."
 
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: stdio-common/../sysdeps/gnu/errlist.c:96
+#: nis/ypclnt.c:661 stdio-common/../sysdeps/gnu/errlist.c:96
 msgid "Permission denied"
 msgstr "Permission non accordée."
 
@@ -1004,11 +1111,11 @@ msgstr "Fin prématurée de l'expression régulière."
 msgid "Profiling timer expired"
 msgstr "Expiration de la minuterie durant l'établissement du profile."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:642
+#: stdio-common/../sysdeps/gnu/errlist.c:678
 msgid "Protocol driver not attached"
 msgstr "Pilote du protocole n'est pas attaché."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:726
+#: stdio-common/../sysdeps/gnu/errlist.c:646
 msgid "Protocol error"
 msgstr "Erreur de protocole."
 
@@ -1038,7 +1145,7 @@ msgstr "Mauvais type pour un socket de protocole."
 msgid "Quit"
 msgstr "Quitter."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:734
+#: stdio-common/../sysdeps/gnu/errlist.c:742
 msgid "RFS specific error"
 msgstr "Erreur spécifique à RFS."
 
@@ -1047,6 +1154,10 @@ msgstr "Erreur spécifique à RFS."
 msgid "RPC bad procedure for program"
 msgstr "Mauvaise procédure RPC du programme."
 
+#: nis/ypclnt.c:635
+msgid "RPC failure on NIS operation"
+msgstr "Échec RPC durant l'opération NIS."
+
 #. TRANS ???
 #: stdio-common/../sysdeps/gnu/errlist.c:517
 msgid "RPC program not available"
@@ -1143,6 +1254,10 @@ msgstr "RPC: hôte inconnu."
 msgid "RPC: Unknown protocol"
 msgstr "RPC: protocole inconnu."
 
+#: elf/dlsym.c:49
+msgid "RTLD_NEXT used in code not dynamically loaded"
+msgstr "Le RTLD_NEXT utilisé dans le code n'est pas chargé dynamiquement."
+
 #. TRANS An attempt was made to modify something on a read-only file system.
 #: stdio-common/../sysdeps/gnu/errlist.c:206
 msgid "Read-only file system"
@@ -1168,13 +1283,17 @@ msgstr ""
 #: catgets/gencat.c:224 db/makedb.c:227 locale/programs/locale.c:257
 #: locale/programs/localedef.c:408
 msgid "Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"
-msgstr "Rapporter toutes anomalies à l'adresse suivante: <bug-glibc@prep.ai.mit.edu>.\n"
+msgstr "Rapporter toutes anomalies à l'adresse: <bug-glibc@prep.ai.mit.edu>.\n"
+
+#: nis/ypclnt.c:633
+msgid "Request arguments bad"
+msgstr "Le paramètre de la requête est invalide."
 
 #: resolv/herror.c:73
 msgid "Resolver Error 0 (no error)"
 msgstr "Code d'erreur 0 du `resolver' (pas d'erreur)."
 
-#: resolv/herror.c:115
+#: resolv/herror.c:117
 msgid "Resolver internal error"
 msgstr "Erreur interne du `resolver'."
 
@@ -1245,7 +1364,7 @@ msgstr "Type de socket non supporté."
 msgid "Software caused connection abort"
 msgstr "Le logiciel a provoqué l'abandon de la connexion."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:718
+#: stdio-common/../sysdeps/gnu/errlist.c:734
 msgid "Srmount error"
 msgstr "Erreur srmount()."
 
@@ -1277,10 +1396,15 @@ msgstr "Erreur de relais de type streams."
 msgid "Structure needs cleaning"
 msgstr "La structure a besoin d'un nettoyage."
 
-#: posix/regex.c:940 stdio-common/../sysdeps/gnu/errlist.c:7
+#: nis/ypclnt.c:631 nis/ypclnt.c:705 posix/regex.c:940
+#: stdio-common/../sysdeps/gnu/errlist.c:7
 msgid "Success"
 msgstr "Succès."
 
+#: nis/ypclnt.c:711
+msgid "System resource allocation failure"
+msgstr "Échec d'allocation de ressources système."
+
 msgid "Terminated"
 msgstr "Complété."
 
@@ -1293,7 +1417,7 @@ msgstr "Complété."
 msgid "Text file busy"
 msgstr "Fichier texte occupé."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:694
+#: stdio-common/../sysdeps/gnu/errlist.c:650
 msgid "Timer expired"
 msgstr "Expiration de la minuterie."
 
@@ -1376,19 +1500,26 @@ msgstr "Le noeud final de transport n'est pas connecté."
 
 #: catgets/gencat.c:208 db/makedb.c:209 locale/programs/locale.c:241
 #: locale/programs/localedef.c:389
+#, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
 
-#: inet/rcmd.c:121
+#: inet/rcmd.c:136
+#, c-format
 msgid "Trying %s...\n"
 msgstr "On tente %s...\n"
 
 #: inet/ruserpass.c:246
+#, c-format
 msgid "Unknown .netrc keyword %s"
 msgstr "Mot clé inconnu %s dans .netrc."
 
-#: string/../sysdeps/generic/_strerror.c:36
-#: string/../sysdeps/mach/_strerror.c:58
+#: nis/ypclnt.c:665
+msgid "Unknown NIS error code"
+msgstr "Code d'erreur NIS inconnu."
+
+#: string/../sysdeps/generic/_strerror.c:44
+#: string/../sysdeps/mach/_strerror.c:67
 msgid "Unknown error "
 msgstr "Erreur inconnue "
 
@@ -1396,7 +1527,7 @@ msgstr "Erreur inconnue "
 msgid "Unknown host"
 msgstr "Hôte inconnu"
 
-#: resolv/herror.c:118
+#: resolv/herror.c:120
 msgid "Unknown resolver error"
 msgstr "Erreur inconnue du `resolver'."
 
@@ -1404,14 +1535,19 @@ msgstr "Erreur inconnue du `resolver'."
 msgid "Unknown server error"
 msgstr "Erreur du serveur inconnu."
 
-#: string/strsignal.c:40
+#: string/strsignal.c:41
+#, c-format
 msgid "Unknown signal %d"
 msgstr "Signal inconnu %d"
 
-#: misc/error.c:94
+#: misc/error.c:95
 msgid "Unknown system error"
 msgstr "Erreur système inconnue."
 
+#: nis/ypclnt.c:713
+msgid "Unknown ypbind error"
+msgstr "Erreur inconnue de ypbind."
+
 #: posix/regex.c:948
 msgid "Unmatched ( or \\("
 msgstr "Échec du pairage de ( ou de \\("
@@ -1428,7 +1564,8 @@ msgstr "Échec du pairage de [ ou de [^"
 msgid "Unmatched \\{"
 msgstr "Échec du pairage de \\{."
 
-#: posix/getconf.c:191
+#: posix/getconf.c:260
+#, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "Variable non reconnue `%s'."
 
@@ -1436,6 +1573,7 @@ msgid "Urgent I/O condition"
 msgstr "Condition d'E/S urgente."
 
 #: catgets/gencat.c:212
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... -o OUTPUT-FILE [INPUT-FILE]...\n"
 "       %s [OPTION]... [OUTPUT-FILE [INPUT-FILE]...]\n"
@@ -1463,6 +1601,7 @@ msgstr ""
 "Si le FICHIER_DE_SORTIE est -, l'écriture se fait sur la sortie standard.\n"
 
 #: db/makedb.c:213
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... INPUT-FILE OUTPUT-FILE\n"
 "       %s [OPTION]... -o OUTPUT-FILE INPUT-FILE\n"
@@ -1492,6 +1631,7 @@ msgstr ""
 "Si le FICHIER_D_ENTRÉE est -, la lecture se fait l'entrée standard.\n"
 
 #: locale/programs/localedef.c:393
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... name\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1512,7 +1652,8 @@ msgstr ""
 "Les paramètres obligatoires pour les options de formes longues le sont\n"
 "aussi pour les options de forme courtes.\n"
 "  -c, --force               poursuivre la génération sur la sortie\n"
-"                            même si des messages d'avertissements s'affichent\n"
+"                            même si des messages d'avertissements "
+"s'affichent\n"
 "  -h, --help                afficher l'aide-mémoire\n"
 "  -f, --charmap=FICHIER     utiliser les noms symboliques de caractères\n"
 "                            qui se trouvent dans le FICHIER\n"
@@ -1528,6 +1669,7 @@ msgstr ""
 "                            fichiers locaux: %s\n"
 
 #: locale/programs/locale.c:245
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... name\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1547,12 +1689,14 @@ msgstr ""
 "  -V, --version         afficher le nom et la version du logiciel\n"
 "\n"
 "  -a, --all-locales     afficher les noms localisés disponibles\n"
-"  -m, --charmaps        afficher les noms des tables de caractères disponibles\n"
+"  -m, --charmaps        afficher les noms des tables de caractères "
+"disponibles\n"
 "\n"
 "  -c, --category-name   afficher les noms des catégories sélectionnées\n"
 "  -k, --keyword-name    afficher les noms des mots clés sélectionnés\n"
 
-#: posix/getconf.c:138
+#: posix/getconf.c:200
+#, c-format
 msgid "Usage: %s variable_name [pathname]\n"
 msgstr "Usage: %s nom_de_variable [chemin_d_accès]\n"
 
@@ -1566,7 +1710,7 @@ msgstr "Signal #1 défini par l'usager."
 msgid "User defined signal 2"
 msgstr "Signal #2 défini par l'usager."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:742
+#: stdio-common/../sysdeps/gnu/errlist.c:642
 msgid "Value too large for defined data type"
 msgstr "Valeur trop grande pour le type défini de données."
 
@@ -1582,9 +1726,27 @@ msgstr "La fenêtre a changée."
 
 #: catgets/gencat.c:174 db/makedb.c:125 locale/programs/locale.c:192
 #: locale/programs/localedef.c:182
+#, c-format
 msgid "Written by %s.\n"
 msgstr "Écrits par %s.\n"
 
+#: nis/ypclnt.c:146
+msgid "YPBINDPROC_DOMAIN: Internal error\n"
+msgstr "YPBINDPROC_DOMAIN: erreur interne.\n"
+
+#: nis/ypclnt.c:150
+#, c-format
+msgid "YPBINDPROC_DOMAIN: No server for domain %s\n"
+msgstr "YPBINDPROC_DOMAIN: échec d'allocation de ressources %s.\n"
+
+#: nis/ypclnt.c:154
+msgid "YPBINDPROC_DOMAIN: Resource allocation failure\n"
+msgstr "YPBINDPROC_DOMAIN: échec d'allocation de ressources.\n"
+
+#: nis/ypclnt.c:158
+msgid "YPBINDPROC_DOMAIN: Unknown error\n"
+msgstr "YPBINDPROC_DOMAIN: erreur inconnue.\n"
+
 #. TRANS You did @strong{what}?
 #: stdio-common/../sysdeps/gnu/errlist.c:596
 msgid "You really blew it this time"
@@ -1597,14 +1759,16 @@ msgstr ""
 "au temps final de la ligne précédente."
 
 #: locale/programs/charmap.c:397 locale/programs/locfile.c:341
+#, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "`%1$s' la définition ne se termine pas par `END %1$s'."
 
 #: locale/programs/ld-monetary.c:358 locale/programs/ld-numeric.c:190
+#, c-format
 msgid "`-1' must be last entry in `%s' field in `%s' category"
 msgstr "`-1' doit être la dernière entrée du champ `%s' de catégorie `%s'."
 
-#: locale/programs/ld-collate.c:1651
+#: locale/programs/ld-collate.c:1652
 msgid "`...' must only be used in `...' and `UNDEFINED' entries"
 msgstr ""
 "`...' doit être utilisé seulement avec les entrées `...' et  `UNDEFINED'."
@@ -1613,7 +1777,7 @@ msgstr ""
 msgid "`from' expected after first argument to `collating-element'"
 msgstr "`from' attendu après le premier paramètre de `collating-element'"
 
-#: locale/programs/ld-collate.c:1108
+#: locale/programs/ld-collate.c:1109
 msgid ""
 "`from' string in collation element declaration contains unknown character"
 msgstr ""
@@ -1621,10 +1785,12 @@ msgstr ""
 "inconnu."
 
 #: locale/programs/charmap.c:267
+#, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "Le paramètre de <%s> doit être un caractère simple."
 
 #: locale/programs/locfile.c:215
+#, c-format
 msgid "argument to `%s' must be a single character"
 msgstr "Le paramètre de `%s' doit être un caractère simple."
 
@@ -1632,7 +1798,7 @@ msgstr "Le paramètre de `%s' doit être un caractère simple."
 msgid "auth_none.c - Fatal marshalling problem"
 msgstr "auth_none.c - problème fatal de mise en ordre."
 
-#: inet/rcmd.c:330
+#: inet/rcmd.c:360
 msgid "bad .rhosts owner"
 msgstr "Mauvais propriétaire du fichier .rhosts."
 
@@ -1675,63 +1841,76 @@ msgstr ""
 "pour rencontrer la condition `jusqu'au temps voulue'."
 
 #: sunrpc/svc_simple.c:64
+#, c-format
 msgid "can't reassign procedure number %d\n"
 msgstr "Ne peut réassigner le numéro de procédure %d.\n"
 
 #: locale/programs/localedef.c:287
+#, c-format
 msgid "cannot `stat' locale file `%s'"
 msgstr "Ne peut effectuer l'évaluation `stat' du fichier local `%s'."
 
-#: locale/programs/ld-collate.c:1313
+#: locale/programs/ld-collate.c:1314
+#, c-format
 msgid "cannot insert collation element `%.*s'"
 msgstr "Ne peut insérer l'élément de fusionnement `%.*s'."
 
-#: locale/programs/ld-collate.c:1492 locale/programs/ld-collate.c:1497
+#: locale/programs/ld-collate.c:1493 locale/programs/ld-collate.c:1498
 msgid "cannot insert into result table"
 msgstr "Ne peut effectuer une insertion dans la table des résultats."
 
-#: locale/programs/ld-collate.c:1165 locale/programs/ld-collate.c:1207
+#: locale/programs/ld-collate.c:1166 locale/programs/ld-collate.c:1208
+#, c-format
 msgid "cannot insert new collating symbol definition: %s"
 msgstr ""
 "Ne peut insérer une nouvelle définition de symbole de fusionnement: %s."
 
 #: db/makedb.c:161
+#, c-format
 msgid "cannot open database file `%s': %s"
 msgstr "Ne peut ouvrir le fichier de base de données `%s': %s."
 
 #: catgets/gencat.c:259 db/makedb.c:180
+#, c-format
 msgid "cannot open input file `%s'"
 msgstr "Ne peut ouvrir le fichier d'entrée `%s'."
 
 #: locale/programs/localedef.c:221
+#, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr "Ne peut ouvrir le fichier des localisations `%s'."
 
 #: catgets/gencat.c:764 catgets/gencat.c:805 db/makedb.c:189
+#, c-format
 msgid "cannot open output file `%s'"
 msgstr "Ne peut ouvrir le fichier de sortie `%s'."
 
 #: locale/programs/locfile.c:986
+#, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "Ne peut ouvrir le fichier de sortie `%s' de catégorie `%s'."
 
-#: locale/programs/ld-collate.c:1359
+#: locale/programs/ld-collate.c:1360
 msgid "cannot process order specification"
 msgstr "Ne peut traiter la spécification d'ordonnancement."
 
 #: locale/programs/locale.c:303
+#, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "Ne peut lire via le répertoire de la table des caractères `%s'."
 
 #: locale/programs/locale.c:278
+#, c-format
 msgid "cannot read locale directory `%s'"
 msgstr "Ne peut lire via le répertoire des définitions localisées `%s'."
 
 #: locale/programs/localedef.c:309
+#, c-format
 msgid "cannot read locale file `%s'"
 msgstr "Ne peut lire le fichier des définitions localisées `%s'."
 
 #: locale/programs/localedef.c:334
+#, c-format
 msgid "cannot write output files to `%s'"
 msgstr "Ne peut écrire dans les fichiers de sortie vers `%s'."
 
@@ -1741,10 +1920,12 @@ msgstr ""
 "Catégorie de données requises plus d'une fois: n'aurait pas dû se produire."
 
 #: locale/programs/ld-ctype.c:265
+#, c-format
 msgid "character %s'%s' in class `%s' must be in class `%s'"
 msgstr "Caractère %s'%s' de la classe `%s' doit être dans la classe `%s'."
 
 #: locale/programs/ld-ctype.c:289
+#, c-format
 msgid "character %s'%s' in class `%s' must not be in class `%s'"
 msgstr ""
 "Caractère %s'%s' de la classe `%s' ne doit pas être dans la classe `%s'."
@@ -1753,28 +1934,28 @@ msgstr ""
 msgid "character <SP> not defined in character map"
 msgstr "Caractère <SP> non défini dans la table des caractères."
 
-#: locale/programs/ld-ctype.c:1141
-msgid "character `%c' not defined while needed as default value"
-msgstr "Caractère `%c' non défini alors qu'attendu comme valeur par défaut."
-
 #: locale/programs/ld-ctype.c:939 locale/programs/ld-ctype.c:1002
 #: locale/programs/ld-ctype.c:1010 locale/programs/ld-ctype.c:1018
 #: locale/programs/ld-ctype.c:1026 locale/programs/ld-ctype.c:1034
 #: locale/programs/ld-ctype.c:1042 locale/programs/ld-ctype.c:1068
 #: locale/programs/ld-ctype.c:1076 locale/programs/ld-ctype.c:1114
-#: locale/programs/ld-ctype.c:1152
+#: locale/programs/ld-ctype.c:1141 locale/programs/ld-ctype.c:1152
+#, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr "Caractère `%s' non défini alors qu'attendu comme valeur par défaut."
 
 #: locale/programs/ld-ctype.c:801
+#, c-format
 msgid "character class `%s' already defined"
 msgstr "Classe de caractères `%s' déjà définie."
 
 #: locale/programs/ld-ctype.c:833
+#, c-format
 msgid "character map `%s' already defined"
 msgstr "Table de caractères `%s' déjà définie."
 
 #: locale/programs/charmap.c:76
+#, c-format
 msgid "character map file `%s' not found"
 msgstr "Fichier de la table des caractères `%s' non repérable."
 
@@ -1782,20 +1963,24 @@ msgstr "Fichier de la table des caractères `%s' non repérable."
 msgid "clnt_raw.c - Fatal header serialization error."
 msgstr "clnt_raw.c - erreur fatale de sérialisation d'en-tête."
 
-#: locale/programs/ld-collate.c:1328
+#: locale/programs/ld-collate.c:1329
+#, c-format
 msgid "collation element `%.*s' appears more than once: ignore line"
 msgstr ""
 "Élément de fusionnement `%.*s' apparaît plus d'une fois: ligne ignorée."
 
-#: locale/programs/ld-collate.c:1346
-msgid "collation symbol `.*s' appears more than once: ignore line"
-msgstr "Symbole de fusionnement `.*s' apparaît plus d'une fois: ligne ignorée."
+#: locale/programs/ld-collate.c:1347
+#, c-format
+msgid "collation symbol `%.*s' appears more than once: ignore line"
+msgstr "Symbole de fusionnement `%.*s' apparaît plus d'une fois: ligne ignorée."
 
 #: locale/programs/locfile.c:522
+#, c-format
 msgid "collation symbol expected after `%s'"
 msgstr "Symbole de fusionnement attendu après `%s'."
 
-#: inet/rcmd.c:114
+#: inet/rcmd.c:129
+#, c-format
 msgid "connect to address %s: "
 msgstr "Connexion établie à l'adresse %s: "
 
@@ -1803,23 +1988,18 @@ msgstr "Connexion établie à l'adresse %s: "
 msgid "couldn't create an rpc server\n"
 msgstr "Ne peut créer un serveur rpc.\n"
 
-#: sunrpc/portmap.c:121
-msgid "couldn't do tcp_create\n"
-msgstr "Ne peut exécuter tcp_create.\n"
-
-#: sunrpc/portmap.c:99
-msgid "couldn't do udp_create\n"
-msgstr "Ne peut exécuter udp_create.\n"
-
 #: sunrpc/svc_simple.c:77
+#, c-format
 msgid "couldn't register prog %d vers %d\n"
 msgstr "Ne peut enregistrer le programme %d de version %d.\n"
 
 #: locale/programs/charmap.c:86
+#, c-format
 msgid "default character map file `%s' not found"
 msgstr "Fichier de la table des caractères par défaut `%s' non repéré."
 
 #: locale/programs/ld-time.c:154
+#, c-format
 msgid ""
 "direction flag in string %d in `era' field in category `%s' is not '+' nor "
 "'-'"
@@ -1828,6 +2008,7 @@ msgstr ""
 "catégorie `%s' n'est pas un `+' ni un `-'."
 
 #: locale/programs/ld-time.c:164
+#, c-format
 msgid ""
 "direction flag in string %d in `era' field in category `%s' is not a single "
 "character"
@@ -1836,14 +2017,16 @@ msgstr ""
 "catégorie `%s' n'est pas un caractères simple."
 
 #: locale/programs/charset.c:87 locale/programs/charset.c:132
+#, c-format
 msgid "duplicate character name `%s'"
 msgstr "Duplicité du nom de caractère `%s'."
 
-#: locale/programs/ld-collate.c:1140
+#: locale/programs/ld-collate.c:1141
 msgid "duplicate collating element definition"
 msgstr "Duplicité de la définition d'élément de fusionnement."
 
-#: locale/programs/ld-collate.c:1286
+#: locale/programs/ld-collate.c:1287
+#, c-format
 msgid "duplicate definition for character `%.*s'"
 msgstr "Duplicité de la définition du caractère `%.*s'."
 
@@ -1856,6 +2039,7 @@ msgid "duplicate set definition"
 msgstr "Duplicité de la définition d'ensemble."
 
 #: time/zic.c:965
+#, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "Duplicité du nom de zone  %s (fichier \"%s\", ligne %d)."
 
@@ -1867,7 +2051,7 @@ msgstr "Duplicité de l'identificateur de message."
 msgid "duplicated message number"
 msgstr "Duplicité du numéro de message"
 
-#: locale/programs/ld-collate.c:1695
+#: locale/programs/ld-collate.c:1696
 msgid "empty weight name: line ignored"
 msgstr "Nom du poids vide: ligne ignorée."
 
@@ -1887,17 +2071,17 @@ msgstr "enablecache: ne peut allouer une cache de données."
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: ne peut allouer une cache de type fifo."
 
-#: locale/programs/ld-collate.c:1418
+#: locale/programs/ld-collate.c:1419
 msgid "end point of ellipsis range is bigger then start"
 msgstr "Le noeud final de l'intervalle d'ellipse est plus grand que l'initial."
 
-#: locale/programs/ld-collate.c:1148
+#: locale/programs/ld-collate.c:1149
 msgid "error while inserting collation element into hash table"
 msgstr ""
 "Erreur durant l'insertion d'un élément de fusionnement dans la table de "
 "hachage."
 
-#: locale/programs/ld-collate.c:1160
+#: locale/programs/ld-collate.c:1161
 msgid "error while inserting to hash table"
 msgstr "Erreur lors de l'insertion dans la table de hachage."
 
@@ -1910,14 +2094,17 @@ msgid "expected continuation line not found"
 msgstr "Ligne de continuation attendue, non repérée."
 
 #: locale/programs/locfile.c:1010
+#, c-format
 msgid "failure while writing data for category `%s'"
 msgstr "Échec durant l'écriture des données de catégorie `%s'."
 
 #: locale/programs/ld-monetary.c:154 locale/programs/ld-numeric.c:95
+#, c-format
 msgid "field `%s' in category `%s' not defined"
 msgstr "Champ `%s' de catégorie `%s' n'est pas défini."
 
 #: locale/programs/ld-messages.c:81 locale/programs/ld-messages.c:102
+#, c-format
 msgid "field `%s' in category `%s' undefined"
 msgstr "Champ `%s' de catégorie `%s' indéfini."
 
@@ -1934,6 +2121,7 @@ msgid "garbage at end of digit"
 msgstr "Rebut à la fin des chiffres."
 
 #: locale/programs/ld-time.c:183
+#, c-format
 msgid ""
 "garbage at end of offset value in string %d in `era' field in category `%s'"
 msgstr ""
@@ -1941,6 +2129,7 @@ msgstr ""
 "de catégorie `%s'."
 
 #: locale/programs/ld-time.c:238
+#, c-format
 msgid ""
 "garbage at end of starting date in string %d in `era' field in category `%s'"
 msgstr ""
@@ -1948,6 +2137,7 @@ msgstr ""
 "de catégorie `%s'."
 
 #: locale/programs/ld-time.c:310
+#, c-format
 msgid ""
 "garbage at end of stopping date in string %d in `era' field in category `%s'"
 msgstr ""
@@ -1966,11 +2156,11 @@ msgstr "CORRECTION illégale du champ dans la ligne de type `Leap'."
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "Champ `Rolling/Stationary' illégal sur la ligne de type `Leap'."
 
-#: locale/programs/ld-collate.c:1766
+#: locale/programs/ld-collate.c:1767
 msgid "illegal character constant in string"
 msgstr "Caractère illégal de constante dans la chaîne."
 
-#: locale/programs/ld-collate.c:1115
+#: locale/programs/ld-collate.c:1116
 msgid "illegal collation element"
 msgstr "Élément de fusionnement illégal."
 
@@ -1991,6 +2181,7 @@ msgid "illegal names for character range"
 msgstr "Nom illégal pour un intervalle de caractères."
 
 #: locale/programs/ld-time.c:176
+#, c-format
 msgid "illegal number for offset in string %d in `era' field in category `%s'"
 msgstr ""
 "Nombre illégal pour la valeur de saut dans la chaîne %d du champ `era'\n"
@@ -2001,23 +2192,27 @@ msgid "illegal set number"
 msgstr "Numéro d'ensemble illégal."
 
 #: locale/programs/ld-time.c:230
+#, c-format
 msgid "illegal starting date in string %d in `era' field in category `%s'"
 msgstr ""
 "Date finale illégale dans la chaîne %d du champ `era'\n"
 "de catégorie `%s'."
 
 #: locale/programs/ld-time.c:302
+#, c-format
 msgid "illegal stopping date in string %d in `era' field in category `%s'"
 msgstr ""
 "Date finale illégale dans la chaîne %d du champ `era'\n"
 "de catégorie `%s'."
 
 #: locale/programs/ld-ctype.c:807
+#, c-format
 msgid "implementation limit: no more than %d character classes allowed"
 msgstr ""
 "Limite d'impantation: pas plus de %d classes de caractères sont permises."
 
 #: locale/programs/ld-ctype.c:839
+#, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr ""
 "Limite d'impantation: pas plus de %d tables de caractères sont permises."
@@ -2043,6 +2238,7 @@ msgid "internal error - addtype called with bad ttisstd"
 msgstr "Erreur interne - addtype appellé avec un mauvais bloc ttisstd."
 
 #: locale/programs/ld-ctype.c:301
+#, c-format
 msgid "internal error in %s, line %u"
 msgstr "Erreur interne dans %s, ligne %u."
 
@@ -2086,11 +2282,11 @@ msgstr "Heure du jour invalide."
 msgid "invalid weekday name"
 msgstr "Nom du jour de semaine invalide."
 
-#: locale/programs/ld-collate.c:1411
+#: locale/programs/ld-collate.c:1412
 msgid "line after ellipsis must contain character definition"
 msgstr "La ligne après l'ellipse doit contenir la définition d'un caractère."
 
-#: locale/programs/ld-collate.c:1390
+#: locale/programs/ld-collate.c:1391
 msgid "line before ellipsis does not contain definition for character constant"
 msgstr ""
 "La ligne avant l'ellipse ne doit pas contenir la définition d'une constante "
@@ -2101,6 +2297,7 @@ msgid "line too long"
 msgstr "Ligne trop longue."
 
 #: locale/programs/localedef.c:281
+#, c-format
 msgid "locale file `%s', used in `copy' statement, not found"
 msgstr ""
 "Fichier localisé `%s', utilisé dans la déclaration de `copy', non repéré."
@@ -2118,23 +2315,29 @@ msgid "memory clobbered past end of allocated block"
 msgstr "Mémoire écrasée après la fin du bloc alloué."
 
 #: locale/programs/ld-collate.c:167 locale/programs/ld-collate.c:173
-#: locale/programs/ld-collate.c:177 locale/programs/ld-collate.c:1438
-#: locale/programs/ld-collate.c:1467 locale/programs/locfile.c:940
-#: locale/programs/xmalloc.c:68 posix/getconf.c:181
+#: locale/programs/ld-collate.c:177 locale/programs/ld-collate.c:1439
+#: locale/programs/ld-collate.c:1468 locale/programs/locfile.c:940
+#: locale/programs/xmalloc.c:68 posix/getconf.c:250
 msgid "memory exhausted"
 msgstr "Mémoire épuisée."
 
+#: malloc/obstack.c:425
+msgid "memory exhausted\n"
+msgstr "Mémoire épuisée.\n"
+
 #: malloc/mcheck.c:180
 msgid "memory is consistent, library is buggy"
 msgstr "Mémoire consistente, la librairie est fautive."
 
 #: locale/programs/ld-time.c:348
+#, c-format
 msgid "missing era format in string %d in `era' field in category `%s'"
 msgstr ""
 "Format de type era manquant dans la chaîne %d du champ `era'\n"
 "de catégorie `%s'."
 
 #: locale/programs/ld-time.c:337
+#, c-format
 msgid "missing era name in string %d in `era' fieldin category `%s'"
 msgstr ""
 "Nom de type era manquant dans la chaîne %d du champ `era'\n"
@@ -2145,10 +2348,12 @@ msgid "nameless rule"
 msgstr "Règle sans nom."
 
 #: sunrpc/svc_simple.c:140
+#, c-format
 msgid "never registered prog %d\n"
 msgstr "Le programme %d n'a jamais été enregistré.\n"
 
 #: locale/programs/ld-messages.c:95 locale/programs/ld-messages.c:116
+#, c-format
 msgid "no correct regular expression for field `%s' in category `%s': %s"
 msgstr "Expression reguliere incorrecte du champ `%s' de catégorie `%s': %s"
 
@@ -2179,6 +2384,7 @@ msgid "no symbolic name given for end of range"
 msgstr "Pas de nom symbolique fourni pour la fin de l'intervalle."
 
 #: locale/programs/ld-collate.c:244
+#, c-format
 msgid "no weight defined for symbol `%s'"
 msgstr "Pas de poids défini pour le symbole `%s'."
 
@@ -2188,46 +2394,40 @@ msgstr ""
 "Seules les définitions de type `WIDTH' sont autorisées à suivre\n"
 "la définition de `CHARMAP'."
 
-#: sunrpc/portmap.c:451
-msgid "portmap CALLIT: cannot fork.\n"
-msgstr "portmap CALLIT: ne peut procéder à un clonage de type fork.\n"
-
-#: sunrpc/portmap.c:94 sunrpc/portmap.c:116
-msgid "portmap cannot bind"
-msgstr "portmap ne peut établir un pairage (bind)."
-
-#: sunrpc/portmap.c:86 sunrpc/portmap.c:112
-msgid "portmap cannot create socket"
-msgstr "portmap ne créer un socket"
-
 #: db/makedb.c:326
+#, c-format
 msgid "problems while reading `%s'"
 msgstr "Problèmes lors de la lecture de `%s'"
 
 #: sunrpc/rpcinfo.c:222 sunrpc/rpcinfo.c:350
+#, c-format
 msgid "program %lu is not available\n"
 msgstr "Le programme %lu n'est pas disponible.\n"
 
 #: sunrpc/rpcinfo.c:245 sunrpc/rpcinfo.c:282 sunrpc/rpcinfo.c:371
 #: sunrpc/rpcinfo.c:408 sunrpc/rpcinfo.c:429 sunrpc/rpcinfo.c:462
+#, c-format
 msgid "program %lu version %lu is not available\n"
 msgstr "Le programme %lu de version %lu n'est pas disponible.\n"
 
 #: sunrpc/rpcinfo.c:466
+#, c-format
 msgid "program %lu version %lu ready and waiting\n"
 msgstr "Le programme %lu de version %lu est prêt et en attente.\n"
 
-#: inet/rcmd.c:157
-msgid "rcmd: select (setting up stderr): %s\n"
-msgstr "rcmd: sélection (configuration de stderr): %s.\n"
+#: inet/rcmd.c:171
+#, c-format
+msgid "rcmd: select (setting up stderr): %m\n"
+msgstr "rcmd: sélection (configuration de stderr): %m.\n"
 
-#: inet/rcmd.c:87
+#: inet/rcmd.c:103
 msgid "rcmd: socket: All ports in use\n"
 msgstr "rcmd: socket: tous les ports sont occupés.\n"
 
-#: inet/rcmd.c:144
-msgid "rcmd: write (setting up stderr): %s\n"
-msgstr "rcmd: écriture (configuration de stderr): %s.\n"
+#: inet/rcmd.c:159
+#, c-format
+msgid "rcmd: write (setting up stderr): %m\n"
+msgstr "rcmd: écriture (configuration de stderr): %m.\n"
 
 #: sunrpc/svc_simple.c:83
 msgid "registerrpc: out of memory\n"
@@ -2238,19 +2438,23 @@ msgid "repeated leap second moment"
 msgstr "Répétition du délai une seconde fois."
 
 #: sunrpc/rpcinfo.c:659
+#, c-format
 msgid "rpcinfo: %s is unknown host\n"
 msgstr "rpcinfo: %s est un hôte inconnu.\n"
 
 #: sunrpc/rpcinfo.c:626
+#, c-format
 msgid "rpcinfo: %s is unknown service\n"
 msgstr "rpcinfo: %s est un service inconnu.\n"
 
 #: sunrpc/rpcinfo.c:600
+#, c-format
 msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
 msgstr ""
 "rpcinfo: ne peut éliminer l'enregistrement du programme %s de version %s.\n"
 
 #: sunrpc/rpcinfo.c:576
+#, c-format
 msgid "rpcinfo: broadcast failed: %s\n"
 msgstr "rpcinfo: échec de diffusion: %s.\n"
 
@@ -2262,19 +2466,15 @@ msgstr "rpcinfo: ne peut contacter le convertisseur de ports."
 msgid "rpcinfo: can't contact portmapper: "
 msgstr "rpcinfo: ne peut contacter le convertisseur de ports."
 
-#: sunrpc/portmap.c:137
-msgid "run_svc returned unexpectedly\n"
-msgstr "run_svc a retourné de façon imprévue.\n"
-
 #: time/zic.c:708 time/zic.c:710
 msgid "same rule name in multiple files"
 msgstr "Même nom de règle dans plusieurs fichiers."
 
-#: inet/rcmd.c:161
+#: inet/rcmd.c:174
 msgid "select: protocol failure in circuit setup\n"
 msgstr "select: échec de protocole dans la configuration du circuit.\n"
 
-#: inet/rcmd.c:179
+#: inet/rcmd.c:192
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket: échec de protocole dans la configuration du circuit.\n"
 
@@ -2283,7 +2483,7 @@ msgid "sorting order `forward' and `backward' are mutually exclusive"
 msgstr ""
 "Les options de tri `forward' et `backward' sont mutuellement exclusives."
 
-#: locale/programs/ld-collate.c:1567 locale/programs/ld-collate.c:1613
+#: locale/programs/ld-collate.c:1568 locale/programs/ld-collate.c:1614
 msgid ""
 "specification of sorting weight for collation symbol does not make sense"
 msgstr ""
@@ -2299,6 +2499,7 @@ msgid "standard output"
 msgstr "sortie standard"
 
 #: locale/programs/ld-time.c:256
+#, c-format
 msgid "starting date is illegal in string %d in `era' field in category `%s'"
 msgstr ""
 "Date initiale illégale dans la chaîne %d du champ `era'\n"
@@ -2309,6 +2510,7 @@ msgid "starting year greater than ending year"
 msgstr "Année initiale plus grande que l'année finale."
 
 #: locale/programs/ld-time.c:328
+#, c-format
 msgid "stopping date is illegal in string %d in `era' field in category `%s'"
 msgstr ""
 "Date finale illégale dans la chaîne %d du champ `era'\\n\"\n"
@@ -2339,7 +2541,8 @@ msgstr "svcudp_create - ne peut trouver le nom du socket par getsockname()."
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create: problème de création du socket."
 
-#: locale/programs/ld-collate.c:1190
+#: locale/programs/ld-collate.c:1191
+#, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates element "
 "definition"
@@ -2347,7 +2550,8 @@ msgstr ""
 "Le symbole d'un élément de fusionnement multi-caractères `%.*s' \n"
 "provoque la duplication de la définition d'un élément."
 
-#: locale/programs/ld-collate.c:1063
+#: locale/programs/ld-collate.c:1064
+#, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates other element "
 "definition"
@@ -2355,7 +2559,8 @@ msgstr ""
 "Le symbole d'un élément de fusionnement multi-caractères `%.*s' \n"
 "provoque la duplication d'autres définitions d'éléments."
 
-#: locale/programs/ld-collate.c:1199
+#: locale/programs/ld-collate.c:1200
+#, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates other symbol "
 "definition"
@@ -2363,7 +2568,8 @@ msgstr ""
 "Le symbole d'un élément de fusionnement multi-caractères `%.*s' \n"
 "provoque la duplication d'autres définitions de symboles."
 
-#: locale/programs/ld-collate.c:1072
+#: locale/programs/ld-collate.c:1073
+#, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates symbol "
 "definition"
@@ -2371,7 +2577,8 @@ msgstr ""
 "Le symbole d'un élément de fusionnement multi-caractères `%.*s' \n"
 "provoque la duplication de la définition d'un symbole."
 
-#: locale/programs/ld-collate.c:1054 locale/programs/ld-collate.c:1181
+#: locale/programs/ld-collate.c:1055 locale/programs/ld-collate.c:1182
+#, c-format
 msgid ""
 "symbol for multicharacter collating element `%.*s' duplicates symbolic name "
 "in charset"
@@ -2383,6 +2590,7 @@ msgstr ""
 #: locale/programs/charmap.c:378 locale/programs/charmap.c:465
 #: locale/programs/charmap.c:511 locale/programs/charmap.c:544
 #: locale/programs/charmap.c:576
+#, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "Erreur de syntaxe dans la définition de %s: %s."
 
@@ -2439,6 +2647,7 @@ msgid "syntax error in order specification"
 msgstr "Erreur de syntaxe dans la spéficication de l'ordonnancement."
 
 #: locale/programs/charmap.c:195 locale/programs/charmap.c:211
+#, c-format
 msgid "syntax error in prolog: %s"
 msgstr "Erreur de syntaxe du prologue: %s."
 
@@ -2490,7 +2699,7 @@ msgstr "Trop de types localisés pour la représentation du temps."
 msgid "too many transitions?!"
 msgstr "Trop de transitions définies?!"
 
-#: locale/programs/ld-collate.c:1622
+#: locale/programs/ld-collate.c:1623
 msgid "too many weights"
 msgstr "Trop de poids définis."
 
@@ -2503,10 +2712,11 @@ msgid "trailing garbage at end of line"
 msgstr "Suffixe en rebut à la fin de la ligne."
 
 #: sunrpc/svc_simple.c:132
+#, c-format
 msgid "trouble replying to prog %d\n"
 msgstr "Problème à répondre au programme %d.\n"
 
-#: locale/programs/ld-collate.c:1382
+#: locale/programs/ld-collate.c:1383
 msgid "two lines in a row containing `...' are not allowed"
 msgstr "Deux lignes consécutives contenant `...' ne sont pas permises."
 
@@ -2514,13 +2724,19 @@ msgstr "Deux lignes consécutives contenant `...' ne sont pas permises."
 msgid "typed single year"
 msgstr "Une seule année fournie."
 
+#: posix/getconf.c:239
+msgid "undefined"
+msgstr "indéfini"
+
 #: locale/programs/charmap.c:617 locale/programs/charmap.c:628
+#, c-format
 msgid "unknown character `%s'"
 msgstr "Caractère inconnu `%s'."
 
 #: locale/programs/ld-messages.c:193 locale/programs/ld-messages.c:204
 #: locale/programs/ld-messages.c:215 locale/programs/ld-messages.c:226
 #: locale/programs/ld-time.c:696
+#, c-format
 msgid "unknown character in field `%s' of category `%s'"
 msgstr "Caractère inconnu dans le champ `%s' de catégorie `%s'."
 
@@ -2529,18 +2745,21 @@ msgid "unknown collation directive"
 msgstr "Directive de fusionnement inconnue."
 
 #: catgets/gencat.c:477
+#, c-format
 msgid "unknown directive `%s': line ignored"
 msgstr "Directive inconnue `%s': ligne ignorée."
 
 #: catgets/gencat.c:456
+#, c-format
 msgid "unknown set `%s'"
 msgstr "Ensemble inconnu `%s'."
 
 msgid "unknown signal"
 msgstr "Signal inconnu."
 
-#: locale/programs/ld-collate.c:1366 locale/programs/ld-collate.c:1557
-#: locale/programs/ld-collate.c:1731
+#: locale/programs/ld-collate.c:1367 locale/programs/ld-collate.c:1558
+#: locale/programs/ld-collate.c:1732
+#, c-format
 msgid "unknown symbol `%.*s': line ignored"
 msgstr "Symbole inconnu `%.*s': ligne ignorée."
 
@@ -2560,7 +2779,7 @@ msgstr "Chaîne incomplète."
 msgid "unterminated symbolic name"
 msgstr "Nom symbolique incomplet."
 
-#: locale/programs/ld-collate.c:1684
+#: locale/programs/ld-collate.c:1685
 msgid "unterminated weight name"
 msgstr "Nom de poids incomplet."
 
@@ -2575,14 +2794,17 @@ msgid "use of 2/29 in non leap-year"
 msgstr "Utiliser 2/29 pour les années non-bissextiles."
 
 #: locale/programs/charmap.c:438 locale/programs/charmap.c:492
+#, c-format
 msgid "value for %s must be an integer"
 msgstr "La valeur de %s doit être un entier."
 
 #: locale/programs/charmap.c:233
+#, c-format
 msgid "value for <%s> must lie between 1 and 4"
 msgstr "La valeur de <%s> doit être comprise entre 1 et 4."
 
 #: locale/programs/ld-monetary.c:148 locale/programs/ld-numeric.c:89
+#, c-format
 msgid "value for field `%s' in category `%s' must not be the empty string"
 msgstr ""
 "La valeur du champ `%s' de catégorie `%s' ne doit pas être un chaîne vide."
@@ -2609,16 +2831,18 @@ msgstr ""
 "bonne longueur."
 
 #: locale/programs/ld-monetary.c:370 locale/programs/ld-numeric.c:199
+#, c-format
 msgid "values for field `%s' in category `%s' must be smaller than 127"
 msgstr ""
 "Les valeurs du champ `%s' de catégorie `%s' doivent être plus petite que 127."
 
 #: locale/programs/ld-monetary.c:366
+#, c-format
 msgid "values for field `%s' in category `%s' must not be zero"
 msgstr ""
 "Les valeurs du champ `%s' de catégorie `%s' ne doivent pas être égal à zéro."
 
-#: login/setutent_r.c:47
+#: login/utmp_file.c:84
 msgid "while opening UTMP file"
 msgstr "durant l'ouverture du fichier UTMP."
 
@@ -2657,3 +2881,33 @@ msgstr "Mauvais nombre de champs sur la ligne de type continuation de `Zone'."
 #: time/zic.c:939
 msgid "wrong number of fields on Zone line"
 msgstr "Mauvais nombre de champs sur la ligne de type `Zone'."
+
+#: nis/ypclnt.c:570
+msgid "yp_all: clnttcp_create failed"
+msgstr "yp_all: échec de la fonction clnttcp_create()."
+
+#: nis/ypclnt.c:772
+msgid "yp_update: cannot convert host to netname\n"
+msgstr "yp_update: ne peut convertir le nom de l'hôte à un nom réseau (netname).\n"
+
+#: nis/ypclnt.c:784
+msgid "yp_update: cannot get server address\n"
+msgstr "yp_update: ne peut obtenir l'adresse du serveur.\n"
+
+#~ msgid "character `%c' not defined while needed as default value"
+#~ msgstr "Caractère `%c' non défini alors qu'attendu comme valeur par défaut."
+
+#~ msgid "couldn't do tcp_create\n"
+#~ msgstr "Ne peut exécuter tcp_create.\n"
+
+#~ msgid "couldn't do udp_create\n"
+#~ msgstr "Ne peut exécuter udp_create.\n"
+
+#~ msgid "portmap CALLIT: cannot fork.\n"
+#~ msgstr "portmap CALLIT: ne peut procéder à un clonage de type fork.\n"
+
+#~ msgid "portmap cannot create socket"
+#~ msgstr "portmap ne créer un socket"
+
+#~ msgid "run_svc returned unexpectedly\n"
+#~ msgstr "run_svc a retourné de façon imprévue.\n"
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 0000000000..4150aea1a1
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,2828 @@
+# GNU libc message catalog for swedish
+# Copyright (C) 1996 Free Software Foundation, Inc.
+# Jan Djärv <Jan.Djarv@mbox200.swipnet.se>, 1996.
+# $Revision$
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libc 1.99\n"
+"POT-Creation-Date: 1996-12-03 13:50+0100\n"
+"PO-Revision-Date: $Date$\n"
+"Last-Translator: Jan Djärv <Jan.Djarv@mbox200.swipnet.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: sunrpc/rpcinfo.c:612
+msgid "       rpcinfo -b prognum versnum\n"
+msgstr "       rpcinfo -b prognr versnr\n"
+
+#: sunrpc/rpcinfo.c:613
+msgid "       rpcinfo -d prognum versnum\n"
+msgstr "       rpcinfo -d prognr versnr\n"
+
+#: sunrpc/rpcinfo.c:611
+msgid "       rpcinfo -p [ host ]\n"
+msgstr "       rpcinfo -p [ värd ]\n"
+
+#: sunrpc/rpcinfo.c:610
+msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
+msgstr "       rpcinfo [ -n portnr ] -t värd prognr [ versnr ]\n"
+
+#: sunrpc/rpcinfo.c:517
+msgid "   program vers proto   port\n"
+msgstr "   program vers proto   port\n"
+
+#: time/zic.c:424
+#, c-format
+msgid " (rule from \"%s\", line %d)"
+msgstr " (regel från \"%s\", rad %d)"
+
+#: locale/programs/ld-collate.c:360 locale/programs/ld-ctype.c:1234
+msgid " done\n"
+msgstr " klar\n"
+
+#: time/zic.c:421
+#, c-format
+msgid "\"%s\", line %d: %s"
+msgstr "\"%s\", rad %d: %s"
+
+#: time/zic.c:945
+#, c-format
+msgid "\"Zone %s\" line and -l option are mutually exclusive"
+msgstr "\"Zone %s\"-rad och flaggan -l är ömsesidigt uteslutande"
+
+#: time/zic.c:953
+#, c-format
+msgid "\"Zone %s\" line and -p option are mutually exclusive"
+msgstr "\"Zone %s\" rad och -p flagga är ömsesidigt uteslutande"
+
+#: time/zic.c:758
+#, c-format
+msgid "%s in ruleless zone"
+msgstr "%s i zon utan regel"
+
+#: assert/assert.c:46
+#, c-format
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+msgstr "%s%s%s:%u: %s%sFörsäkran \"%s\" falskt.\n"
+
+#: assert/assert-perr.c:47
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgstr "%s%s%s:%u: %s%sOväntat fel: %s.\n"
+
+#: stdio-common/psignal.c:47
+#, c-format
+msgid "%s%sUnknown signal %d\n"
+msgstr "%s%sOkänd signal %d\n"
+
+#: time/zic.c:2139
+#, c-format
+msgid "%s: %d did not sign extend correctly\n"
+msgstr "%s: %d teckenexpanderades inte korrekt\n"
+
+#: locale/programs/charmap.c:176
+#, c-format
+msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
+msgstr "%s: <mb_cur_max> måste vara större än <mb_cur_min>\n"
+
+#: time/zic.c:1430
+#, c-format
+msgid "%s: Can't create %s: %s\n"
+msgstr "%s: Kan inte skapa %s: %s\n"
+
+#: time/zic.c:2118
+#, c-format
+msgid "%s: Can't create directory %s: %s\n"
+msgstr "%s: Kan inte skapa katalog %s: %s\n"
+
+#: time/zic.c:612
+#, c-format
+msgid "%s: Can't link from %s to %s: %s\n"
+msgstr "%s: Kan inte länka från %s till %s: %s\n"
+
+#: time/zic.c:783
+#, c-format
+msgid "%s: Can't open %s: %s\n"
+msgstr "%s: Kan inte öppna %s: %s\n"
+
+#: time/zic.c:851
+#, c-format
+msgid "%s: Error closing %s: %s\n"
+msgstr "%s: Fel vid stängning av %s: %s\n"
+
+#: time/zic.c:845
+#, c-format
+msgid "%s: Error reading %s\n"
+msgstr "%s: Fel vid läsning från %s\n"
+
+#: time/zic.c:1494
+#, c-format
+msgid "%s: Error writing %s\n"
+msgstr "%s: Fel vid skrivning till %s\n"
+
+#: time/zdump.c:258
+#, c-format
+msgid "%s: Error writing standard output "
+msgstr "%s: Fel vid skrivning till standard ut "
+
+#: time/zic.c:830
+#, c-format
+msgid "%s: Leap line in non leap seconds file %s\n"
+msgstr "%s: \"Leap\"-rad i fil %s som inte är skottsekundsfil\n"
+
+#: time/zic.c:362
+#, c-format
+msgid "%s: Memory exhausted: %s\n"
+msgstr "%s: Minnet slut: %s\n"
+
+#: time/zic.c:527
+#, c-format
+msgid "%s: More than one -L option specified\n"
+msgstr "%s: Flaggan -L given mer än en gång\n"
+
+#: time/zic.c:487
+#, c-format
+msgid "%s: More than one -d option specified\n"
+msgstr "%s: Flagga -d given mer än en gång\n"
+
+#: time/zic.c:497
+#, c-format
+msgid "%s: More than one -l option specified\n"
+msgstr "%s: Flaggan -l given mer än en gång\n"
+
+#: time/zic.c:507
+#, c-format
+msgid "%s: More than one -p option specified\n"
+msgstr "%s: Flaggan -p given mer än en gång\n"
+
+#: time/zic.c:517
+#, c-format
+msgid "%s: More than one -y option specified\n"
+msgstr "%s: Flaggan -y given mer än en gång\n"
+
+#: time/zic.c:1845
+#, c-format
+msgid "%s: command was '%s', result was %d\n"
+msgstr "%s: kommandot var \"%s\", resultatet blev %d\n"
+
+#: locale/programs/charmap.c:593 locale/programs/locfile.c:878
+#, c-format
+msgid "%s: error in state machine"
+msgstr "%s: fel i tillståndsmaskin"
+
+#: posix/getopt.c:687
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
+
+#: posix/getopt.c:690
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ogiltig flagga -- %c\n"
+
+#: posix/getopt.c:611
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
+
+#: posix/getopt.c:582
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flaggan \"%s\" är tvetydig\n"
+
+#: posix/getopt.c:628 posix/getopt.c:801
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flaggan \"%s\" behöver ett argument\n"
+
+#: posix/getopt.c:606
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flaggan \"--%s\" tar inget argument\n"
+
+#: posix/getopt.c:786
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
+
+#: posix/getopt.c:767
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
+
+#: posix/getopt.c:721 posix/getopt.c:850
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flaggan behöver ett argument -- %c\n"
+
+#: time/zic.c:837 time/zic.c:1248 time/zic.c:1268
+#, c-format
+msgid "%s: panic: Invalid l_value %d\n"
+msgstr "%s: panik: ogiltigt l_value %d\n"
+
+#: locale/programs/charmap.c:600
+#, c-format
+msgid "%s: premature end of file"
+msgstr "%s: för tidigt filslut"
+
+#: posix/getopt.c:661
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
+
+#: posix/getopt.c:657
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
+
+#: time/zic.c:446
+#, c-format
+msgid ""
+"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d "
+"directory ]\n"
+"\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+msgstr ""
+"%s: användning är %s [ -s ] [ -v ] [ -l lokaltid ] [ -p posixregler ] [ -d "
+"katalog ]\n"
+"\t[ -L skottsekunder ] [ -y årkontrollprogram ] [ filnamn ... ]\n"
+
+#: time/zdump.c:165
+#, c-format
+msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
+msgstr "%s: användning är %s [ -v ] [ -c gräns ] zonnamn ...\n"
+
+#: sunrpc/clnt_perr.c:125
+#, c-format
+msgid "(unknown authentication error - %d)"
+msgstr "(okänt fel vid äkthetskontroll - %d)"
+
+#: sunrpc/rpcinfo.c:555
+msgid "(unknown)"
+msgstr "(okänt)"
+
+#: catgets/gencat.c:253
+msgid "*standard input*"
+msgstr "*standard in*"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:766
+msgid ".lib section in a.out corrupted"
+msgstr ".lib-sektion i a.out korrupt"
+
+#: inet/rcmd.c:358
+msgid ".rhosts fstat failed"
+msgstr "misslyckades ta status (fstat) på .rhosts"
+
+#: inet/rcmd.c:354
+msgid ".rhosts lstat failed"
+msgstr "misslyckades ta status (lstat) på .rhosts"
+
+#: inet/rcmd.c:356
+msgid ".rhosts not regular file"
+msgstr ".rhosts är inte en normal fil"
+
+#: inet/rcmd.c:362
+msgid ".rhosts writeable by other than owner"
+msgstr ".rhosts kan skrivas av andra än ägaren"
+
+#: sunrpc/clnt_perr.c:112 sunrpc/clnt_perr.c:133
+#, c-format
+msgid "; low version = %lu, high version = %lu"
+msgstr "; undre version = %lu, övre version = %lu"
+
+#: sunrpc/clnt_perr.c:119
+msgid "; why = "
+msgstr "; varför = "
+
+#: locale/programs/ld-ctype.c:326
+#, c-format
+msgid "<SP> character must not be in class `%s'"
+msgstr "<SP>-tecknet får inte vara i klass \"%s\""
+
+#: locale/programs/ld-ctype.c:317
+#, c-format
+msgid "<SP> character not in class `%s'"
+msgstr "<SP>-tecknet är inte i klass \"%s\""
+
+#. TRANS The experienced user will know what is wrong.
+#. TRANS @c This error code is a joke.  Its perror text is part of the joke.
+#. TRANS @c Don't change it.
+#: stdio-common/../sysdeps/gnu/errlist.c:591
+msgid "?"
+msgstr "?"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:762
+msgid "Accessing a corrupted shared library"
+msgstr "Öppnar ett korrupt delat bibliotek"
+
+#. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
+#: stdio-common/../sysdeps/gnu/errlist.c:354
+msgid "Address already in use"
+msgstr "Adressen används redan"
+
+#. TRANS The address family specified for a socket is not supported; it is
+#. TRANS inconsistent with the protocol being used on the socket.  @xref{Sockets}.
+#: stdio-common/../sysdeps/gnu/errlist.c:349
+msgid "Address family not supported by protocol"
+msgstr "Adressfamiljen stöds inte av protokollet"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:730
+msgid "Advertise error"
+msgstr "Annonseringsfel"
+
+msgid "Alarm clock"
+msgstr "Alarmklocka"
+
+#. TRANS Argument list too long; used when the arguments passed to a new program
+#. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
+#. TRANS File}) occupy too much memory space.  This condition never arises in the
+#. TRANS GNU system.
+#: stdio-common/../sysdeps/gnu/errlist.c:57
+msgid "Argument list too long"
+msgstr "Argumentlistan för lång"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:770
+msgid "Attempting to link in too many shared libraries"
+msgstr "Försök att länka in för många delade bibliotek"
+
+#: sunrpc/clnt_perr.c:276
+msgid "Authentication OK"
+msgstr "Äkthetskontroll OK"
+
+#. TRANS ???
+#: stdio-common/../sysdeps/gnu/errlist.c:549
+msgid "Authentication error"
+msgstr "Äkthetskontroll misslyckades"
+
+#. TRANS Bad address; an invalid pointer was detected.
+#. TRANS In the GNU system, this error never happens; you get a signal instead.
+#: stdio-common/../sysdeps/gnu/errlist.c:102
+msgid "Bad address"
+msgstr "Felaktig adress"
+
+#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been
+#. TRANS closed or reading from a descriptor open only for writing (or vice
+#. TRANS versa).
+#: stdio-common/../sysdeps/gnu/errlist.c:70
+msgid "Bad file descriptor"
+msgstr "Felaktig filidentifierare"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:718
+msgid "Bad font file format"
+msgstr "Felaktigt format på typsnittsfil"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:610
+msgid "Bad message"
+msgstr "Felaktigt meddelande"
+
+#. TRANS A file that isn't a block special file was given in a situation that
+#. TRANS requires one.  For example, trying to mount an ordinary file as a file
+#. TRANS system in Unix gives this error.
+#: stdio-common/../sysdeps/gnu/errlist.c:109
+msgid "Block device required"
+msgstr "Blockspecialfil krävs"
+
+#: sunrpc/pmap_rmt.c:337
+msgid "Broadcast select problem"
+msgstr "Problem med \"select\" i utsändning"
+
+#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
+#. TRANS Every library function that returns this error code also generates a
+#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
+#. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
+#. TRANS unless it has handled or blocked @code{SIGPIPE}.
+#: stdio-common/../sysdeps/gnu/errlist.c:222
+msgid "Broken pipe"
+msgstr "Brutet rör"
+
+msgid "Bus error"
+msgstr "Bussfel"
+
+msgid "CPU time limit exceeded"
+msgstr "begränsning av CPU-tid överskriden"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:758
+msgid "Can not access a needed shared library"
+msgstr "Kan inte komma åt ett nödvändigt delat bibliotek"
+
+#: nis/ypclnt.c:637
+msgid "Can't bind to server which serves this domain"
+msgstr "Kan inte ansluta till betjänt som betjänar denna domän"
+
+#: nis/ypclnt.c:649
+msgid "Can't communicate with portmapper"
+msgstr "Kan inte kommunicera med portmapper"
+
+#: nis/ypclnt.c:651
+msgid "Can't communicate with ypbind"
+msgstr "Kan inte kommunicera med ypbind"
+
+#: nis/ypclnt.c:653
+msgid "Can't communicate with ypserv"
+msgstr "Kan inte kommunicera med ypserv"
+
+#. TRANS No memory available.  The system cannot allocate more virtual memory
+#. TRANS because its capacity is full.
+#: stdio-common/../sysdeps/gnu/errlist.c:91
+msgid "Cannot allocate memory"
+msgstr "Kan inte allokera minne"
+
+#. TRANS The requested socket address is not available; for example, you tried
+#. TRANS to give a socket a name that doesn't match the local host name.
+#. TRANS @xref{Socket Addresses}.
+#: stdio-common/../sysdeps/gnu/errlist.c:361
+msgid "Cannot assign requested address"
+msgstr "Kan inte tilldela begärd adress"
+
+#: sunrpc/pmap_rmt.c:255
+msgid "Cannot create socket for broadcast rpc"
+msgstr "Kan inte skapa uttag (socket) för utsändnings-rpc"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:774
+msgid "Cannot exec a shared library directly"
+msgstr "Kan inte köra ett delat bibliotek direkt"
+
+#: sunrpc/pmap_rmt.c:349
+msgid "Cannot receive reply to broadcast"
+msgstr "Kan inte ta emot svar på utsändning"
+
+#: sunrpc/pmap_clnt.c:79
+msgid "Cannot register service"
+msgstr "Kan inte registrera tjänst"
+
+#. TRANS The socket has already been shut down.
+#: stdio-common/../sysdeps/gnu/errlist.c:422
+msgid "Cannot send after transport endpoint shutdown"
+msgstr "Kan inte skicka efter att transportslutpunkten har tagits ned"
+
+#: sunrpc/pmap_rmt.c:313
+msgid "Cannot send broadcast packet"
+msgstr "Kan inte skicka utsändningspaket"
+
+#: sunrpc/pmap_rmt.c:261
+msgid "Cannot set socket option SO_BROADCAST"
+msgstr "Kan inte sätta uttagsflaggan (socket) SO_BROADCAST"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:658
+msgid "Channel number out of range"
+msgstr "Kanalnummer utanför giltigt intervall"
+
+msgid "Child exited"
+msgstr "Barnet avslutade"
+
+#: sunrpc/clnt_perr.c:286
+msgid "Client credential too weak"
+msgstr "Klientens referenser är för svaga"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:738
+msgid "Communication error on send"
+msgstr "Kommunikationsfel vid sändning"
+
+#. TRANS Go home and have a glass of warm, dairy-fresh milk.
+#: stdio-common/../sysdeps/gnu/errlist.c:601
+msgid "Computer bought the farm"
+msgstr "Datorn packade ihop"
+
+#: locale/programs/ld-ctype.c:1197
+msgid "Computing table size for character classes might take a while..."
+msgstr "Att beräkna tabellstorlek för teckenklasser kan ta ett tag..."
+
+#: locale/programs/ld-collate.c:327
+msgid "Computing table size for collation information might take a while..."
+msgstr ""
+"Att beräkna tabellstorlek för kollationeringsinformation kan ta ett tag..."
+
+#. TRANS A remote host refused to allow the network connection (typically because
+#. TRANS it is not running the requested service).
+#: stdio-common/../sysdeps/gnu/errlist.c:439
+msgid "Connection refused"
+msgstr "Förbindelse vägras"
+
+#. TRANS A network connection was closed for reasons outside the control of the
+#. TRANS local host, such as by the remote machine rebooting or an unrecoverable
+#. TRANS protocol violation.
+#: stdio-common/../sysdeps/gnu/errlist.c:389
+msgid "Connection reset by peer"
+msgstr "Förbindelse borttagen av kommunikationspartnern"
+
+#. TRANS A socket operation with a specified timeout received no response during
+#. TRANS the timeout period.
+#: stdio-common/../sysdeps/gnu/errlist.c:433
+msgid "Connection timed out"
+msgstr "Förbindelsens tid tog slut"
+
+msgid "Continued"
+msgstr "Fortsätter"
+
+#: catgets/gencat.c:169 db/makedb.c:120 locale/programs/locale.c:187
+#: locale/programs/localedef.c:177
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"This is free software; see the source for copying conditions.  There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Detta är fri programvara; se källkoden för kopieringsvillkor.  Det finns\n"
+"INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT\n"
+"ÄNDAMÅL.\n"
+
+#: nis/ypclnt.c:663
+msgid "Database is busy"
+msgstr "Databasen är upptagen"
+
+#. TRANS No default destination address was set for the socket.  You get this
+#. TRANS error when you try to transmit data over a connectionless socket,
+#. TRANS without first specifying a destination for the data with @code{connect}.
+#: stdio-common/../sysdeps/gnu/errlist.c:417
+msgid "Destination address required"
+msgstr "Måladress krävs"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:638
+msgid "Device not a stream"
+msgstr "Enheten är inte en stream"
+
+#. TRANS No such device or address.  The system tried to use the device
+#. TRANS represented by a file you specified, and it couldn't find the device.
+#. TRANS This can mean that the device file was installed incorrectly, or that
+#. TRANS the physical device is missing or not correctly attached to the
+#. TRANS computer.
+#: stdio-common/../sysdeps/gnu/errlist.c:49
+msgid "Device not configured"
+msgstr "Enheten är inte konfigurerad"
+
+#. TRANS Resource busy; a system resource that can't be shared is already in use.
+#. TRANS For example, if you try to delete a file that is the root of a currently
+#. TRANS mounted filesystem, you get this error.
+#: stdio-common/../sysdeps/gnu/errlist.c:116
+msgid "Device or resource busy"
+msgstr "Enhet eller resurs upptagen"
+
+#. TRANS Directory not empty, where an empty directory was expected.  Typically,
+#. TRANS this error occurs when you are trying to delete a directory.
+#: stdio-common/../sysdeps/gnu/errlist.c:468
+msgid "Directory not empty"
+msgstr "Katalog inte tom"
+
+#. TRANS The user's disk quota was exceeded.
+#: stdio-common/../sysdeps/gnu/errlist.c:486
+msgid "Disc quota exceeded"
+msgstr "Diskkvot överskriden"
+
+#: nis/ypclnt.c:709
+msgid "Domain not bound"
+msgstr "Domän inte bunden"
+
+#: sunrpc/clnt_perr.c:254
+#, c-format
+msgid "Error %d"
+msgstr "Fel %d"
+
+#: string/../sysdeps/mach/_strerror.c:52
+msgid "Error in unknown error system: "
+msgstr "Fel i okänt felsystem: "
+
+#: inet/ruserpass.c:161
+msgid "Error: .netrc file is readable by others."
+msgstr "Fel: .netrc kan läsas av andra."
+
+#: stdio-common/../sysdeps/gnu/errlist.c:698
+msgid "Exchange full"
+msgstr "Växeln full"
+
+#. TRANS Invalid executable file format.  This condition is detected by the
+#. TRANS @code{exec} functions; see @ref{Executing a File}.
+#: stdio-common/../sysdeps/gnu/errlist.c:63
+msgid "Exec format error"
+msgstr "Formatfel på körbar fil"
+
+#: locale/programs/localedef.c:213
+msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
+msgstr "FATALT: systemet definierar inte \"_POSIX2_LOCALEDEF\""
+
+#: sunrpc/clnt_perr.c:290
+msgid "Failed (unspecified error)"
+msgstr "Misslyckades (ospecificerat fel)"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:750
+msgid "File descriptor in bad state"
+msgstr "Filidentifierare i felaktigt tillstånd"
+
+#. TRANS File exists; an existing file was specified in a context where it only
+#. TRANS makes sense to specify a new file.
+#: stdio-common/../sysdeps/gnu/errlist.c:122
+msgid "File exists"
+msgstr "Filen existerar"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:714
+msgid "File locking deadlock error"
+msgstr "Fillåsning gav dödläge"
+
+#. TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
+#. TRANS Files}) or host name too long (in @code{gethostname} or
+#. TRANS @code{sethostname}; @pxref{Host Identification}).
+#: stdio-common/../sysdeps/gnu/errlist.c:452
+msgid "File name too long"
+msgstr "Filnamn för långt"
+
+msgid "File size limit exceeded"
+msgstr "Begränsning av filstorlek överskriden"
+
+#. TRANS File too big; the size of a file would be larger than allowed by the system.
+#: stdio-common/../sysdeps/gnu/errlist.c:190
+msgid "File too large"
+msgstr "Fil för stor"
+
+msgid "Floating point exception"
+msgstr "Flyttalsberäkningsfel"
+
+#. TRANS Function not implemented.  Some functions have commands or options defined
+#. TRANS that might not be supported in all implementations, and this is the kind
+#. TRANS of error you get if you request them and they are not supported.
+#: stdio-common/../sysdeps/gnu/errlist.c:561
+msgid "Function not implemented"
+msgstr "Funktion inte implementerad"
+
+#. TRANS This error code has no purpose.
+#: stdio-common/../sysdeps/gnu/errlist.c:606
+msgid "Gratuitous error"
+msgstr "Omotiverat fel"
+
+msgid "Hangup"
+msgstr "Lägg på"
+
+#. TRANS The remote host for a requested network connection is down.
+#: stdio-common/../sysdeps/gnu/errlist.c:457
+msgid "Host is down"
+msgstr "Värddator är nere"
+
+#: resolv/herror.c:75
+msgid "Host name lookup failure"
+msgstr "Uppslagning av värdnamn misslyckades"
+
+msgid "I/O possible"
+msgstr "I/O möjligt"
+
+msgid "IOT trap"
+msgstr "IOT fälla"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:614
+msgid "Identifier removed"
+msgstr "Identifierare borttagen"
+
+msgid "Illegal Instruction"
+msgstr "Otillåten instruktion"
+
+#. TRANS Invalid seek operation (such as on a pipe).
+#: stdio-common/../sysdeps/gnu/errlist.c:201
+msgid "Illegal seek"
+msgstr "Otillåten sökning"
+
+#. TRANS Inappropriate file type or format.  The file was the wrong type for the
+#. TRANS operation, or a data file had the wrong format.
+#. TRANS
+#. TRANS On some systems @code{chmod} returns this error if you try to set the
+#. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
+#: stdio-common/../sysdeps/gnu/errlist.c:544
+msgid "Inappropriate file type or format"
+msgstr "Filtyp eller format olämplig"
+
+#. TRANS Inappropriate I/O control operation, such as trying to set terminal
+#. TRANS modes on an ordinary file.
+#: stdio-common/../sysdeps/gnu/errlist.c:176
+msgid "Inappropriate ioctl for device"
+msgstr "Ioctl för enhet olämplig"
+
+#. TRANS In the GNU system, servers supporting the @code{term} protocol return
+#. TRANS this error for certain operations when the caller is not in the
+#. TRANS foreground process group of the terminal.  Users do not usually see this
+#. TRANS error because functions such as @code{read} and @code{write} translate
+#. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
+#. TRANS for information on process groups and these signals.
+#: stdio-common/../sysdeps/gnu/errlist.c:577
+msgid "Inappropriate operation for background process"
+msgstr "Operation för bakgrundsprocess olämplig"
+
+#. TRANS Input/output error; usually used for physical read or write errors.
+#: stdio-common/../sysdeps/gnu/errlist.c:40
+msgid "Input/output error"
+msgstr "In/ut-fel"
+
+#: nis/ypclnt.c:643
+msgid "Internal NIS error"
+msgstr "Internt NIS-fel"
+
+#: nis/ypclnt.c:707
+msgid "Internal ypbind error"
+msgstr "Internt ypbind-fel"
+
+msgid "Interrupt"
+msgstr "Avbrutet"
+
+#. TRANS Interrupted function call; an asynchronous signal occured and prevented
+#. TRANS completion of the call.  When this happens, you should try the call
+#. TRANS again.
+#. TRANS
+#. TRANS You can choose to have functions resume after a signal that is handled,
+#. TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
+#. TRANS Primitives}.
+#: stdio-common/../sysdeps/gnu/errlist.c:35
+msgid "Interrupted system call"
+msgstr "Avbrutet systemanrop"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:654
+msgid "Interrupted system call should be restarted"
+msgstr "Avbrutet systemanrop borde omstartas"
+
+#. TRANS Invalid argument.  This is used to indicate various kinds of problems
+#. TRANS with passing the wrong argument to a library function.
+#: stdio-common/../sysdeps/gnu/errlist.c:152
+msgid "Invalid argument"
+msgstr "Ogiltigt argument"
+
+#: posix/regex.c:946
+msgid "Invalid back reference"
+msgstr "Ogiltig bakåtreferens"
+
+#: posix/regex.c:944
+msgid "Invalid character class name"
+msgstr "Ogiltigt teckenklassnamn"
+
+#: sunrpc/clnt_perr.c:278
+msgid "Invalid client credential"
+msgstr "Ogiltiga klientreferenser"
+
+#: sunrpc/clnt_perr.c:282
+msgid "Invalid client verifier"
+msgstr "Ogiltig klientverifierare"
+
+#: posix/regex.c:943
+msgid "Invalid collation character"
+msgstr "Ogiltigt kollationeringstecken"
+
+#: posix/regex.c:950
+msgid "Invalid content of \\{\\}"
+msgstr "Ogiltig användning av \\{\\}"
+
+#. TRANS An attempt to make an improper link across file systems was detected.
+#. TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
+#. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
+#: stdio-common/../sysdeps/gnu/errlist.c:129
+msgid "Invalid cross-device link"
+msgstr "Ogiltig länk över skilda enheter"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:690
+msgid "Invalid exchange"
+msgstr "Ogiltig växel"
+
+#. TRANS While decoding a multibyte character the function came along an invalid
+#. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
+#: stdio-common/../sysdeps/gnu/errlist.c:567
+msgid "Invalid or incomplete multibyte or wide character"
+msgstr "Ogiltig eller inte komplett flerbyte eller brett tecken"
+
+#: posix/regex.c:953
+msgid "Invalid preceding regular expression"
+msgstr "Ogiltigt föregående reguljärt uttryck"
+
+#: posix/regex.c:951
+msgid "Invalid range end"
+msgstr "Ogiltigt intervallslut"
+
+#: posix/regex.c:942
+msgid "Invalid regular expression"
+msgstr "Ogiltigt reguljärt uttryck"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:706
+msgid "Invalid request code"
+msgstr "Ogiltig åtkomstkod"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:694
+msgid "Invalid request descriptor"
+msgstr "Ogiltig frågedeskriptor"
+
+#: sunrpc/clnt_perr.c:288
+msgid "Invalid server verifier"
+msgstr "Ogiltig betjäntverifierare"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:710
+msgid "Invalid slot"
+msgstr "Ogiltig plats"
+
+#. TRANS File is a directory; you cannot open a directory for writing,
+#. TRANS or create or remove hard links to it.
+#: stdio-common/../sysdeps/gnu/errlist.c:146
+msgid "Is a directory"
+msgstr "Är en katalog"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:794
+msgid "Is a named type file"
+msgstr "Är en namngiven filtyp"
+
+msgid "Killed"
+msgstr "Dödad"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:686
+msgid "Level 2 halted"
+msgstr "Nivå 2 stannad"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:662
+msgid "Level 2 not synchronized"
+msgstr "Nivå 2 inte synkroniserad"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:666
+msgid "Level 3 halted"
+msgstr "Nivå 3 stannad"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:670
+msgid "Level 3 reset"
+msgstr "Nivå 3 omstartad"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:626
+msgid "Link has been severed"
+msgstr "Länken har brutits"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:674
+msgid "Link number out of range"
+msgstr "Länktal utanför giltigt område"
+
+#: nis/ypclnt.c:655
+msgid "Local domain name not set"
+msgstr "Lokalt domännamn inte satt"
+
+#: nis/ypclnt.c:645
+msgid "Local resource allocation failure"
+msgstr "Allokeringsfel för lokal resurs"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:722
+msgid "Machine is not on the network"
+msgstr "Maskinen finns inte på nätverket"
+
+#: posix/regex.c:952
+msgid "Memory exhausted"
+msgstr "Minnet slut"
+
+#. TRANS The size of a message sent on a socket was larger than the supported
+#. TRANS maximum size.
+#: stdio-common/../sysdeps/gnu/errlist.c:305
+msgid "Message too long"
+msgstr "Meddelandet för långt"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:618
+msgid "Multihop attempted"
+msgstr "Flerhopp försöktes"
+
+#: nis/ypclnt.c:659
+msgid "NIS client/server version mismatch - can't supply service"
+msgstr "NIS klient/betjänt versionsskillnad - kan inte betjäna"
+
+#: nis/ypclnt.c:657
+msgid "NIS map data base is bad"
+msgstr "NIS tabelldatabas är felaktig"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:746
+msgid "Name not unique on network"
+msgstr "Namnet inte unikt i nätverket"
+
+#. TRANS ???
+#: stdio-common/../sysdeps/gnu/errlist.c:554
+msgid "Need authenticator"
+msgstr "Behöver äkthetsintygare"
+
+#. TRANS A network connection was reset because the remote host crashed.
+#: stdio-common/../sysdeps/gnu/errlist.c:377
+msgid "Network dropped connection on reset"
+msgstr "Nätverket tog bort förbindelsen vid omstart"
+
+#. TRANS A socket operation failed because the network was down.
+#: stdio-common/../sysdeps/gnu/errlist.c:366
+msgid "Network is down"
+msgstr "Nätverket är nere"
+
+#. TRANS A socket operation failed because the subnet containing the remote host
+#. TRANS was unreachable.
+#: stdio-common/../sysdeps/gnu/errlist.c:372
+msgid "Network is unreachable"
+msgstr "Nätverket kan inte nås"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:682
+msgid "No CSI structure available"
+msgstr "Inga CSI-strukturer tillgängliga"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:790
+msgid "No XENIX semaphores available"
+msgstr "Inga XENIX-semaforer tillgängliga"
+
+#: resolv/herror.c:77
+msgid "No address associated with name"
+msgstr "Ingen adress associerad med namnet"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:702
+msgid "No anode"
+msgstr "Ingen anod"
+
+#. TRANS The kernel's buffers for I/O operations are all in use.  In GNU, this
+#. TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
+#. TRANS other from network operations.
+#: stdio-common/../sysdeps/gnu/errlist.c:396
+msgid "No buffer space available"
+msgstr "Ingen buffertplats tillgänglig"
+
+#. TRANS There are no child processes.  This error happens on operations that are
+#. TRANS supposed to manipulate child processes, when there aren't any processes
+#. TRANS to manipulate.
+#: stdio-common/../sysdeps/gnu/errlist.c:77
+msgid "No child processes"
+msgstr "Inga barnprocesser"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:622
+msgid "No data available"
+msgstr "Data otillgängligt"
+
+#. TRANS No locks available.  This is used by the file locking facilities; see
+#. TRANS @ref{File Locks}.  This error is never generated by the GNU system, but
+#. TRANS it can result from an operation to an NFS server running another
+#. TRANS operating system.
+#: stdio-common/../sysdeps/gnu/errlist.c:535
+msgid "No locks available"
+msgstr "Inga lås tillgängliga"
+
+#: posix/regex.c:941
+msgid "No match"
+msgstr "Ingen träff"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:630
+msgid "No message of desired type"
+msgstr "Inget meddelande av önskad typ"
+
+#: nis/ypclnt.c:647
+msgid "No more records in map database"
+msgstr "Inga fler poster i tabelldatabasen"
+
+#: posix/regex.c:5204
+msgid "No previous regular expression"
+msgstr "Inget föregående reguljärt uttryck"
+
+#: sunrpc/rpcinfo.c:515
+msgid "No remote programs registered.\n"
+msgstr "Inga fjärrprogram registrerade.\n"
+
+#. TRANS The remote host for a requested network connection is not reachable.
+#: stdio-common/../sysdeps/gnu/errlist.c:462
+msgid "No route to host"
+msgstr "Ingen väg till värd"
+
+#. TRANS No space left on device; write operation on a file failed because the
+#. TRANS disk is full.
+#: stdio-common/../sysdeps/gnu/errlist.c:196
+msgid "No space left on device"
+msgstr "Enheten är full"
+
+#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
+#. TRANS for ordinary files that are referenced in contexts where they are
+#. TRANS expected to already exist.
+#: stdio-common/../sysdeps/gnu/errlist.c:19
+msgid "No such file or directory"
+msgstr "Filen eller katalogen finns inte"
+
+#: nis/ypclnt.c:641
+msgid "No such key in map"
+msgstr "Ingen sådan nyckel i tabellen"
+
+#: nis/ypclnt.c:639
+msgid "No such map in server's domain"
+msgstr "Ingen sådan tabell i betjäntens domän"
+
+#. TRANS No process matches the specified process ID.
+#: stdio-common/../sysdeps/gnu/errlist.c:24
+msgid "No such process"
+msgstr "Processen finns inte"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:786
+msgid "Not a XENIX named type file"
+msgstr "Inte en XENIX-namngiven fil"
+
+#. TRANS A file that isn't a directory was specified when a directory is required.
+#: stdio-common/../sysdeps/gnu/errlist.c:140
+msgid "Not a directory"
+msgstr "Inte en katalog"
+
+#. TRANS Domain error; used by mathematical functions when an argument value does
+#. TRANS not fall into the domain over which the function is defined.
+#: stdio-common/../sysdeps/gnu/errlist.c:228
+msgid "Numerical argument out of domain"
+msgstr "Numeriskt argument är utanför området"
+
+#. TRANS Range error; used by mathematical functions when the result value is
+#. TRANS not representable because of overflow or underflow.
+#: stdio-common/../sysdeps/gnu/errlist.c:234
+msgid "Numerical result out of range"
+msgstr "Numeriskt resultat är utanför giltigt område"
+
+#. TRANS An attempt was made to NFS-mount a remote file system with a file name that
+#. TRANS already specifies an NFS-mounted file.
+#. TRANS (This is an error on some operating systems, but we expect it to work
+#. TRANS properly on the GNU system, making this error code impossible.)
+#: stdio-common/../sysdeps/gnu/errlist.c:502
+msgid "Object is remote"
+msgstr "Är ett fjärrobjekt"
+
+#: time/zic.c:1939
+msgid "Odd number of quotation marks"
+msgstr "Ojämnt antal citationstecken"
+
+#. TRANS An operation is already in progress on an object that has non-blocking
+#. TRANS mode selected.
+#: stdio-common/../sysdeps/gnu/errlist.c:294
+msgid "Operation already in progress"
+msgstr "Operationen pågår redan"
+
+#. TRANS Operation not permitted; only the owner of the file (or other resource)
+#. TRANS or processes with special privileges can perform the operation.
+#: stdio-common/../sysdeps/gnu/errlist.c:12
+msgid "Operation not permitted"
+msgstr "Operationen inte tillåten"
+
+#. TRANS The operation you requested is not supported.  Some socket functions
+#. TRANS don't make sense for all types of sockets, and others may not be
+#. TRANS implemented for all communications protocols.  In the GNU system, this
+#. TRANS error can happen for many calls when the object does not support the
+#. TRANS particular operation; it is a generic indication that the server knows
+#. TRANS nothing to do for that call.
+#: stdio-common/../sysdeps/gnu/errlist.c:338
+msgid "Operation not supported"
+msgstr "Operationen stöds inte"
+
+#. TRANS The wrong type of device was given to a function that expects a
+#. TRANS particular sort of device.
+#: stdio-common/../sysdeps/gnu/errlist.c:135
+msgid "Operation not supported by device"
+msgstr "Operationen stöds inte av enheten"
+
+#. TRANS An operation that cannot complete immediately was initiated on an object
+#. TRANS that has non-blocking mode selected.  Some functions that must always
+#. TRANS block (such as @code{connect}; @pxref{Connecting}) never return
+#. TRANS @code{EAGAIN}.  Instead, they return @code{EINPROGRESS} to indicate that
+#. TRANS the operation has begun and will take some time.  Attempts to manipulate
+#. TRANS the object before the call completes return @code{EALREADY}.  You can
+#. TRANS use the @code{select} function to find out when the pending operation
+#. TRANS has completed; @pxref{Waiting for I/O}.
+#: stdio-common/../sysdeps/gnu/errlist.c:288
+msgid "Operation now in progress"
+msgstr "Operationen pågår nu"
+
+#. TRANS In the GNU C library, this is another name for @code{EAGAIN} (above).
+#. TRANS The values are always the same, on every operating system.
+#. TRANS
+#. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
+#. TRANS separate error code.
+#: stdio-common/../sysdeps/gnu/errlist.c:276
+msgid "Operation would block"
+msgstr "Operationen skulle blockera"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:634
+msgid "Out of streams resources"
+msgstr "Stream-resurserna är slut"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:726
+msgid "Package not installed"
+msgstr "Paketet är inte installerat"
+
+#. TRANS Permission denied; the file permissions do not allow the attempted operation.
+#: nis/ypclnt.c:661 stdio-common/../sysdeps/gnu/errlist.c:96
+msgid "Permission denied"
+msgstr "Åtkomst nekas"
+
+msgid "Power failure"
+msgstr "Spänningsfall"
+
+#: posix/regex.c:954
+msgid "Premature end of regular expression"
+msgstr "För tidigt slut på reguljärt uttryck"
+
+msgid "Profiling timer expired"
+msgstr "Profileringstiden tog slut"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:678
+msgid "Protocol driver not attached"
+msgstr "Styrprogram för protokoll inte anslutet"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:646
+msgid "Protocol error"
+msgstr "Protokollfel"
+
+#. TRANS The socket communications protocol family you requested is not supported.
+#: stdio-common/../sysdeps/gnu/errlist.c:343
+msgid "Protocol family not supported"
+msgstr "Protokollfamiljen stöds ej"
+
+#. TRANS You specified a socket option that doesn't make sense for the
+#. TRANS particular protocol being used by the socket.  @xref{Socket Options}.
+#: stdio-common/../sysdeps/gnu/errlist.c:316
+msgid "Protocol not available"
+msgstr "Protokollet ej tillgängligt"
+
+#. TRANS The socket domain does not support the requested communications protocol
+#. TRANS (perhaps because the requested protocol is completely invalid.)
+#. TRANS @xref{Creating a Socket}.
+#: stdio-common/../sysdeps/gnu/errlist.c:323
+msgid "Protocol not supported"
+msgstr "Protokollet stöds ej"
+
+#. TRANS The socket type does not support the requested communications protocol.
+#: stdio-common/../sysdeps/gnu/errlist.c:310
+msgid "Protocol wrong type for socket"
+msgstr "Fel protokolltyp för uttag (socket)"
+
+msgid "Quit"
+msgstr "Sluta"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:742
+msgid "RFS specific error"
+msgstr "RFS-specifikt fel"
+
+#. TRANS ???
+#: stdio-common/../sysdeps/gnu/errlist.c:527
+msgid "RPC bad procedure for program"
+msgstr "RPC dålig procedur för program"
+
+#: nis/ypclnt.c:635
+msgid "RPC failure on NIS operation"
+msgstr "RPC-fel vid NIS-operation"
+
+#. TRANS ???
+#: stdio-common/../sysdeps/gnu/errlist.c:517
+msgid "RPC program not available"
+msgstr "RPC programmet ej tillgängligt"
+
+#. TRANS ???
+#: stdio-common/../sysdeps/gnu/errlist.c:522
+msgid "RPC program version wrong"
+msgstr "RPC fel programversion"
+
+#. TRANS ???
+#: stdio-common/../sysdeps/gnu/errlist.c:507
+msgid "RPC struct is bad"
+msgstr "RPC struktur dålig"
+
+#. TRANS ???
+#: stdio-common/../sysdeps/gnu/errlist.c:512
+msgid "RPC version wrong"
+msgstr "RPC fel version"
+
+#: sunrpc/clnt_perr.c:217
+msgid "RPC: (unknown error code)"
+msgstr "RPC: (okänd felkod)"
+
+#: sunrpc/clnt_perr.c:179
+msgid "RPC: Authentication error"
+msgstr "RPC: Fel vid äkthetskontroll"
+
+#: sunrpc/clnt_perr.c:169
+msgid "RPC: Can't decode result"
+msgstr "RPC: Kan inte avkoda resultatet"
+
+#: sunrpc/clnt_perr.c:167
+msgid "RPC: Can't encode arguments"
+msgstr "RPC: Kan inte koda argumentet"
+
+#: sunrpc/clnt_perr.c:199
+msgid "RPC: Failed (unspecified error)"
+msgstr "RPC: Misslyckades (ospecificerat fel)"
+
+#: sunrpc/clnt_perr.c:177
+msgid "RPC: Incompatible versions of RPC"
+msgstr "RPC: Inkompatibla versioner av RPC"
+
+#: sunrpc/clnt_perr.c:195
+msgid "RPC: Port mapper failure"
+msgstr "RPC: Fel i portöversättare"
+
+#: sunrpc/clnt_perr.c:185
+msgid "RPC: Procedure unavailable"
+msgstr "RPC: Procedur inte tillgänglig"
+
+#: sunrpc/clnt_perr.c:197
+msgid "RPC: Program not registered"
+msgstr "RPC: Programmet inte registrerat"
+
+#: sunrpc/clnt_perr.c:181
+msgid "RPC: Program unavailable"
+msgstr "RPC: Programmet otillgängligt"
+
+#: sunrpc/clnt_perr.c:183
+msgid "RPC: Program/version mismatch"
+msgstr "RPC: Program/version-inkompabilitet"
+
+#: sunrpc/clnt_perr.c:189
+msgid "RPC: Remote system error"
+msgstr "RPC: Fjärrsystemsfel"
+
+#: sunrpc/clnt_perr.c:187
+msgid "RPC: Server can't decode arguments"
+msgstr "RPC: Betjänt kan inte avkoda argumenten"
+
+#: sunrpc/clnt_perr.c:165
+msgid "RPC: Success"
+msgstr "RPC: Lyckat"
+
+#: sunrpc/clnt_perr.c:175
+msgid "RPC: Timed out"
+msgstr "RPC: Tiden löpte ut"
+
+#: sunrpc/clnt_perr.c:173
+msgid "RPC: Unable to receive"
+msgstr "RPC: Kan inte ta emot"
+
+#: sunrpc/clnt_perr.c:171
+msgid "RPC: Unable to send"
+msgstr "RPC: Kan inte skicka"
+
+#: sunrpc/clnt_perr.c:191
+msgid "RPC: Unknown host"
+msgstr "RPC: Okänd värdmaskin"
+
+#: sunrpc/clnt_perr.c:193
+msgid "RPC: Unknown protocol"
+msgstr "RPC: Okänt protokoll"
+
+#: elf/dlsym.c:49
+msgid "RTLD_NEXT used in code not dynamically loaded"
+msgstr "RTLD_NEXT används i kod som inte är dynamiskt laddad"
+
+#. TRANS An attempt was made to modify something on a read-only file system.
+#: stdio-common/../sysdeps/gnu/errlist.c:206
+msgid "Read-only file system"
+msgstr "Filsystemet endast läsbart"
+
+#: posix/regex.c:955
+msgid "Regular expression too big"
+msgstr "Reguljärt uttryck för stort"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:798
+msgid "Remote I/O error"
+msgstr "I/O-fel på fjärrmaskin"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:754
+msgid "Remote address changed"
+msgstr "Fjärradress ändrades"
+
+#: inet/ruserpass.c:162
+msgid "Remove password or make file unreadable by others."
+msgstr "Ta bort lösenord eller gör filen oläsbar för andra"
+
+#: catgets/gencat.c:224 db/makedb.c:227 locale/programs/locale.c:257
+#: locale/programs/localedef.c:408
+msgid "Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"
+msgstr "Rapportera fel till <bug-glibc@prep.ai.mit.edu>.\n"
+
+#: nis/ypclnt.c:633
+msgid "Request arguments bad"
+msgstr "Argument för förfrågan felaktiga"
+
+#: resolv/herror.c:73
+msgid "Resolver Error 0 (no error)"
+msgstr "Resolver-fel 0 (inget fel)"
+
+#: resolv/herror.c:117
+msgid "Resolver internal error"
+msgstr "Internt fel i namnlösare"
+
+#. TRANS Deadlock avoided; allocating a system resource would have resulted in a
+#. TRANS deadlock situation.  The system does not guarantee that it will notice
+#. TRANS all such situations.  This error means you got lucky and the system
+#. TRANS noticed; it might just hang.  @xref{File Locks}, for an example.
+#: stdio-common/../sysdeps/gnu/errlist.c:85
+msgid "Resource deadlock avoided"
+msgstr "Resursdödläge undveks"
+
+#. TRANS Resource temporarily unavailable; the call might work if you try again
+#. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
+#. TRANS they are always the same in the GNU C library.
+#. TRANS
+#. TRANS This error can happen in a few different situations:
+#. TRANS
+#. TRANS @itemize @bullet
+#. TRANS @item
+#. TRANS An operation that would block was attempted on an object that has
+#. TRANS non-blocking mode selected.  Trying the same operation again will block
+#. TRANS until some external condition makes it possible to read, write, or
+#. TRANS connect (whatever the operation).  You can use @code{select} to find out
+#. TRANS when the operation will be possible; @pxref{Waiting for I/O}.
+#. TRANS
+#. TRANS @strong{Portability Note:} In older Unix many systems, this condition
+#. TRANS was indicated by @code{EWOULDBLOCK}, which was a distinct error code
+#. TRANS different from @code{EAGAIN}.  To make your program portable, you should
+#. TRANS check for both codes and treat them the same.
+#. TRANS
+#. TRANS @item
+#. TRANS A temporary resource shortage made an operation impossible.  @code{fork}
+#. TRANS can return this error.  It indicates that the shortage is expected to
+#. TRANS pass, so your program can try the call again later and it may succeed.
+#. TRANS It is probably a good idea to delay for a few seconds before trying it
+#. TRANS again, to allow time for other processes to release scarce resources.
+#. TRANS Such shortages are usually fairly serious and affect the whole system,
+#. TRANS so usually an interactive program should report the error to the user
+#. TRANS and return to its command loop.
+#. TRANS @end itemize
+#: stdio-common/../sysdeps/gnu/errlist.c:267
+msgid "Resource temporarily unavailable"
+msgstr "Resursen tillfälligt otillgänglig"
+
+msgid "Segmentation fault"
+msgstr "Minnessegmentsfel"
+
+#: sunrpc/clnt_perr.c:280
+msgid "Server rejected credential"
+msgstr "Betjänt förkastade kreditiv"
+
+#: sunrpc/clnt_perr.c:284
+msgid "Server rejected verifier"
+msgstr "Betjänt förkastade verifierare"
+
+#. TRANS A file that isn't a socket was specified when a socket is required.
+#: stdio-common/../sysdeps/gnu/errlist.c:299
+msgid "Socket operation on non-socket"
+msgstr "Uttagsoperation på icke-uttag (socket)"
+
+#. TRANS The socket type is not supported.
+#: stdio-common/../sysdeps/gnu/errlist.c:328
+msgid "Socket type not supported"
+msgstr "Uttagstyp (socket) stöds inte"
+
+#. TRANS A network connection was aborted locally.
+#: stdio-common/../sysdeps/gnu/errlist.c:382
+msgid "Software caused connection abort"
+msgstr "Mjukvara orsakade förbindelsebrott"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:734
+msgid "Srmount error"
+msgstr "Srmount-fel"
+
+#. TRANS Stale NFS file handle.  This indicates an internal confusion in the NFS
+#. TRANS system which is due to file system rearrangements on the server host.
+#. TRANS Repairing this condition usually requires unmounting and remounting
+#. TRANS the NFS file system on the local host.
+#: stdio-common/../sysdeps/gnu/errlist.c:494
+msgid "Stale NFS file handle"
+msgstr "Förlegad NFS-filhandtag"
+
+msgid "Stopped"
+msgstr "Stoppad"
+
+msgid "Stopped (signal)"
+msgstr "Stoppad (signal)"
+
+msgid "Stopped (tty input)"
+msgstr "Stoppad (tty-läsning)"
+
+msgid "Stopped (tty output)"
+msgstr "Stoppad (tty-skrivning)"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:778
+msgid "Streams pipe error"
+msgstr "Streams-rörfel"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:782
+msgid "Structure needs cleaning"
+msgstr "Strukturen behöver städas"
+
+#: nis/ypclnt.c:631 nis/ypclnt.c:705 posix/regex.c:940
+#: stdio-common/../sysdeps/gnu/errlist.c:7
+msgid "Success"
+msgstr "Lyckat"
+
+#: nis/ypclnt.c:711
+msgid "System resource allocation failure"
+msgstr "Allokeringsfel för systemresurs"
+
+msgid "Terminated"
+msgstr "Terminerad"
+
+#. TRANS An attempt to execute a file that is currently open for writing, or
+#. TRANS write to a file that is currently being executed.  Often using a
+#. TRANS debugger to run a program is considered having it open for writing and
+#. TRANS will cause this error.  (The name stands for ``text file busy''.)  This
+#. TRANS is not an error in the GNU system; the text is copied as necessary.
+#: stdio-common/../sysdeps/gnu/errlist.c:185
+msgid "Text file busy"
+msgstr "Kodfil upptagen"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:650
+msgid "Timer expired"
+msgstr "Tidtagning avslutad"
+
+#. TRANS Too many levels of symbolic links were encountered in looking up a file name.
+#. TRANS This often indicates a cycle of symbolic links.
+#: stdio-common/../sysdeps/gnu/errlist.c:445
+msgid "Too many levels of symbolic links"
+msgstr "För många nivåer av symboliska länkar"
+
+#. TRANS Too many links; the link count of a single file would become too large.
+#. TRANS @code{rename} can cause this error if the file being renamed already has
+#. TRANS as many links as it can take (@pxref{Renaming Files}).
+#: stdio-common/../sysdeps/gnu/errlist.c:213
+msgid "Too many links"
+msgstr "För många länkar"
+
+#. TRANS The current process has too many files open and can't open any more.
+#. TRANS Duplicate descriptors do count toward this limit.
+#. TRANS
+#. TRANS In BSD and GNU, the number of open files is controlled by a resource
+#. TRANS limit that can usually be increased.  If you get this error, you might
+#. TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
+#. TRANS @pxref{Limits on Resources}.
+#: stdio-common/../sysdeps/gnu/errlist.c:163
+msgid "Too many open files"
+msgstr "För många öppna filer"
+
+#. TRANS There are too many distinct file openings in the entire system.  Note
+#. TRANS that any number of linked channels count as just one file opening; see
+#. TRANS @ref{Linked Channels}.  This error never occurs in the GNU system.
+#: stdio-common/../sysdeps/gnu/errlist.c:170
+msgid "Too many open files in system"
+msgstr "För många öppna filer i systemet"
+
+#. TRANS This means that the per-user limit on new process would be exceeded by
+#. TRANS an attempted @code{fork}.  @xref{Limits on Resources}, for details on
+#. TRANS the @code{RLIMIT_NPROC} limit.
+#: stdio-common/../sysdeps/gnu/errlist.c:475
+msgid "Too many processes"
+msgstr "För många processer"
+
+#. TRANS ???
+#: stdio-common/../sysdeps/gnu/errlist.c:427
+msgid "Too many references: cannot splice"
+msgstr "För många referenser: kan inte skarva"
+
+#. TRANS The file quota system is confused because there are too many users.
+#. TRANS @c This can probably happen in a GNU system when using NFS.
+#: stdio-common/../sysdeps/gnu/errlist.c:481
+msgid "Too many users"
+msgstr "För många användare"
+
+msgid "Trace/breakpoint trap"
+msgstr "Spårning/brytpunktsfälla"
+
+#: posix/regex.c:945
+msgid "Trailing backslash"
+msgstr "Felplacerat omvänt snedstreck"
+
+#. TRANS In the GNU system, opening a file returns this error when the file is
+#. TRANS translated by a program and the translator program dies while starting
+#. TRANS up, before it has connected to the file.
+#: stdio-common/../sysdeps/gnu/errlist.c:584
+msgid "Translator died"
+msgstr "Översättaren dog"
+
+#. TRANS You tried to connect a socket that is already connected.
+#. TRANS @xref{Connecting}.
+#: stdio-common/../sysdeps/gnu/errlist.c:402
+msgid "Transport endpoint is already connected"
+msgstr "Transportslutpunkten är redan förbunden"
+
+#. TRANS The socket is not connected to anything.  You get this error when you
+#. TRANS try to transmit data over a socket, without first specifying a
+#. TRANS destination for the data.  For a connectionless socket (for datagram
+#. TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead.
+#: stdio-common/../sysdeps/gnu/errlist.c:410
+msgid "Transport endpoint is not connected"
+msgstr "Transportslutpunkten är inte förbunden"
+
+#: catgets/gencat.c:208 db/makedb.c:209 locale/programs/locale.c:241
+#: locale/programs/localedef.c:389
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Försök med \"%s --help\" för mer information\n"
+
+#: inet/rcmd.c:136
+#, c-format
+msgid "Trying %s...\n"
+msgstr "Provar %s...\n"
+
+#: inet/ruserpass.c:246
+#, c-format
+msgid "Unknown .netrc keyword %s"
+msgstr "Okänt .netrc-nyckelord %s"
+
+#: nis/ypclnt.c:665
+msgid "Unknown NIS error code"
+msgstr "Okänd NIS-felkod"
+
+#: string/../sysdeps/generic/_strerror.c:44
+#: string/../sysdeps/mach/_strerror.c:67
+msgid "Unknown error "
+msgstr "Okänt fel "
+
+#: resolv/herror.c:74
+msgid "Unknown host"
+msgstr "Okänd värd"
+
+#: resolv/herror.c:120
+msgid "Unknown resolver error"
+msgstr "Okänt fel hos namnlösare"
+
+#: resolv/herror.c:76
+msgid "Unknown server error"
+msgstr "Okänt fel hos tjänsteställe"
+
+#: string/strsignal.c:41
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Okänd signal %d"
+
+#: misc/error.c:95
+msgid "Unknown system error"
+msgstr "Okänt systemfel"
+
+#: nis/ypclnt.c:713
+msgid "Unknown ypbind error"
+msgstr "Okänt ypbind-fel"
+
+#: posix/regex.c:948
+msgid "Unmatched ( or \\("
+msgstr "Obalanserade ( eller \\("
+
+#: posix/regex.c:956
+msgid "Unmatched ) or \\)"
+msgstr "Obalanserade ) eller \\)"
+
+#: posix/regex.c:947
+msgid "Unmatched [ or [^"
+msgstr "Obalanserade [ eller [^"
+
+#: posix/regex.c:949
+msgid "Unmatched \\{"
+msgstr "Obalanserad \\{"
+
+#: posix/getconf.c:260
+#, c-format
+msgid "Unrecognized variable `%s'"
+msgstr "Okänd variabel \"%s\""
+
+msgid "Urgent I/O condition"
+msgstr "Viktigt I/O-tillstånd"
+
+#: catgets/gencat.c:212
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... -o OUTPUT-FILE [INPUT-FILE]...\n"
+"       %s [OPTION]... [OUTPUT-FILE [INPUT-FILE]...]\n"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"  -H, --header        create C header file containing symbol definitions\n"
+"  -h, --help          display this help and exit\n"
+"      --new           do not use existing catalog, force new output file\n"
+"  -o, --output=NAME   write output to file NAME\n"
+"  -V, --version       output version information and exit\n"
+"If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
+"is -, output is written to standard output.\n"
+msgstr ""
+"Användning: %s [FLAGGA]... -o UTFIL [INFIL]...\n"
+"            %s [FLAGGA]... [UTFIL [INFIL]...]\n"
+"Obligatoriska argument till långa flaggor är obligatoriska även för de "
+"korta.\n"
+"  -H, --header        skapa en C-deklarationsfil med symboldefinitioner\n"
+"  -h, --help          visa denna hjälptext och avsluta\n"
+"      --new           använd inte existerande katalog, gör en ny utfil\n"
+"  -o, --output=NAMN   skriv resultatet till filen NAMN\n"
+"  -V, --version       visa versionsinformation och avsluta.\n"
+"Om INFIL är -, läs indata från standard in.  Om UTFIL är -, skriv\n"
+"resultatet till standard ut.\n"
+
+#: db/makedb.c:213
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... INPUT-FILE OUTPUT-FILE\n"
+"       %s [OPTION]... -o OUTPUT-FILE INPUT-FILE\n"
+"       %s [OPTION]... -u INPUT-FILE\n"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"  -f, --fold-case     convert key to lower case\n"
+"  -h, --help          display this help and exit\n"
+"  -o, --output=NAME   write output to file NAME\n"
+"      --quiet         don't print messages while building database\n"
+"  -u, --undo          print content of database file, one entry a line\n"
+"  -V, --version       output version information and exit\n"
+"If INPUT-FILE is -, input is read from standard input.\n"
+msgstr ""
+"Användning: %s [FLAGGA]... INFIL UTFIL\n"
+"            %s [FLAGGA]... -o UTFIL INFIL\n"
+"            %s [FLAGGA]... -u INFIL\n"
+"Obligatoriska argument till långa flaggor är obligatoriska även för de "
+"korta.\n"
+"  -f, --fold-case     omvandla nyckel till små bokstäver\n"
+"  -h, --help          visa denna hjälptext och avsluta\n"
+"  -o, --output=NAMN   skriv resultatet till filen NAMN\n"
+"      --quiet         visa inga meddelanden när databasen byggs\n"
+"  -u, --undo          skriv innehållet i databasen, en post per rad\n"
+"  -V, --version       visa versionsinformation och avsluta\n"
+"Om INFIL är -, läs indata från standard in\n"
+
+#: locale/programs/localedef.c:393
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... name\n"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"  -c, --force               create output even if warning messages were "
+"issued\n"
+"  -h, --help                display this help and exit\n"
+"  -f, --charmap=FILE        symbolic character names defined in FILE\n"
+"  -i, --inputfile=FILE      source definitions are found in FILE\n"
+"  -u, --code-set-name=NAME  specify code set for mapping ISO 10646 elements\n"
+"  -v, --verbose             print more messages\n"
+"  -V, --version             output version information and exit\n"
+"      --posix               be strictly POSIX conform\n"
+"\n"
+"System's directory for character maps: %s\n"
+"                       locale files  : %s\n"
+msgstr ""
+"Användning: %s [FLAGGA]... namn\n"
+"Obligatoriska argument till långa flaggor är obligatoriska även för de "
+"korta.\n"
+"  -c, --force               skapa resultatfil även om varningar gavs\n"
+"  -h, --help                visa denna hjälptext och avsluta\n"
+"  -f, --charmap=FIL         symboliska teckennamn definieras i FIL\n"
+"  -i, --inputfile=FIL       källdefinitioner finns i FIL\n"
+"  -u, --code-set-name=NAMN  ange koduppsättning för att översätta\n"
+"                            ISO 10646-element\n"
+"  -v, --verbose             skriv mer meddelanden\n"
+"  -V, --version             visa versionsinformation och avsluta\n"
+"      --posix               följ POSIX strikt\n"
+"\n"
+"Systemets katalog för teckenuppsättningar: %s\n"
+"                      meddelandekataloger: %s\n"
+
+#: locale/programs/locale.c:245
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... name\n"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"  -h, --help            display this help and exit\n"
+"  -V, --version         output version information and exit\n"
+"\n"
+"  -a, --all-locales     write names of available locales\n"
+"  -m, --charmaps        write names of available charmaps\n"
+"\n"
+"  -c, --category-name   write names of selected categories\n"
+"  -k, --keyword-name    write names of selected keywords\n"
+msgstr ""
+"Användning: %s [FLAGGA]... namn\n"
+"Obligatoriska argument till långa flaggor är obligatoriska även för de "
+"korta.\n"
+"  -h, --help            visa denna hjälptext och avsluta\n"
+"  -V, --version         visa versionsinformation och avsluta\n"
+"\n"
+"  -a, --all-locales     skriv namnen på tillgängliga lokaler\n"
+"  -m, --charmaps        skriv namnen på tillgängliga teckenuppsättningar\n"
+"\n"
+"  -c, --category-name   skriv namnen på utvalda kategorier\n"
+"  -k, --keyword-name    skriv namnen på utvalda nyckelord\n"
+
+#: posix/getconf.c:200
+#, c-format
+msgid "Usage: %s variable_name [pathname]\n"
+msgstr "Användning: %s variabelnamn [sökväg]\n"
+
+#: sunrpc/rpcinfo.c:609
+msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
+msgstr "Användning: rpcinfo [ -n portnr ] -u värd prognr [ versnr ]\n"
+
+msgid "User defined signal 1"
+msgstr "Användarsignal 1"
+
+msgid "User defined signal 2"
+msgstr "Användarsignal 2"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:642
+msgid "Value too large for defined data type"
+msgstr "Värdet för stort för definierad datatyp"
+
+msgid "Virtual timer expired"
+msgstr "Virtuell tidtagare löpte ut"
+
+#: time/zic.c:1844
+msgid "Wild result from command execution"
+msgstr "Vilt resultat från kommandokörning"
+
+msgid "Window changed"
+msgstr "Fönstret ändrades"
+
+#: catgets/gencat.c:174 db/makedb.c:125 locale/programs/locale.c:192
+#: locale/programs/localedef.c:182
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Skriven av %s.\n"
+
+#: nis/ypclnt.c:146
+msgid "YPBINDPROC_DOMAIN: Internal error\n"
+msgstr "YPBINDPROC_DOMAIN: Internt fel\n"
+
+#: nis/ypclnt.c:150
+#, c-format
+msgid "YPBINDPROC_DOMAIN: No server for domain %s\n"
+msgstr "YPBINDPROC_DOMAIN: Ingen betjänt för domän %s\n"
+
+#: nis/ypclnt.c:154
+msgid "YPBINDPROC_DOMAIN: Resource allocation failure\n"
+msgstr "YPBINDPROC_DOMAIN: Allokeringsfel för resurs\n"
+
+#: nis/ypclnt.c:158
+msgid "YPBINDPROC_DOMAIN: Unknown error\n"
+msgstr "YPBINDPROC_DOMAIN: Okänt fel\n"
+
+#. TRANS You did @strong{what}?
+#: stdio-common/../sysdeps/gnu/errlist.c:596
+msgid "You really blew it this time"
+msgstr "Du strulade till det den här gången"
+
+#: time/zic.c:1050
+msgid "Zone continuation line end time is not after end time of previous line"
+msgstr ""
+"Zon-fortsättningsradens sluttid är inte efter sluttiden på föregående rad"
+
+#: locale/programs/charmap.c:397 locale/programs/locfile.c:341
+#, c-format
+msgid "`%1$s' definition does not end with `END %1$s'"
+msgstr "\"%1$s\" definition slutar ej med \"END %1$s\""
+
+#: locale/programs/ld-monetary.c:358 locale/programs/ld-numeric.c:190
+#, c-format
+msgid "`-1' must be last entry in `%s' field in `%s' category"
+msgstr "\"-1\" måste vara sista post i fält \"%s\" i kategori \"%s\""
+
+#: locale/programs/ld-collate.c:1652
+msgid "`...' must only be used in `...' and `UNDEFINED' entries"
+msgstr "\"...\" får endast användas för post \"...\" och post \"UNDEFINED\""
+
+#: locale/programs/locfile.c:538
+msgid "`from' expected after first argument to `collating-element'"
+msgstr ""
+"\"from\" förväntades efter första argumentet till \"collating-element\""
+
+#: locale/programs/ld-collate.c:1109
+msgid ""
+"`from' string in collation element declaration contains unknown character"
+msgstr ""
+"\"från\"-sträng i deklaration av kollationeringselement innehåller okänt "
+"tecken"
+
+#: locale/programs/charmap.c:267
+#, c-format
+msgid "argument to <%s> must be a single character"
+msgstr "argumentet till <%s> måste vara ett enskilt tecken"
+
+#: locale/programs/locfile.c:215
+#, c-format
+msgid "argument to `%s' must be a single character"
+msgstr "argumentet till \"%s\" måste vara ett enskilt tecken"
+
+#: sunrpc/auth_unix.c:322
+msgid "auth_none.c - Fatal marshalling problem"
+msgstr "auth_none.c - Fatalt kodningsproblem"
+
+#: inet/rcmd.c:360
+msgid "bad .rhosts owner"
+msgstr "dålig .rhosts-ägare"
+
+#: locale/programs/charmap.c:212 locale/programs/locfile.c:209
+msgid "bad argument"
+msgstr "dåligt argument"
+
+#: time/zic.c:1172
+msgid "blank FROM field on Link line"
+msgstr "tomt \"FROM\"-fält på \"Link\"-rad"
+
+#: time/zic.c:1176
+msgid "blank TO field on Link line"
+msgstr "tomt \"TO\"-fält på \"Link\"-rad"
+
+#: malloc/mcheck.c:189
+msgid "block freed twice"
+msgstr "block avallokerat två gånger"
+
+#: malloc/mcheck.c:192
+msgid "bogus mcheck_status, library is buggy"
+msgstr "felaktig mcheck_status, biblioteket är felaktigt"
+
+#: sunrpc/pmap_rmt.c:179
+msgid "broadcast: ioctl (get interface configuration)"
+msgstr "utsändning: ioctl (hämta gränssnittskonfiguration)"
+
+#: sunrpc/pmap_rmt.c:186
+msgid "broadcast: ioctl (get interface flags)"
+msgstr "utsändning: ioctl (hämta gränssnittsflaggor)"
+
+#: sunrpc/svc_udp.c:402
+msgid "cache_set: victim not found"
+msgstr "cache_set: offer hittades ej"
+
+#: time/zic.c:1685
+msgid "can't determine time zone abbrevation to use just after until time"
+msgstr ""
+"kan inte avgöra tidszonsförkortning att använda just efter \"until\"-tid"
+
+#: sunrpc/svc_simple.c:64
+#, c-format
+msgid "can't reassign procedure number %d\n"
+msgstr "kan inte återtilldela procedurnummer %d\n"
+
+#: locale/programs/localedef.c:287
+#, c-format
+msgid "cannot `stat' locale file `%s'"
+msgstr "kan inte ta status på lokalfil \"%s\""
+
+#: locale/programs/ld-collate.c:1314
+#, c-format
+msgid "cannot insert collation element `%.*s'"
+msgstr "kan inte sätta in kollationselement \"%.*s\""
+
+#: locale/programs/ld-collate.c:1493 locale/programs/ld-collate.c:1498
+msgid "cannot insert into result table"
+msgstr "kan inte sätta in i resultattabell"
+
+#: locale/programs/ld-collate.c:1166 locale/programs/ld-collate.c:1208
+#, c-format
+msgid "cannot insert new collating symbol definition: %s"
+msgstr "kan inte sätta in ny kollationssymbolsdefinition: %s"
+
+#: db/makedb.c:161
+#, c-format
+msgid "cannot open database file `%s': %s"
+msgstr "kan inte öppna databasfil \"%s\": %s"
+
+#: catgets/gencat.c:259 db/makedb.c:180
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "kan inte öppna infil \"%s\""
+
+#: locale/programs/localedef.c:221
+#, c-format
+msgid "cannot open locale definition file `%s'"
+msgstr "kan inte öppna lokaldefinitionsfil \"%s\""
+
+#: catgets/gencat.c:764 catgets/gencat.c:805 db/makedb.c:189
+#, c-format
+msgid "cannot open output file `%s'"
+msgstr "kan inte öppna utfil \"%s\""
+
+#: locale/programs/locfile.c:986
+#, c-format
+msgid "cannot open output file `%s' for category `%s'"
+msgstr "kan inte öppna utfil \"%s\" för kategori \"%s\""
+
+#: locale/programs/ld-collate.c:1360
+msgid "cannot process order specification"
+msgstr "kan inte bearbeta sorteringsspecifikation"
+
+#: locale/programs/locale.c:303
+#, c-format
+msgid "cannot read character map directory `%s'"
+msgstr "kan inte läsa teckenuppsättningskatalog \"%s\""
+
+#: locale/programs/locale.c:278
+#, c-format
+msgid "cannot read locale directory `%s'"
+msgstr "kan inte läsa lokalkatalog \"%s\""
+
+#: locale/programs/localedef.c:309
+#, c-format
+msgid "cannot read locale file `%s'"
+msgstr "kan inte läsa lokalfil \"%s\""
+
+#: locale/programs/localedef.c:334
+#, c-format
+msgid "cannot write output files to `%s'"
+msgstr "kan inte skriva utfiler till \"%s\""
+
+#: locale/programs/localedef.c:377
+msgid "category data requested more than once: should not happen"
+msgstr "kategoridata begärd mer än en gång: borde inte inträffa"
+
+#: locale/programs/ld-ctype.c:265
+#, c-format
+msgid "character %s'%s' in class `%s' must be in class `%s'"
+msgstr "tecken %s\"%s\" i klass \"%s\" måste vara i klass \"%s\""
+
+#: locale/programs/ld-ctype.c:289
+#, c-format
+msgid "character %s'%s' in class `%s' must not be in class `%s'"
+msgstr "tecken %s\"%s\" i klass \"%s\" kan inte vara i klass \"%s\""
+
+#: locale/programs/ld-ctype.c:310
+msgid "character <SP> not defined in character map"
+msgstr "tecken <SP> inte definierat i teckenuppsättning"
+
+#: locale/programs/ld-ctype.c:939 locale/programs/ld-ctype.c:1002
+#: locale/programs/ld-ctype.c:1010 locale/programs/ld-ctype.c:1018
+#: locale/programs/ld-ctype.c:1026 locale/programs/ld-ctype.c:1034
+#: locale/programs/ld-ctype.c:1042 locale/programs/ld-ctype.c:1068
+#: locale/programs/ld-ctype.c:1076 locale/programs/ld-ctype.c:1114
+#: locale/programs/ld-ctype.c:1141 locale/programs/ld-ctype.c:1152
+#, c-format
+msgid "character `%s' not defined while needed as default value"
+msgstr "tecken \"%s\" inte definierad men behövs som standardvärde"
+
+#: locale/programs/ld-ctype.c:801
+#, c-format
+msgid "character class `%s' already defined"
+msgstr "teckenklass \"%s\" redan definierad"
+
+#: locale/programs/ld-ctype.c:833
+#, c-format
+msgid "character map `%s' already defined"
+msgstr "teckenuppsättning \"%s\" redan definierad"
+
+#: locale/programs/charmap.c:76
+#, c-format
+msgid "character map file `%s' not found"
+msgstr "teckenuppsättningsfil \"%s\" inte funnen"
+
+#: sunrpc/clnt_raw.c:106
+msgid "clnt_raw.c - Fatal header serialization error."
+msgstr "clnt_raw.c - Fatalt fel vid serialisation."
+
+#: locale/programs/ld-collate.c:1329
+#, c-format
+msgid "collation element `%.*s' appears more than once: ignore line"
+msgstr "kollationselement \"%.*s\" finns mer än en gång: rad ignorerad"
+
+#: locale/programs/ld-collate.c:1347
+#, c-format
+msgid "collation symbol `%.*s' appears more than once: ignore line"
+msgstr "kollationssymbol \"%.*s\" finns mer än en gång: rad ignorerad"
+
+#: locale/programs/locfile.c:522
+#, c-format
+msgid "collation symbol expected after `%s'"
+msgstr "kollationssymbol förväntades efter \"%s\""
+
+#: inet/rcmd.c:129
+#, c-format
+msgid "connect to address %s: "
+msgstr "koppla till adress %s: "
+
+#: sunrpc/svc_simple.c:70
+msgid "couldn't create an rpc server\n"
+msgstr "kunde inte skapa en rpc-betjänt\n"
+
+#: sunrpc/svc_simple.c:77
+#, c-format
+msgid "couldn't register prog %d vers %d\n"
+msgstr "kunde inte registrera prog %d vers %d\n"
+
+#: locale/programs/charmap.c:86
+#, c-format
+msgid "default character map file `%s' not found"
+msgstr "standardteckenuppsättningsfil \"%s\" inte hittad"
+
+#: locale/programs/ld-time.c:154
+#, c-format
+msgid ""
+"direction flag in string %d in `era' field in category `%s' is not '+' nor "
+"'-'"
+msgstr ""
+"riktningsflagga i sträng %d i \"era\"-fält i kategori \"%s\" är inte \"+\" "
+"eller \"-\""
+
+#: locale/programs/ld-time.c:164
+#, c-format
+msgid ""
+"direction flag in string %d in `era' field in category `%s' is not a single "
+"character"
+msgstr ""
+"riktningsflagga i sträng %d i \"era\"-fält i kategori \"%s\" är inte ett "
+"tecken"
+
+#: locale/programs/charset.c:87 locale/programs/charset.c:132
+#, c-format
+msgid "duplicate character name `%s'"
+msgstr "duplicerat teckennamn \"%s\""
+
+#: locale/programs/ld-collate.c:1141
+msgid "duplicate collating element definition"
+msgstr "dubbla definitioner av kollationselement"
+
+#: locale/programs/ld-collate.c:1287
+#, c-format
+msgid "duplicate definition for character `%.*s'"
+msgstr "dubbla definitioner för tecken \"%.*s\""
+
+#: db/makedb.c:310
+msgid "duplicate key"
+msgstr "duplicerad nyckel"
+
+#: catgets/gencat.c:378
+msgid "duplicate set definition"
+msgstr "duplicerad definition av uppsättning"
+
+#: time/zic.c:965
+#, c-format
+msgid "duplicate zone name %s (file \"%s\", line %d)"
+msgstr "duplicerat zonnamn %s (fil \"%s\", rad %d)"
+
+#: catgets/gencat.c:541
+msgid "duplicated message identifier"
+msgstr "duplicerad meddelandeidentifierare"
+
+#: catgets/gencat.c:514
+msgid "duplicated message number"
+msgstr "duplicerat meddelandenummer"
+
+#: locale/programs/ld-collate.c:1696
+msgid "empty weight name: line ignored"
+msgstr "tomt viktnamn: rad ignorerad"
+
+#: sunrpc/svc_udp.c:348
+msgid "enablecache: cache already enabled"
+msgstr "enablecache: cache redan påslagen"
+
+#: sunrpc/svc_udp.c:353
+msgid "enablecache: could not allocate cache"
+msgstr "enablecache: kunde inte allokera cache"
+
+#: sunrpc/svc_udp.c:360
+msgid "enablecache: could not allocate cache data"
+msgstr "enablecache: kunde inte allokera cache-data"
+
+#: sunrpc/svc_udp.c:366
+msgid "enablecache: could not allocate cache fifo"
+msgstr "enablecache: kunde inte allokera cache-fifo"
+
+#: locale/programs/ld-collate.c:1419
+msgid "end point of ellipsis range is bigger then start"
+msgstr "slutpunkt för ... är större än startvärdet"
+
+#: locale/programs/ld-collate.c:1149
+msgid "error while inserting collation element into hash table"
+msgstr "fel vid insättning av kollationselement i hashtabellen"
+
+#: locale/programs/ld-collate.c:1161
+msgid "error while inserting to hash table"
+msgstr "fel vis insättning till hashtabellen"
+
+#: locale/programs/locfile.c:465
+msgid "expect string argument for `copy'"
+msgstr "förväntar strängargument för \"copy\""
+
+#: time/zic.c:856
+msgid "expected continuation line not found"
+msgstr "förväntad fortsättningsrad ej funnen"
+
+#: locale/programs/locfile.c:1010
+#, c-format
+msgid "failure while writing data for category `%s'"
+msgstr "misslyckades skriva data för kategori \"%s\""
+
+#: locale/programs/ld-monetary.c:154 locale/programs/ld-numeric.c:95
+#, c-format
+msgid "field `%s' in category `%s' not defined"
+msgstr "fält \"%s\" i kategori \"%s\" inte definierad"
+
+#: locale/programs/ld-messages.c:81 locale/programs/ld-messages.c:102
+#, c-format
+msgid "field `%s' in category `%s' undefined"
+msgstr "fält \"%s\" i kategori \"%s\" odefinierad"
+
+#: locale/programs/locfile.c:547
+msgid "from-value of `collating-element' must be a string"
+msgstr "frånvärde för \"collating-element\" måste vara en sträng"
+
+#: locale/programs/linereader.c:328
+msgid "garbage at end of character code specification"
+msgstr "skräp i slutet av teckenkodsspecifikation"
+
+#: locale/programs/linereader.c:214
+msgid "garbage at end of digit"
+msgstr "skräp i slutet av nummer"
+
+#: locale/programs/ld-time.c:183
+#, c-format
+msgid ""
+"garbage at end of offset value in string %d in `era' field in category `%s'"
+msgstr ""
+"skräp i slutet av tilläggsvärde i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: locale/programs/ld-time.c:238
+#, c-format
+msgid ""
+"garbage at end of starting date in string %d in `era' field in category `%s'"
+msgstr ""
+"skräp i slutet av startdatum i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: locale/programs/ld-time.c:310
+#, c-format
+msgid ""
+"garbage at end of stopping date in string %d in `era' field in category `%s'"
+msgstr ""
+"skräp i slutet av slutdatum i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: sunrpc/get_myaddr.c:73
+msgid "get_myaddress: ioctl (get interface configuration)"
+msgstr "get_myaddress: ioctl (hämta gränssnittskonfiguration)"
+
+#: time/zic.c:1149
+msgid "illegal CORRECTION field on Leap line"
+msgstr "otillåtet \"CORRECTION\"-fält på \"Leap\"-rad"
+
+#: time/zic.c:1153
+msgid "illegal Rolling/Stationary field on Leap line"
+msgstr "otillåtet \"Rolling/Stationary\"-fält på \"Leap\"-rad"
+
+#: locale/programs/ld-collate.c:1767
+msgid "illegal character constant in string"
+msgstr "otillåten teckenkonstant i sträng"
+
+#: locale/programs/ld-collate.c:1116
+msgid "illegal collation element"
+msgstr "otillåtet kollationselement"
+
+#: locale/programs/charmap.c:196
+msgid "illegal definition"
+msgstr "otillåten definition"
+
+#: locale/programs/charmap.c:349
+msgid "illegal encoding given"
+msgstr "otillåten kodning given"
+
+#: locale/programs/linereader.c:546
+msgid "illegal escape sequence at end of string"
+msgstr "otillåten teckensekvens vid strängslut"
+
+#: locale/programs/charset.c:101
+msgid "illegal names for character range"
+msgstr "otillåtna namn för teckenomfång"
+
+#: locale/programs/ld-time.c:176
+#, c-format
+msgid "illegal number for offset in string %d in `era' field in category `%s'"
+msgstr ""
+"otillåtet tal för tilläggsvärde i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: catgets/gencat.c:351 catgets/gencat.c:428
+msgid "illegal set number"
+msgstr "otillåtet tal för uppsättning"
+
+#: locale/programs/ld-time.c:230
+#, c-format
+msgid "illegal starting date in string %d in `era' field in category `%s'"
+msgstr "otillåtet startdatum i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: locale/programs/ld-time.c:302
+#, c-format
+msgid "illegal stopping date in string %d in `era' field in category `%s'"
+msgstr "otillåtet slutdatum i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: locale/programs/ld-ctype.c:807
+#, c-format
+msgid "implementation limit: no more than %d character classes allowed"
+msgstr "implementationsbegränsning: inte fler än %d teckenklasser tillåtet"
+
+#: locale/programs/ld-ctype.c:839
+#, c-format
+msgid "implementation limit: no more than %d character maps allowed"
+msgstr ""
+"implementationsbegränsning: inte fler än %d teckenuppsättningar tillåtet"
+
+#: db/makedb.c:163
+msgid "incorrectly formatted file"
+msgstr "felaktigt formaterad rad"
+
+#: time/zic.c:814
+msgid "input line of unknown type"
+msgstr "inrad av okänd typ"
+
+#: time/zic.c:1733
+msgid "internal error - addtype called with bad isdst"
+msgstr "internt fel - addtype anropad med felaktig isdst"
+
+#: time/zic.c:1741
+msgid "internal error - addtype called with bad ttisgmt"
+msgstr "internt fel - addtype anropad med felaktig ttisgmt"
+
+#: time/zic.c:1737
+msgid "internal error - addtype called with bad ttisstd"
+msgstr "internt fel - addtype anropad med felaktig ttisstd"
+
+#: locale/programs/ld-ctype.c:301
+#, c-format
+msgid "internal error in %s, line %u"
+msgstr "internt fel i %s, rad %u"
+
+#: time/zic.c:1021
+msgid "invalid GMT offset"
+msgstr "ogiltigt tilläggsvärde till GMT"
+
+#: time/zic.c:1024
+msgid "invalid abbreviation format"
+msgstr "ogiltigt förkortningsformat"
+
+#: time/zic.c:1114 time/zic.c:1313 time/zic.c:1327
+msgid "invalid day of month"
+msgstr "ogiltig dag i månaden"
+
+#: time/zic.c:1272
+msgid "invalid ending year"
+msgstr "ogiltigt slutår"
+
+#: time/zic.c:1086
+msgid "invalid leaping year"
+msgstr "ogiltigt skottår"
+
+#: time/zic.c:1101 time/zic.c:1204
+msgid "invalid month name"
+msgstr "ogiltigt månadsnamn"
+
+#: time/zic.c:920
+msgid "invalid saved time"
+msgstr "ogiltigt sparad tid"
+
+#: time/zic.c:1252
+msgid "invalid starting year"
+msgstr "ogiltigt startår"
+
+#: time/zic.c:1130 time/zic.c:1232
+msgid "invalid time of day"
+msgstr "ogiltig tid på dagen"
+
+#: time/zic.c:1318
+msgid "invalid weekday name"
+msgstr "ogiltigt veckodagsnamn"
+
+#: locale/programs/ld-collate.c:1412
+msgid "line after ellipsis must contain character definition"
+msgstr "rad efter ... får inte innehålla teckendefinition"
+
+#: locale/programs/ld-collate.c:1391
+msgid "line before ellipsis does not contain definition for character constant"
+msgstr "rad före ... innehåller inte definition för teckenkonstant"
+
+#: time/zic.c:794
+msgid "line too long"
+msgstr "rad för lång"
+
+#: locale/programs/localedef.c:281
+#, c-format
+msgid "locale file `%s', used in `copy' statement, not found"
+msgstr "lokalfil \"%s\", använd i \"copy\", inte funnen"
+
+#: catgets/gencat.c:609
+msgid "malformed line ignored"
+msgstr "felaktig rad ignorerad"
+
+#: malloc/mcheck.c:183
+msgid "memory clobbered before allocated block"
+msgstr "minnet förstört före allokerat block"
+
+#: malloc/mcheck.c:186
+msgid "memory clobbered past end of allocated block"
+msgstr "minnet förstört efter slutet på allokerat block"
+
+#: locale/programs/ld-collate.c:167 locale/programs/ld-collate.c:173
+#: locale/programs/ld-collate.c:177 locale/programs/ld-collate.c:1439
+#: locale/programs/ld-collate.c:1468 locale/programs/locfile.c:940
+#: locale/programs/xmalloc.c:68 posix/getconf.c:250
+msgid "memory exhausted"
+msgstr "minne slut"
+
+#: malloc/obstack.c:425
+msgid "memory exhausted\n"
+msgstr "minnet slut\n"
+
+#: malloc/mcheck.c:180
+msgid "memory is consistent, library is buggy"
+msgstr "minnet är konsistent, biblioteket är felaktigt"
+
+#: locale/programs/ld-time.c:348
+#, c-format
+msgid "missing era format in string %d in `era' field in category `%s'"
+msgstr "saknar eraformat i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: locale/programs/ld-time.c:337
+#, c-format
+msgid "missing era name in string %d in `era' fieldin category `%s'"
+msgstr "saknar eranamn i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: time/zic.c:915
+msgid "nameless rule"
+msgstr "namnlös regel"
+
+#: sunrpc/svc_simple.c:140
+#, c-format
+msgid "never registered prog %d\n"
+msgstr "aldrig registrerat prog %d\n"
+
+#: locale/programs/ld-messages.c:95 locale/programs/ld-messages.c:116
+#, c-format
+msgid "no correct regular expression for field `%s' in category `%s': %s"
+msgstr "felaktigt reguljärt uttryck för fält \"%s\" i kategori \"%s\": %s"
+
+#: time/zic.c:2059
+msgid "no day in month matches rule"
+msgstr "ingen dag i månaden matchar regeln"
+
+#: locale/programs/ld-collate.c:259
+msgid "no definition of `UNDEFINED'"
+msgstr "ingen definition av \"UNDEFINED\""
+
+#: locale/programs/locfile.c:479
+msgid "no other keyword shall be specified when `copy' is used"
+msgstr "inget annat nyckelord ska anges när \"copy\" används"
+
+#: locale/programs/localedef.c:340
+msgid "no output file produced because warning were issued"
+msgstr "ingen utfil skapad på grund av varningar"
+
+#: locale/programs/charmap.c:315 locale/programs/charmap.c:466
+#: locale/programs/charmap.c:545
+msgid "no symbolic name given"
+msgstr "inget symboliskt namn givet"
+
+#: locale/programs/charmap.c:380 locale/programs/charmap.c:512
+#: locale/programs/charmap.c:578
+msgid "no symbolic name given for end of range"
+msgstr "inget symboliskt namn givet för slutet på omfånget"
+
+#: locale/programs/ld-collate.c:244
+#, c-format
+msgid "no weight defined for symbol `%s'"
+msgstr "ingen vikt definierad för symbol \"%s\""
+
+#: locale/programs/charmap.c:430
+msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
+msgstr "endast definition av \"WIDTH\" får följa definitionen av \"CHARMAP\""
+
+#: db/makedb.c:326
+#, c-format
+msgid "problems while reading `%s'"
+msgstr "problem läsa \"%s\""
+
+#: sunrpc/rpcinfo.c:222 sunrpc/rpcinfo.c:350
+#, c-format
+msgid "program %lu is not available\n"
+msgstr "program %lu är inte tillgängligt\n"
+
+#: sunrpc/rpcinfo.c:245 sunrpc/rpcinfo.c:282 sunrpc/rpcinfo.c:371
+#: sunrpc/rpcinfo.c:408 sunrpc/rpcinfo.c:429 sunrpc/rpcinfo.c:462
+#, c-format
+msgid "program %lu version %lu is not available\n"
+msgstr "program %lu version %lu är inte tillgängligt\n"
+
+#: sunrpc/rpcinfo.c:466
+#, c-format
+msgid "program %lu version %lu ready and waiting\n"
+msgstr "program %lu version %lu klar och väntar\n"
+
+#: inet/rcmd.c:171
+#, c-format
+msgid "rcmd: select (setting up stderr): %m\n"
+msgstr "rcmd: select (sätter upp standard error): %m\n"
+
+#: inet/rcmd.c:103
+msgid "rcmd: socket: All ports in use\n"
+msgstr "rcmd: uttag (socket): Alla portar används\n"
+
+#: inet/rcmd.c:159
+#, c-format
+msgid "rcmd: write (setting up stderr): %m\n"
+msgstr "rcmd: write: (sätter upp standard error): %m\n"
+
+#: sunrpc/svc_simple.c:83
+msgid "registerrpc: out of memory\n"
+msgstr "registerrpc: minnet slut\n"
+
+#: time/zic.c:1794
+msgid "repeated leap second moment"
+msgstr "upprepad skottsekundstillfälle"
+
+#: sunrpc/rpcinfo.c:659
+#, c-format
+msgid "rpcinfo: %s is unknown host\n"
+msgstr "rpcinfo: %s är en okänd värd\n"
+
+#: sunrpc/rpcinfo.c:626
+#, c-format
+msgid "rpcinfo: %s is unknown service\n"
+msgstr "rpcinfo: %s är en okänd tjänst\n"
+
+#: sunrpc/rpcinfo.c:600
+#, c-format
+msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
+msgstr "rpcinfo: Kunde inte ta bort registrering för prog %s version %s\n"
+
+#: sunrpc/rpcinfo.c:576
+#, c-format
+msgid "rpcinfo: broadcast failed: %s\n"
+msgstr "rpcinfo: utsändning misslyckades: %s\n"
+
+#: sunrpc/rpcinfo.c:505
+msgid "rpcinfo: can't contact portmapper"
+msgstr "rpcinfo: kan inte kontakta portmapper"
+
+#: sunrpc/rpcinfo.c:510
+msgid "rpcinfo: can't contact portmapper: "
+msgstr "rpcinfo: kan inte kontakta portmapper: "
+
+#: time/zic.c:708 time/zic.c:710
+msgid "same rule name in multiple files"
+msgstr "samma regel i flera filer"
+
+#: inet/rcmd.c:174
+msgid "select: protocol failure in circuit setup\n"
+msgstr "select: protokollfel i förbindelseuppsättning\n"
+
+#: inet/rcmd.c:192
+msgid "socket: protocol failure in circuit setup\n"
+msgstr "uttag (socket): protokollfel i förbindelseuppsättning\n"
+
+#: locale/programs/locfile.c:600
+msgid "sorting order `forward' and `backward' are mutually exclusive"
+msgstr ""
+"sorteringsordning \"forward\" och \"backward\" är ömsesidigt uteslutande"
+
+#: locale/programs/ld-collate.c:1568 locale/programs/ld-collate.c:1614
+msgid ""
+"specification of sorting weight for collation symbol does not make sense"
+msgstr ""
+"specifikation av sorteringsvikter för kollationssymbol verkar inte vettig"
+
+#: time/zic.c:779
+msgid "standard input"
+msgstr "standard in"
+
+#: time/zdump.c:260
+msgid "standard output"
+msgstr "standard ut"
+
+#: locale/programs/ld-time.c:256
+#, c-format
+msgid "starting date is illegal in string %d in `era' field in category `%s'"
+msgstr "startdatum är otillåtet i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: time/zic.c:1276
+msgid "starting year greater than ending year"
+msgstr "startår är större än slutår"
+
+#: locale/programs/ld-time.c:328
+#, c-format
+msgid "stopping date is illegal in string %d in `era' field in category `%s'"
+msgstr "slutdatum är otillåtet i sträng %d i \"era\"-fält i kategori \"%s\""
+
+#: sunrpc/svc_tcp.c:201 sunrpc/svc_tcp.c:206
+msgid "svc_tcp: makefd_xprt: out of memory\n"
+msgstr "svc_tcp: makefd_xprt: minnet slut\n"
+
+#: sunrpc/svc_tcp.c:149
+msgid "svctcp_.c - cannot getsockname or listen"
+msgstr "svctcp_.c - kan inte anropa getsockname eller listen"
+
+#: sunrpc/svc_tcp.c:136
+msgid "svctcp_.c - udp socket creation problem"
+msgstr "svctcp_.c - problem att skapa udp-uttag (socket)"
+
+#: sunrpc/svc_tcp.c:156 sunrpc/svc_tcp.c:163
+msgid "svctcp_create: out of memory\n"
+msgstr "svctcp_create: minnet slut\n"
+
+#: sunrpc/svc_udp.c:123
+msgid "svcudp_create - cannot getsockname"
+msgstr "svcudp_create - kan inte anropa getsockname"
+
+#: sunrpc/svc_udp.c:111
+msgid "svcudp_create: socket creation problem"
+msgstr "svcudp_create: problem att skapa uttag (socket)"
+
+#: locale/programs/ld-collate.c:1191
+#, c-format
+msgid ""
+"symbol for multicharacter collating element `%.*s' duplicates element "
+"definition"
+msgstr ""
+"symbol för flerteckenskollationselement \"%.*s\" duplicerar elementdefinition"
+
+#: locale/programs/ld-collate.c:1064
+#, c-format
+msgid ""
+"symbol for multicharacter collating element `%.*s' duplicates other element "
+"definition"
+msgstr ""
+"symbol för flerteckenskollationselement \"%.*s\" duplicerar annan\n"
+"elementdefinition"
+
+#: locale/programs/ld-collate.c:1200
+#, c-format
+msgid ""
+"symbol for multicharacter collating element `%.*s' duplicates other symbol "
+"definition"
+msgstr ""
+"symbol för flerteckenskollationselement \"%.*s\" duplicerar annan\n"
+"symboldefinition"
+
+#: locale/programs/ld-collate.c:1073
+#, c-format
+msgid ""
+"symbol for multicharacter collating element `%.*s' duplicates symbol "
+"definition"
+msgstr ""
+"symbol för flerteckenskollationselement \"%.*s\" duplicerar symboldefinition"
+
+#: locale/programs/ld-collate.c:1055 locale/programs/ld-collate.c:1182
+#, c-format
+msgid ""
+"symbol for multicharacter collating element `%.*s' duplicates symbolic name "
+"in charset"
+msgstr ""
+"symbol för flerteckenskollationselement \"%.*s\" duplicerar symbolnamn i\n"
+"teckenuppsättning"
+
+#: locale/programs/charmap.c:314 locale/programs/charmap.c:348
+#: locale/programs/charmap.c:378 locale/programs/charmap.c:465
+#: locale/programs/charmap.c:511 locale/programs/charmap.c:544
+#: locale/programs/charmap.c:576
+#, c-format
+msgid "syntax error in %s definition: %s"
+msgstr "syntaxfel i definition av %s: %s"
+
+#: locale/programs/locfile.c:620
+msgid "syntax error in `order_start' directive"
+msgstr "syntaxfel i direktivet \"order_start\""
+
+#: locale/programs/locfile.c:362
+msgid "syntax error in character class definition"
+msgstr "syntaxfel i teckenklassdefinition"
+
+#: locale/programs/locfile.c:420
+msgid "syntax error in character conversion definition"
+msgstr "syntaxfel i teckenkonverteringsdefinition"
+
+#: locale/programs/locfile.c:662
+msgid "syntax error in collating order definition"
+msgstr "syntaxfel i kollationssorteringsdefinition"
+
+#: locale/programs/locfile.c:512
+msgid "syntax error in collation definition"
+msgstr "syntaxfel i kollationsdefinition"
+
+#: locale/programs/locfile.c:335
+msgid "syntax error in definition of LC_CTYPE category"
+msgstr "syntaxfel i definition av kategorin LC_CTYPE"
+
+#: locale/programs/locfile.c:278
+msgid "syntax error in definition of new character class"
+msgstr "syntaxfel i definition av ny teckenklass"
+
+#: locale/programs/locfile.c:288
+msgid "syntax error in definition of new character map"
+msgstr "syntaxfel i definition av ny teckenuppsättning"
+
+#: locale/programs/locfile.c:873
+msgid "syntax error in message locale definition"
+msgstr "syntaxfel i definition av meddelandelokal"
+
+#: locale/programs/locfile.c:784
+msgid "syntax error in monetary locale definition"
+msgstr "syntaxfel i definition av monetärlokal"
+
+#: locale/programs/locfile.c:811
+msgid "syntax error in numeric locale definition"
+msgstr "syntaxfel i definition av numerisk lokal"
+
+#: locale/programs/locfile.c:722
+msgid "syntax error in order specification"
+msgstr "syntaxfel i sorteringsspecifikation"
+
+#: locale/programs/charmap.c:195 locale/programs/charmap.c:211
+#, c-format
+msgid "syntax error in prolog: %s"
+msgstr "syntaxfel i prolog: %s"
+
+#: locale/programs/locfile.c:849
+msgid "syntax error in time locale definition"
+msgstr "syntaxfel i definition av tidslokal"
+
+#: locale/programs/locfile.c:255
+msgid "syntax error: not inside a locale definition section"
+msgstr "syntaxfel: inte inne i en lokaldefinition"
+
+#: catgets/gencat.c:380 catgets/gencat.c:516 catgets/gencat.c:543
+msgid "this is the first definition"
+msgstr "detta är den första definitionen"
+
+#: time/zic.c:1119
+msgid "time before zero"
+msgstr "tid före noll"
+
+#: time/zic.c:1127 time/zic.c:1959 time/zic.c:1978
+msgid "time overflow"
+msgstr "för stort tidsvärde"
+
+#: locale/programs/charset.c:44
+msgid "too few bytes in character encoding"
+msgstr "för få byte i teckenkodning"
+
+#: locale/programs/charset.c:46
+msgid "too many bytes in character encoding"
+msgstr "för många tecken i teckenkodning"
+
+#: locale/programs/locales.h:72
+msgid "too many character classes defined"
+msgstr "för många teckenklasser definierade"
+
+#: time/zic.c:1788
+msgid "too many leap seconds"
+msgstr "för många skottsekunder"
+
+#: time/zic.c:1760
+msgid "too many local time types"
+msgstr "för många lokala tidstyper"
+
+#: time/zic.c:1714
+msgid "too many transitions?!"
+msgstr "för många övergångar?!"
+
+#: locale/programs/ld-collate.c:1623
+msgid "too many weights"
+msgstr "för många vikter"
+
+#: time/zic.c:2082
+msgid "too many, or too long, time zone abbreviations"
+msgstr "för många eller för långa tidszonförkortningar"
+
+#: locale/programs/linereader.h:146
+msgid "trailing garbage at end of line"
+msgstr "avslutande skräp vid radslutet"
+
+#: sunrpc/svc_simple.c:132
+#, c-format
+msgid "trouble replying to prog %d\n"
+msgstr "problem att svara till prog %d\n"
+
+#: locale/programs/ld-collate.c:1383
+msgid "two lines in a row containing `...' are not allowed"
+msgstr "två rader efter varann som har \"...\" är inte tillåtet"
+
+#: time/zic.c:1283
+msgid "typed single year"
+msgstr "satte typ på endast ett år"
+
+#: posix/getconf.c:239
+msgid "undefined"
+msgstr "odefinierad"
+
+#: locale/programs/charmap.c:617 locale/programs/charmap.c:628
+#, c-format
+msgid "unknown character `%s'"
+msgstr "okänt tecken \"%s\""
+
+#: locale/programs/ld-messages.c:193 locale/programs/ld-messages.c:204
+#: locale/programs/ld-messages.c:215 locale/programs/ld-messages.c:226
+#: locale/programs/ld-time.c:696
+#, c-format
+msgid "unknown character in field `%s' of category `%s'"
+msgstr "okänt tecken i fält \"%s\" i kategori \"%s\""
+
+#: locale/programs/locfile.c:585
+msgid "unknown collation directive"
+msgstr "okänt kollationsdirektiv"
+
+#: catgets/gencat.c:477
+#, c-format
+msgid "unknown directive `%s': line ignored"
+msgstr "okänt direktiv \"%s\": rad ignorerad"
+
+#: catgets/gencat.c:456
+#, c-format
+msgid "unknown set `%s'"
+msgstr "okänd uppsättning \"%s\""
+
+msgid "unknown signal"
+msgstr "okänd signal"
+
+#: locale/programs/ld-collate.c:1367 locale/programs/ld-collate.c:1558
+#: locale/programs/ld-collate.c:1732
+#, c-format
+msgid "unknown symbol `%.*s': line ignored"
+msgstr "okänd symbol \"%.*s\": rad ignorerad"
+
+#: time/zic.c:751
+msgid "unruly zone"
+msgstr "besvärlig zon"
+
+#: catgets/gencat.c:961
+msgid "unterminated message"
+msgstr "oavslutat meddelande"
+
+#: locale/programs/linereader.c:515 locale/programs/linereader.c:550
+msgid "unterminated string"
+msgstr "oavslutad sträng"
+
+#: locale/programs/linereader.c:385
+msgid "unterminated symbolic name"
+msgstr "oavslutat symboliskt namn"
+
+#: locale/programs/ld-collate.c:1685
+msgid "unterminated weight name"
+msgstr "oavslutat viktnamn"
+
+#: locale/programs/charset.c:119
+msgid "upper limit in range is not smaller then lower limit"
+msgstr "övre gräns i område är inte mindre än undre gräns"
+
+#: time/zic.c:2025
+msgid "use of 2/29 in non leap-year"
+msgstr "använder 29/2 i icke-skottår"
+
+#: locale/programs/charmap.c:438 locale/programs/charmap.c:492
+#, c-format
+msgid "value for %s must be an integer"
+msgstr "värdet för %s måste vara heltal"
+
+#: locale/programs/charmap.c:233
+#, c-format
+msgid "value for <%s> must lie between 1 and 4"
+msgstr "värde för <%s> måste vara mellan 1 och 4"
+
+#: locale/programs/ld-monetary.c:148 locale/programs/ld-numeric.c:89
+#, c-format
+msgid "value for field `%s' in category `%s' must not be the empty string"
+msgstr "värde för fält \"%s\" i kategori \"%s\" får inte vara tom sträng"
+
+#: locale/programs/charmap.c:245
+msgid "value of <mb_cur_max> must be greater than the value of <mb_cur_min>"
+msgstr "värdet på <mb_cur_max> måste vara större än värdet på <mb_cur_min>"
+
+#: locale/programs/ld-monetary.c:138
+msgid ""
+"value of field `int_curr_symbol' in category `LC_MONETARY' does not "
+"correspond to a valid name in ISO 4217"
+msgstr ""
+"värdet på fältet \"int_curr_symbol\" i kategorin LC_MONETARY stämmer inte "
+"med värden i ISO 4217"
+
+#: locale/programs/ld-monetary.c:133
+msgid ""
+"value of field `int_curr_symbol' in category `LC_MONETARY' has wrong length"
+msgstr ""
+"värdet på fältet \"int_curr_symbol\" i kategorin LC_MONETARY har fel längd"
+
+#: locale/programs/ld-monetary.c:370 locale/programs/ld-numeric.c:199
+#, c-format
+msgid "values for field `%s' in category `%s' must be smaller than 127"
+msgstr "värden på fält \"%s\" i kategorin \"%s\" måste vara mindre än 127"
+
+#: locale/programs/ld-monetary.c:366
+#, c-format
+msgid "values for field `%s' in category `%s' must not be zero"
+msgstr "värden på fält \"%s\" i kategorin \"%s\" får inte vara noll"
+
+#: login/utmp_file.c:84
+msgid "while opening UTMP file"
+msgstr "när UTMP-filen öppnades"
+
+#: catgets/gencat.c:988
+msgid "while opening old catalog file"
+msgstr "när gammal katalogfil öppnades"
+
+#: db/makedb.c:353
+msgid "while reading database"
+msgstr "när databasen lästes"
+
+#: db/makedb.c:315
+msgid "while writing data base file"
+msgstr "när databasen skrevs"
+
+#: db/makedb.c:142
+msgid "wrong number of arguments"
+msgstr "fel antal argument"
+
+#: time/zic.c:1077
+msgid "wrong number of fields on Leap line"
+msgstr "fel antal fält på \"Leap\"-rad"
+
+#: time/zic.c:1168
+msgid "wrong number of fields on Link line"
+msgstr "fel antal fält på \"Link\"-rad"
+
+#: time/zic.c:911
+msgid "wrong number of fields on Rule line"
+msgstr "fel antal fält på \"Rule\"-rad"
+
+#: time/zic.c:981
+msgid "wrong number of fields on Zone continuation line"
+msgstr "fel antal fält på \"Zone\"-fortsättningsrad"
+
+#: time/zic.c:939
+msgid "wrong number of fields on Zone line"
+msgstr "fel antal fält på \"Zone\"-rad"
+
+#: nis/ypclnt.c:570
+msgid "yp_all: clnttcp_create failed"
+msgstr "yp_all: clnttcp_create misslyckades"
+
+#: nis/ypclnt.c:772
+msgid "yp_update: cannot convert host to netname\n"
+msgstr "yp_update: kan inte omvandla värd till nätnamn\n"
+
+#: nis/ypclnt.c:784
+msgid "yp_update: cannot get server address\n"
+msgstr "yp_update: kan inte hämta betjäntadress\n"
diff --git a/resolv/Makefile b/resolv/Makefile
index a70ee99d08..4590f267e8 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -33,6 +33,7 @@ libresolv-routines := gethnamaddr res_comp res_debug	\
 		      res_data res_mkquery res_query res_send		\
 		      inet_net_ntop inet_net_pton inet_neta base64
 
+subdirs-dirs = nss_dns
 vpath %.c nss_dns
 
 libnss_dns-routines	:= dns-host dns-network
diff --git a/socket/sys/un.h b/socket/sys/un.h
index 02fc775acb..331f49650f 100644
--- a/socket/sys/un.h
+++ b/socket/sys/un.h
@@ -37,7 +37,7 @@ struct sockaddr_un
 
 
 /* Evaluate to actual length of the `sockaddr_un' structure.  */
-#define SUN_LEN(ptr) (((struct sockaddr_un *) 0)->sun_path		      \
+#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path)	      \
 		      + strlen ((ptr)->sun_path))
 
 __END_DECLS
diff --git a/stdio/Makefile b/stdio/Makefile
index 9c69e52335..cabb4aa9da 100644
--- a/stdio/Makefile
+++ b/stdio/Makefile
@@ -12,9 +12,9 @@
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
+# License along with the GNU C Library; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 #
 #	Specific makefile for stdio.
@@ -34,7 +34,7 @@ routines	:=							      \
 	fputc putc putchar						      \
 	fgets gets fputs puts						      \
 	getdelim							      \
-	fclose fflush							      \
+	fclose fcloseall fflush						      \
 	vdprintf vsnprintf vsprintf vasprintf vsscanf vscanf		      \
 	memstream obstream linewrap					      \
 	internals sysd-stdio pipestream stdio_init libc_fatal
diff --git a/stdio/fclose.c b/stdio/fclose.c
index b8abe65655..4fda20b4ac 100644
--- a/stdio/fclose.c
+++ b/stdio/fclose.c
@@ -26,21 +26,11 @@
 /* Close a stream.  */
 int
 fclose (stream)
-     register FILE *stream;
+     FILE *stream;
 {
   int status;
 
-  if (stream == NULL)
-    {
-      /* Close all streams.  */
-      register FILE *f;
-      for (f = __stdio_head; f != NULL; f = f->__next)
-	if (__validfp(f))
-	  (void) fclose(f);
-      return 0;
-    }
-
-  if (!__validfp(stream))
+  if (!__validfp (stream))
     {
       __set_errno (EINVAL);
       return EOF;
@@ -53,18 +43,18 @@ fclose (stream)
 
   /* Free the buffer's storage.  */
   if (stream->__buffer != NULL && !stream->__userbuf)
-    free(stream->__buffer);
+    free (stream->__buffer);
 
   /* Close the system file descriptor.  */
   if (stream->__io_funcs.__close != NULL)
-    status = (*stream->__io_funcs.__close)(stream->__cookie);
+    status = (*stream->__io_funcs.__close) (stream->__cookie);
   else if (!stream->__seen && stream->__cookie != NULL)
-    status = __stdio_close(stream->__cookie);
+    status = __stdio_close (stream->__cookie);
   else
     status = 0;
 
   /* Nuke the stream, making it available for re-use.  */
-  __invalidate(stream);
+  __invalidate (stream);
 
   return status < 0 ? EOF : 0;
 }
diff --git a/stdio/fcloseall.c b/stdio/fcloseall.c
new file mode 100644
index 0000000000..e7c632d24a
--- /dev/null
+++ b/stdio/fcloseall.c
@@ -0,0 +1,37 @@
+/* Copyright (C) 1991, 1995, 1996 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+
+/* Close a stream.  */
+int
+__fcloseall ()
+{
+  /* Close all streams.  */
+  register FILE *f;
+  for (f = __stdio_head; f != NULL; f = f->__next)
+    if (__validfp(f))
+      (void) fclose(f);
+  return 0;
+}
+weak_alias (__fcloseall, fcloseall)
diff --git a/stdio/stdio.h b/stdio/stdio.h
index 8e913ccbd9..bd2ffa8eb5 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -324,11 +324,17 @@ extern char *tempnam __P ((__const char *__dir, __const char *__pfx));
 extern int __flshfp __P ((FILE *__stream, int __c));
 
 
-/* Close STREAM, or all streams if STREAM is NULL.  */
+/* Close STREAM.  */
 extern int fclose __P ((FILE *__stream));
 /* Flush STREAM, or all streams if STREAM is NULL.  */
 extern int fflush __P ((FILE *__stream));
 
+#ifdef __USE_GNU
+/* Close all streams.  */
+extern int __fcloseall __P ((void));
+extern int fcloseall __P ((void));
+#endif
+
 
 /* Open a file and create a new stream for it.  */
 extern FILE *fopen __P ((__const char *__filename, __const char *__modes));
diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
index f0e6686d65..bb631b4d52 100644
--- a/sunrpc/auth_unix.c
+++ b/sunrpc/auth_unix.c
@@ -92,10 +92,10 @@ static bool_t marshal_new_auth();
 AUTH *
 authunix_create(machname, uid, gid, len, aup_gids)
 	char *machname;
-	int uid;
-	int gid;
+	uid_t uid;
+	gid_t gid;
 	register int len;
-	int *aup_gids;
+	gid_t *aup_gids;
 {
 	struct authunix_parms aup;
 	char mymem[MAX_AUTH_BYTES];
@@ -172,8 +172,8 @@ authunix_create_default()
 {
 	register int len;
 	char machname[MAX_MACHINE_NAME + 1];
-	register int uid;
-	register int gid;
+	register uid_t uid;
+	register gid_t gid;
 	int max_nr_groups = sysconf (_SC_NGROUPS_MAX);
 	gid_t gids[max_nr_groups];
 
@@ -260,7 +260,7 @@ authunix_refresh(auth)
 
 	/* first deserialize the creds back into a struct authunix_parms */
 	aup.aup_machname = NULL;
-	aup.aup_gids = (int *)NULL;
+	aup.aup_gids = (gid_t *)NULL;
 	xdrmem_create(&xdrs, au->au_origcred.oa_base,
 	    au->au_origcred.oa_length, XDR_DECODE);
 	stat = xdr_authunix_parms(&xdrs, &aup);
diff --git a/sunrpc/rpc/auth.h b/sunrpc/rpc/auth.h
index 39aa0f7bcb..fff60baccd 100644
--- a/sunrpc/rpc/auth.h
+++ b/sunrpc/rpc/auth.h
@@ -155,8 +155,9 @@ extern struct opaque_auth _null_auth;
  *	int len;
  *	int *aup_gids;
  */
-extern AUTH *authunix_create __P ((char *__machname, int __uid, int __gid,
-				   int __len, int *__aup_gids));
+extern AUTH *authunix_create __P ((char *__machname, __uid_t __uid,
+				   __gid_t __gid, int __len,
+				   __gid_t *__aup_gids));
 extern AUTH *authunix_create_default __P ((void));
 extern AUTH *authnone_create __P ((void));
 extern AUTH *authdes_create();
diff --git a/sunrpc/rpc/auth_unix.h b/sunrpc/rpc/auth_unix.h
index 3fb711894e..32d8d0aa35 100644
--- a/sunrpc/rpc/auth_unix.h
+++ b/sunrpc/rpc/auth_unix.h
@@ -58,14 +58,15 @@ __BEGIN_DECLS
 /*
  * Unix style credentials.
  */
-struct authunix_parms {
-	u_long	 aup_time;
-	char	*aup_machname;
-	int	 aup_uid;
-	int	 aup_gid;
-	u_int	 aup_len;
-	int	*aup_gids;
-};
+struct authunix_parms
+  {
+    u_long aup_time;
+    char *aup_machname;
+    __uid_t aup_uid;
+    __gid_t aup_gid;
+    u_int aup_len;
+    __gid_t *aup_gids;
+  };
 
 extern bool_t xdr_authunix_parms __P ((XDR *__xdrs,
 				       struct authunix_parms *__p));
@@ -75,9 +76,10 @@ extern bool_t xdr_authunix_parms __P ((XDR *__xdrs,
  * then the body of the response verifier encapsulates the following structure;
  * again it is serialized in the obvious fashion.
  */
-struct short_hand_verf {
-	struct opaque_auth new_cred;
-};
+struct short_hand_verf
+  {
+    struct opaque_auth new_cred;
+  };
 
 __END_DECLS
 
diff --git a/sysdeps/generic/abort.c b/sysdeps/generic/abort.c
index 604eadc4f5..366a543791 100644
--- a/sysdeps/generic/abort.c
+++ b/sysdeps/generic/abort.c
@@ -90,7 +90,7 @@ abort (void)
   if (stage == 4)
     {
       ++stage;
-      fclose (NULL);
+      __fcloseall ();
     }
 
   /* Try again.  */
diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/utmpbits.h
index 9fcc77de6b..de4a830bcc 100644
--- a/sysdeps/gnu/utmpbits.h
+++ b/sysdeps/gnu/utmpbits.h
@@ -96,7 +96,7 @@ struct utmp
   long ut_session;		/* Session ID, used for windowing.  */
   struct timeval ut_tv;		/* Time entry was made.  */
   int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char pad[18];			/* Reserved for future use.  */
+  char pad[20];			/* Reserved for future use.  */
 };
 
 /* Backwards compatibility hacks.  */
diff --git a/sysdeps/ieee754/Makefile b/sysdeps/ieee754/Makefile
new file mode 100644
index 0000000000..3796e728aa
--- /dev/null
+++ b/sysdeps/ieee754/Makefile
@@ -0,0 +1,3 @@
+ifeq ($(subdir),math)
+sysdep_headers += ieee754.h
+endif
diff --git a/sysdeps/ieee754/ieee754.h b/sysdeps/ieee754/ieee754.h
index 9e6efe4973..ba40cc7683 100644
--- a/sysdeps/ieee754/ieee754.h
+++ b/sysdeps/ieee754/ieee754.h
@@ -16,8 +16,15 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _IEEE754_H
+
+#define _IEEE754_H 1
+#include <features.h>
+
 #include <endian.h>
 
+__BEGIN_DECLS
+
 union ieee754_float
   {
     float f;
@@ -153,3 +160,7 @@ union ieee854_long_double
   };
 
 #define IEEE854_LONG_DOUBLE_BIAS 0x3fff
+
+__END_DECLS
+
+#endif /* ieee754.h */
diff --git a/sysdeps/libm-i387/e_exp.S b/sysdeps/libm-i387/e_exp.S
index 4505ebd309..3c9d45b746 100644
--- a/sysdeps/libm-i387/e_exp.S
+++ b/sysdeps/libm-i387/e_exp.S
@@ -5,7 +5,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: e_exp.S,v 1.4 1995/05/08 23:47:04 jtc Exp $")
+RCSID("$NetBSD: e_exp.S,v 1.7 1996/07/03 17:31:28 jtc Exp $")
 
 /* e^x = 2^(x * log2(e)) */
 ENTRY(__ieee754_exp)
@@ -16,16 +16,16 @@ ENTRY(__ieee754_exp)
    -- drepper@cygnus.com.  */
 	fxam				/* Is NaN or +-Inf?  */
 	fstsw	%ax
-	sahf
-	jnc	.LnoInfNaN		/* No, jump.   */
-	jp	.LisInf			/* Is +-Inf, jump.  */
-.LnoInfNaN:
+	movb	$0x45, %dh
+	andb	%ah, %dh
+	cmpb	$0x05, %dh
+	je	1f			/* Is +-Inf, jump.  */
 	fldl2e
 	fmulp				/* x * log2(e) */
 	fstl	%st(1)
 	frndint				/* int(x * log2(e)) */
-	fstl	%st(2)
-	fsubrp				/* fract(x * log2(e)) */
+	fsub	%st,%st(1)		/* fract(x * log2(e)) */
+	fxch
 	f2xm1				/* 2^(fract(x * log2(e))) - 1 */
 	fld1
 	faddp				/* 2^(fract(x * log2(e))) */
@@ -33,9 +33,8 @@ ENTRY(__ieee754_exp)
 	fstp	%st(1)
 	ret
 
-.LisInf:
-	andb	$2, %ah			/* Test sign.  */
-	jz	.LpInf			/* If positive, jump.  */
+1:	testl	$0x200, %eax		/* Test sign.  */
+	jz	2f			/* If positive, jump.  */
 	fldz				/* Set result to 0.  */
-.LpInf:	ret
+2:	ret
 END (__ieee754_exp)
diff --git a/sysdeps/libm-i387/e_expf.S b/sysdeps/libm-i387/e_expf.S
index c8233eba50..cd8dc7f0b9 100644
--- a/sysdeps/libm-i387/e_expf.S
+++ b/sysdeps/libm-i387/e_expf.S
@@ -17,16 +17,16 @@ ENTRY(__ieee754_expf)
    -- drepper@cygnus.com.  */
 	fxam				/* Is NaN or +-Inf?  */
 	fstsw	%ax
-	sahf
-	jnc	.LnoInfNaN		/* No, jump.   */
-	jp	.LisInf			/* Is +-Inf, jump.  */
-.LnoInfNaN:
+	movb	$0x45, %dh
+	andb	%ah, %dh
+	cmpb	$0x05, %dh
+	je	1f			/* Is +-Inf, jump.  */
 	fldl2e
 	fmulp				/* x * log2(e) */
 	fstl	%st(1)
 	frndint				/* int(x * log2(e)) */
-	fstl	%st(2)
-	fsubrp				/* fract(x * log2(e)) */
+	fsub	%st,%st(1)		/* fract(x * log2(e)) */
+	fxch
 	f2xm1				/* 2^(fract(x * log2(e))) - 1 */
 	fld1
 	faddp				/* 2^(fract(x * log2(e))) */
@@ -34,9 +34,8 @@ ENTRY(__ieee754_expf)
 	fstp	%st(1)
 	ret
 
-.LisInf:
-	andb	$2, %ah			/* Test sign.  */
-	jz	.LpInf			/* If positive, jump.  */
+1:	testl	$0x200, %eax		/* Test sign.  */
+	jz	2f			/* If positive, jump.  */
 	fldz				/* Set result to 0.  */
-.LpInf:	ret
+2:	ret
 END (__ieee754_expf)
diff --git a/sysdeps/libm-i387/e_expl.S b/sysdeps/libm-i387/e_expl.S
index 9103a923aa..e398a90ef6 100644
--- a/sysdeps/libm-i387/e_expl.S
+++ b/sysdeps/libm-i387/e_expl.S
@@ -18,16 +18,16 @@ ENTRY(__ieee754_expl)
    -- drepper@cygnus.com.  */
 	fxam				/* Is NaN or +-Inf?  */
 	fstsw	%ax
-	sahf
-	jnc	.LnoInfNaN		/* No, jump.   */
-	jp	.LisInf			/* Is +-Inf, jump.  */
-.LnoInfNaN:
+	movb	$0x45, %dh
+	andb	%ah, %dh
+	cmpb	$0x05, %dh
+	je	1f			/* Is +-Inf, jump.  */
 	fldl2e
 	fmulp				/* x * log2(e) */
 	fstl	%st(1)
 	frndint				/* int(x * log2(e)) */
-	fstl	%st(2)
-	fsubrp				/* fract(x * log2(e)) */
+	fsub	%st,%st(1)		/* fract(x * log2(e)) */
+	fxch
 	f2xm1				/* 2^(fract(x * log2(e))) - 1 */
 	fld1
 	faddp				/* 2^(fract(x * log2(e))) */
@@ -35,9 +35,8 @@ ENTRY(__ieee754_expl)
 	fstp	%st(1)
 	ret
 
-.LisInf:
-	andb	$2, %ah			/* Test sign.  */
-	jz	.LpInf			/* If positive, jump.  */
+1:	testl	$0x200, %eax		/* Test sign.  */
+	jz	2f			/* If positive, jump.  */
 	fldz				/* Set result to 0.  */
-.LpInf:	ret
+2:	ret
 END (__ieee754_expl)
diff --git a/sysdeps/libm-i387/e_log.S b/sysdeps/libm-i387/e_log.S
index 43d430332c..e7f567d950 100644
--- a/sysdeps/libm-i387/e_log.S
+++ b/sysdeps/libm-i387/e_log.S
@@ -53,7 +53,7 @@ ENTRY(__ieee754_log)
 	fyl2xp1			// log(x)
 	ret
 
-2:	fincstp			// x : log(2)
+2:	fstp	%st(0)		// x : log(2)
 	fyl2x			// log(x)
 	ret
 END (__ieee754_log)
diff --git a/sysdeps/libm-i387/e_log10.S b/sysdeps/libm-i387/e_log10.S
index 95efc8f7a2..ecb691b905 100644
--- a/sysdeps/libm-i387/e_log10.S
+++ b/sysdeps/libm-i387/e_log10.S
@@ -53,7 +53,7 @@ ENTRY(__ieee754_log10)
 	fyl2xp1			// log10(x)
 	ret
 
-2:	fincstp			// x : log10(2)
+2:	fstp	%st(0)		// x : log10(2)
 	fyl2x			// log10(x)
 	ret
 END (__ieee754_log10)
diff --git a/sysdeps/libm-i387/e_log10f.S b/sysdeps/libm-i387/e_log10f.S
index bddb5011bc..aac58d0293 100644
--- a/sysdeps/libm-i387/e_log10f.S
+++ b/sysdeps/libm-i387/e_log10f.S
@@ -54,7 +54,7 @@ ENTRY(__ieee754_log10f)
 	fyl2xp1			// log10(x)
 	ret
 
-2:	fincstp			// x : log10(2)
+2:	fstp	%st(0)		// x : log10(2)
 	fyl2x			// log10(x)
 	ret
 END (__ieee754_log10f)
diff --git a/sysdeps/libm-i387/e_log10l.S b/sysdeps/libm-i387/e_log10l.S
index f0b8f325a7..4f51818bdd 100644
--- a/sysdeps/libm-i387/e_log10l.S
+++ b/sysdeps/libm-i387/e_log10l.S
@@ -55,7 +55,7 @@ ENTRY(__ieee754_log10l)
 	fyl2xp1			// log10(x)
 	ret
 
-2:	fincstp			// x : log10(2)
+2:	fstp	%st(0)		// x : log10(2)
 	fyl2x			// log10(x)
 	ret
 END(__ieee754_log10l)
diff --git a/sysdeps/libm-i387/e_logf.S b/sysdeps/libm-i387/e_logf.S
index b79f478cdf..4459b7fc08 100644
--- a/sysdeps/libm-i387/e_logf.S
+++ b/sysdeps/libm-i387/e_logf.S
@@ -54,7 +54,7 @@ ENTRY(__ieee754_logf)
 	fyl2xp1			// log(x)
 	ret
 
-2:	fincstp			// x : log(2)
+2:	fstp	%st(0)		// x : log(2)
 	fyl2x			// log(x)
 	ret
 END (__ieee754_logf)
diff --git a/sysdeps/libm-i387/e_logl.S b/sysdeps/libm-i387/e_logl.S
index 1657dfd5fb..08447a27e7 100644
--- a/sysdeps/libm-i387/e_logl.S
+++ b/sysdeps/libm-i387/e_logl.S
@@ -54,7 +54,7 @@ ENTRY(__ieee754_logl)
 	fyl2xp1			// log(x)
 	ret
 
-2:	fincstp			// x : log(2)
+2:	fstp	%st(0)		// x : log(2)
 	fyl2x			// log(x)
 	ret
 END (__ieee754_logl)
diff --git a/sysdeps/libm-i387/e_pow.S b/sysdeps/libm-i387/e_pow.S
new file mode 100644
index 0000000000..f6c7562d9c
--- /dev/null
+++ b/sysdeps/libm-i387/e_pow.S
@@ -0,0 +1,120 @@
+/* ix87 specific implementation of pow function.
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <machine/asm.h>
+
+#ifdef __ELF__
+	.section .rodata
+#else
+	.text
+#endif
+
+	.align ALIGNARG(4)
+	ASM_TYPE_DIRECTIVE(one,@object)
+one:	.double 1.0
+	ASM_SIZE_DIRECTIVE(one)
+	ASM_TYPE_DIRECTIVE(limit,@object)
+limit:	.double 0.29
+	ASM_SIZE_DIRECTIVE(limit)
+
+#ifdef PIC
+#define MO(op) op##@GOTOFF(%ecx)
+#else
+#define MO(op) op
+#endif
+
+	.text
+ENTRY(__ieee754_pow)
+	fldl	4(%esp)		// x
+	fldl	12(%esp)	// y : x
+
+#ifdef	PIC
+	call	1f
+1:	popl	%ecx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx
+#endif
+	subl	$8,%esp
+
+	/* First see whether `y' is a natural number.  In this case we
+	   can use a more precise algorithm.  */
+	fld	%st		// y : y : x
+	fistpll	(%esp)		// y : x
+	fildll	(%esp)		// int(y) : y : x
+	fucomp	%st(1)		// y : x
+	fnstsw
+	sahf
+	jne	2f
+
+	/* OK, we have an integer value for y.  */
+	ftst			// y : x
+	fstp	%st(0)		// x
+	fnstsw
+	sahf
+	popl	%eax
+	popl	%edx
+	jnc	4f		// y >= 0, jump
+	fdivrl	MO(one)		// 1/x		(now referred to as x)
+	negl	%eax
+	adcl	$0, %edx
+	negl	%edx
+4:	fldl	MO(one)		// 1 : x
+	fxch
+
+6:	shrdl	$1, %edx, %eax
+	jnc	5f
+	fxch
+	fmul	%st(1)		// x : ST*x
+	fxch
+5:	fmul	%st(0), %st	// x*x : ST*x
+	movl	%eax, %ecx
+	orl	%edx, %ecx
+	jnz	6b
+	fstp	%st(0)		// ST*x
+	ret
+
+	.align ALIGNARG(4)
+2:	/* y is a real number.  */
+	fxch			// x : y
+	fldl	MO(one)		// 1.0 : x : y
+	fld	%st(1)		// x : 1.0 : x : y
+	fsub	%st(1)		// x-1 : 1.0 : x : y
+	fabs			// |x-1| : 1.0 : x : y
+	fcompl	MO(limit)	// 1.0 : x : y
+	fnstsw
+	fxch			// x : 1.0 : y
+	sahf
+	ja	7f
+	fsub	%st(1)		// x-1 : 1.0 : y
+	fyl2xp1			// log2(x) : y
+	jmp	8f
+
+7:	fyl2x			// log2(x) : y
+8:	fmul	%st(1)		// y*log2(x) : y
+	fst	%st(1)		// y*log2(x) : y*log2(x)
+	frndint			// int(y*log2(x)) : y*log2(x)
+	fsubr	%st, %st(1)	// int(y*log2(x)) : fract(y*log2(x))
+	fxch			// fract(y*log2(x)) : int(y*log2(x))
+	f2xm1			// 2^fract(y*log2(x))-1 : int(y*log2(x))
+	faddl	MO(one)		// 2^fract(y*log2(x)) : int(y*log2(x))
+	fscale			// 2^fract(y*log2(x))*2^int(y*log2(x)) : int(y*log2(x))
+	addl	$8, %esp
+	fstp	%st(1)		// 2^fract(y*log2(x))*2^int(y*log2(x))
+	ret
+END(__ieee754_pow)
diff --git a/sysdeps/libm-i387/e_powf.S b/sysdeps/libm-i387/e_powf.S
new file mode 100644
index 0000000000..9d6bc510b6
--- /dev/null
+++ b/sysdeps/libm-i387/e_powf.S
@@ -0,0 +1,120 @@
+/* ix87 specific implementation of pow function.
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <machine/asm.h>
+
+#ifdef __ELF__
+	.section .rodata
+#else
+	.text
+#endif
+
+	.align ALIGNARG(4)
+	ASM_TYPE_DIRECTIVE(one,@object)
+one:	.double 1.0
+	ASM_SIZE_DIRECTIVE(one)
+	ASM_TYPE_DIRECTIVE(limit,@object)
+limit:	.double 0.29
+	ASM_SIZE_DIRECTIVE(limit)
+
+#ifdef PIC
+#define MO(op) op##@GOTOFF(%ecx)
+#else
+#define MO(op) op
+#endif
+
+	.text
+ENTRY(__ieee754_powf)
+	flds	4(%esp)		// x
+	flds	8(%esp)		// y : x
+
+#ifdef	PIC
+	call	1f
+1:	popl	%ecx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx
+#endif
+	subl	$8,%esp
+
+	/* First see whether `y' is a natural number.  In this case we
+	   can use a more precise algorithm.  */
+	fld	%st		// y : y : x
+	fistpll	(%esp)		// y : x
+	fildll	(%esp)		// int(y) : y : x
+	fucomp	%st(1)		// y : x
+	fnstsw
+	sahf
+	jne	2f
+
+	/* OK, we have an integer value for y.  */
+	ftst			// y : x
+	fstp	%st(0)		// x
+	fnstsw
+	sahf
+	popl	%eax
+	popl	%edx
+	jnc	4f		// y >= 0, jump
+	fdivrl	MO(one)		// 1/x		(now referred to as x)
+	negl	%eax
+	adcl	$0, %edx
+	negl	%edx
+4:	fldl	MO(one)		// 1 : x
+	fxch
+
+6:	shrdl	$1, %edx, %eax
+	jnc	5f
+	fxch
+	fmul	%st(1)		// x : ST*x
+	fxch
+5:	fmul	%st(0), %st	// x*x : ST*x
+	movl	%eax, %ecx
+	orl	%edx, %ecx
+	jnz	6b
+	fstp	%st(0)		// ST*x
+	ret
+
+	.align ALIGNARG(4)
+2:	/* y is a real number.  */
+	fxch			// x : y
+	fldl	MO(one)		// 1.0 : x : y
+	fld	%st(1)		// x : 1.0 : x : y
+	fsub	%st(1)		// x-1 : 1.0 : x : y
+	fabs			// |x-1| : 1.0 : x : y
+	fcompl	MO(limit)	// 1.0 : x : y
+	fnstsw
+	fxch			// x : 1.0 : y
+	sahf
+	ja	7f
+	fsub	%st(1)		// x-1 : 1.0 : y
+	fyl2xp1			// log2(x) : y
+	jmp	8f
+
+7:	fyl2x			// log2(x) : y
+8:	fmul	%st(1)		// y*log2(x) : y
+	fst	%st(1)		// y*log2(x) : y*log2(x)
+	frndint			// int(y*log2(x)) : y*log2(x)
+	fsubr	%st, %st(1)	// int(y*log2(x)) : fract(y*log2(x))
+	fxch			// fract(y*log2(x)) : int(y*log2(x))
+	f2xm1			// 2^fract(y*log2(x))-1 : int(y*log2(x))
+	faddl	MO(one)		// 2^fract(y*log2(x)) : int(y*log2(x))
+	fscale			// 2^fract(y*log2(x))*2^int(y*log2(x)) : int(y*log2(x))
+	addl	$8, %esp
+	fstp	%st(1)		// 2^fract(y*log2(x))*2^int(y*log2(x))
+	ret
+END(__ieee754_powf)
diff --git a/sysdeps/libm-i387/e_powl.S b/sysdeps/libm-i387/e_powl.S
new file mode 100644
index 0000000000..ea445804f0
--- /dev/null
+++ b/sysdeps/libm-i387/e_powl.S
@@ -0,0 +1,120 @@
+/* ix87 specific implementation of pow function.
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <machine/asm.h>
+
+#ifdef __ELF__
+	.section .rodata
+#else
+	.text
+#endif
+
+	.align ALIGNARG(4)
+	ASM_TYPE_DIRECTIVE(one,@object)
+one:	.double 1.0
+	ASM_SIZE_DIRECTIVE(one)
+	ASM_TYPE_DIRECTIVE(limit,@object)
+limit:	.double 0.29
+	ASM_SIZE_DIRECTIVE(limit)
+
+#ifdef PIC
+#define MO(op) op##@GOTOFF(%ecx)
+#else
+#define MO(op) op
+#endif
+
+	.text
+ENTRY(__ieee754_powl)
+	fldt	4(%esp)		// x
+	fldt	16(%esp)	// y : x
+
+#ifdef	PIC
+	call	1f
+1:	popl	%ecx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx
+#endif
+	subl	$8,%esp
+
+	/* First see whether `y' is a natural number.  In this case we
+	   can use a more precise algorithm.  */
+	fld	%st		// y : y : x
+	fistpll	(%esp)		// y : x
+	fildll	(%esp)		// int(y) : y : x
+	fucomp	%st(1)		// y : x
+	fnstsw
+	sahf
+	jne	2f
+
+	/* OK, we have an integer value for y.  */
+	ftst			// y : x
+	fstp	%st(0)		// x
+	fnstsw
+	sahf
+	popl	%eax
+	popl	%edx
+	jnc	4f		// y >= 0, jump
+	fdivrl	MO(one)		// 1/x		(now referred to as x)
+	negl	%eax
+	adcl	$0, %edx
+	negl	%edx
+4:	fldl	MO(one)		// 1 : x
+	fxch
+
+6:	shrdl	$1, %edx, %eax
+	jnc	5f
+	fxch
+	fmul	%st(1)		// x : ST*x
+	fxch
+5:	fmul	%st(0), %st	// x*x : ST*x
+	movl	%eax, %ecx
+	orl	%edx, %ecx
+	jnz	6b
+	fstp	%st(0)		// ST*x
+	ret
+
+	.align ALIGNARG(4)
+2:	/* y is a real number.  */
+	fxch			// x : y
+	fldl	MO(one)		// 1.0 : x : y
+	fld	%st(1)		// x : 1.0 : x : y
+	fsub	%st(1)		// x-1 : 1.0 : x : y
+	fabs			// |x-1| : 1.0 : x : y
+	fcompl	MO(limit)	// 1.0 : x : y
+	fnstsw
+	fxch			// x : 1.0 : y
+	sahf
+	ja	7f
+	fsub	%st(1)		// x-1 : 1.0 : y
+	fyl2xp1			// log2(x) : y
+	jmp	8f
+
+7:	fyl2x			// log2(x) : y
+8:	fmul	%st(1)		// y*log2(x) : y
+	fst	%st(1)		// y*log2(x) : y*log2(x)
+	frndint			// int(y*log2(x)) : y*log2(x)
+	fsubr	%st, %st(1)	// int(y*log2(x)) : fract(y*log2(x))
+	fxch			// fract(y*log2(x)) : int(y*log2(x))
+	f2xm1			// 2^fract(y*log2(x))-1 : int(y*log2(x))
+	faddl	MO(one)		// 2^fract(y*log2(x)) : int(y*log2(x))
+	fscale			// 2^fract(y*log2(x))*2^int(y*log2(x)) : int(y*log2(x))
+	addl	$8, %esp
+	fstp	%st(1)		// 2^fract(y*log2(x))*2^int(y*log2(x))
+	ret
+END(__ieee754_powl)
diff --git a/sysdeps/libm-i387/s_asinh.S b/sysdeps/libm-i387/s_asinh.S
index 9b58eaa424..a71d0b66f4 100644
--- a/sysdeps/libm-i387/s_asinh.S
+++ b/sysdeps/libm-i387/s_asinh.S
@@ -101,7 +101,7 @@ ENTRY(__asinh)
 	fchs				// x
 4:	fld	%st			// x : x
 	faddl	MO(huge)		// huge+x : x
-	fincstp				// x
+	fstp	%st(0)			// x
 	ret
 
 	// |x| > 2^28 => y = sign(x) * (log(|x|) + log(2))
diff --git a/sysdeps/libm-i387/s_asinhf.S b/sysdeps/libm-i387/s_asinhf.S
index d0a99a9461..f47bc9e0ac 100644
--- a/sysdeps/libm-i387/s_asinhf.S
+++ b/sysdeps/libm-i387/s_asinhf.S
@@ -101,7 +101,7 @@ ENTRY(__asinhf)
 	fchs				// x
 4:	fld	%st			// x : x
 	faddl	MO(huge)		// huge+x : x
-	fincstp				// x
+	fstp	%st(0)			// x
 	ret
 
 	// |x| > 2^14 => y = sign(x) * (log(|x|) + log(2))
diff --git a/sysdeps/libm-i387/s_asinhl.S b/sysdeps/libm-i387/s_asinhl.S
index 28f76c2649..e112244908 100644
--- a/sysdeps/libm-i387/s_asinhl.S
+++ b/sysdeps/libm-i387/s_asinhl.S
@@ -109,7 +109,7 @@ ENTRY(__asinhl)
 4:	fld	%st			// x : x
 	fldt	MO(huge)		// huge : x : x
 	faddp				// huge+x : x
-	fincstp				// x
+	fstp	%st(0)			// x
 	ret
 
 	// |x| > 2^34 => y = sign(x) * (log(|x|) + log(2))
diff --git a/sysdeps/libm-i387/s_ceil.S b/sysdeps/libm-i387/s_ceil.S
index 309fe882f8..b0159128aa 100644
--- a/sysdeps/libm-i387/s_ceil.S
+++ b/sysdeps/libm-i387/s_ceil.S
@@ -8,27 +8,25 @@
 RCSID("$NetBSD: s_ceil.S,v 1.4 1995/05/08 23:52:13 jtc Exp $")
 
 ENTRY(__ceil)
-	pushl	%ebp
-	movl	%esp,%ebp
+	fldl	4(%esp)
 	subl	$8,%esp
 
-	fstcw	-4(%ebp)		/* store fpu control word */
+	fstcw	4(%esp)			/* store fpu control word */
 
 	/* We use here %edx although only the low 1 bits are defined.
 	   But none of the operations should care and they are faster
 	   than the 16 bit operations.  */
-	movl	-4(%ebp),%edx
-	orl	$0x0800,%edx		/* round towards +oo */
+	movl	$0x0800,%edx		/* round towards +oo */
+	orl	4(%esp),%edx
 	andl	$0xfbff,%edx
-	movl	%edx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modified control word */
+	movl	%edx,(%esp)
+	fldcw	(%esp)			/* load modified control word */
 
-	fldl	8(%ebp);		/* round */
-	frndint
+	frndint				/* round */
 
-	fldcw	-4(%ebp)		/* restore original control word */
+	fldcw	4(%esp)			/* restore original control word */
 
-	leave
+	addl	$8,%esp
 	ret
 END (__ceil)
 weak_alias (__ceil, ceil)
diff --git a/sysdeps/libm-i387/s_ceilf.S b/sysdeps/libm-i387/s_ceilf.S
index 768d117021..352d40d7ce 100644
--- a/sysdeps/libm-i387/s_ceilf.S
+++ b/sysdeps/libm-i387/s_ceilf.S
@@ -8,27 +8,25 @@
 RCSID("$NetBSD: s_ceilf.S,v 1.3 1995/05/08 23:52:44 jtc Exp $")
 
 ENTRY(__ceilf)
-	pushl	%ebp
-	movl	%esp,%ebp
+	flds	4(%esp)
 	subl	$8,%esp
 
-	fstcw	-4(%ebp)		/* store fpu control word */
+	fstcw	4(%esp)			/* store fpu control word */
 
 	/* We use here %edx although only the low 1 bits are defined.
 	   But none of the operations should care and they are faster
 	   than the 16 bit operations.  */
-	movl	-4(%ebp),%edx
-	orl	$0x0800,%edx		/* round towards +oo */
+	movl	$0x0800,%edx		/* round towards +oo */
+	orl	4(%esp),%edx
 	andl	$0xfbff,%edx
-	movl	%edx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modified control word */
+	movl	%edx,(%esp)
+	fldcw	(%esp)			/* load modified control word */
 
-	flds	8(%ebp);		/* round */
-	frndint
+	frndint				/* round */
 
-	fldcw	-4(%ebp)		/* restore original control word */
+	fldcw	4(%esp)			/* restore original control word */
 
-	leave
+	addl	$8,%esp
 	ret
 END (__ceilf)
 weak_alias (__ceilf, ceilf)
diff --git a/sysdeps/libm-i387/s_ceill.S b/sysdeps/libm-i387/s_ceill.S
index dcf8719af3..0128966ebe 100644
--- a/sysdeps/libm-i387/s_ceill.S
+++ b/sysdeps/libm-i387/s_ceill.S
@@ -9,27 +9,25 @@
 RCSID("$NetBSD: $")
 
 ENTRY(__ceill)
-	pushl	%ebp
-	movl	%esp,%ebp
+	fldt	4(%esp)
 	subl	$8,%esp
 
-	fstcw	-4(%ebp)		/* store fpu control word */
+	fstcw	4(%esp)			/* store fpu control word */
 
 	/* We use here %edx although only the low 1 bits are defined.
 	   But none of the operations should care and they are faster
 	   than the 16 bit operations.  */
-	movl	-4(%ebp),%edx
-	orl	$0x0800,%edx		/* round towards +oo */
+	movl	$0x0800,%edx		/* round towards +oo */
+	orl	4(%esp),%edx
 	andl	$0xfbff,%edx
-	movl	%edx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modified control word */
+	movl	%edx,(%esp)
+	fldcw	(%esp)			/* load modified control word */
 
-	fldt	8(%ebp);		/* round */
-	frndint
+	frndint				/* round */
 
-	fldcw	-4(%ebp)		/* restore original control word */
+	fldcw	4(%esp)			/* restore original control word */
 
-	leave
+	addl	$8,%esp
 	ret
 END (__ceill)
 weak_alias (__ceill, ceill)
diff --git a/sysdeps/libm-i387/s_expm1.S b/sysdeps/libm-i387/s_expm1.S
new file mode 100644
index 0000000000..2685d6e770
--- /dev/null
+++ b/sysdeps/libm-i387/s_expm1.S
@@ -0,0 +1,83 @@
+/* ix87 specific implementation of exp(x)-1.
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+	/* Using: e^x - 1 = 2^(x * log2(e)) - 1 */
+
+#include <machine/asm.h>
+
+#ifdef __ELF__
+	.section .rodata
+#else
+	.text
+#endif
+	.align ALIGNARG(4)
+	ASM_TYPE_DIRECTIVE(zero,@object)
+zero:	.double 0.0
+	ASM_SIZE_DIRECTIVE(zero)
+	ASM_TYPE_DIRECTIVE(one,@object)
+one:	.double 1.0
+	ASM_SIZE_DIRECTIVE(one)
+	ASM_TYPE_DIRECTIVE(l2e,@object)
+l2e:	.tfloat 1.442695040888963407359924681002
+	ASM_SIZE_DIRECTIVE(l2e)
+
+#ifdef PIC
+#define MO(op) op##@GOTOFF(%edx)
+#else
+#define MO(op) op
+#endif
+
+	.text
+ENTRY(__expm1)
+	fldl	4(%esp)		// x
+	fxam			// Is NaN or +-Inf?
+	fstsw	%ax
+#ifdef	PIC
+	call	1f
+1:	popl	%edx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %edx
+#endif
+	movb	$0x45, %ch
+	andb	%ah, %ch
+	cmpb	$0x05, %ch
+	je	2f		// Is +-Inf, jump.
+
+	fldt	MO(l2e)		// log2(e) : x
+	fmulp			// log2(e)*x
+	fld	%st		// log2(e)*x : log2(e)*x
+	frndint			// int(log2(e)*x) : log2(e)*x
+	fsub	%st, %st(1)	// int(log2(e)*x) : fract(log2(e)*x)
+	fxch			// fract(log2(e)*x) : int(log2(e)*x)
+	f2xm1			// 2^fract(log2(e)*x)-1 : int(log2(e)*x)
+	fscale			// 2^(log2(e)*x)-2^int(log2(e)*x) : int(log2(e)*x)
+	fxch			// int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	fldl	MO(one)		// 1 : int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	fscale			// 2^int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	faddp			// 2^(log2(e)*x)
+	fsubl	MO(one)
+	ret
+
+2:	testl	$0x200, %eax	// Test sign.
+	jz	3f		// If positive, jump.
+	fldl	MO(zero)	// Set result to 0.
+3:	ret
+END(__expm1)
+weak_alias (__expm1, expm1)
diff --git a/sysdeps/libm-i387/s_expm1f.S b/sysdeps/libm-i387/s_expm1f.S
new file mode 100644
index 0000000000..85c3c849f1
--- /dev/null
+++ b/sysdeps/libm-i387/s_expm1f.S
@@ -0,0 +1,83 @@
+/* ix87 specific implementation of exp(x)-1.
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+	/* Using: e^x - 1 = 2^(x * log2(e)) - 1 */
+
+#include <machine/asm.h>
+
+#ifdef __ELF__
+	.section .rodata
+#else
+	.text
+#endif
+	.align ALIGNARG(4)
+	ASM_TYPE_DIRECTIVE(zero,@object)
+zero:	.double 0.0
+	ASM_SIZE_DIRECTIVE(zero)
+	ASM_TYPE_DIRECTIVE(one,@object)
+one:	.double 1.0
+	ASM_SIZE_DIRECTIVE(one)
+	ASM_TYPE_DIRECTIVE(l2e,@object)
+l2e:	.tfloat 1.442695040888963407359924681002
+	ASM_SIZE_DIRECTIVE(l2e)
+
+#ifdef PIC
+#define MO(op) op##@GOTOFF(%edx)
+#else
+#define MO(op) op
+#endif
+
+	.text
+ENTRY(__expm1f)
+	flds	4(%esp)		// x
+	fxam			// Is NaN or +-Inf?
+	fstsw	%ax
+#ifdef	PIC
+	call	1f
+1:	popl	%edx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %edx
+#endif
+	movb	$0x45, %ch
+	andb	%ah, %ch
+	cmpb	$0x05, %ch
+	je	2f		// Is +-Inf, jump.
+
+	fldt	MO(l2e)		// log2(e) : x
+	fmulp			// log2(e)*x
+	fld	%st		// log2(e)*x : log2(e)*x
+	frndint			// int(log2(e)*x) : log2(e)*x
+	fsub	%st, %st(1)	// int(log2(e)*x) : fract(log2(e)*x)
+	fxch			// fract(log2(e)*x) : int(log2(e)*x)
+	f2xm1			// 2^fract(log2(e)*x)-1 : int(log2(e)*x)
+	fscale			// 2^(log2(e)*x)-2^int(log2(e)*x) : int(log2(e)*x)
+	fxch			// int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	fldl	MO(one)		// 1 : int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	fscale			// 2^int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	faddp			// 2^(log2(e)*x)
+	fsubl	MO(one)
+	ret
+
+2:	testl	$0x200, %eax	// Test sign.
+	jz	3f		// If positive, jump.
+	fldl	MO(zero)	// Set result to 0.
+3:	ret
+END(__expm1f)
+weak_alias (__expm1f, expm1f)
diff --git a/sysdeps/libm-i387/s_expm1l.S b/sysdeps/libm-i387/s_expm1l.S
new file mode 100644
index 0000000000..45aa753094
--- /dev/null
+++ b/sysdeps/libm-i387/s_expm1l.S
@@ -0,0 +1,83 @@
+/* ix87 specific implementation of exp(x)-1.
+   Copyright (C) 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+   Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+	/* Using: e^x - 1 = 2^(x * log2(e)) - 1 */
+
+#include <machine/asm.h>
+
+#ifdef __ELF__
+	.section .rodata
+#else
+	.text
+#endif
+	.align ALIGNARG(4)
+	ASM_TYPE_DIRECTIVE(zero,@object)
+zero:	.double 0.0
+	ASM_SIZE_DIRECTIVE(zero)
+	ASM_TYPE_DIRECTIVE(one,@object)
+one:	.double 1.0
+	ASM_SIZE_DIRECTIVE(one)
+	ASM_TYPE_DIRECTIVE(l2e,@object)
+l2e:	.tfloat 1.442695040888963407359924681002
+	ASM_SIZE_DIRECTIVE(l2e)
+
+#ifdef PIC
+#define MO(op) op##@GOTOFF(%edx)
+#else
+#define MO(op) op
+#endif
+
+	.text
+ENTRY(__expm1l)
+	fldt	4(%esp)		// x
+	fxam			// Is NaN or +-Inf?
+	fstsw	%ax
+#ifdef	PIC
+	call	1f
+1:	popl	%edx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %edx
+#endif
+	movb	$0x45, %ch
+	andb	%ah, %ch
+	cmpb	$0x05, %ch
+	je	2f		// Is +-Inf, jump.
+
+	fldt	MO(l2e)		// log2(e) : x
+	fmulp			// log2(e)*x
+	fld	%st		// log2(e)*x : log2(e)*x
+	frndint			// int(log2(e)*x) : log2(e)*x
+	fsub	%st, %st(1)	// int(log2(e)*x) : fract(log2(e)*x)
+	fxch			// fract(log2(e)*x) : int(log2(e)*x)
+	f2xm1			// 2^fract(log2(e)*x)-1 : int(log2(e)*x)
+	fscale			// 2^(log2(e)*x)-2^int(log2(e)*x) : int(log2(e)*x)
+	fxch			// int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	fldl	MO(one)		// 1 : int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	fscale			// 2^int(log2(e)*x) : 2^(log2(e)*x)-2^int(log2(e)*x)
+	faddp			// 2^(log2(e)*x)
+	fsubl	MO(one)
+	ret
+
+2:	testl	$0x200, %eax	// Test sign.
+	jz	3f		// If positive, jump.
+	fldl	MO(zero)	// Set result to 0.
+3:	ret
+END(__expm1l)
+weak_alias (__expm1l, expm1l)
diff --git a/sysdeps/libm-i387/s_floor.S b/sysdeps/libm-i387/s_floor.S
index 561f83d98a..20a8660424 100644
--- a/sysdeps/libm-i387/s_floor.S
+++ b/sysdeps/libm-i387/s_floor.S
@@ -8,23 +8,25 @@
 RCSID("$NetBSD: s_floor.S,v 1.4 1995/05/09 00:01:59 jtc Exp $")
 
 ENTRY(__floor)
-	pushl	%ebp
-	movl	%esp,%ebp
+	fldl	4(%esp)
 	subl	$8,%esp
 
-	fstcw	-4(%ebp)		/* store fpu control word */
-	movw	-4(%ebp),%dx
-	orw	$0x0400,%dx		/* round towards -oo */
-	andw	$0xf7ff,%dx
-	movw	%dx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modified control word */
+	fstcw	4(%esp)			/* store fpu control word */
 
-	fldl	8(%ebp);		/* round */
-	frndint
+	/* We use here %edx although only the low 1 bits are defined.
+	   But none of the operations should care and they are faster
+	   than the 16 bit operations.  */
+	movl	$0x400,%edx		/* round towards -oo */
+	orl	4(%esp),%edx
+	andl	$0xf7ff,%edx
+	movl	%edx,(%esp)
+	fldcw	(%esp)			/* load modified control word */
 
-	fldcw	-4(%ebp)		/* restore original control word */
+	frndint				/* round */
 
-	leave
+	fldcw	4(%esp)			/* restore original control word */
+
+	addl	$8,%esp
 	ret
 END (__floor)
 weak_alias (__floor, floor)
diff --git a/sysdeps/libm-i387/s_floorf.S b/sysdeps/libm-i387/s_floorf.S
index 059f4f3a15..eca93a2aa3 100644
--- a/sysdeps/libm-i387/s_floorf.S
+++ b/sysdeps/libm-i387/s_floorf.S
@@ -8,23 +8,25 @@
 RCSID("$NetBSD: s_floorf.S,v 1.3 1995/05/09 00:04:32 jtc Exp $")
 
 ENTRY(__floorf)
-	pushl	%ebp
-	movl	%esp,%ebp
+	flds	4(%esp)
 	subl	$8,%esp
 
-	fstcw	-4(%ebp)		/* store fpu control word */
-	movw	-4(%ebp),%dx
-	orw	$0x0400,%dx		/* round towards -oo */
-	andw	$0xf7ff,%dx
-	movw	%dx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modified control word */
+	fstcw	4(%esp)			/* store fpu control word */
 
-	flds	8(%ebp);		/* round */
-	frndint
+	/* We use here %edx although only the low 1 bits are defined.
+	   But none of the operations should care and they are faster
+	   than the 16 bit operations.  */
+	movl	$0x400,%edx		/* round towards -oo */
+	orl	4(%esp),%edx
+	andl	$0xf7ff,%edx
+	movl	%edx,(%esp)
+	fldcw	(%esp)			/* load modified control word */
 
-	fldcw	-4(%ebp)		/* restore original control word */
+	frndint				/* round */
 
-	leave
+	fldcw	4(%esp)			/* restore original control word */
+
+	addl	$8,%esp
 	ret
 END (__floorf)
 weak_alias (__floorf, floorf)
diff --git a/sysdeps/libm-i387/s_floorl.S b/sysdeps/libm-i387/s_floorl.S
index 7b7cff777a..c2bf091d73 100644
--- a/sysdeps/libm-i387/s_floorl.S
+++ b/sysdeps/libm-i387/s_floorl.S
@@ -9,23 +9,25 @@
 RCSID("$NetBSD: $")
 
 ENTRY(__floorl)
-	pushl	%ebp
-	movl	%esp,%ebp
+	fldt	4(%esp)
 	subl	$8,%esp
 
-	fstcw	-4(%ebp)		/* store fpu control word */
-	movw	-4(%ebp),%dx
-	orw	$0x0400,%dx		/* round towards -oo */
-	andw	$0xf7ff,%dx
-	movw	%dx,-8(%ebp)
-	fldcw	-8(%ebp)		/* load modified control word */
+	fstcw	4(%esp)			/* store fpu control word */
 
-	fldt	8(%ebp)			/* round */
-	frndint
+	/* We use here %edx although only the low 1 bits are defined.
+	   But none of the operations should care and they are faster
+	   than the 16 bit operations.  */
+	movl	$0x400,%edx		/* round towards -oo */
+	orl	4(%esp),%edx
+	andl	$0xf7ff,%edx
+	movl	%edx,(%esp)
+	fldcw	(%esp)			/* load modified control word */
 
-	fldcw	-4(%ebp)		/* restore original control word */
+	frndint				/* round */
 
-	leave
+	fldcw	4(%esp)			/* restore original control word */
+
+	addl	$8,%esp
 	ret
 END (__floorl)
 weak_alias (__floorl, floorl)
diff --git a/sysdeps/libm-i387/s_significandl.S b/sysdeps/libm-i387/s_significandl.S
index 1d5f4a3f6a..e3a69cba73 100644
--- a/sysdeps/libm-i387/s_significandl.S
+++ b/sysdeps/libm-i387/s_significandl.S
@@ -11,7 +11,7 @@ RCSID("$NetBSD: $")
 ENTRY(__significandl)
 	fldt	4(%esp)
 	fxtract
-	fincstp
+	fstp	%st(0)
 	ret
 END (__significandl)
 weak_alias (__significandl, significandl)
diff --git a/sysdeps/libm-ieee754/e_coshf.c b/sysdeps/libm-ieee754/e_coshf.c
index e6f4ed6f37..223fbeea20 100644
--- a/sysdeps/libm-ieee754/e_coshf.c
+++ b/sysdeps/libm-ieee754/e_coshf.c
@@ -8,20 +8,20 @@
  *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
+ * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
  */
 
 #if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_coshf.c,v 1.5 1995/05/10 20:45:01 jtc Exp $";
+static char rcsid[] = "$NetBSD: e_coshf.c,v 1.6 1996/04/08 15:43:41 phil Exp $";
 #endif
 
 #include "math.h"
 #include "math_private.h"
 
 #ifdef __STDC__
-static const volatile float huge = 1.0e30;
+static const float huge = 1.0e30;
 static const float one = 1.0, half=0.5;
 #else
 static float one = 1.0, half=0.5, huge = 1.0e30;
@@ -33,7 +33,7 @@ static float one = 1.0, half=0.5, huge = 1.0e30;
 	float __ieee754_coshf(x)
 	float x;
 #endif
-{	
+{
 	float t,w;
 	int32_t ix;
 
@@ -41,7 +41,7 @@ static float one = 1.0, half=0.5, huge = 1.0e30;
 	ix &= 0x7fffffff;
 
     /* x is INF or NaN */
-	if(ix>=0x7f800000) return x*x;	
+	if(ix>=0x7f800000) return x*x;
 
     /* |x| in [0,0.5*ln2], return 1+expm1(|x|)^2/(2*exp(|x|)) */
 	if(ix<0x3eb17218) {
diff --git a/sysdeps/libm-ieee754/e_expf.c b/sysdeps/libm-ieee754/e_expf.c
index 80af17918f..fbf2691bf9 100644
--- a/sysdeps/libm-ieee754/e_expf.c
+++ b/sysdeps/libm-ieee754/e_expf.c
@@ -8,19 +8,19 @@
  *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
+ * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
  */
 
 #if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_expf.c,v 1.5 1995/05/10 20:45:05 jtc Exp $";
+static char rcsid[] = "$NetBSD: e_expf.c,v 1.6 1996/04/08 15:43:43 phil Exp $";
 #endif
 
 #include "math.h"
 #include "math_private.h"
 
-static const volatile float huge = 1.0e+30;
+static const float huge = 1.0e+30;
 
 #ifdef __STDC__
 static const float
@@ -69,7 +69,7 @@ P5   =  4.1381369442e-08; /* 0x3331bb4c */
 	}
 
     /* argument reduction */
-	if(hx > 0x3eb17218) {		/* if  |x| > 0.5 ln2 */ 
+	if(hx > 0x3eb17218) {		/* if  |x| > 0.5 ln2 */
 	    if(hx < 0x3F851592) {	/* and |x| < 1.5 ln2 */
 		hi = x-ln2HI[xsb]; lo=ln2LO[xsb]; k = 1-xsb-xsb;
 	    } else {
@@ -79,7 +79,7 @@ P5   =  4.1381369442e-08; /* 0x3331bb4c */
 		lo = t*ln2LO[0];
 	    }
 	    x  = hi - lo;
-	} 
+	}
 	else if(hx < 0x31800000)  {	/* when |x|<2**-28 */
 	    if(huge+x>one) return one+x;/* trigger inexact */
 	}
@@ -88,7 +88,7 @@ P5   =  4.1381369442e-08; /* 0x3331bb4c */
     /* x is now in primary range */
 	t  = x*x;
 	c  = x - t*(P1+t*(P2+t*(P3+t*(P4+t*P5))));
-	if(k==0) 	return one-((x*c)/(c-(float)2.0)-x); 
+	if(k==0) 	return one-((x*c)/(c-(float)2.0)-x);
 	else 		y = one-((lo-(x*c)/((float)2.0-c))-hi);
 	if(k >= -125) {
 	    u_int32_t hy;
diff --git a/sysdeps/libm-ieee754/e_hypot.c b/sysdeps/libm-ieee754/e_hypot.c
index 24c8ae452f..76a77ec33a 100644
--- a/sysdeps/libm-ieee754/e_hypot.c
+++ b/sysdeps/libm-ieee754/e_hypot.c
@@ -5,7 +5,7 @@
  *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
+ * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
  */
@@ -16,12 +16,12 @@ static char rcsid[] = "$NetBSD: e_hypot.c,v 1.9 1995/05/12 04:57:27 jtc Exp $";
 
 /* __ieee754_hypot(x,y)
  *
- * Method :                  
- *	If (assume round-to-nearest) z=x*x+y*y 
- *	has error less than sqrt(2)/2 ulp, than 
+ * Method :
+ *	If (assume round-to-nearest) z=x*x+y*y
+ *	has error less than sqrt(2)/2 ulp, than
  *	sqrt(z) has error less than 1 ulp (exercise).
  *
- *	So, compute sqrt(x*x+y*y) with some care as 
+ *	So, compute sqrt(x*x+y*y) with some care as
  *	follows to get the error below 1 ulp:
  *
  *	Assume x>y>0;
@@ -31,10 +31,10 @@ static char rcsid[] = "$NetBSD: e_hypot.c,v 1.9 1995/05/12 04:57:27 jtc Exp $";
  *	where x1 = x with lower 32 bits cleared, x2 = x-x1; else
  *	2. if x <= 2y use
  *		t1*y1+((x-y)*(x-y)+(t1*y2+t2*y))
- *	where t1 = 2x with lower 32 bits cleared, t2 = 2x-t1, 
+ *	where t1 = 2x with lower 32 bits cleared, t2 = 2x-t1,
  *	y1= y with lower 32 bits chopped, y2 = y-y1.
- *		
- *	NOTE: scaling may be necessary if some argument is too 
+ *
+ *	NOTE: scaling may be necessary if some argument is too
  *	      large or too tiny
  *
  * Special cases:
@@ -42,8 +42,8 @@ static char rcsid[] = "$NetBSD: e_hypot.c,v 1.9 1995/05/12 04:57:27 jtc Exp $";
  *	hypot(x,y) is NAN if x or y is NAN.
  *
  * Accuracy:
- * 	hypot(x,y) returns sqrt(x^2+y^2) with error less 
- * 	than 1 ulps (units in the last place) 
+ * 	hypot(x,y) returns sqrt(x^2+y^2) with error less
+ * 	than 1 ulps (units in the last place)
  */
 
 #include "math.h"
@@ -56,7 +56,7 @@ static char rcsid[] = "$NetBSD: e_hypot.c,v 1.9 1995/05/12 04:57:27 jtc Exp $";
 	double x, y;
 #endif
 {
-	double a=x,b=y,t1,t2,y1,y2,w;
+	double a,b,t1,t2,y1,y2,w;
 	int32_t j,k,ha,hb;
 
 	GET_HIGH_WORD(ha,x);
@@ -84,7 +84,7 @@ static char rcsid[] = "$NetBSD: e_hypot.c,v 1.9 1995/05/12 04:57:27 jtc Exp $";
 	   SET_HIGH_WORD(b,hb);
 	}
 	if(hb < 0x20b00000) {	/* b < 2**-500 */
-	    if(hb <= 0x000fffff) {	/* subnormal b or 0 */	
+	    if(hb <= 0x000fffff) {	/* subnormal b or 0 */
 	        u_int32_t low;
 		GET_LOW_WORD(low,b);
 		if((hb|low)==0) return a;
diff --git a/sysdeps/libm-ieee754/e_hypotf.c b/sysdeps/libm-ieee754/e_hypotf.c
index 434cf94e8d..d6b1520cb8 100644
--- a/sysdeps/libm-ieee754/e_hypotf.c
+++ b/sysdeps/libm-ieee754/e_hypotf.c
@@ -8,7 +8,7 @@
  *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
+ * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
  */
@@ -27,7 +27,7 @@ static char rcsid[] = "$NetBSD: e_hypotf.c,v 1.5 1995/05/12 04:57:30 jtc Exp $";
 	float x, y;
 #endif
 {
-	float a=x,b=y,t1,t2,y1,y2,w;
+	float a,b,t1,t2,y1,y2,w;
 	int32_t j,k,ha,hb;
 
 	GET_FLOAT_WORD(ha,x);
@@ -52,7 +52,7 @@ static char rcsid[] = "$NetBSD: e_hypotf.c,v 1.5 1995/05/12 04:57:30 jtc Exp $";
 	   SET_FLOAT_WORD(b,hb);
 	}
 	if(hb < 0x26800000) {	/* b < 2**-50 */
-	    if(hb <= 0x007fffff) {	/* subnormal b or 0 */	
+	    if(hb <= 0x007fffff) {	/* subnormal b or 0 */
 	        if(hb==0) return a;
 		SET_FLOAT_WORD(t1,0x3f000000);	/* t1=2^126 */
 		b *= t1;
diff --git a/sysdeps/libm-ieee754/e_hypotl.c b/sysdeps/libm-ieee754/e_hypotl.c
new file mode 100644
index 0000000000..1a40c556dc
--- /dev/null
+++ b/sysdeps/libm-ieee754/e_hypotl.c
@@ -0,0 +1,133 @@
+/* e_hypotl.c -- long double version of e_hypot.c.
+ * Conversion to long double by Ulrich Drepper,
+ * Cygnus Support, drepper@cygnus.com.
+ */
+
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static char rcsid[] = "$NetBSD: $";
+#endif
+
+/* __ieee754_hypotl(x,y)
+ *
+ * Method :
+ *	If (assume round-to-nearest) z=x*x+y*y
+ *	has error less than sqrt(2)/2 ulp, than
+ *	sqrt(z) has error less than 1 ulp (exercise).
+ *
+ *	So, compute sqrt(x*x+y*y) with some care as
+ *	follows to get the error below 1 ulp:
+ *
+ *	Assume x>y>0;
+ *	(if possible, set rounding to round-to-nearest)
+ *	1. if x > 2y  use
+ *		x1*x1+(y*y+(x2*(x+x1))) for x*x+y*y
+ *	where x1 = x with lower 32 bits cleared, x2 = x-x1; else
+ *	2. if x <= 2y use
+ *		t1*y1+((x-y)*(x-y)+(t1*y2+t2*y))
+ *	where t1 = 2x with lower 32 bits cleared, t2 = 2x-t1,
+ *	y1= y with lower 32 bits chopped, y2 = y-y1.
+ *
+ *	NOTE: scaling may be necessary if some argument is too
+ *	      large or too tiny
+ *
+ * Special cases:
+ *	hypot(x,y) is INF if x or y is +INF or -INF; else
+ *	hypot(x,y) is NAN if x or y is NAN.
+ *
+ * Accuracy:
+ * 	hypot(x,y) returns sqrt(x^2+y^2) with error less
+ * 	than 1 ulps (units in the last place)
+ */
+
+#include "math.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+	long double __ieee754_hypotl(long double x, long double y)
+#else
+	long double __ieee754_hypotl(x,y)
+	long double x, y;
+#endif
+{
+	long double a,b,t1,t2,y1,y2,w;
+	u_int32_t j,k,ea,eb;
+
+	GET_LDOUBLE_EXP(ea,x);
+	ea &= 0x7fff;
+	GET_LDOUBLE_EXP(eb,y);
+	eb &= 0x7fff;
+	if(eb > ea) {a=y;b=x;j=ea; ea=eb;eb=j;} else {a=x;b=y;}
+	SET_LDOUBLE_EXP(a,ea);	/* a <- |a| */
+	SET_LDOUBLE_EXP(b,eb);	/* b <- |b| */
+	if((ea-eb)>0x46) {return a+b;} /* x/y > 2**70 */
+	k=0;
+	if(ea > 0x5f3f) {	/* a>2**8000 */
+	   if(ea == 0x7fff) {	/* Inf or NaN */
+	       u_int32_t exp,high,low;
+	       w = a+b;			/* for sNaN */
+	       GET_LDOUBLE_WORDS(exp,high,low,a);
+	       if(((high&0x7fffffff)|low)==0) w = a;
+	       GET_LDOUBLE_WORDS(exp,high,low,b);
+	       if(((eb^0x7fff)|(high&0x7fffffff)|low)==0) w = b;
+	       return w;
+	   }
+	   /* scale a and b by 2**-9600 */
+	   ea -= 0x2580; eb -= 0x2580;	k += 9600;
+	   SET_LDOUBLE_EXP(a,ea);
+	   SET_LDOUBLE_EXP(b,eb);
+	}
+	if(eb < 0x20bf) {	/* b < 2**-8000 */
+	    if(eb == 0) {	/* subnormal b or 0 */
+	        u_int32_t exp,high,low;
+		GET_LDOUBLE_WORDS(exp,high,low,b);
+		if((high|low)==0) return a;
+		SET_LDOUBLE_WORDS(t1, 0x7ffd, 0, 0);	/* t1=2^16382 */
+		b *= t1;
+		a *= t1;
+		k -= 16382;
+	    } else {		/* scale a and b by 2^9600 */
+	        ea += 0x2580; 	/* a *= 2^9600 */
+		eb += 0x2580;	/* b *= 2^9600 */
+		k -= 9600;
+		SET_LDOUBLE_EXP(a,ea);
+		SET_LDOUBLE_EXP(b,eb);
+	    }
+	}
+    /* medium size a and b */
+	w = a-b;
+	if (w>b) {
+	    u_int32_t high;
+	    GET_LDOUBLE_MSW(high,a);
+	    SET_LDOUBLE_WORDS(t1,ea,high,0);
+	    t2 = a-t1;
+	    w  = __ieee754_sqrtl(t1*t1-(b*(-b)-t2*(a+t1)));
+	} else {
+	    u_int32_t high;
+	    GET_LDOUBLE_MSW(high,b);
+	    a  = a+a;
+	    SET_LDOUBLE_WORDS(y1,eb,high,0);
+	    y2 = b - y1;
+	    GET_LDOUBLE_MSW(high,a);
+	    SET_LDOUBLE_WORDS(t1,ea+1,high,0);
+	    t2 = a - t1;
+	    w  = __ieee754_sqrtl(t1*y1-(w*(-w)-(t1*y2+t2*b)));
+	}
+	if(k!=0) {
+	    u_int32_t exp;
+	    t1 = 1.0;
+	    GET_LDOUBLE_EXP(exp,t1);
+	    SET_LDOUBLE_EXP(t1,exp+k);
+	    return t1*w;
+	} else return w;
+}
diff --git a/sysdeps/libm-ieee754/e_powf.c b/sysdeps/libm-ieee754/e_powf.c
index 1358555128..4798340c84 100644
--- a/sysdeps/libm-ieee754/e_powf.c
+++ b/sysdeps/libm-ieee754/e_powf.c
@@ -14,13 +14,13 @@
  */
 
 #if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: e_powf.c,v 1.6 1995/05/12 04:57:35 jtc Exp $";
+static char rcsid[] = "$NetBSD: e_powf.c,v 1.7 1996/04/08 15:43:44 phil Exp $";
 #endif
 
 #include "math.h"
 #include "math_private.h"
 
-static const volatile float huge = 1.0e+30, tiny = 1.0e-30;
+static const float huge = 1.0e+30, tiny = 1.0e-30;
 
 #ifdef __STDC__
 static const float
diff --git a/sysdeps/libm-ieee754/e_sinhl.c b/sysdeps/libm-ieee754/e_sinhl.c
new file mode 100644
index 0000000000..2d98562f94
--- /dev/null
+++ b/sysdeps/libm-ieee754/e_sinhl.c
@@ -0,0 +1,91 @@
+/* e_asinhl.c -- long double version of e_asinh.c.
+ * Conversion to long double by Ulrich Drepper,
+ * Cygnus Support, drepper@cygnus.com.
+ */
+
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static char rcsid[] = "$NetBSD: $";
+#endif
+
+/* __ieee754_sinhl(x)
+ * Method :
+ * mathematically sinh(x) if defined to be (exp(x)-exp(-x))/2
+ *	1. Replace x by |x| (sinhl(-x) = -sinhl(x)).
+ *	2.
+ *		                                     E + E/(E+1)
+ *	    0        <= x <= 25     :  sinhl(x) := --------------, E=expm1l(x)
+ *			       			         2
+ *
+ *	    25       <= x <= lnovft :  sinhl(x) := expl(x)/2
+ *	    lnovft   <= x <= ln2ovft:  sinhl(x) := expl(x/2)/2 * expl(x/2)
+ *	    ln2ovft  <  x	    :  sinhl(x) := x*shuge (overflow)
+ *
+ * Special cases:
+ *	sinhl(x) is |x| if x is +INF, -INF, or NaN.
+ *	only sinhl(0)=0 is exact for finite x.
+ */
+
+#include "math.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+static const long double one = 1.0, shuge = 1.0e4931L;
+#else
+static long double one = 1.0, shuge = 1.0e4931L;
+#endif
+
+#ifdef __STDC__
+	long double __ieee754_sinhl(long double x)
+#else
+	long double __ieee754_sinhl(x)
+	long double x;
+#endif
+{
+	long double t,w,h;
+	u_int32_t jx,ix,i0,i1;
+
+    /* Words of |x|. */
+	GET_LDOUBLE_WORDS(jx,i0,i1,x);
+	ix = jx&0x7fff;
+
+    /* x is INF or NaN */
+	if(ix==0x7fff) return x+x;
+
+	h = 0.5;
+	if (jx<0) h = -h;
+    /* |x| in [0,25], return sign(x)*0.5*(E+E/(E+1))) */
+	if (ix < 0x4003 || (ix == 0x4003 && i0 <= 0xc8000000)) { /* |x|<25 */
+	    if (ix<0x3fe3) 		/* |x|<2**-28 */
+		if(shuge+x>one) return x;/* sinh(tiny) = tiny with inexact */
+	    t = __expm1l(fabsl(x));
+	    if(ix<0x3fff) return h*(2.0*t-t*t/(t+one));
+	    return h*(t+t/(t+one));
+	}
+
+    /* |x| in [25, log(maxdouble)] return 0.5*exp(|x|) */
+	if (ix < 0x400c || (ix == 0x400c && i0 < 0xb17217f7))
+		return h*__ieee754_expl(fabsl(x));
+
+    /* |x| in [log(maxdouble), overflowthresold] */
+	if (ix<0x400c || (ix == 0x400c && (i0 < 0xb174ddc0
+					   || (i0 == 0xb174ddc0
+					       && i1 <= 0x31aec0ea)))) {
+	    w = __ieee754_expl(0.5*fabsl(x));
+	    t = h*w;
+	    return t*w;
+	}
+
+    /* |x| > overflowthresold, sinhl(x) overflow */
+	return x*shuge;
+}
diff --git a/sysdeps/m68k/Makefile b/sysdeps/m68k/Makefile
index a5e9064767..dc502912bf 100644
--- a/sysdeps/m68k/Makefile
+++ b/sysdeps/m68k/Makefile
@@ -12,9 +12,9 @@
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
+# License along with the GNU C Library; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 # The mpn functions need this.  All existing 68k ports use MIT syntax.  If
 # a new port wants to use Motorola or Sony syntax, it can redefine this
@@ -30,3 +30,7 @@ CFLAGS-setjmp.c := -fno-omit-frame-pointer
 
 # The 68k `long double' is a distinct type we support.
 long-double-fcts = yes
+
+ifeq ($(subdir),elf)
+CFLAGS-rtld.c += -Wno-uninitialized
+endif
diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c
index b3eec8f39a..8b820ecad9 100644
--- a/sysdeps/posix/sigpause.c
+++ b/sysdeps/posix/sigpause.c
@@ -34,7 +34,7 @@ __sigpause (sig_or_mask, is_sig)
       /* The modern X/Open implementation is requested.  */
       if (sigprocmask (0, NULL, &set) < 0
 	  /* Yes, we call `sigaddset' and not `__sigaddset'.  */
-	  || sigaddset (&set, sig_or_mask) < 0)
+	  || sigdelset (&set, sig_or_mask) < 0)
 	return -1;
     }
   else
@@ -54,3 +54,16 @@ __sigpause (sig_or_mask, is_sig)
 
   return sigsuspend (&set);
 }
+
+
+/* We have to provide a default version of this function since the
+   standards demand it.  The version which is a bit more reasonable is
+   the BSD version.  So make this the default.  */
+int __default_sigpause __P ((int mask));
+int
+__default_sigpause (mask)
+     int mask;
+{
+  return __sigpause (mask, 0);
+}
+weak_alias (__default_sigpause, sigpause)
diff --git a/sysdeps/stub/e_hypotl.c b/sysdeps/stub/e_hypotl.c
deleted file mode 100644
index a7a6e124d3..0000000000
--- a/sysdeps/stub/e_hypotl.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-
-long double
-__ieee754_hypotl (long double x, long double y)
-{
-  fputs ("__ieee754_hypotl not implemented\n", stderr);
-  return 0.0;
-}
-
-stub_warning (__ieee754_hypotl)
diff --git a/sysdeps/stub/e_sinhl.c b/sysdeps/stub/e_sinhl.c
deleted file mode 100644
index 8fe11d4ea9..0000000000
--- a/sysdeps/stub/e_sinhl.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-
-long double
-__ieee754_sinhl (long double x)
-{
-  fputs ("__ieee754_sinhl not implemented\n", stderr);
-  return 0.0;
-}
-
-stub_warning (__ieee754_sinhl)
diff --git a/time/asia b/time/asia
index 7afe922bf4..07cdb113c4 100644
--- a/time/asia
+++ b/time/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.26
+# @(#)asia	7.27
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -354,6 +354,26 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 			9:00	-	JAYT
 
 # Iran
+# From Paul Eggert (1996-12-17), following up a suggestion by Rich Wales:
+# Ahmad Alavi <URL:http://tehran.stanford.edu/Iran_Lib/Calendar/taghveem.txt>
+# (1993-08-04) writes ``Daylight saving time in Iran starts from the first day
+# of Farvardin and ends the first day of Mehr.''  This disagrees with the SSIM:
+#
+#		   DST start	   DST end
+#	year	SSIM	Alavi	SSIM	Alavi
+#	1991	05-03!=	03-21	09-20!=	09-23
+#	1992	03-22!=	03-21	09-23	09-23
+#	1993	03-21	03-21	09-23	09-23
+#	1994	03-21	03-21	09-22!= 09-23
+#	1995	03-21	03-21	09-22!= 09-23
+#	1996	03-21!=	03-20	09-21!= 09-22
+#	1997	03-21	03-21	09-21!= 09-23
+#
+# Go with Alavi starting with 1992.
+# I used Ed Reingold's cal-persia in GNU Emacs 19.34 to compute Persian dates.
+# The Persian calendar is based on the sun, and dates after around 2050
+# are approximate; stop after 2037 when 32-bit time_t's overflow.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	S
 Rule	Iran	1978	only	-	Oct	21	0:00	0	-
@@ -361,11 +381,50 @@ Rule	Iran	1979	only	-	Sep	19	0:00	0	-
 Rule	Iran	1980	only	-	Sep	23	0:00	0	-
 Rule	Iran	1991	only	-	May	 3	0:00s	1:00	S
 Rule	Iran	1991	only	-	Sep	20	0:00s	0	-
-Rule	Iran	1992	only	-	Mar	22	0:00	1:00	S
-Rule	Iran	1992	1993	-	Sep	23	0:00	0	-
-Rule	Iran	1993	max	-	Mar	21	0:00	1:00	S
-Rule	Iran	1994	1995	-	Sep	22	0:00	0	-
-Rule	Iran	1996	max	-	Sep	21	0:00	0	-
+Rule	Iran	1992	1995	-	Mar	21	0:00	1:00	S
+Rule	Iran	1992	1995	-	Sep	23	0:00	0	-
+Rule	Iran	1996	only	-	Mar	20	0:00	1:00	S
+Rule	Iran	1996	only	-	Sep	22	0:00	0	-
+Rule	Iran	1997	1999	-	Mar	21	0:00	1:00	S
+Rule	Iran	1997	1999	-	Sep	23	0:00	0	-
+Rule	Iran	2000	only	-	Mar	20	0:00	1:00	S
+Rule	Iran	2000	only	-	Sep	22	0:00	0	-
+Rule	Iran	2001	2003	-	Mar	21	0:00	1:00	S
+Rule	Iran	2001	2003	-	Sep	23	0:00	0	-
+Rule	Iran	2004	only	-	Mar	20	0:00	1:00	S
+Rule	Iran	2004	only	-	Sep	22	0:00	0	-
+Rule	Iran	2005	2007	-	Mar	21	0:00	1:00	S
+Rule	Iran	2005	2007	-	Sep	23	0:00	0	-
+Rule	Iran	2008	only	-	Mar	20	0:00	1:00	S
+Rule	Iran	2008	only	-	Sep	22	0:00	0	-
+Rule	Iran	2009	2011	-	Mar	21	0:00	1:00	S
+Rule	Iran	2009	2011	-	Sep	23	0:00	0	-
+Rule	Iran	2012	only	-	Mar	20	0:00	1:00	S
+Rule	Iran	2012	only	-	Sep	22	0:00	0	-
+Rule	Iran	2013	2015	-	Mar	21	0:00	1:00	S
+Rule	Iran	2013	2015	-	Sep	23	0:00	0	-
+Rule	Iran	2016	only	-	Mar	20	0:00	1:00	S
+Rule	Iran	2016	only	-	Sep	22	0:00	0	-
+Rule	Iran	2017	2019	-	Mar	21	0:00	1:00	S
+Rule	Iran	2017	2019	-	Sep	23	0:00	0	-
+Rule	Iran	2020	only	-	Mar	20	0:00	1:00	S
+Rule	Iran	2020	only	-	Sep	22	0:00	0	-
+Rule	Iran	2021	2023	-	Mar	21	0:00	1:00	S
+Rule	Iran	2021	2023	-	Sep	23	0:00	0	-
+Rule	Iran	2024	2025	-	Mar	20	0:00	1:00	S
+Rule	Iran	2024	2025	-	Sep	22	0:00	0	-
+Rule	Iran	2026	2027	-	Mar	21	0:00	1:00	S
+Rule	Iran	2026	2027	-	Sep	23	0:00	0	-
+Rule	Iran	2028	2029	-	Mar	20	0:00	1:00	S
+Rule	Iran	2028	2029	-	Sep	22	0:00	0	-
+Rule	Iran	2030	2031	-	Mar	21	0:00	1:00	S
+Rule	Iran	2030	2031	-	Sep	23	0:00	0	-
+Rule	Iran	2032	2033	-	Mar	20	0:00	1:00	S
+Rule	Iran	2032	2033	-	Sep	22	0:00	0	-
+Rule	Iran	2034	2035	-	Mar	21	0:00	1:00	S
+Rule	Iran	2034	2035	-	Sep	23	0:00	0	-
+Rule	Iran	2036	2037	-	Mar	20	0:00	1:00	S
+Rule	Iran	2036	2037	-	Sep	22	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
 			3:25:44	-	TMT	1946	# Tehran Mean Time
@@ -492,7 +551,7 @@ Rule	Zion	1995	only	-	Sep	 3	0:00	0	S
 #
 #   ftp://ftp.huji.ac.il/pub/misc/timezones/announcements/1996-1998.ps.gz
 #
-# Emptor Caveat: The dates for the years 1996-1998 were originally announced
+# Caveat emptor: The dates for the years 1996-1998 were originally announced
 # on 1995-08-31, by the previous Minister of Interior.  The new Minister
 # of Interior changed the dates on 1996-01-01, to take into account the
 # desires of certain portions of Israeli society (the next election is in the
diff --git a/time/australasia b/time/australasia
index be15771b07..811e569127 100644
--- a/time/australasia
+++ b/time/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.30
+# @(#)australasia	7.31
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
@@ -48,15 +48,15 @@ Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
 # so use Lindeman.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	QL	1989	1991	-	Oct	lastSun	2:00s	1:00	-
-Rule	QL	1990	1992	-	Mar	Sun>=1	2:00s	0	-
+Rule	AQ	1989	1991	-	Oct	lastSun	2:00s	1:00	-
+Rule	AQ	1990	1992	-	Mar	Sun>=1	2:00s	0	-
 Rule	Holiday	1989	1993	-	Oct	lastSun	2:00s	1:00	-
 Rule	Holiday	1990	1994	-	Mar	Sun>=1	2:00s	0	-
 Zone Australia/Brisbane	10:12:08 -	LMT	1895
 			10:00	-	EST	1917 Jan 1 0:01
 			10:00	Aus	EST	1971 Oct lastSun 2:00s
 			10:00	1:00	EST	1972 Feb lastSun 2:00s
-			10:00	QL	EST
+			10:00	AQ	EST
 Zone Australia/Lindeman  9:55:56 -	LMT	1895
 			10:00	-	EST	1917 Jan 1 0:01
 			10:00	Aus	EST	1971 Oct lastSun 2:00s
@@ -339,7 +339,7 @@ Zone Pacific/Palau	8:57:56 -	LMT	1901		# Koror
 			9:00	-	PWT	# Palau Time
 
 # Palmyra
-# uninhabited since World War II; was probably like Pacific/Kiritmati
+# uninhabited since World War II; was probably like Pacific/Kiritimati
 
 # Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/time/difftime.c b/time/difftime.c
index 49c5bfbc5c..170471768f 100644
--- a/time/difftime.c
+++ b/time/difftime.c
@@ -1,28 +1,30 @@
-/* Copyright (C) 1991, 1994 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1994, 1996 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
-#include <ansidecl.h>
 #include <time.h>
+#include <values.h>
 
 
 /* Return the difference between TIME1 and TIME0.  */
 double
-DEFUN(difftime, (time1, time0), time_t time1 AND time_t time0)
+difftime (time1, time0)
+     time_t time1;
+     time_t time0;
 {
   /* Algorithm courtesy Paul Eggert (eggert@twinsun.com).  */
 
@@ -30,8 +32,8 @@ DEFUN(difftime, (time1, time0), time_t time1 AND time_t time0)
 
   if (sizeof (time_t) < sizeof (double))
     return (double) time1 - (double) time0;
-  if (sizeof (time_t) < sizeof (LONG_DOUBLE))
-    return (LONG_DOUBLE) time1 - (LONG_DOUBLE) time0;
+  if (sizeof (time_t) < sizeof (long double))
+    return (long double) time1 - (long double) time0;
 
   if (time1 < time0)
     return - difftime (time0, time1);
@@ -43,9 +45,7 @@ DEFUN(difftime, (time1, time0), time_t time1 AND time_t time0)
     return delta;
 
   /* Repair delta overflow.  */
-  hibit = 1;
-  while ((hibit <<= 1) > 0)
-    continue;
+  hibit = (~ (time_t) 0) << (_TYPEBITS (time_t) - 1);
 
   /* The following expression rounds twice, which means the result may not
      be the closest to the true answer.  For example, suppose time_t is
@@ -62,5 +62,5 @@ DEFUN(difftime, (time1, time0), time_t time1 AND time_t time0)
      round twice when converting large unsigned types to small floating
      types, so if time_t is unsigned the "return delta" above has the same
      double-rounding problem.  */
-  return delta - 2 * (LONG_DOUBLE) hibit;
+  return delta - 2 * (long double) hibit;
 }
diff --git a/time/europe b/time/europe
index 6eb92b769d..78ad05d7f5 100644
--- a/time/europe
+++ b/time/europe
@@ -1,4 +1,4 @@
-# @(#)europe	7.41
+# @(#)europe	7.42
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -78,7 +78,7 @@
 # of the text said:
 #
 # `An old stone obelisk marking a forgotten terrestrial meridian stands
-# beside the river at Kew. In the 18th century, before time and longditude
+# beside the river at Kew. In the 18th century, before time and longitude
 # was standardised by the Royal Observatory in Greenwich, scholars observed
 # this stone and the movement of stars from Kew Observatory nearby. They
 # made their calculations and set the time for the Horse Guards and Parliament,
@@ -86,7 +86,7 @@
 # along the towpath within a few yards of it.'
 #
 # I have a one inch to one mile map of London and my estimate of the stone's
-# position is 51 deg. 28' 30" N, 0 deg. 18' 45" W. The longditude should
+# position is 51 deg. 28' 30" N, 0 deg. 18' 45" W. The longitude should
 # be within about +-2". The Ordnance Survey grid reference is TQ172761.
 #
 # [This yields GMTOFF = -0:01:15 for London LMT in the 18th century.]
@@ -167,7 +167,7 @@
 # It ends at 02:00 GMT on the morning of the day after the fourth Saturday
 # in October. (All the redundant `morning of the day ...' is in the Act.)
 # This is only of passing interest now as it will always be overridden by
-# an Order in Council (a Statutary Instrument, the SI thing mentioned above)
+# an Order in Council (a Statutory Instrument, the SI thing mentioned above)
 # to specify the EC specified dates.
 
 # From Peter Ilieve <peter@memex.co.uk> (1993-10-18):
@@ -327,7 +327,7 @@
 # so that part of the 1922 Act will still apply.
 #
 # - The Defence (Summer Time) Regulations, 1939, SR&O 1939 No. 1379
-#   [SR&O == Statutary Regulation and Order]
+#   [SR&O == Statutory Regulation and Order]
 #
 # These were made under the Emergency Powers (Defence) Act, 1939.
 # It changes the end date to be the day after the third Saturday in November.
@@ -403,7 +403,7 @@
 # harmonise with the EC since 1981. The major change is that the time changes
 # to 01:00 GMT.)
 #
-# - The Summer Time Order, 1992, SI 1992/1729 [SI == Statutary Instrument]
+# - The Summer Time Order, 1992, SI 1992/1729 [SI == Statutory Instrument]
 #
 # This specifies dates of:
 #       Start       End
@@ -1298,7 +1298,7 @@ Zone	Europe/Athens	1:34:52 -	LMT	1895 Sep 14
 			1:00	Greece	CE%sT	1944 Apr  4
 			2:00	Greece	EE%sT	1981
 			# Shanks says they switched to C-Eur in 1981;
-			# go with EU intead, since Greece joined it on Jan 1.
+			# go with EU instead, since Greece joined it on Jan 1.
 			2:00	EU	EE%sT
 
 # Hungary
@@ -1819,9 +1819,15 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 			2:00	E-Eur	EE%sT
 
 # Russia
-# From Shanks (1991):
-# In 1929 the Soviet Union instituted a 5 day week; in 1932 it instituted
-# a 6 day week; on 1940-06-27 it returned to the Gregorian week.
+
+# From Chris Carrier <72157.3334@CompuServe.COM> (1996-12-02):
+# On 1929-10-01 the Soviet Union instituted an ``Eternal Calendar''
+# with 30-day months plus 5 holidays, with a 5-day week.
+# On 1931-12-01 it changed to a 6-day week; in 1934 it reverted to the
+# Gregorian calendar while retaining the 6-day week; on 1940-06-27 it
+# reverted to the 7-day week.  With the 6-day week the usual days
+# off were the 6th, 12th, 18th, 24th and 30th of the month.
+# (Source: Evitiar Zerubavel, _The Seven Day Circle_)
 #
 # From Paul Eggert <eggert@twinsun.com> (1996-11-22):
 # Except for Moscow after 1919-07-01, I invented the time zone abbreviations,
@@ -1882,7 +1888,7 @@ Zone Asia/Omsk		 4:53:36 -	LMT	1924 May  2
 # as far as I remember it was done exactly during winter->summer switching
 # so we (Novosibirsk) simply did not switch.
 Zone Asia/Novosibirsk	 5:31:40 -	LMT	1924 May  2
-			 6:00	-	NOVT	1957 Mar # Novosibirsk TIme
+			 6:00	-	NOVT	1957 Mar # Novosibirsk Time
 			 7:00	Russia	NOV%sT	1991 Mar 31 2:00s
 			 6:00	1:00	NOVST	1991 Sep 29 2:00s
 			 6:00	-	NOVT	1992 Jan 19 2:00s
@@ -2134,7 +2140,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 # Ukraine
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Ukraine	1917	only	-	Jul	 1	23:00	1:00	UST	# Ukrainian Summer Time
-Rule	Ukraine	1917	only	-	Dec	28	 0:00	0	KMT	# Kiev Mean TIme
+Rule	Ukraine	1917	only	-	Dec	28	 0:00	0	KMT	# Kiev Mean Time
 Rule	Ukraine	1918	only	-	May	31	22:00	2:00	UDST	# Ukrainian Double Summer Time
 Rule	Ukraine	1918	only	-	Sep	17	 0:00	1:00	UST
 Rule	Ukraine	1919	only	-	May	31	23:00	2:00	UDST
diff --git a/time/northamerica b/time/northamerica
index af81c5edb9..9bd959e45c 100644
--- a/time/northamerica
+++ b/time/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	7.29
+# @(#)northamerica	7.30
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -920,9 +920,9 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # MEXICO BAJA CAL N   7 H  BEHIND UTC    BAJA CALIFORNIA SUR AND
 # MEXICO BAJA CAL N                      N. PACIFIC COAST (STATES
 # MEXICO BAJA CAL N                      OF SINALOA AND SONORA)
-# MEXICO BAJA CAL N   8 H  BEHIND UTC    ABOVE 28TH PARALLAL APR 3
+# MEXICO BAJA CAL N   8 H  BEHIND UTC    ABOVE 28TH PARALLEL APR 3
 # MEXICO BAJA CAL N                      - OCT 29
-# MEXICO BAJA CAL N   7 H  BEHIND UTC    ABOVE 28TH PARALLAL APR 3
+# MEXICO BAJA CAL N   7 H  BEHIND UTC    ABOVE 28TH PARALLEL APR 3
 # MEXICO BAJA CAL N                      - 0CT 29
 # MEXICO              6 H  BEHIND UTC    STATES OF DURANGO,
 # MEXICO                                 COAHUILA, NUEVO LEON,
diff --git a/time/southamerica b/time/southamerica
index 1fdde5ebe5..b2b5138171 100644
--- a/time/southamerica
+++ b/time/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica	7.15
+# @(#)southamerica	7.16
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -61,7 +61,7 @@
 # ARGENTINA           3 H BEHIND   UTC
 
 # From Hernan G. Otero <hernan@isoft.com.ar> (1995-06-26):
-# I am sending modifications to the Argentinian time zone table...
+# I am sending modifications to the Argentine time zone table...
 # AR was chosen because they are the ISO letters that represent Argentina.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -99,7 +99,7 @@ Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
 # These corrections were contributed by InterSoft Argentina S.A.,
 # obtaining the data from the:
 # Talleres de Hidrografia Naval Argentina
-# (Argentinian Naval Hydrography Institute)
+# (Argentine Naval Hydrography Institute)
 #
 # Shanks gives 1989 Mar 16 and stops after 1990 Mar 4; go with Otero.
 Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	-
diff --git a/time/zic.c b/time/zic.c
index f75834c6c3..5a0063ab4b 100644
--- a/time/zic.c
+++ b/time/zic.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)zic.c	7.79";
+static char	elsieid[] = "@(#)zic.c	7.80";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -1697,7 +1697,7 @@ const int			zonecount;
 					(void) strcpy(startbuf, zp->z_format);
 			eat(zp->z_filename, zp->z_linenum);
 			if (*startbuf == '\0')
-error(_("can't determine time zone abbrevation to use just after until time"));
+error(_("can't determine time zone abbreviation to use just after until time"));
 			else	addtt(starttime,
 					addtype(startoff, startbuf,
 						startoff != zp->z_gmtoff,
diff --git a/values.h b/values.h
index 14f13ea89d..0b2b661abd 100644
--- a/values.h
+++ b/values.h
@@ -35,11 +35,11 @@
 #define DOUBLEBITS	_TYPEBITS (double)
 #define FLOATBITS	_TYPEBITS (float)
 
-#define MINSHORT	SHORT_MIN
+#define MINSHORT	SHRT_MIN
 #define	MININT		INT_MIN
 #define	MINLONG		LONG_MIN
 
-#define	MAXSHORT	SHORT_MAX
+#define	MAXSHORT	SHRT_MAX
 #define	MAXINT		INT_MAX
 #define	MAXLONG		LONG_MAX