Update.

2001-08-19  Ulrich Drepper  <drepper@redhat.com>

	* sunrpc/svcauth_des.c (_svcauth_des): Avoid using bcopy.
	* sunrpc/xdr_rec.c: Likewise.
	* sunrpc/xdr_mem.c: Likewise.
	* sunrpc/svc_authux.c (_svcauth_unix): Likewise.
	* sunrpc/rpc_cmsg.c: Likewise.
	* sunrpc/getrpcport.c (getrpcport): Likewise.
	* sunrpc/clnt_simp.c (callrpc): Likewise.
	* sunrpc/clnt_gen.c (clnt_create): Likewise.
	* string/envz.c: Likewise.

	* po/ko.po: Update from translation team.

	* argp/argp-help.c: Handle wide oriented stderr stream.

	* conform/conformtest.pl: <inttypes.h> test requires <stddef.h>.

12 files changed, 950 insertions, 742 deletions

diff --git a/ChangeLog b/ChangeLog
index c8d5e9aa94..19aa87f32d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,25 @@
+2001-08-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* sunrpc/svcauth_des.c (_svcauth_des): Avoid using bcopy.
+	* sunrpc/xdr_rec.c: Likewise.
+	* sunrpc/xdr_mem.c: Likewise.
+	* sunrpc/svc_authux.c (_svcauth_unix): Likewise.
+	* sunrpc/rpc_cmsg.c: Likewise.
+	* sunrpc/getrpcport.c (getrpcport): Likewise.
+	* sunrpc/clnt_simp.c (callrpc): Likewise.
+	* sunrpc/clnt_gen.c (clnt_create): Likewise.
+	* string/envz.c: Likewise.
+
+	* po/ko.po: Update from translation team.
+
+	* argp/argp-help.c: Handle wide oriented stderr stream.
+
 2001-08-18  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/generic/strtol.c: Little optimizations.  Add some
 	__builtin_expect.
 
-	* conform/conformtest.pl: <inttypes.h> test required <stddef.h>.
+	* conform/conformtest.pl: <inttypes.h> test requires <stddef.h>.
 
 	* wcsmbs/wchar.h (wcwdith): Change parameter type to wchar_t.
 	* wcsmbs/wcwidth.c (wcwdith): Likewise.
diff --git a/argp/argp-help.c b/argp/argp-help.c
index 852992591e..de709dff8f 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -1,5 +1,5 @@
 /* Hierarchial argument parsing help output
-   Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -52,6 +52,9 @@ char *alloca ();
 #include <stdarg.h>
 #include <malloc.h>
 #include <ctype.h>
+#ifdef USE_IN_LIBIO
+# include <wchar.h>
+#endif
 
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.  */
@@ -1702,19 +1705,39 @@ __argp_error (const struct argp_state *state, const char *fmt, ...)
 
 	  __flockfile (stream);
 
-	  fputs_unlocked (state ? state->name : program_invocation_short_name,
-			  stream);
-	  putc_unlocked (':', stream);
-	  putc_unlocked (' ', stream);
-
 	  va_start (ap, fmt);
-	  vfprintf (stream, fmt, ap);
-	  va_end (ap);
 
-	  putc_unlocked ('\n', stream);
+#ifdef USE_IN_LIBIO
+	  if (_IO_fwide (stream, 0) > 0)
+	    {
+	      char *buf;
+
+	      asprintf (&buf, fmt, ap);
+
+	      fwprintf (stream, L"%s: %s\n",
+			state ? state->name : program_invocation_short_name,
+			buf);
+
+	      free (buf);
+	    }
+	  else
+#endif
+	    {
+	      fputs_unlocked (state
+			      ? state->name : program_invocation_short_name,
+			      stream);
+	      putc_unlocked (':', stream);
+	      putc_unlocked (' ', stream);
+
+	      vfprintf (stream, fmt, ap);
+
+	      putc_unlocked ('\n', stream);
+	    }
 
 	  __argp_state_help (state, stream, ARGP_HELP_STD_ERR);
 
+	  va_end (ap);
+
 	  __funlockfile (stream);
 	}
     }
@@ -1743,29 +1766,68 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
 	{
 	  __flockfile (stream);
 
-	  fputs_unlocked (state ? state->name : program_invocation_short_name,
-			  stream);
+#ifdef USE_IN_LIBIO
+	  if (_IO_fwide (stream, 0) > 0)
+	    fputws_unlocked (state
+			     ? state->name : program_invocation_short_name,
+			     stream);
+	  else
+#endif
+	    fputs_unlocked (state
+			    ? state->name : program_invocation_short_name,
+			    stream);
 
 	  if (fmt)
 	    {
 	      va_list ap;
 
-	      putc_unlocked (':', stream);
-	      putc_unlocked (' ', stream);
-
 	      va_start (ap, fmt);
-	      vfprintf (stream, fmt, ap);
+#ifdef USE_IN_LIBIO
+	      if (_IO_fwide (stream, 0) > 0)
+		{
+		  char *buf;
+
+		  asprintf (&buf, fmt, ap);
+
+		  fwprintf (stream, L": %s", buf);
+
+		  free (buf);
+		}
+	      else
+#endif
+		{
+		  putc_unlocked (':', stream);
+		  putc_unlocked (' ', stream);
+
+		  vfprintf (stream, fmt, ap);
+		}
+
 	      va_end (ap);
 	    }
 
 	  if (errnum)
 	    {
-	      putc_unlocked (':', stream);
-	      putc_unlocked (' ', stream);
-	      fputs (strerror (errnum), stream);
+	      char buf[200];
+
+#ifdef USE_IN_LIBIO
+	      if (_IO_fwide (stream, 0) > 0)
+		fwprintf (stream, ": %s",
+			  __strerror_r (errnum, buf, sizeof (buf)));
+	      else
+#endif
+		{
+		  putc_unlocked (':', stream);
+		  putc_unlocked (' ', stream);
+		  fputs (__strerror_r (errnum, buf, sizeof (buf)), stream);
+		}
 	    }
 
-	  putc_unlocked ('\n', stream);
+#ifdef USE_IN_LIBIO
+	  if (_IO_fwide (stream, 0) > 0)
+	    putwc_unlocked (L'\n', stream);
+	  else
+#endif
+	    putc_unlocked ('\n', stream);
 
 	  __funlockfile (stream);
 
diff --git a/po/ko.po b/po/ko.po
index c9c03089c5..0a9ff8528e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,82 +4,88 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libc 2.2.3\n"
-"POT-Creation-Date: 2001-01-21 08:03-0800\n"
-"PO-Revision-Date: 2001-06-07 02:20+0900\n"
+"Project-Id-Version: GNU libc 2.2.4\n"
+"POT-Creation-Date: 2001-08-13 15:08-0700\n"
+"PO-Revision-Date: 2001-08-20 15:03+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: nis/nis_print.c:274
+#: locale/programs/ld-monetary.c:278
+#, c-format
+msgid "\t\t\t\t\t\t\t      %s: value for field `%s' must be in range %d...%d"
+msgstr "\t\t\t\t\t\t\t      %s: `%s' ÇʵåÀÇ °ªÀº %d...%d »çÀÌ¿¡ ÀÖ¾î¾ß ÇÕ´Ï´Ù"
+
+#: nis/nis_print.c:277
 msgid "\t\tAccess Rights : "
 msgstr "\t\tÁ¢±Ù ±ÇÇÑ     : "
 
-#: nis/nis_print.c:272
+#: nis/nis_print.c:275
 msgid "\t\tAttributes    : "
 msgstr "\t\t¼Ó¼º          : "
 
-#: sunrpc/rpc_main.c:1425
+#: sunrpc/rpc_main.c:1427
 #, 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:1427
+#: sunrpc/rpc_main.c:1429
 #, 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:1430
+#: sunrpc/rpc_main.c:1432
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n ³×Æ®id]* [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\n"
 
-#: sunrpc/rpc_main.c:1429
+#: sunrpc/rpc_main.c:1431
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s ³×ƮŸÀÔ]* [-o Ãâ·ÂÆÄÀÏ] [ÀÔ·ÂÆÄÀÏ]\n"
 
-#: nis/nis_print.c:236
+#: nis/nis_print.c:239
 msgid "\tAccess rights: "
 msgstr "\tÁ¢±Ù ±ÇÇÑ: "
 
-#: nis/nis_print.c:294
+#: nis/nis_print.c:297
 #, c-format
 msgid "\tEntry data of type %s\n"
 msgstr "\tŸÀÔ %sÀÇ entry µ¥ÀÌŸ\n"
 
-#: nis/nis_print.c:172
+#: nis/nis_print.c:175
 #, c-format
 msgid "\tName       : %s\n"
 msgstr "\tÀ̸§       : %s\n"
 
-#: nis/nis_print.c:173
+#: nis/nis_print.c:176
 msgid "\tPublic Key : "
 msgstr "\t°ø¿ë Å°    : "
 
-#: nis/nis_print.c:235
+#: nis/nis_print.c:238
 #, c-format
 msgid "\tType         : %s\n"
 msgstr "\tŸÀÔ         : %s\n"
 
-#: nis/nis_print.c:202
+#: nis/nis_print.c:205
 #, c-format
 msgid "\tUniversal addresses (%u)\n"
 msgstr "\tº¸Æí ÁÖ¼Ò (%u)\n"
 
-#: nis/nis_print.c:270
+#: nis/nis_print.c:273
 #, c-format
 msgid "\t[%d]\tName          : %s\n"
 msgstr "\t[%d]\tÀ̸§          : %s\n"
 
-#: nis/nis_print.c:297
+#: nis/nis_print.c:300
 #, c-format
 msgid "\t[%u] - [%u bytes] "
 msgstr "\t[%u] - [%u ¹ÙÀÌÆ®] "
 
 #: nscd/nscd_stat.c:154
+#, c-format
 msgid ""
 "\n"
 "%s cache:\n"
@@ -109,11 +115,11 @@ msgstr ""
 "%15ld%% ij½¬ È÷Æ®À²\n"
 "%15s  check /etc/%s for changes\n"
 
-#: nis/nis_print.c:252
+#: nis/nis_print.c:255
 msgid "\nGroup Members :\n"
 msgstr "\n±×·ì ¸â¹ö :\n"
 
-#: nis/nis_print.c:323
+#: nis/nis_print.c:326
 msgid "\nTime to Live  : "
 msgstr "\nÀ¯Áö ½Ã°£ : "
 
@@ -141,7 +147,7 @@ msgstr "      ¾Æ´Ï¿À"
 msgid "     yes"
 msgstr "     ¿¹"
 
-#: nis/nis_print.c:349
+#: nis/nis_print.c:352
 #, c-format
 msgid "    Data Length = %u\n"
 msgstr "    µ¥ÀÌŸ ±æÀÌ = %u\n"
@@ -198,15 +204,15 @@ msgstr "   ÇÁ·Î±×·¥ ¹öÀü ¿øÇü   Æ÷Æ®\n"
 msgid "  or: "
 msgstr "  ȤÀº: "
 
-#: elf/ldconfig.c:448
+#: elf/ldconfig.c:457
 msgid " (SKIPPED)\n"
 msgstr " (Áö³ªÄ§)\n"
 
-#: elf/ldconfig.c:446
+#: elf/ldconfig.c:455
 msgid " (changed)\n"
 msgstr " (º¯°æµÊ)\n"
 
-#: timezone/zic.c:421
+#: timezone/zic.c:427
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (\"%s\"¿¡ ÀÖ´Â ±ÔÄ¢, Çà %d)"
@@ -215,22 +221,22 @@ msgstr " (\"%s\"¿¡ ÀÖ´Â ±ÔÄ¢, Çà %d)"
 msgid " [OPTION...]"
 msgstr "[<¿É¼Ç>...]"
 
-#: timezone/zic.c:418
+#: timezone/zic.c:424
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", Çà %d: %s"
 
-#: timezone/zic.c:983
+#: timezone/zic.c:989
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"Áö¿ª %s\" Çà°ú -l ¿É¼ÇÀº »óÈ£ ¹èŸÀûÀÔ´Ï´Ù"
 
-#: timezone/zic.c:991
+#: timezone/zic.c:997
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"Áö¿ª %s\" Çà°ú -p ¿É¼ÇÀº »óÈ£ ¹èŸÀûÀÔ´Ï´Ù"
 
-#: sunrpc/rpc_main.c:1410
+#: sunrpc/rpc_main.c:1412
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "ÅÛÇø´ »ý¼º Ç÷¡±×¸¦ À§Çؼ­´Â \"ÀÔ·ÂÆÄÀÏ\"ÀÌ ÇÊ¿äÇÕ´Ï´Ù\n"
 
@@ -244,58 +250,58 @@ msgstr "%.*s: ARGP_HELP_FMT Àμö´Â °ªÀÌ ÇÊ¿äÇÕ´Ï´Ù"
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: ¾Ë¼ö ¾ø´Â ARGP_HELP_FMT ÀÎÀÚ"
 
-#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2593
-#: locale/programs/ld-collate.c:3719 locale/programs/ld-ctype.c:2110
-#: locale/programs/ld-ctype.c:2847 locale/programs/ld-identification.c:440
-#: locale/programs/ld-measurement.c:232 locale/programs/ld-messages.c:326
-#: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:300
-#: locale/programs/ld-numeric.c:370 locale/programs/ld-paper.c:233
-#: locale/programs/ld-telephone.c:308 locale/programs/ld-time.c:1172
+#: locale/programs/ld-address.c:581 locale/programs/ld-collate.c:2612
+#: locale/programs/ld-collate.c:3740 locale/programs/ld-ctype.c:2112
+#: locale/programs/ld-ctype.c:2849 locale/programs/ld-identification.c:448
+#: locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331
+#: locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:305
+#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:238
+#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1199
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: Á¤ÀÇ°¡ `END %1$s'·Î ³¡³ªÁö ¾Ê½À´Ï´Ù"
 
-#: elf/cache.c:165 elf/cache.c:175
+#: elf/cache.c:190 elf/cache.c:200
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%2$s ij½¬¿¡ %1$d°³ÀÇ ¶óÀ̺귯¸®°¡ ¹ß°ßµÇ¾ú½À´Ï´Ù\n"
 
-#: timezone/zic.c:793
+#: timezone/zic.c:799
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "±ÔÄ¢¾ø´Â Áö¿ª¿¡ %s°¡ ÀÖÀ½"
 
-#: elf/../sysdeps/generic/readelflib.c:65
+#: elf/../sysdeps/generic/readelflib.c:67
 #, c-format
 msgid "%s is a 32 bit ELF file.\n"
 msgstr "%sÀº(´Â) 32ºñÆ® ELF ÆÄÀÏÀÔ´Ï´Ù.\n"
 
-#: elf/../sysdeps/generic/readelflib.c:67
+#: elf/../sysdeps/generic/readelflib.c:69
 #, c-format
 msgid "%s is a 64 bit ELF file.\n"
 msgstr "%sÀº(´Â) 64ºñÆ® ELF ÆÄÀÏÀÔ´Ï´Ù.\n"
 
-#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:48
+#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49
 #, c-format
 msgid "%s is for unknown machine %d.\n"
 msgstr "%sÀº(´Â) ¾Ë·ÁÁöÁö ¾ÊÀº ±â°è %dÀ»(¸¦) À§ÇÑ °ÍÀÔ´Ï´Ù.\n"
 
-#: elf/ldconfig.c:329
+#: elf/ldconfig.c:326
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%sÀº(´Â) ¾Ë·ÁÁø ¶óÀ̺귯¸® ŸÀÔÀÌ ¾Æ´Õ´Ï´Ù"
 
-#: elf/../sysdeps/generic/readelflib.c:76
+#: elf/../sysdeps/generic/readelflib.c:78
 #, c-format
 msgid "%s is not a shared object file (Type: %d).\n"
 msgstr "%sÀº(´Â) µ¿Àû ¿ÀºêÁ§Æ® ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù (ŸÀÔ: %d).\n"
 
-#: elf/ldconfig.c:415
+#: elf/ldconfig.c:424
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%sÀº(´Â) ½Éº¼¸¯ ¸µÅ©°¡ ¾Æ´Õ´Ï´Ù\n"
 
-#: elf/readlib.c:157
+#: elf/readlib.c:155
 #, c-format
 msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
 msgstr "%sÀº(´Â) ELF ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù - ½ÃÀۺκÐÀÇ ¸ÅÁ÷ ¹ÙÀÌÆ®°¡ Ʋ·È½À´Ï´Ù.\n"
@@ -315,12 +321,12 @@ msgstr "%s%s%s:%u: %s%s¿¹±âÄ¡ ¸øÇÑ ¿À·ù: %s.\n"
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%s¾Ë ¼ö ¾ø´Â ½ÅÈ£ %d\n"
 
-#: timezone/zic.c:2228
+#: timezone/zic.c:2234
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d´Â ºÎÈ£ È®ÀåÀÌ Á¦´ë·Î µÇÁö ¾Ê¾Ò½À´Ï´Ù\n"
 
-#: locale/programs/charmap.c:326
+#: locale/programs/charmap.c:331
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max>´Â <mb_cur_min>º¸´Ù Ä¿¾ß ÇÕ´Ï´Ù\n"
@@ -335,87 +341,82 @@ msgstr "%s: C Àü󸮱Ⱑ Á¾·á ÄÚµå %d·Î ½ÇÆÐÇÏ¿´½À´Ï´Ù\n"
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr "%s: C Àü󷯱Ⱑ ½Ã±×³¯ %d·Î ½ÇÆÐÇÏ¿´½À´Ï´Ù\n"
 
-#: timezone/zic.c:1494
+#: timezone/zic.c:1500
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: %s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:2206
+#: timezone/zic.c:2212
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: %s µð·ºÅ丮¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:645
+#: timezone/zic.c:651
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: %s¸¦ %s·Î ¸µÅ©ÇÒ ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:819
+#: timezone/zic.c:825
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: %s¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:1484
+#: timezone/zic.c:1490
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:630
+#: timezone/zic.c:636
 #, c-format
 msgid "%s: Can't unlink  %s: %s\n"
 msgstr "%s: %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: %s\n"
 
-#: timezone/zic.c:888
+#: timezone/zic.c:894
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: %sÀ»(¸¦) ´Ý´Â µµÁß ¿À·ù ¹ß»ý: %s\n"
 
-#: timezone/zic.c:881
+#: timezone/zic.c:887
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: %sÀ»(¸¦) Àд µµÁß ¿À·ù ¹ß»ý\n"
 
-#: timezone/zdump.c:267
-#, c-format
-msgid "%s: Error writing "
-msgstr "%s: ¾²´Â µµÁß ¿À·ù ¹ß»ý"
-
-#: timezone/zic.c:1560
+#: timezone/zic.c:1566
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: %sÀ»(¸¦) ¾²´Â µµÁß ¿À·ù ¹ß»ý\n"
 
-#: timezone/zic.c:866
+#: timezone/zic.c:872
 #, 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:365
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: ¸Þ¸ð¸®°¡ ¹Ù´Ú³²: %s\n"
 
-#: timezone/zic.c:525
+#: timezone/zic.c:531
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -L ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: timezone/zic.c:485
+#: timezone/zic.c:491
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -d ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: timezone/zic.c:495
+#: timezone/zic.c:501
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -l ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: timezone/zic.c:505
+#: timezone/zic.c:511
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -p ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
 
-#: timezone/zic.c:515
+#: timezone/zic.c:521
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: Çϳª ÀÌ»óÀÇ -y ¿É¼ÇÀÌ ÁöÁ¤µÇ¾úÀ½\n"
@@ -431,7 +432,7 @@ msgstr "%s: ÀÎÀÚ°¡ ³Ê¹« ¸¹À½\n"
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%1$s: ¹«°Ô %3$dÀÇ Á¤ÀÇ¿¡¼­ `%2$s'ÀÌ(°¡) ¿©·¯ ¹ø ³ªÅ¸³µ½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1323
+#: locale/programs/ld-collate.c:1336
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s'Àº(´Â) ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
@@ -442,7 +443,7 @@ msgstr "%s: `%s'Àº(´Â) ´ÜÀÏ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù"
 msgid "%s: `%s' value does not match `%s' value"
 msgstr "%s: `%s'ÀÇ °ªÀº `%s'ÀÇ °ª°ú ¸ÂÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/ld-monetary.c:835 locale/programs/ld-numeric.c:313
+#: locale/programs/ld-monetary.c:837 locale/programs/ld-numeric.c:318
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1'Àº `%2$s' ¹üÁÖÀÇ `%s' ÇʵåÀÇ ¸¶Áö¸· Ç׸ñÀ̾î¾ß ÇÕ´Ï´Ù"
@@ -452,101 +453,101 @@ msgstr "%s: `-1'Àº `%2$s' ¹üÁÖÀÇ `%s' ÇʵåÀÇ ¸¶Áö¸· Ç׸ñÀ̾î¾ß ÇÕ´Ï´Ù"
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: Á¤·Ä ¼ø¼­ `forward'¿Í `backward'´Â ¼­·Î ¹èŸÀûÀÔ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1515
+#: locale/programs/ld-collate.c:1528
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position'Àº ¸ðµç ¼½¼ÇÀÇ Æ¯Á¤ ´Ü°è¿¡¼­¸¸ »ç¿ëµÇ°Å³ª ¾Æ¿¹ »ç¿ëµÇÁö ¸»¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2635 locale/programs/ld-ctype.c:2775
+#: locale/programs/ld-ctype.c:2637 locale/programs/ld-ctype.c:2777
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s: `translit_start' ¼½¼ÇÀÌ `translit_end'·Î ³¡³ªÁö ¾Ê½À´Ï´Ù."
 
-#: locale/programs/ld-collate.c:1123
+#: locale/programs/ld-collate.c:1136
 #, c-format
 msgid "%s: byte sequence of first character of sequence is not lower than that of the last character"
 msgstr "%s: ¼ø¼­¿­ÀÇ Ã¹¹ø° ¹®ÀÚÀÇ ¹ÙÀÌÆ® ¼ø¼­°¡ ¸¶Áö¸· ¹®ÀÚÀÇ ¹ÙÀÌÆ® ¼ø¼­º¸´Ù ÀÛÁö ¾Ê½À´Ï´Ù"
 
-#: locale/programs/ld-collate.c:1081
+#: locale/programs/ld-collate.c:1094
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: ù¹ø° ¹®ÀÚ¿Í ¸¶Áö¸· ¹®ÀÚÀÇ ¹ÙÀÌÆ® ¼ø¼­´Â ±æÀÌ°¡ °°¾Æ¾ß ÇÕ´Ï´Ù"
 
-#: locale/programs/ld-collate.c:3642
+#: locale/programs/ld-collate.c:3663
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: ¸»ÁÙÀÓÇ¥ ¹üÀ§ÀÇ ³¡¿¡ `%s'À»(¸¦) µÑ ¼ö ¾ø½À´Ï´Ù"
 
 # ????
-#: locale/programs/ld-collate.c:3308
+#: locale/programs/ld-collate.c:3327
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: %.*s µÚ¿¡ ¼ø¼­¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù: ±âÈ£¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2910 locale/programs/ld-ctype.c:2994
-#: locale/programs/ld-ctype.c:3014 locale/programs/ld-ctype.c:3035
-#: locale/programs/ld-ctype.c:3056 locale/programs/ld-ctype.c:3077
-#: locale/programs/ld-ctype.c:3098 locale/programs/ld-ctype.c:3138
-#: locale/programs/ld-ctype.c:3159 locale/programs/ld-ctype.c:3226
+#: locale/programs/ld-ctype.c:2912 locale/programs/ld-ctype.c:2996
+#: locale/programs/ld-ctype.c:3016 locale/programs/ld-ctype.c:3037
+#: locale/programs/ld-ctype.c:3058 locale/programs/ld-ctype.c:3079
+#: locale/programs/ld-ctype.c:3100 locale/programs/ld-ctype.c:3140
+#: locale/programs/ld-ctype.c:3161 locale/programs/ld-ctype.c:3228
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: ¹®ÀÚÁöµµÀÇ `%s' ¹®ÀÚ´Â ÇÑ ¹ÙÀÌÆ®·Î Ç¥ÇöÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:3270 locale/programs/ld-ctype.c:3295
+#: locale/programs/ld-ctype.c:3272 locale/programs/ld-ctype.c:3297
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: ±âº»°ª `%s' ¹®ÀÚ´Â ÇÑ ¹ÙÀÌÆ®·Î Ç¥ÇöÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2905
+#: locale/programs/ld-ctype.c:2907
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
 msgstr "%s: ¹®ÀÚ `%s'´Â ±âº»°ªÀ¸·Î ÇÊ¿äÇÏÁö¸¸ ¹®Àڸʿ¡ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: locale/programs/ld-ctype.c:2989 locale/programs/ld-ctype.c:3009
-#: locale/programs/ld-ctype.c:3051 locale/programs/ld-ctype.c:3072
-#: locale/programs/ld-ctype.c:3093 locale/programs/ld-ctype.c:3133
-#: locale/pr