about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog134
-rw-r--r--bits/libc-lock.h11
-rw-r--r--bits/shm.h9
-rw-r--r--conform/conformtest.pl57
-rw-r--r--conform/data/fcntl.h-data5
-rw-r--r--conform/data/fnmatch.h-data1
-rw-r--r--conform/data/math.h-data1
-rw-r--r--conform/data/ndbm.h-data2
-rw-r--r--conform/data/nl_types.h-data1
-rw-r--r--conform/data/poll.h-data4
-rw-r--r--conform/data/pthread.h-data2
-rw-r--r--conform/data/semaphore.h-data1
-rw-r--r--conform/data/setjmp.h-data2
-rw-r--r--conform/data/signal.h-data11
-rw-r--r--conform/data/stdarg.h-data2
-rw-r--r--conform/data/stddef.h-data2
-rw-r--r--conform/data/stdio.h-data2
-rw-r--r--conform/data/stdlib.h-data3
-rw-r--r--conform/data/string.h-data4
-rw-r--r--conform/data/strings.h-data2
-rw-r--r--conform/data/stropts.h-data14
-rw-r--r--conform/data/sys/ipc.h-data4
-rw-r--r--conform/data/sys/mman.h-data7
-rw-r--r--conform/data/sys/msg.h-data4
-rw-r--r--conform/data/sys/resource.h-data50
-rw-r--r--conform/data/sys/sem.h-data37
-rw-r--r--conform/data/sys/shm.h-data32
-rw-r--r--conform/data/sys/stat.h-data75
-rw-r--r--conform/data/sys/statvfs.h-data26
-rw-r--r--conform/data/sys/time.h-data40
-rw-r--r--conform/data/sys/timeb.h-data12
-rw-r--r--conform/data/sys/times.h-data13
-rw-r--r--conform/data/sys/types.h-data34
-rw-r--r--conform/data/sys/uio.h-data11
-rw-r--r--conform/data/sys/wait.h-data64
-rw-r--r--conform/data/syslog.h-data3
-rw-r--r--conform/data/tar.h-data29
-rw-r--r--conform/data/termios.h-data159
-rw-r--r--conform/data/time.h-data75
-rw-r--r--conform/data/ucontext.h-data20
-rw-r--r--conform/data/ulimit.h-data7
-rw-r--r--conform/data/unistd.h-data308
-rw-r--r--conform/data/utime.h-data11
-rw-r--r--conform/data/utmpx.h-data36
-rw-r--r--conform/data/varargs.h-data8
-rw-r--r--conform/data/wchar.h-data95
-rw-r--r--conform/data/wctype.h-data36
-rw-r--r--conform/data/wordexp.h-data25
-rw-r--r--grp/grp.h4
-rw-r--r--include/sys/time.h2
-rw-r--r--intl/bindtextdom.c140
-rw-r--r--intl/dcgettext.c3
-rw-r--r--intl/dcigettext.c34
-rw-r--r--intl/dcngettext.c3
-rw-r--r--intl/dgettext.c5
-rw-r--r--intl/dngettext.c3
-rw-r--r--intl/explodename.c5
-rw-r--r--intl/finddomain.c5
-rw-r--r--intl/gettext.c3
-rw-r--r--intl/gettext.h5
-rw-r--r--intl/gettextP.h6
-rw-r--r--intl/hash-string.h5
-rw-r--r--intl/l10nflist.c5
-rw-r--r--intl/libintl.h3
-rw-r--r--intl/loadmsgcat.c3
-rw-r--r--intl/localealias.c5
-rw-r--r--intl/ngettext.c3
-rw-r--r--intl/textdomain.c64
-rw-r--r--io/sys/stat.h23
-rw-r--r--io/sys/statvfs.h22
-rw-r--r--linuxthreads/ChangeLog11
-rw-r--r--linuxthreads/Versions5
-rw-r--r--linuxthreads/rwlock.c26
-rw-r--r--linuxthreads/sysdeps/pthread/bits/libc-lock.h52
-rw-r--r--linuxthreads_db/td_ta_thr_iter.c4
-rw-r--r--linuxthreads_db/td_ta_tsd_iter.c4
-rw-r--r--locale/langinfo.h144
-rw-r--r--math/Makefile2
-rw-r--r--math/bits/mathcalls.h7
-rw-r--r--po/de.po24
-rw-r--r--po/ko.po1694
-rw-r--r--posix/sys/types.h20
-rw-r--r--posix/unistd.h7
-rw-r--r--resource/sys/resource.h39
-rw-r--r--sysdeps/generic/bits/libc-lock.h11
-rw-r--r--sysdeps/generic/bits/shm.h9
-rw-r--r--sysdeps/generic/getpriority.c4
-rw-r--r--sysdeps/generic/sbrk.c4
-rw-r--r--sysdeps/generic/setpriority.c4
-rw-r--r--sysdeps/generic/utimes.c4
-rw-r--r--sysdeps/gnu/bits/sem.h8
-rw-r--r--sysdeps/gnu/bits/shm.h9
-rw-r--r--sysdeps/mach/hurd/getpriority.c4
-rw-r--r--sysdeps/mach/hurd/sbrk.c4
-rw-r--r--sysdeps/mach/hurd/setpriority.c4
-rw-r--r--sysdeps/mach/hurd/utimes.c4
-rw-r--r--sysdeps/posix/utimes.c4
-rw-r--r--sysdeps/unix/sysv/irix4/getpriority.c4
-rw-r--r--sysdeps/unix/sysv/irix4/setpriority.c4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/shm.h11
-rw-r--r--sysdeps/unix/sysv/linux/bits/shm.h11
-rw-r--r--sysdeps/unix/sysv/linux/bits/statvfs.h26
-rw-r--r--sysdeps/unix/sysv/linux/configure.in2
-rw-r--r--sysdeps/unix/sysv/linux/fstatvfs64.c4
-rw-r--r--sysdeps/unix/sysv/linux/getpriority.c6
-rw-r--r--sysdeps/unix/sysv/linux/internal_statvfs.c2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/shm.h11
-rw-r--r--sysdeps/unix/sysv/linux/statvfs64.c4
-rw-r--r--sysvipc/sys/sem.h4
-rw-r--r--sysvipc/sys/shm.h6
-rw-r--r--time/sys/time.h28
111 files changed, 3105 insertions, 972 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c588a15e3..83ecb8f526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,137 @@
+2000-02-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* conform/conformtest.pl (@headers): Add wordexp.h, wctype.h, wchar.h,
+	varargs.h, utmpx.h, utime.h, unistd.h, ulimit.h, ucontext.h, time.h,
+	termios.h, tar.h, sys/wait.h, sys/uio.h, sys/types.h, sys/times.h,
+	sys/timeb.h, sys/time.h, sys/statvfs.h, sys/stat.h, sys/shm.h,
+	sys/sem.h, and sys/resource.h.
+	Implement handling of allow-header.
+	* conform/data/fcntl.h-data: Correct various bugs.
+	* conform/data/fnmatch.h-data: Likewise.
+	* conform/data/math.h-data: Likewise.
+	* conform/data/ndbm.h-data: Likewise.
+	* conform/data/nl_types.h-data: Likewise.
+	* conform/data/poll.h-data: Likewise.
+	* conform/data/pthread.h-data: Likewise.
+	* conform/data/semaphore.h-data: Likewise.
+	* conform/data/setjmp.h-data: Likewise.
+	* conform/data/signal.h-data: Likewise.
+	* conform/data/stdarg.h-data: Likewise.
+	* conform/data/stddef.h-data: Likewise.
+	* conform/data/stdio.h-data: Likewise.
+	* conform/data/stdlib.h-data: Likewise.
+	* conform/data/string.h-data: Likewise.
+	* conform/data/strings.h-data: Likewise.
+	* conform/data/stropts.h-data: Likewise.
+	* conform/data/syslog.h-data: Likewise.
+	* conform/data/sys/ipc.h-data: Likewise.
+	* conform/data/sys/mman.h-data: Likewise.
+	* conform/data/sys/msg.h-data: Likewise.
+	* conform/data/tar.h-data: New file.
+	* conform/data/termios.h-data: New file.
+	* conform/data/time.h-data: New file.
+	* conform/data/ucontext.h-data: New file.
+	* conform/data/ulimit.h-data: New file.
+	* conform/data/unistd.h-data: New file.
+	* conform/data/utime.h-data: New file.
+	* conform/data/utmpx.h-data: New file.
+	* conform/data/varargs.h-data: New file.
+	* conform/data/wchar.h-data: New file.
+	* conform/data/wctype.h-data: New file.
+	* conform/data/wordexp.h-data: New file.
+	* conform/data/sys/resource.h-data: New file.
+	* conform/data/sys/sem.h-data: New file.
+	* conform/data/sys/shm.h-data: New file.
+	* conform/data/sys/stat.h-data: New file.
+	* conform/data/sys/statvfs.h-data: New file.
+	* conform/data/sys/time.h-data: New file.
+	* conform/data/sys/timeb.h-data: New file.
+	* conform/data/sys/times.h-data: New file.
+	* conform/data/sys/types.h-data: New file.
+	* conform/data/sys/uio.h-data: New file.
+	* conform/data/sys/wait.h-data: New file.
+
+	* grp/grp.h (getgrent_r): Declare only if __USE_GNU.
+
+	* include/sys/time.h (__itimes): Fix type of second parameter.
+
+	* io/sys/stat.h (S_IFLNK): Define also if __USE_XOPEN.
+	(S_ISVTX): Likewise.
+
+	* io/sys/statvfs.h: Define fsblkcnt_t and fsfilcnt_t.
+
+	* locale/langindo.h: Make ERA_YEAR, INT_CURR_SYMBOL, CURRENCY_SYMBOL,
+	MON_DECIMAL_POINT, MON_THOUSANDS_SEP, MON_GROUPING, POSITIVE_SIGN,
+	NEGATIVE_SIGN, INT_FRAC_DIGITS, FRAC_DIGITS, P_CS_PRECEDES,
+	P_SEP_BY_SPACE, N_CS_PRECEDES, N_SEP_BY_SPACE, P_SIGN_POSN,
+	N_SIGN_POSN, DECIMAL_POINT, THOUSANDS_SEP, GROUPING, YESEXPR,
+	NOEXPR, YESSTR, and NOSTR only available if __USE_GNU.
+
+	* math/bits/mathcalls.h: Don't declare tgamma and scalbn if only
+	__USE_XOPEN.
+
+	* posix/unistd.h: Don't define ptrdiff_t.
+	(sbrk): Correct type of parameter.
+	* sysdeps/generic/sbrk.c: Likewise.
+	* sysdeps/mach/hurd/sbrk.c: Likewise.
+
+	* posix/sys/types.h: Allow id_t, suseconds_t, fsblkcnt_t, and
+	fsfilcnt_t being defined elsewhere.
+
+	* resource/sys/resource.h: Define id_t.
+	If __USE_XOPEN use int for type of first parameter if getrlimit,
+	getrlimit64, setrlimit, setrlimit64, getrusage, getpriority, and
+	setpriority.
+	* sysdeps/generic/getpriority.c: Fix type of second parameter.
+	* sysdeps/generic/setpriority.c: Likewise.
+	* sysdeps/mach/hurd/getpriority.c: Likewise.
+	* sysdeps/mach/hurd/setpriority.c: Likewise.
+	* sysdeps/unix/sysv/irix4/getpriority.c: Likewise.
+	* sysdeps/unix/sysv/irix4/setpriority.c: Likewise.
+	* sysdeps/unix/sysv/linux/getpriority.c: Likewise.
+
+	* sysdeps/generic/utimes.c: Fix parameter of third parameter.
+	* sysdeps/mach/hurd/utimes.c: Likewise.
+	* sysdeps/posix/utimes.c: Likewise.
+
+	* sysdeps/generic/bits/shm.h: Define shmatt_t type and use it in
+	struct shmid_ds definition.
+	* sysdeps/gnu/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
+
+	* sysvipc/sys/shm.h: Define time_t.
+
+	* sysvipc/sys/sem.h (struct sembuf): Make sem_num field unsigned.
+
+	* sysdeps/gnu/bits/sem.h: Rename anonymous type struct sem_queue and
+	struct sem_undo to struct __sem_queue and struct __sem_undo resp.
+
+	* time/time.h: Define suseconds_t if not already done.
+
+	* sysdeps/unix/sysv/linux/bits/statvfs.h: Rename f_spare to __f_spare.
+	* sysdeps/unix/sysv/linux/fstatvfs64.c: Likewise.
+	* sysdeps/unix/sysv/linux/statvfs64.c: Likewise.
+	* sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise.
+
+	* intl/bindtextdom.c: Use rwlock to avoid surprising results in
+	multithreaded applications.
+	* intl/dcigettext.c: Likewise.
+	* intl/textdomain.c: Likewise.
+	* intl/*.c: Update copyright.
+	* sysdeps/generic/bits/libc-lock.h: Define __libc_rwlock_* stubs.
+
+2000-02-27  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/configure.in: Treat also "/usr/" as
+	prefix especially.
+
+2000-02-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* po/de.po: Update from translation team.
+	* po/ko.po: Likewise.
+
 2000-02-25  Andreas Jaeger  <aj@suse.de>
 
 	* math/Versions: Move fe* function to GLIBC_2.2.  The patches have
diff --git a/bits/libc-lock.h b/bits/libc-lock.h
index 84f9cd4653..4613310d39 100644
--- a/bits/libc-lock.h
+++ b/bits/libc-lock.h
@@ -1,5 +1,5 @@
 /* libc-internal interface for mutex locks.  Stub version.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000 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
@@ -29,9 +29,11 @@
    begins with a `*'), because its storage size will not be known outside
    of libc.  */
 #define __libc_lock_define(CLASS,NAME)
+#define __libc_rwlock_define(CLASS,NAME)
 
 /* Define an initialized lock variable NAME with storage class CLASS.  */
 #define __libc_lock_define_initialized(CLASS,NAME)
+#define __libc_rwlock_define_initialized(CLASS,NAME)
 
 /* Define an initialized recursive lock variable NAME with storage
    class CLASS.  */
@@ -40,6 +42,7 @@
 /* Initialize the named lock variable, leaving it in a consistent, unlocked
    state.  */
 #define __libc_lock_init(NAME)
+#define __libc_rwlock_init(NAME)
 
 /* Same as last but this time we initialize a recursive mutex.  */
 #define __libc_lock_init_recursive(NAME)
@@ -48,24 +51,30 @@
    used again until __libc_lock_init is called again on it.  This must be
    called on a lock variable before the containing storage is reused.  */
 #define __libc_lock_fini(NAME)
+#define __libc_rwlock_fini(NAME)
 
 /* Finalize recursive named lock.  */
 #define __libc_lock_fini_recursive(NAME)
 
 /* Lock the named lock variable.  */
 #define __libc_lock_lock(NAME)
+#define __libc_rwlock_rdlock(NAME)
+#define __libc_rwlock_wrlock(NAME)
 
 /* Lock the recursive named lock variable.  */
 #define __libc_lock_lock_recursive(NAME)
 
 /* Try to lock the named lock variable.  */
 #define __libc_lock_trylock(NAME) 0
+#define __libc_rwlock_tryrdlock(NAME) 0
+#define __libc_rwlock_trywrlock(NAME) 0
 
 /* Try to lock the recursive named lock variable.  */
 #define __libc_lock_trylock_recursive(NAME) 0
 
 /* Unlock the named lock variable.  */
 #define __libc_lock_unlock(NAME)
+#define __libc_rwlock_unlock(NAME)
 
 /* Unlock the recursive named lock variable.  */
 #define __libc_lock_unlock_recursive(NAME)
diff --git a/bits/shm.h b/bits/shm.h
index 8c97999626..e230f81061 100644
--- a/bits/shm.h
+++ b/bits/shm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 2000 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
@@ -20,7 +20,7 @@
 # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
 #endif
 
-#include <sys/types.h>
+#include <bits/types.h>
 
 /* Flags for `shmat'.  */
 #define SHM_RDONLY	010000		/* attach read-only else read-write */
@@ -32,6 +32,9 @@
 #define SHM_UNLOCK	12		/* unlock segment (root only) */
 
 
+/* Type to count number of attaches.  */
+typedef unsigned short int shmatt_t;
+
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
   {
@@ -42,5 +45,5 @@ struct shmid_ds
     __time_t sem_ctime;			/* time of last change by shmctl() */
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
-    unsigned short int shm_nattch;	/* number of current attaches */
+    shmatt_t shm_nattch;		/* number of current attaches */
   };
diff --git a/conform/conformtest.pl b/conform/conformtest.pl
index 23fff7084d..0608d9ff15 100644
--- a/conform/conformtest.pl
+++ b/conform/conformtest.pl
@@ -4,7 +4,12 @@ $CC = "gcc";
 $CFLAGS = "-I. '-D__attribute__(x)=' -D_XOPEN_SOURCE=500";
 
 # List of the headers we are testing.
-@headers = ("sys/msg.h", "sys/mman.h", "sys/ipc.h", "syslog.h",
+@headers = ("wordexp.h", "wctype.h", "wchar.h", "varargs.h", "utmpx.h",
+	    "utime.h", "unistd.h", "ulimit.h", "ucontext.h", "time.h",
+	    "termios.h", "tar.h", "sys/wait.h", "sys/uio.h", "sys/types.h",
+	    "sys/times.h", "sys/timeb.h", "sys/time.h", "sys/statvfs.h",
+	    "sys/stat.h", "sys/shm.h", "sys/sem.h", "sys/resource.h",
+	    "sys/msg.h", "sys/mman.h", "sys/ipc.h", "syslog.h",
 	    "stropts.h", "strings.h", "string.h", "stdlib.h", "stdio.h",
 	    "stddef.h", "stdarg.h", "signal.h", "setjmp.h", "semaphore.h",
 	    "search.h", "sched.h", "regex.h", "pwd.h", "pthread.h",
@@ -240,6 +245,7 @@ while ($#headers >= 0) {
   my($fnamebase) = "$tmpdir/$hf-test";
   my($missing);
   my(@allow) = ();
+  my(@allowheader) = ();
   my($prepend) = $mustprepend{$h};
 
   printf ("Testing <$h>\n");
@@ -539,6 +545,10 @@ while ($#headers >= 0) {
       my($pattern) = $1;
       push @allow, $pattern;
       next control;
+    } elsif (/^allow-header *(.*)/) {
+      my($pattern) = $1;
+      push @allowheader, $pattern;
+      next control;
     } else {
       # printf ("line is `%s'\n", $_);
       next control;
@@ -548,6 +558,51 @@ while ($#headers >= 0) {
   }
   close (CONTROL);
 
+  # Read the data files for the header files which are allowed to be included.
+  while ($#allowheader >= 0) {
+    my($ah) = pop @allowheader;
+
+    open (ALLOW, "$CC -E -D$dialect - < data/$ah-data |");
+    acontrol: while (<ALLOW>) {
+      next acontrol if (/^#/);
+      next acontrol if (/^[ 	]*$/);
+
+      if (/^element *({([^}]*)}|([^ ]*)) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*) *(.*)/) {
+	push @allow, $7;
+      } elsif (/^constant *([a-zA-Z0-9_]*) *([A-Za-z0-9_]*)?/) {
+	push @allow, $1;
+      } elsif (/^typed-constant *([a-zA-Z0-9_]*) *({([^}]*)}|([^ ]*)) *([A-Za-z0-9_]*)?/) {
+	push @allow, 1;
+      } elsif (/^type *({([^}]*)|([a-zA-Z0-9_]*))/) {
+	my($type) = "$2$3";
+
+	# Remember that this name is allowed.
+	if ($type =~ /^struct *(.*)/) {
+	  push @allow, $1;
+	} elsif ($type =~ /^union *(.*)/) {
+	  push @allow, $1;
+	} else {
+	  push @allow, $type;
+	}
+      } elsif (/^function *({([^}]*)}|([a-zA-Z0-9_]*)) [(][*]([a-zA-Z0-9_]*) ([(].*[)])/) {
+	push @allow, $4;
+      } elsif (/^function *({([^}]*)}|([a-zA-Z0-9_]*)) ([a-zA-Z0-9_]*) ([(].*[)])/) {
+	push @allow, $4;
+      } elsif (/^variable *({([^}]*)}|([a-zA-Z0-9_]*)) ([a-zA-Z0-9_]*)/) {
+	push @allow, $4;
+      } elsif (/^macro-function *({([^}]*)}|([a-zA-Z0-9_]*)) ([a-zA-Z0-9_]*) ([(].*[)])/) {
+	push @allow, $4;
+      } elsif (/^macro *([^ 	]*)/) {
+	push @allow, $1;
+      } elsif (/^allow *(.*)/) {
+	push @allow, $1;
+      } elsif (/^allow-header *(.*)/) {
+	push @allowheader, $1;
+      }
+    }
+    close (ALLOW);
+  }
+
   # Now check the namespace.
   printf ("  Checking the namespace of \"%s\"... ", $h);
   if ($missing) {
diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data
index 0344ce973b..cf34c2b9ce 100644
--- a/conform/data/fcntl.h-data
+++ b/conform/data/fcntl.h-data
@@ -50,6 +50,9 @@ function int open (const char*, int, ...)
 allow-header sys/stat.h
 allow-header unistd.h
 
-allow *_t
 allow l_*
+allow F_*
+allow O_*
+allow S_*
+allow *_t
 #endif
diff --git a/conform/data/fnmatch.h-data b/conform/data/fnmatch.h-data
index 82a4136c56..ef34fc4e04 100644
--- a/conform/data/fnmatch.h-data
+++ b/conform/data/fnmatch.h-data
@@ -7,5 +7,6 @@ constant FNM_NOSYS
 
 function int fnmatch (const char*, const char*, int)
 
+allow FNM_*
 allow *_t
 #endif
diff --git a/conform/data/math.h-data b/conform/data/math.h-data
index 466de7d687..0d391eb99a 100644
--- a/conform/data/math.h-data
+++ b/conform/data/math.h-data
@@ -32,6 +32,7 @@ function double frexp (double, int*)
 function double ldexp (double, int)
 function double log (double)
 function double log10 (double)
+function double modf (double, double*)
 function double pow (double, double)
 function double sin (double)
 function double sinh (double)
diff --git a/conform/data/ndbm.h-data b/conform/data/ndbm.h-data
index 7843941114..6e606e589c 100644
--- a/conform/data/ndbm.h-data
+++ b/conform/data/ndbm.h-data
@@ -22,5 +22,7 @@ function datum dbm_nextkey (DBM*)
 function {DBM*} dbm_open (const char*, int, mode_t)
 function int dbm_store (DBM*, datum, datum, int)
 
+allow dbm_*
+allow DBM_*
 allow *_t
 #endif
diff --git a/conform/data/nl_types.h-data b/conform/data/nl_types.h-data
index 7cabf3ff62..ec2c18bc3e 100644
--- a/conform/data/nl_types.h-data
+++ b/conform/data/nl_types.h-data
@@ -9,5 +9,6 @@ function int catclose (nl_catd)
 function {char*} catgets (nl_catd, int, int, const char*)
 function nl_catd catopen (const char*, int)
 
+allow NL_*
 allow *_t
 #endif
diff --git a/conform/data/poll.h-data b/conform/data/poll.h-data
index fdc7b2f5ea..b695cad6d8 100644
--- a/conform/data/poll.h-data
+++ b/conform/data/poll.h-data
@@ -19,5 +19,9 @@ constant POLLNVAL
 
 function int poll (struct pollfd[], nfsd_t, int)
 
+allow pd_*
+allow ph_*
+allow ps_*
+allow POLL*
 allow *_t
 #endif
diff --git a/conform/data/pthread.h-data b/conform/data/pthread.h-data
index eb0523e6af..f437814528 100644
--- a/conform/data/pthread.h-data
+++ b/conform/data/pthread.h-data
@@ -1,4 +1,4 @@
-#ifdef ISO
+#ifndef ISO
 constant PTHREAD_CANCEL_ASYNCHRONOUS
 constant PTHREAD_CANCEL_ENABLE
 constant PTHREAD_CANCEL_DEFERRED
diff --git a/conform/data/semaphore.h-data b/conform/data/semaphore.h-data
index 9664b67dd5..8a59746f51 100644
--- a/conform/data/semaphore.h-data
+++ b/conform/data/semaphore.h-data
@@ -20,4 +20,5 @@ allow-header sys/types.h
 
 allow sem_*
 allow SEM_*
+allow *_t
 #endif
diff --git a/conform/data/setjmp.h-data b/conform/data/setjmp.h-data
index 806dacfc94..ef29c9cbe8 100644
--- a/conform/data/setjmp.h-data
+++ b/conform/data/setjmp.h-data
@@ -18,3 +18,5 @@ macro-function int sigsetjmp (sigjmp_buf, int)
 macro-function int _setjmp (jmp_buf)
 # endif
 #endif
+
+allow *_t
diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index fda1af9436..ee6ec52e3c 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -189,3 +189,14 @@ allow SI_*
 allow sigev_*
 allow SIGEV_*
 allow sival_*
+allow SA_*
+allow BUS_*
+allow CLD_*
+allow FPE_*
+allow ILL_*
+allow POLL_*
+allow SEGV_*
+allow SS_*
+allow SV_*
+allow TRAP_*
+allow *_t
diff --git a/conform/data/stdarg.h-data b/conform/data/stdarg.h-data
index 719d504ef9..ee228d0cd0 100644
--- a/conform/data/stdarg.h-data
+++ b/conform/data/stdarg.h-data
@@ -5,3 +5,5 @@ macro va_start
 macro va_arg
 macro va_end
 macro va_copy
+
+allow *_t
diff --git a/conform/data/stddef.h-data b/conform/data/stddef.h-data
index 05b157060a..630e017acf 100644
--- a/conform/data/stddef.h-data
+++ b/conform/data/stddef.h-data
@@ -6,3 +6,5 @@ type ptrdiff_t
 type wchar_t
 type size_t
 type wint_t
+
+allow *_t
diff --git a/conform/data/stdio.h-data b/conform/data/stdio.h-data
index 93238ba0ba..9299a9ad83 100644
--- a/conform/data/stdio.h-data
+++ b/conform/data/stdio.h-data
@@ -100,4 +100,6 @@ variable int optind
 variable int optopt
 
 allow-header stddef.h
+
+allow *_t
 #endif
diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data
index 00fd032227..74dc452084 100644
--- a/conform/data/stdlib.h-data
+++ b/conform/data/stdlib.h-data
@@ -83,3 +83,6 @@ allow-header stddef.h
 allow-header limits.h
 allow-header math.h
 allow-header sys/wait.h
+
+allow str*
+allow *_t
diff --git a/conform/data/string.h-data b/conform/data/string.h-data
index fe27c8ab61..4773cb2b54 100644
--- a/conform/data/string.h-data
+++ b/conform/data/string.h-data
@@ -29,3 +29,7 @@ function {char*} strtok_r (char*, const char*, char**)
 function size_t strxfrm (char*, const char*, size_t)
 
 allow-header stddef.h
+
+allow str*
+allow wcs*
+allow *_t
diff --git a/conform/data/strings.h-data b/conform/data/strings.h-data
index 7d7d67e9ce..201780c8d3 100644
--- a/conform/data/strings.h-data
+++ b/conform/data/strings.h-data
@@ -8,3 +8,5 @@ function int strcasecmp (const char*, const char*)
 function int strncasecmp (const char*, const char*, size_t)
 
 type size_t
+
+allow *_t
diff --git a/conform/data/stropts.h-data b/conform/data/stropts.h-data
index 318dc11b32..c760282046 100644
--- a/conform/data/stropts.h-data
+++ b/conform/data/stropts.h-data
@@ -121,3 +121,17 @@ function int fattach (int, const char*)
 function int fdetach (const char*)
 
 allow-header unistd.h
+
+allow bi_*
+allow ic_*
+allow l_*
+allow sl_*
+allow str_*
+allow FLUSH*
+allow I_*
+allow M_*
+allow MUXID_R*
+allow S_*
+allow SND*
+allow STR*
+allow *_t
diff --git a/conform/data/sys/ipc.h-data b/conform/data/sys/ipc.h-data
index 0bfd22bad2..1b2ec99d37 100644
--- a/conform/data/sys/ipc.h-data
+++ b/conform/data/sys/ipc.h-data
@@ -22,3 +22,7 @@ constant IPC_SET
 constant IPC_STAT
 
 function key_t ftok (const char*, int)
+
+allow ipc_*
+allow IPC_*
+allow *_t
diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data
index f45ea0c8c3..8a696d349b 100644
--- a/conform/data/sys/mman.h-data
+++ b/conform/data/sys/mman.h-data
@@ -30,3 +30,10 @@ function int munlockall (void)
 function int munmap (void*, size_t)
 function int shm_open (const char*, int, mode_t)
 function int shm_unlink (const char*)
+
+allow shm_*
+allow MAP_*
+allow MCL_*
+allow MS_*
+allow PROT_*
+allow *_t
diff --git a/conform/data/sys/msg.h-data b/conform/data/sys/msg.h-data
index 69bd82f956..7a1df4cbed 100644
--- a/conform/data/sys/msg.h-data
+++ b/conform/data/sys/msg.h-data
@@ -26,3 +26,7 @@ function ssize_t msgrcv (int, void*, size_t, long int, int)
 function int msgsnd (int, const void*, size_t, int)
 
 allow-header sys/ipc.h
+
+allow msg*
+allow MSG*
+allow *_h
diff --git a/conform/data/sys/resource.h-data b/conform/data/sys/resource.h-data
new file mode 100644
index 0000000000..d9f9b9ab8c
--- /dev/null
+++ b/conform/data/sys/resource.h-data
@@ -0,0 +1,50 @@
+constant PRIO_PROCESS
+constant PRIO_PGRP
+constant PRIO_USER
+
+type rlim_t
+
+constant RLIM_INFINITY
+constant RLIM_SAVED_MAX
+constant RLIM_SAVED_CUR
+
+constant RUSAGE_SELF
+constant RUSAGE_CHILDREN
+
+type {struct rlimit}
+
+element {struct rlimit} rlim_t rlim_cur
+element {struct rlimit} rlim_t rlim_max
+
+type {struct rusage}
+
+element {struct rusage} {struct timeval} ru_utime
+element {struct rusage} {struct timeval} ru_stime
+
+type {struct timeval}
+
+constant RLIMIT_CORE
+constant RLIMIT_CPU
+constant RLIMIT_DATA
+constant RLIMIT_FSIZE
+constant RLIMIT_NOFILE
+constant RLIMIT_STACK
+constant RLIMIT_AS
+
+function int getpriority (int, id_t)
+function int getrlimit (int, struct rlimit*)
+function int getrusage (int, struct rusage*)
+function int setpriority (int, id_t, int)
+function int setrlimit (int, const struct rlimit*)
+
+type id_t
+
+allow-header sys/time.h
+
+allow rlim_*
+allow ru_*
+allow PRIO_*
+allow RLIM_*
+allow RLIMIT_*
+allow RUSAGE_*
+allow *_t
diff --git a/conform/data/sys/sem.h-data b/conform/data/sys/sem.h-data
new file mode 100644
index 0000000000..8b4598b7b2
--- /dev/null
+++ b/conform/data/sys/sem.h-data
@@ -0,0 +1,37 @@
+constant SEM_UNDO
+
+constant GETNCNT
+constant GETPID
+constant GETVAL
+constant GETALL
+constant GETZCNT
+constant SETVAL
+constant SETALL
+
+type {struct semid_ds}
+
+element {struct semid_ds} {struct ipc_perm} sem_perm
+element {struct semid_ds} {unsigned short int} sem_nsems
+element {struct semid_ds} time_t sem_otime
+element {struct semid_ds} time_t sem_ctime
+
+type pid_t
+type time_t
+type key_t
+type size_t
+
+type {struct sembuf}
+
+element {struct sembuf} {unsigned short int} sem_num
+element {struct sembuf} {short int} sem_op
+element {struct sembuf} {short int} sem_flg
+
+function int semctl (int, int, int, ...)
+function int semget (key_t, int, int)
+function int semop (int, struct sembuf*, size_t)
+
+allow-header sys/ipc.h
+
+allow sem*
+allow SEM_*
+allow *_t
diff --git a/conform/data/sys/shm.h-data b/conform/data/sys/shm.h-data
new file mode 100644
index 0000000000..a08d6f5596
--- /dev/null
+++ b/conform/data/sys/shm.h-data
@@ -0,0 +1,32 @@
+constant SHM_RDONLY
+constant SHMLBA
+constant SHM_RND
+
+type shmatt_t
+
+type {struct shmid_ds}
+
+element {struct shmid_ds} {struct ipc_perm} shm_perm
+element {struct shmid_ds} size_t shm_segsz
+element {struct shmid_ds} pid_t shm_lpid
+element {struct shmid_ds} pid_t shm_cpid
+element {struct shmid_ds} shmatt_t shm_nattch
+element {struct shmid_ds} time_t shm_atime
+element {struct shmid_ds} time_t shm_dtime
+element {struct shmid_ds} time_t shm_ctime
+
+type pid_t
+type time_t
+type key_t
+type size_t
+
+function {void*} shmat (int, const void*, int)
+function int shmctl (int, int, struct shmid_ds*)
+function int shmdt (const void*)
+function int shmget (key_t, size_t, int)
+
+allow-header sys/ipc.h
+
+allow shm*
+allow SHM*
+allow *_t
diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
new file mode 100644
index 0000000000..97ab81287d
--- /dev/null
+++ b/conform/data/sys/stat.h-data
@@ -0,0 +1,75 @@
+type {struct stat}
+
+element {struct stat} dev_t st_dev
+element {struct stat} ino_t st_ino
+element {struct stat} mode_t st_mode
+element {struct stat} nlink_t st_nlink
+element {struct stat} uid_t st_uid
+element {struct stat} gid_t st_gid
+element {struct stat} dev_t st_rdev
+element {struct stat} off_t st_size
+element {struct stat} time_t st_atime
+element {struct stat} time_t st_mtime
+element {struct stat} time_t st_ctime
+element {struct stat} blksize_t st_blksize
+element {struct stat} blkcnt_t st_blocks
+
+type blkcnt_t
+type blksize_t
+type dev_t
+type ino_t
+type mode_t
+type nlink_t
+type uid_t
+type gid_t
+type off_t
+type time_t
+
+constant S_IFMT
+constant S_IFBLK
+constant S_IFCHR
+constant S_IFIFO
+constant S_IFREG
+constant S_IFDIR
+constant S_IFLNK
+
+constant S_IRWXU
+constant S_IRUSR
+constant S_IWUSR
+constant S_IXUSR
+constant S_IRWXG
+constant S_IWGRP
+constant S_IXGRP
+constant S_IRWXO
+constant S_IROTH
+constant S_IWOTH
+constant S_IXOTH
+constant S_ISUID
+constant S_ISGID
+constant S_ISVTX
+
+macro S_ISBLK
+macro S_ISCHR
+macro S_ISDIR
+macro S_ISFIFO
+macro S_ISREG
+macro S_ISLNK
+
+# How to represent optional tests?
+# macro S_TYPEISMQ
+# macro S_TYPEISSEM
+# macro S_TYPEISSHM
+
+function int chmod (const char*, mode_t)
+function int fchmod (int, mode_t)
+function int fstat (int, struct stat*)
+function int lstat (const char*, struct stat*)
+function int mkdir (const char*, mode_t)
+function int mkfifo (const char*, mode_t)
+function int mknod (const char*, mode_t, dev_t)
+function int stat (const char*, struct stat*)
+function mode_t umask (mode_t)
+
+allow st_*
+allow S_*
+allow *_t
diff --git a/conform/data/sys/statvfs.h-data b/conform/data/sys/statvfs.h-data
new file mode 100644
index 0000000000..d7312cdb87
--- /dev/null
+++ b/conform/data/sys/statvfs.h-data
@@ -0,0 +1,26 @@
+type {struct statvfs}
+
+element {struct statvfs} {unsigned long} f_bsize
+element {struct statvfs} {unsigned long} f_frsize
+element {struct statvfs} fsblkcnt_t f_blocks
+element {struct statvfs} fsblkcnt_t f_bfree
+element {struct statvfs} fsblkcnt_t f_bavail
+element {struct statvfs} fsfilcnt_t f_files
+element {struct statvfs} fsfilcnt_t f_ffree
+element {struct statvfs} fsfilcnt_t f_favail
+element {struct statvfs} {unsigned long} f_fsid
+element {struct statvfs} {unsigned long} f_flag
+element {struct statvfs} {unsigned long} f_namemax
+
+type fsblkcnt_t
+type fsfilcnt_t
+
+constant ST_RDONLY
+constant ST_NOSUID
+
+function int statvfs (const char*, struct statvfs*)
+function int fstatvfs (int, struct statvfs*)
+
+allow f_*
+allow ST_*
+allow *_t
diff --git a/conform/data/sys/time.h-data b/conform/data/sys/time.h-data
new file mode 100644
index 0000000000..49d5fbc2d1
--- /dev/null
+++ b/conform/data/sys/time.h-data
@@ -0,0 +1,40 @@
+type {struct timeval}
+
+element {struct timeval} time_t tv_sec
+element {struct timeval} suseconds_t tv_usec
+
+type {struct itimerval}
+
+element {struct itimerval} {struct timeval} it_interval
+element {struct itimerval} {struct timeval} it_value
+
+type time_t
+type suseconds_t
+
+type {struct fd_set}
+
+element {struct fd_set} long fds_bits []
+
+constant ITIMER_REAL
+constant ITIMER_VIRTUAL
+constant ITIMER_PROF
+
+macro FD_CLR
+macro FD_ISSET
+macro FD_SET
+macro FD_ZERO
+
+constant FD_SETSIZE
+
+function int getitimer (int, struct itimerval*)
+function int setitimer (int, const struct itimerval*, struct itimerval*)
+function int gettimeofday (struct timeval*, void*)
+function int select (int, fd_set*, fd_set*, fd_set*, struct timeval*)
+function int utimes (const char*, const struct timeval [2])
+
+allow fds_*
+allow it_*
+allow tv_*
+allow FD_*
+allow ITIMER_*
+allow *_t
diff --git a/conform/data/sys/timeb.h-data b/conform/data/sys/timeb.h-data
new file mode 100644
index 0000000000..d012f5d69a
--- /dev/null
+++ b/conform/data/sys/timeb.h-data
@@ -0,0 +1,12 @@
+type {struct timeb}
+
+element {struct timeb} time_t time
+element {struct timeb} {unsigned short} millitm
+element {struct timeb} short timezone
+element {struct timeb} short dstflag
+
+type time_t
+
+function int ftime (struct timeb*)
+
+allow *_t
diff --git a/conform/data/sys/times.h-data b/conform/data/sys/times.h-data
new file mode 100644
index 0000000000..9c3237eb83
--- /dev/null
+++ b/conform/data/sys/times.h-data
@@ -0,0 +1,13 @@
+type {struct tms}
+
+element {struct tms} clock_t tms_utime
+element {struct tms} clock_t tms_stime
+element {struct tms} clock_t tms_cutime
+element {struct tms} clock_t tms_cstime
+
+type clock_t
+
+function clock_t times (struct tms*)
+
+allow tms_*
+allow *_t
diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data
new file mode 100644
index 0000000000..6a08c1940e
--- /dev/null
+++ b/conform/data/sys/types.h-data
@@ -0,0 +1,34 @@
+type blkcnt_t
+type blksize_t
+type clock_t
+type clockid_t
+type dev_t
+type fsblkcnt_t
+type fsfilcnt_t
+type gid_t
+type id_t
+type ino_t
+type key_t
+type mode_t
+type nlink_t
+type off_t
+type pid_t
+type pthread_attr_t
+type pthread_cond_t
+type pthread_condattr_t
+type pthread_key_t
+type pthread_mutex_t
+type pthread_mutexattr_t
+type pthread_once_t
+type pthread_rwlock_t
+type pthread_rwlockattr_t
+type pthread_t
+type size_t
+type ssize_t
+type suseconds_t
+type time_t
+type timer_t
+type uid_t
+type useconds_t
+
+allow *_t
diff --git a/conform/data/sys/uio.h-data b/conform/data/sys/uio.h-data
new file mode 100644
index 0000000000..593cb18ef8
--- /dev/null
+++ b/conform/data/sys/uio.h-data
@@ -0,0 +1,11 @@
+type {struct iovec}
+
+element {struct iovec} {void*} iov_base
+element {struct iovec} size_t iov_len
+
+function ssize_t readv (int, const struct iovec*, int)
+function ssize_t writev (int, const struct iovec*, int)
+
+allow iov_*
+allow IOV_*
+allow *_t
diff --git a/conform/data/sys/wait.h-data b/conform/data/sys/wait.h-data
new file mode 100644
index 0000000000..731c9551f7
--- /dev/null
+++ b/conform/data/sys/wait.h-data
@@ -0,0 +1,64 @@
+constant WNOHANG
+constant WUNTRACED
+
+macro WEXITSTATUS
+macro WIFCONTINUED
+macro WIFEXITED
+macro WIFSIGNALED
+macro WIFSTOPPED
+macro WSTOPSIG
+macro WTERMSIG
+
+constant WEXITED
+constant WSTOPPED
+constant WCONTINUED
+constant WNOHANG
+constant WNOWAIT
+
+type idtype_t
+
+constant P_ALL
+constant P_PID
+constant P_PGID
+
+type id_t
+
+type siginfo_t
+
+element siginfo_t int si_signo
+element siginfo_t int si_errno
+element siginfo_t int si_code
+element siginfo_t pid_t si_pid
+element siginfo_t uid_t si_uid
+element siginfo_t {void*} si_addr
+element siginfo_t int si_status
+element siginfo_t long si_band
+element siginfo_t {union sigval} si_value
+
+type {struct rusage}
+
+element {struct rusage} {struct timeval} ru_utime
+element {struct rusage} {struct timeval} ru_stime
+
+type pid_t
+
+function pid_t wait (int*)
+function pid_t wait3 (int*, int, struct rusage*)
+function int waitid (idtype_t, id_t, siginfo_t*, int)
+function pid_t waitpid (pid_t, int*, int)
+
+allow-header signal.h
+allow-header sys/resource.h
+
+allow si_*
+allow W*
+allow P_*
+allow BUS_
+allow CLD_
+allow FPE_
+allow ILL_
+allow POLL_
+allow SEGV_
+allow SI_
+allow TRAP_
+allow *_t
diff --git a/conform/data/syslog.h-data b/conform/data/syslog.h-data
index 62ae5512ac..87414e8a7e 100644
--- a/conform/data/syslog.h-data
+++ b/conform/data/syslog.h-data
@@ -37,3 +37,6 @@ function void closelog (void)
 function void openlog (const char*, int, int)
 function int setlogmask (int)
 function void syslog (int, const char*, ...)
+
+allow LOG_*
+allow *_t
diff --git a/conform/data/tar.h-data b/conform/data/tar.h-data
new file mode 100644
index 0000000000..79f6fb477a
--- /dev/null
+++ b/conform/data/tar.h-data
@@ -0,0 +1,29 @@
+constant TMAGIC
+constant TMAGLEN
+constant TVERSION
+constant TVERSLEN
+
+constant REGTYPE
+constant AREGTYPE
+constant LNKTYPE
+constant SYMTYPE
+constant CHRTYPE
+constant BLKTYPE
+constant DIRTYPE
+constant FIFOTYPE
+constant CONTTYPE
+
+constant TSUID
+constant TSGID
+constant TSVTX
+constant TUREAD
+constant TUWRITE
+constant TUEXEC
+constant TGREAD
+constant TGWRITE
+constant TGEXEC
+constant TOREAD
+constant TOWRITE
+constant TOEXEC
+
+allow *_t
diff --git a/conform/data/termios.h-data b/conform/data/termios.h-data
new file mode 100644
index 0000000000..07351b459d
--- /dev/null
+++ b/conform/data/termios.h-data
@@ -0,0 +1,159 @@
+type cc_t
+type speed_t
+type tcflag_t
+
+type {struct termios}
+
+element {struct termios} tcflag_t c_iflag
+element {struct termios} tcflag_t c_oflag
+element {struct termios} tcflag_t c_cflag
+element {struct termios} tcflag_t c_lflag
+element {struct termios} cc_t c_cc[NCCS]
+
+constant NCCS
+
+constant VEOF
+constant VEOL
+constant VERASE
+constant VINTR
+constant VKILL
+constant VMIN
+constant VQUIT
+constant VSTART
+constant VSTOP
+constant VSUSP
+constant VTIME
+
+constant BRKINT
+constant ICRNL
+constant IGNBRK
+constant IGNCR
+constant IGNPAR
+constant INLCR
+constant INPCK
+constant ISTRIP
+constant IUCLC
+constant IXANY
+constant IXOFF
+constant IXON
+constant PARMRK
+
+constant OPOST
+constant OLCUC
+constant ONLCR
+constant OCRNL
+constant ONOCR
+constant ONLRET
+constant OFILL
+constant NLDLY
+constant NL0
+constant NL1
+constant CRDLY
+constant CR0
+constant CR1
+constant CR2
+constant CR3
+constant TABDLY
+constant TAB0
+constant TAB1
+constant TAB2
+constant TAB3
+constant BSDLY
+constant BS0
+constant BS1
+constant VTDLY
+constant VT0
+constant VT1
+constant FFDLY
+constant FF0
+constant FF1
+
+constant B0
+constant B50
+constant B75
+constant B110
+constant B134
+constant B150
+constant B200
+constant B300
+constant B600
+constant B1200
+constant B1800
+constant B2400
+constant B4800
+constant B9600
+constant B19200
+constant B38400
+
+constant CSIZE
+constant CS5
+constant CS6
+constant CS7
+constant CS8
+constant CSTOPB
+constant CREAD
+constant PARENB
+constant PARODD
+constant HUPCL
+constant CLOCAL
+
+constant ECHO
+constant ECHOE
+constant ECHOK
+constant ECHONL
+constant ICANON
+constant IEXTEN
+constant ISIG
+constant NOFLSH
+constant TOSTOP
+constant XCASE
+
+constant TCSANOW
+constant TCSADRAIN
+constant TCSAFLUSH
+
+constant TCIFLUSH
+constant TCIOFLUSH
+
+constant TCIOFF
+constant TCION
+constant TCOOFF
+constant TCOON
+
+function speed_t cfgetispeed (const struct termios*)
+function speed_t cfgetospeed (const struct termios*)
+function int cfsetispeed (struct termios*, speed_t)
+function int cfsetospeed (struct termios*, speed_t)
+function int tcdrain (int)
+function int tcflow (int, int)
+function int tcflush (int, int)
+function int tcgetattr (int, struct termios*)
+function pid_t tcgetsid (int)
+function int tcsendbreak (int, int)
+function int tcsetattr (int, int, struct termios*)
+
+allow CBAUD
+allow DEFECHO
+allow ECHOCTL
+allow ECHOKE
+allow ECHOPRT
+allow EXTA
+allow EXTB
+allow FLUSHO
+allow LOBLK
+allow PENDIN
+allow SWTCH
+allow VDISCARD
+allow VDSUSP
+allow VLNEXT
+allow VREPRINT
+allow VSTATUS
+allow VWERASE
+
+allow c_*
+allow V*
+allow I*
+allow O*
+allow TC*
+allow B*
+allow *_t
diff --git a/conform/data/time.h-data b/conform/data/time.h-data
new file mode 100644
index 0000000000..045ed49624
--- /dev/null
+++ b/conform/data/time.h-data
@@ -0,0 +1,75 @@
+type {struct tm}
+
+element {struct tm} int tm_sec
+element {struct tm} int tm_min
+element {struct tm} int tm_hour
+element {struct tm} int tm_mday
+element {struct tm} int tm_mon
+element {struct tm} int tm_year
+element {struct tm} int tm_wday
+element {struct tm} int tm_yday
+element {struct tm} int tm_isdst
+
+constant NULL
+constant CLK_TCK
+constant CLOCKS_PER_SEC
+
+type {struct timespec}
+
+element {struct timespec} time_t tv_sec
+element {struct timespec} long tv_nsec
+
+type {struct itimerspec}
+
+element {struct itimerspec} {struct timespec} it_interval
+element {struct itimerspec} {struct timespec} it_value
+
+constant CLOCK_REALTIME
+constant TIME_ABSTIME
+
+type clock_t
+type clockid_t
+type size_t
+type time_t
+type timer_t
+
+variable int getdate_err
+
+function {char*} asctime (const struct tm*)
+function {char*} asctime_r (const struct tm*, char*)
+function clock_t clock (void)
+function int clock_getres (clockid_t, struct timespec*)
+function int clock_gettime (clockid_t, struct timespec*)
+function int clock_settime (clockid_t, const struct timespec*)
+function {char*} ctime (const time_t*)
+function {char*} ctime_r (const time_t*, char*)
+function double difftime (time_t, time_t)
+function {struct tm*} getdate (const char*)
+function {struct tm*} gmtime (const time_t*)
+function {struct tm*} gmtime_t (const time_t*, struct tm*)
+function {struct tm*} localtime (const time_t*)
+function {struct tm*} localtime_r (const time_t*, struct tm*)
+function time_t mktime (struct tm*)
+function int nanosleep (const struct timespec*, struct timespec*)
+function size_t strftime (char*, size_t, const char*, const struct tm*)
+function {char*} strptime (const char*, const char*, struct tm*)
+function time_t time (time_t*)
+function int timer_create (clockid_t, struct sigevent*, timer_t*)
+function int timer_delete (timer_t)
+function int timer_gettime (timer_t, struct itimerspec*)
+function int timer_getoverrun (timer_t)
+function int timer_settime (timer_t, int, const struct itimerspec*, struct itimerspec*)
+function void tzset (void)
+
+variable int daylight
+variable {long int} timezone
+# variable {char*} tzname []
+
+allow tm_*
+allow clock_*
+allow timer_*
+allow it_*
+allow tv_*
+allow CLOCK_*
+allow TIMER_*
+allow *_t
diff --git a/conform/data/ucontext.h-data b/conform/data/ucontext.h-data
new file mode 100644
index 0000000000..3ad661e7b9
--- /dev/null
+++ b/conform/data/ucontext.h-data
@@ -0,0 +1,20 @@
+type mcontext_t
+
+type ucontext_t
+
+element {struct ucontext_t} {ucontext_t*} uc_link
+element {struct ucontext_t} sigset_t uc_sigmask
+element {struct ucontext_t} stack_t uc_stack
+element {struct ucontext_t} mcontext_t uc_mcontext
+
+type sigset_t
+type stack_t
+
+function int getcontext (ucontext_t*)
+function int setcontext (const ucontext_t*)
+function void makecontext (ucontext_t*, void(*)(void), int, ...)
+function int swapcontext (ucontext_t*, const ucontext_t*)
+
+allow uc_*
+allow SS_*
+allow *_t
diff --git a/conform/data/ulimit.h-data b/conform/data/ulimit.h-data
new file mode 100644
index 0000000000..84ab56c1d1
--- /dev/null
+++ b/conform/data/ulimit.h-data
@@ -0,0 +1,7 @@
+constant UL_GETFSIZE
+constant UL_SETFSIZE
+
+function {long int} ulimit (int, ...)
+
+allow UL_*
+allow *_t
diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
new file mode 100644
index 0000000000..e3008e7be4
--- /dev/null
+++ b/conform/data/unistd.h-data
@@ -0,0 +1,308 @@
+constant _POSIX_VERSION
+constant _POSIX2_VERSION
+constant _POSIX2_C_VERSION
+constant _XOPEN_VERSION
+constant _XOPEN_XCU_VERSION
+
+constant _POSIX2_C_BIND
+constant _POSIX2_CHAR_TERM
+constant _POSIX2_LOCALDEF
+constant _POSIX2_UPE
+constant _POSIX2_VERSION
+
+constant _XOPEN_XPG2
+constant _XOPEN_XPG3
+constant _XOPEN_XPG4
+constant _XOPEN_UNIX
+
+constant _POSIX_CHOWN_RESTRICTED
+constant _POSIX_NO_TRUNC
+constant _POSIX_VDISABLE
+constant _POSIX_SAVED_IDS
+constant _POSIX_JOB_CONTROL
+
+constant _POSIX_THREADS
+constant _POSIX_THREAD_ATTR_STACKADDR
+constant _POSIX_THREAD_ATTR_STACKSIZE
+constant _POSIX_THREAD_PROCESS_SHARED
+constant _POSIX_THREAD_SAFE_FUNCTIONS
+
+constant _POSIX2_C_DEV
+constant _POSIX2_FORT_DEV
+constant _POSIX2_FORT_RUN
+constant _POSIX2_SW_DEV
+constant _XOPEN_CRYPT
+constant _XOPEN_ENH_I18N
+constant _XOPEN_LEGACY
+constant _XOPEN_REALTIME
+constant _XOPEN_REALTIME_THREADS
+constant _XOPEN_SHM
+allow _XBS5_ILP32_OFF32
+allow _XBS5_ILP32_OFBIG
+allow _XBS5_LP64_OFF64
+allow _XBS5_LPBIG_OFFBIG
+constant _POSIX_ASYNCHRONOUS_IO
+constant _POSIX_MEMLOCK
+constant _POSIX_MEMLOCK_RANGE
+constant _POSIX_MESSAGE_PASSING
+constant _POSIX_PRIORITY_SCHEDULING
+constant _POSIX_REALTIME_SIGNALS
+constant _POSIX_SEMAPHORES
+constant _POSIX_SHARED_MEMORY_OBJECTS
+constant _POSIX_SYNCHRONIZED_IO
+constant _POSIX_TIMERS
+
+constant _POSIX_FSYNC
+constant _POSIX_MAPPED_FILES
+constant _POSIX_MEMORY_PROTECTION
+
+constant _POSIX_PRIORITIZED_IO
+
+constant _POSIX_THREAD_PRIORITY_SCHEDULING
+constant _POSIX_THREAD_PRIO_INHERIT
+constant _POSIX_THREAD_PRIO_PROTECT
+
+constant _POSIX_ASYNC_IO
+constant _POSIX_PRIO_IO
+constant _POSIX_SYNC_IO
+
+constant NULL
+
+constant R_OK
+constant W_OK
+constant X_OK
+constant F_OK
+
+constant _CS_PATH
+constant _CS_XBS5_ILP32_OFF32_CFLAGS
+constant _CS_XBS5_ILP32_OFF32_LDFLAGS
+constant _CS_XBS5_ILP32_OFF32_LIBS
+constant _CS_XBS5_ILP32_OFF32_LINTFLAGS
+constant _CS_XBS5_ILP32_OFFBIG_CFLAGS
+constant _CS_XBS5_ILP32_OFFBIG_LDFLAGS
+constant _CS_XBS5_ILP32_OFFBIG_LIBS
+constant _CS_XBS5_ILP32_OFFBIG_LINTFLAGS
+constant _CS_XBS5_LP64_OFF64_CFLAGS
+constant _CS_XBS5_LP64_OFF64_LDFLAGS
+constant _CS_XBS5_LP64_OFF64_LIBS
+constant _CS_XBS5_LP64_OFF64_LINTFLAGS
+constant _CS_XBS5_LPBIG_OFFBIG_CFLAGS
+constant _CS_XBS5_LPBIG_OFFBIG_LDFLAGS
+constant _CS_XBS5_LPBIG_OFFBIG_LIBS
+constant _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS
+
+constant SEEK_SET
+constant SEEK_CUR
+constant SEEK_END
+
+constant _SC_2_C_BIND
+constant _SC_2_C_DEV
+constant _SC_2_C_VERSION
+constant _SC_2_FORT_DEV
+constant _SC_2_FORT_RUN
+constant _SC_2_LOCALEDEF
+constant _SC_2_SW_DEV
+constant _SC_2_UPE
+constant _SC_2_VERSION
+constant _SC_ARG_MAX
+constant _SC_AIO_LISTIO_MAX
+constant _SC_AIO_MAX
+constant _SC_AIO_PRIO_DELTA_MAX
+constant _SC_ASYNCHRONOUS_IO
+constant _SC_ATEXIT_MAX
+constant _SC_BC_BASE_MAX
+constant _SC_BC_DIM_MAX
+constant _SC_BC_SCALE_MAX
+constant _SC_BC_STRING_MAX
+constant _SC_CHILD_MAX
+constant _SC_CLK_TCK
+constant _SC_COLL_WEIGHTS_MAX
+constant _SC_DELAYTIMER_MAX
+constant _SC_EXPR_NEST_MAX
+constant _SC_FSYNC
+constant _SC_GETGR_R_SIZE_MAX
+constant _SC_GETPW_R_SIZE_MAX
+constant _SC_IOV_MAX
+constant _SC_JOB_CONTROL
+constant _SC_LINE_MAX
+constant _SC_LOGIN_NAME_MAX
+constant _SC_MAPPED_FILES
+constant _SC_MEMLOCK
+constant _SC_MEMLOCK_RANGE
+constant _SC_MQ_OPEN_MAX
+constant _SC_MQ_PRIO_MAX
+constant _SC_NGROUPS_MAX
+constant _SC_OPEN_MAX
+constant _SC_PAGESIZE
+constant _SC_PAGE_SIZE
+constant _SC_PASS_MAX
+constant _SC_PRIORITIZED_IO
+constant _SC_PRIORITY_SCHEDULING
+constant _SC_RE_DUP_MAX
+constant _SC_REALTIME_SIGNALS
+constant _SC_RTSIG_MAX
+constant _SC_SAVED_IDS
+constant _SC_SEMAPHORES
+constant _SC_SEM_NSEMS_MAX
+constant _SC_SEM_VALUE_MAX
+constant _SC_SHARED_MEMORY_OBJECTS
+constant _SC_SIGQUEUE_MAX
+constant _SC_STREAM_MAX
+constant _SC_SYNCHRONIZED_IO
+constant _SC_THREADS
+constant _SC_THREAD_ATTR_STACKADDR
+constant _SC_THREAD_ATTR_STACKSIZE
+constant _SC_THREAD_DESTRUCTOR_ITERATIONS
+constant _SC_THREAD_KEYS_MAX
+constant _SC_THREAD_PRIORITY_SCHEDULING
+constant _SC_THREAD_PRIO_INHERIT
+constant _SC_THREAD_PRIO_PROTECT
+constant _SC_THREAD_PROCESS_SHARED
+constant _SC_THREAD_SAFE_FUNCTIONS
+constant _SC_THREAD_STACK_MIN
+constant _SC_THREAD_THREADS_MAX
+constant _SC_TIMERS
+constant _SC_TIMER_MAX
+constant _SC_TTY_NAME_MAX
+constant _SC_TZNAME_MAX
+constant _SC_VERSION
+constant _SC_XOPEN_VERSION
+constant _SC_XOPEN_CRYPT
+constant _SC_XOPEN_ENH_I18N
+constant _SC_XOPEN_SHM
+constant _SC_XOPEN_UNIX
+constant _SC_XOPEN_XCU_VERSION
+constant _SC_XOPEN_LEGACY
+constant _SC_XOPEN_REALTIME
+constant _SC_XOPEN_REALTIME_THREADS
+constant _SC_XBS5_ILP32_OFF32
+constant _SC_XBS5_ILP32_OFFBIG
+constant _SC_XBS5_ILP64_OFF64
+constant _SC_XBS5_ILPIBIG_OFFBIG
+
+constant F_LOCK
+constant F_ULOCK
+constant F_TEST
+constant F_TLOCK
+
+constant _PC_ASYNC_IO
+constant _PC_CHOWN_RESTRICTED
+constant _PC_FILESIZEBITS
+constant _PC_LINK_MAX
+constant _PC_MAX_CANON
+constant _PC_MAX_INPUT
+constant _PC_NAME_MAX
+constant _PC_NO_TRUNC
+constant _PC_PATH_MAX
+constant _PC_PIPE_BUF
+constant _PC_PRIO_IO
+constant _PC_SYNC_IO
+constant _PC_VDISABLE
+
+constant STDIN_FILENO
+constant STDOUT_FILENO
+constant STDERR_FILENO
+
+type size_t
+type ssize_t
+type uid_t
+type gid_t
+type uid_t
+type pid_t
+
+type useconds_t
+
+type intptr_t
+
+function int access (const char*, int)
+function {unsigned int} alarm (unsigned int)
+function int brk (void*)
+function int chdir (const char*)
+function int chroot (const char*)
+function int chown (const char*, uid_t, gid_t)
+function int close (int)
+function size_t confstr (int, char*, size_t)
+function {char*} crypt (const char*, const char*)
+function {char*} ctermid (char*)
+function {char*} cuserid (char*)
+function int dup (int)
+function int dup2 (int, int)
+function void encrypt (char[64], int)
+function int execl (const char*, const char*, ...)
+function int execle (const char*, const char*, ...)
+function int execlp (const char*, const char*, ...)
+function int execv (const char*, char *const[])
+function int execve (const char*, char *const[])
+function int execvp (const char*, char *const[])
+function void _exit (int)
+function int fchown (int, uid_t, gid_t)
+function int fchdir (int)
+function int fdatasync (int)
+function pid_t fork (void)
+function {long int} fpathconf (int, int)
+function int fsync (int)
+function int ftruncate (int, off_t)
+function {char*} getcwd (char*, size_t)
+function int getdtablesize (void)
+function gid_t getegid (void)
+function uid_t geteuid (void)
+function gid_t getgid (void)
+function int getgroups (int, gid_t[])
+function long gethostid (void)
+function {char*} getlogin (void)
+function int getlogin_r (char*, size_t)
+function int getopt (int, char*const[], const char*)
+function int getpagesize (void)
+function {char*} getpass (const char*)
+function pid_t getpgid (pid_t)
+function pid_t getpgrp (void)
+function pid_t getpid (void)
+function pid_t getppid (void)
+function pid_t getsid (void)
+function uid_t getuid (void)
+function {char*} getwd (char*)
+function int isatty (int)
+function int lchown (const char*, uid_t, gid_t)
+function int link (const char*, const char*)
+function int lockf (int, int, off_t)
+function off_t lseek (int, off_t, int)
+function int nice (int)
+function {long int} pathconf (const char*, int)
+function int pause (void)
+function int pipe (int[2])
+function ssize_t pread (int, void*, size_t, off_t)
+function int pthread_atfork (void(*)(void), void(*)(void), void(*)(void))
+function ssize_t pwrite (int, const void*, size_t, off_t)
+function ssize_t read (int, void*, size_t)
+function int readlink (const char*, char*, size_t)
+function int rmdir (const char*)
+function {void*} sbrk (intptr_t)
+function int setgid (gid_t)
+function int setpgid (pid_t, pid_t)
+function pid_t setpgrp (void)
+function int setregid (gid_t, gid_t)
+function int setreuid (uid_t, uid_t)
+function pid_t setsid (void)
+function int setuid (uid_t)
+function {unsigned int} sleep (unsigned int)
+function void swab (const char*, void*, ssize_t)
+function int symlink (const char*, const char*)
+function void sync (void)
+function {long int} sysconf (int)
+function pid_t tcgetpgrp (int)
+function int tcsetpgrp (int, pid_t)
+function int truncate (const char*, off_t)
+function {char*} ttyname (int)
+function int ttyname_r (int, char*, size_t)
+function useconds_t ualarm (useconds_t, useconds_t)
+function int unlink (const char*)
+function int usleep (useconds_t)
+function pid_t vfork (void)
+function ssize_t write (int, const void*, size_t)
+
+variable {char*} optarg
+variable int optind
+variable int opterr
+variable int optopt
+
+allow *_t
diff --git a/conform/data/utime.h-data b/conform/data/utime.h-data
new file mode 100644
index 0000000000..15d4487055
--- /dev/null
+++ b/conform/data/utime.h-data
@@ -0,0 +1,11 @@
+type {struct utimbuf}
+
+element {struct utimbuf} time_t actime
+element {struct utimbuf} time_t modtime
+
+type time_t
+
+function int utime (const char*, const struct utimbuf*)
+
+allow utim_*
+allow *_t
diff --git a/conform/data/utmpx.h-data b/conform/data/utmpx.h-data
new file mode 100644
index 0000000000..ba034f0deb
--- /dev/null
+++ b/conform/data/utmpx.h-data
@@ -0,0 +1,36 @@
+type {struct utmpx}
+
+element {struct utmpx} char ut_user []
+element {struct utmpx} char ut_id []
+element {struct utmpx} char ut_line []
+element {struct utmpx} pid_t ut_pid
+element {struct utmpx} {short int} ut_type
+element {struct utmpx} {struct timeval} ut_tv
+
+type pid_t
+
+type {struct timeval}
+
+element {struct timeval} time_t tv_sec
+element {struct timeval} suseconds_t tv_usec
+
+constant EMPTY
+constant BOOT_TIME
+constant OLD_TIME
+constant NEW_TIME
+constant USER_PROCESS
+constant INIT_PROCESS
+constant LOGIN_PROCESS
+constant DEAD_PROCESS
+
+function void endutxent (void)
+function {struct utmpx*} getutxent (void)
+function {struct utmpx*} getutxid (const struct utmpx*)
+function {struct utmpx*} getutxline (const struct utmpx*)
+function {struct utmpx*} pututxline (const struct utmpx*)
+function void setutxent (void)
+
+allow-header sys/time.h
+
+allow ut_*
+allow *_t
diff --git a/conform/data/varargs.h-data b/conform/data/varargs.h-data
new file mode 100644
index 0000000000..11dc38c2ab
--- /dev/null
+++ b/conform/data/varargs.h-data
@@ -0,0 +1,8 @@
+macro va_alist
+macro va_dcl
+type va_list
+macro va_start
+macro va_arg
+macro va_end
+
+allow *_t
diff --git a/conform/data/wchar.h-data b/conform/data/wchar.h-data
new file mode 100644
index 0000000000..49f85c5210
--- /dev/null
+++ b/conform/data/wchar.h-data
@@ -0,0 +1,95 @@
+type wchar_t
+type wint_t
+type wctype_t
+type mbstate_t
+type FILE
+type size_t
+
+function wint_t btowc (int)
+function int fwprintf (FILE*, const wchar_t*, ...)
+function int fwscanf (FILE*, const wchar_t*, ...)
+#if !ISO
+function int iswalnum (wint_t)
+function int iswalpha (wint_t)
+function int iswcntrl (wint_t)
+function int iswdigit (wint_t)
+function int iswgraph (wint_t)
+function int iswlower (wint_t)
+function int iswprint (wint_t)
+function int iswpunct (wint_t)
+function int iswspace (wint_t)
+function int iswupper (wint_t)
+function int iswxdigit (wint_t)
+function int iswctype (wint_t, wctype_t)
+#endif
+function wint_t fgetwc (FILE*)
+function {wchar_t*} fgetws (wchar_t*, int, FILE*)
+function wint_t fputwc (wchar_t, FILE*)
+function int fputws (const wchar_t*, FILE*)
+function int fwide (FILE*, int)
+function wint_t getwc (FILE*)
+function wint_t getwchar (void)
+function int mbsinit (const mbstate_t*)
+function size_t mbrlen (const char*, size_t, mbstate_t*)
+function size_t mbrtowc (wchar_t*, const char*, size_t, mbstate_*)
+function size_t mbsrtowcs (wchar_t*, const char**, size_t, mbstate_t*)
+function wint_t putwc (wchar_t, FILE*)
+function wint_t putwchar (wchar_t)
+function int swprintf (wchar_t*, size_t, const wchar_t*, ...)
+function int swscanf (const wchar_t*, const wchar_t*, ...)
+function wint_t towlower (wint_t)
+function wint_t towupper (wint_t)
+function wint_t ungetwc (wint_t, FILE*)
+function int vfwprintf (FILE, const wchar_t*, va_list)
+function int vwprintf (const wchar_t*, va_list)
+function int vswprintf (wchar_t*, size_t, const wchar_t*, va_list)
+function size_t wcrtomb (char*, wchar_t, mbstate_t*)
+function {wchar_t*} wcscat (wchar_t*, const wchar_t*)
+function {wchar_t*} wcschr (const wchar_t*, wchar_t)
+function int wcscmp (const wchar_t*, const wchar_t*)
+function int wcscoll (const wchar_t*, const wchar_t*)
+function {wchar_t*} wcscpy (wchar_t*, const wchar_t*)
+function size_t wcscspn (const wchar_t*, const wchar_t*)
+function size_t wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*)
+function size_t wcslen (const wchar_t*)
+function {wchar_t*} wcsncat (wchar_t*, const wchar_t*, size_t)
+function int wcsncmp (const wchar_t*, const wchar_t*, size_t)
+function {wchar_t*} wcsncpy (wchar_t*, const wchar_t*, size_t)
+function {wchar_t*} wcspbrk (const wchar_t*, const wchar_t*)
+function {wchar_t*} wcsrchr (const wchar_t*, wchar_t)
+function size_t wcsrtombs (char*, const wchar_t**, size_t, mbstate_t*)
+function size_t wcsspn (const wchar_t*, const wchar_t*)
+function {wchar_t*} wcsstr (const wchar_t*, const wchar_t*)
+function double wcstod (const wchar_t*, wchar_t**)
+function {wchar_t*} wcstok (wchar_t*, const wchar_t*, wchar_t**)
+function {long int} wcstol (const wchar_t*, wchar_t**, int)
+function {unsigned long int} wcstoul (const wchar_t*, wchar_t**, int)
+function {wchar_t*} wcswcs (const wchar_t*, const wchar_t*)
+function int wcswidth (const wchar_t*, size_t)
+function size_t wcsxfrm (wchar_t*, const wchar_t*, size_t)
+function int wctob (wint_t)
+function wctype_t wctype (const char*)
+function int wcwidth (wchar_t)
+function {wchar_t*} wmemchr (const wchar_t*, wchar_t, size_t)
+function int wmemcmp (const wchar_t*, const wchar_t*, size_t)
+function {wchar_t*} wmemcpy (wchar_t*, const wchar_t*, size_t)
+function {wchar_t*} wmemmove (wchar_t*, const wchar_t*, size_t)
+function {wchar_t*} wmemset (wchar_t*, wchar_t, size_t)
+function int wprintf (const wchar_t*, ...)
+function int wscanf (const wchar_t*, ...)
+
+macro WCHAR_MAX
+macro WCHAR_MIN
+macro WEOF
+macro NULL
+
+allow-header ctype.h
+allow-header stdio.h
+allow-header stdarg.h
+allow-header stdlib.h
+allow-header string.h
+allow-header stddef.h
+allow-header time.h
+
+allow wcs*
+allow *_t
diff --git a/conform/data/wctype.h-data b/conform/data/wctype.h-data
new file mode 100644
index 0000000000..230d7482a6
--- /dev/null
+++ b/conform/data/wctype.h-data
@@ -0,0 +1,36 @@
+type wint_t
+type wctrans_t
+type wctype_t
+
+function int iswalnum (wint_t)
+function int iswalpha (wint_t)
+function int iswcntrl (wint_t)
+function int iswdigit (wint_t)
+function int iswgraph (wint_t)
+function int iswlower (wint_t)
+function int iswprint (wint_t)
+function int iswpunct (wint_t)
+function int iswspace (wint_t)
+function int iswupper (wint_t)
+function int iswxdigit (wint_t)
+function int iswctype (wint_t, wctype_t)
+function wint_t towctrans (wint_t, wctrans_t)
+function wint_t towlower (wint_t)
+function wint_t towupper (wint_t)
+function wctrans_t wctrans (const char*)
+function wctype_t wctype (const char*)
+
+macro WEOF
+
+allow-header ctype.h
+allow-header stdio.h
+allow-header stdarg.h
+allow-header stdlib.h
+allow-header string.h
+allow-header stddef.h
+allow-header time.h
+allow-header wchar.h
+
+allow is*
+allow to*
+allow *_t
diff --git a/conform/data/wordexp.h-data b/conform/data/wordexp.h-data
new file mode 100644
index 0000000000..7ff2145f5f
--- /dev/null
+++ b/conform/data/wordexp.h-data
@@ -0,0 +1,25 @@
+type wordexp_t
+
+element wordexp_t size_t we_wordc
+element wordexp_t {char**} we_wordv
+element wordexp_t size_t we_offs
+
+constant WRDE_APPEND
+constant WRDE_DOOFS
+constant WRDE_NOCMD
+constant WRDE_REUSE
+constant WRDE_SHOWERR
+constant WRDE_UNDEF
+
+constant WRDE_BADCHAR
+constant WRDE_CMDSUB
+constant WRDE_NOSPACE
+constant WRDE_NOSYS
+constant WRDE_SYNTAX
+
+function int wordexp (const char*, wordexp_t*, int)
+function void wordfree (wordexp_t*)
+
+allow WRDE_*
+allow we_*
+allow *_t
diff --git a/grp/grp.h b/grp/grp.h
index bf29066def..fc805c6f46 100644
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,95,96,97,98,99,2000 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
@@ -99,7 +99,7 @@ extern struct group *getgrnam (__const char *__name) __THROW;
    other reentrant functions so the chances are good this is what the
    POSIX people would choose.  */
 
-# if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
+# ifdef __USE_GNU
 extern int getgrent_r (struct group *__restrict __resultbuf,
 		       char *__restrict __buffer, size_t __buflen,
 		       struct group **__restrict __result) __THROW;
diff --git a/include/sys/time.h b/include/sys/time.h
index 1f24827e71..e21cca43ec 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -13,5 +13,5 @@ extern int __getitimer (enum __itimer_which __which,
 extern int __setitimer (enum __itimer_which __which,
 			__const struct itimerval *__new,
 			struct itimerval *__old);
-extern int __utimes (__const char *__file, struct timeval __tvp[2]);
+extern int __utimes (__const char *__file, const struct timeval __tvp[2]);
 #endif
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index be78ae0f23..dde7eb131d 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,8 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
+   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
 
    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
@@ -50,6 +47,16 @@ void free ();
 #include "gettext.h"
 #include "gettextP.h"
 
+#ifdef _LIBC
+/* We have to handle multi-threaded applications.  */
+# include <bits/libc-lock.h>
+#else
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_lock_define_initialized (CLASS, NAME)
+# define __libc_lock_lock(NAME)
+# define __libc_lock_unlock(NAME)
+#endif
+
 /* @@ end of prolog @@ */
 
 /* Contains the default location of the message catalogs.  */
@@ -58,6 +65,9 @@ extern const char _nl_default_dirname[];
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings;
 
+/* Lock variable to protect the global data in the gettext implementation.  */
+__libc_rwlock_define (extern, _nl_state_lock)
+
 
 /* Names for the libintl functions are a problem.  They must not clash
    with existing names and they should follow ANSI C.  But this source
@@ -80,11 +90,14 @@ BINDTEXTDOMAIN (domainname, dirname)
      const char *dirname;
 {
   struct binding *binding;
+  char *result;
 
   /* Some sanity checks.  */
   if (domainname == NULL || domainname[0] == '\0')
     return NULL;
 
+  __libc_rwlock_wrlock (_nl_state_lock);
+
   for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
     {
       int compare = strcmp (domainname, binding->domainname);
@@ -101,104 +114,97 @@ BINDTEXTDOMAIN (domainname, dirname)
 
   if (dirname == NULL)
     /* The current binding has be to returned.  */
-    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
-
-  if (binding != NULL)
+    result = binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
+  else if (binding != NULL)
     {
       /* The domain is already bound.  If the new value and the old
 	 one are equal we simply do nothing.  Otherwise replace the
 	 old binding.  */
-      if (strcmp (dirname, binding->dirname) != 0)
+      result = binding->dirname;
+      if (strcmp (dirname, result) != 0)
 	{
-	  char *new_dirname;
-
 	  if (strcmp (dirname, _nl_default_dirname) == 0)
-	    new_dirname = (char *) _nl_default_dirname;
+	    result = (char *) _nl_default_dirname;
 	  else
 	    {
 #if defined _LIBC || defined HAVE_STRDUP
-	      new_dirname = strdup (dirname);
-	      if (new_dirname == NULL)
-		return NULL;
+	      result = strdup (dirname);
 #else
 	      size_t len = strlen (dirname) + 1;
-	      new_dirname = (char *) malloc (len);
-	      if (new_dirname == NULL)
-		return NULL;
-
-	      memcpy (new_dirname, dirname, len);
+	      result = (char *) malloc (len);
+	      if (result != NULL)
+		memcpy (result, dirname, len);
 #endif
 	    }
 
-	  if (binding->dirname != _nl_default_dirname)
-	    free (binding->dirname);
+	  if (result != NULL)
+	    {
+	      if (binding->dirname != _nl_default_dirname)
+		free (binding->dirname);
 
-	  binding->dirname = new_dirname;
+	      binding->dirname = result;
+	    }
 	}
     }
   else
     {
       /* We have to create a new binding.  */
-#if !defined _LIBC && !defined HAVE_STRDUP
-      size_t len;
-#endif
+      size_t len = strlen (domainname) + 1;
       struct binding *new_binding =
-	(struct binding *) malloc (sizeof (*new_binding));
+	(struct binding *) malloc (sizeof (*new_binding) + len);
 
       if (new_binding == NULL)
-	return NULL;
-
-#if defined _LIBC || defined HAVE_STRDUP
-      new_binding->domainname = strdup (domainname);
-      if (new_binding->domainname == NULL)
-	return NULL;
-#else
-      len = strlen (domainname) + 1;
-      new_binding->domainname = (char *) malloc (len);
-      if (new_binding->domainname == NULL)
-	return NULL;
-      memcpy (new_binding->domainname, domainname, len);
-#endif
-
-      if (strcmp (dirname, _nl_default_dirname) == 0)
-	new_binding->dirname = (char *) _nl_default_dirname;
+	result = NULL;
       else
 	{
+	  memcpy (new_binding->domainname, domainname, len);
+
+	  if (strcmp (dirname, _nl_default_dirname) == 0)
+	    result = new_binding->dirname = (char *) _nl_default_dirname;
+	  else
+	    {
 #if defined _LIBC || defined HAVE_STRDUP
-	  new_binding->dirname = strdup (dirname);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
+	      result = new_binding->dirname = strdup (dirname);
 #else
-	  len = strlen (dirname) + 1;
-	  new_binding->dirname = (char *) malloc (len);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-	  memcpy (new_binding->dirname, dirname, len);
+	      len = strlen (dirname) + 1;
+	      result = new_binding->dirname = (char *) malloc (len);
+	      if (result != NULL)
+		memcpy (new_binding->dirname, dirname, len);
 #endif
+	    }
 	}
 
-      /* Now enqueue it.  */
-      if (_nl_domain_bindings == NULL
-	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
-	{
-	  new_binding->next = _nl_domain_bindings;
-	  _nl_domain_bindings = new_binding;
-	}
-      else
+      if (result != NULL)
 	{
-	  binding = _nl_domain_bindings;
-	  while (binding->next != NULL
-		 && strcmp (domainname, binding->next->domainname) > 0)
-	    binding = binding->next;
+	  /* Now enqueue it.  */
+	  if (_nl_domain_bindings == NULL
+	      || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
+	    {
+	      new_binding->next = _nl_domain_bindings;
+	      _nl_domain_bindings = new_binding;
+	    }
+	  else
+	    {
+	      binding = _nl_domain_bindings;
+	      while (binding->next != NULL
+		     && strcmp (domainname, binding->next->domainname) > 0)
+		binding = binding->next;
 
-	  new_binding->next = binding->next;
-	  binding->next = new_binding;
+	      new_binding->next = binding->next;
+	      binding->next = new_binding;
+	    }
 	}
-
-      binding = new_binding;
+      else if (new_binding != NULL)
+	free (new_binding);
     }
 
-  return binding->dirname;
+  /* For a succesful call we flush the caches.  */
+  if (result != NULL)
+    ++_nl_msg_cat_cntr;
+
+  __libc_rwlock_unlock (_nl_state_lock);
+
+  return result;
 }
 
 #ifdef _LIBC
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 5be8e4ff70..8115d5c54e 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,9 +1,6 @@
 /* Implementation of the dcgettext(3) function.
    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index e11fd06147..be312ce967 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -1,9 +1,6 @@
 /* Implementation of the internal dcigettext function.
    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
@@ -99,6 +96,11 @@ void free ();
 /* Thread safetyness.  */
 #ifdef _LIBC
 # include <bits/libc-lock.h>
+#else
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_lock_define_initialized (CLASS, NAME)
+# define __libc_lock_lock(NAME)
+# define __libc_lock_unlock(NAME)
 #endif
 
 /* @@ end of prolog @@ */
@@ -306,6 +308,9 @@ struct block_list
 # define DCIGETTEXT dcigettext__
 #endif
 
+/* Lock variable to protect the global data in the gettext implementation.  */
+__libc_rwlock_define_initialized (, _nl_state_lock)
+
 /* Checking whether the binaries runs SUID must be done and glibc provides
    easier methods therefore we make a difference here.  */
 #ifdef _LIBC
@@ -358,6 +363,8 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
   if (msgid1 == NULL)
     return NULL;
 
+  __libc_rwlock_rdlock (_nl_state_lock);
+
 #if defined HAVE_TSEARCH || defined _LIBC
   if (plural == 0)
     {
@@ -372,7 +379,10 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 
       foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
       if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
-	return (char *) (*foundp)->translation;
+	{
+	  __libc_rwlock_unlock (_nl_state_lock);
+	  return (char *) (*foundp)->translation;
+	}
     }
 #endif
 
@@ -501,6 +511,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	  || strcmp (single_locale, "POSIX") == 0)
 	{
 	  FREE_BLOCKS (block_list);
+	  __libc_rwlock_unlock (_nl_state_lock);
 	  __set_errno (saved_errno);
 	  return (plural == 0
 		  ? (char *) msgid1
@@ -539,7 +550,10 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	      foundp = (struct known_translation_t **) tfind (search, &root,
 							      transcmp);
 	      if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
-		return (char *) (*foundp)->translation;
+		{
+		  __libc_rwlock_unlock (_nl_state_lock);
+		  return (char *) (*foundp)->translation;
+		}
 	    }
 #endif
 
@@ -596,6 +610,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 		  (*foundp)->translation = retval;
 		}
 #endif
+	      __libc_rwlock_unlock (_nl_state_lock);
 	      return retval;
 	    }
 	}
@@ -981,12 +996,9 @@ free_mem (void)
   struct binding *runp;
 
   for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
-    {
-      free (runp->domainname);
-      if (runp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (runp->dirname);
-    }
+    if (runp->dirname != _nl_default_dirname)
+      /* Yes, this is a pointer comparison.  */
+      free (runp->dirname);
 
   if (_nl_current_default_domain != _nl_default_default_domain)
     /* Yes, again a pointer comparison.  */
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index ef1dc349b6..d10f4a6363 100644
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -1,9 +1,6 @@
 /* Implementation of the dcngettext(3) function.
    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/dgettext.c b/intl/dgettext.c
index f7899579f7..85770d2bc7 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,8 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
+   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
 
    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
diff --git a/intl/dngettext.c b/intl/dngettext.c
index 2fb861c6e4..050144641c 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,9 +1,6 @@
 /* Implementation of the dngettext(3) function.
    Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/explodename.c b/intl/explodename.c
index 8fe928f312..f89c7c93f9 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,9 +1,6 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 7f6d35c198..09f6a91fc2 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -1,10 +1,7 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/gettext.c b/intl/gettext.c
index 74eab14419..c9ba112b55 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,9 +1,6 @@
 /* Implementation of gettext(3) function.
    Copyright (C) 1995, 1997, 2000 Free Software Foundation, Inc.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/gettext.h b/intl/gettext.h
index 804b219ee2..a8bd7b513e 100644
--- a/intl/gettext.h
+++ b/intl/gettext.h
@@ -1,8 +1,5 @@
 /* Internal header for GNU gettext internationalization functions.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
+   Copyright (C) 1995, 1997, 2000 Free Software Foundation, Inc.
 
    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
diff --git a/intl/gettextP.h b/intl/gettextP.h
index d210dc6c4e..26d9de0e77 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -136,8 +136,12 @@ struct loaded_domain
 struct binding
 {
   struct binding *next;
-  char *domainname;
   char *dirname;
+#ifdef __GNUC__
+  char domainname[0];
+#else
+  char domainname[1];
+#endif
 };
 
 extern int _nl_msg_cat_cntr;
diff --git a/intl/hash-string.h b/intl/hash-string.h
index 32ca018bda..107514c34f 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -1,8 +1,5 @@
 /* Implements a string hashing function.
-   Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
+   Copyright (C) 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
 
    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
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 871b42814e..ef599361a9 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,9 +1,6 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/libintl.h b/intl/libintl.h
index a301dc5407..91e73265dc 100644
--- a/intl/libintl.h
+++ b/intl/libintl.h
@@ -2,9 +2,6 @@
    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
    This file is derived from the file libgettext.h in the GNU gettext package.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index b017d710e8..a03fe0d809 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,9 +1,6 @@
 /* Load needed message catalogs.
    Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/localealias.c b/intl/localealias.c
index 9f2c510428..d2b5ae8895 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,8 +1,5 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
+   Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
 
    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
diff --git a/intl/ngettext.c b/intl/ngettext.c
index 99e74d9938..3ffdc6996f 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -1,9 +1,6 @@
 /* Implementation of ngettext(3) function.
    Copyright (C) 1995, 1997, 2000 Free Software Foundation, Inc.
 
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
    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
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 5dd4003a8e..726b5bb8e3 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,8 +1,5 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in /gd/gnu/lib.
+   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
 
    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
@@ -41,6 +38,18 @@
 #else
 # include "libgettext.h"
 #endif
+#include "gettext.h"
+#include "gettextP.h"
+
+#ifdef _LIBC
+/* We have to handle multi-threaded applications.  */
+# include <bits/libc-lock.h>
+#else
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_lock_define_initialized (CLASS, NAME)
+# define __libc_lock_lock(NAME)
+# define __libc_lock_unlock(NAME)
+#endif
 
 /* @@ end of prolog @@ */
 
@@ -64,6 +73,9 @@ extern const char *_nl_current_default_domain;
 # define TEXTDOMAIN textdomain__
 #endif
 
+/* Lock variable to protect the global data in the gettext implementation.  */
+__libc_rwlock_define (extern, _nl_state_lock)
+
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
    If DOMAINNAME is "", reset to the default of "messages".  */
@@ -71,38 +83,60 @@ char *
 TEXTDOMAIN (domainname)
      const char *domainname;
 {
-  char *old;
+  char *new_domain;
+  char *old_domain;
 
   /* A NULL pointer requests the current setting.  */
   if (domainname == NULL)
     return (char *) _nl_current_default_domain;
 
-  old = (char *) _nl_current_default_domain;
+  __libc_rwlock_wrlock (_nl_state_lock);
+
+  old_domain = (char *) _nl_current_default_domain;
 
   /* If domain name is the null string set to default domain "messages".  */
   if (domainname[0] == '\0'
       || strcmp (domainname, _nl_default_default_domain) == 0)
-    _nl_current_default_domain = _nl_default_default_domain;
+    {
+      _nl_current_default_domain = _nl_default_default_domain;
+      new_domain = (char *) _nl_current_default_domain;
+    }
+  else if (strcmp (domainname, old_domain) == 0)
+    /* This can happen and people will use it to signal that some
+       environment variable changed.  */
+    new_domain = old_domain;
   else
     {
       /* If the following malloc fails `_nl_current_default_domain'
 	 will be NULL.  This value will be returned and so signals we
 	 are out of core.  */
 #if defined _LIBC || defined HAVE_STRDUP
-      _nl_current_default_domain = strdup (domainname);
+      new_domain = strdup (domainname);
 #else
       size_t len = strlen (domainname) + 1;
-      char *cp = (char *) malloc (len);
-      if (cp != NULL)
-	memcpy (cp, domainname, len);
-      _nl_current_default_domain = cp;
+      new_domain = (char *) malloc (len);
+      if (new_domain != NULL)
+	memcpy (new_domain, domainname, len);
 #endif
+
+      if (new_domain != NULL)
+	_nl_current_default_domain = new_domain;
+    }
+
+  /* We use this possibility to signal a change of the loaded catalogs
+     since this is most likely the case and there is no other easy we
+     to do it.  Do it only when the call was successful.  */
+  if (new_domain != NULL)
+    {
+      ++_nl_msg_cat_cntr;
+
+      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
+	free (old_domain);
     }
 
-  if (old != _nl_default_default_domain)
-    free (old);
+  __libc_rwlock_unlock (_nl_state_lock);
 
-  return (char *) _nl_current_default_domain;
+  return new_domain;
 }
 
 #ifdef _LIBC
diff --git a/io/sys/stat.h b/io/sys/stat.h
index d6175dd0cd..18eafb4bca 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 1995-1999, 2000 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
@@ -106,13 +106,11 @@ __BEGIN_DECLS
 # ifdef __S_IFIFO
 #  define S_IFIFO	__S_IFIFO
 # endif
-# if defined __USE_BSD || defined __USE_MISC
-#  ifdef __S_IFLNK
-#   define S_IFLNK	__S_IFLNK
-#  endif
-#  ifdef __S_IFSOCK
-#   define S_IFSOCK	__S_IFSOCK
-#  endif
+# ifdef __S_IFLNK
+#  define S_IFLNK	__S_IFLNK
+# endif
+# if (defined __USE_BSD || defined __USE_MISC) && !defined __S_IFSOCK
+#  define S_IFSOCK	__S_IFSOCK
 # endif
 #endif
 
@@ -127,11 +125,12 @@ __BEGIN_DECLS
 #ifdef __S_IFIFO
 # define S_ISFIFO(mode)	 __S_ISTYPE((mode), __S_IFIFO)
 #endif
+#ifdef __S_IFLNK
+# define S_ISLNK(mode)	 __S_ISTYPE((mode), __S_IFLNK)
+#endif
 
 #ifdef	__USE_BSD
-# ifdef __S_IFLNK
-#  define S_ISLNK(mode)	 __S_ISTYPE((mode), __S_IFLNK)
-# else
+# ifndef __S_IFLNK
 #  define S_ISLNK(mode)  0
 # endif
 # ifdef __S_IFSOCK
@@ -145,7 +144,7 @@ __BEGIN_DECLS
 #define	S_ISUID __S_ISUID	/* Set user ID on execution.  */
 #define	S_ISGID	__S_ISGID	/* Set group ID on execution.  */
 
-#if defined __USE_BSD || defined __USE_MISC
+#if defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN
 /* Save swapped text after use (sticky bit).  This is pretty well obsolete.  */
 # define S_ISVTX	__S_ISVTX
 #endif
diff --git a/io/sys/statvfs.h b/io/sys/statvfs.h
index 6f497cc4a7..71335f324f 100644
--- a/io/sys/statvfs.h
+++ b/io/sys/statvfs.h
@@ -1,5 +1,5 @@
 /* Definitions for getting information about a filesystem.
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000 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
@@ -25,6 +25,26 @@
 /* Get the system-specific definition of `struct statfs'.  */
 #include <bits/statvfs.h>
 
+#ifndef __USE_FILE_OFFSET64
+# ifndef __fsblkcnt_t_defined
+typedef __fsblkcnt_t fsblkcnt_t; /* Type to count file system blocks.  */
+#  define __fsblkcnt_t_defined
+# endif
+# ifndef __fsfilcnt_t_defined
+typedef __fsfilcnt_t fsfilcnt_t; /* Type to count file system inodes.  */
+#  define __fsfilcnt_t_defined
+# endif
+#else
+# ifndef __fsblkcnt_t_defined
+typedef __fsblkcnt64_t fsblkcnt_t; /* Type to count file system blocks.  */
+#  define __fsblkcnt_t_defined
+# endif
+# ifndef __fsfilcnt_t_defined
+typedef __fsfilcnt64_t fsfilcnt_t; /* Type to count file system inodes.  */
+#  define __fsfilcnt_t_defined
+# endif
+#endif
+
 __BEGIN_DECLS
 
 /* Return information about the filesystem on which FILE resides.  */
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 9fcbf92ed2..1179e7f8bf 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,8 +1,15 @@
+2000-02-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* rwlock.c: Define __* variants of the functions and make old names
+	aliases.
+	* Versions [GLIBC_2.2]: Export the __pthread_rwlock_* functions.
+	* sysdeps/pthread/bits/libc-lock.h: Define __libc_rwlock_* macros.
+
 2000-02-25  Andreas Jaeger  <aj@suse.de>
 
 	* Versions: Export pread, __pread64, pread64, pwrite, __pwrite64,
-        pwrite64, lseek64, open64, and __open64 with version 2.2.
-		
+	pwrite64, lseek64, open64, and __open64 with version 2.2.
+
 2000-02-22  Ulrich Drepper  <drepper@redhat.com>
 
 	* semaphore.h (SEM_FAILED): Use 0 not NULL.
diff --git a/linuxthreads/Versions b/linuxthreads/Versions
index 1e93064f41..1b9de67b67 100644
--- a/linuxthreads/Versions
+++ b/linuxthreads/Versions
@@ -124,5 +124,10 @@ libpthread {
     open64; __open64;
 
     __res_state;
+
+    # Names used internally.
+    __pthread_rwlock_init; __pthread_rwlock_destroy; __pthread_rwlock_rdlock;
+    __pthread_rwlock_tryrdlock; __pthread_rwlock_wrlock;
+    __pthread_rwlock_trywrlock; __pthread_rwlock_unlock;
   }
 }
diff --git a/linuxthreads/rwlock.c b/linuxthreads/rwlock.c
index e1401c3c0c..0dd714bc39 100644
--- a/linuxthreads/rwlock.c
+++ b/linuxthreads/rwlock.c
@@ -183,7 +183,7 @@ rwlock_have_already(pthread_descr *pself, pthread_rwlock_t *rwlock,
 }
 
 int
-pthread_rwlock_init (pthread_rwlock_t *rwlock,
+__pthread_rwlock_init (pthread_rwlock_t *rwlock,
 		     const pthread_rwlockattr_t *attr)
 {
   __pthread_init_lock(&rwlock->__rw_lock);
@@ -205,10 +205,11 @@ pthread_rwlock_init (pthread_rwlock_t *rwlock,
 
   return 0;
 }
+strong_alias (__pthread_init_lock, pthread_init_lock)
 
 
 int
-pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
+__pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
 {
   int readers;
   _pthread_descr writer;
@@ -223,16 +224,17 @@ pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
 
   return 0;
 }
+strong_alias (__pthread_rwlock_destroy, pthread_rwlock_destroy)
 
 int
-pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
+__pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
 {
   pthread_descr self = NULL;
   pthread_readlock_info *existing;
   int out_of_mem, have_lock_already;
 
   have_lock_already = rwlock_have_already(&self, rwlock,
-      &existing, &out_of_mem);
+					  &existing, &out_of_mem);
 
   for (;;)
     {
@@ -262,9 +264,10 @@ pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
 
   return 0;
 }
+strong_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock)
 
 int
-pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
+__pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
 {
   pthread_descr self = thread_self();
   pthread_readlock_info *existing;
@@ -303,10 +306,11 @@ pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
 
   return retval;
 }
+strong_alias (__pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock)
 
 
 int
-pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
+__pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
 {
   pthread_descr self = thread_self ();
 
@@ -326,10 +330,11 @@ pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
       suspend (self); /* This is not a cancellation point */
     }
 }
+strong_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock)
 
 
 int
-pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
+__pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
 {
   int result = EBUSY;
 
@@ -343,10 +348,11 @@ pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
 
   return result;
 }
+strong_alias (__pthread_rwlock_trywrlock, pthread_rwlock_trywrlock)
 
 
 int
-pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
+__pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
 {
   pthread_descr torestart;
   pthread_descr th;
@@ -425,6 +431,7 @@ pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
 
   return 0;
 }
+strong_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock)
 
 
 
@@ -439,10 +446,11 @@ pthread_rwlockattr_init (pthread_rwlockattr_t *attr)
 
 
 int
-pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr)
+__pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr)
 {
   return 0;
 }
+strong_alias (__pthread_rwlockattr_destroy, pthread_rwlockattr_destroy)
 
 
 int
diff --git a/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/linuxthreads/sysdeps/pthread/bits/libc-lock.h
index 0f412bb9e2..76a56d5058 100644
--- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h
+++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h
@@ -1,5 +1,5 @@
 /* libc-internal interface for mutex locks.  LinuxThreads version.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 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
@@ -25,8 +25,10 @@
 /* Mutex type.  */
 #ifdef _LIBC
 typedef pthread_mutex_t __libc_lock_t;
+typedef pthread_rwlock_t __libc_rwlock_t;
 #else
 typedef struct __libc_lock_opaque__ __libc_lock_t;
+typedef struct __libc_rwlock_opaque__ __libc_rwlock_t;
 #endif
 
 /* Type for key to thread-specific data.  */
@@ -41,6 +43,8 @@ typedef pthread_key_t __libc_key_t;
    of libc.  */
 #define __libc_lock_define(CLASS,NAME) \
   CLASS __libc_lock_t NAME;
+#define __libc_rwlock_define(CLASS,NAME) \
+  CLASS __libc_rwlock_t NAME;
 
 /* Define an initialized lock variable NAME with storage class CLASS.
 
@@ -50,6 +54,8 @@ typedef pthread_key_t __libc_key_t;
    section.  */
 #define __libc_lock_define_initialized(CLASS,NAME) \
   CLASS __libc_lock_t NAME;
+#define __libc_rwlock_define_initialized(CLASS,NAME) \
+  CLASS __libc_rwlock_t NAME = PTHREAD_RWLOCK_INITIALIZER;
 
 /* Define an initialized recursive lock variable NAME with storage
    class CLASS.  */
@@ -60,6 +66,8 @@ typedef pthread_key_t __libc_key_t;
    state.  */
 #define __libc_lock_init(NAME) \
   (__pthread_mutex_init != NULL ? __pthread_mutex_init (&(NAME), NULL) : 0);
+#define __libc_rwlock_init(NAME) \
+  (__pthread_rwlock_init != NULL ? __pthread_rwlock_init (&(NAME), NULL) : 0);
 
 /* Same as last but this time we initialize a recursive mutex.  */
 #define __libc_lock_init_recursive(NAME) \
@@ -79,6 +87,8 @@ typedef pthread_key_t __libc_key_t;
    called on a lock variable before the containing storage is reused.  */
 #define __libc_lock_fini(NAME) \
   (__pthread_mutex_destroy != NULL ? __pthread_mutex_destroy (&(NAME)) : 0);
+#define __libc_rwlock_fini(NAME) \
+  (__pthread_rwlock_destroy != NULL ? __pthread_rwlock_destroy (&(NAME)) : 0);
 
 /* Finalize recursive named lock.  */
 #define __libc_lock_fini_recursive(NAME) __libc_lock_fini (NAME)
@@ -86,6 +96,10 @@ typedef pthread_key_t __libc_key_t;
 /* Lock the named lock variable.  */
 #define __libc_lock_lock(NAME) \
   (__pthread_mutex_lock != NULL ? __pthread_mutex_lock (&(NAME)) : 0);
+#define __libc_rwlock_rdlock(NAME) \
+  (__pthread_rwlock_rdlock != NULL ? __pthread_rwlock_rdlock (&(NAME)) : 0);
+#define __libc_rwlock_wrlock(NAME) \
+  (__pthread_rwlock_wrlock != NULL ? __pthread_rwlock_wrlock (&(NAME)) : 0);
 
 /* Lock the recursive named lock variable.  */
 #define __libc_lock_lock_recursive(NAME) __libc_lock_lock (NAME)
@@ -93,6 +107,12 @@ typedef pthread_key_t __libc_key_t;
 /* Try to lock the named lock variable.  */
 #define __libc_lock_trylock(NAME) \
   (__pthread_mutex_trylock != NULL ? __pthread_mutex_trylock (&(NAME)) : 0)
+#define __libc_rwlock_tryrdlock(NAME) \
+  (__pthread_rwlock_tryrdlock != NULL \
+   ? __pthread_rwlock_tryrdlock (&(NAME)) : 0)
+#define __libc_rwlock_trywrlock(NAME) \
+  (__pthread_rwlock_trywrlock != NULL \
+   ? __pthread_rwlock_trywrlock (&(NAME)) : 0)
 
 /* Try to lock the recursive named lock variable.  */
 #define __libc_lock_trylock_recursive(NAME) __libc_lock_trylock (NAME)
@@ -100,6 +120,8 @@ typedef pthread_key_t __libc_key_t;
 /* Unlock the named lock variable.  */
 #define __libc_lock_unlock(NAME) \
   (__pthread_mutex_unlock != NULL ? __pthread_mutex_unlock (&(NAME)) : 0);
+#define __libc_rwlock_unlock(NAME) \
+  (__pthread_rwlock_unlock != NULL ? __pthread_rwlock_unlock (&(NAME)) : 0);
 
 /* Unlock the recursive named lock variable.  */
 #define __libc_lock_unlock_recursive(NAME) __libc_lock_unlock (NAME)
@@ -187,6 +209,21 @@ extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
 extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr,
 					int __kind);
 
+extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock,
+				  __const pthread_rwlockattr_t *__attr);
+
+extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
+
+extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
+
+extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
+
+extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
+
+extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
+
+extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
+
 extern int __pthread_key_create (pthread_key_t *__key,
 				 void (*__destr_function) (void *));
 
@@ -216,6 +253,13 @@ weak_extern (__pthread_mutex_unlock)
 weak_extern (__pthread_mutexattr_init)
 weak_extern (__pthread_mutexattr_destroy)
 weak_extern (__pthread_mutexattr_settype)
+weak_extern (__pthread_rwlock_init)
+weak_extern (__pthread_rwlock_destroy)
+weak_extern (__pthread_rwlock_rdlock)
+weak_extern (__pthread_rwlock_tryrdlock)
+weak_extern (__pthread_rwlock_wrlock)
+weak_extern (__pthread_rwlock_trywrlock)
+weak_extern (__pthread_rwlock_unlock)
 weak_extern (__pthread_key_create)
 weak_extern (__pthread_setspecific)
 weak_extern (__pthread_getspecific)
@@ -233,6 +277,12 @@ weak_extern (_pthread_cleanup_pop_restore)
 #  pragma weak __pthread_mutexattr_init
 #  pragma weak __pthread_mutexattr_destroy
 #  pragma weak __pthread_mutexattr_settype
+#  pragna weak __pthread_rwlock_destroy
+#  pragma weak __pthread_rwlock_rdlock
+#  pragma weak __pthread_rwlock_tryrdlock
+#  pragma weak __pthread_rwlock_wrlock
+#  pragma weak __pthread_rwlock_trywrlock
+#  pragma weak __pthread_rwlock_unlock
 #  pragma weak __pthread_key_create
 #  pragma weak __pthread_setspecific
 #  pragma weak __pthread_getspecific
diff --git a/linuxthreads_db/td_ta_thr_iter.c b/linuxthreads_db/td_ta_thr_iter.c
index b5694119a4..e6502687af 100644
--- a/linuxthreads_db/td_ta_thr_iter.c
+++ b/linuxthreads_db/td_ta_thr_iter.c
@@ -1,5 +1,5 @@
 /* Iterate over a process's threads.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
 
@@ -19,7 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "thread_dbP.h"
-
+#include <alloca.h>
 
 static int
 handle_descr (const td_thragent_t *ta, td_thr_iter_f *callback,
diff --git a/linuxthreads_db/td_ta_tsd_iter.c b/linuxthreads_db/td_ta_tsd_iter.c
index c58928c986..c0b7bc4518 100644
--- a/linuxthreads_db/td_ta_tsd_iter.c
+++ b/linuxthreads_db/td_ta_tsd_iter.c
@@ -1,5 +1,5 @@
 /* Iterate over a process's thread-specific data.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
 
@@ -19,7 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "thread_dbP.h"
-
+#include <alloca.h>
 
 td_err_e
 td_ta_tsd_iter (const td_thragent_t *ta, td_key_iter_f *callback,
diff --git a/locale/langinfo.h b/locale/langinfo.h
index c0d8d9b19a..7203c5d5ee 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -144,8 +144,10 @@ enum
 
   ERA,				/* Alternate era.  */
 #define ERA			ERA
-  ERA_YEAR,			/* Year in alternate era format.  */
-#define ERA_YEAR		ERA_YEAR
+  __ERA_YEAR,			/* Year in alternate era format.  */
+#ifdef __USE_GNU
+# define ERA_YEAR		__ERA_YEAR
+#endif
   ERA_D_FMT,			/* Date in alternate era format.  */
 #define ERA_D_FMT		ERA_D_FMT
   ALT_DIGITS,			/* Alternate symbols for digits.  */
@@ -320,36 +322,66 @@ enum
   /* LC_MONETARY category: formatting of monetary quantities.
      These items each correspond to a member of `struct lconv',
      defined in <locale.h>.  */
-  INT_CURR_SYMBOL = _NL_ITEM (LC_MONETARY, 0),
-#define INT_CURR_SYMBOL		INT_CURR_SYMBOL
-  CURRENCY_SYMBOL,
-#define CURRENCY_SYMBOL		CURRENCY_SYMBOL
-  MON_DECIMAL_POINT,
-#define MON_DECIMAL_POINT	MON_DECIMAL_POINT
-  MON_THOUSANDS_SEP,
-#define MON_THOUSANDS_SEP	MON_THOUSANDS_SEP
-  MON_GROUPING,
-#define MON_GROUPING		MON_GROUPING
-  POSITIVE_SIGN,
-#define POSITIVE_SIGN		POSITIVE_SIGN
-  NEGATIVE_SIGN,
-#define NEGATIVE_SIGN		NEGATIVE_SIGN
-  INT_FRAC_DIGITS,
-#define INT_FRAC_DIGITS		INT_FRAC_DIGITS
-  FRAC_DIGITS,
-#define FRAC_DIGITS		FRAC_DIGITS
-  P_CS_PRECEDES,
-#define P_CS_PRECEDES		P_CS_PRECEDES
-  P_SEP_BY_SPACE,
-#define P_SEP_BY_SPACE		P_SEP_BY_SPACE
-  N_CS_PRECEDES,
-#define N_CS_PRECEDES		N_CS_PRECEDES
-  N_SEP_BY_SPACE,
-#define N_SEP_BY_SPACE		N_SEP_BY_SPACE
-  P_SIGN_POSN,
-#define P_SIGN_POSN		P_SIGN_POSN
-  N_SIGN_POSN,
-#define N_SIGN_POSN		N_SIGN_POSN
+  __INT_CURR_SYMBOL = _NL_ITEM (LC_MONETARY, 0),
+#ifdef __USE_GNU
+# define INT_CURR_SYMBOL	__INT_CURR_SYMBOL
+#endif
+  __CURRENCY_SYMBOL,
+#ifdef __USE_GNU
+# define CURRENCY_SYMBOL	__CURRENCY_SYMBOL
+#endif
+  __MON_DECIMAL_POINT,
+#ifdef __USE_GNU
+# define MON_DECIMAL_POINT	__MON_DECIMAL_POINT
+#endif
+  __MON_THOUSANDS_SEP,
+#ifdef __USE_GNU
+# define MON_THOUSANDS_SEP	__MON_THOUSANDS_SEP
+#endif
+  __MON_GROUPING,
+#ifdef __USE_GNU
+# define MON_GROUPING		__MON_GROUPING
+#endif
+  __POSITIVE_SIGN,
+#ifdef __USE_GNU
+# define POSITIVE_SIGN		__POSITIVE_SIGN
+#endif
+  __NEGATIVE_SIGN,
+#ifdef __USE_GNU
+# define NEGATIVE_SIGN		__NEGATIVE_SIGN
+#endif
+  __INT_FRAC_DIGITS,
+#ifdef __USE_GNU
+# define INT_FRAC_DIGITS	__INT_FRAC_DIGITS
+#endif
+  __FRAC_DIGITS,
+#ifdef __USE_GNU
+# define FRAC_DIGITS		__FRAC_DIGITS
+#endif
+  __P_CS_PRECEDES,
+#ifdef __USE_GNU
+# define P_CS_PRECEDES		__P_CS_PRECEDES
+#endif
+  __P_SEP_BY_SPACE,
+#ifdef __USE_GNU
+# define P_SEP_BY_SPACE		__P_SEP_BY_SPACE
+#endif
+  __N_CS_PRECEDES,
+#ifdef __USE_GNU
+# define N_CS_PRECEDES		__N_CS_PRECEDES
+#endif
+  __N_SEP_BY_SPACE,
+#ifdef __USE_GNU
+# define N_SEP_BY_SPACE		__N_SEP_BY_SPACE
+#endif
+  __P_SIGN_POSN,
+#ifdef __USE_GNU
+# define P_SIGN_POSN		__P_SIGN_POSN
+#endif
+  __N_SIGN_POSN,
+#ifdef __USE_GNU
+# define N_SIGN_POSN		__N_SIGN_POSN
+#endif
   _NL_MONETARY_CRNCYSTR,
 #ifdef __USE_XOPEN
 # define CRNCYSTR		__CRNCYSTR
@@ -387,32 +419,46 @@ enum
 
   /* LC_NUMERIC category: formatting of numbers.
      These also correspond to members of `struct lconv'; see <locale.h>.  */
-  DECIMAL_POINT = _NL_ITEM (LC_NUMERIC, 0),
-#define DECIMAL_POINT		DECIMAL_POINT
+  __DECIMAL_POINT = _NL_ITEM (LC_NUMERIC, 0),
+#ifdef __USE_GNU
+# define DECIMAL_POINT		__DECIMAL_POINT
+#endif
 #ifdef __USE_XOPEN
-  RADIXCHAR = DECIMAL_POINT,
+  RADIXCHAR = __DECIMAL_POINT,
 # define RADIXCHAR		RADIXCHAR
 #endif
-  THOUSANDS_SEP,
-#define THOUSANDS_SEP		THOUSANDS_SEP
+  __THOUSANDS_SEP,
+#ifdef __USE_GNU
+# define THOUSANDS_SEP		__THOUSANDS_SEP
+#endif
 #ifdef __USE_XOPEN
-  THOUSEP = THOUSANDS_SEP,
-# define THOUSANDS_SEP		THOUSANDS_SEP
+  THOUSEP = __THOUSANDS_SEP,
+# define THOUSANDS_SEP		__THOUSANDS_SEP
+#endif
+  __GROUPING,
+#ifdef __USE_GNU
+# define GROUPING		__GROUPING
 #endif
-  GROUPING,
-#define GROUPING		GROUPING
   _NL_NUMERIC_DECIMAL_POINT_WC,
   _NL_NUMERIC_THOUSANDS_SEP_WC,
   _NL_NUM_LC_NUMERIC,
 
-  YESEXPR = _NL_ITEM (LC_MESSAGES, 0), /* Regex matching ``yes'' input.  */
-#define YESEXPR			YESEXPR
-  NOEXPR,			/* Regex matching ``no'' input.  */
-#define NOEXPR			NOEXPR
-  YESSTR,			/* Output string for ``yes''.  */
-#define YESSTR			YESSTR
-  NOSTR,			/* Output string for ``no''.  */
-#define	NOSTR			NOSTR
+  __YESEXPR = _NL_ITEM (LC_MESSAGES, 0), /* Regex matching ``yes'' input.  */
+#ifdef __USE_GNU
+# define YESEXPR		__YESEXPR
+#endif
+  __NOEXPR,			/* Regex matching ``no'' input.  */
+#ifdef __USE_GNU
+# define NOEXPR			__NOEXPR
+#endif
+  __YESSTR,			/* Output string for ``yes''.  */
+#ifdef __USE_GNU
+# define YESSTR			__YESSTR
+#endif
+  __NOSTR,			/* Output string for ``no''.  */
+#ifdef __USE_GNU
+# define	NOSTR		__NOSTR
+#endif
   _NL_NUM_LC_MESSAGES,
 
   _NL_PAPER_HEIGHT = _NL_ITEM (LC_PAPER, 0),
diff --git a/math/Makefile b/math/Makefile
index 56a17a8fae..0981006535 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -165,7 +165,7 @@ endif
 endif
 
 # The fdlibm code generates a lot of these warnings but is otherwise clean.
-override CFLAGS += -Wno-uninitialized -Wno-write-strings
+override CFLAGS += -Wno-uninitialized
 
 # The -lieee library is actually an object file.
 # The module just defines the _LIB_VERSION_ variable.
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index 93dda960c3..9334e7fa49 100644
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -1,5 +1,5 @@
 /* Prototype declarations for math functions; helper file for <math.h>.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 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
@@ -235,6 +235,9 @@ __MATHCALL (yn,, (int, _Mdouble_));
 __MATHCALL (erf,, (_Mdouble_));
 __MATHCALL (erfc,, (_Mdouble_));
 __MATHCALL (lgamma,, (_Mdouble_));
+#endif
+
+#ifdef __USE_ISOC99
 __MATHCALL (tgamma,, (_Mdouble_));
 #endif
 
@@ -270,8 +273,10 @@ __MATHCALL (remainder,, (_Mdouble_ __x, _Mdouble_ __y));
 __MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n));
 # endif
 
+# if defined __USE_MISC || defined __USE_ISOC99
 /* Return X times (2 to the Nth power).  */
 __MATHCALL (scalbn,, (_Mdouble_ __x, int __n));
+# endif
 
 /* Return the binary exponent of X, which must be nonzero.  */
 __MATHDECL (int,ilogb,, (_Mdouble_ __x));
diff --git a/po/de.po b/po/de.po
index 1e74209110..911a6d3fb5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3205,15 +3205,16 @@ msgstr "»%s« ist keine gültige Profiledaten-Datei für »%s«"
 #: locale/programs/ld-monetary.c:369 locale/programs/ld-numeric.c:193
 #, c-format
 msgid "`-1' must be last entry in `%s' field in `%s' category"
-msgstr "»-1« muß der letzte Eintrag im »%s«-Feld in der »%s«-Kategorie sein"
+msgstr "»-1« muß der letzte Eintrag im »%s«-Feld der »%s«-Kategorie sein"
 
 #: locale/programs/ld-collate.c:1670
 msgid "`...' must only be used in `...' and `UNDEFINED' entries"
-msgstr "»...« darf nur in »...« und »UNDEFINED« Einträgen verwendet werden"
+msgstr "»...« darf nur in »...« und »UNDEFINED«-Einträgen verwendet werden"
 
+# Alternative: ... muss ... nach ... kommen
 #: locale/programs/locfile.c:674
 msgid "`from' expected after first argument to `collating-element'"
-msgstr "»from« erwartet nach dem ersten Argument von »collating-element«"
+msgstr "»from« wird nach dem ersten Argument von »collating-element«  erwartet"
 
 #: locale/programs/ld-collate.c:1122
 msgid "`from' string in collation element declaration contains unknown character"
@@ -3306,7 +3307,7 @@ msgstr "Kann die Abkürzung der Zeitzone zur Verwendung direkt nach der Ende-Zeit
 #: sunrpc/svc_simple.c:75
 #, c-format
 msgid "can't reassign procedure number %d\n"
-msgstr "Kann die Prozedurnummer %d nicht erneut zuweisen\n"
+msgstr "Kann die Nummer der Prozedur %d nicht erneut zuweisen\n"
 
 #: locale/programs/localedef.c:276
 #, c-format
@@ -3325,10 +3326,11 @@ msgstr "Kann keinen internen Deskriptor erzeugen"
 msgid "cannot create internal descriptors"
 msgstr "Kann keine internen Deskriptoren erzeugen"
 
+# ;-)
 #: nscd/connections.c:183
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
-msgstr "Der Socken kann nicht zum Annehmen von Verbindungen aktiviert werden: %s"
+msgstr "Der Socket kann nicht zum Annehmen von Verbindungen aktiviert werden: %s"
 
 #: sunrpc/rpc_main.c:341
 #, c-format
@@ -3750,12 +3752,13 @@ msgstr "Die Datei »%s« existiert bereits und würde überschrieben\n"
 
 #: locale/programs/locfile.c:683
 msgid "from-value of `collating-element' must be a string"
-msgstr "Der »From«-Wert eines Sortierelementes muß ein String sein"
+msgstr "Der »From«-Wert eines Sortierelementes muß eine Zeichenkette sein"
 
 #: inet/rcmd.c:324
 msgid "fstat failed"
 msgstr "Fehler beim Holen des Datei-Status mit »fstat«"
 
+# Gut! ;-)
 #: locale/programs/linereader.c:333
 msgid "garbage at end of character code specification"
 msgstr "Murks am Ende einer Zeichensatzspezifikation"
@@ -4073,7 +4076,7 @@ msgstr "netname2user: der Principal-Name »%s« ist zu lang"
 
 #: nis/nss_nisplus/nisplus-publickey.c:374
 msgid "netname2user: should not have uid 0"
-msgstr "netname2user: Sollte nicht die Benutzernummer 0 haben"
+msgstr "netname2user: sollte nicht die Benutzernummer 0 haben"
 
 #: sunrpc/svc_simple.c:158
 #, c-format
@@ -4178,9 +4181,10 @@ msgstr "Fehler beim Aufruf des Präprozessors"
 msgid "print list of count paths and their number of use"
 msgstr "Gib eine Liste der gezählten Pfade und der Anzahl der Benutzung aus"
 
+# So sonst oft.
 #: iconv/iconv_prog.c:61
 msgid "print progress information"
-msgstr "Gebe Informationen über den Bearbeitungsstand aus"
+msgstr "Gib Informationen über den Bearbeitungsstand aus"
 
 #: db2/makedb.c:345
 #, c-format
@@ -4466,7 +4470,7 @@ msgstr "Syntaxfehler im Prolog: %s"
 #: locale/programs/repertoire.c:272
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
-msgstr "Syntaxfehler in der »epertoire« Map-Definition: %s"
+msgstr "Syntaxfehler in der »repertoire« Map-Definition: %s"
 
 #: locale/programs/locfile.c:985
 msgid "syntax error in time locale definition"
@@ -4625,7 +4629,7 @@ msgstr "Syntax: %s Eingabedatei\n"
 
 #: timezone/zic.c:2109
 msgid "use of 2/29 in non leap-year"
-msgstr "Der 29. Februar wurde in einem nicht-Schaltjahr verwendet"
+msgstr "Der 29. Februar wurde in einem Jahr verwendet, das kein Schaltjahr ist"
 
 #: locale/programs/charmap.c:521 locale/programs/charmap.c:575
 #, c-format
diff --git a/po/ko.po b/po/ko.po
index 1c0887a775..0cc60338ca 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,12 +1,12 @@
 # GNU libcÀÇ Çѱ¹¾î ¸Þ½ÃÁö
-# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2000 Free Software Foundation, Inc.
 # Bang Jun-Young <bangjy@nownuri.net>, 1996-97.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libc 2.1\n"
-"POT-Creation-Date: 1998-11-28 09:29-0800\n"
-"PO-Revision-Date: 1998-12-04 06:52+0900\n"
+"Project-Id-Version: GNU libc 2.1.3\n"
+"POT-Creation-Date: 2000-02-16 10:39-0800\n"
+"PO-Revision-Date: 2000-02-19 11:38+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@adam.kaist.ac.kr>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,22 +21,22 @@ msgstr "\t\tÁ¢±Ù ±ÇÇÑ     : "
 msgid "\t\tAttributes    : "
 msgstr "\t\t¼Ó¼º          : "
 
-#: sunrpc/rpc_main.c:1416
+#: sunrpc/rpc_main.c:1414
 #, c-format
 msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
 msgstr "\t%s [-abkCLNTM][-DÀ̸§[=°ª]] [-i Å©±â] [-I [-K ÃÊ]] [-Y °æ·Î] ÀÔ·ÂÆÄÀÏ\n"
 
-#: sunrpc/rpc_main.c:1418
+#: sunrpc/rpc_main.c:1416
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\n"
 
-#: sunrpc/rpc_main.c:1421
+#: sunrpc/rpc_main.c:1419
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n ³×Æ®id]* [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\n"
 
-#: sunrpc/rpc_main.c:1420
+#: sunrpc/rpc_main.c:1418
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s ³×ƮŸÀÔ]* [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "\nGroup Members :\n"
 msgstr "\n±×·ì ¸â¹ö :\n"
 
-#: nis/nis_print.c:320
+#: nis/nis_print.c:322
 msgid "\nTime to Live  : "
 msgstr "\nÀ¯Áö ½Ã°£ : "
 
@@ -141,7 +141,7 @@ msgstr "      ¾Æ´Ï¿À"
 msgid "     yes"
 msgstr "     ¿¹"
 
-#: nis/nis_print.c:344
+#: nis/nis_print.c:348
 #, c-format
 msgid "    Data Length = %u\n"
 msgstr "    µ¥ÀÌŸ ±æÀÌ = %u\n"
@@ -194,39 +194,39 @@ msgstr "    Àç±ÍÀû ¸â¹ö:\n"
 msgid "   program vers proto   port\n"
 msgstr "   ÇÁ·Î±×·¥ ¹öÀü ¿øÇü   Æ÷Æ®\n"
 
-#: argp/argp-help.c:1571
+#: argp/argp-help.c:1573
 msgid "  or: "
 msgstr "  ȤÀº: "
 
-#: timezone/zic.c:421
+#: timezone/zic.c:423
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (\"%s\"¿¡ ÀÖ´Â ±ÔÄ¢, Çà %d)"
 
-#: argp/argp-help.c:1583
+#: argp/argp-help.c:1585
 msgid " [OPTION...]"
 msgstr "[¿É¼Ç...]"
 
-#: locale/programs/ld-collate.c:370 locale/programs/ld-ctype.c:1291
+#: locale/programs/ld-collate.c:370 locale/programs/ld-ctype.c:1476
 msgid " done\n"
 msgstr " ¿Ï·á\n"
 
-#: timezone/zic.c:418
+#: timezone/zic.c:420
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", Çà %d: %s"
 
-#: timezone/zic.c:958
+#: timezone/zic.c:984
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"Áö¿ª %s\" Çà°ú -l ¿É¼ÇÀº »óÈ£ ¹èŸÀûÀÔ´Ï´Ù"
 
-#: timezone/zic.c:966
+#: timezone/zic.c:992
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"Áö¿ª %s\" Çà°ú -p ¿É¼ÇÀº »óÈ£ ¹èŸÀûÀÔ´Ï´Ù"
 
-#: sunrpc/rpc_main.c:1401
+#: sunrpc/rpc_main.c:1399
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "ÅÛÇø´ »ý¼º Ç÷¡±×¸¦ À§Çؼ­´Â \"ÀÔ·ÂÆÄÀÏ\"ÀÌ ÇÊ¿äÇÕ´Ï´Ù\n"
 
@@ -240,7 +240,7 @@ msgstr "%.*s: ARGP_HELP_FMT Àμö´Â °ªÀÌ ÇÊ¿äÇÕ´Ï´Ù"
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: ¾Ë¼ö ¾ø´Â ARGP_HELP_FMT ÀÎÀÚ"
 
-#: timezone/zic.c:768
+#: timezone/zic.c:794
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "±ÔÄ¢¾ø´Â Áö¿ª¿¡ %s°¡ ÀÖÀ½"
@@ -260,7 +260,7 @@ msgstr "%s%s%s:%u: %s%s¿¹±âÄ¡ ¸øÇÑ ¿À·ù: %s.\n"
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%s¾Ë ¼ö ¾ø´Â ½ÅÈ£ %d\n"
 
-#: timezone/zic.c:2201
+#: timezone/zic.c:2229
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d´Â ºÎÈ£ È®ÀåÀÌ Á¦´ë·Î µÇÁö ¾Ê¾Ò½À´Ï´Ù\n"
@@ -270,92 +270,97 @@ msgstr "%s: %d´Â ºÎÈ£ È®ÀåÀÌ Á¦´ë·Î µÇÁö ¾Ê¾Ò½À´Ï´Ù\n"
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max>´Â <mb_cur_min>º¸´Ù Ä¿¾ß ÇÕ´Ï´Ù\n"
 
-#: sunrpc/rpc_main.c:422
+#: sunrpc/rpc_main.c:421
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr "%s: C Àü󸮱Ⱑ Á¾·á ÄÚµå %d·Î ½ÇÆÐÇÏ¿´½À´Ï´Ù\n"
 
-#: sunrpc/rpc_main.c:419
+#: sunrpc/rpc_main.c:418
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr "%s: C Àü󷯱Ⱑ ½Ã±×³¯ %d·Î ½ÇÆÐÇÏ¿´½À´Ï´Ù\n"
 
-#: timezone/zic.c:1469
+#: timezone/zic.c:1495
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: %s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:2179
+#: timezone/zic.c:2207
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: %s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:620
+#: timezone/zic.c:646
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: %s¸¦ %s·Î ¸µÅ©ÇÒ ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:794
+#: timezone/zic.c:820
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: %s¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:1459
+#: timezone/zic.c:1485
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
-msgstr "%s: %s¸¦ Áö¿ï ¼ö ¾ø½À´Ï´Ù: %s\n"
+msgstr "%s: %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: %s\n"
+
+#: timezone/zic.c:631
+#, c-format
+msgid "%s: Can't unlink  %s: %s\n"
+msgstr "%s: %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:863
+#: timezone/zic.c:889
 #, c-format
 msgid "%s: Error closing %s: %s\n"
-msgstr "%s: %s¸¦ ´Ý´Â µµÁß ¿À·ù ¹ß»ý: %s\n"
+msgstr "%s: %sÀ»(¸¦) ´Ý´Â µµÁß ¿À·ù ¹ß»ý: %s\n"
 
-#: timezone/zic.c:856
+#: timezone/zic.c:882
 #, c-format
 msgid "%s: Error reading %s\n"
-msgstr "%s: %s¸¦ Àд µµÁß ¿À·ù ¹ß»ý\n"
+msgstr "%s: %sÀ»(¸¦) Àд µµÁß ¿À·ù ¹ß»ý\n"
 
-#: timezone/zic.c:1535
+#: timezone/zdump.c:266
 #, c-format
-msgid "%s: Error writing %s\n"
-msgstr "%s: %s¸¦ ¾²´Â µµÁß ¿À·ù ¹ß»ý\n"
+msgid "%s: Error writing "
+msgstr "%s: ¾²´Â µµÁß ¿À·ù ¹ß»ý"
 
-#: timezone/zdump.c:266
+#: timezone/zic.c:1561
 #, c-format
-msgid "%s: Error writing standard output "
-msgstr "%s: Ç¥ÁØ Ãâ·Â¿¡ ¾²´Â µµÁß ¿À·ù ¹ß»ý "
+msgid "%s: Error writing %s\n"
+msgstr "%s: %sÀ»(¸¦) ¾²´Â µµÁß ¿À·ù ¹ß»ý\n"
 
-#: timezone/zic.c:841
+#: timezone/zic.c:867
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: À±ÃÊ ÆÄÀÏÀÌ ¾Æ´Ñ %s ÆÄÀÏ¿¡ Leap ÁÙÀÌ ÀÖÀ½\n"
 
-#: timezone/zic.c:359
+#: timezone/zic.c:361
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: ¸Þ¸ð¸®°¡ ¹Ù´Ú³²: %s\n"
 
-#: timezone/zic.c:524
+#: timezone/zic.c:526
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -L ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: timezone/zic.c:484
+#: timezone/zic.c:486
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -d ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: timezone/zic.c:494
+#: timezone/zic.c:496
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -l ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: timezone/zic.c:504
+#: timezone/zic.c:506
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -p ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: timezone/zic.c:514
+#: timezone/zic.c:516
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -y ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
@@ -370,57 +375,57 @@ msgstr "%s: ÀÎÀÚ°¡ ³Ê¹« ¸¹À½\n"
 msgid "%s: cannot get modification time"
 msgstr "%s: º¯°æ ½Ã°¢À» ¾Ë¾Æ³¾ ¼ö ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:1900
+#: timezone/zic.c:1928
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: ¸í·ÉÀº '%s'¿´°í, °á°ú´Â %d¿´½À´Ï´Ù\n"
 
-#: locale/programs/charmap.c:677 locale/programs/locfile.c:1008
+#: locale/programs/charmap.c:676 locale/programs/locfile.c:1014
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: »óÅ ±â°è¿¡ ¿À·ù ¹ß»ý"
 
-#: posix/getopt.c:784
+#: posix/getopt.c:788
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: À߸øµÈ ¿É¼Ç -- %c\n"
 
-#: posix/getopt.c:787
+#: posix/getopt.c:791
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ºÎÀûÀýÇÑ ¿É¼Ç -- %c\n"
 
-#: posix/getopt.c:707
+#: posix/getopt.c:711
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: posix/getopt.c:677
+#: posix/getopt.c:681
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s'´Â ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
 
-#: posix/getopt.c:725 posix/getopt.c:898
+#: posix/getopt.c:729 posix/getopt.c:902
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: `%s' ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù\n"
 
-#: posix/getopt.c:702
+#: posix/getopt.c:706
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: posix/getopt.c:882
+#: posix/getopt.c:886
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: posix/getopt.c:864
+#: posix/getopt.c:868
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s'´Â ¸ðÈ£ÇÑ ¿É¼ÇÀÔ´Ï´Ù\n"
 
-#: posix/getopt.c:817 posix/getopt.c:947
+#: posix/getopt.c:821 posix/getopt.c:951
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ÀÌ ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù -- %c\n"
@@ -430,32 +435,32 @@ msgstr "%s: ÀÌ ¿É¼ÇÀº Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù -- %c\n"
 msgid "%s: output would overwrite %s\n"
 msgstr "%s: Ãâ·ÂÀÌ %s¸¦ µ¤¾î¾µ °ÍÀÔ´Ï´Ù\n"
 
-#: timezone/zic.c:848 timezone/zic.c:1262 timezone/zic.c:1287
+#: timezone/zic.c:874 timezone/zic.c:1288 timezone/zic.c:1313
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: panic: ºÎÀûÀýÇÑ ÁÂÇ×°ª %d\n"
 
-#: locale/programs/charmap.c:684 locale/programs/repertoire.c:289
+#: locale/programs/charmap.c:683 locale/programs/repertoire.c:301
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: ÆÄÀÏÀÌ ¿Ï°áµÇÁö ¾ÊÀº ä ³¡³²"
 
 #: sunrpc/rpc_main.c:294
 #, c-format
-msgid "%s: unable to open "
-msgstr "%s: ¿­ ¼ö ¾øÀ½"
+msgid "%s: unable to open %s: %m\n"
+msgstr "%s: %sÀ»(¸¦) ¿­ ¼ö ¾øÀ½: %m\n"
 
-#: posix/getopt.c:758
+#: posix/getopt.c:762
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `%c%s'\n"
 
-#: posix/getopt.c:754
+#: posix/getopt.c:758
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÀνÄÇÒ ¼ö ¾ø´Â ¿É¼Ç `--%s'\n"
 
-#: timezone/zic.c:443
+#: timezone/zic.c:445
 #, c-format
 msgid ""
 "%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d directory ]\n"
@@ -469,10 +474,10 @@ msgstr ""
 msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: »ç¿ë¹ýÀº %s [ -v ] [ -c Àý´Ü ] Áö¿ª¸í ... ÀÔ´Ï´Ù\n"
 
-#: sunrpc/rpc_main.c:307
+#: sunrpc/rpc_main.c:306
 #, c-format
-msgid "%s: while writing output: "
-msgstr "%s: Ãâ·ÂÇÏ´Â µµÁß ¿À·ù ¹ß»ý "
+msgid "%s: while writing output %s: %m"
+msgstr "%s: %sÀ»(¸¦) Ãâ·ÂÇÏ´Â µµÁß ¿À·ù ¹ß»ý: %m"
 
 #: argp/argp-parse.c:164
 msgid "(PROGRAM ERROR) No version known!?"
@@ -495,16 +500,16 @@ msgstr "(¾Ë ¼ö ¾ø´Â ÀÎÁõ ¿À·ù - %d)"
 msgid "(unknown)"
 msgstr "(¾Ë ¼ö ¾øÀ½)"
 
-#: elf/sprof.c:574
+#: elf/sprof.c:570
 #, c-format
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr "*** `%s' ÆÄÀÏÀº µð¹ö±ëÁ¤º¸°¡ Á¦°ÅµÇ¾ú½À´Ï´Ù: ´õ ÀÚ¼¼ÇÑ ºÐ¼®Àº ºÒ°¡´ÉÇÕ´Ï´Ù\n"
 
-#: catgets/gencat.c:266
+#: catgets/gencat.c:267
 msgid "*standard input*"
 msgstr "*Ç¥ÁØ ÀÔ·Â*"
 
-#: catgets/gencat.c:120
+#: catgets/gencat.c:121
 msgid ""
 "-o OUTPUT-FILE [INPUT-FILE]...\n"
 "[OUTPUT-FILE [INPUT-FILE]...]"
@@ -512,7 +517,8 @@ msgstr ""
 "-o Ãâ·Â-ÆÄÀÏ [ÀÔ·Â-ÆÄÀÏ]...\n"
 "[Ãâ·Â-ÆÄÀÏ [ÀÔ·Â-ÆÄÀÏ]...]"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:778
+#: stdio-common/../sysdeps/gnu/errlist.c:796
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:114
 msgid ".lib section in a.out corrupted"
 msgstr "a.outÀÇ .lib ÀýÀÌ ¼Õ»óµÇ¾úÀ½"
 
@@ -530,12 +536,12 @@ msgstr "; ÀÌÀ¯ = "
 msgid "<%s> and <%s> are illegal names for range"
 msgstr "¹®ÀÚÀÇ ¹üÀ§·Î À߸øµÈ À̸§ <%s>¿Í <%s>"
 
-#: locale/programs/ld-ctype.c:342
+#: locale/programs/ld-ctype.c:428
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> ¹®ÀÚ´Â `%s' Ŭ·¡½º¿¡ ÀÖÀ¸¸é ¾ÈµË´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:330
+#: locale/programs/ld-ctype.c:416
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> ¹®ÀÚ´Â `%s' Ŭ·¡½º¿¡ ¾øÀ½"
@@ -543,24 +549,26 @@ msgstr "<SP> ¹®ÀÚ´Â `%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:603
+#: stdio-common/../sysdeps/gnu/errlist.c:621
 msgid "?"
 msgstr "?"
 
-#: sysdeps/unix/sysv/linux/siglist.h:27
+#: sysdeps/generic/siglist.h:34 sysdeps/gnu/siglist.h:28
 msgid "Aborted"
 msgstr "ÁßÁöµÊ"
 
-#: nis/nis_print.c:318
+#: nis/nis_print.c:320
 msgid "Access Rights : "
 msgstr "Á¢±Ù ±ÇÇÑ : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:774
+#: stdio-common/../sysdeps/gnu/errlist.c:792
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:113
 msgid "Accessing a corrupted shared library"
 msgstr "¼Õ»óµÈ °øÀ¯ ¶óÀ̺귯¸®¿¡ Á¢±ÙÇÔ"
 
 #. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
 #: stdio-common/../sysdeps/gnu/errlist.c:366
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:154
 msgid "Address already in use"
 msgstr "ÁÖ¼Ò°¡ ÀÌ¹Ì »ç¿ë ÁßÀÔ´Ï´Ù"
 
@@ -574,32 +582,54 @@ msgstr "È£½ºÆ®À̸§¿¡ ´ëÇÑ ÁÖ¼Ò±ºÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 msgid "Address family not supported by protocol"
 msgstr "ÁÖ¼Ò±ºÀÌ ±Ô¾à¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:742
+# (FIXME)
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:153
+msgid "Address family not supported by protocol family"
+msgstr "ÁÖ¼Ò±ºÀÌ ±Ô¾à±º¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:760
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:97
 msgid "Advertise error"
 msgstr "±¤°í ¿À·ù"
 
-#: stdio-common/../sysdeps/unix/siglist.c:39
-#: sysdeps/unix/sysv/linux/siglist.h:33
+#: stdio-common/../sysdeps/unix/siglist.c:39 sysdeps/generic/siglist.h:40
+#: sysdeps/gnu/siglist.h:34
 msgid "Alarm clock"
 msgstr "ÀÚ¸íÁ¾ ½Ã°è"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:82
+msgid "Anode table overflow"
+msgstr "Anode Å×À̺í Èê·¯ ³Ñħ"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:36
+msgid "Arg list too long"
+msgstr "Àμö ¸í´ÜÀÌ ³Ê¹« ±è"
+
 #. 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:69
 msgid "Argument list too long"
-msgstr "Àμö ¸í´ÜÀÌ ³Ê¹« ±é´Ï´Ù"
+msgstr "Àμö ¸í´ÜÀÌ ³Ê¹« ±è"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:62
+msgid "Argument out of domain"
+msgstr "ÀÎÀÚ°¡ ¿µ¿ªÀ» ¹þ¾î³²"
 
 #: nis/nis_error.c:65
 msgid "Attempt to remove a non-empty table"
 msgstr "ºñ¾îÀÖÁö ¾ÊÀº Å×À̺íÀ» Áö¿ì·Á°í ½Ãµµ"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:782
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:115
+msgid "Attempting to link in more shared libraries than system limit"
+msgstr "½Ã½ºÅÛÀÇ Á¦ÇѺ¸´Ù ¸¹Àº µ¿Àû ¶óÀ̺귯¸®¿Í ¸µÅ©ÇÏ·Á°í ÇßÀ½"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:800
 msgid "Attempting to link in too many shared libraries"
 msgstr "³Ê¹« ¸¹Àº µ¿Àû ¶óÀ̺귯¸®¿Í ¸µÅ©ÇÏ·Á°í ½ÃµµÇÏ¿´À½"
 
-#: sunrpc/clnt_perr.c:273
+#: sunrpc/clnt_perr.c:328
 msgid "Authentication OK"
 msgstr "ÀÎÁõ ¼º°ø"
 
@@ -615,9 +645,15 @@ msgstr "¾ûÅ͸® ¿ÀºêÁ§Æ®\n"
 #. 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:114
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:43
 msgid "Bad address"
 msgstr "À߸øµÈ ÁÖ¼Ò"
 
+# (FIXME)
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:79
+msgid "Bad exchange descriptor"
+msgstr "À߸øµÈ exchange ±â¼úÀÚ"
+
 #. 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).
@@ -625,16 +661,29 @@ msgstr "À߸øµÈ ÁÖ¼Ò"
 msgid "Bad file descriptor"
 msgstr "À߸øµÈ ÆÄÀÏ ±â¼úÀÚ"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:730
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:38
+msgid "Bad file number"
+msgstr "À߸øµÈ ÆÄÀÏ ¹øÈ£"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:748
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:86
 msgid "Bad font file format"
 msgstr "À߸øµÈ ÆùÆ® ÆÄÀÏ Çü½Ä"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:622
+#: stdio-common/../sysdeps/gnu/errlist.c:640
 msgid "Bad message"
 msgstr "À߸øµÈ ¸Þ½ÃÁö"
 
-#: stdio-common/../sysdeps/unix/siglist.c:37
-#: sysdeps/unix/sysv/linux/siglist.h:56
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:83
+msgid "Bad request code"
+msgstr "À߸øµÈ ¿äû ÄÚµå"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:80
+msgid "Bad request descriptor"
+msgstr "À߸øµÈ ¿äû ±â¼úÀÚ"
+
+#: stdio-common/../sysdeps/unix/siglist.c:37 sysdeps/generic/siglist.h:63
+#: sysdeps/gnu/siglist.h:57
 msgid "Bad system call"
 msgstr "À߸øµÈ ½Ã½ºÅÛ È£Ãâ"
 
@@ -642,7 +691,7 @@ msgstr "À߸øµÈ ½Ã½ºÅÛ È£Ãâ"
 msgid "Bad value for ai_flags"
 msgstr "À߸øµÈ ai_flagsÀÇ °ª"
 
-#: locale/programs/localedef.c:104
+#: locale/programs/localedef.c:101
 msgid "Be strictly POSIX conform"
 msgstr "¾ö°ÝÇÏ°Ô POSIX¸¦ µû¸§"
 
@@ -654,6 +703,7 @@ msgstr "ÀÌÁø µ¥ÀÌŸ\n"
 #. 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:121
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:44
 msgid "Block device required"
 msgstr "ºí·° ÀåÄ¡°¡ ÇÊ¿äÇÔ"
 
@@ -668,12 +718,13 @@ msgstr "ºê·Îµåij½ºÆ® ¼±Åà ¹®Á¦"
 #. TRANS unless it has handled or blocked @code{SIGPIPE}.
 #: stdio-common/../sysdeps/gnu/errlist.c:234
 #: stdio-common/../sysdeps/unix/siglist.c:38
-#: sysdeps/unix/sysv/linux/siglist.h:32
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:61
+#: sysdeps/generic/siglist.h:39 sysdeps/gnu/siglist.h:33
 msgid "Broken pipe"
 msgstr "ÆÄÀÌÇÁ°¡ ±ú¾îÁü"
 
-#: stdio-common/../sysdeps/unix/siglist.c:35
-#: sysdeps/unix/sysv/linux/siglist.h:30
+#: stdio-common/../sysdeps/unix/siglist.c:35 sysdeps/generic/siglist.h:37
+#: sysdeps/gnu/siglist.h:31
 msgid "Bus error"
 msgstr "¹ö½º ¿À·ù"
 
@@ -681,8 +732,8 @@ msgstr "¹ö½º ¿À·ù"
 msgid "CDS"
 msgstr "CDS"
 
-#: stdio-common/../sysdeps/unix/siglist.c:49
-#: sysdeps/unix/sysv/linux/siglist.h:43
+#: stdio-common/../sysdeps/unix/siglist.c:49 sysdeps/generic/siglist.h:50
+#: sysdeps/gnu/siglist.h:44
 msgid "CPU time limit exceeded"
 msgstr "CPU ½Ã°£ Á¦ÇÑ ÃÊ°úÇÔ"
 
@@ -690,23 +741,28 @@ msgstr "CPU ½Ã°£ Á¦ÇÑ ÃÊ°úÇÔ"
 msgid "Cache expired"
 msgstr "ij½¬°¡ ½Ã°£ ÃÊ°úµÊ"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:770
+#: stdio-common/../sysdeps/gnu/errlist.c:788
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:112
 msgid "Can not access a needed shared library"
 msgstr "ÇÊ¿äÇÑ °øÀ¯ ¶óÀ̺귯¸®¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/ypclnt.c:769
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:116
+msgid "Can not exec a shared library directly"
+msgstr "°øÀ¯ ¶óÀ̺귯¸®¸¦ Á÷Á¢ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#: nis/ypclnt.c:779
 msgid "Can't bind to server which serves this domain"
 msgstr "ÀÌ µµ¸ÞÀÎÀ» Á¦°øÇÏ´Â ¼­¹ö¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/ypclnt.c:781
+#: nis/ypclnt.c:791
 msgid "Can't communicate with portmapper"
 msgstr "rpcinfo: Æ÷Æ®¸ÅÆÛ¿Í Åë½ÅÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/ypclnt.c:783
+#: nis/ypclnt.c:793
 msgid "Can't communicate with ypbind"
 msgstr "ypbind¿Í Åë½ÅÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/ypclnt.c:785
+#: nis/ypclnt.c:795
 msgid "Can't communicate with ypserv"
 msgstr "ypserv¿Í Åë½ÅÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -720,6 +776,7 @@ msgstr "¸Þ¸ð¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 #. 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:373
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:155
 msgid "Cannot assign requested address"
 msgstr "¿äûµÈ ÁÖ¼Ò¸¦ ¹èÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -727,11 +784,11 @@ msgstr "¿äûµÈ ÁÖ¼Ò¸¦ ¹èÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 msgid "Cannot create socket for broadcast rpc"
 msgstr "ºê·Îµåij½ºÆ® rpc¸¦ À§ÇÑ ¼ÒÄÏÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:786
+#: stdio-common/../sysdeps/gnu/errlist.c:804
 msgid "Cannot exec a shared library directly"
 msgstr "°øÀ¯ ¶óÀ̺귯¸®¸¦ Á÷Á¢ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/rpc_main.c:1406
+#: sunrpc/rpc_main.c:1404
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "ÇÑ°³ ÀÌ»óÀÇ ÆÄÀÏ »ý¼º Ç÷¡±×¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù\n"
 
@@ -739,10 +796,14 @@ msgstr "ÇÑ°³ ÀÌ»óÀÇ ÆÄÀÏ »ý¼º Ç÷¡±×¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù\n"
 msgid "Cannot receive reply to broadcast"
 msgstr "ºê·Îµåij½ºÆ®¿¡ ´ëÇÑ ÀÀ´äÀ» ¹ÞÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/pmap_clnt.c:74
+#: sunrpc/pmap_clnt.c:133
 msgid "Cannot register service"
 msgstr "¼­ºñ½º¸¦ µî·ÏÇÒ ¼ö ¾ø½À´Ï´Ù"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:172
+msgid "Cannot send after socket shutdown"
+msgstr "¼ÒÄÏÀ» Á¾·áÇÑ ÈÄ¿¡´Â º¸³¾ ¼ö ¾ø½À´Ï´Ù"
+
 #. TRANS The socket has already been shut down.
 #: stdio-common/../sysdeps/gnu/errlist.c:434
 msgid "Cannot send after transport endpoint shutdown"
@@ -756,23 +817,24 @@ msgstr "ºê·Îµåij½ºÆ® ÆÐŶÀ» º¸³¾ ¼ö ¾ø½À´Ï´Ù"
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "¼ÒÄÏ ¿É¼Ç SO_BROADCAST¸¦ ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/rpc_main.c:1193
+#: sunrpc/rpc_main.c:1191
 msgid "Cannot specify more than one input file!\n"
 msgstr "ÇÑ°³ ÀÌ»óÀÇ ÀÔ·Â ÆÄÀÏÀ» ÁöÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù!\n"
 
-#: sunrpc/rpc_main.c:1363
+#: sunrpc/rpc_main.c:1361
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "³×Æ®id Ç÷¡±×¸¦ inetd Ç÷¡±×¿Í ÇÔ²² ¾µ ¼ö ¾ø½À´Ï´Ù!\n"
 
-#: sunrpc/rpc_main.c:1375
+#: sunrpc/rpc_main.c:1373
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr "³×Æ®id Ç÷¡±×¸¦ TIRPC¿Í ÇÔ²² ¾µ ¼ö ¾ø½À´Ï´Ù!\n"
 
-#: sunrpc/rpc_main.c:1382
+#: sunrpc/rpc_main.c:1380
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "»õ·Î¿î ½ºÅ¸ÀÏ¿¡¼­´Â Å×À̺í Ç÷¡±×¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù!\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:670
+#: stdio-common/../sysdeps/gnu/errlist.c:688
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:66
 msgid "Channel number out of range"
 msgstr "¹üÀ§¸¦ ¹þ¾î³­ ä³Î ¹øÈ£"
 
@@ -781,12 +843,12 @@ msgstr "¹üÀ§¸¦ ¹þ¾î³­ ä³Î ¹øÈ£"
 msgid "Character Separator : %c\n"
 msgstr "¹®ÀÚ ±¸ºÐÀÚ : %c\n"
 
-#: stdio-common/../sysdeps/unix/siglist.c:45
-#: sysdeps/unix/sysv/linux/siglist.h:39
+#: stdio-common/../sysdeps/unix/siglist.c:45 sysdeps/generic/siglist.h:46
+#: sysdeps/gnu/siglist.h:40
 msgid "Child exited"
 msgstr "ÀÚ½ÄÀÌ Á¾·áµÊ"
 
-#: sunrpc/clnt_perr.c:283
+#: sunrpc/clnt_perr.c:347
 msgid "Client credential too weak"
 msgstr "Ŭ¶óÀ̾ðÆ® ÀÚ°Ý ºÎ¿©°¡ ³Ê¹« ¾àÇÔ"
 
@@ -794,20 +856,21 @@ msgstr "Ŭ¶óÀ̾ðÆ® ÀÚ°Ý ºÎ¿©°¡ ³Ê¹« ¾àÇÔ"
 msgid "Columns             :\n"
 msgstr "¿­                  :\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:750
+#: stdio-common/../sysdeps/gnu/errlist.c:768
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:99
 msgid "Communication error on send"
 msgstr "Àü¼Û Áß Åë½Å ¿À·ù"
 
-#: locale/programs/localedef.c:112
+#: locale/programs/localedef.c:109
 msgid "Compile locale specification"
 msgstr "·ÎÄÉÀÏ ¸í¼¼¸¦ ÄÄÆÄÀÏ"
 
 #. TRANS Go home and have a glass of warm, dairy-fresh milk.
-#: stdio-common/../sysdeps/gnu/errlist.c:613
+#: stdio-common/../sysdeps/gnu/errlist.c:631
 msgid "Computer bought the farm"
 msgstr "ÄÄÇ»ÅÍ°¡ ³óÀåÀ» »ò½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:1253
+#: locale/programs/ld-ctype.c:1438
 msgid "Computing table size for character classes might take a while..."
 msgstr "¹®ÀÚ Å¬·¡½ºÀÇ Ç¥ Å©±â °è»êÀº ½Ã°£ÀÌ ¾à°£ °É¸± ¼ö ÀÖ½À´Ï´Ù..."
 
@@ -818,6 +881,7 @@ msgstr "Á¶»ç Á¤º¸ÀÇ Ç¥ Å©±â °è»êÀº ½Ã°£ÀÌ ¾à°£ °É¸± ¼ö ÀÖ½À´Ï´Ù... "
 #. 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:451
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:175
 msgid "Connection refused"
 msgstr "¿¬°áÀÌ °ÅºÎµÊ"
 
@@ -825,17 +889,19 @@ msgstr "¿¬°áÀÌ °ÅºÎµÊ"
 #. TRANS local host, such as by the remote machine rebooting or an unrecoverable
 #. TRANS protocol violation.
 #: stdio-common/../sysdeps/gnu/errlist.c:401
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:160
 msgid "Connection reset by peer"
 msgstr "¿¬°áÀÌ »ó´ëÆí¿¡ ÀÇÇØ ²÷¾îÁü"
 
 #. TRANS A socket operation with a specified timeout received no response during
 #. TRANS the timeout period.
 #: stdio-common/../sysdeps/gnu/errlist.c:445
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:174
 msgid "Connection timed out"
 msgstr "¿¬°á ½Ã°£ ÃÊ°ú"
 
-#: stdio-common/../sysdeps/unix/siglist.c:44
-#: sysdeps/unix/sysv/linux/siglist.h:38
+#: stdio-common/../sysdeps/unix/siglist.c:44 sysdeps/generic/siglist.h:45
+#: sysdeps/gnu/siglist.h:39
 msgid "Continued"
 msgstr "°è¼ÓµÊ"
 
@@ -847,10 +913,10 @@ msgstr "ÁÖ¾îÁø ÆÄÀÏÀÇ ÀÎÄÚµùÀ» ÇÑ ÀÎÄÚµù¿¡¼­ ¶Ç´Ù¸¥ ÀÎÄÚµùÀ¸·Î º¯È¯ÇÔ."
 msgid "Convert key to lower case"
 msgstr "Å°¸¦ ¼Ò¹®ÀÚ·Î º¯È¯ÇÔ"
 
-#: catgets/gencat.c:236 db2/makedb.c:242 elf/sprof.c:359
+#: catgets/gencat.c:237 db2/makedb.c:242 elf/sprof.c:355
 #: iconv/iconv_prog.c:294 locale/programs/locale.c:267
-#: locale/programs/localedef.c:403 nscd/nscd.c:223 nss/getent.c:65
-#: posix/getconf.c:624
+#: locale/programs/localedef.c:400 nscd/nscd.c:277 nscd/nscd_nischeck.c:90
+#: nss/getent.c:66 posix/getconf.c:624
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -861,16 +927,16 @@ msgstr ""
 "ÀÌ ÇÁ·Î±×·¥Àº °ø°³ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù; º¹»çÁ¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ.  »óÇ°¼º\n"
 "À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿© ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
-#: nscd/nscd_conf.c:167
+#: nscd/nscd_conf.c:165
 #, c-format
 msgid "Could not create log file \"%s\""
 msgstr "±â·Ï ÆÄÀÏ `%s'¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: catgets/gencat.c:107
+#: catgets/gencat.c:108
 msgid "Create C header file NAME containing symbol definitions"
 msgstr "±âÈ£ Á¤ÀǸ¦ ´ã°í ÀÖ´Â C Çì´õ ÆÄÀÏ NAMEÀ» ¸¸µê"
 
-#: locale/programs/localedef.c:103
+#: locale/programs/localedef.c:100
 msgid "Create output even if warning messages were issued"
 msgstr "°æ°í ¸Þ¼¼Áö°¡ ³ª¿Ã °æ¿ì¿¡µµ Ãâ·ÂÇÔ"
 
@@ -878,13 +944,17 @@ msgstr "°æ°í ¸Þ¼¼Áö°¡ ³ª¿Ã °æ¿ì¿¡µµ Ãâ·ÂÇÔ"
 msgid "Create simple DB database from textual input."
 msgstr "ÅؽºÆ® ÀԷ¿¡¼­ °£´ÜÇÑ DB µ¥ÀÌŸ¸¦ ¸¸µê"
 
-#: nis/nis_print.c:322
+#: nis/nis_print.c:325
 #, c-format
 msgid "Creation Time : %s"
 msgstr "¸¸µé¾îÁø ½Ã°¢ : %s"
 
-#: nis/nss_nisplus/nisplus-publickey.c:89
-#: nis/nss_nisplus/nisplus-publickey.c:159
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:47
+msgid "Cross-device link"
+msgstr "ÀåÄ¡°£ ¿¬°á"
+
+#: nis/nss_nisplus/nisplus-publickey.c:95
+#: nis/nss_nisplus/nisplus-publickey.c:171
 #, c-format
 msgid "DES entry for netname %s not unique\n"
 msgstr "³×Æ®name %s¿¡ ´ëÇÑ DES entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù\n"
@@ -905,10 +975,14 @@ msgstr "DNS"
 msgid "Database for table does not exist"
 msgstr "Å×ÀÌºí¿¡ ´ëÇÑ µ¥ÀÌŸº£À̽º°¡ ¾ø½À´Ï´Ù"
 
-#: nis/ypclnt.c:795
+#: nis/ypclnt.c:805
 msgid "Database is busy"
 msgstr "µ¥ÀÌÅͺ£À̽º°¡ ÀÛ¾÷ ÁßÀÔ´Ï´Ù"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:74
+msgid "Deadlock situation detected/avoided"
+msgstr "±³Âø»óÅ°¡ ¹ß°ßµÇ¾ú°Å³ª ȸÇÇÇÕ´Ï´Ù"
+
 #: nis/nis_print.c:225
 msgid "Default Access rights :\n"
 msgstr "±âº» Á¢±Ù ±ÇÇÑ :\n"
@@ -917,10 +991,15 @@ msgstr "±âº» Á¢±Ù ±ÇÇÑ :\n"
 #. 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:429
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:125
 msgid "Destination address required"
 msgstr "¸ñÀûÁö ÁÖ¼Ò°¡ ÇÊ¿äÇÔ"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:650
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:45
+msgid "Device busy"
+msgstr "ÀåÄ¡°¡ »ç¿ë ÁßÀÓ"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:668
 msgid "Device not a stream"
 msgstr "ÀåÄ¡°¡ ½ºÆ®¸²ÀÌ ¾Æ´Ô"
 
@@ -945,7 +1024,7 @@ msgstr "ÀåÄ¡³ª ÀÚ¿øÀÌ µ¿ÀÛ Áß"
 msgid "Diffie-Hellmann (%d bits)\n"
 msgstr "Diffie-Hellman (%d ºñÆ®)\n"
 
-#: nis/nis_print.c:315
+#: nis/nis_print.c:317
 #, c-format
 msgid "Directory     : %s\n"
 msgstr "µð·ºÅ丮      : %s\n"
@@ -953,15 +1032,20 @@ msgstr "µð·ºÅ丮      : %s\n"
 #. 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:480
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:122
 msgid "Directory not empty"
 msgstr "µð·ºÅ丮°¡ ºñ¾îÀÖÁö ¾ÊÀ½"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:78
+msgid "Disc quota exceeded"
+msgstr "µð½ºÅ© ÇÒ´ç·®ÀÌ ÃÊ°úµÊ"
+
 #. TRANS The user's disk quota was exceeded.
 #: stdio-common/../sysdeps/gnu/errlist.c:498
-msgid "Disc quota exceeded"
+msgid "Disk quota exceeded"
 msgstr "µð½ºÅ© ÇÒ´ç·®ÀÌ ÃÊ°úµÊ"
 
-#: nscd/nscd.c:80
+#: nscd/nscd.c:83
 msgid "Do not fork and display messages on the current tty"
 msgstr "forkÇÏÁö ¾Ê°í ÇöÀç tty¿¡ ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÔ"
 
@@ -969,16 +1053,16 @@ msgstr "forkÇÏÁö ¾Ê°í ÇöÀç tty¿¡ ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÔ"
 msgid "Do not print messages while building database"
 msgstr "µ¥ÀÌŸº£À̽º¸¦ ¸¸µå´Â µ¿¾È ¸Þ¼¼Áö Ç¥½ÃÇÏÁö ¾ÊÀ½"
 
-#: catgets/gencat.c:109
+#: catgets/gencat.c:110
 msgid "Do not use existing catalog, force new output file"
 msgstr "ÀÌ¹Ì Á¸ÀçÇÏ´Â ¸ñ·ÏÀ» »ç¿ëÇÏÁö ¾Ê°í, »õ·Î¿î ÆÄÀÏ¿¡ Ãâ·ÂÇÔ"
 
-#: nis/ypclnt.c:841
+#: nis/ypclnt.c:851
 msgid "Domain not bound"
 msgstr "µµ¸ÞÀÎÀÌ ¹Ù¿îµåµÇÁö ¾ÊÀ½"
 
-#: stdio-common/../sysdeps/unix/siglist.c:32
-#: sysdeps/unix/sysv/linux/siglist.h:53
+#: stdio-common/../sysdeps/unix/siglist.c:32 sysdeps/generic/siglist.h:60
+#: sysdeps/gnu/siglist.h:54
 msgid "EMT trap"
 msgstr "EMT Æ®·¦"
 
@@ -991,8 +1075,132 @@ msgid "Encrypted data\n"
 msgstr "¾ÏȣȭµÈ µ¥ÀÌŸ\n"
 
 #: nis/nis_error.c:52
-msgid "Entry/Table type mismatch"
-msgstr "Entry/Å×À̺í ŸÀÔÀÌ ¸ÂÁö ¾Ê½À´Ï´Ù"
+msgid "Entry/table type mismatch"
+msgstr "Entry/table ŸÀÔÀÌ ¸ÂÁö ¾Ê½À´Ï´Ù"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:29
+msgid "Error 0"
+msgstr "¿À·ù 0"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:129
+msgid "Error 100"
+msgstr "¿À·ù 100"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:130
+msgid "Error 101"
+msgstr "¿À·ù 101"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:131
+msgid "Error 102"
+msgstr "¿À·ù 102"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:132
+msgid "Error 103"
+msgstr "¿À·ù 103"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:133
+msgid "Error 104"
+msgstr "¿À·ù 104"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:134
+msgid "Error 105"
+msgstr "¿À·ù 105"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:135
+msgid "Error 106"
+msgstr "¿À·ù 106"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:136
+msgid "Error 107"
+msgstr "¿À·ù 107"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:137
+msgid "Error 108"
+msgstr "¿À·ù 108"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:138
+msgid "Error 109"
+msgstr "¿À·ù 109"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:139
+msgid "Error 110"
+msgstr "¿À·ù 110"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:140
+msgid "Error 111"
+msgstr "¿À·ù 111"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:141
+msgid "Error 112"
+msgstr "¿À·ù 112"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:142
+msgid "Error 113"
+msgstr "¿À·ù 113"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:143
+msgid "Error 114"
+msgstr "¿À·ù 114"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:144
+msgid "Error 115"
+msgstr "¿À·ù 115"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:145
+msgid "Error 116"
+msgstr "¿À·ù 116"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:146
+msgid "Error 117"
+msgstr "¿À·ù 117"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:147
+msgid "Error 118"
+msgstr "¿À·ù 118"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:148
+msgid "Error 119"
+msgstr "¿À·ù 119"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:165
+msgid "Error 136"
+msgstr "¿À·ù 136"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:171
+msgid "Error 142"
+msgstr "¿À·ù 142"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:87
+msgid "Error 58"
+msgstr "¿À·ù 142"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:88
+msgid "Error 59"
+msgstr "¿À·ù 59"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:101
+msgid "Error 72"
+msgstr "¿À·ù 72"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:102
+msgid "Error 73"
+msgstr "¿À·ù 73"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:104
+msgid "Error 75"
+msgstr "¿À·ù 75"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:105
+msgid "Error 76"
+msgstr "¿À·ù 76"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:120
+msgid "Error 91"
+msgstr "¿À·ù 91"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:121
+msgid "Error 92"
+msgstr "¿À·ù 92"
 
 #: nis/nis_error.c:56
 msgid "Error in RPC subsystem"
@@ -1002,7 +1210,7 @@ msgstr "RPC ¼­ºê ½Ã½ºÅÛ¿¡ ¿À·ù: "
 msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
 msgstr "NIS+ ½ÃÀÛ ÆÄÀÏ¿¡ Á¢±ÙÇÏ´Â µ¥ ¿À·ù.  NIS+°¡ ¼³Ä¡µÇ¾ú½À´Ï±î?"
 
-#: string/../sysdeps/mach/_strerror.c:56
+#: string/../sysdeps/mach/_strerror.c:57
 #: sysdeps/mach/hurd/mips/dl-machine.c:67
 msgid "Error in unknown error system: "
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù ½Ã½ºÅÛ¿¡ ¿À·ù: "
@@ -1011,43 +1219,55 @@ msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù ½Ã½ºÅÛ¿¡ ¿À·ù: "
 msgid "Error while talking to callback proc"
 msgstr "Äݹé ÇÁ·Î½ÃÀú¸¦ »ç¿ëÇÏ´Â µ¥ ¿À·ù"
 
-#: inet/ruserpass.c:161
+#: inet/ruserpass.c:176
 msgid "Error: .netrc file is readable by others."
 msgstr "¿À·ù: .netrc ÆÄÀÏÀ» ´Ù¸¥ »ç¶÷ÀÌ ÀÐÀ» ¼ö ÀÖ½À´Ï´Ù."
 
-#: stdio-common/../sysdeps/gnu/errlist.c:710
+#: stdio-common/../sysdeps/gnu/errlist.c:728
 msgid "Exchange full"
 msgstr "±³È¯ÀÌ °¡µæÂü"
 
 #. 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:75
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:37
 msgid "Exec format error"
 msgstr "Exec Çü½Ä ¿À·ù"
 
-#: locale/programs/localedef.c:190
+#: locale/programs/localedef.c:187
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "Áß¿ä: ½Ã½ºÅÛ¿¡ `_POSIX2_LOCALEDEF'°¡ Á¤ÀǵǾî ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/localedef.c:99
+#: locale/programs/localedef.c:91 locale/programs/localedef.c:93
+#: locale/programs/localedef.c:95
+msgid "FILE"
+msgstr "<ÆÄÀÏ>"
+
+#: locale/programs/localedef.c:96
 msgid "FILE contains mapping from symbolic names to UCS4 values"
-msgstr "ÆÄÀÏÀº ±âÈ£·Î Ç¥½ÃµÈ À̸§¿¡¼­ UCS4 °ªÀ¸·ÎÀÇ ¸ÅÇÎÀ» °®°í ÀÖ½À´Ï´Ù"
+msgstr "<ÆÄÀÏ>Àº ±âÈ£·Î Ç¥½ÃµÈ À̸§¿¡¼­ UCS4 °ªÀ¸·ÎÀÇ ¸ÅÇÎÀ» °®°í ÀÖ½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:287
+#: sunrpc/clnt_perr.c:355
 msgid "Failed (unspecified error)"
 msgstr "½ÇÆÐ (ÁöÁ¤µÇÁö ¾ÊÀº ¿À·ù)"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:762
+#: stdio-common/../sysdeps/gnu/errlist.c:780
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:110
 msgid "File descriptor in bad state"
 msgstr "ÆÄÀÏ ±â¼úÀÚ°¡ À߸øµÈ »óÅ¿¡ ÀÖÀ½"
 
 #. 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:134
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:46
 msgid "File exists"
 msgstr "ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:726
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:85
+msgid "File locking deadlock"
+msgstr "ÆÄÀÏ Àá±Ý ±³Âø»óÅÂ"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:744
 msgid "File locking deadlock error"
 msgstr "ÆÄÀÏ Àá±Ý ±³Âø»óÅ ¿À·ù"
 
@@ -1055,25 +1275,31 @@ msgstr "ÆÄÀÏ Àá±Ý ±³Âø»óÅ ¿À·ù"
 #. TRANS Files}) or host name too long (in @code{gethostname} or
 #. TRANS @code{sethostname}; @pxref{Host Identification}).
 #: stdio-common/../sysdeps/gnu/errlist.c:464
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:107
 msgid "File name too long"
 msgstr "ÆÄÀÏ À̸§ÀÌ ³Ê¹« ±é´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/siglist.c:50
-#: sysdeps/unix/sysv/linux/siglist.h:44
+#: stdio-common/../sysdeps/unix/siglist.c:50 sysdeps/generic/siglist.h:51
+#: sysdeps/gnu/siglist.h:45
 msgid "File size limit exceeded"
 msgstr "ÆÄÀÏ Å©±â Á¦ÇÑÀ» ÃÊ°úÇÔ"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:52
+msgid "File table overflow"
+msgstr "ÆÄÀÏ Å×À̺í Èê·¯ ³Ñħ"
+
 #. TRANS File too big; the size of a file would be larger than allowed by the system.
 #: stdio-common/../sysdeps/gnu/errlist.c:202
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:56
 msgid "File too large"
 msgstr "ÆÄÀÏÀÌ ³Ê¹« Å®´Ï´Ù"
 
 #: nis/nis_error.c:37
-msgid "First/Next chain broken"
-msgstr "First/Next ¿¬°áÀÌ ²÷¾îÁü"
+msgid "First/next chain broken"
+msgstr "First/next ¿¬°áÀÌ ²÷¾îÁü"
 
-#: stdio-common/../sysdeps/unix/siglist.c:33
-#: sysdeps/unix/sysv/linux/siglist.h:28
+#: stdio-common/../sysdeps/unix/siglist.c:33 sysdeps/generic/siglist.h:35
+#: sysdeps/gnu/siglist.h:29
 msgid "Floating point exception"
 msgstr "ºÎµ¿ ¼Ò¼öÁ¡ ¿¹¿Ü"
 
@@ -1081,10 +1307,12 @@ msgstr "ºÎµ¿ ¼Ò¼öÁ¡ ¿¹¿Ü"
 msgid "Full resync required for directory"
 msgstr "µð·ºÅ丮¿¡ ´ëÇØ ¿ÏÀüÇÑ resync°¡ ÇÊ¿äÇÔ"
 
-#. 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:573
+#. TRANS Function not implemented.  This indicates that the function called is
+#. TRANS not implemented at all, either in the C library itself or in the
+#. TRANS operating system.  When you get this error, you can be sure that this
+#. TRANS particular function will always fail with @code{ENOSYS} unless you
+#. TRANS install a new version of the C library or the operating system.
+#: stdio-common/../sysdeps/gnu/errlist.c:575
 msgid "Function not implemented"
 msgstr "ÇÔ¼ö°¡ ±¸ÇöµÇÁö ¾Ê¾ÒÀ½"
 
@@ -1097,7 +1325,7 @@ msgstr "±×·ì\n"
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT¿¡ ¾µ¸ð¾ø´Â °Í: %s"
 
-#: catgets/gencat.c:115
+#: catgets/gencat.c:116
 msgid ""
 "Generate message catalog.\\vIf INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
 "is -, output is written to standard output.\n"
@@ -1120,11 +1348,11 @@ msgid "Give this help list"
 msgstr "ÀÌ µµ¿ò¸» ¸®½ºÆ®¸¦ Ç¥½ÃÇÔ"
 
 #. TRANS This error code has no purpose.
-#: stdio-common/../sysdeps/gnu/errlist.c:618
+#: stdio-common/../sysdeps/gnu/errlist.c:636
 msgid "Gratuitous error"
 msgstr "ÀÌÀ¯¾ø´Â ¿À·ù"
 
-#: nis/nis_print.c:317
+#: nis/nis_print.c:319
 #, c-format
 msgid "Group         : %s\n"
 msgstr "±×·ì          : %s\n"
@@ -1142,39 +1370,40 @@ msgstr "\"%s.%s\" ±×·ìÀ» À§ÇÑ ±×·ì entry:\n"
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "SECSÃÊ µ¿¾È ¸ØÃã (±âº»°ª 3600)"
 
-#: stdio-common/../sysdeps/unix/siglist.c:26
-#: sysdeps/unix/sysv/linux/siglist.h:22
+#: stdio-common/../sysdeps/unix/siglist.c:26 sysdeps/generic/siglist.h:29
+#: sysdeps/gnu/siglist.h:23
 msgid "Hangup"
 msgstr "²÷¾îÁü"
 
-#: nscd/grpcache.c:238
+#: nscd/grpcache.c:251
 #, c-format
 msgid "Haven't found \"%d\" in group cache!"
 msgstr "±×·ì ij½¬¿¡¼­ \"%d\"¸¦ ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
 
-#: nscd/pwdcache.c:235
+#: nscd/pwdcache.c:249
 #, c-format
 msgid "Haven't found \"%d\" in password cache!"
 msgstr "¾ÏÈ£ ij½¬¿¡¼­ \"%d\"¸¦ ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
 
-#: nscd/grpcache.c:210
+#: nscd/grpcache.c:212
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "±×·ì ij½¬¿¡¼­ \"%s\"¸¦ ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
 
-#: nscd/hstcache.c:297 nscd/hstcache.c:328 nscd/hstcache.c:359
-#: nscd/hstcache.c:390
+#: nscd/hstcache.c:291 nscd/hstcache.c:333 nscd/hstcache.c:378
+#: nscd/hstcache.c:422
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "È£½ºÆ® ij½¬¿¡¼­ \"%s\"¸¦ ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
 
-#: nscd/pwdcache.c:207
+#: nscd/pwdcache.c:210
 #, c-format
 msgid "Haven't found \"%s\" in password cache!"
 msgstr "¾ÏÈ£ ij½¬¿¡¼­ \"%s\"¸¦ ãÀ» ¼ö ¾ø¾ú½À´Ï´Ù!"
 
 #. TRANS The remote host for a requested network connection is down.
 #: stdio-common/../sysdeps/gnu/errlist.c:469
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:176
 msgid "Host is down"
 msgstr "È£½ºÆ®°¡ Á×¾ú½À´Ï´Ù"
 
@@ -1182,8 +1411,12 @@ msgstr "È£½ºÆ®°¡ Á×¾ú½À´Ï´Ù"
 msgid "Host name lookup failure"
 msgstr "È£½ºÆ® À̸§ Ž»ö ½ÇÆÐ"
 
-#: stdio-common/../sysdeps/unix/siglist.c:48
-#: sysdeps/unix/sysv/linux/siglist.h:42
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:34
+msgid "I/O error"
+msgstr "ÀÔÃâ·Â ¿À·ù"
+
+#: stdio-common/../sysdeps/unix/siglist.c:48 sysdeps/generic/siglist.h:49
+#: sysdeps/gnu/siglist.h:43
 msgid "I/O possible"
 msgstr "ÀÔÃâ·Â °¡´É"
 
@@ -1205,12 +1438,17 @@ msgstr "IOT Æ®·¦"
 msgid "IVY"
 msgstr "IVY"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:626
+#: stdio-common/../sysdeps/gnu/errlist.c:644
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:65
 msgid "Identifier removed"
 msgstr "½Äº°ÀÚ Á¦°ÅµÊ"
 
-#: stdio-common/../sysdeps/unix/siglist.c:29
-#: sysdeps/unix/sysv/linux/siglist.h:25
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:117
+msgid "Illegal byte sequence"
+msgstr "¹ÙÀÌÆ® ¼ø¼­°¡ À߸øµÊ"
+
+#: stdio-common/../sysdeps/unix/siglist.c:29 sysdeps/generic/siglist.h:32
+#: sysdeps/gnu/siglist.h:26
 msgid "Illegal instruction"
 msgstr "À߸øµÈ ¸í·É¾î"
 
@@ -1220,6 +1458,7 @@ msgstr "ÀÛ¾÷ÇÏ´Â µ¥ À߸øµÈ ¿ÀºêÁ§Æ® ŸÀÔ"
 
 #. TRANS Invalid seek operation (such as on a pipe).
 #: stdio-common/../sysdeps/gnu/errlist.c:213
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:58
 msgid "Illegal seek"
 msgstr "À߸øµÈ Ž»ö"
 
@@ -1235,6 +1474,7 @@ msgstr "ºÎÀûÀýÇÑ ÆÄÀÏ Å¸ÀÔ ¶Ç´Â Çü½Ä"
 #. TRANS Inappropriate I/O control operation, such as trying to set terminal
 #. TRANS modes on an ordinary file.
 #: stdio-common/../sysdeps/gnu/errlist.c:188
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:54
 msgid "Inappropriate ioctl for device"
 msgstr "ÀåÄ¡¿¡ ´ëÇØ ºÎÀûÀýÇÑ ioctl"
 
@@ -1244,11 +1484,11 @@ msgstr "ÀåÄ¡¿¡ ´ëÇØ ºÎÀûÀýÇÑ ioctl"
 #. 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:589
+#: stdio-common/../sysdeps/gnu/errlist.c:607
 msgid "Inappropriate operation for background process"
 msgstr "¹è°æ ÇÁ·Î¼¼½º·Î ºÎÀûÇÕÇÑ µ¿ÀÛ"
 
-#: sysdeps/unix/sysv/linux/siglist.h:62
+#: sysdeps/generic/siglist.h:69 sysdeps/gnu/siglist.h:63
 msgid "Information request"
 msgstr "Á¤º¸ ¿äû"
 
@@ -1256,7 +1496,7 @@ msgstr "Á¤º¸ ¿äû"
 msgid "Information:"
 msgstr "Á¤º¸:"
 
-#: locale/programs/localedef.c:94
+#: locale/programs/localedef.c:90
 msgid "Input Files:"
 msgstr "ÀÔ·Â ÆÄÀÏ:"
 
@@ -1269,16 +1509,16 @@ msgstr "ÀÔ/Ãâ·Â Çü½Ä ÁöÁ¤:"
 msgid "Input/output error"
 msgstr "ÀÔ·Â/Ãâ·Â ¿À·ù"
 
-#: nis/ypclnt.c:775
+#: nis/ypclnt.c:785
 msgid "Internal NIS error"
 msgstr "³»ºÎ NIS ¿À·ù"
 
-#: nis/ypclnt.c:839
+#: nis/ypclnt.c:849
 msgid "Internal ypbind error"
 msgstr "³»ºÎ ypbind ¿À·ù"
 
-#: stdio-common/../sysdeps/unix/siglist.c:27
-#: sysdeps/unix/sysv/linux/siglist.h:23
+#: stdio-common/../sysdeps/unix/siglist.c:27 sysdeps/generic/siglist.h:30
+#: sysdeps/gnu/siglist.h:24
 msgid "Interrupt"
 msgstr "ÀÎÅÍ·´Æ®"
 
@@ -1290,44 +1530,42 @@ msgstr "ÀÎÅÍ·´Æ®"
 #. TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
 #. TRANS Primitives}.
 #: stdio-common/../sysdeps/gnu/errlist.c:47
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:33
 msgid "Interrupted system call"
 msgstr "Áß´ÜµÈ ½Ã½ºÅÛ È£Ãâ"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:666
+#: stdio-common/../sysdeps/gnu/errlist.c:684
 msgid "Interrupted system call should be restarted"
 msgstr "Áß´ÜµÈ ½Ã½ºÅÛ È£ÃâÀº Àç½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù"
 
-#: nis/nis_error.c:44
-msgid "Invalid Object for operation"
-msgstr "ÀÛ¾÷ÇÏ´Â µ¥ À߸øµÈ ¿ÀºêÁ§Æ®"
-
 #. 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:164
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:51
 msgid "Invalid argument"
 msgstr "ºÎÀûÀýÇÑ Àμö"
 
-#: posix/regex.c:1018
+#: posix/regex.c:1034
 msgid "Invalid back reference"
 msgstr "ºÎÀûÀýÇÑ ÈĹæ ÂüÁ¶"
 
-#: posix/regex.c:1016
+#: posix/regex.c:1028
 msgid "Invalid character class name"
 msgstr "ºÎÀûÀýÇÑ ¹®ÀÚ Å¬·¡½º À̸§"
 
-#: sunrpc/clnt_perr.c:275
+#: sunrpc/clnt_perr.c:331
 msgid "Invalid client credential"
 msgstr "ºÎÀûÀýÇÑ Å¬¶óÀ̾ðÆ® ÀÚ°Ý ºÎ¿©"
 
-#: sunrpc/clnt_perr.c:279
+#: sunrpc/clnt_perr.c:339
 msgid "Invalid client verifier"
 msgstr "ºÎÀûÀýÇÑ Å¬¶óÀ̾ðÆ® °ËÁõ±â"
 
-#: posix/regex.c:1015
+#: posix/regex.c:1025
 msgid "Invalid collation character"
 msgstr "ºÎÀûÀýÇÑ ´ëÁ¶ ¹®ÀÚ"
 
-#: posix/regex.c:1022
+#: posix/regex.c:1046
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\}¿¡ ºÎÀûÀýÇÑ ³»¿ë¹°ÀÌ ÀÖÀ½"
 
@@ -1338,51 +1576,65 @@ msgstr "\\{\\}¿¡ ºÎÀûÀýÇÑ ³»¿ë¹°ÀÌ ÀÖÀ½"
 msgid "Invalid cross-device link"
 msgstr "ºÎÀûÀýÇÑ ÀåÄ¡°£ ¿¬°á"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:702
+#: stdio-common/../sysdeps/gnu/errlist.c:720
 msgid "Invalid exchange"
 msgstr "ºÎÀûÀýÇÑ ±³È¯"
 
+#: nis/nis_error.c:44
+msgid "Invalid object for operation"
+msgstr "ÀÛ¾÷ÇÏ´Â µ¥ À߸øµÈ ¿ÀºêÁ§Æ®"
+
 #. 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:579
+#: stdio-common/../sysdeps/gnu/errlist.c:597
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr "ºÎÀûÀýÇϰųª ºÒ¿ÏÀüÇÑ ´ÙÁß¹ÙÀÌÆ® ¶Ç´Â ±¤¿ª ¹®ÀÚ"
 
-#: posix/regex.c:1025
+#: posix/regex.c:1055
 msgid "Invalid preceding regular expression"
 msgstr "¾Õ¼± Á¤±Ô½ÄÀÌ ºÎÀûÀýÇÔ"
 
-#: posix/regex.c:1023
+#: posix/regex.c:1049
 msgid "Invalid range end"
 msgstr "ºÎÀûÀýÇÑ ¹üÀ§ ³¡"
 
-#: posix/regex.c:1014
+#: posix/regex.c:1022
 msgid "Invalid regular expression"
 msgstr "ºÎÀûÀýÇÑ Á¤±Ô½Ä"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:718
+#: stdio-common/../sysdeps/gnu/errlist.c:736
 msgid "Invalid request code"
 msgstr "ºÎÀûÀýÇÑ ¿äû ÄÚµå"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:706
+#: stdio-common/../sysdeps/gnu/errlist.c:724
 msgid "Invalid request descriptor"
 msgstr "À߸øµÈ ¿äû ±â¼úÀÚ"
 
-#: sunrpc/clnt_perr.c:285
+#: sunrpc/clnt_perr.c:351
 msgid "Invalid server verifier"
 msgstr "ºÎÀûÀýÇÑ ¼­¹ö °ËÁõ±â"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:722
+#: stdio-common/../sysdeps/gnu/errlist.c:740
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:84
 msgid "Invalid slot"
 msgstr "ºÎÀûÀýÇÑ ½½·Ô"
 
+#: nscd/nscd.c:88
+msgid "Invalidate the specified cache"
+msgstr "ÁöÁ¤ÇÑ Ä³½¬¸¦ ¹«È¿È­ÇÕ´Ï´Ù"
+
 #. 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:158
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:50
 msgid "Is a directory"
 msgstr "µð·ºÅ丮ÀÔ´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:806
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:168
+msgid "Is a name file"
+msgstr "name ÆÄÀÏÀÔ´Ï´Ù"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:824
 msgid "Is a named type file"
 msgstr "named ŸÀÔ ÆÄÀÏÀÔ´Ï´Ù"
 
@@ -1390,8 +1642,8 @@ msgstr "named ŸÀÔ ÆÄÀÏÀÔ´Ï´Ù"
 msgid "Kerberos.\n"
 msgstr "Kerberos.\n"
 
-#: stdio-common/../sysdeps/unix/siglist.c:34
-#: sysdeps/unix/sysv/linux/siglist.h:29
+#: stdio-common/../sysdeps/unix/siglist.c:34 sysdeps/generic/siglist.h:36
+#: sysdeps/gnu/siglist.h:30
 msgid "Killed"
 msgstr "Á×¾úÀ½"
 
@@ -1404,34 +1656,40 @@ msgstr "¿¬°á\n"
 msgid "LOCAL entry for UID %d in directory %s not unique\n"
 msgstr "µð·ºÅ丮 %2$sÀÇ UID %1$d¸¦ À§ÇÑ LOCAL entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:698
+#: stdio-common/../sysdeps/gnu/errlist.c:716
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:73
 msgid "Level 2 halted"
 msgstr "µî±Þ 2 ¸Ü¾úÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:674
+#: stdio-common/../sysdeps/gnu/errlist.c:692
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:67
 msgid "Level 2 not synchronized"
 msgstr "µî±Þ 2°¡ µ¿±âÈ­µÇÁö ¾ÊÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:678
+#: stdio-common/../sysdeps/gnu/errlist.c:696
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:68
 msgid "Level 3 halted"
 msgstr "µî±Þ 3 ¸Ü¾úÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:682
+#: stdio-common/../sysdeps/gnu/errlist.c:700
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:69
 msgid "Level 3 reset"
 msgstr "µî±Þ 3 ¸®¼Â"
 
-#: nis/nis_error.c:53
-msgid "Link Points to illegal name"
-msgstr "°¢ ÁöÁ¡À» À߸øµÈ À̸§¿¡ ¿¬°á"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:638
+#: stdio-common/../sysdeps/gnu/errlist.c:656
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:96
 msgid "Link has been severed"
 msgstr "¸µÅ©°¡ ¼Õ»óµÇ¾ú½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:686
+#: stdio-common/../sysdeps/gnu/errlist.c:704
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:70
 msgid "Link number out of range"
 msgstr "¹üÀ§¸¦ ¹þ¾î³­ ¸µÅ© ¹øÈ£"
 
+#: nis/nis_error.c:53
+msgid "Link points to illegal name"
+msgstr "¸µÅ©°¡ À߸øµÈ À̸§À» °¡¸®Å´"
+
 #: nis/nis_print.c:282
 msgid "Linked Object Type : "
 msgstr "¿¬°áµÈ ¿ÀºêÁ§Æ® ŸÀÔ : "
@@ -1441,23 +1699,24 @@ msgstr "¿¬°áµÈ ¿ÀºêÁ§Æ® ŸÀÔ : "
 msgid "Linked to : %s\n"
 msgstr "%s¿Í ¿¬°á\n"
 
-#: nis/ypclnt.c:787
+#: nis/ypclnt.c:797
 msgid "Local domain name not set"
 msgstr "Áö¿ª µµ¸ÞÀθíÀÌ ¼³Á¤µÇÁö ¾Ê¾ÒÀ½"
 
-#: nis/ypclnt.c:777
+#: nis/ypclnt.c:787
 msgid "Local resource allocation failure"
 msgstr "Áö¿ª ÀÚ¿ø ÇÒ´ç ½ÇÆÐ"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:734
+#: stdio-common/../sysdeps/gnu/errlist.c:752
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:93
 msgid "Machine is not on the network"
 msgstr "±â°è°¡ ³×Æ®¿öÅ© »ó¿¡ ÀÖÁö ¾Ê½À´Ï´Ù"
 
 #: nis/nis_error.c:45
-msgid "Malformed Name, or illegal name"
-msgstr "À߸øµÈ Çü½Ä, ȤÀº Ʋ¸° À̸§"
+msgid "Malformed name, or illegal name"
+msgstr "À߸øµÈ Çü½ÄÀÇ À̸§, ȤÀº ¾µ ¼ö ¾ø´Â À̸§"
 
-#: argp/argp-help.c:1182
+#: argp/argp-help.c:1186
 msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
 msgstr "±ä ¿É¼Ç¿¡¼­ ´ëÇØ ²À ÇÊ¿äÇϰųª ¼±ÅÃÀûÀÎ ÀÎÀÚ´Â ±× ±ä ¿É¼Ç¿¡ ÇØ´çÇϴ ªÀº ¿É¼Ç¿¡¼­µµ ²À ÇÊ¿äÇϰųª ¼±ÅÃÀûÀÔ´Ï´Ù."
 
@@ -1473,13 +1732,18 @@ msgstr "ÁÖ ¼­¹ö°¡ ÀÛ¾÷ÁßÀ̹ǷÎ, ¿ÏÀüÇÑ ´ýÇÁ´Â ¿¬±âµË´Ï´Ù."
 msgid "Memory allocation failure"
 msgstr "¸Þ¸ð¸® ÇÒ´ç ½ÇÆÐ"
 
-#: posix/regex.c:1024
+#: posix/regex.c:1052
 msgid "Memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:81
+msgid "Message tables full"
+msgstr "¸Þ½ÃÁö Ç¥°¡ ²Ë á½À´Ï´Ù"
+
 #. TRANS The size of a message sent on a socket was larger than the supported
 #. TRANS maximum size.
 #: stdio-common/../sysdeps/gnu/errlist.c:317
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:126
 msgid "Message too long"
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±é´Ï´Ù"
 
@@ -1487,7 +1751,7 @@ msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±é´Ï´Ù"
 msgid "Missing or malformed attribute"
 msgstr "¼Ó¼ºÀÌ ¾ø°Å³ª Çü½ÄÀÌ Æ²·ÈÀ½"
 
-#: nis/nis_print.c:323
+#: nis/nis_print.c:327
 #, c-format
 msgid "Mod. Time     : %s"
 msgstr "º¯°æ ½Ã°¢     : %s"
@@ -1504,12 +1768,13 @@ msgstr "¼öÁ¤ ÀÛ¾÷ÀÌ ½ÇÆÐÇÏ¿´À½"
 msgid "Modify output format:"
 msgstr "Ãâ·Â Çü½Ä ¼öÁ¤:"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:630
+#: stdio-common/../sysdeps/gnu/errlist.c:648
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:103
 msgid "Multihop attempted"
 msgstr "¿©·¯°³ÀÇ hopÀÌ ½ÃµµµÊ"
 
-#: catgets/gencat.c:106 catgets/gencat.c:110 db2/makedb.c:59
-#: locale/programs/localedef.c:115 nscd/nscd.c:77
+#: catgets/gencat.c:107 catgets/gencat.c:111 db2/makedb.c:59
+#: locale/programs/localedef.c:112 nscd/nscd.c:80
 msgid "NAME"
 msgstr "À̸§"
 
@@ -1525,11 +1790,11 @@ msgstr ""
 msgid "NIS"
 msgstr "NIS"
 
-#: nis/ypclnt.c:791
+#: nis/ypclnt.c:801
 msgid "NIS client/server version mismatch - can't supply service"
 msgstr "NIS Ŭ¶óÀ̾ðÆ®/¼­¹ö ¹öÀü ºÒÀÏÄ¡ - ¼­ºñ½º¸¦ Á¦°øÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nis/ypclnt.c:789
+#: nis/ypclnt.c:799
 msgid "NIS map database is bad"
 msgstr "NIS Áöµµ µ¥ÀÌÅͺ£À̽º°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
@@ -1549,16 +1814,16 @@ msgstr "NIS+ ¼­ºñ½º¸¦ »ç¿ëÇÒ ¼ö ¾ø°Å³ª NIS+ ¼­ºñ½º°¡ ¼³Ä¡µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 msgid "NO OBJECT\n"
 msgstr "¿ÀºêÁ§Æ®°¡ ¾øÀ½\n"
 
-#: nscd/nscd.c:81
+#: nscd/nscd.c:84
 msgid "NUMBER"
 msgstr "¼ýÀÚ"
 
 #: nis/nis_print.c:162
 #, c-format
-msgid "Name : '%s'\n"
-msgstr "À̸§ : '%s'\n"
+msgid "Name : `%s'\n"
+msgstr "À̸§ : `%s'\n"
 
-#: nscd/nscd.c:88
+#: nscd/nscd.c:94
 msgid "Name Service Cache Daemon."
 msgstr "Name ¼­ºñ½º ij½¬ µ¥¸ó."
 
@@ -1566,7 +1831,8 @@ msgstr "Name ¼­ºñ½º ij½¬ µ¥¸ó."
 msgid "Name not served by this server"
 msgstr "ÀÌ ¼­¹ö¿¡¼­ name ¼­ºñ½º°¡ µÇÁö ¾Ê½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:758
+#: stdio-common/../sysdeps/gnu/errlist.c:776
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:109
 msgid "Name not unique on network"
 msgstr "À̸§ÀÌ ³×Æ®¿öÅ© »ó¿¡¼­ ´ÜÀÏÇÏÁö ¾ÊÀ½"
 
@@ -1587,6 +1853,10 @@ msgstr "À̸§¿¡ ÇØ´çµÇ´Â ¿ÀºêÁ§Æ®¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
 msgid "Need authenticator"
 msgstr "ÀÎÁõ±â°¡ ÇÊ¿äÇÔ"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:158
+msgid "Network dropped connection because of reset"
+msgstr "¸®¼Â¶§¹®¿¡ ³×Æ®¿öÅ©°¡ ¿¬°áÀ» ²÷¾ú½À´Ï´Ù"
+
 #. TRANS A network connection was reset because the remote host crashed.
 #: stdio-common/../sysdeps/gnu/errlist.c:389
 msgid "Network dropped connection on reset"
@@ -1594,20 +1864,23 @@ msgstr "³×Æ®¿÷ÀÌ reset¶§¹®¿¡ ¿¬°áÀ» ²÷¾ú½À´Ï´Ù"
 
 #. TRANS A socket operation failed because the network was down.
 #: stdio-common/../sysdeps/gnu/errlist.c:378
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:156
 msgid "Network is down"
 msgstr "³×Æ®¿öÅ©°¡ Á×¾ú½À´Ï´Ù"
 
 #. TRANS A socket operation failed because the subnet containing the remote host
 #. TRANS was unreachable.
 #: stdio-common/../sysdeps/gnu/errlist.c:384
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:157
 msgid "Network is unreachable"
 msgstr "³×Æ®¿öÅ©°¡ Á¢±Ù ºÒ°¡´ÉÇÕ´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:694
+#: stdio-common/../sysdeps/gnu/errlist.c:712
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:72
 msgid "No CSI structure available"
 msgstr "»ç¿ë °¡´ÉÇÑ CSI ±¸Á¶°¡ ¾øÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:802
+#: stdio-common/../sysdeps/gnu/errlist.c:820
 msgid "No XENIX semaphores available"
 msgstr "»ç¿ë °¡´ÉÇÑ XENIX ¼¼¸¶Æ÷¾î°¡ ¾øÀ½"
 
@@ -1619,7 +1892,7 @@ msgstr "È£½ºÆ®À̸§°ú ´ëÀÀµÇ´Â ÁÖ¼Ò°¡ ¾øÀ½"
 msgid "No address associated with name"
 msgstr "À̸§°ú ´ëÀÀµÇ´Â ÁÖ¼Ò°¡ ¾øÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:714
+#: stdio-common/../sysdeps/gnu/errlist.c:732
 msgid "No anode"
 msgstr "anode°¡ ¾øÀ½"
 
@@ -1627,6 +1900,7 @@ msgstr "anode°¡ ¾øÀ½"
 #. 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:408
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:161
 msgid "No buffer space available"
 msgstr "»ç¿ë °¡´ÉÇÑ ¹öÆÛ °ø°£ÀÌ ¾øÀ½"
 
@@ -1634,10 +1908,12 @@ msgstr "»ç¿ë °¡´ÉÇÑ ¹öÆÛ °ø°£ÀÌ ¾øÀ½"
 #. TRANS supposed to manipulate child processes, when there aren't any processes
 #. TRANS to manipulate.
 #: stdio-common/../sysdeps/gnu/errlist.c:89
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:39
 msgid "No child processes"
 msgstr "ÀÚ½Ä ÇÁ·Î¼¼½º°¡ ¾øÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:634
+#: stdio-common/../sysdeps/gnu/errlist.c:652
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:90
 msgid "No data available"
 msgstr "»ç¿ë °¡´ÉÇÑ ÀÚ·á°¡ ¾øÀ½"
 
@@ -1653,64 +1929,79 @@ msgstr "¼­¹ö¿¡ ³²Àº °ø°£ÀÌ ¾øÀ½"
 msgid "No locks available"
 msgstr "»ç¿ë°¡´ÉÇÑ Àá±ÝÀåÄ¡°¡ ¾øÀ½"
 
-#: posix/regex.c:1013
+#: posix/regex.c:1019
 msgid "No match"
 msgstr "¸Â´Â ¦ ¾øÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:814
+#: stdio-common/../sysdeps/gnu/errlist.c:832
 msgid "No medium found"
 msgstr "¸Å°³¹°ÀÌ ¾øÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:642
+#: stdio-common/../sysdeps/gnu/errlist.c:660
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:64
 msgid "No message of desired type"
 msgstr "Àû´çÇÑ ÇüÀ» °¡Áø ¸Þ½ÃÁö°¡ ¾øÀ½"
 
-#: nis/ypclnt.c:779
+#: nis/ypclnt.c:789
 msgid "No more records in map database"
 msgstr "Áöµµ µ¥ÀÌÅͺ£À̽º¿¡ ´õ ÀÌ»óÀÇ ±â·ÏÀÌ ¾øÀ½"
 
-#: posix/regex.c:5515
+#: posix/regex.c:5569
 msgid "No previous regular expression"
 msgstr "ÀÌÀüÀÇ Á¤±Ô½ÄÀÌ ¾øÀ½"
 
+# (FIXME)
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:75
+msgid "No record locks available"
+msgstr "·¹ÄÚµå Àá±ÝÀåÄ¡°¡ ¾øÀ½"
+
 #: sunrpc/rpcinfo.c:570
 msgid "No remote programs registered.\n"
 msgstr "¿ø°Ý ÇÁ·Î±×·¥ÀÌ µî·ÏµÇÁö ¾Ê¾ÒÀ½.\n"
 
 #. TRANS The remote host for a requested network connection is not reachable.
 #: stdio-common/../sysdeps/gnu/errlist.c:474
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:177
 msgid "No route to host"
 msgstr "È£½ºÆ®·Î °¥ ·çÆ®°¡ ¾øÀ½"
 
 #. TRANS No space left on device; write operation on a file failed because the
 #. TRANS disk is full.
 #: stdio-common/../sysdeps/gnu/errlist.c:208
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:57
 msgid "No space left on device"
 msgstr "ÀåÄ¡¿¡ ³²Àº °ø°£ÀÌ ¾øÀ½"
 
 #. 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:147
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:48
 msgid "No such device"
 msgstr "±×·± ÀåÄ¡°¡ ¾øÀ½"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:35
+msgid "No such device or address"
+msgstr "±×·± ÀåÄ¡ ȤÀº ÁÖ¼Ò°¡ ¾øÀ½"
+
 #. 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:31
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:31
 msgid "No such file or directory"
 msgstr "±×·± ÆÄÀÏÀ̳ª µð·ºÅ丮°¡ ¾øÀ½"
 
-#: nis/ypclnt.c:773
+#: nis/ypclnt.c:783
 msgid "No such key in map"
 msgstr "Áöµµ¿¡ ±×·± Å°°¡ ¾øÀ½"
 
-#: nis/ypclnt.c:771
+#: nis/ypclnt.c:781
 msgid "No such map in server's domain"
 msgstr "¼­¹öÀÇ µµ¸ÞÀο¡ ±×·± Áöµµ°¡ ¾øÀ½"
 
 #. TRANS No process matches the specified process ID.
 #: stdio-common/../sysdeps/gnu/errlist.c:36
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:32
 msgid "No such process"
 msgstr "±×·± ÇÁ·Î¼¼½º°¡ ¾øÀ½"
 
@@ -1726,41 +2017,85 @@ msgstr "name resolution¿¡¼­ º¹±¸ÇÒ ¼ö ¾ø´Â ½ÇÆÐ"
 msgid "None.\n"
 msgstr "¾øÀ½.\n"
 
-#: nis/nis_error.c:48
-msgid "Not Found, no such name"
-msgstr "ãÀ» ¼ö ¾øÀ½.  ±×·± À̸§ÀÌ ¾øÀ½"
-
-#: stdio-common/../sysdeps/gnu/errlist.c:798
+#: stdio-common/../sysdeps/gnu/errlist.c:816
 msgid "Not a XENIX named type file"
 msgstr "XENIX named ŸÀÔ ÆÄÀÏÀÌ ¾Æ´Ô"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:106
+msgid "Not a data message"
+msgstr "µ¥ÀÌŸ ¸Þ½ÃÁö°¡ ¾Æ´Ô"
+
 #. TRANS A file that isn't a directory was specified when a directory is required.
 #: stdio-common/../sysdeps/gnu/errlist.c:152
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:49
 msgid "Not a directory"
 msgstr "µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù"
 
+# (FIXME)
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:166
+msgid "Not a name file"
+msgstr "name ÆÄÀÏÀÌ ¾Æ´Ô"
+
+# (FIXME)
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:89
+msgid "Not a stream device"
+msgstr "½ºÆ®¸² ÀåÄ¡°¡ ¾Æ´Ô"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:167
+msgid "Not available"
+msgstr "»ç¿ë ºÒ°¡´É"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:41
+msgid "Not enough space"
+msgstr "¿ë·®ÀÌ ¸ðÀÚ¶÷"
+
 #: nis/nis_error.c:30
 msgid "Not found"
 msgstr "ãÀ» ¼ö ¾øÀ½"
 
+#: nis/nis_error.c:48
+msgid "Not found, no such name"
+msgstr "ãÀ» ¼ö ¾øÀ½.  ±×·± À̸§ÀÌ ¾øÀ½"
+
 #: nis/nis_error.c:43
 msgid "Not master server for this domain"
 msgstr "ÀÌ µµ¸ÞÀÎÀÇ ÁÖ ¼­¹ö°¡ ¾Æ´Ô"
 
 #: nis/nis_error.c:39
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:30
 msgid "Not owner"
 msgstr "¼ÒÀ¯ÀÚ°¡ ¾Æ´Ô"
 
+#. TRANS Not supported.  A function returns this error when certain parameter
+#. TRANS values are valid, but the functionality they request is not available.
+#. TRANS This can mean that the function does not implement a particular command
+#. TRANS or option value or flag bit at all.  For functions that operate on some
+#. TRANS object given in a parameter, such as a file descriptor or a port, it
+#. TRANS might instead mean that only @emph{that specific object} (file
+#. TRANS descriptor, port, etc.) is unable to support the other parameters given;
+#. TRANS different file descriptors might support different ranges of parameter
+#. TRANS values.
+#. TRANS
+#. TRANS If the entire function is not available at all in the implementation,
+#. TRANS it returns @code{ENOSYS} instead.
+#: stdio-common/../sysdeps/gnu/errlist.c:591
+msgid "Not supported"
+msgstr "Áö¿øµÇÁö ¾ÊÀ½"
+
 #: nis/nis_print.c:263
 #, c-format
 msgid "Number of Columns   : %d\n"
 msgstr "¿­ÀÇ ¼ö             : %d\n"
 
-#: nis/nis_print.c:358
+#: nis/nis_print.c:362
 #, c-format
 msgid "Number of objects : %u\n"
 msgstr "¿ÀºêÁ§Æ®ÀÇ ¼ö     : %u\n"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:119
+msgid "Number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS"
+msgstr "°æ·Î¸íÀ» ÂѾư¥ ¶§ ¹ß°ßµÈ ½Éº¼¸¯ ¸µÅ©ÀÇ °¹¼ö°¡ MAXSYMLINKSº¸´Ù ¸¹½À´Ï´Ù"
+
 #. 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:240
@@ -1773,17 +2108,17 @@ msgstr "¿µ¿ªÀ» ¹þ¾î³­ ¼öÄ¡ Àμö"
 msgid "Numerical result out of range"
 msgstr "¹üÀ§¸¦ ¹þ¾î³­ ¼öÄ¡ °á°ú"
 
-#: nis/nis_print.c:362
+#: nis/nis_print.c:366
 #, c-format
 msgid "Object #%d:\n"
 msgstr "¿ÀºêÁ§Æ® #%d:\n"
 
-#: nis/nis_print.c:314
+#: nis/nis_print.c:316
 #, c-format
 msgid "Object Name   : %s\n"
 msgstr "¿ÀºêÁ§Æ® À̸§ : %s\n"
 
-#: nis/nis_print.c:324
+#: nis/nis_print.c:328
 msgid "Object Type   : "
 msgstr "¿ÀºêÁ§Æ® ŸÀÔ : "
 
@@ -1792,6 +2127,7 @@ msgstr "¿ÀºêÁ§Æ® ŸÀÔ : "
 #. 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:514
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:95
 msgid "Object is remote"
 msgstr "¿ø°Ý °³Ã¼ÀÔ´Ï´Ù"
 
@@ -1799,20 +2135,29 @@ msgstr "¿ø°Ý °³Ã¼ÀÔ´Ï´Ù"
 msgid "Object with same name exists"
 msgstr "°°Àº À̸§ÀÇ ¿ÀºêÁ§Æ®°¡ Á¸ÀçÇÕ´Ï´Ù"
 
-#: timezone/zic.c:1995
+#: timezone/zic.c:2023
 msgid "Odd number of quotation marks"
 msgstr "µû¿ÈÇ¥°¡ Ȧ¼ö °³ÀÔ´Ï´Ù"
 
-#: nscd/nscd.c:185
+#: nscd/nscd.c:191 nscd/nscd.c:211 nscd/nscd.c:217
 msgid "Only root is allowed to use this option!"
 msgstr "root¸¸ÀÌ ÀÌ ¿É¼ÇÀ» »ç¿ëÇÒ ¼ö ÀÖ½À´Ï´Ù!"
 
 #. TRANS An operation is already in progress on an object that has non-blocking
 #. TRANS mode selected.
 #: stdio-common/../sysdeps/gnu/errlist.c:306
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:178
 msgid "Operation already in progress"
 msgstr "ÀÌ¹Ì ÁøÇà ÁßÀÎ ¸í·É"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:76
+msgid "Operation canceled"
+msgstr "¸í·ÉÀÌ Ãë¼ÒµÇ¾úÀ½"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:118
+msgid "Operation not applicable"
+msgstr "¸í·ÉÀ» ¼öÇàÇÒ ¼ö ¾ÊÀ½"
+
 #. 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:24
@@ -1826,9 +2171,14 @@ msgstr "¸í·ÉÀÌ Çã¿ëµÇÁö ¾ÊÀ½"
 #. 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:350
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:77
 msgid "Operation not supported"
 msgstr "¸í·ÉÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:151
+msgid "Operation not supported on transport endpoint"
+msgstr "Àü¼Û ºÎºÐ¿¡¼­ ÇØ´ç ¸í·ÉÀ» Áö¿øÇÏÁö ¾ÊÀ½"
+
 #. 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
@@ -1838,6 +2188,7 @@ msgstr "¸í·ÉÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 #. 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:300
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:179
 msgid "Operation now in progress"
 msgstr "Áö±Ý ÁøÇà ÁßÀÎ ¸í·É"
 
@@ -1850,19 +2201,28 @@ msgstr "Áö±Ý ÁøÇà ÁßÀÎ ¸í·É"
 msgid "Operation would block"
 msgstr "µ¿ÀÛÀÌ ¸·Èú °ÍÀÔ´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:646
+# (FIXME)
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:128
+msgid "Option not supported by protocol"
+msgstr "ÇÁ·ÎÅäÄÝÀÌ ¿É¼ÇÀ» Áö¿øÇÏÁö ¾ÊÀ½"
+
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:92
+msgid "Out of stream resources"
+msgstr "½ºÆ®¸² ÀÚ¿ø ºÎÁ·"
+
+#: stdio-common/../sysdeps/gnu/errlist.c:664
 msgid "Out of streams resources"
 msgstr "½ºÆ®¸² ÀÚ¿ø ºÎÁ·"
 
-#: iconv/iconv_prog.c:59 locale/programs/localedef.c:101
+#: iconv/iconv_prog.c:59 locale/programs/localedef.c:98
 msgid "Output control:"
 msgstr "Ãâ·Â Á¶Á¤:"
 
-#: elf/sprof.c:76
+#: elf/sprof.c:72
 msgid "Output selection:"
 msgstr "Ãâ·Â ¼±ÅÃ:"
 
-#: nis/nis_print.c:316
+#: nis/nis_print.c:318
 #, c-format
 msgid "Owner         : %s\n"
 msgstr "¼ÒÀ¯ÀÚ        : %s\n"
@@ -1871,17 +2231,18 @@ msgstr "¼ÒÀ¯ÀÚ        : %s\n"
 msgid "PRIVATE\n"
 msgstr "°³ÀÎ\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:738
+#: stdio-common/../sysdeps/gnu/errlist.c:756
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:94
 msgid "Package not installed"
 msgstr "ÆÐÅ°Áö°¡ ¼³Ä¡µÇÁö ¾ÊÀ½"
 
-#: nscd/nscd_conf.c:84
+#: nscd/nscd_conf.c:82
 #, c-format
 msgid "Parse error: %s"
 msgstr "ÆÄ½Ì ¿À·ù: %s"
 
 #: nis/nis_error.c:54
-msgid "Partial Success"
+msgid "Partial success"
 msgstr "ºÎºÐÀûÀÎ ¼º°ø"
 
 #: nis/nis_error.c:62
@@ -1889,16 +2250,17 @@ msgid "Passed object is not the same object on server"
 msgstr "Åë°úµÈ ¿ÀºêÁ§Æ®´Â ¼­¹öÀÇ °°Àº ¿ÀºêÁ§Æ®°¡ ¾Æ´Õ´Ï´Ù"
 
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: nis/nis_error.c:38 nis/ypclnt.c:793
+#: nis/nis_error.c:38 nis/ypclnt.c:803
 #: stdio-common/../sysdeps/gnu/errlist.c:108
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:42
 msgid "Permission denied"
 msgstr "Çã°¡ °ÅºÎµÊ"
 
-#: sysdeps/unix/sysv/linux/siglist.h:64
+#: sysdeps/generic/siglist.h:71 sysdeps/gnu/siglist.h:65
 msgid "Power failure"
 msgstr "Àü·ÂÀÌ ²÷¾îÁü"
 
-#: posix/regex.c:1026
+#: posix/regex.c:1058
 msgid "Premature end of regular expression"
 msgstr "Á¤±Ô½ÄÀÌ ¿Ï°áµÇÁö ¾ÊÀº ä ³¡³²"
 
@@ -1906,11 +2268,11 @@ msgstr "Á¤±Ô½ÄÀÌ ¿Ï°áµÇÁö ¾ÊÀº ä ³¡³²"
 msgid "Print content of database file, one entry a line"
 msgstr "µ¥ÀÌŸ º£À̽º ÆÄÀÏÀÇ ³»¿ëÀ» ÇÑÁÙ¿¡ ÇÑ Ç׸ñ¾¿ Ç¥½ÃÇÔ"
 
-#: nscd/nscd.c:83
+#: nscd/nscd.c:86
 msgid "Print current configuration statistic"
 msgstr "ÇöÀç ¼³Á¤ »óŸ¦ Ç¥½ÃÇÔ"
 
-#: locale/programs/localedef.c:107
+#: locale/programs/localedef.c:104
 msgid "Print more messages"
 msgstr "´õ ¸¹Àº ¸Þ½ÃÁö Ç¥½Ã"
 
@@ -1926,21 +2288,24 @@ msgstr "¾Æ¸¶µµ ¼º°ø"
 msgid "Probably not found"
 msgstr "¾Æ¸¶µµ ¾øÀ½"
 
-#: stdio-common/../sysdeps/unix/siglist.c:52
-#: sysdeps/unix/sysv/linux/siglist.h:46
+#: stdio-common/../sysdeps/unix/siglist.c:52 sysdeps/generic/siglist.h:53
+#: sysdeps/gnu/siglist.h:47
 msgid "Profiling timer expired"
 msgstr "ÇÁ·ÎÆÄÀϸµ ŸÀ̸ÓÀÇ ½Ã°£ÀÌ ÃÊ°úµÊ"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:690
+#: stdio-common/../sysdeps/gnu/errlist.c:708
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:71
 msgid "Protocol driver not attached"
 msgstr "±Ô¾à ±¸µ¿±â¿¡ ¿¬°áµÇÁö ¾ÊÀ½"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:658
+#: stdio-common/../sysdeps/gnu/errlist.c:676
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:100
 msgid "Protocol error"
 msgstr "±Ô¾à ¿À·ù"
 
 #. TRANS The socket communications protocol family you requested is not supported.
 #: stdio-common/../sysdeps/gnu/errlist.c:355
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:152
 msgid "Protocol family not supported"
 msgstr "±Ô¾à±ºÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
@@ -1954,11 +2319,13 @@ msgstr "±Ô¾à »ç¿ë ºÒ°¡´É"
 #. TRANS (perhaps because the requested protocol is completely invalid).
 #. TRANS @xref{Creating a Socket}.
 #: stdio-common/../sysdeps/gnu/errlist.c:335
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:149
 msgid "Protocol not supported"
 msgstr "±Ô¾àÀÌ Áö¿øµÇÁö ¾ÊÀ½"
 
 #. TRANS The socket type does not support the requested communications protocol.
 #: stdio-common/../sysdeps/gnu/errlist.c:322
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:127
 msgid "Protocol wrong type for socket"
 msgstr "¼ÒÄÏ¿¡ ´ëÇÑ ±Ô¾àÀÌ À߸øµÊ"
 
@@ -1966,12 +2333,12 @@ msgstr "¼ÒÄÏ¿¡ ´ëÇÑ ±Ô¾àÀÌ À߸øµÊ"
 msgid "Query illegal for named table"
 msgstr "À̸§ Å×ÀÌºí¿¡ À߸øµÈ ÁúÀÇ"
 
-#: stdio-common/../sysdeps/unix/siglist.c:28
-#: sysdeps/unix/sysv/linux/siglist.h:24
+#: stdio-common/../sysdeps/unix/siglist.c:28 sysdeps/generic/siglist.h:31
+#: sysdeps/gnu/siglist.h:25
 msgid "Quit"
 msgstr "Á¾·á"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:754
+#: stdio-common/../sysdeps/gnu/errlist.c:772
 msgid "RFS specific error"
 msgstr "RFS¿¡ ±¹ÇÑµÈ ¿À·ù"
 
@@ -1980,7 +2347,7 @@ msgstr "RFS¿¡ ±¹ÇÑµÈ ¿À·ù"
 msgid "RPC bad procedure for program"
 msgstr "RPC ÇÁ·Î±×·¥ÀÇ ÇÁ·Î½ÃÁ®°¡ À߸øµÊ"
 
-#: nis/ypclnt.c:767
+#: nis/ypclnt.c:777
 msgid "RPC failure on NIS operation"
 msgstr "NIS ¿¬»ê Áß RPC ½ÇÆÐÇÔ"
 
@@ -2004,55 +2371,55 @@ msgstr "RPC ±¸Á¶°¡ À߸øµÇ¾ú½À´Ï´Ù"
 msgid "RPC version wrong"
 msgstr "RPC ¹öÀüÀÌ À߸øµÊ"
 
-#: sunrpc/clnt_perr.c:215
+#: sunrpc/clnt_perr.c:270
 msgid "RPC: (unknown error code)"
 msgstr "RPC: (¾Ë ¼ö ¾ø´Â ¿À·ù ÄÚµå)"
 
-#: sunrpc/clnt_perr.c:176
+#: sunrpc/clnt_perr.c:189
 msgid "RPC: Authentication error"
 msgstr "RPC: ÀÎÁõ ¿À·ù"
 
-#: sunrpc/clnt_perr.c:166
+#: sunrpc/clnt_perr.c:169
 msgid "RPC: Can't decode result"
 msgstr "RPC: °á°ú¸¦ Çص¶ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:164
+#: sunrpc/clnt_perr.c:165
 msgid "RPC: Can't encode arguments"
 msgstr "RPC: Àμö¸¦ ºÎȣȭÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:196
+#: sunrpc/clnt_perr.c:229
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC: ½ÇÆÐ (ÁöÁ¤µÇÁö ¾ÊÀº ¿À·ù)"
 
-#: sunrpc/clnt_perr.c:174
+#: sunrpc/clnt_perr.c:185
 msgid "RPC: Incompatible versions of RPC"
 msgstr "RPC: ȣȯµÇÁö ¾Ê´Â RPC ¹öÀü"
 
-#: sunrpc/clnt_perr.c:192
+#: sunrpc/clnt_perr.c:221
 msgid "RPC: Port mapper failure"
 msgstr "RPC: Æ÷Æ® ¸ÊÆÛ ½ÇÆÐ"
 
-#: sunrpc/clnt_perr.c:182
+#: sunrpc/clnt_perr.c:201
 msgid "RPC: Procedure unavailable"
 msgstr "RPC: ÇÁ·Î½ÃÁ® »ç¿ë ºÒ°¡´É"
 
-#: sunrpc/clnt_perr.c:194
+#: sunrpc/clnt_perr.c:225
 msgid "RPC: Program not registered"
 msgstr "RPC: ÇÁ·Î±×·¥ÀÌ µî·ÏµÇÁö ¾ÊÀ½"
 
-#: sunrpc/clnt_perr.c:178
+#: sunrpc/clnt_perr.c:193
 msgid "RPC: Program unavailable"
 msgstr "RPC: ÇÁ·Î±×·¥ »ç¿ë ºÒ°¡´É"
 
-#: sunrpc/clnt_perr.c:180
+#: sunrpc/clnt_perr.c:197
 msgid "RPC: Program/version mismatch"
 msgstr "RPC: ÇÁ·Î±×·¥/¹öÀü ºÒÀÏÄ¡"
 
-#: sunrpc/clnt_perr.c:186
+#: sunrpc/clnt_perr.c:209
 msgid "RPC: Remote system error"
 msgstr "RPC: ¿ø°Ý ½Ã½ºÅÛ ¿À·ù"
 
-#: sunrpc/clnt_perr.c:184
+#: sunrpc/clnt_perr.c:205
 msgid "RPC: Server can't decode arguments"
 msgstr "RPC: ¼­¹ö°¡ Àμö¸¦ Çص¶ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -2060,23 +2427,23 @@ msgstr "RPC: ¼­¹ö°¡ Àμö¸¦ Çص¶ÇÒ ¼ö ¾ø½À´Ï´Ù"
 msgid "RPC: Success"
 msgstr "RPC: ¼º°ø"
 
-#: sunrpc/clnt_perr.c:172
+#: sunrpc/clnt_perr.c:181
 msgid "RPC: Timed out"
 msgstr "RPC: ½Ã°£ ÃÊ°ú"
 
-#: sunrpc/clnt_perr.c:170
+#: sunrpc/clnt_perr.c:177
 msgid "RPC: Unable to receive"
 msgstr "RPC: ¹ÞÀ» ¼ö ¾øÀ½"
 
-#: sunrpc/clnt_perr.c:168
+#: sunrpc/clnt_perr.c:173
 msgid "RPC: Unable to send"
 msgstr "RPC: º¸³¾ ¼ö ¾øÀ½"
 
-#: sunrpc/clnt_perr.c:188
+#: sunrpc/clnt_perr.c:213
 msgid "RPC: Unknown host"
 msgstr "RPC: ¾Ë ¼ö ¾ø´Â È£½ºÆ®"
 
-#: sunrpc/clnt_perr.c:190
+#: sunrpc/clnt_perr.c:217
 msgid "RPC: Unknown protocol"
 msgstr "RPC: ¾Ë ¼ö ¾ø´Â ±Ô¾à"
 
@@ -2089,16 +2456,17 @@ msgstr "RSA (%d ºñÆ®)\n"
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "µ¿ÀûÀ¸·Î ÀûÀçµÇÁö ¾ÊÀº Äڵ忡 RTLD_NEXT°¡ »ç¿ëµÊ"
 
-#: elf/sprof.c:88
+#: elf/sprof.c:84
 msgid "Read and display shared object profiling data"
 msgstr "µ¿Àû ¿ÀºêÁ§Æ® ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ¸¦ Àаí Ç¥½Ã"
 
-#: nscd/nscd.c:78
+#: nscd/nscd.c:81
 msgid "Read configuration data from NAME"
 msgstr "`À̸§'¿¡¼­ ¼³Á¤ µ¥ÀÌŸ¸¦ Àбâ"
 
 #. TRANS An attempt was made to modify something on a read-only file system.
 #: stdio-common/../sysdeps/gnu/errlist.c:218
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:59
 msgid "Read-only file system"
 msgstr "ÀбâÀü¿ë ÆÄÀÏ ½Ã½ºÅÛ"
 
@@ -2107,23 +2475,25 @@ msgstr "ÀбâÀü¿ë ÆÄÀÏ ½Ã½ºÅÛ"
 msgid "Real-time signal %d"
 msgstr "½Ç-½Ã°¢ ½Ã±×³¯ %d"
 
-#: posix/regex.c:1027
+#: posix/regex.c:1061
 msgid "Regular expression too big"
 msgstr "Á¤±Ô½ÄÀÌ ³Ê¹« Å®´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:810
+#: stdio-common/../sysdeps/gnu/errlist.c:828
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:169
 msgid "Remote I/O error"
 msgstr "¿ø°Ý ÀÔÃâ·Â ¿À·ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:766
+#: stdio-common/../sysdeps/gnu/errlist.c:784
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:111
 msgid "Remote address changed"
 msgstr "¿ø°Ý ÁÖ¼Ò°¡ ¹Ù²î¾úÀ½"
 
-#: inet/ruserpass.c:162
+#: inet/ruserpass.c:177
 msgid "Remove password or make file unreadable by others."
 msgstr "¾ÏÈ£¸¦ Áö¿ì°Å³ª ´Ù¸¥ »ç¶÷ÀÌ ÀÐÀ» ¼ö ¾ø´Â ÆÄÀÏÀ» ¸¸µì´Ï´Ù."
 
-#: elf/sprof.c:537
+#: elf/sprof.c:533
 #, c-format
 msgid "Reopening shared object `%s' failed"
 msgstr "µ¿Àû ¿ÀºêÁ§Æ® `%s'¸¦ ´Ù½Ã ¿©´Â µ¥ ½ÇÆÐÇÔ"
@@ -2132,20 +2502,24 @@ msgstr "µ¿Àû ¿ÀºêÁ§Æ® `%s'¸¦ ´Ù½Ã ¿©´Â µ¥ ½ÇÆÐÇÔ"
 msgid "Replicate :\n"
 msgstr "Áߺ¹µÊ    :\n"
 
-#: argp/argp-help.c:1638
+#: argp/argp-help.c:1640
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "¹ö±×¸¦ %s·Î ¾Ë·ÁÁֽʽÿÀ.\n"
 
-#: catgets/gencat.c:223 db2/makedb.c:229 iconv/iconv_prog.c:280
-#: locale/programs/locale.c:254 locale/programs/localedef.c:389
+#: catgets/gencat.c:224 db2/makedb.c:229 iconv/iconv_prog.c:280
+#: locale/programs/locale.c:254 locale/programs/localedef.c:386
 msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
 msgstr "¹ö±×´Â `glibcbug' ½ºÅ©¸³Æ®¸¦ ÀÌ¿ëÇØ <bugs@gnu.org>¿¡ º¸°íÇϽʽÿÀ.\n"
 
-#: nis/ypclnt.c:765
+#: nis/ypclnt.c:775
 msgid "Request arguments bad"
 msgstr "¿äûµÈ Àμö°¡ À߸øµÊ"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:170
+msgid "Reserved for future use"
+msgstr "¹Ì·¡¿¡ »ç¿ëÇϱâ À§ÇØ ¿¹¾àµÊ"
+
 #: resolv/herror.c:73
 msgid "Resolver Error 0 (no error)"
 msgstr "ÇØ°á±â ¿À·ù 0 (¿À·ù¾Æ´Ô)"
@@ -2162,7 +2536,8 @@ msgstr "ÇØ°á±â ³»ºÎ ¿À·ù"
 msgid "Resource deadlock avoided"
 msgstr "ÀÚ¿ø ±³Âø»óŸ¦ ÇÇÇß½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/unix/siglist.c:54
+#: stdio-common/../sysdeps/unix/siglist.c:54 sysdeps/generic/siglist.h:74
+#: sysdeps/gnu/siglist.h:68
 msgid "Resource lost"
 msgstr "ÀÚ¿øÀ» ¼Õ½ÇÇßÀ½"
 
@@ -2196,14 +2571,19 @@ msgstr "ÀÚ¿øÀ» ¼Õ½ÇÇßÀ½"
 #. TRANS and return to its command loop.
 #. TRANS @end itemize
 #: stdio-common/../sysdeps/gnu/errlist.c:279
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:40
 msgid "Resource temporarily unavailable"
 msgstr "ÀÚ¿øÀÌ ÀϽÃÀûÀ¸·Î »ç¿ë ºÒ°¡´ÉÇÔ"
 
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:63
+msgid "Result too large"
+msgstr "°á°ú¹°ÀÌ ³Ê¹« Å®´Ï´Ù"
+
 #: nis/nis_error.c:47
-msgid "Results Sent to callback proc"
-msgstr "Äݹé ÇÁ·Î½ÃÀú·Î °á°ú¸¦ º¸³ÂÀ½"
+msgid "Results sent to callback proc"
+msgstr "°á°ú¸¦ Äݹé ÇÁ·Î½ÃÀú·Î º¸³ÂÀ½"
 
-#: elf/sprof.c:91
+#: elf/sprof.c:87
 msgid "SHOBJ [PROFDATA]"
 msgstr "SHOBJ [PROFDATA]"
 
@@ -2216,8 +2596,8 @@ msgstr "SUNYP"
 msgid "Search Path         : %s\n"
 msgstr "ã±â °æ·Î           : %s\n"
 
-#: stdio-common/../sysdeps/unix/siglist.c:36
-#: sysdeps/unix/sysv/linux/siglist.h:31
+#: stdio-common/../sysdeps/unix/siglist.c:36 sysdeps/generic/siglist.h:38
+#: sysdeps/gnu/siglist.h:32
 msgid "Segmentation fault"
 msgstr "¼¼±×¸àÅ×ÀÌ¼Ç ¿À·ù"
 
@@ -2229,11 +2609,11 @@ msgstr "¼­¹ö°¡ ´Ù¸¥ ÀÏÀ» ÇÏ°í ÀÖ½À´Ï´Ù, ´Ù½Ã ½ÃµµÇϼ¼¿ä"
 msgid "Server out of memory"
 msgstr "¼­¹ö ¸Þ¸ð¸® ºÎÁ·"
 
-#: sunrpc/clnt_perr.c:277
+#: sunrpc/clnt_perr.c:335
 msgid "Server rejected credential"
 msgstr "¼­¹ö°¡ ÀÚ°Ý ºÎ¿©¸¦ °ÅºÎÇß½À´Ï´Ù"
 
-#: sunrpc/clnt_perr.c:281
+#: sunrpc/clnt_perr.c:343
 msgid "Server rejected verifier"
 msgstr "¼­¹ö°¡ °ËÁõ±â¸¦ °ÅºÎÇß½À´Ï´Ù"
 
@@ -2245,7 +2625,7 @@ msgstr "ai_socktype¿¡¼­´Â servnameÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 msgid "Set the program name"
 msgstr "ÇÁ·Î±×·¥ À̸§ °áÁ¤"
 
-#: nscd/nscd.c:82
+#: nscd/nscd.c:85
 msgid "Shut the server down"
 msgstr "¼­¹ö¸¦ ¼Ë´Ù¿îÇÔ"
 
@@ -2255,16 +2635,19 @@ msgstr "½ÅÈ£ 0"
 
 #. TRANS A file that isn't a socket was specified when a socket is required.
 #: stdio-common/../sysdeps/gnu/errlist.c:311
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:124
 msgid "Socket operation on non-socket"
 msgstr "ºñ¼ÒÄÏ»óÀÇ ¼ÒÄÏ µ¿ÀÛ"
 
 #. TRANS The socket type is not supported.
 #: stdio-common/../sysdeps/gnu/errlist.c:340
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:150
 msgid "Socket type not supported"
 msgstr "¼ÒÄÏ Å¸ÀÔÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
 #. TRANS A network connection was aborted locally.
 #: stdio-common/../sysdeps/gnu/errlist.c:394
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:159
 msgid "Software caused connection abort"
 msgstr "¼ÒÇÁÆ®¿þ¾î°¡ ¿¬°á Áß´ÜÀ» ÃÊ·¡Çß½À´Ï´Ù"
 
@@ -2272,15 +2655,16 @@ msgstr "¼ÒÇÁÆ®¿þ¾î°¡ ¿¬°á Áß´ÜÀ» ÃÊ·¡Çß½À´Ï´Ù"
 msgid "Sorry. You are not root\n"
 msgstr "Á˼ÛÇÕ´Ï´Ù. ´ç½ÅÀº root°¡ ¾Æ´Õ´Ï´Ù\n"
 
-#: locale/programs/localedef.c:97
+#: locale/programs/localedef.c:94
 msgid "Source definitions are found in FILE"
 msgstr "`ÆÄÀÏ'¿¡ ¼Ò½º Á¤ÀÇ°¡ ÀÖ½À´Ï´Ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:746
+#: stdio-common/../sysdeps/gnu/errlist.c:764
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:98
 msgid "Srmount error"
 msgstr "Srmount ¿À·ù"
 
-#: sysdeps/unix/sysv/linux/siglist.h:59
+#: sysdeps/generic/siglist.h:66 sysdeps/gnu/siglist.h:60
 msgid "Stack fault"
 msgstr "½ºÅà ¿À·ù"
 
@@ -2289,56 +2673,58 @@ msgstr "½ºÅà ¿À·ù"
 #. TRANS Repairing this condition usually requires unmounting and remounting
 #. TRANS the NFS file system on the local host.
 #: stdio-common/../sysdeps/gnu/errlist.c:506
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:180
 msgid "Stale NFS file handle"
 msgstr "²÷¾îÁø NFS ÆÄÀÏ ÇÚµé"
 
-#: nscd/nscd.c:81
+#: nscd/nscd.c:84
 msgid "Start NUMBER threads"
 msgstr "`¼ýÀÚ'°³ÀÇ ¾²·¹µå¸¦ ½ÃÀÛÇÔ"
 
-#: nis/nis_print.c:357
+#: nis/nis_print.c:361
 #, c-format
 msgid "Status            : %s\n"
 msgstr "»óÅÂ              : %s\n"
 
-#: stdio-common/../sysdeps/unix/siglist.c:43
-#: sysdeps/unix/sysv/linux/siglist.h:37
+#: stdio-common/../sysdeps/unix/siglist.c:43 sysdeps/generic/siglist.h:44
+#: sysdeps/gnu/siglist.h:38
 msgid "Stopped"
 msgstr "Á¤ÁöµÊ"
 
-#: stdio-common/../sysdeps/unix/siglist.c:42
-#: sysdeps/unix/sysv/linux/siglist.h:36
+#: stdio-common/../sysdeps/unix/siglist.c:42 sysdeps/generic/siglist.h:43
+#: sysdeps/gnu/siglist.h:37
 msgid "Stopped (signal)"
 msgstr "Á¤ÁöµÊ (½ÅÈ£)"
 
-#: stdio-common/../sysdeps/unix/siglist.c:46
-#: sysdeps/unix/sysv/linux/siglist.h:40
+#: stdio-common/../sysdeps/unix/siglist.c:46 sysdeps/generic/siglist.h:47
+#: sysdeps/gnu/siglist.h:41
 msgid "Stopped (tty input)"
 msgstr "Á¤ÁöµÊ (tty ÀÔ·Â)"
 
-#: stdio-common/../sysdeps/unix/siglist.c:47
-#: sysdeps/unix/sysv/linux/siglist.h:41
+#: stdio-common/../sysdeps/unix/siglist.c:47 sysdeps/generic/siglist.h:48
+#: sysdeps/gnu/siglist.h:42
 msgid "Stopped (tty output)"
 msgstr "Á¤ÁöµÊ (tty Ãâ·Â)"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:790
+#: stdio-common/../sysdeps/gnu/errlist.c:808
 msgid "Streams pipe error"
 msgstr "½ºÆ®¸² ÆÄÀÌÇÁ ¿À·ù"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:794
+#: stdio-common/../sysdeps/gnu/errlist.c:812
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:164
 msgid "Structure needs cleaning"
 msgstr "±¸Á¶¿¡ û¼Ò°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: nis/nis_error.c:28 nis/ypclnt.c:763 nis/ypclnt.c:837 posix/regex.c:1012
+#: nis/nis_error.c:28 nis/ypclnt.c:773 nis/ypclnt.c:847 posix/regex.c:1016
 #: stdio-common/../sysdeps/gnu/errlist.c:19
 msgid "Success"
 msgstr "¼º°ø"
 
-#: locale/programs/localedef.c:106
+#: locale/programs/localedef.c:103
 msgid "Suppress warnings and information messages"
 msgstr "°æ°í ¸Þ¼¼Áö¿Í °ü·Ã Á¤º¸ ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÏÁö ¾ÊÀ½"
 
-#: locale/programs/localedef.c:96
+#: locale/programs/localedef.c:92
 msgid "Symbolic character names defined in FILE"
 msgstr "`ÆÄÀÏ'¿¡ ±âÈ£·Î Ç¥½ÃµÈ ¹®ÀÚ À̸§ÀÌ Á¤ÀǵÊ"
 
@@ -2350,11 +2736,11 @@ msgstr "½Ã½ºÅÛ ¿À·ù"
 msgid "System information:"
 msgstr "½Ã½ºÅÛ Á¤º¸:"
 
-#: nis/ypclnt.c:843
+#: nis/ypclnt.c:853
 msgid "System resource allocation failure"
 msgstr "½Ã½ºÅÛ ÀÚ¿ø ÇÒ´ç ½ÇÆÐ"
 
-#: locale/programs/localedef.c:384
+#: locale/programs/localedef.c:381
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -2367,10 +2753,19 @@ msgstr ""
 "                   ·ÎÄÉÀÏ °æ·Î  : %s\n"
 "%s"
 
+#: nscd/nscd.c:87
+msgid "TABLE"
+msgstr "Å×À̺í"
+
 #: nis/nis_print.c:117
 msgid "TABLE\n"
 msgstr "Å×À̺í\n"
 
+# (FIXME)
+#: nscd/nscd.c:89
+msgid "TABLE,yes"
+msgstr "Å×À̺í,¿¹"
+
 #: nis/nis_print.c:262
 #, c-format
 msgid "Table Type          : %s\n"
@@ -2380,8 +2775,8 @@ msgstr "Å×À̺í ŸÀÔ         : %s\n"
 msgid "Temporary failure in name resolution"
 msgstr "name resolution¿¡¼­ ÀϽÃÀûÀÎ ½ÇÆÐ"
 
-#: stdio-common/../sysdeps/unix/siglist.c:40
-#: sysdeps/unix/sysv/linux/siglist.h:34
+#: stdio-common/../sysdeps/unix/siglist.c:40 sysdeps/generic/siglist.h:41
+#: sysdeps/gnu/siglist.h:35
 msgid "Terminated"
 msgstr "Á¾·áµÊ"
 
@@ -2391,10 +2786,11 @@ msgstr "Á¾·áµÊ"
 #. 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:197
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:55
 msgid "Text file busy"
 msgstr "½ÇÇà ÆÄÀÏ »ç¿ë Áß"
 
-#: iconv/iconv_prog.c:536
+#: iconv/iconv_prog.c:578
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -2420,12 +2816,13 @@ msgstr ""
 msgid "Time to live : "
 msgstr "À¯ÁöµÇ´Â ½Ã°£ : "
 
-#: stdio-common/../sysdeps/gnu/errlist.c:662
+#: stdio-common/../sysdeps/gnu/errlist.c:680
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:91
 msgid "Timer expired"
 msgstr "ŸÀÌ¸Ó ½Ã°£ ÃÊ°úµÊ"
 
 #: nis/nis_error.c:55
-msgid "Too Many Attributes"
+msgid "Too many attributes"
 msgstr "¼Ó¼ºÀÌ ³Ê¹« ¸¹À½"
 
 #. TRANS Too many levels of symbolic links were encountered in looking up a file name.
@@ -2438,6 +2835,7 @@ msgstr "±âÈ£ ¿¬°áÀÇ ´Ü°è°¡ ³Ê¹« ¸¹À½"
 #. 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:225
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:60
 msgid "Too many links"
 msgstr "¿¬°áÀÌ ³Ê¹« ¸¹À½"
 
@@ -2449,6 +2847,7 @@ msgstr "¿¬°áÀÌ ³Ê¹« ¸¹À½"
 #. TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
 #. TRANS @pxref{Limits on Resources}.
 #: stdio-common/../sysdeps/gnu/errlist.c:175
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:53
 msgid "Too many open files"
 msgstr "¿­¸° ÆÄÀÏÀÌ ³Ê¹« ¸¹À½"
 
@@ -2468,34 +2867,37 @@ msgstr "ÇÁ·Î¼¼½º°¡ ³Ê¹« ¸¹À½"
 
 #. TRANS ???
 #: stdio-common/../sysdeps/gnu/errlist.c:439
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:173
 msgid "Too many references: cannot splice"
 msgstr "ÂüÁ¶°¡ ³Ê¹« ¸¹À½: ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
 #. 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:493
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:123
 msgid "Too many users"
 msgstr "»ç¿ëÀÚ°¡ ³Ê¹« ¸¹À½"
 
-#: stdio-common/../sysdeps/unix/siglist.c:30
-#: sysdeps/unix/sysv/linux/siglist.h:26
+#: stdio-common/../sysdeps/unix/siglist.c:30 sysdeps/generic/siglist.h:33
+#: sysdeps/gnu/siglist.h:27
 msgid "Trace/breakpoint trap"
 msgstr "ÃßÀû/Áß´ÜÁ¡ ÇÔÁ¤"
 
-#: posix/regex.c:1017
+#: posix/regex.c:1031
 msgid "Trailing backslash"
 msgstr "µû¶óºÙ´Â ¿ª½½·¡½¬"
 
 #. 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:596
+#: stdio-common/../sysdeps/gnu/errlist.c:614
 msgid "Translator died"
 msgstr "º¯È¯±â°¡ Á×¾úÀ½"
 
 #. TRANS You tried to connect a socket that is already connected.
 #. TRANS @xref{Connecting}.
 #: stdio-common/../sysdeps/gnu/errlist.c:414
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:162
 msgid "Transport endpoint is already connected"
 msgstr "Àü¼Û Á¾·áÁöÁ¡ÀÌ ÀÌ¹Ì ¿¬°áµÇ¾î ÀÖ½À´Ï´Ù"
 
@@ -2504,15 +2906,16 @@ msgstr "Àü¼Û Á¾·áÁöÁ¡ÀÌ ÀÌ¹Ì ¿¬°áµÇ¾î ÀÖ½À´Ï´Ù"
 #. 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:422
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:163
 msgid "Transport endpoint is not connected"
 msgstr "Àü¼Û Á¾·áÁöÁ¡ÀÌ ¿¬°áµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: argp/argp-help.c:1610
+#: argp/argp-help.c:1612
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ȤÀº `%s --usage' ÇϽʽÿÀ.\n"
 
-#: inet/rcmd.c:143
+#: inet/rcmd.c:150
 #, c-format
 msgid "Trying %s...\n"
 msgstr "%s ½ÃµµÁß...\n"
@@ -2547,16 +2950,16 @@ msgstr "¼­¹ö¿¡¼­ ÇÁ·Î¼¼½º¸¦ ¸¸µé ¼ö ¾øÀ½"
 msgid "Unknown (type = %d, bits = %d)\n"
 msgstr "¾Ë¼ö¾øÀ½ (ŸÀÔ = %d, ºñÆ®¼ö = %d)\n"
 
-#: inet/ruserpass.c:248
+#: inet/ruserpass.c:263
 #, c-format
 msgid "Unknown .netrc keyword %s"
 msgstr "¾Ë ¼ö ¾ø´Â .netrc Å°¿öµå %s"
 
-#: nis/ypclnt.c:797
+#: nis/ypclnt.c:807
 msgid "Unknown NIS error code"
 msgstr "¾Ë ¼ö ¾ø´Â NIS ¿À·ù ÄÚµå"
 
-#: nss/getent.c:505
+#: nss/getent.c:512
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "¾Ë ¼ö ¾ø´Â µ¥ÀÌŸº£À̽º: `%s'\n"
@@ -2566,7 +2969,7 @@ msgid "Unknown error"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù"
 
 #: string/../sysdeps/generic/_strerror.c:48
-#: string/../sysdeps/mach/_strerror.c:86
+#: string/../sysdeps/mach/_strerror.c:87
 #: sysdeps/mach/hurd/mips/dl-machine.c:82
 msgid "Unknown error "
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù"
@@ -2579,7 +2982,7 @@ msgstr "¾Ë ¼ö ¾ø´Â È£½ºÆ®"
 msgid "Unknown object"
 msgstr "¾Ë ¼ö ¾ø´Â ¿ÀºêÁ§Æ®"
 
-#: nscd/nscd_conf.c:181
+#: nscd/nscd_conf.c:179
 #, c-format
 msgid "Unknown option: %s %s %s"
 msgstr "¾Ë ¼ö ¾ø´Â ¿É¼Ç: %s %s %s"
@@ -2597,27 +3000,27 @@ msgstr "¾Ë ¼ö ¾ø´Â ¼­¹ö ¿À·ù"
 msgid "Unknown signal %d"
 msgstr "¾Ë ¼ö ¾ø´Â ½ÅÈ£ %d"
 
-#: misc/error.c:107
+#: misc/error.c:107 timezone/zic.c:386
 msgid "Unknown system error"
 msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù"
 
-#: nis/ypclnt.c:845
+#: nis/ypclnt.c:855
 msgid "Unknown ypbind error"
 msgstr "¾Ë ¼ö ¾ø´Â ypbind ¿À·ù"
 
-#: posix/regex.c:1020
+#: posix/regex.c:1040
 msgid "Unmatched ( or \\("
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ( ¶Ç´Â \\("
 
-#: posix/regex.c:1028
+#: posix/regex.c:1064
 msgid "Unmatched ) or \\)"
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â ) ¶Ç´Â \\)"
 
-#: posix/regex.c:1019
+#: posix/regex.c:1037
 msgid "Unmatched [ or [^"
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â [ ¶Ç´Â [^"
 
-#: posix/regex.c:1021
+#: posix/regex.c:1043
 msgid "Unmatched \\{"
 msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â \\{"
 
@@ -2626,12 +3029,12 @@ msgstr "¦ÀÌ ¸ÂÁö ¾Ê´Â \\{"
 msgid "Unrecognized variable `%s'"
 msgstr "ÀνÄÇÒ ¼ö ¾ø´Â º¯¼ö `%s'"
 
-#: stdio-common/../sysdeps/unix/siglist.c:41
-#: sysdeps/unix/sysv/linux/siglist.h:35
+#: stdio-common/../sysdeps/unix/siglist.c:41 sysdeps/generic/siglist.h:42
+#: sysdeps/gnu/siglist.h:36
 msgid "Urgent I/O condition"
 msgstr "½Ã±ÞÇÑ ÀÔÃâ·Â »óȲ"
 
-#: argp/argp-help.c:1567
+#: argp/argp-help.c:1569
 msgid "Usage:"
 msgstr "»ç¿ë¹ý:"
 
@@ -2644,31 +3047,36 @@ msgstr "»ç¿ë¹ý: %s º¯¼ö¸í [°æ·Î¸í]\n"
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 msgstr "»ç¿ë¹ý: rpcinfo [ -n Æ÷Æ®¹øÈ£ ] -u È£½ºÆ® ÇÁ·Î±×·¥¹øÈ£ [ ¹öÀü¹øÈ£ ]\n"
 
-#: stdio-common/../sysdeps/unix/siglist.c:55
-#: sysdeps/unix/sysv/linux/siglist.h:48
+#: nscd/nscd.c:89
+msgid "Use separate cache for each user"
+msgstr "»ç¿ëÀÚº°·Î º°µµÀÇ Ä³½¬ »ç¿ë"
+
+#: stdio-common/../sysdeps/unix/siglist.c:55 sysdeps/generic/siglist.h:55
+#: sysdeps/gnu/siglist.h:49
 msgid "User defined signal 1"
 msgstr "»ç¿ëÀÚ Á¤ÀÇ ½ÅÈ£ 1"
 
-#: stdio-common/../sysdeps/unix/siglist.c:56
-#: sysdeps/unix/sysv/linux/siglist.h:49
+#: stdio-common/../sysdeps/unix/siglist.c:56 sysdeps/generic/siglist.h:56
+#: sysdeps/gnu/siglist.h:50
 msgid "User defined signal 2"
 msgstr "»ç¿ëÀÚ ½ÅÈ£ ½ÅÈ£ 2"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:654
+#: stdio-common/../sysdeps/gnu/errlist.c:672
+#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:108
 msgid "Value too large for defined data type"
 msgstr "Á¤ÀÇµÈ ÀÚ·áÇüÀ¸·Î ¾²±â¿£ ³Ê¹« Å« °ª"
 
-#: stdio-common/../sysdeps/unix/siglist.c:51
-#: sysdeps/unix/sysv/linux/siglist.h:45
+#: stdio-common/../sysdeps/unix/siglist.c:51 sysdeps/generic/siglist.h:52
+#: sysdeps/gnu/siglist.h:46
 msgid "Virtual timer expired"
 msgstr "°¡»ó ŸÀÌ¸Ó ½Ã°£ ÃÊ°ú"
 
-#: timezone/zic.c:1899
+#: timezone/zic.c:1927
 msgid "Wild result from command execution"
 msgstr "¸í·É ½ÇÇà¿¡¼­ Á¦ ¸Ú´ë·ÎÀÇ °á°ú°¡ ³ª¿ÔÀ½"
 
-#: stdio-common/../sysdeps/unix/siglist.c:53
-#: sysdeps/unix/sysv/linux/siglist.h:47
+#: stdio-common/../sysdeps/unix/siglist.c:53 sysdeps/generic/siglist.h:54
+#: sysdeps/gnu/siglist.h:48
 msgid "Window changed"
 msgstr "À©µµ¿ì º¯°æµÊ"
 
@@ -2688,19 +3096,19 @@ msgstr "»ç¿ë °¡´ÉÇÑ ¹üÁÖÀÇ À̸§À» Ç¥½ÃÇÔ"
 msgid "Write names of selected keywords"
 msgstr "¼±ÅÃµÈ Å°¿öµåÀÇ À̸§À» Ç¥½ÃÇÔ"
 
-#: catgets/gencat.c:110 db2/makedb.c:59
+#: catgets/gencat.c:111 db2/makedb.c:59
 msgid "Write output to file NAME"
 msgstr "`À̸§' ÆÄÀÏ·Î Ãâ·ÂÇÔ"
 
-#: catgets/gencat.c:241 db2/makedb.c:247 elf/sprof.c:365
+#: catgets/gencat.c:242 db2/makedb.c:247 elf/sprof.c:361
 #: iconv/iconv_prog.c:299 locale/programs/locale.c:272
-#: locale/programs/localedef.c:408 nscd/nscd.c:228 nss/getent.c:70
-#: posix/getconf.c:629
+#: locale/programs/localedef.c:405 nscd/nscd.c:282 nscd/nscd_nischeck.c:95
+#: nss/getent.c:71 posix/getconf.c:629
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%sÀÌ ¸¸µé¾ú½À´Ï´Ù.\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:818
+#: stdio-common/../sysdeps/gnu/errlist.c:836
 msgid "Wrong medium type"
 msgstr "À߸øµÈ ¸Å°³Ã¼ ŸÀÔ"
 
@@ -2712,7 +3120,7 @@ msgstr "X500"
 msgid "XCHS"
 msgstr "XCHS"
 
-#: nis/ypclnt.c:185
+#: nis/ypclnt.c:171
 #, c-format
 msgid "YPBINDPROC_DOMAIN: %s\n"
 msgstr "YPBINDPROC_DOMAIN: %s\n"
@@ -2722,11 +3130,11 @@ msgid "Yes, 42 is the meaning of life"
 msgstr "¿¹, 42´Â Á¤»óÀûÀ¸·Î µ¿ÀÛÇÑ´Ù´Â ¶æÇÕ´Ï´Ù"
 
 #. TRANS You did @strong{what}?
-#: stdio-common/../sysdeps/gnu/errlist.c:608
+#: stdio-common/../sysdeps/gnu/errlist.c:626
 msgid "You really blew it this time"
 msgstr "À̹ø¿£ Á¤¸»·Î ³¯·Á¹ö·È½À´Ï´Ù"
 
-#: timezone/zic.c:1063
+#: timezone/zic.c:1089
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "°è¼ÓµÇ´Â Zone ÁÙ¿¡ ÀÖ´Â ³¡ ½Ã°¢ÀÌ À­ ÁÙ¿¡ ÀÖ´Â ³¡½Ã°¢º¸´Ù ´ÊÀº ½Ã°¢ÀÌ ¾Æ´Õ´Ï´Ù"
 
@@ -2734,13 +3142,17 @@ msgstr "°è¼ÓµÇ´Â Zone ÁÙ¿¡ ÀÖ´Â ³¡ ½Ã°¢ÀÌ À­ ÁÙ¿¡ ÀÖ´Â ³¡½Ã°¢º¸´Ù ´ÊÀº ½Ã°¢ÀÌ ¾Æ
 msgid "[FILE...]"
 msgstr "[ÆÄÀÏ...]"
 
-#: locale/programs/charmap.c:481 locale/programs/locfile.c:471
-#: locale/programs/repertoire.c:278
+#: sunrpc/pmap_clnt.c:71
+msgid "__get_myaddress: ioctl (get interface configuration)"
+msgstr "__get_myaddress: ioctl (ÀÎÅÍÆäÀ̽º ¼³Á¤À» ¾òÀ½)"
+
+#: locale/programs/charmap.c:480 locale/programs/locfile.c:477
+#: locale/programs/repertoire.c:290
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "`%1$s' Á¤ÀÇ°¡ `END %1$s'·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: elf/sprof.c:766
+#: elf/sprof.c:762
 #, c-format
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr "`%s'´Â `%s'¿¡ ¸Â´Â ÇÁ·ÎÆÄÀÏ µ¥ÀÌŸ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù"
@@ -2750,15 +3162,15 @@ msgstr "`%s'´Â `%s'¿¡ ¸Â´Â ÇÁ·ÎÆÄÀÏ µ¥ÀÌŸ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù"
 msgid "`-1' must be last entry in `%s' field in `%s' category"
 msgstr "`-1'Àº `%2$s' ¹üÁÖÀÇ `%1$s' ÇʵåÀÇ ¸¶Áö¸· entry¿©¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1666
+#: locale/programs/ld-collate.c:1670
 msgid "`...' must only be used in `...' and `UNDEFINED' entries"
 msgstr "`...'´Â `...'¿Í `UNDEFINED' Ç׸ñ¿¡¸¸ ¾²¿©¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/locfile.c:668
+#: locale/programs/locfile.c:674
 msgid "`from' expected after first argument to `collating-element'"
 msgstr "`collating-element'¿¡ ´ëÇÑ Ã¹¹ø° Àμö µÚ¿¡ `from'ÀÌ ¿Í¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1118
+#: locale/programs/ld-collate.c:1122
 msgid "`from' string in collation element declaration contains unknown character"
 msgstr "»çÀü¼ø¼­ ¿ä¼Ò ¼±¾ðºÎÀÇ `from' ¹®ÀÚ¿­¿¡ ¾Ë ¼ö ¾ø´Â ¹®ÀÚ"
 
@@ -2770,11 +3182,11 @@ msgstr "ai_family°¡ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 msgid "ai_socktype not supported"
 msgstr "ai_socktypeÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
-#: nscd/nscd.c:121
+#: nscd/nscd.c:127
 msgid "already running"
 msgstr "ÀÌ¹Ì ½ÇÇàÁß"
 
-#: locale/programs/charmap.c:352 locale/programs/repertoire.c:152
+#: locale/programs/charmap.c:352 locale/programs/repertoire.c:164
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "<%s>¿¡ ´ëÇÑ Àμö´Â ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
@@ -2784,28 +3196,28 @@ msgstr "<%s>¿¡ ´ëÇÑ Àμö´Â ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
 msgid "argument to `%s' must be a single character"
 msgstr "`%s'¿¡ ´ëÇÑ Àμö´Â ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
 
-#: sunrpc/auth_unix.c:321
+#: sunrpc/auth_unix.c:310
 msgid "auth_none.c - Fatal marshalling problem"
 msgstr "auto_none.c - Ä¡¸íÀûÀÎ Á¤·Ä(marshalling) ¹®Á¦"
 
-#: sunrpc/auth_unix.c:116 sunrpc/auth_unix.c:122 sunrpc/auth_unix.c:151
+#: sunrpc/auth_unix.c:105 sunrpc/auth_unix.c:111 sunrpc/auth_unix.c:141
 msgid "authunix_create: out of memory\n"
 msgstr "authunix_create: ¸Þ¸ð¸® ºÎÁ·\n"
 
 #: locale/programs/charmap.c:297 locale/programs/locfile.c:234
-#: locale/programs/locfile.c:261 locale/programs/repertoire.c:144
+#: locale/programs/locfile.c:261 locale/programs/repertoire.c:156
 msgid "bad argument"
 msgstr "À߸øµÈ Àμö"
 
-#: inet/rcmd.c:318
+#: inet/rcmd.c:326
 msgid "bad owner"
 msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ"
 
-#: timezone/zic.c:1185
+#: timezone/zic.c:1211
 msgid "blank FROM field on Link line"
 msgstr "Link ÁÙ¿¡ FROM Çʵ尡 ¾øÀ½"
 
-#: timezone/zic.c:1189
+#: timezone/zic.c:1215
 msgid "blank TO field on Link line"
 msgstr "Link ÁÙ¿¡ TO Çʵ尡 ¾øÀ½"
 
@@ -2827,7 +3239,7 @@ msgstr "broadcast: ioctl (ÀÎÅÍÆäÀ̽º Ç÷¡±× ¾òÀ½)"
 
 #: login/programs/request.c:167
 msgid "buffer overflow"
-msgstr "¹öÆÛ Èê·¯³Ñħ"
+msgstr "¹öÆÛ Èê·¯ ³Ñħ"
 
 #: sunrpc/svc_udp.c:446
 msgid "cache_set: could not allocate new rpc_buffer"
@@ -2841,7 +3253,7 @@ msgstr "cache_set: ¹ö¸±°ÍÀ» ÇÒ´çÇÏÁö ¸øÇßÀ½"
 msgid "cache_set: victim not found"
 msgstr "cache_set: ¹ö¸±°ÍÀ» ãÁö ¸øÇßÀ½"
 
-#: timezone/zic.c:1726
+#: timezone/zic.c:1752
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "´ÜÁö Á¾·á½Ã°¢ ÀÌÈÄ¿¡ »ç¿ëÇϱâ À§ÇÑ ½Ã°£´ë ¾à¾î¸¦ °áÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -2850,61 +3262,61 @@ msgstr "´ÜÁö Á¾·á½Ã°¢ ÀÌÈÄ¿¡ »ç¿ëÇϱâ À§ÇÑ ½Ã°£´ë ¾à¾î¸¦ °áÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 msgid "can't reassign procedure number %d\n"
 msgstr "ÇÁ·Î½ÃÁ® ¹øÈ£ %d¸¦ ÀçÁöÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: locale/programs/localedef.c:279
+#: locale/programs/localedef.c:276
 #, c-format
 msgid "cannot `stat' locale file `%s'"
 msgstr "·ÎÄÉÀÏ ÆÄÀÏ `%s'¸¦ `stat'ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: elf/sprof.c:935 elf/sprof.c:987
+#: elf/sprof.c:931 elf/sprof.c:983
 msgid "cannot allocate symbol data"
 msgstr "±âÈ£ µ¥ÀÌŸ¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: elf/sprof.c:719 elf/sprof.c:777
+#: elf/sprof.c:715 elf/sprof.c:773
 msgid "cannot create internal descriptor"
 msgstr "³»ºÎÀû ±â¼úÀÚ¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: elf/sprof.c:417
+#: elf/sprof.c:413
 msgid "cannot create internal descriptors"
 msgstr "³»ºÎÀû ±â¼úÀÚ¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/connections.c:180
+#: nscd/connections.c:183
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "¼ÒÄÏÀÌ ¿¬°áÀ» ¹Þ¾ÆµéÀ̵µ·Ï ÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: sunrpc/rpc_main.c:342
+#: sunrpc/rpc_main.c:341
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr "C Àü󸮱⸦ ãÀ» ¼ö ¾ø½À´Ï´Ù: %s \n"
 
-#: sunrpc/rpc_main.c:350
+#: sunrpc/rpc_main.c:349
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr "¾î¶² C Àü󸮱⵵ (cpp) ãÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: nscd/connections.c:205
+#: nscd/connections.c:224
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "°ú°ÅÀÇ ¿äû ¹öÀü %d¸¦ ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù; ÇöÀç ¹öÀüÀº %dÀÔ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1324
+#: locale/programs/ld-collate.c:1328
 #, c-format
 msgid "cannot insert collation element `%.*s'"
 msgstr "»çÀü ¼ø¼­ ¿ä¼Ò `%.*s'¸¦ »ðÀÔÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1503 locale/programs/ld-collate.c:1510
+#: locale/programs/ld-collate.c:1507 locale/programs/ld-collate.c:1514
 msgid "cannot insert into result table"
 msgstr "°á°úÇ¥¿¡ »ðÀÔÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1175 locale/programs/ld-collate.c:1218
+#: locale/programs/ld-collate.c:1179 locale/programs/ld-collate.c:1222
 #, c-format
 msgid "cannot insert new collating symbol definition: %s"
 msgstr "»õ·Î¿î »çÀü¼ø¼­ ±âÈ£ Á¤ÀǸ¦ »ðÀÔÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: elf/sprof.c:674
+#: elf/sprof.c:670
 msgid "cannot load profiling data"
 msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: inet/rcmd.c:314
+#: inet/rcmd.c:322
 msgid "cannot open"
 msgstr "¿­ ¼ö ¾ø½À´Ï´Ù"
 
@@ -2918,12 +3330,12 @@ msgstr "`%s'¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
 msgid "cannot open database file `%s': %s"
 msgstr "µ¥ÀÌÅͺ£À̽º ÆÄÀÏ `%s'¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: catgets/gencat.c:272 db2/makedb.c:167 iconv/iconv_prog.c:177
+#: catgets/gencat.c:273 db2/makedb.c:167 iconv/iconv_prog.c:177
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ÀÔ·Â ÆÄÀÏ `%s'¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/localedef.c:198
+#: locale/programs/localedef.c:195
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr "·ÎÄÉÀÏ Á¤ÀÇ ÆÄÀÏ `%s'¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
@@ -2932,22 +3344,22 @@ msgstr "·ÎÄÉÀÏ Á¤ÀÇ ÆÄÀÏ `%s'¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
 msgid "cannot open output file"
 msgstr "Ãâ·Â ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: catgets/gencat.c:774 catgets/gencat.c:815 db2/makedb.c:181
+#: catgets/gencat.c:780 catgets/gencat.c:821 db2/makedb.c:181
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr "Ãâ·Â ÆÄÀÏ `%s'¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locfile.c:1129
+#: locale/programs/locfile.c:1135
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "Ãâ·Â ÆÄÀÏ `%s'¸¦ ¹üÁÖ `%s'¿¡ ´ëÇØ ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/connections.c:162
+#: nscd/connections.c:165
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "¼ÒÄÏ `%s'¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1370
+#: locale/programs/ld-collate.c:1374
 msgid "cannot process order specification"
 msgstr "¼ø¼­ ¸í¼¼¸¦ ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -2956,7 +3368,7 @@ msgstr "¼ø¼­ ¸í¼¼¸¦ ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù"
 msgid "cannot read character map directory `%s'"
 msgstr "¹®ÀÚ Áöµµ µð·ºÅ丮 `%s'¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/connections.c:122
+#: nscd/connections.c:125
 msgid "cannot read configuration file; this is fatal"
 msgstr "¼³Á¤ ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù; Ä¡¸íÀûÀÓ"
 
@@ -2974,14 +3386,14 @@ msgstr "`%s'¿¡¼­ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 msgid "cannot read locale directory `%s'"
 msgstr "·ÎÄÉÀÏ µð·ºÅ丮 `%s'¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/localedef.c:303
+#: locale/programs/localedef.c:300
 #, c-format
 msgid "cannot read locale file `%s'"
 msgstr "·ÎÄÉÀÏ ÆÄÀÏ `%s'¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/locfile.c:288 locale/programs/locfile.c:306
-#: locale/programs/locfile.c:324 locale/programs/locfile.c:342
-#: locale/programs/locfile.c:360 locale/programs/locfile.c:378
+#: locale/programs/locfile.c:289 locale/programs/locfile.c:308
+#: locale/programs/locfile.c:327 locale/programs/locfile.c:346
+#: locale/programs/locfile.c:365 locale/programs/locfile.c:384
 #, c-format
 msgid "cannot read repertoire map `%s'"
 msgstr "·¹ÆÄÅ丮 Áöµµ ÆÄÀÏ `%s'¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
@@ -2990,17 +3402,17 @@ msgstr "·¹ÆÄÅ丮 Áöµµ ÆÄÀÏ `%s'¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 msgid "cannot read statistics data"
 msgstr "Åë°è µ¥ÀÌŸ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/cache.c:141 nscd/connections.c:148
+#: nscd/cache.c:150 nscd/connections.c:151
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "`%s'ÆÄÀÏ¿¡ stat()À» ÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: locale/programs/localedef.c:328
+#: locale/programs/localedef.c:325
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "Ãâ·Â ÆÄÀÏÀ» `%s'¿¡ ±â·ÏÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: nscd/connections.c:229 nscd/connections.c:250
+#: nscd/connections.c:260 nscd/connections.c:281
 #, c-format
 msgid "cannot write result: %s"
 msgstr "°á°ú¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù: %s"
@@ -3014,40 +3426,50 @@ msgstr "Åë°è¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù: %s"
 msgid "cannot write to client"
 msgstr "Ŭ¶óÀ̾ðÆ®¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/localedef.c:442
+#: locale/programs/localedef.c:439
 msgid "category data requested more than once: should not happen"
 msgstr "¹üÁÖ µ¥ÀÌŸ°¡ Çѹø ÀÌ»ó ¿äûµÇ¾ú½À´Ï´Ù: ÀÌ·± ÀÏÀÌ ÀϾ¼­´Â ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:269
+#: locale/programs/ld-ctype.c:278
 #, c-format
-msgid "character %s'%s' in class `%s' must be in class `%s'"
-msgstr "`%3$s' Ŭ·¡½ºÀÇ %1$s'%2$s' ¹®ÀÚ´Â `%4$s' Ŭ·¡½º¿¡ µé¾î ÀÖ¾î¾ß ÇÕ´Ï´Ù"
+msgid "character '%s' in class `%s' must be in class `%s'"
+msgstr "`%2$s' Ŭ·¡½ºÀÇ '%1$s' ¹®ÀÚ´Â `%3$s' Ŭ·¡½º¿¡ µé¾î ÀÖ¾î¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:294
+#: locale/programs/ld-ctype.c:303
 #, c-format
-msgid "character %s'%s' in class `%s' must not be in class `%s'"
-msgstr "`%3$s' Ŭ·¡½ºÀÇ %1$s'%2$s' ¹®ÀÚ´Â `%4$s' Ŭ·¡½º¿¡ µé¾î ÀÖÀ¸¸é ¾È µË´Ï´Ù"
+msgid "character '%s' in class `%s' must not be in class `%s'"
+msgstr "`%2$s' Ŭ·¡½ºÀÇ '%1$s' ¹®ÀÚ´Â `%3$s' Ŭ·¡½º¿¡ µé¾î ÀÖÀ¸¸é ¾È µË´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:320
+#: locale/programs/ld-ctype.c:405
 msgid "character <SP> not defined in character map"
 msgstr "¹®ÀÚ <SP>°¡ ¹®ÀÚ Áöµµ¿¡¼­ Á¤ÀǵÇÁö ¾Ê¾ÒÀ½"
 
-#: locale/programs/ld-ctype.c:964 locale/programs/ld-ctype.c:1029
-#: locale/programs/ld-ctype.c:1040 locale/programs/ld-ctype.c:1051
-#: locale/programs/ld-ctype.c:1062 locale/programs/ld-ctype.c:1073
-#: locale/programs/ld-ctype.c:1084 locale/programs/ld-ctype.c:1113
-#: locale/programs/ld-ctype.c:1124 locale/programs/ld-ctype.c:1165
-#: locale/programs/ld-ctype.c:1194 locale/programs/ld-ctype.c:1206
+#: locale/programs/ld-ctype.c:355
+#, c-format
+msgid "character L'%s' (index %Zd) in class `%s' must be in class `%s'"
+msgstr "`%3$s' Ŭ·¡½ºÀÇ L'%1$s' ¹®ÀÚ(À妽º %2$Zd)´Â `%4$s' Ŭ·¡½º¿¡ µé¾î ÀÖ¾î¾ß ÇÕ´Ï´Ù"
+
+#: locale/programs/ld-ctype.c:380
+#, c-format
+msgid "character L'%s' (index %Zd) in class `%s' must not be in class `%s'"
+msgstr "`%3$s' Ŭ·¡½ºÀÇ L'%1$s' ¹®ÀÚ(À妽º %2$Zd)´Â `%4$s' Ŭ·¡½º¿¡ µé¾î ÀÖÀ¸¸é ¾È µË´Ï´Ù"
+
+#: locale/programs/ld-ctype.c:1107 locale/programs/ld-ctype.c:1183
+#: locale/programs/ld-ctype.c:1196 locale/programs/ld-ctype.c:1209
+#: locale/programs/ld-ctype.c:1222 locale/programs/ld-ctype.c:1235
+#: locale/programs/ld-ctype.c:1248 locale/programs/ld-ctype.c:1279
+#: locale/programs/ld-ctype.c:1292 locale/programs/ld-ctype.c:1343
+#: locale/programs/ld-ctype.c:1374 locale/programs/ld-ctype.c:1386
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr "¹®ÀÚ `%s'´Â ³»Á¤Ä¡·Î ÇÊ¿äÇÏÁö¸¸ Á¤ÀǵÇÁö ¾Ê¾ÒÀ½"
 
-#: locale/programs/ld-ctype.c:825
+#: locale/programs/ld-ctype.c:967
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "¹®ÀÚ Å¬·¡½º `%s'´Â ÀÌ¹Ì Á¤ÀǵǾúÀ½"
 
-#: locale/programs/ld-ctype.c:857
+#: locale/programs/ld-ctype.c:999
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "¹®ÀÚ Áöµµ `%s'´Â ÀÌ¹Ì Á¤ÀǵǾúÀ½"
@@ -3065,7 +3487,7 @@ msgstr "clnt_raw.c - Ä¡¸íÀûÀÎ Çì´õ ¿¬¼ÓÈ­ ¿À·ù."
 msgid "clnttcp_create: out of memory\n"
 msgstr "clnttcp_create: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: sunrpc/clnt_udp.c:124 sunrpc/clnt_udp.c:134
+#: sunrpc/clnt_udp.c:125 sunrpc/clnt_udp.c:135
 msgid "clntudp_create: out of memory\n"
 msgstr "clntudp_create: ¸Þ¸ð¸® ºÎÁ·\n"
 
@@ -3073,22 +3495,22 @@ msgstr "clntudp_create: ¸Þ¸ð¸® ºÎÁ·\n"
 msgid "clntunix_create: out of memory\n"
 msgstr "clntunix_create: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: locale/programs/ld-collate.c:1339
+#: locale/programs/ld-collate.c:1343
 #, c-format
 msgid "collation element `%.*s' appears more than once: ignore line"
 msgstr "»çÀü ¼ø¼­ ¿ä¼Ò `%.*s'°¡ Çѹø ÀÌ»ó ³ªÅ¸³µ½À´Ï´Ù: ÀÌ ÁÙÀ» ¹«½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1357
+#: locale/programs/ld-collate.c:1361
 #, c-format
 msgid "collation symbol `%.*s' appears more than once: ignore line"
 msgstr "»çÀü ¼ø¼­ ±âÈ£ `%.*s'°¡ Çѹø ÀÌ»ó ³ªÅ¸³µ½À´Ï´Ù: ÀÌ ÁÙÀ» ¹«½ÃÇÕ´Ï´Ù"
 
-#: locale/programs/locfile.c:652
+#: locale/programs/locfile.c:658
 #, c-format
 msgid "collation symbol expected after `%s'"
 msgstr "»çÀü ¼ø¼­ ½Éº¼ÀÌ `%s' ´ÙÀ½¿¡ ¿Í¾ß ÇÕ´Ï´Ù"
 
-#: inet/rcmd.c:136
+#: inet/rcmd.c:143
 #, c-format
 msgid "connect to address %s: "
 msgstr "ÁÖ¼Ò %s¿¡ ¿¬°á: "
@@ -3102,7 +3524,7 @@ msgstr "»ó¼ö ȤÀº ½Äº°ÀÚ°¡ ¿Í¾ß ÇÔ"
 msgid "conversion from `%s' to `%s' not supported"
 msgstr "`%s'¿¡¼­ `%s'·ÎÀÇ º¯È¯Àº Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:326
+#: iconv/iconv_prog.c:328 iconv/iconv_prog.c:353
 msgid "conversion stopped due to problem in writing the output"
 msgstr "Ãâ·ÂÆÄÀÏ¿¡ ¾µ¶§ ¹ß»ýÇÑ ¹®Á¦·Î º¯È¯ÀÛ¾÷ÀÌ ÁߴܵǾú½À´Ï´Ù"
 
@@ -3115,7 +3537,7 @@ msgstr "rpc ¼­¹ö¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù\n"
 msgid "couldn't register prog %d vers %d\n"
 msgstr "ÇÁ·Î±×·¥ %d ¹öÀü %d¸¦ µî·ÏÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: nss/getent.c:49
+#: nss/getent.c:50
 msgid "database [key ...]"
 msgstr "µ¥ÀÌŸº£À̽º [Å°...]"
 
@@ -3139,11 +3561,11 @@ msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ `%1$d'ÀÇ ¹æÇâ Ç÷¡±×°¡ ÇÑ°³ÀÇ ¹®À
 msgid "duplicate character name `%s'"
 msgstr "¹®ÀÚ À̸§ `%s'ÀÌ Áߺ¹µÊ"
 
-#: locale/programs/ld-collate.c:1150
+#: locale/programs/ld-collate.c:1154
 msgid "duplicate collating element definition"
 msgstr "»çÀü¼ø¼­ ¿ä¼Ò Á¤ÀÇ°¡ Áߺ¹µÇ¾ú½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1297
+#: locale/programs/ld-collate.c:1301
 #, c-format
 msgid "duplicate definition for character `%.*s'"
 msgstr "¹®ÀÚ `%.*s'¸¦ Áߺ¹ Á¤ÀÇÇÔ"
@@ -3152,20 +3574,20 @@ msgstr "¹®ÀÚ `%.*s'¸¦ Áߺ¹ Á¤ÀÇÇÔ"
 msgid "duplicate key"
 msgstr "Áߺ¹µÈ Å°"
 
-#: catgets/gencat.c:388
+#: catgets/gencat.c:389
 msgid "duplicate set definition"
 msgstr "Áߺ¹µÈ ÁýÇÕ Á¤ÀÇ"
 
-#: timezone/zic.c:978
+#: timezone/zic.c:1004
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "Áߺ¹µÈ Áö¿ª¸í %s (ÆÄÀÏ \"%s\", Çà %d)"
 
-#: catgets/gencat.c:551
+#: catgets/gencat.c:556
 msgid "duplicated message identifier"
 msgstr "Áߺ¹µÈ ¸Þ½ÃÁö ½Äº°ÀÚ"
 
-#: catgets/gencat.c:524
+#: catgets/gencat.c:528
 msgid "duplicated message number"
 msgstr "Áߺ¹µÈ ¸Þ½ÃÁö ¹øÈ£"
 
@@ -3173,7 +3595,7 @@ msgstr "Áߺ¹µÈ ¸Þ½ÃÁö ¹øÈ£"
 msgid "empty char string"
 msgstr "ºó ¹®ÀÚ¿­"
 
-#: locale/programs/ld-collate.c:1710
+#: locale/programs/ld-collate.c:1714
 msgid "empty weight name: line ignored"
 msgstr "ºó weight À̸§: ÀÌ ÁÙÀº ¹«½ÃµË´Ï´Ù"
 
@@ -3201,10 +3623,15 @@ msgstr "Ãâ·Â ÀÎÄÚµù"
 msgid "encoding of original text"
 msgstr "¿ø ¹®¼­ ÀÎÄÚµù"
 
-#: locale/programs/ld-collate.c:1429
+#: locale/programs/ld-collate.c:1433
 msgid "end point of ellipsis range is bigger then start"
 msgstr "¸»ÁÙÀÓÇ¥ Áö¿ªÀÇ ³¡Á¡ÀÌ ½ÃÀÛÁ¡º¸´Ù Å®´Ï´Ù"
 
+#: nscd/connections.c:357 nscd/connections.c:444
+#, c-format
+msgid "error getting callers id: %s"
+msgstr "È£ÃâÀÚÀÇ ID¸¦ ¾ò´Âµ¥ ¿À·ù: %s"
+
 #: iconv/iconv_prog.c:193
 #, c-format
 msgid "error while closing input `%s'"
@@ -3214,40 +3641,40 @@ msgstr "ÀÔ·Â `%s'¸¦ ´Ý´Â µµÁß ¿À·ù ¹ß»ý"
 msgid "error while closing output file"
 msgstr "Ãâ·Â ÆÄÀÏÀ» ´Ý´Â µµÁß ¿À·ù ¹ß»ý"
 
-#: elf/sprof.c:710
+#: elf/sprof.c:706
 msgid "error while closing the profiling data file"
 msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏÀ¸ ´Ý´Â µµÁß ¿À·ù ¹ß»ý"
 
-#: locale/programs/ld-collate.c:1158
+#: locale/programs/ld-collate.c:1162
 msgid "error while inserting collation element into hash table"
 msgstr "Çؽ¬ Å×ÀÌºí¿¡ »çÀü¼ø¼­ ¿ä¼Ò¸¦ »ðÀÔÇÒ ¶§ ¿À·ù"
 
-#: locale/programs/ld-collate.c:1170
+#: locale/programs/ld-collate.c:1174
 msgid "error while inserting to hash table"
 msgstr "Çؽ¬ Å×ÀÌºí¿¡ »ðÀÔÇÏ´Â µµÁß ¿À·ù ¹ß»ý"
 
-#: iconv/iconv_prog.c:389 iconv/iconv_prog.c:420
+#: iconv/iconv_prog.c:417 iconv/iconv_prog.c:448
 msgid "error while reading the input"
 msgstr "ÀÔ·ÂÀ» Àд µµÁß¿¡ ¿À·ù ¹ß»ý"
 
-#: locale/programs/locfile.c:595
+#: locale/programs/locfile.c:601
 msgid "expect string argument for `copy'"
 msgstr "`copy'¿¡ ´ëÇÑ ¹®ÀÚ¿­ Àμö°¡ ÇÊ¿äÇÔ"
 
-#: timezone/zic.c:868
+#: timezone/zic.c:894
 msgid "expected continuation line not found"
 msgstr "¿¹»óÇß´ø ¿¬¼Ó ÇàÀ» ãÁö ¸øÇßÀ½"
 
-#: elf/sprof.c:408
+#: elf/sprof.c:404
 #, c-format
 msgid "failed to load shared object `%s'"
 msgstr "µ¿Àû ¿ÀºêÁ§Æ® `%s'¸¦ Àдµ¥ ½ÇÆÐ"
 
-#: elf/sprof.c:604
+#: elf/sprof.c:600
 msgid "failed to load symbol data"
 msgstr "±âÈ£ µ¥ÀÌŸ¸¦ Àд µ¥ ½ÇÆÐ"
 
-#: elf/sprof.c:702
+#: elf/sprof.c:698
 msgid "failed to mmap the profiling data file"
 msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏÀ» mmapÇÏ´Â µ¥ ½ÇÆÐ"
 
@@ -3255,7 +3682,7 @@ msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏÀ» mmapÇÏ´Â µ¥ ½ÇÆÐ"
 msgid "failed to start conversion processing"
 msgstr "º¯È¯ÀÛ¾÷À» ½ÃÀÛÇϴµ¥ ½ÇÆÐ"
 
-#: locale/programs/locfile.c:1154
+#: locale/programs/locfile.c:1160
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr "¹üÁÖ `%s'ÀÇ ÀڷḦ ¾²´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
@@ -3264,26 +3691,22 @@ msgstr "¹üÁÖ `%s'ÀÇ ÀڷḦ ¾²´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù"
 msgid "fcntl: F_SETFD"
 msgstr "fcntl: F_SETFD"
 
-#: locale/programs/ld-monetary.c:163 locale/programs/ld-numeric.c:98
-#, c-format
-msgid "field `%s' in category `%s' not defined"
-msgstr "`%2$s' ¹üÁÖ¿¡¼­ `%1$s' Çʵ尡 Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
-
 #: locale/programs/ld-messages.c:86 locale/programs/ld-messages.c:110
+#: locale/programs/ld-monetary.c:163 locale/programs/ld-numeric.c:98
 #, c-format
 msgid "field `%s' in category `%s' undefined"
 msgstr "`%2$s' ¹üÁÖ¿¡¼­ `%1$s' Çʵ尡 Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: sunrpc/rpc_main.c:1148
+#: sunrpc/rpc_main.c:1146
 #, c-format
-msgid "file '%s' already exists and may be overwritten\n"
-msgstr "`%s' ÆÄÀÏÀº ÀÌ¹Ì Á¸ÀçÇϹǷÎ, µ¤¾î ¾µ¼öµµ ÀÖ½À´Ï´Ù\n"
+msgid "file `%s' already exists and may be overwritten\n"
+msgstr "`%s' ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù.  µ¤¾î ¾µ¼öµµ ÀÖ½À´Ï´Ù\n"
 
-#: locale/programs/locfile.c:677
+#: locale/programs/locfile.c:683
 msgid "from-value of `collating-element' must be a string"
 msgstr "`collating-element'ÀÇ from-value´Â ¹®ÀÚ¿­À̾î¾ß ÇÕ´Ï´Ù"
 
-#: inet/rcmd.c:316
+#: inet/rcmd.c:324
 msgid "fstat failed"
 msgstr "fstat ½ÇÆÐ"
 
@@ -3310,11 +3733,11 @@ msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡¼­ ½ÃÀÛ ³¯Â¥ °ªÀÇ ³¡¿¡ ¾µ¸ð
 msgid "garbage at end of stopping date in string %d in `era' field in category `%s'"
 msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡¼­ ¸ØÃã ³¯Â¥ °ªÀÇ ³¡¿¡ ¾µ¸ð¾ø´Â °ÍÀÌ ÀÖÀ½"
 
-#: elf/sprof.c:81
+#: elf/sprof.c:77
 msgid "generate call graph"
 msgstr "È£Ãâ ±×·¡ÇÁ¸¦ ¸¸µê"
 
-#: elf/sprof.c:80
+#: elf/sprof.c:76
 msgid "generate flat profile with counts and ticks"
 msgstr "Ƚ¼ö¿Í ƽ¼ö¸¦ ±â·ÏÇÑ Ç÷§ ÇÁ·ÎÆÄÀÏÀ» ¸¸µç´Ù"
 
@@ -3322,32 +3745,32 @@ msgstr "Ƚ¼ö¿Í ƽ¼ö¸¦ ±â·ÏÇÑ Ç÷§ ÇÁ·ÎÆÄÀÏÀ» ¸¸µç´Ù"
 msgid "get_myaddress: ioctl (get interface configuration)"
 msgstr "get_myaddress: ioctl (ÀÎÅÍÆäÀ̽º ¼³Á¤À» ¾òÀ½)"
 
-#: nss/getent.c:53
+#: nss/getent.c:54
 msgid "getent - get entries from administrative database."
 msgstr "getent - °ü¸® µ¥ÀÌŸº£À̽º¿¡¼­ entry¸¦ ¾òÀ½."
 
-#: nscd/connections.c:200
+#: nscd/connections.c:219
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: ¿äûÀ» ¹Þ¾ÒÀ½ (¹öÀü = %d)"
 
-#: timezone/zic.c:613
+#: timezone/zic.c:638
 msgid "hard link failed, symbolic link used"
 msgstr "ÇÏµå ¸µÅ© ½ÇÆÐ, ½Éº¼¸¯ ¸µÅ©°¡ »ç¿ëµË´Ï´Ù"
 
-#: inet/rcmd.c:322
+#: inet/rcmd.c:330
 msgid "hard linked somewhere"
 msgstr "¾îµò°¡¿¡ ÇÏµå ¸µÅ©µÊ"
 
-#: timezone/zic.c:1162
+#: timezone/zic.c:1188
 msgid "illegal CORRECTION field on Leap line"
 msgstr "Leap ÁÙ¿¡ À߸øµÈ CORRECTION Çʵå"
 
-#: timezone/zic.c:1166
+#: timezone/zic.c:1192
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "Leap ÁÙ¿¡ À߸øµÈ Rolling/Stationary Çʵå"
 
-#: locale/programs/ld-collate.c:1782
+#: locale/programs/ld-collate.c:1786
 msgid "illegal character constant in string"
 msgstr "¹®ÀÚ¿­¿¡ À߸øµÈ ¹®ÀÚ »ó¼ö°¡ ÀÖÀ½"
 
@@ -3355,7 +3778,7 @@ msgstr "¹®ÀÚ¿­¿¡ À߸øµÈ ¹®ÀÚ »ó¼ö°¡ ÀÖÀ½"
 msgid "illegal character in file: "
 msgstr "ÆÄÀÏ¿¡ À߸øµÈ ¹®ÀÚ°¡ ÀÖÀ½"
 
-#: locale/programs/ld-collate.c:1125
+#: locale/programs/ld-collate.c:1129
 msgid "illegal collation element"
 msgstr "À߸øµÈ »çÀü¼ø¼­ ¿ä¼Ò"
 
@@ -3371,7 +3794,7 @@ msgstr "À߸øµÈ ºÎȣȭ°¡ ÁÖ¾îÁü"
 msgid "illegal escape sequence at end of string"
 msgstr "¹®ÀÚ¿­ ³¡¿¡ À߸øµÈ À̽ºÄÉÀÌÇÁ ¼ø¼­¿­ÀÌ ÀÖÀ½"
 
-#: iconv/iconv_prog.c:342
+#: iconv/iconv_prog.c:370
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "%ld À§Ä¡¿¡ À߸øµÈ ÀÔ·Â ¼ø¼­¿­ÀÌ ÀÖÀ½"
@@ -3380,17 +3803,17 @@ msgstr "%ld À§Ä¡¿¡ À߸øµÈ ÀÔ·Â ¼ø¼­¿­ÀÌ ÀÖÀ½"
 msgid "illegal names for character range"
 msgstr "¹®ÀÚÀÇ ¹üÀ§·Î À߸øµÈ À̸§"
 
-#: sunrpc/rpc_main.c:462
+#: sunrpc/rpc_main.c:461
 #, c-format
-msgid "illegal nettype :'%s'\n"
-msgstr "À߸øµÈ ³×ƮŸÀÔ :'%s'\n"
+msgid "illegal nettype :`%s'\n"
+msgstr "À߸øµÈ ³×ƮŸÀÔ :`%s'\n"
 
 #: locale/programs/ld-time.c:187
 #, c-format
 msgid "illegal number for offset in string %d in `era' field in category `%s'"
 msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡¼­ À߸øµÈ ¿ÀÇÁ¼Â Å©±â"
 
-#: catgets/gencat.c:361 catgets/gencat.c:438
+#: catgets/gencat.c:362 catgets/gencat.c:439
 msgid "illegal set number"
 msgstr "ÁýÇÕ ¹øÈ£°¡ À߸øµÇ¾úÀ½"
 
@@ -3404,17 +3827,17 @@ msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡¼­ À߸øµÈ ½ÃÀÛ ³¯Â¥"
 msgid "illegal stopping date in string %d in `era' field in category `%s'"
 msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡¼­ À߸øµÈ Á¤Áö ³¯Â¥"
 
-#: locale/programs/ld-ctype.c:831
+#: locale/programs/ld-ctype.c:973
 #, c-format
 msgid "implementation limit: no more than %d character classes allowed"
 msgstr "±¸Çö»óÀÇ Á¦ÇÑ: %d°³ ¹®ÀÚº¸´Ù Å« Ŭ·¡½º´Â Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:863
+#: locale/programs/ld-ctype.c:1005
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "±¸Çö»óÀÇ Á¦ÇÑ: %d °³ ÀÌ»óÀÇ ¹®ÀÚ Áöµµ´Â Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:346
+#: iconv/iconv_prog.c:374
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "¹öÆÛÀÇ ³¡¿¡ ºÒ¿ÏÀüÇÑ ¹®ÀÚ È¤Àº ½¬ÇÁÆ® ¿¬¼Ó"
 
@@ -3422,89 +3845,89 @@ msgstr "¹öÆÛÀÇ ³¡¿¡ ºÒ¿ÏÀüÇÑ ¹®ÀÚ È¤Àº ½¬ÇÁÆ® ¿¬¼Ó"
 msgid "incorrectly formatted file"
 msgstr "À߸øµÈ Çü½ÄÀ» °®Ãá ÆÄÀÏ"
 
-#: timezone/zic.c:825
+#: timezone/zic.c:851
 msgid "input line of unknown type"
 msgstr "¾Ë ¼ö ¾ø´Â ÇüÅÂÀÇ ÀÔ·ÂÇà"
 
-#: iconv/iconv_prog.c:350
+#: iconv/iconv_prog.c:378
 msgid "internal error (illegal descriptor)"
 msgstr "³»ºÎ ¿À·ù (À߸øµÈ ±â¼úÀÚ)"
 
-#: timezone/zic.c:1788
+#: timezone/zic.c:1814
 msgid "internal error - addtype called with bad isdst"
 msgstr "³»ºÎ ¿À·ù - Ʋ¸° isdst·Î addtypeÀ» È£ÃâÇßÀ½"
 
-#: timezone/zic.c:1796
+#: timezone/zic.c:1822
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "³»ºÎ ¿À·ù - Ʋ¸° ttisgmt·Î addtypeÀ» È£ÃâÇßÀ½"
 
-#: timezone/zic.c:1792
+#: timezone/zic.c:1818
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "³»ºÎ ¿À·ù - Ʋ¸° ttisstd·Î addtypeÀ» È£ÃâÇßÀ½"
 
-#: locale/programs/ld-ctype.c:307
+#: locale/programs/ld-ctype.c:315 locale/programs/ld-ctype.c:392
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "%s, Çà %u¿¡ ³»ºÎ ¿À·ù ¹ß»ý"
 
-#: timezone/zic.c:1034
+#: timezone/zic.c:1060
 msgid "invalid UTC offset"
 msgstr "UTC ¿É¼ÂÀÌ ºÎÀûÀýÇÔ"
 
-#: timezone/zic.c:1037
+#: timezone/zic.c:1063
 msgid "invalid abbreviation format"
 msgstr "¾à¾î Çü½ÄÀÌ ºÎÀûÀýÇÔ"
 
-#: timezone/zic.c:1127 timezone/zic.c:1339 timezone/zic.c:1353
+#: timezone/zic.c:1153 timezone/zic.c:1365 timezone/zic.c:1379
 msgid "invalid day of month"
 msgstr "´ÞÀÇ ³¯Â¥ ¼ö°¡ ºÎÀûÀýÇÔ"
 
-#: timezone/zic.c:1291
+#: timezone/zic.c:1317
 msgid "invalid ending year"
 msgstr "³¡³ª´Â ÇØ°¡ ºÎÀûÀýÇÔ"
 
-#: timezone/zic.c:1099
+#: timezone/zic.c:1125
 msgid "invalid leaping year"
 msgstr "ºÎÀûÀýÇÑ À±³â"
 
-#: elf/dl-open.c:159
+#: elf/dl-open.c:223
 msgid "invalid mode for dlopen()"
 msgstr "dlopen()¿¡ À߸øµÈ ¸ðµå"
 
-#: timezone/zic.c:1114 timezone/zic.c:1217
+#: timezone/zic.c:1140 timezone/zic.c:1243
 msgid "invalid month name"
 msgstr "´Þ À̸§ÀÌ ºÎÀûÀýÇÔ"
 
-#: timezone/zic.c:933
+#: timezone/zic.c:959
 msgid "invalid saved time"
 msgstr "Àý¾à ½Ã°£ÀÌ ºÎÀûÀýÇÔ"
 
-#: timezone/zic.c:1266
+#: timezone/zic.c:1292
 msgid "invalid starting year"
 msgstr "½ÃÀÛÇÏ´Â ÇØ°¡ ºÎÀûÀýÇÔ"
 
-#: timezone/zic.c:1143 timezone/zic.c:1246
+#: timezone/zic.c:1169 timezone/zic.c:1272
 msgid "invalid time of day"
 msgstr "ºÎÀûÀýÇÑ ÇÏ·çÁß ½Ã°¢"
 
-#: timezone/zic.c:1344
+#: timezone/zic.c:1370
 msgid "invalid weekday name"
 msgstr "ºÎÀûÀýÇÑ ¿äÀÏ À̸§"
 
-#: nscd/connections.c:375
+#: nscd/connections.c:460
 #, c-format
 msgid "key length in request too long: %Zd"
 msgstr "¿äûµÈ Å°ÀÇ ±æÀÌ°¡ ³Ê¹« ±è: %Zd"
 
-#: locale/programs/ld-collate.c:1422
+#: locale/programs/ld-collate.c:1426
 msgid "line after ellipsis must contain character definition"
 msgstr "¸»ÁÙÀÓÇ¥ ´ÙÀ½ÁÙ¿¡´Â ¹®ÀÚ Á¤ÀÇ°¡ ÀÖ¾î¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1401
+#: locale/programs/ld-collate.c:1405
 msgid "line before ellipsis does not contain definition for character constant"
 msgstr "¸»ÁÙÀÓÇ¥ ¾ÕÁÙ¿¡´Â ¹®ÀÚ »ó¼ö¿¡ ´ëÇÑ Á¤ÀÇ°¡ ÀÖ¾î¾ß ÇÕ´Ï´Ù"
 
-#: timezone/zic.c:805
+#: timezone/zic.c:831
 msgid "line too long"
 msgstr "ÇàÀÌ ³Ê¹« ±é´Ï´Ù"
 
@@ -3512,24 +3935,24 @@ msgstr "ÇàÀÌ ³Ê¹« ±é´Ï´Ù"
 msgid "list all known coded character sets"
 msgstr "¾Ë·ÁÁø ¸ðµç ¹®Àڼ Äڵ带 ¿­°ÅÇÔ"
 
-#: locale/programs/localedef.c:273
+#: locale/programs/localedef.c:270
 #, c-format
 msgid "locale file `%s', used in `copy' statement, not found"
 msgstr "`copy' ¹®Àå¿¡¼­ ¾²ÀÌ´Â ·ÎÄÉÀÏ ÆÄÀÏ `%s'À» ãÁö ¸øÇß½À´Ï´Ù"
 
-#: inet/rcmd.c:307
+#: inet/rcmd.c:315
 msgid "lstat failed"
 msgstr "lstat ½ÇÆÐ"
 
-#: catgets/gencat.c:619
+#: catgets/gencat.c:625
 msgid "malformed line ignored"
 msgstr "À߸øµÈ ÇüŸ¦ °¡Áø ÇàÀº ¹«½ÃµÊ"
 
-#: elf/sprof.c:554
+#: elf/sprof.c:550
 msgid "mapping of section header string table failed"
 msgstr "¼½¼Ç Çì´õÀÇ ¹®ÀÚ¿­ Å×À̺íÀ» ¸ÅÇÎÇϴµ¥ ½ÇÆÐ"
 
-#: elf/sprof.c:544
+#: elf/sprof.c:540
 msgid "mapping of section headers failed"
 msgstr "¼½¼Ç Çì´õ¸¦ ¸ÅÇÎÇÏ´Â µ¥ ½ÇÆÐ"
 
@@ -3542,23 +3965,19 @@ msgid "memory clobbered past end of allocated block\n"
 msgstr "ºí·°À» ÇÒ´çÀÌ ³¡³ª±â Àü¿¡ ¸Þ¸ð¸®°¡ ÈѼյÊ\n"
 
 #: locale/programs/ld-collate.c:170 locale/programs/ld-collate.c:176
-#: locale/programs/ld-collate.c:180 locale/programs/ld-collate.c:1449
-#: locale/programs/ld-collate.c:1478 locale/programs/locfile.c:1082
+#: locale/programs/ld-collate.c:180 locale/programs/ld-collate.c:1453
+#: locale/programs/ld-collate.c:1482 locale/programs/locfile.c:1088
 #: locale/programs/xmalloc.c:70 login/programs/database.c:62
 #: login/programs/database.c:79 login/programs/database.c:95
-#: posix/getconf.c:682
+#: malloc/obstack.c:471 posix/getconf.c:682
 msgid "memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
 
-#: malloc/obstack.c:471
-msgid "memory exhausted\n"
-msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²\n"
-
 #: malloc/mcheck.c:199
 msgid "memory is consistent, library is buggy\n"
 msgstr "¸Þ¸ð¸®´Â °ß°íÇÏÁö¸¸, ¶óÀ̺귯¸®´Â ¹ö±×°¡ ¸¹½À´Ï´Ù\n"
 
-#: locale/programs/ld-time.c:370
+#: locale/programs/ld-time.c:373
 #, c-format
 msgid "missing era format in string %d in `era' field in category `%s'"
 msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡ era Çü½ÄÀÌ ¾øÀ½"
@@ -3568,7 +3987,7 @@ msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡ era Çü½ÄÀÌ ¾øÀ½"
 msgid "missing era name in string %d in `era' field in category `%s'"
 msgstr "`%2$s' ¹üÁÖÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡ era À̸§ÀÌ ¾øÀ½"
 
-#: timezone/zic.c:928
+#: timezone/zic.c:954
 msgid "nameless rule"
 msgstr "À̸§¾ø´Â ±ÔÄ¢"
 
@@ -3576,35 +3995,35 @@ msgstr "À̸§¾ø´Â ±ÔÄ¢"
 msgid "neither original nor target encoding specified"
 msgstr "¿ø ÀÎÄÚµù°ú Ãâ·Â ÀÎÄÚµù ¸ðµÎ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: nis/nss_nisplus/nisplus-publickey.c:262
-#: nis/nss_nisplus/nisplus-publickey.c:268
-#: nis/nss_nisplus/nisplus-publickey.c:327
-#: nis/nss_nisplus/nisplus-publickey.c:336
+#: nis/nss_nisplus/nisplus-publickey.c:280
+#: nis/nss_nisplus/nisplus-publickey.c:286
+#: nis/nss_nisplus/nisplus-publickey.c:345
+#: nis/nss_nisplus/nisplus-publickey.c:354
 #, c-format
 msgid "netname2user: (nis+ lookup): %s\n"
 msgstr "netname2user: (nis+ ã±â): %s\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:281
+#: nis/nss_nisplus/nisplus-publickey.c:299
 #, c-format
 msgid "netname2user: DES entry for %s in directory %s not unique"
 msgstr "netname2user: µð·ºÅ丮 %2$sÀÇ %1$s¿¡ ´ëÇÑ DES entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: nis/nss_nisplus/nisplus-publickey.c:349
+#: nis/nss_nisplus/nisplus-publickey.c:367
 #, c-format
 msgid "netname2user: LOCAL entry for %s in directory %s not unique"
 msgstr "netname2user: µð·ºÅ丮 %2$sÀÇ %1$s¿¡ ´ëÇÑ LOCAL entry°¡ À¯ÀÏÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: nis/nss_nisplus/nisplus-publickey.c:194
+#: nis/nss_nisplus/nisplus-publickey.c:206
 #, c-format
-msgid "netname2user: missing group id list in '%s'."
-msgstr "netname2user: '%s'¿¡ ±×·ì ½Äº°ÀÚ ¸®½ºÆ®°¡ ¾øÀ½."
+msgid "netname2user: missing group id list in `%s'."
+msgstr "netname2user: `%s'¿¡ ±×·ì ½Äº°ÀÚ ¸®½ºÆ®°¡ ¾øÀ½."
 
-#: nis/nss_nisplus/nisplus-publickey.c:299
+#: nis/nss_nisplus/nisplus-publickey.c:317
 #, c-format
-msgid "netname2user: principal name '%s' too long"
-msgstr "netname2user: ÁÖ¿ä À̸§ '%s'Àº ³Ê¹« ±è"
+msgid "netname2user: principal name `%s' too long"
+msgstr "netname2user: ÁÖ¿ä À̸§ `%s'Àº ³Ê¹« ±è"
 
-#: nis/nss_nisplus/nisplus-publickey.c:356
+#: nis/nss_nisplus/nisplus-publickey.c:374
 msgid "netname2user: should not have uid 0"
 msgstr "netname2user: uid¸¦ 0À¸·Î ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -3613,7 +4032,7 @@ msgstr "netname2user: uid¸¦ 0À¸·Î ÇÒ ¼ö ¾ø½À´Ï´Ù"
 msgid "never registered prog %d\n"
 msgstr "°áÄÚ µî·ÏµÇÁö ¾ÊÀº ÇÁ·Î±×·¥ %d\n"
 
-#: locale/programs/repertoire.c:238
+#: locale/programs/repertoire.c:250
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "<Uxxxx> ȤÀº <Uxxxxxxxx> °ªÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
 
@@ -3622,7 +4041,7 @@ msgstr "<Uxxxx> ȤÀº <Uxxxxxxxx> °ªÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
 msgid "no correct regular expression for field `%s' in category `%s': %s"
 msgstr "`%2$s' ¹üÁÖÀÇ `%1$s' Çʵ忡 À߸øµÈ Á¤±Ô½Ä: %3$s"
 
-#: timezone/zic.c:2115
+#: timezone/zic.c:2143
 msgid "no day in month matches rule"
 msgstr "±ÔÄ¢¿¡ ºÎÇյǴ ³¯ÀÌ ´Þ ¾È¿¡ ¾øÀ½"
 
@@ -3630,32 +4049,32 @@ msgstr "±ÔÄ¢¿¡ ºÎÇյǴ ³¯ÀÌ ´Þ ¾È¿¡ ¾øÀ½"
 msgid "no definition of `UNDEFINED'"
 msgstr "`UNDEFINED'ÀÇ Á¤ÀÇ°¡ ¾øÀ½"
 
-#: elf/sprof.c:276
+#: elf/sprof.c:272
 #, c-format
 msgid "no filename for profiling data given and shared object `%s' has no soname"
 msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸÀÇ ÆÄÀÏ À̸§ÀÌ ¾ø°í, µ¿Àû ¿ÀºêÁ§Æ® `%s'´Â sonameÀÌ ¾øÀ½"
 
-#: locale/programs/locfile.c:609
+#: locale/programs/locfile.c:615
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "`copy'°¡ »ç¿ëµÉ ¶© ´Ù¸¥ Å°¿öµå¸¦ ÁöÁ¤ÇÏ¸é ¾È µË´Ï´Ù"
 
-#: locale/programs/localedef.c:334
+#: locale/programs/localedef.c:331
 msgid "no output file produced because warning were issued"
 msgstr "°æ°í°¡ Á¦±âµÇ¾ú±â ¶§¹®¿¡ Ãâ·Â ÆÄÀÏÀÌ ¸¸µé¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: locale/programs/locfile.c:283 locale/programs/locfile.c:301
-#: locale/programs/locfile.c:319 locale/programs/locfile.c:337
-#: locale/programs/locfile.c:355 locale/programs/locfile.c:373
+#: locale/programs/locfile.c:283 locale/programs/locfile.c:302
+#: locale/programs/locfile.c:321 locale/programs/locfile.c:340
+#: locale/programs/locfile.c:359 locale/programs/locfile.c:378
 msgid "no repertoire map specified: cannot proceed"
 msgstr "·¹ÆÄÅ丮 Áöµµ°¡ Á¤ÀǵÇÁö ¾Ê¾ÒÀ½: °è¼ÓÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/charmap.c:400 locale/programs/charmap.c:550
-#: locale/programs/charmap.c:629 locale/programs/repertoire.c:199
+#: locale/programs/charmap.c:400 locale/programs/charmap.c:549
+#: locale/programs/charmap.c:628 locale/programs/repertoire.c:211
 msgid "no symbolic name given"
 msgstr "±âÈ£¸íÀÌ ÁÖ¾îÁöÁö ¾ÊÀ½"
 
-#: locale/programs/charmap.c:465 locale/programs/charmap.c:596
-#: locale/programs/charmap.c:662 locale/programs/repertoire.c:261
+#: locale/programs/charmap.c:464 locale/programs/charmap.c:595
+#: locale/programs/charmap.c:661 locale/programs/repertoire.c:273
 msgid "no symbolic name given for end of range"
 msgstr "¹üÀ§ÀÇ ³¡±îÁö ±âÈ£ À̸§ÀÌ ¾ø½À´Ï´Ù"
 
@@ -3664,7 +4083,7 @@ msgstr "¹üÀ§ÀÇ ³¡±îÁö ±âÈ£ À̸§ÀÌ ¾ø½À´Ï´Ù"
 msgid "no weight defined for symbol `%s'"
 msgstr "`%s' ±âÈ£¿¡ ´ëÇØ Áß¿äµµ°¡ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: inet/rcmd.c:309
+#: inet/rcmd.c:317
 msgid "not regular file"
 msgstr "ÀÏ¹Ý ÆÄÀÏÀÌ ¾Æ´Ô"
 
@@ -3683,7 +4102,7 @@ msgstr ""
 msgid "nscd not running!\n"
 msgstr "nscd°¡ ½ÇÇàµÇÁö ¾Ê¾Ò½À´Ï´Ù!\n"
 
-#: locale/programs/charmap.c:514
+#: locale/programs/charmap.c:513
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "CHARMAP Á¤ÀÇ ¹Ù·Î ´ÙÀ½¿¡´Â WIDTH Á¤ÀǸ¸ÀÌ °¡´ÉÇÕ´Ï´Ù"
 
@@ -3699,7 +4118,7 @@ msgstr "Ãâ·Â ÆÄÀÏ"
 msgid "pmap_getmaps rpc problem"
 msgstr "pmap_genmaps rcp ¹®Á¦"
 
-#: inet/rcmd.c:179
+#: inet/rcmd.c:186
 msgid "poll: protocol failure in circuit setup\n"
 msgstr "poll: ȸ·Î ¼³Á¤Áß ±Ô¾àÀÌ ºÒÀÌÇàµÊ\n"
 
@@ -3707,7 +4126,7 @@ msgstr "poll: ȸ·Î ¼³Á¤Áß ±Ô¾àÀÌ ºÒÀÌÇàµÊ\n"
 msgid "preprocessor error"
 msgstr "Àü󸮱⠿À·ù"
 
-#: elf/sprof.c:78
+#: elf/sprof.c:74
 msgid "print list of count paths and their number of use"
 msgstr "´Ü°èÀÇ ¸ñ·Ï°ú ±× °¢ ´Ü°èÀÇ »ç¿ë Ƚ¼ö¸¦ Ç¥½Ã"
 
@@ -3720,7 +4139,7 @@ msgstr "ÁøÇà Á¤º¸¸¦ Ç¥½Ã"
 msgid "problems while reading `%s'"
 msgstr "`%s'¸¦ Àд µ¿¾È ¹®Á¦°¡ ¹ß»ýÇßÀ½"
 
-#: elf/sprof.c:691
+#: elf/sprof.c:687
 #, c-format
 msgid "profiling data file `%s' does not match shared object `%s'"
 msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏ `%s'´Â µ¿Àû ¿ÀºêÁ§Æ®`%s'¿Í ¸ÂÁö ¾Ê½À´Ï´Ù"
@@ -3742,16 +4161,16 @@ msgstr "ÇÁ·Î±×·¥ %lu ¹öÀü %lu´Â »ç¿ë ºÒ°¡´ÉÇÕ´Ï´Ù\n"
 msgid "program %lu version %lu ready and waiting\n"
 msgstr "ÇÁ·Î±×·¥ %lu ¹öÀü %lu´Â ÁغñµÇ¾î ±â´Ù¸®°í ÀÖ½À´Ï´Ù\n"
 
-#: inet/rcmd.c:176
+#: inet/rcmd.c:183
 #, c-format
 msgid "rcmd: poll (setting up stderr): %m\n"
 msgstr "rcmd: poll (Ç¥ÁØ¿À·ù ¼³Á¤): %m\n"
 
-#: inet/rcmd.c:110
+#: inet/rcmd.c:117
 msgid "rcmd: socket: All ports in use\n"
 msgstr "rcmd: socket: ¸ðµç Æ÷Æ®°¡ »ç¿ëÁß\n"
 
-#: inet/rcmd.c:166
+#: inet/rcmd.c:173
 #, c-format
 msgid "rcmd: write (setting up stderr): %m\n"
 msgstr "rcmd: write (Ç¥ÁØ¿À·ù ¼³Á¤): %m\n"
@@ -3760,20 +4179,20 @@ msgstr "rcmd: write (Ç¥ÁØ¿À·ù ¼³Á¤): %m\n"
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: timezone/zic.c:1849
+#: timezone/zic.c:1875
 msgid "repeated leap second moment"
 msgstr "À±ÃÊÀÇ Å©±â°¡ Áߺ¹µÇ¾úÀ½"
 
-#: locale/programs/repertoire.c:95
+#: locale/programs/repertoire.c:107
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "·¹ÆÄÅ丮 Áöµµ ÆÄÀÏ `%s'¸¦ ãÁö ¸øÇßÀ½"
 
-#: sunrpc/rpc_main.c:1117
+#: sunrpc/rpc_main.c:1115
 msgid "rpcgen: arglist coding error\n"
 msgstr "rcpgen: arglist ÄÚµù ¿À·ù\n"
 
-#: sunrpc/rpc_main.c:1105
+#: sunrpc/rpc_main.c:1103
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: ³Ê¹« ¸¹Àº Á¤ÀÇ\n"
 
@@ -3801,38 +4220,38 @@ msgstr "rpcinfo: ºê·Îµåij½ºÆ® ½ÇÆÐÇÔ: %s\n"
 msgid "rpcinfo: can't contact portmapper"
 msgstr "rpcinfo: Æ÷Æ®¸ÅÆÛ¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:718 timezone/zic.c:720
+#: timezone/zic.c:744 timezone/zic.c:746
 msgid "same rule name in multiple files"
 msgstr "¿©·¯ ÆÄÀÏ¿¡ °°Àº À̸§ÀÇ ±ÔÄ¢ÀÌ ÀÖÀ½"
 
-#: nscd/connections.c:387
+#: nscd/connections.c:472
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "¿äûÇÑ Å°¸¦ ´Ù ÀÐÁö ¸øÇßÀ½: %s"
 
-#: nscd/connections.c:364
+#: nscd/connections.c:430
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "¿ä±¸»çÇ×À» ´Ù ÀÐÁö ¸øÇßÀ½: %s"
 
-#: nscd/grpcache.c:191 nscd/hstcache.c:278 nscd/pwdcache.c:188
+#: nscd/grpcache.c:191 nscd/hstcache.c:270 nscd/pwdcache.c:189
 #, c-format
 msgid "short write in %s: %s"
 msgstr "%s¸¦ ´Ù ¾²Áö ¸øÇßÀ½: %s"
 
-#: inet/rcmd.c:197
+#: inet/rcmd.c:204
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket: ȸ·Î ¼³Á¤Áß ±Ô¾àÀÌ ºÒÀÌÇàµÊ\n"
 
-#: locale/programs/locfile.c:730
+#: locale/programs/locfile.c:736
 msgid "sorting order `forward' and `backward' are mutually exclusive"
 msgstr "Á¤·Ä ¼ø¼­ `forward'¿Í `backward'´Â ¼­·Î ¹èŸÀûÀÔ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1582 locale/programs/ld-collate.c:1628
+#: locale/programs/ld-collate.c:1586 locale/programs/ld-collate.c:1632
 msgid "specification of sorting weight for collation symbol does not make sense"
 msgstr "»çÀü¼ø¼­ ±âÈ£¿¡ ´ëÇØ Á¤·Ä Áß¿äµµ¸¦ ÁöÁ¤Çصµ ¾Æ¹« Àǹ̰¡ ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:789
+#: timezone/zic.c:815
 msgid "standard input"
 msgstr "Ç¥ÁØ ÀÔ·Â"
 
@@ -3845,15 +4264,15 @@ msgstr "Ç¥ÁØ Ãâ·Â"
 msgid "starting date is illegal in string %d in `era' field in category `%s'"
 msgstr "½ÃÀÛÇÏ´Â ³¯Â¥°¡ ¹üÁÖ `%2$s'ÀÇ `era' Çʵ忡 ÀÖ´Â ¹®ÀÚ¿­ %1$d¿¡¼­ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: timezone/zic.c:1300
+#: timezone/zic.c:1326
 msgid "starting year greater than ending year"
 msgstr "½ÃÀÛÇÏ´Â ÇØ°¡ ³¡³ª´Â Çغ¸´Ù Å®´Ï´Ù"
 
-#: timezone/zic.c:1272 timezone/zic.c:1297
+#: timezone/zic.c:1298 timezone/zic.c:1323
 msgid "starting year too high to be represented"
 msgstr "½ÃÀÛ ¿¬µµ°¡ ³Ê¹« ³ôÀº ¼ö¶ó¼­ Ç¥½ÃÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:1270 timezone/zic.c:1295
+#: timezone/zic.c:1296 timezone/zic.c:1321
 msgid "starting year too low to be represented"
 msgstr "½ÃÀÛ ¿¬µµ°¡ ³Ê¹« ³·Àº ¼ö¶ó¼­ Ç¥½ÃÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -3910,104 +4329,99 @@ msgstr "svcudp_create: ¼ÒÄÏ »ý¼º ¹®Á¦"
 msgid "svcunix_create: out of memory\n"
 msgstr "svcunix_create: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: locale/programs/ld-collate.c:1201
+#: locale/programs/ld-collate.c:1077 locale/programs/ld-collate.c:1205
 #, c-format
 msgid "symbol for multicharacter collating element `%.*s' duplicates element definition"
 msgstr "¿©·¯ ¹®ÀÚ·Î µÈ »çÀü¼ø¼­ ¿ä¼Ò `%.*s'ÀÇ ±âÈ£´Â ¿ä¼Ò Á¤ÀÇ°¡ Áߺ¹µË´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1073
-#, c-format
-msgid "symbol for multicharacter collating element `%.*s' duplicates other element definition"
-msgstr "¿©·¯ ¹®ÀÚ·Î µÈ »çÀü¼ø¼­ ¿ä¼Ò `%.*s'ÀÇ ±âÈ£´Â ´Ù¸¥ ¿ä¼Ò Á¤ÀÇ¿Í Áߺ¹µË´Ï´Ù"
-
-#: locale/programs/ld-collate.c:1210
+#: locale/programs/ld-collate.c:1214
 #, c-format
 msgid "symbol for multicharacter collating element `%.*s' duplicates other symbol definition"
 msgstr "¿©·¯ ¹®ÀÚ·Î µÈ »çÀü¼ø¼­ ¿ä¼Ò `%.*s'ÀÇ ±âÈ£´Â ´Ù¸¥ ½Éº¼ Á¤ÀÇ¿Í Áߺ¹µË´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1082
+#: locale/programs/ld-collate.c:1086
 #, c-format
 msgid "symbol for multicharacter collating element `%.*s' duplicates symbol definition"
 msgstr "¿©·¯ ¹®ÀÚ·Î µÈ »çÀü¼ø¼­ ¿ä¼Ò `%.*s'ÀÇ ±âÈ£´Â ½Éº¼ Á¤ÀÇ°¡ Áߺ¹µË´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1064 locale/programs/ld-collate.c:1192
+#: locale/programs/ld-collate.c:1068 locale/programs/ld-collate.c:1196
 #, c-format
 msgid "symbol for multicharacter collating element `%.*s' duplicates symbolic name in charset"
 msgstr "¿©·¯ ¹®ÀÚ·Î µÈ »çÀü¼ø¼­ ¿ä¼Ò `%.*s'ÀÇ ±âÈ£´Â ¹®ÀÚ¼ÂÀÇ ±âÈ£¿Í Áߺ¹µË´Ï´Ù"
 
 #: locale/programs/charmap.c:399 locale/programs/charmap.c:433
-#: locale/programs/charmap.c:463 locale/programs/charmap.c:549
-#: locale/programs/charmap.c:595 locale/programs/charmap.c:628
-#: locale/programs/charmap.c:660
+#: locale/programs/charmap.c:462 locale/programs/charmap.c:548
+#: locale/programs/charmap.c:594 locale/programs/charmap.c:627
+#: locale/programs/charmap.c:659
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "%s Á¤ÀǺο¡ ¹®¹ý ¿À·ù ÀÖÀ½: %s"
 
-#: locale/programs/locfile.c:750
+#: locale/programs/locfile.c:756
 msgid "syntax error in `order_start' directive"
 msgstr "`order_start' Áö½ÃÀÚ¿¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:492
+#: locale/programs/locfile.c:498
 msgid "syntax error in character class definition"
 msgstr "¹®ÀÚ Å¬·¡½º Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:550
+#: locale/programs/locfile.c:556
 msgid "syntax error in character conversion definition"
 msgstr "¹®ÀÚ º¯È¯ Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:792
+#: locale/programs/locfile.c:798
 msgid "syntax error in collating order definition"
 msgstr "»çÀü ¼ø¼­ Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù"
 
-#: locale/programs/locfile.c:642
+#: locale/programs/locfile.c:648
 msgid "syntax error in collation definition"
 msgstr "»çÀü ¼ø¼­ Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù"
 
-#: locale/programs/locfile.c:465
+#: locale/programs/locfile.c:471
 msgid "syntax error in definition of LC_CTYPE category"
 msgstr "LC_CTYPE ¹üÁÖÀÇ Á¤ÀǺο¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:408
+#: locale/programs/locfile.c:414
 msgid "syntax error in definition of new character class"
 msgstr "»õ·Î¿î ¹®ÀÚ Å¬·¡½º Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù"
 
-#: locale/programs/locfile.c:418
+#: locale/programs/locfile.c:424
 msgid "syntax error in definition of new character map"
 msgstr "»õ·Î¿î ¹®ÀÚ Áöµµ Á¤ÀǺο¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:1003
+#: locale/programs/locfile.c:1009
 msgid "syntax error in message locale definition"
 msgstr "¸Þ½ÃÁö ·ÎÄÉÀÏ Á¤ÀǺο¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:914
+#: locale/programs/locfile.c:920
 msgid "syntax error in monetary locale definition"
 msgstr "È­Æó ·ÎÄÉÀÏ Á¤ÀǺο¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:941
+#: locale/programs/locfile.c:947
 msgid "syntax error in numeric locale definition"
 msgstr "¼ýÀÚ ·ÎÄÉÀÏ Á¤ÀǺο¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:852
+#: locale/programs/locfile.c:858
 msgid "syntax error in order specification"
 msgstr "¼ø¼­ ÁöÁ¤¿¡ µ¥ ¹®¹ý ¿À·ù"
 
 #: locale/programs/charmap.c:280 locale/programs/charmap.c:296
-#: locale/programs/repertoire.c:143
+#: locale/programs/repertoire.c:155
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "¸Ó¸´¸»¿¡ ¹®¹ý ¾Ö·¯: %s"
 
-#: locale/programs/repertoire.c:198 locale/programs/repertoire.c:237
-#: locale/programs/repertoire.c:260
+#: locale/programs/repertoire.c:210 locale/programs/repertoire.c:249
+#: locale/programs/repertoire.c:272
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr "·¹ÆÄÅ丮 Áöµµ Á¤ÀÇ¿¡ ¹®¹ý ¿À·ù: %s"
 
-#: locale/programs/locfile.c:979
+#: locale/programs/locfile.c:985
 msgid "syntax error in time locale definition"
 msgstr "½Ã°£ ·ÎÄÉÀÏ Á¤ÀǺο¡ ¹®¹ý ¿À·ù ÀÖÀ½"
 
-#: locale/programs/locfile.c:385
+#: locale/programs/locfile.c:391
 msgid "syntax error: not inside a locale definition section"
 msgstr "¹®¹ý ¾Ö·¯: ·ÎÄÉÀÏ Á¤ÀÇ ºÎºÐÀÌ ¾Æ´Õ´Ï´Ù"
 
@@ -4015,17 +4429,17 @@ msgstr "¹®¹ý ¾Ö·¯: ·ÎÄÉÀÏ Á¤ÀÇ ºÎºÐÀÌ ¾Æ´Õ´Ï´Ù"
 msgid "target encoding not specified using `-t'"
 msgstr "`-t'¸¦ »ç¿ëÇÑ Ãâ·Â ÀÎÄÚµù ÁöÁ¤ÀÌ ¾ø½À´Ï´Ù"
 
-#: catgets/gencat.c:390 catgets/gencat.c:526 catgets/gencat.c:553
+#: catgets/gencat.c:391 catgets/gencat.c:530 catgets/gencat.c:559
 msgid "this is the first definition"
 msgstr "ÀÌ°ÍÀº ù¹ø° Á¤ÀÇÀÔ´Ï´Ù"
 
-#: timezone/zic.c:1132
+#: timezone/zic.c:1158
 msgid "time before zero"
 msgstr "0 ÀÌÀüÀÇ ½Ã°£"
 
-#: timezone/zic.c:1140 timezone/zic.c:2015 timezone/zic.c:2034
+#: timezone/zic.c:1166 timezone/zic.c:2043 timezone/zic.c:2062
 msgid "time overflow"
-msgstr "½Ã°£ Èê·¯³Ñħ"
+msgstr "½Ã°£ Èê·¯ ³Ñħ"
 
 #: locale/programs/charmap.c:443
 msgid "too few bytes in character encoding"
@@ -4039,23 +4453,23 @@ msgstr "¹®ÀÚ ºÎȣȭ¿¡ ÇÊ¿äÇÑ ¹ÙÀÌÆ®°¡ ³Ê¹« ¸¹À½"
 msgid "too many character classes defined"
 msgstr "¹®ÀÚ Å¬·¡½º°¡ ³Ê¹« ¸¹ÀÌ Á¤ÀǵǾúÀ½"
 
-#: timezone/zic.c:1843
+#: timezone/zic.c:1869
 msgid "too many leap seconds"
 msgstr "À±ÃÊ°¡ ³Ê¹« ¸¹À½"
 
-#: timezone/zic.c:1815
+#: timezone/zic.c:1841
 msgid "too many local time types"
 msgstr "Áö¿ª½ÃÀÇ Á¾·ù°¡ ³Ê¹« ¸¹À½"
 
-#: timezone/zic.c:1769
+#: timezone/zic.c:1795
 msgid "too many transitions?!"
 msgstr "³Ê¹« ¸¹Àº ÀüÀÌ?!"
 
-#: locale/programs/ld-collate.c:1637
+#: locale/programs/ld-collate.c:1641
 msgid "too many weights"
 msgstr "³Ê¹« ¸¹Àº Áß¿äµµ"
 
-#: timezone/zic.c:2138
+#: timezone/zic.c:2166
 msgid "too many, or too long, time zone abbreviations"
 msgstr "³Ê¹« ¸¹°Å³ª ³Ê¹« ±ä ½Ã°£´ë ¾à¾î"
 
@@ -4068,15 +4482,15 @@ msgstr "ÆÄÀÏÀÇ ³¡¿¡ ¾µ¸ð¾ø´Â °ÍÀÌ ºÙ¾î ÀÖÀ½"
 msgid "trouble replying to prog %d\n"
 msgstr "ÇÁ·Î±×·¥ %d¿¡ ÀÀ´äÇÏ´Â µ¥ ¹®Á¦°¡ ÀÖÀ½\n"
 
-#: locale/programs/ld-collate.c:1393
+#: locale/programs/ld-collate.c:1397
 msgid "two lines in a row containing `...' are not allowed"
 msgstr "`...'°¡ µé¾î ÀÖ´Â Çà¿¡ µÎÁÙÀ» ¾µ ¼ö ¾ø½À´Ï´Ù"
 
-#: timezone/zic.c:1307
+#: timezone/zic.c:1333
 msgid "typed single year"
 msgstr "ÇÑ°³ÀÇ ¿¬µµ°¡ ŸÀÌÇÁµÇ¾ú½À´Ï´Ù"
 
-#: iconv/iconv_prog.c:406
+#: iconv/iconv_prog.c:434
 msgid "unable to allocate buffer for input"
 msgstr "ÀÔ·ÂÀ» À§ÇÑ ¹öÆÛ¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -4088,48 +4502,48 @@ msgstr "ÀÎÀÚ¸¦ ºñ¿ï ¼ö ¾ø½À´Ï´Ù"
 msgid "undefined"
 msgstr "Á¤ÀǵÇÁö ¾ÊÀ½"
 
-#: locale/programs/charmap.c:701 locale/programs/charmap.c:712
+#: locale/programs/charmap.c:700 locale/programs/charmap.c:711
 #, c-format
 msgid "unknown character `%s'"
 msgstr "¾Ë ¼ö ¾ø´Â ¹®ÀÚ `%s'"
 
 #: locale/programs/ld-messages.c:202 locale/programs/ld-messages.c:213
 #: locale/programs/ld-messages.c:224 locale/programs/ld-messages.c:235
-#: locale/programs/ld-time.c:718
+#: locale/programs/ld-time.c:700
 #, c-format
 msgid "unknown character in field `%s' of category `%s'"
 msgstr "`%2$s' ¹üÁÖÀÇ `%1$s' Çʵ忡 ¾Ë ¼ö ¾ø´Â ¹®ÀÚ°¡ ÀÖ½À´Ï´Ù"
 
-#: locale/programs/locfile.c:715
+#: locale/programs/locfile.c:721
 msgid "unknown collation directive"
 msgstr "¾Ë ¼ö ¾ø´Â »çÀü ¼ø¼­ Áö½Ã¹®"
 
-#: catgets/gencat.c:487
+#: catgets/gencat.c:488
 #, c-format
 msgid "unknown directive `%s': line ignored"
 msgstr "¾Ë ¼ö ¾ø´Â Áö½ÃÀÚ `%s': Çà ¹«½ÃµÊ"
 
-#: iconv/iconv_prog.c:353
+#: iconv/iconv_prog.c:381
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "¾Ë ¼ö ¾ø´Â iconv() ¿À·ù %d"
 
-#: catgets/gencat.c:466
+#: catgets/gencat.c:467
 #, c-format
 msgid "unknown set `%s'"
 msgstr "¾Ë ¼ö ¾ø´Â ¼³Á¤ `%s'"
 
-#: locale/programs/ld-collate.c:1377 locale/programs/ld-collate.c:1572
-#: locale/programs/ld-collate.c:1747
+#: locale/programs/ld-collate.c:1381 locale/programs/ld-collate.c:1576
+#: locale/programs/ld-collate.c:1751
 #, c-format
 msgid "unknown symbol `%.*s': line ignored"
 msgstr "¾Ë ¼ö ¾ø´Â ±âÈ£ `%.*s': Çà ¹«½ÃµÊ"
 
-#: timezone/zic.c:761
+#: timezone/zic.c:787
 msgid "unruly zone"
 msgstr "±ÔÄ¢¾ø´Â Áö¿ª"
 
-#: catgets/gencat.c:971
+#: catgets/gencat.c:977
 msgid "unterminated message"
 msgstr "Á¾·áµÇÁö ¾ÊÀº ¸Þ½ÃÁö"
 
@@ -4145,7 +4559,7 @@ msgstr "Á¾·áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
 msgid "unterminated symbolic name"
 msgstr "Á¾·áµÇÁö ¾ÊÀº ±âÈ£ À̸§"
 
-#: locale/programs/ld-collate.c:1699
+#: locale/programs/ld-collate.c:1703
 msgid "unterminated weight name"
 msgstr "Á¾·áµÇÁö ¾ÊÀº weight À̸§"
 
@@ -4153,16 +4567,16 @@ msgstr "Á¾·áµÇÁö ¾ÊÀº weight À̸§"
 msgid "upper limit in range is not smaller then lower limit"
 msgstr "¹üÀ§ÀÇ »óÇÑÀº ÇÏÇѺ¸´Ù ÀÛÁö ¾Ê¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: sunrpc/rpc_main.c:1415
+#: sunrpc/rpc_main.c:1413
 #, c-format
-msgid "usage:  %s infile\n"
-msgstr "»ç¿ë¹ý:  %s ÀÔ·ÂÆÄÀÏ\n"
+msgid "usage: %s infile\n"
+msgstr "»ç¿ë¹ý: %s ÀÔ·ÂÆÄÀÏ\n"
 
-#: timezone/zic.c:2081
+#: timezone/zic.c:2109
 msgid "use of 2/29 in non leap-year"
 msgstr "Æò³â¿¡ 2¿ù 29ÀÏÀ» »ç¿ëÇÔ"
 
-#: locale/programs/charmap.c:522 locale/programs/charmap.c:576
+#: locale/programs/charmap.c:521 locale/programs/charmap.c:575
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s¿¡ ´ëÇÑ °ªÀº Á¤¼ö¿©¾ß ÇÕ´Ï´Ù"
@@ -4194,24 +4608,28 @@ msgstr "`LC_MONETARY' ¹üÁÖÀÇ `int_curr_symbol' ÇʵåÀÇ °ªÀÇ ±æÀÌ°¡ Ʋ·È½À´Ï´Ù"
 msgid "values for field `%s' in category `%s' must be smaller than 127"
 msgstr "`%s' ¹üÁÖÀÇ `%s' ÇʵåÀÇ °ªÀº 127º¸´Ù ÀÛ¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: nscd/connections.c:355
+#: timezone/zic.c:435
+msgid "warning: "
+msgstr "°æ°í: "
+
+#: nscd/connections.c:421
 #, c-format
 msgid "while accepting connection: %s"
 msgstr "¿¬°áÀ» ¹Þ¾ÆµéÀÌ´Â µµÁß: %s"
 
-#: nscd/grpcache.c:149 nscd/hstcache.c:168 nscd/pwdcache.c:142
+#: nscd/grpcache.c:149 nscd/hstcache.c:168 nscd/pwdcache.c:143
 msgid "while allocating cache entry"
 msgstr "ij½¬¿¡ ³ÖÀ» Ç׸ñÀ» ÇÒ´çÇÏ´Â µµÁß"
 
-#: nscd/cache.c:85
+#: nscd/cache.c:88
 msgid "while allocating hash table entry"
 msgstr "Çؽ¬ Å×ÀÌºí¿¡ entry¸¦ ÇÒ´çÇÏ´Â µ¿¾È"
 
-#: nscd/grpcache.c:99 nscd/hstcache.c:109 nscd/pwdcache.c:105
+#: nscd/grpcache.c:99 nscd/hstcache.c:111 nscd/pwdcache.c:106
 msgid "while allocating key copy"
 msgstr "Å° º¹»ç¸¦ ÇÒ´çÇÏ´Â µ¿¾È"
 
-#: catgets/gencat.c:1001
+#: catgets/gencat.c:1007
 msgid "while opening old catalog file"
 msgstr "¿À·¡µÈ ¸ñ·Ï ÆÄÀÏÀ» ¿©´Â µ¿¾È"
 
@@ -4223,7 +4641,7 @@ msgstr "Ãâ·ÂÀ» ÁغñÇÏ´Â µ¿¾È"
 msgid "while reading database"
 msgstr "µ¥ÀÌÅͺ£À̽º¸¦ Àд µ¿¾È"
 
-#: elf/sprof.c:683
+#: elf/sprof.c:679
 msgid "while stat'ing profiling data file"
 msgstr "ÇÁ·ÎÆÄÀϸµ µ¥ÀÌŸ ÆÄÀÏÀ» ¾²´Â µ¿¾È"
 
@@ -4235,31 +4653,31 @@ msgstr "µ¥ÀÌÅÍ º£À̽º ÆÄÀÏÀ» ¾²´Â µ¿¾È"
 msgid "write incomplete"
 msgstr "¿ÏÀüÈ÷ ¾²Áö ¸øÇß½À´Ï´Ù"
 
-#: inet/rcmd.c:320
+#: inet/rcmd.c:328
 msgid "writeable by other than owner"
 msgstr "¼ÒÀ¯ÀÚ°¡ ¾Æ´Ñ »ç¶÷ÀÌ º¯°æÇÒ ¼ö ÀÖÀ½"
 
-#: db2/makedb.c:124 nscd/nscd.c:114 nss/getent.c:392
+#: db2/makedb.c:124 nscd/nscd.c:120 nscd/nscd_nischeck.c:64 nss/getent.c:399
 msgid "wrong number of arguments"
 msgstr "ÀμöÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: timezone/zic.c:1090
+#: timezone/zic.c:1116
 msgid "wrong number of fields on Leap line"
 msgstr "Leap ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: timezone/zic.c:1181
+#: timezone/zic.c:1207
 msgid "wrong number of fields on Link line"
 msgstr "Link ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: timezone/zic.c:924
+#: timezone/zic.c:950
 msgid "wrong number of fields on Rule line"
 msgstr "Rule ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: timezone/zic.c:994
+#: timezone/zic.c:1020
 msgid "wrong number of fields on Zone continuation line"
 msgstr "Zone continuation ÁÙ¿¡ ÇʵåÀÇ °³¼ö°¡ À߸øµÇ¾úÀ½"
 
-#: timezone/zic.c:952
+#: timezone/zic.c:978
 msgid "wrong number of fields on Zone line"
 msgstr "Zone ÁÙ¿¡ ÇʵåÀÇ °¹¼ö°¡ À߸øµÇ¾úÀ½"
 
@@ -4267,14 +4685,14 @@ msgstr "Zone ÁÙ¿¡ ÇʵåÀÇ °¹¼ö°¡ À߸øµÇ¾úÀ½"
 msgid "xdr_reference: out of memory\n"
 msgstr "xdr_reference: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: sunrpc/xdr_rec.c:151 sunrpc/xdr_rec.c:166
+#: sunrpc/xdr_rec.c:150 sunrpc/xdr_rec.c:165
 msgid "xdrrec_create: out of memory\n"
 msgstr "xdrrec_create: ¸Þ¸ð¸® ºÎÁ·\n"
 
-#: nis/ypclnt.c:884
+#: nis/ypclnt.c:894
 msgid "yp_update: cannot convert host to netname\n"
 msgstr "yp_update: È£½ºÆ®¸¦ ³×Æ®À̸§À¸·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù\n"
 
-#: nis/ypclnt.c:896
+#: nis/ypclnt.c:906
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: ¼­¹ö ÁÖ¼Ò¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n"
diff --git a/posix/sys/types.h b/posix/sys/types.h
index 28f3a74c01..bf07f73ee1 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,99,2000 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
@@ -97,8 +97,9 @@ typedef __pid_t pid_t;
 # define __pid_t_defined
 #endif
 
-#if defined __USE_SVID || defined __USE_XOPEN
+#if (defined __USE_SVID || defined __USE_XOPEN) && !defined __id_t_defined
 typedef __id_t id_t;
+# define __id_t_defined
 #endif
 
 #ifndef __ssize_t_defined
@@ -127,7 +128,10 @@ typedef __key_t key_t;
 typedef __useconds_t useconds_t;
 #  define __useconds_t_defined
 # endif
+# ifndef __suseconds_t_defined
 typedef __suseconds_t suseconds_t;
+#  define __suseconds_t_defined
+# endif
 #endif
 
 #define	__need_size_t
@@ -218,15 +222,27 @@ typedef __blksize_t blksize_t;
 typedef __blkcnt_t blkcnt_t;	 /* Type to count number of disk blocks.  */
 #  define __blkcnt_t_defined
 # endif
+# ifndef __fsblkcnt_t_defined
 typedef __fsblkcnt_t fsblkcnt_t; /* Type to count file system blocks.  */
+#  define __fsblkcnt_t_defined
+# endif
+# ifndef __fsfilcnt_t_defined
 typedef __fsfilcnt_t fsfilcnt_t; /* Type to count file system inodes.  */
+#  define __fsfilcnt_t_defined
+# endif
 #else
 # ifndef __blkcnt_t_defined
 typedef __blkcnt64_t blkcnt_t;	   /* Type to count number of disk blocks.  */
 #  define __blkcnt_t_defined
 # endif
+# ifndef __fsblkcnt_t_defined
 typedef __fsblkcnt64_t fsblkcnt_t; /* Type to count file system blocks.  */
+#  define __fsblkcnt_t_defined
+# endif
+# ifndef __fsfilcnt_t_defined
 typedef __fsfilcnt64_t fsfilcnt_t; /* Type to count file system inodes.  */
+#  define __fsfilcnt_t_defined
+# endif
 #endif
 
 #ifdef __USE_LARGEFILE64
diff --git a/posix/unistd.h b/posix/unistd.h
index a36868caae..e9697c7592 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -864,15 +864,12 @@ extern int getdtablesize (void) __THROW;
    Returns zero on success and -1 for errors (with errno set).  */
 extern int brk (void *__addr) __THROW;
 
-# define __need_ptrdiff_t
-# include <stddef.h>
-
 /* Increase or decrease the end of accessible data space by DELTA bytes.
    If successful, returns the address the previous end of data space
    (i.e. the beginning of the new space, if DELTA > 0);
    returns (void *) -1 for errors (with errno set).  */
-extern void *__sbrk (ptrdiff_t __delta) __THROW;
-extern void *sbrk (ptrdiff_t __delta) __THROW;
+extern void *__sbrk (intptr_t __delta) __THROW;
+extern void *sbrk (intptr_t __delta) __THROW;
 #endif
 
 
diff --git a/resource/sys/resource.h b/resource/sys/resource.h
index 9eca1677d7..f575d1dc0a 100644
--- a/resource/sys/resource.h
+++ b/resource/sys/resource.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 94, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 94, 96, 97, 98, 99, 2000 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
@@ -24,16 +24,35 @@
 /* Get the system-dependent definitions of structures and bit values.  */
 #include <bits/resource.h>
 
+#ifndef __id_t_defined
+typedef __id_t id_t;
+# define __id_t_defined
+#endif
+
 __BEGIN_DECLS
 
+/* The X/Open standard defines that all the functions below must use
+   `int' as the type for the first argument.  When we are compiling with
+   GNU extensions we change this slightly to provide better error
+   checking.  */
+#ifdef __USE_GNU
+typedef enum __rlimit_resource __rlimit_resource_t;
+typedef enum __rusage_who __rusage_who_t;
+typedef enum __priority_which __priority_which_t;
+#else
+typedef int __rlimit_resource_t;
+typedef int __rusage_who_t;
+typedef int __priority_which_t;
+#endif
+
 /* Put the soft and hard limits for RESOURCE in *RLIMITS.
    Returns 0 if successful, -1 if not (and sets errno).  */
 #ifndef __USE_FILE_OFFSET64
-extern int getrlimit (enum __rlimit_resource __resource,
+extern int getrlimit (__rlimit_resource_t __resource,
 		      struct rlimit *__rlimits) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (getrlimit, (enum __rlimit_resource __resource,
+extern int __REDIRECT (getrlimit, (__rlimit_resource_t __resource,
 				   struct rlimit *__rlimits) __THROW,
 		       getrlimit64);
 # else
@@ -41,7 +60,7 @@ extern int __REDIRECT (getrlimit, (enum __rlimit_resource __resource,
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int getrlimit64 (enum __rlimit_resource __resource,
+extern int getrlimit64 (__rlimit_resource_t __resource,
 			struct rlimit64 *__rlimits) __THROW;
 #endif
 
@@ -49,11 +68,11 @@ extern int getrlimit64 (enum __rlimit_resource __resource,
    Only the super-user can increase hard limits.
    Return 0 if successful, -1 if not (and sets errno).  */
 #ifndef __USE_FILE_OFFSET64
-extern int setrlimit (enum __rlimit_resource __resource,
+extern int setrlimit (__rlimit_resource_t __resource,
 		      __const struct rlimit *__rlimits) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (setrlimit, (enum __rlimit_resource __resource,
+extern int __REDIRECT (setrlimit, (__rlimit_resource_t __resource,
 				   __const struct rlimit *__rlimits) __THROW,
 		       setrlimit64);
 # else
@@ -61,23 +80,23 @@ extern int __REDIRECT (setrlimit, (enum __rlimit_resource __resource,
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int setrlimit64 (enum __rlimit_resource __resource,
+extern int setrlimit64 (__rlimit_resource_t __resource,
 			__const struct rlimit64 *__rlimits) __THROW;
 #endif
 
 /* Return resource usage information on process indicated by WHO
    and put it in *USAGE.  Returns 0 for success, -1 for failure.  */
-extern int getrusage (enum __rusage_who __who, struct rusage *__usage) __THROW;
+extern int getrusage (__rusage_who_t __who, struct rusage *__usage) __THROW;
 
 /* Return the highest priority of any process specified by WHICH and WHO
    (see above); if WHO is zero, the current process, process group, or user
    (as specified by WHO) is used.  A lower priority number means higher
    priority.  Priorities range from PRIO_MIN to PRIO_MAX (above).  */
-extern int getpriority (enum __priority_which __which, int __who) __THROW;
+extern int getpriority (__priority_which_t __which, id_t __who) __THROW;
 
 /* Set the priority of all processes specified by WHICH and WHO (see above)
    to PRIO.  Returns 0 on success, -1 on errors.  */
-extern int setpriority (enum __priority_which __which, int __who, int __prio)
+extern int setpriority (__priority_which_t __which, id_t __who, int __prio)
      __THROW;
 
 __END_DECLS
diff --git a/sysdeps/generic/bits/libc-lock.h b/sysdeps/generic/bits/libc-lock.h
index 84f9cd4653..4613310d39 100644
--- a/sysdeps/generic/bits/libc-lock.h
+++ b/sysdeps/generic/bits/libc-lock.h
@@ -1,5 +1,5 @@
 /* libc-internal interface for mutex locks.  Stub version.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000 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
@@ -29,9 +29,11 @@
    begins with a `*'), because its storage size will not be known outside
    of libc.  */
 #define __libc_lock_define(CLASS,NAME)
+#define __libc_rwlock_define(CLASS,NAME)
 
 /* Define an initialized lock variable NAME with storage class CLASS.  */
 #define __libc_lock_define_initialized(CLASS,NAME)
+#define __libc_rwlock_define_initialized(CLASS,NAME)
 
 /* Define an initialized recursive lock variable NAME with storage
    class CLASS.  */
@@ -40,6 +42,7 @@
 /* Initialize the named lock variable, leaving it in a consistent, unlocked
    state.  */
 #define __libc_lock_init(NAME)
+#define __libc_rwlock_init(NAME)
 
 /* Same as last but this time we initialize a recursive mutex.  */
 #define __libc_lock_init_recursive(NAME)
@@ -48,24 +51,30 @@
    used again until __libc_lock_init is called again on it.  This must be
    called on a lock variable before the containing storage is reused.  */
 #define __libc_lock_fini(NAME)
+#define __libc_rwlock_fini(NAME)
 
 /* Finalize recursive named lock.  */
 #define __libc_lock_fini_recursive(NAME)
 
 /* Lock the named lock variable.  */
 #define __libc_lock_lock(NAME)
+#define __libc_rwlock_rdlock(NAME)
+#define __libc_rwlock_wrlock(NAME)
 
 /* Lock the recursive named lock variable.  */
 #define __libc_lock_lock_recursive(NAME)
 
 /* Try to lock the named lock variable.  */
 #define __libc_lock_trylock(NAME) 0
+#define __libc_rwlock_tryrdlock(NAME) 0
+#define __libc_rwlock_trywrlock(NAME) 0
 
 /* Try to lock the recursive named lock variable.  */
 #define __libc_lock_trylock_recursive(NAME) 0
 
 /* Unlock the named lock variable.  */
 #define __libc_lock_unlock(NAME)
+#define __libc_rwlock_unlock(NAME)
 
 /* Unlock the recursive named lock variable.  */
 #define __libc_lock_unlock_recursive(NAME)
diff --git a/sysdeps/generic/bits/shm.h b/sysdeps/generic/bits/shm.h
index 8c97999626..e230f81061 100644
--- a/sysdeps/generic/bits/shm.h
+++ b/sysdeps/generic/bits/shm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 2000 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
@@ -20,7 +20,7 @@
 # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
 #endif
 
-#include <sys/types.h>
+#include <bits/types.h>
 
 /* Flags for `shmat'.  */
 #define SHM_RDONLY	010000		/* attach read-only else read-write */
@@ -32,6 +32,9 @@
 #define SHM_UNLOCK	12		/* unlock segment (root only) */
 
 
+/* Type to count number of attaches.  */
+typedef unsigned short int shmatt_t;
+
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
   {
@@ -42,5 +45,5 @@ struct shmid_ds
     __time_t sem_ctime;			/* time of last change by shmctl() */
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
-    unsigned short int shm_nattch;	/* number of current attaches */
+    shmatt_t shm_nattch;		/* number of current attaches */
   };
diff --git a/sysdeps/generic/getpriority.c b/sysdeps/generic/getpriority.c
index ce9eb59f0d..e92303bfd4 100644
--- a/sysdeps/generic/getpriority.c
+++ b/sysdeps/generic/getpriority.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2000 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
@@ -26,7 +26,7 @@
 int
 getpriority (which, who)
      enum __priority_which which;
-     int who;
+     id_t who;
 {
   __set_errno (ENOSYS);
   return -1;
diff --git a/sysdeps/generic/sbrk.c b/sysdeps/generic/sbrk.c
index 4df883b59e..8710a9eb87 100644
--- a/sysdeps/generic/sbrk.c
+++ b/sysdeps/generic/sbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2000 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
@@ -29,7 +29,7 @@ extern int __libc_multiple_libcs;	/* Defined in init-first.c.  */
    If INCREMENT is negative, shrink data space by - INCREMENT.
    Return start of new space allocated, or -1 for errors.  */
 void *
-__sbrk (ptrdiff_t increment)
+__sbrk (intptr_t increment)
 {
   void *oldbrk;
 
diff --git a/sysdeps/generic/setpriority.c b/sysdeps/generic/setpriority.c
index 997bea82a6..04158c6b76 100644
--- a/sysdeps/generic/setpriority.c
+++ b/sysdeps/generic/setpriority.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2000 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
@@ -24,7 +24,7 @@
 int
 setpriority (which, who, prio)
      enum __priority_which which;
-     int who;
+     id_t who;
      int prio;
 {
   __set_errno (ENOSYS);
diff --git a/sysdeps/generic/utimes.c b/sysdeps/generic/utimes.c
index 438673bf17..4d293398f5 100644
--- a/sysdeps/generic/utimes.c
+++ b/sysdeps/generic/utimes.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2000 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
@@ -25,7 +25,7 @@
 int
 __utimes (file, tvp)
      const char *file;
-     struct timeval tvp[2];
+     const struct timeval tvp[2];
 {
   if (file == NULL || tvp == NULL)
     {
diff --git a/sysdeps/gnu/bits/sem.h b/sysdeps/gnu/bits/sem.h
index 3d113a74f6..096254d446 100644
--- a/sysdeps/gnu/bits/sem.h
+++ b/sysdeps/gnu/bits/sem.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 2000 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
@@ -42,9 +42,9 @@ struct semid_ds
   __time_t sem_otime;			/* last semop() time */
   __time_t sem_ctime;			/* last time changed by semctl() */
   struct sem *__sembase;		/* ptr to first semaphore in array */
-  struct sem_queue *__sem_pending;	/* pending operations */
-  struct sem_queue *__sem_pending_last; /* last pending operation */
-  struct sem_undo *__undo;		/* ondo requests on this array */
+  struct __sem_queue *__sem_pending;	/* pending operations */
+  struct __sem_queue *__sem_pending_last;/* last pending operation */
+  struct __sem_undo *__undo;		/* ondo requests on this array */
   unsigned short int sem_nsems;		/* number of semaphores in set */
 };
 
diff --git a/sysdeps/gnu/bits/shm.h b/sysdeps/gnu/bits/shm.h
index c7070595b8..81116f4dca 100644
--- a/sysdeps/gnu/bits/shm.h
+++ b/sysdeps/gnu/bits/shm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 2000 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
@@ -20,7 +20,7 @@
 # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
 #endif
 
-#include <sys/types.h>
+#include <bits/types.h>
 
 /* Permission flag for shmget.  */
 #define SHM_R		0400		/* or S_IRUGO from <linux/stat.h> */
@@ -36,6 +36,9 @@
 #define SHM_UNLOCK	12		/* unlock segment (root only) */
 
 
+/* Type to count number of attaches.  */
+typedef unsigned short int shmatt_t;
+
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
   {
@@ -46,7 +49,7 @@ struct shmid_ds
     __time_t shm_ctime;			/* time of last change by shmctl() */
     __ipc_pid_t shm_cpid;		/* pid of creator */
     __ipc_pid_t shm_lpid;		/* pid of last shmop */
-    unsigned short int shm_nattch;	/* number of current attaches */
+    shmatt_t shm_nattch;		/* number of current attaches */
     unsigned short int __shm_npages;	/* size of segment (pages) */
     unsigned long int *__shm_pages;	/* array of ptrs to frames -> SHMMAX */
     struct vm_area_struct *__attaches;	/* descriptors for attaches */
diff --git a/sysdeps/mach/hurd/getpriority.c b/sysdeps/mach/hurd/getpriority.c
index 49cc38ec91..99e9fdbe2e 100644
--- a/sysdeps/mach/hurd/getpriority.c
+++ b/sysdeps/mach/hurd/getpriority.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1996, 1997, 2000 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
@@ -25,7 +25,7 @@
    or user (as specified by WHO) is used.  A lower priority number means higher
    priority.  Priorities range from PRIO_MIN to PRIO_MAX.  */
 int
-getpriority (enum __priority_which which, int who)
+getpriority (enum __priority_which which, id_t who)
 {
   error_t err, onerr;
   int maxpri = INT_MIN;
diff --git a/sysdeps/mach/hurd/sbrk.c b/sysdeps/mach/hurd/sbrk.c
index ece9b50967..48a15d9ab0 100644
--- a/sysdeps/mach/hurd/sbrk.c
+++ b/sysdeps/mach/hurd/sbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 94, 95, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 94, 95, 97, 98, 2000 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
@@ -24,7 +24,7 @@
    If INCREMENT is negative, shrink data space by - INCREMENT.
    Return the address of the start of the new data space, or -1 for errors.  */
 void *
-__sbrk (int increment)
+__sbrk (intptr_t increment)
 {
   void *result;
 
diff --git a/sysdeps/mach/hurd/setpriority.c b/sysdeps/mach/hurd/setpriority.c
index 3da7f32385..d9951e55ac 100644
--- a/sysdeps/mach/hurd/setpriority.c
+++ b/sysdeps/mach/hurd/setpriority.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1997, 2000 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
@@ -22,7 +22,7 @@
 /* Set the priority of all processes specified by WHICH and WHO
    to PRIO.  Returns 0 on success, -1 on errors.  */
 int
-setpriority (enum __priority_which which, int who, int prio)
+setpriority (enum __priority_which which, id_t who, int prio)
 {
   error_t err;
   error_t pidloser, priloser;
diff --git a/sysdeps/mach/hurd/utimes.c b/sysdeps/mach/hurd/utimes.c
index aec7d5d2af..6f24e99080 100644
--- a/sysdeps/mach/hurd/utimes.c
+++ b/sysdeps/mach/hurd/utimes.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 97, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1995, 97, 99, 2000 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
@@ -26,7 +26,7 @@
 int
 __utimes (file, tvp)
      const char *file;
-     struct timeval tvp[2];
+     const struct timeval tvp[2];
 {
   struct timeval timevals[2];
   error_t err;
diff --git a/sysdeps/posix/utimes.c b/sysdeps/posix/utimes.c
index 2ef10b77eb..dfb236dee6 100644
--- a/sysdeps/posix/utimes.c
+++ b/sysdeps/posix/utimes.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 2000 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
@@ -24,7 +24,7 @@
 /* Change the access time of FILE to TVP[0] and
    the modification time of FILE to TVP[1].  */
 int
-__utimes (const char *file, struct timeval tvp[2])
+__utimes (const char *file, const struct timeval tvp[2])
 {
   struct utimbuf buf, *times;
 
diff --git a/sysdeps/unix/sysv/irix4/getpriority.c b/sysdeps/unix/sysv/irix4/getpriority.c
index 290573a65c..5203b42ac9 100644
--- a/sysdeps/unix/sysv/irix4/getpriority.c
+++ b/sysdeps/unix/sysv/irix4/getpriority.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1996, 1997, 2000 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
@@ -29,7 +29,7 @@ extern int __sysmp __P ((int, ...));
 int
 getpriority (which, who)
      enum __priority_which which;
-     int who;
+     id_t who;
 {
   switch (which)
     {
diff --git a/sysdeps/unix/sysv/irix4/setpriority.c b/sysdeps/unix/sysv/irix4/setpriority.c
index 5d6313ae1c..8e2c8ec943 100644
--- a/sysdeps/unix/sysv/irix4/setpriority.c
+++ b/sysdeps/unix/sysv/irix4/setpriority.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1996, 1997, 2000 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
@@ -23,7 +23,7 @@
 int
 setpriority (which, who, prio)
      enum __priority_which which;
-     int who;
+     id_t who;
      int prio;
 {
   switch (which)
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/shm.h b/sysdeps/unix/sysv/linux/alpha/bits/shm.h
index 683a9b6726..acd479de57 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/shm.h
@@ -20,7 +20,7 @@
 # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
 #endif
 
-#include <sys/types.h>
+#include <bits/types.h>
 
 /* Permission flag for shmget.  */
 #define SHM_R		0400		/* or S_IRUGO from <linux/stat.h> */
@@ -36,6 +36,9 @@
 #define SHM_UNLOCK	12		/* unlock segment (root only) */
 
 
+/* Type to count number of attaches.  */
+typedef unsigned long int shmatt_t;
+
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
   {
@@ -44,9 +47,9 @@ struct shmid_ds
     __time_t shm_atime;			/* time of last shmat() */
     __time_t shm_dtime;			/* time of last shmdt() */
     __time_t shm_ctime;			/* time of last change by shmctl() */
-    pid_t shm_cpid;			/* pid of creator */
-    pid_t shm_lpid;			/* pid of last shmop */
-    unsigned long int shm_nattch;	/* number of current attaches */
+    __pid_t shm_cpid;			/* pid of creator */
+    __pid_t shm_lpid;			/* pid of last shmop */
+    shmatt_t shm_nattch;		/* number of current attaches */
     unsigned long int __unused1;
     unsigned long int __unused2;
   };
diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h
index ca397e810f..8e4b8ac9e8 100644
--- a/sysdeps/unix/sysv/linux/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/bits/shm.h
@@ -20,7 +20,7 @@
 # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
 #endif
 
-#include <sys/types.h>
+#include <bits/types.h>
 
 /* Permission flag for shmget.  */
 #define SHM_R		0400		/* or S_IRUGO from <linux/stat.h> */
@@ -36,6 +36,9 @@
 #define SHM_UNLOCK	12		/* unlock segment (root only) */
 
 
+/* Type to count number of attaches.  */
+typedef unsigned long int shmatt_t;
+
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
   {
@@ -47,9 +50,9 @@ struct shmid_ds
     unsigned long int __unused2;
     __time_t shm_ctime;			/* time of last change by shmctl() */
     unsigned long int __unused3;
-    pid_t shm_cpid;			/* pid of creator */
-    pid_t shm_lpid;			/* pid of last shmop */
-    unsigned long int shm_nattch;	/* number of current attaches */
+    __pid_t shm_cpid;			/* pid of creator */
+    __pid_t shm_lpid;			/* pid of last shmop */
+    shmatt_t shm_nattch;		/* number of current attaches */
     unsigned long int __unused4;
     unsigned long int __unused5;
   };
diff --git a/sysdeps/unix/sysv/linux/bits/statvfs.h b/sysdeps/unix/sysv/linux/bits/statvfs.h
index fc63806848..c000e8a85a 100644
--- a/sysdeps/unix/sysv/linux/bits/statvfs.h
+++ b/sysdeps/unix/sysv/linux/bits/statvfs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2000 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
@@ -44,7 +44,7 @@ struct statvfs
     __fsid_t f_fsid;
     unsigned long int f_flag;
     unsigned long int f_namemax;
-    int f_spare[6];
+    int __f_spare[6];
   };
 
 #ifdef __USE_LARGEFILE64
@@ -61,7 +61,7 @@ struct statvfs64
     __fsid_t f_fsid;
     unsigned long int f_flag;
     unsigned long int f_namemax;
-    int f_spare[6];
+    int __f_spare[6];
   };
 #endif
 
@@ -73,22 +73,24 @@ enum
 #define ST_RDONLY	ST_RDONLY
   ST_NOSUID = 2,		/* Ignore suid and sgid bits.  */
 #define ST_NOSUID	ST_NOSUID
+#ifdef __USE_GNU
   ST_NODEV = 4,			/* Disallow access to device special files.  */
-#define ST_NODEV	ST_NODEV
+# define ST_NODEV	ST_NODEV
   ST_NOEXEC = 8,		/* Disallow program execution.  */
-#define ST_NOEXEC	ST_NOEXEC
+# define ST_NOEXEC	ST_NOEXEC
   ST_SYNCHRONOUS = 16,		/* Writes are synced at once.  */
-#define ST_SYNCHRONOUS	ST_SYNCHRONOUS
+# define ST_SYNCHRONOUS	ST_SYNCHRONOUS
   ST_MANDLOCK = 64,		/* Allow mandatory locks on an FS.  */
-#define ST_MANDLOCK	ST_MANDLOCK
+# define ST_MANDLOCK	ST_MANDLOCK
   ST_WRITE = 128,		/* Write on file/directory/symlink.  */
-#define ST_WRITE	ST_WRITE
+# define ST_WRITE	ST_WRITE
   ST_APPEND = 256,		/* Append-only file.  */
-#define ST_APPEND	ST_APPEND
+# define ST_APPEND	ST_APPEND
   ST_IMMUTABLE = 512,		/* Immutable file.  */
-#define ST_IMMUTABLE	ST_IMMUTABLE
+# define ST_IMMUTABLE	ST_IMMUTABLE
   ST_NOATIME = 1024,		/* Do not update access times.  */
-#define ST_NOATIME	ST_NOATIME
+# define ST_NOATIME	ST_NOATIME
   ST_NODIRATIME			/* Do not update directory access times.  */
-#define ST_NODIRATIME	ST_NODIRATIME
+# define ST_NODIRATIME	ST_NODIRATIME
+#endif	/* Use GNU.  */
 };
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 5cb5462950..9d17063761 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -62,7 +62,7 @@ fi
 # files.  I.e., when the installation prefix is "/usr" we have to place
 # shared library objects and the configuration files on the root partition
 # in /lib and /etc.
-if test "$prefix" = "/usr"; then
+if test "$prefix" = "/usr" -o "$prefix" = "/usr/"; then
   # 64bit libraries on sparc go to /lib64 and not /lib
   if test "$machine" = "sparc/sparc64"; then
     libc_cv_slibdir="/lib64"
diff --git a/sysdeps/unix/sysv/linux/fstatvfs64.c b/sysdeps/unix/sysv/linux/fstatvfs64.c
index 8ede56eec3..bc2165e3ee 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs64.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs64.c
@@ -1,5 +1,5 @@
 /* Return information about the filesystem on which FD resides.
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 2000 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
@@ -41,7 +41,7 @@ fstatvfs64 (int fd, struct statvfs64 *buf)
   buf->f_fsid = buf32.f_fsid;
   buf->f_flag = buf32.f_flag;
   buf->f_namemax = buf32.f_namemax;
-  memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
+  memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare));
 
   return 0;
 }
diff --git a/sysdeps/unix/sysv/linux/getpriority.c b/sysdeps/unix/sysv/linux/getpriority.c
index 9be8d3f70b..c420ff5ccf 100644
--- a/sysdeps/unix/sysv/linux/getpriority.c
+++ b/sysdeps/unix/sysv/linux/getpriority.c
@@ -1,5 +1,5 @@
 /* getpriority for Linux.
-   Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
 
    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
@@ -22,7 +22,7 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-extern int __syscall_getpriority (int, int);
+extern int __syscall_getpriority (int, id_t);
 
 /* The return value of __syscall_getpriority is biased by this value
    to avoid returning negative values.  */
@@ -34,7 +34,7 @@ extern int __syscall_getpriority (int, int);
    priority.  Priorities range from PRIO_MIN to PRIO_MAX.  */
 
 int
-getpriority (enum __priority_which which, int who)
+getpriority (enum __priority_which which, id_t who)
 {
   int res;
 
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 2ea380d5cd..a6aec7d0f4 100644
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -28,7 +28,7 @@
   buf->f_ffree = fsbuf.f_ffree;
   buf->f_fsid = fsbuf.f_fsid;
   buf->f_namemax = fsbuf.f_namelen;
-  memset (buf->f_spare, '\0', 6 * sizeof (int));
+  memset (buf->__f_spare, '\0', 6 * sizeof (int));
 
   /* What remains to do is to fill the fields f_favail and f_flag.  */
 
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm.h b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
index e43de59fe1..6dc6011da4 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
@@ -20,7 +20,7 @@
 # error "Never include <bits/shm.h> directly; use <sys/shm.h> instead."
 #endif
 
-#include <sys/types.h>
+#include <bits/types.h>
 #include <bits/wordsize.h>
 
 /* Permission flag for shmget.  */
@@ -37,6 +37,9 @@
 #define SHM_UNLOCK	12		/* unlock segment (root only) */
 
 
+/* Type to count number of attaches.  */
+typedef unsigned long int shmatt_t;
+
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
   {
@@ -54,9 +57,9 @@ struct shmid_ds
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
     size_t shm_segsz;			/* size of segment in bytes */
-    pid_t shm_cpid;			/* pid of creator */
-    pid_t shm_lpid;			/* pid of last shmop */
-    unsigned long int shm_nattch;	/* number of current attaches */
+    __pid_t shm_cpid;			/* pid of creator */
+    __pid_t shm_lpid;			/* pid of last shmop */
+    shmatt_t shm_nattch;		/* number of current attaches */
     unsigned long int __unused1;
     unsigned long int __unused2;
   };
diff --git a/sysdeps/unix/sysv/linux/statvfs64.c b/sysdeps/unix/sysv/linux/statvfs64.c
index d88bd5945b..9417b23247 100644
--- a/sysdeps/unix/sysv/linux/statvfs64.c
+++ b/sysdeps/unix/sysv/linux/statvfs64.c
@@ -1,5 +1,5 @@
 /* Return information about the filesystem on which FILE resides.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000 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
@@ -42,7 +42,7 @@ statvfs64 (const char *file, struct statvfs64 *buf)
   buf->f_fsid = buf32.f_fsid;
   buf->f_flag = buf32.f_flag;
   buf->f_namemax = buf32.f_namemax;
-  memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
+  memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare));
 
   return 0;
 }
diff --git a/sysvipc/sys/sem.h b/sysvipc/sys/sem.h
index 9657a14bfe..578a0a47a3 100644
--- a/sysvipc/sys/sem.h
+++ b/sysvipc/sys/sem.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000 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
@@ -36,7 +36,7 @@
 /* Structure used for argument to `semop' to describe operations.  */
 struct sembuf
 {
-  short int sem_num;		/* semaphore number */
+  unsigned short int sem_num;	/* semaphore number */
   short int sem_op;		/* semaphore operation */
   short int sem_flg;		/* operation flag */
 };
diff --git a/sysvipc/sys/shm.h b/sysvipc/sys/shm.h
index 4f30ad8f92..8622f82dca 100644
--- a/sysvipc/sys/shm.h
+++ b/sysvipc/sys/shm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000 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
@@ -30,6 +30,10 @@
 /* Get system dependent definition of `struct shmid_ds' and more.  */
 #include <bits/shm.h>
 
+/* Define types required by the standard.  */
+#define __need_time_t
+#include <time.h>
+
 
 /* Segment low boundary address multiple.  */
 #define SHMLBA		(__getpagesize ())
diff --git a/time/sys/time.h b/time/sys/time.h
index 92b21cdd7f..fe8648e763 100644
--- a/time/sys/time.h
+++ b/time/sys/time.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,96,97,98,99,2000 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
@@ -27,6 +27,11 @@
 #define __need_timeval
 #include <bits/time.h>
 
+#ifndef __suseconds_t_defined
+typedef __suseconds_t suseconds_t;
+# define __suseconds_t_defined
+#endif
+
 
 __BEGIN_DECLS
 
@@ -49,12 +54,18 @@ struct timezone
     int tz_dsttime;		/* Nonzero if DST is ever in effect.  */
   };
 
+#if defined __USE_GNU || defined __USE_BSD
+typedef struct timezone *__timezone_ptr_t;
+#else
+typedef void *__timezone_ptr_t;
+#endif
+
 /* Get the current time of day and timezone information,
    putting it into *TV and *TZ.  If TZ is NULL, *TZ is not filled.
    Returns 0 on success, -1 on errors.
    NOTE: This form of timezone information is obsolete.
    Use the functions and variables declared in <time.h> instead.  */
-extern int gettimeofday (struct timeval *__tv, struct timezone *__tz) __THROW;
+extern int gettimeofday (struct timeval *__tv, __timezone_ptr_t __tz) __THROW;
 
 /* Set the current time of day and timezone information.
    This call is restricted to the super-user.  */
@@ -94,21 +105,28 @@ struct itimerval
     struct timeval it_value;
   };
 
+#ifdef __USE_GNU
+typedef enum __itimer_which __itimer_which_t;
+#else
+typedef int __itimer_which_t;
+#endif
+
 /* Set *VALUE to the current setting of timer WHICH.
    Return 0 on success, -1 on errors.  */
-extern int getitimer (enum __itimer_which __which,
+extern int getitimer (__itimer_which_t __which,
 		      struct itimerval *__value) __THROW;
 
 /* Set the timer WHICH to *NEW.  If OLD is not NULL,
    set *OLD to the old value of timer WHICH.
    Returns 0 on success, -1 on errors.  */
-extern int setitimer (enum __itimer_which __which,
+extern int setitimer (__itimer_which_t __which,
 		      __const struct itimerval *__new,
 		      struct itimerval *__old) __THROW;
 
 /* Change the access time of FILE to TVP[0] and
    the modification time of FILE to TVP[1].  */
-extern int utimes (__const char *__file, struct timeval __tvp[2]) __THROW;
+extern int utimes (__const char *__file, __const struct timeval __tvp[2])
+     __THROW;
 
 
 /* Convenience macros for operations on timevals.