about summary refs log tree commit diff
path: root/po
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-17 19:18:16 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-17 19:18:16 +0000
commitfaf3500746cac91261bda212b57d18b1ee28652d (patch)
tree5757d398481a0ab6d5d6292e0bddf2eac8a13695 /po
parentcbc53df0fa0726c6267978250c1f53bf9517bf39 (diff)
downloadglibc-faf3500746cac91261bda212b57d18b1ee28652d.tar.gz
glibc-faf3500746cac91261bda212b57d18b1ee28652d.tar.xz
glibc-faf3500746cac91261bda212b57d18b1ee28652d.zip
Update from translation team.
Diffstat (limited to 'po')
-rw-r--r--po/ja.po1321
1 files changed, 717 insertions, 604 deletions
diff --git a/po/ja.po b/po/ja.po
index 7a0d0aca40..fe9a913b5a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,12 +1,12 @@
 # Japanese Messages for GNU libc.
 # Copyright (C) 1996 Free Software Foundation, Inc.
-# GOTO Masanori <gotom@debian.or.jp>, 2000-2003.
+# GOTO Masanori <gotom@debian.or.jp>, 2000-2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.3.2\n"
-"POT-Creation-Date: 2003-02-22 15:34-0800\n"
-"PO-Revision-Date: 2003-11-25 00:31+09:00\n"
+"Project-Id-Version: libc 2.3.3\n"
+"POT-Creation-Date: 2004-08-05 09:16+0200\n"
+"PO-Revision-Date: 2004-12-18 02:22+0900\n"
 "Last-Translator: GOTO Masanori <gotom@debian.or.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@ msgstr "��λ���ޤ���"
 
 #: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
 msgid "Urgent I/O condition"
-msgstr "�۵ޤ�I/O�����Ǥ�"
+msgstr "�۵�I/O���"
 
 #: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
 msgid "Stopped (signal)"
@@ -138,7 +138,7 @@ msgstr "EMT �ȥ�å�"
 
 #: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
 msgid "Bad system call"
-msgstr "�����ʥ����ƥॳ����Ǥ�"
+msgstr "�����ʥ����ƥॳ����"
 
 #: sysdeps/generic/siglist.h:66
 msgid "Stack fault"
@@ -150,7 +150,7 @@ msgstr "�����׵�"
 
 #: sysdeps/generic/siglist.h:71
 msgid "Power failure"
-msgstr "�Ÿ��ξ�"
+msgstr "�Ÿ��㳲"
 
 #: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
 msgid "Resource lost"
@@ -177,12 +177,12 @@ msgstr "`%s'�򳫤��ޤ���"
 msgid "cannot read header from `%s'"
 msgstr "`%s'�Υإå����ɤ�ޤ���"
 
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:293 catgets/gencat.c:288
+#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:295 catgets/gencat.c:288
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "���ϥե�����`%s'�򳫤��ޤ���"
 
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:311
+#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:313
 #, c-format
 msgid "error while closing input `%s'"
 msgstr "���ϥե����� `%s' ���Ĥ��Ƥ���֤Υ��顼"
@@ -192,16 +192,16 @@ msgstr "���ϥե����� `%s' ���Ĥ��Ƥ���֤Υ��顼"
 msgid "illegal input sequence at position %Zd"
 msgstr "���� %Zd �����������ϥ������󥹤�����ޤ���"
 
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:503
+#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:506
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "�Хåե��κǸ�Ǥΰ��פ��ʤ�ʸ���ޤ��ϥ��եȥ������󥹤Ǥ�"
 
-#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:546
-#: iconv/iconv_prog.c:582
+#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:549
+#: iconv/iconv_prog.c:585
 msgid "error while reading the input"
 msgstr "�����ɤ߹�����Υ��顼"
 
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:564
+#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:567
 msgid "unable to allocate buffer for input"
 msgstr "�����ѥХåե��������Ƥ뤳�Ȥ��Ǥ��ޤ���"
 
@@ -223,7 +223,7 @@ msgstr "����:"
 
 #: iconv/iconv_prog.c:65
 msgid "list all known coded character sets"
-msgstr "���Τ�������饯�����åȤ�ɽ������"
+msgstr "���Τ�������饯�����åȤ�ɽ��"
 
 #: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
 msgid "Output control:"
@@ -231,7 +231,7 @@ msgstr "��������:"
 
 #: iconv/iconv_prog.c:67
 msgid "omit invalid characters from output"
-msgstr "���Ϥ���������ʸ����ȴ�����ޤ���"
+msgstr "���Ϥ���������ʸ����ȴ����"
 
 #: iconv/iconv_prog.c:68
 msgid "output file"
@@ -253,47 +253,47 @@ msgstr "Ϳ����줿�ե�����Υ��󥳡��ǥ��󥰤��Ѵ�����."
 msgid "[FILE...]"
 msgstr "[�ե�����...]"
 
-#: iconv/iconv_prog.c:199
+#: iconv/iconv_prog.c:201
 msgid "cannot open output file"
 msgstr "���ϥե�����򳫤��ޤ���"
 
-#: iconv/iconv_prog.c:241
+#: iconv/iconv_prog.c:243
 #, c-format
 msgid "conversion from `%s' and to `%s' are not supported"
 msgstr "`%s'������Ѵ���`%s'�ؤ��Ѵ��Ϥɤ���⥵�ݡ��Ȥ���Ƥ��ޤ���"
 
-#: iconv/iconv_prog.c:246
+#: iconv/iconv_prog.c:248
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr "`%s'������Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: iconv/iconv_prog.c:253
+#: iconv/iconv_prog.c:255
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr "`%s'�ؤ��Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: iconv/iconv_prog.c:257
+#: iconv/iconv_prog.c:259
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr "`%s'����`%s'�ؤ��Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: iconv/iconv_prog.c:263
+#: iconv/iconv_prog.c:265
 msgid "failed to start conversion processing"
 msgstr "�Ѵ������γ��Ϥ˼��Ԥ��ޤ���"
 
-#: iconv/iconv_prog.c:358
+#: iconv/iconv_prog.c:360
 msgid "error while closing output file"
 msgstr "���ϥե�������Ĥ��Ƥ���֤Υ��顼"
 
-#: iconv/iconv_prog.c:407 iconv/iconvconfig.c:357 locale/programs/locale.c:274
+#: iconv/iconv_prog.c:409 iconv/iconvconfig.c:357 locale/programs/locale.c:279
 #: locale/programs/localedef.c:372 catgets/gencat.c:233
 #: malloc/memusagestat.c:602 debug/pcprofiledump.c:199
 msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
 msgstr "�Х��ϥ�����ץ�`glibcbug'���Ѥ���<bugs@gnu.org>�ޤ���𤷤Ƥ�������.\n"
 
-#: iconv/iconv_prog.c:421 iconv/iconvconfig.c:371 locale/programs/locale.c:287
-#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:910
-#: nss/getent.c:74 nscd/nscd.c:330 nscd/nscd_nischeck.c:90 elf/ldconfig.c:271
+#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:371 locale/programs/locale.c:292
+#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:913
+#: nss/getent.c:74 nscd/nscd.c:355 nscd/nscd_nischeck.c:90 elf/ldconfig.c:274
 #: elf/sprof.c:349
 #, c-format
 msgid ""
@@ -307,33 +307,33 @@ msgstr ""
 "����ϥե꡼���եȥ������Ǥ������ѵ����ˤĤ��Ƥϥ�������������������\n"
 "���������������Ū�ؤ�Ŭ������ǡ���˴ؤ�餺��̵�ݾڤǤ��� \n"
 
-#: iconv/iconv_prog.c:426 iconv/iconvconfig.c:376 locale/programs/locale.c:292
-#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:915
-#: nss/getent.c:79 nscd/nscd.c:335 nscd/nscd_nischeck.c:95 elf/ldconfig.c:276
+#: iconv/iconv_prog.c:428 iconv/iconvconfig.c:376 locale/programs/locale.c:297
+#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:918
+#: nss/getent.c:79 nscd/nscd.c:360 nscd/nscd_nischeck.c:95 elf/ldconfig.c:279
 #: elf/sprof.c:355
 #, c-format
 msgid "Written by %s.\n"
-msgstr "%s�ˤ��񤭹���.\n"
+msgstr "���: %s.\n"
 
-#: iconv/iconv_prog.c:456 iconv/iconv_prog.c:482
+#: iconv/iconv_prog.c:458 iconv/iconv_prog.c:484
 msgid "conversion stopped due to problem in writing the output"
 msgstr "���Ͻ񤭽Ф�������꤬���ä������Ѵ�����ߤ��ޤ���"
 
-#: iconv/iconv_prog.c:499
+#: iconv/iconv_prog.c:502
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "���� %ld �����������ϥ������󥹤�����ޤ���"
 
-#: iconv/iconv_prog.c:507
+#: iconv/iconv_prog.c:510
 msgid "internal error (illegal descriptor)"
 msgstr "�������顼 (�����ʵ��һҤǤ�)"
 
-#: iconv/iconv_prog.c:510
+#: iconv/iconv_prog.c:513
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "������ iconv() ���顼 %d"
 
-#: iconv/iconv_prog.c:753
+#: iconv/iconv_prog.c:756
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -378,162 +378,162 @@ msgstr "���ϥե�����������Ǥ��ޤ���"
 msgid "cannot read character map directory `%s'"
 msgstr "����饯���ޥåץǥ��쥯�ȥ�`%s'���ɤ߹���ޤ���"
 
-#: locale/programs/charmap.c:135
+#: locale/programs/charmap.c:136
 #, c-format
 msgid "character map file `%s' not found"
 msgstr "����饯���ޥåץե����� `%s' �����Ĥ���ޤ���"
 
-#: locale/programs/charmap.c:193
+#: locale/programs/charmap.c:194
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "ɸ�७��饯���ޥåץե�����`%s'�����Ĥ���ޤ���"
 
-#: locale/programs/charmap.c:255
+#: locale/programs/charmap.c:257
 #, c-format
 msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr "����饯���ޥå� `%s' �� ASCII �ߴ��ǤϤ���ޤ���, ��������� ISO C �˽��äƤ��ޤ���\n"
 
-#: locale/programs/charmap.c:332
+#: locale/programs/charmap.c:336
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max>��<mb_cur_min>����礭���ʤ���Фʤ�ޤ���\n"
 
-#: locale/programs/charmap.c:352 locale/programs/charmap.c:369
+#: locale/programs/charmap.c:356 locale/programs/charmap.c:373
 #: locale/programs/repertoire.c:175
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "prolog ���ʸˡ���顼�Ǥ�: %s"
 
-#: locale/programs/charmap.c:353
+#: locale/programs/charmap.c:357
 msgid "invalid definition"
 msgstr "����������Ǥ�"
 
-#: locale/programs/charmap.c:370 locale/programs/locfile.c:126
+#: locale/programs/charmap.c:374 locale/programs/locfile.c:126
 #: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
 msgid "bad argument"
 msgstr "�����ʰ����Ǥ�"
 
-#: locale/programs/charmap.c:398
+#: locale/programs/charmap.c:402
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "<%s> ���������ʣ���Ƥ��ޤ�"
 
-#: locale/programs/charmap.c:405
+#: locale/programs/charmap.c:409
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "<%s> ���ͤ�1�ʾ�Ǥʤ���Фʤ�ޤ���"
 
-#: locale/programs/charmap.c:417
+#: locale/programs/charmap.c:421
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> ���ͤ� <%s> ���Ͱʾ�Ǥʤ���Ф����ޤ���"
 
-#: locale/programs/charmap.c:440 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:444 locale/programs/repertoire.c:184
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "���� <%s> �ϥ��󥰥륭��饯���Ǥʤ���Ф����ޤ���"
 
-#: locale/programs/charmap.c:466
+#: locale/programs/charmap.c:470
 msgid "character sets with locking states are not supported"
 msgstr "���å����֤���ĥ���饯�����礬���ݡ��Ȥ���Ƥ��ޤ���"
 
-#: locale/programs/charmap.c:493 locale/programs/charmap.c:547
-#: locale/programs/charmap.c:579 locale/programs/charmap.c:673
-#: locale/programs/charmap.c:728 locale/programs/charmap.c:769
-#: locale/programs/charmap.c:810
+#: locale/programs/charmap.c:497 locale/programs/charmap.c:551
+#: locale/programs/charmap.c:583 locale/programs/charmap.c:677
+#: locale/programs/charmap.c:732 locale/programs/charmap.c:773
+#: locale/programs/charmap.c:814
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "%s��������ʸˡ���顼������ޤ�: %s"
 
-#: locale/programs/charmap.c:494 locale/programs/charmap.c:674
-#: locale/programs/charmap.c:770 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:498 locale/programs/charmap.c:678
+#: locale/programs/charmap.c:774 locale/programs/repertoire.c:231
 msgid "no symbolic name given"
 msgstr "����ܥ�̾��Ϳ�����Ƥ��ޤ���"
 
-#: locale/programs/charmap.c:548
+#: locale/programs/charmap.c:552
 msgid "invalid encoding given"
 msgstr "�����ʥ��󥳡��ǥ��󥰤�Ϳ�����ޤ���"
 
-#: locale/programs/charmap.c:557
+#: locale/programs/charmap.c:561
 msgid "too few bytes in character encoding"
 msgstr "ʸ�����󥳡��ǥ�����ǤΥХ��ȿ������ʤ����ޤ�"
 
-#: locale/programs/charmap.c:559
+#: locale/programs/charmap.c:563
 msgid "too many bytes in character encoding"
 msgstr "ʸ�����󥳡��ǥ�����ǤΥХ��ȿ���¿�����ޤ�"
 
-#: locale/programs/charmap.c:581 locale/programs/charmap.c:729
-#: locale/programs/charmap.c:812 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:585 locale/programs/charmap.c:733
+#: locale/programs/charmap.c:816 locale/programs/repertoire.c:297
 msgid "no symbolic name given for end of range"
 msgstr "�ΰ�κǸ�˥���ܥ�̾��Ϳ�����Ƥ��ޤ���"
 
-#: locale/programs/charmap.c:605 locale/programs/locfile.h:96
+#: locale/programs/charmap.c:609 locale/programs/locfile.c:818
 #: locale/programs/repertoire.c:314
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "���`%1$s' �� `END %1$s' �ǽ��äƤ��ޤ���"
 
-#: locale/programs/charmap.c:638
+#: locale/programs/charmap.c:642
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "WIDTH ����� CHARMAP ����˽������ȤΤߵ�����ޤ�"
 
-#: locale/programs/charmap.c:646 locale/programs/charmap.c:709
+#: locale/programs/charmap.c:650 locale/programs/charmap.c:713
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s���ͤ������Ǥʤ���Фʤ�ޤ���"
 
-#: locale/programs/charmap.c:837
+#: locale/programs/charmap.c:841
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: ���ֵ�����ǥ��顼"
 
-#: locale/programs/charmap.c:845 locale/programs/ld-address.c:605
-#: locale/programs/ld-collate.c:2635 locale/programs/ld-collate.c:3793
-#: locale/programs/ld-ctype.c:2216 locale/programs/ld-ctype.c:2977
+#: locale/programs/charmap.c:849 locale/programs/ld-address.c:605
+#: locale/programs/ld-collate.c:2650 locale/programs/ld-collate.c:3818
+#: locale/programs/ld-ctype.c:2225 locale/programs/ld-ctype.c:2994
 #: locale/programs/ld-identification.c:469
 #: locale/programs/ld-measurement.c:255 locale/programs/ld-messages.c:349
-#: locale/programs/ld-monetary.c:952 locale/programs/ld-name.c:324
+#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:324
 #: locale/programs/ld-numeric.c:392 locale/programs/ld-paper.c:258
-#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1217
-#: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
+#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1219
+#: locale/programs/locfile.c:825 locale/programs/repertoire.c:325
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s �ե����뽪ü���᤹���ޤ�"
 
-#: locale/programs/charmap.c:864 locale/programs/charmap.c:875
+#: locale/programs/charmap.c:868 locale/programs/charmap.c:879
 #, c-format
 msgid "unknown character `%s'"
 msgstr "������ʸ��`%s'"
 
-#: locale/programs/charmap.c:883
+#: locale/programs/charmap.c:887
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "�Х��ȥ������󥹤γ��Ϥ��齪λ�ޤǤΥХ��ȿ��ȡ��ϰϤν����Ȥ����פ��ޤ���: %d vs %d"
 
-#: locale/programs/charmap.c:987 locale/programs/ld-collate.c:2915
+#: locale/programs/charmap.c:991 locale/programs/ld-collate.c:2930
 #: locale/programs/repertoire.c:420
 msgid "invalid names for character range"
 msgstr "����饯���ϰϤȤ���������̾��"
 
-#: locale/programs/charmap.c:999 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1003 locale/programs/repertoire.c:432
 msgid "hexadecimal range format should use only capital characters"
 msgstr "16�ʿ����ϰϥե����ޥåȤϱ���ʸ���ǤΤ߻��Ѥ��٤��Ǥ�"
 
-#: locale/programs/charmap.c:1017
+#: locale/programs/charmap.c:1021
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
 msgstr "<%s> �� <%s> ���ϰϤȤ���������̾���Ǥ�"
 
-#: locale/programs/charmap.c:1023
+#: locale/programs/charmap.c:1027
 msgid "upper limit in range is not higher then lower limit"
 msgstr "�ϰ���ξ�¤ϲ��¤���礭������ޤ���"
 
-#: locale/programs/charmap.c:1081
+#: locale/programs/charmap.c:1085
 msgid "resulting bytes for range not representable."
 msgstr "�ϰ���η�̥Х��Ȥ�ɽ����ǽ�ǤϤ���ޤ���."
 
-#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1519
-#: locale/programs/ld-ctype.c:416 locale/programs/ld-identification.c:134
+#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1534
+#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:134
 #: locale/programs/ld-measurement.c:95 locale/programs/ld-messages.c:98
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:95
 #: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:92
@@ -547,8 +547,8 @@ msgstr "%s ���ƥ�����Ф�����������Ĥ���ޤ���"
 #: locale/programs/ld-address.c:290 locale/programs/ld-address.c:309
 #: locale/programs/ld-address.c:322 locale/programs/ld-identification.c:147
 #: locale/programs/ld-measurement.c:106 locale/programs/ld-monetary.c:206
-#: locale/programs/ld-monetary.c:244 locale/programs/ld-monetary.c:260
-#: locale/programs/ld-monetary.c:272 locale/programs/ld-name.c:106
+#: locale/programs/ld-monetary.c:250 locale/programs/ld-monetary.c:266
+#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:106
 #: locale/programs/ld-name.c:143 locale/programs/ld-numeric.c:113
 #: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:103
 #: locale/programs/ld-paper.c:112 locale/programs/ld-telephone.c:106
@@ -592,513 +592,513 @@ msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: �񥳡����ֹ�`%d'�������Ǥ�"
 
 #: locale/programs/ld-address.c:497 locale/programs/ld-address.c:534
-#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2592
+#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2601
 #: locale/programs/ld-identification.c:365
 #: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:302
-#: locale/programs/ld-monetary.c:694 locale/programs/ld-monetary.c:729
-#: locale/programs/ld-monetary.c:770 locale/programs/ld-name.c:281
+#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735
+#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:281
 #: locale/programs/ld-numeric.c:264 locale/programs/ld-paper.c:225
-#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1106
-#: locale/programs/ld-time.c:1148
+#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1108
+#: locale/programs/ld-time.c:1150
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s: �ե������`%s'��ʣ�����������Ƥ��ޤ�"
 
 #: locale/programs/ld-address.c:501 locale/programs/ld-address.c:539
 #: locale/programs/ld-identification.c:369 locale/programs/ld-messages.c:312
-#: locale/programs/ld-monetary.c:698 locale/programs/ld-monetary.c:733
+#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739
 #: locale/programs/ld-name.c:285 locale/programs/ld-numeric.c:268
-#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1000
-#: locale/programs/ld-time.c:1069 locale/programs/ld-time.c:1111
+#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1002
+#: locale/programs/ld-time.c:1071 locale/programs/ld-time.c:1113
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: �ե������`%s'���̤�Τ�ʸ��������ޤ�"
 
-#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3775
-#: locale/programs/ld-ctype.c:2957 locale/programs/ld-identification.c:450
+#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3800
+#: locale/programs/ld-ctype.c:2974 locale/programs/ld-identification.c:450
 #: locale/programs/ld-measurement.c:236 locale/programs/ld-messages.c:331
-#: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:306
+#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:306
 #: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:240
-#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1199
+#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1201
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: �Դ�����`END'�ԤǤ�"
 
-#: locale/programs/ld-address.c:589 locale/programs/ld-collate.c:2638
-#: locale/programs/ld-collate.c:3777 locale/programs/ld-ctype.c:2219
-#: locale/programs/ld-ctype.c:2960 locale/programs/ld-identification.c:453
+#: locale/programs/ld-address.c:589 locale/programs/ld-collate.c:2653
+#: locale/programs/ld-collate.c:3802 locale/programs/ld-ctype.c:2228
+#: locale/programs/ld-ctype.c:2977 locale/programs/ld-identification.c:453
 #: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
-#: locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:308
+#: locale/programs/ld-monetary.c:942 locale/programs/ld-name.c:308
 #: locale/programs/ld-numeric.c:376 locale/programs/ld-paper.c:242
-#: locale/programs/ld-telephone.c:314 locale/programs/ld-time.c:1201
+#: locale/programs/ld-telephone.c:314 locale/programs/ld-time.c:1203
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: ����� `END %1$s' �ǽ��äƤ��ޤ���"
 
-#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:520
-#: locale/programs/ld-collate.c:572 locale/programs/ld-collate.c:869
-#: locale/programs/ld-collate.c:882 locale/programs/ld-collate.c:2625
-#: locale/programs/ld-collate.c:3784 locale/programs/ld-ctype.c:1947
-#: locale/programs/ld-ctype.c:2206 locale/programs/ld-ctype.c:2782
-#: locale/programs/ld-ctype.c:2968 locale/programs/ld-identification.c:460
+#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:523
+#: locale/programs/ld-collate.c:575 locale/programs/ld-collate.c:871
+#: locale/programs/ld-collate.c:884 locale/programs/ld-collate.c:2640
+#: locale/programs/ld-collate.c:3809 locale/programs/ld-ctype.c:1956
+#: locale/programs/ld-ctype.c:2215 locale/programs/ld-ctype.c:2799
+#: locale/programs/ld-ctype.c:2985 locale/programs/ld-identification.c:460
 #: locale/programs/ld-measurement.c:246 locale/programs/ld-messages.c:340
-#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:315
+#: locale/programs/ld-monetary.c:949 locale/programs/ld-name.c:315
 #: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:249
-#: locale/programs/ld-telephone.c:321 locale/programs/ld-time.c:1208
+#: locale/programs/ld-telephone.c:321 locale/programs/ld-time.c:1210
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: ʸˡ���顼"
 
-#: locale/programs/ld-collate.c:395
+#: locale/programs/ld-collate.c:398
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s'�ϴ��� charmap ����������Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:404
+#: locale/programs/ld-collate.c:407
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' �ϴ��˥�ѡ��ȥ�����������Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:411
+#: locale/programs/ld-collate.c:414
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' �ϴ��˾ȹ祷��ܥ�Ȥ����������Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:418
+#: locale/programs/ld-collate.c:421
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' �ϴ��˾ȹ����ǤȤ����������Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:449 locale/programs/ld-collate.c:475
+#: locale/programs/ld-collate.c:452 locale/programs/ld-collate.c:478
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: `forward' �� `backward' ����¾Ū�Ǥ�"
 
-#: locale/programs/ld-collate.c:459 locale/programs/ld-collate.c:485
-#: locale/programs/ld-collate.c:501
+#: locale/programs/ld-collate.c:462 locale/programs/ld-collate.c:488
+#: locale/programs/ld-collate.c:504
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s'�ϽŤ���� %d ���ʣ����Ȥ��Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:557
+#: locale/programs/ld-collate.c:560
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: ��§��¿�����ޤ�; �ǽ�Υ���ȥ�� %d ����äƤ��ޤ�"
 
-#: locale/programs/ld-collate.c:593
+#: locale/programs/ld-collate.c:596
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: �¤��ؤ���§���Խ�ʬ�Ǥ�"
 
-#: locale/programs/ld-collate.c:759
+#: locale/programs/ld-collate.c:761
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: ���νŤ�ʸ����ϵ�����Ƥ��ޤ���"
 
-#: locale/programs/ld-collate.c:854
+#: locale/programs/ld-collate.c:856
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: �ŤߤϤ���̾�ΤȤ���Ʊ����ά����ܥ����Ѥ��ʤ���Фʤ�ޤ���"
 
-#: locale/programs/ld-collate.c:910
+#: locale/programs/ld-collate.c:912
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: ������¿�����ޤ�"
 
-#: locale/programs/ld-collate.c:1023 locale/programs/ld-collate.c:1194
+#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s'���Ф��륪�������� %s:%Zu �Ǵ����������Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:1073
+#: locale/programs/ld-collate.c:1081
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: �����ϰϤγ��ϡ���λ����ܥ�ϥ���饯���˴�Ť��ʤ���Фʤ�ޤ���"
 
-#: locale/programs/ld-collate.c:1100
+#: locale/programs/ld-collate.c:1108
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: �ǽ�ȺǸ��ʸ���ΥХ��ȥ������󥹤�Ʊ��Ĺ�Ǥʤ���Фʤ�ޤ���"
 
-#: locale/programs/ld-collate.c:1142
+#: locale/programs/ld-collate.c:1150
 #, c-format
 msgid "%s: byte sequence of first character of sequence is not lower than that of the last character"
 msgstr "%s: ����������κǽ��ʸ���ΥХ��ȥ������󥹤ϺǸ��ʸ���Τ���lower�ǤϤ���ޤ���"
 
-#: locale/programs/ld-collate.c:1263
+#: locale/programs/ld-collate.c:1275
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: ����ܥ���ϰϤξ�ά��`order_start'�Τ�������֤��ƤϤ����ޤ���"
 
-#: locale/programs/ld-collate.c:1267
+#: locale/programs/ld-collate.c:1279
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: ����ܥ��ϰϾ�ά�����`order_end'�Τ������³���ƤϤ����ޤ���"
 
-#: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
+#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1476
 #, c-format
 msgid "`%s' and `%.*s' are no valid names for symbolic range"
 msgstr "`%s' �� `%.*s' �ϥ���ܥ���ϰϤȤ���������̾���Ǥ�"
 
-#: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
+#: locale/programs/ld-collate.c:1348 locale/programs/ld-collate.c:3737
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s'���Ф����¤��ؤ��Ϥ��Ǥ� %s:%Zu ���������Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:1342
+#: locale/programs/ld-collate.c:1357
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s'��ñ��Υ���饯���Ǥʤ���Ф����ޤ���"
 
-#: locale/programs/ld-collate.c:1535
+#: locale/programs/ld-collate.c:1550
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position'�������٥���Ф��������������ǻ��Ѥ�̤���Ѥ��Τɤ��餫�Ǥ�"
 
-#: locale/programs/ld-collate.c:1560
+#: locale/programs/ld-collate.c:1575
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "����ܥ�`%s'���������Ƥ��ޤ���"
 
-#: locale/programs/ld-collate.c:1636 locale/programs/ld-collate.c:1742
+#: locale/programs/ld-collate.c:1651 locale/programs/ld-collate.c:1757
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "����ܥ� `%s' �ϰʲ���Ʊ�����󥳡��ǥ��󥰤���äƤ��ޤ�"
 
-#: locale/programs/ld-collate.c:1640 locale/programs/ld-collate.c:1746
+#: locale/programs/ld-collate.c:1655 locale/programs/ld-collate.c:1761
 #, c-format
 msgid "symbol `%s'"
 msgstr "����ܥ� `%s'"
 
-#: locale/programs/ld-collate.c:1788
+#: locale/programs/ld-collate.c:1803
 msgid "no definition of `UNDEFINED'"
 msgstr "`UNDEFINED'���������Ƥ��ޤ���"
 
-#: locale/programs/ld-collate.c:1817
+#: locale/programs/ld-collate.c:1832
 msgid "too many errors; giving up"
 msgstr "���顼��¿�����ޤ�; �����򤢤����ޤ�"
 
-#: locale/programs/ld-collate.c:2720
+#: locale/programs/ld-collate.c:2735
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: `%s'���������ʣ���Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:2756
+#: locale/programs/ld-collate.c:2771
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: ���������`%s'�ε��Ҥ���ʣ���Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:2895
+#: locale/programs/ld-collate.c:2910
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: �ȹ祷��ܥ�̾���̤�Τ�ʸ��������ޤ�"
 
-#: locale/programs/ld-collate.c:3027
+#: locale/programs/ld-collate.c:3042
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: ���������̾���̤�Τ�ʸ��������ޤ�"
 
-#: locale/programs/ld-collate.c:3040
+#: locale/programs/ld-collate.c:3055
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: ��������������̤�Τ�ʸ��������ޤ�"
 
-#: locale/programs/ld-collate.c:3050
+#: locale/programs/ld-collate.c:3065
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: ������������̤�ΤΥ���ܥ�`%s'������ޤ���"
 
-#: locale/programs/ld-collate.c:3059
+#: locale/programs/ld-collate.c:3074
 msgid "error while adding equivalent collating symbol"
 msgstr "�����ʾȹ祷��ܥ��ɲ���ǥ��顼"
 
-#: locale/programs/ld-collate.c:3089
+#: locale/programs/ld-collate.c:3104
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "������ץ� `%s' ���������ʣ���Ƥ��ޤ�"
 
-#: locale/programs/ld-collate.c:3137
+#: locale/programs/ld-collate.c:3152
 #, c-format
 msgid "%s: unknown section name `%s'"
 msgstr "%s: ̤�ΤΥ��������̾`%s'�Ǥ�"
 
-#: locale/programs/ld-collate.c:3165
+#: locale/programs/ld-collate.c:3180
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: ���������`%s'���Ф����¤��ؤ������ʣ������ޤ�"
 
-#: locale/programs/ld-collate.c:3190
+#: locale/programs/ld-collate.c:3205
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: �¤��ؤ���§���ֹ椬�����Ǥ�"
 
-#: locale/programs/ld-collate.c:3217
+#: locale/programs/ld-collate.c:3232
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: ̾���Τʤ������������Ф����¤��ؤ������ʣ������ޤ�"
 
-#: locale/programs/ld-collate.c:3271 locale/programs/ld-collate.c:3394
-#: locale/programs/ld-collate.c:3753
+#: locale/programs/ld-collate.c:3286 locale/programs/ld-collate.c:3414
+#: locale/programs/ld-collate.c:3778
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: `order_end'������ɤ����Ĥ���ޤ���"
 
-#: locale/programs/ld-collate.c:3329
+#: locale/programs/ld-collate.c:3347
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: �ȹ祷��ܥ� %.*s ���Ф����¤��ؤ����ޤ��������Ƥ��ޤ���"
 
-#: locale/programs/ld-collate.c:3345
+#: locale/programs/ld-collate.c:3365
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: �ȹ����� %.*s ���Ф����¤��ؤ����ޤ��������Ƥ��ޤ���"
 
-#: locale/programs/ld-collate.c:3356
+#: locale/programs/ld-collate.c:3376
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: %.*s�θ�Ǻ��¤��ؤ����Ǥ��ޤ���: ̤�ΤΥ���ܥ�Ǥ�"
 
-#: locale/programs/ld-collate.c:3408 locale/programs/ld-collate.c:3765
+#: locale/programs/ld-collate.c:3428 locale/programs/ld-collate.c:3790
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: `reorder-end'������ɤ����Ĥ���ޤ���"
 
-#: locale/programs/ld-collate.c:3442 locale/programs/ld-collate.c:3637
+#: locale/programs/ld-collate.c:3462 locale/programs/ld-collate.c:3662
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: ���������`%.*s'��̤�ΤǤ�"
 
-#: locale/programs/ld-collate.c:3507
+#: locale/programs/ld-collate.c:3527
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: �ְ�ä�����ܥ� <%.*s>"
 
-#: locale/programs/ld-collate.c:3700
+#: locale/programs/ld-collate.c:3725
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: ��ά������ϰϤν�����`%s'������ޤ���"
 
-#: locale/programs/ld-collate.c:3749
+#: locale/programs/ld-collate.c:3774
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: ���Υ��ƥ��국�Ҥϵ�����Ƥޤ���"
 
-#: locale/programs/ld-collate.c:3768
+#: locale/programs/ld-collate.c:3793
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: `reorder-sections-end'������ɤ����Ĥ���ޤ���"
 
-#: locale/programs/ld-ctype.c:435
+#: locale/programs/ld-ctype.c:440
 msgid "No character set name specified in charmap"
 msgstr "����饯���ޥå����ʸ������̾�����ꤵ��Ƥ��ޤ���"
 
-#: locale/programs/ld-ctype.c:464
+#: locale/programs/ld-ctype.c:469
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "ʸ�� L'\\u%0*x' (���饹`%s'��) �ϥ��饹`%s'�ˤʤ���Ф����ޤ���"
 
-#: locale/programs/ld-ctype.c:479
+#: locale/programs/ld-ctype.c:484
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "ʸ�� L'\\u%0*x' (���饹`%s'��) �ϥ��饹`%s'�ˤ��äƤϤ����ޤ���"
 
-#: locale/programs/ld-ctype.c:493 locale/programs/ld-ctype.c:551
+#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "%s��(%u��)�ǡ��������顼��������ޤ���"
 
-#: locale/programs/ld-ctype.c:522
+#: locale/programs/ld-ctype.c:527
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "���饹`%2$s'��ʸ��`%1$s'�ϥ��饹`%3$s'�ˤʤ���Ф����ޤ���"
 
-#: locale/programs/ld-ctype.c:538
+#: locale/programs/ld-ctype.c:543
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "���饹`%2$s'��ʸ��`%1$s'�ϥ��饹`%3$s'�ˤ��äƤϤ����ޤ���"
 
-#: locale/programs/ld-ctype.c:568 locale/programs/ld-ctype.c:606
+#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> ʸ���ϥ��饹 `%s' �ˤ���ޤ���"
 
-#: locale/programs/ld-ctype.c:580 locale/programs/ld-ctype.c:617
+#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> ʸ���ϥ��饹 `%s' �ˤ��äƤϤʤ�ޤ���"
 
-#: locale/programs/ld-ctype.c:595
+#: locale/programs/ld-ctype.c:600
 msgid "character <SP> not defined in character map"
 msgstr "ʸ�� <SP> ������饯���ޥåפ��������Ƥ��ޤ���"
 
-#: locale/programs/ld-ctype.c:709
+#: locale/programs/ld-ctype.c:714
 msgid "`digit' category has not entries in groups of ten"
 msgstr "`digit' ���ƥ���ϥ��롼�����10�ĤΥ���ȥ����äƤ��ޤ���"
 
-#: locale/programs/ld-ctype.c:758
+#: locale/programs/ld-ctype.c:763
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr "���Ϸ夬�������Ƥ��ʤ���������饯���ޥå����ɸ��̾������ޤ���"
 
-#: locale/programs/ld-ctype.c:823
+#: locale/programs/ld-ctype.c:828
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "`outdigit'�ǻ������ʸ���ΰ����ϥ���饯���ޥåפ����Ѳ�ǽ�ǤϤ���ޤ���"
 
-#: locale/programs/ld-ctype.c:840
+#: locale/programs/ld-ctype.c:845
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "`outdigit'�ǻ������ʸ���ΰ����ϥ�ѡ��ȥ�ޥåפ����Ѳ�ǽ�ǤϤ���ޤ���"
 
-#: locale/programs/ld-ctype.c:1235
+#: locale/programs/ld-ctype.c:1244
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "����饯�����饹`%s'�Ϥ��Ǥ��������Ƥ��ޤ�"
 
-#: locale/programs/ld-ctype.c:1241
+#: locale/programs/ld-ctype.c:1250
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "�����������: %Zd �ʾ�Υ���饯�����饹�ϵ�����Ƥ��ޤ���"
 
-#: locale/programs/ld-ctype.c:1267
+#: locale/programs/ld-ctype.c:1276
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "����饯���ޥå�`%s'�Ϥ��Ǥ��������Ƥ��ޤ�"
 
-#: locale/programs/ld-ctype.c:1273
+#: locale/programs/ld-ctype.c:1282
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "�����������: %d �ʾ�Υ���饯���ޥåפϵ�����Ƥ��ޤ���"
 
-#: locale/programs/ld-ctype.c:1538 locale/programs/ld-ctype.c:1663
-#: locale/programs/ld-ctype.c:1769 locale/programs/ld-ctype.c:2455
-#: locale/programs/ld-ctype.c:3443
+#: locale/programs/ld-ctype.c:1547 locale/programs/ld-ctype.c:1672
+#: locale/programs/ld-ctype.c:1778 locale/programs/ld-ctype.c:2464
+#: locale/programs/ld-ctype.c:3460
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: �ե������`%s'�Ϥ��ä���10����ʬ�ޤ�Ǥ��ޤ���"
 
-#: locale/programs/ld-ctype.c:1566 locale/programs/ld-ctype.c:2137
+#: locale/programs/ld-ctype.c:1575 locale/programs/ld-ctype.c:2146
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "�ϰ����to���� <U%0*X> ��from���� <U%0*X> ���⾮�������ޤ�"
 
-#: locale/programs/ld-ctype.c:1693
+#: locale/programs/ld-ctype.c:1702
 msgid "start and end character sequence of range must have the same length"
 msgstr "�ϰ���γ��Ͻ�λ����饯���������󥹤�Ʊ��Ĺ�Ǥʤ���Фʤ�ޤ���"
 
-#: locale/programs/ld-ctype.c:1700
+#: locale/programs/ld-ctype.c:1709
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "to�ͤ�ʸ���������󥹤�from�ͤ�ʸ���������󥹤��⾮�������ޤ�"
 
-#: locale/programs/ld-ctype.c:2057 locale/programs/ld-ctype.c:2108
+#: locale/programs/ld-ctype.c:2066 locale/programs/ld-ctype.c:2117
 msgid "premature end of `translit_ignore' definition"
 msgstr "`translit_ignore'����ν�ü���᤹���ޤ�"
 
-#: locale/programs/ld-ctype.c:2063 locale/programs/ld-ctype.c:2114
-#: locale/programs/ld-ctype.c:2156
+#: locale/programs/ld-ctype.c:2072 locale/programs/ld-ctype.c:2123
+#: locale/programs/ld-ctype.c:2165
 msgid "syntax error"
 msgstr "ʸˡ���顼"
 
-#: locale/programs/ld-ctype.c:2287
+#: locale/programs/ld-ctype.c:2296
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s: ����������饯�����饹��������ʸˡ���顼������ޤ�"
 
-#: locale/programs/ld-ctype.c:2302
+#: locale/programs/ld-ctype.c:2311
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s: ����������饯���ޥåפ�������ʸˡ���顼������ޤ�"
 
-#: locale/programs/ld-ctype.c:2477
+#: locale/programs/ld-ctype.c:2486
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "��ά���ϰϤ�Ʊ������2�ĤΥ��ڥ��ɤˤ�äƥޡ����Ť�����Ƥʤ���Фʤ�ޤ���"
 
-#: locale/programs/ld-ctype.c:2486
+#: locale/programs/ld-ctype.c:2495
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr "����ܥ�̾���ͤ��ϰϤȤ������о�ά `...' �ϻ��Ѥ��ƤϤ����ޤ���"
 
-#: locale/programs/ld-ctype.c:2501
+#: locale/programs/ld-ctype.c:2510
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr "UCS ���ͤ��ϰϤȤ���16�ʥ���ܥ��ά `..' ����Ѥ��ʤ���Фʤ�ޤ���"
 
-#: locale/programs/ld-ctype.c:2515
+#: locale/programs/ld-ctype.c:2524
 msgid "with character code range values one must use the absolute ellipsis `...'"
 msgstr "ʸ�������ɤ��ͤ��ϰϤȤ������о�ά `...' ����Ѥ��ʤ���Фʤ�ޤ���"
 
-#: locale/programs/ld-ctype.c:2666
+#: locale/programs/ld-ctype.c:2675
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "��ʣ�����ޥåԥ� `%s' �����"
 
-#: locale/programs/ld-ctype.c:2744 locale/programs/ld-ctype.c:2888
+#: locale/programs/ld-ctype.c:2761 locale/programs/ld-ctype.c:2905
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s: `translit_start' ��������� `translit_end' �ǽ��äƤ��ޤ���"
 
-#: locale/programs/ld-ctype.c:2839
+#: locale/programs/ld-ctype.c:2856
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: `default_missing'�������ʣ���Ƥ��ޤ�"
 
-#: locale/programs/ld-ctype.c:2844
+#: locale/programs/ld-ctype.c:2861
 msgid "previous definition was here"
 msgstr "��������������ˤ���ޤ���"
 
-#: locale/programs/ld-ctype.c:2866
+#: locale/programs/ld-ctype.c:2883
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr "%s: ɽ����ǽ��`default_missing'��������Ĥ���ޤ���"
 
-#: locale/programs/ld-ctype.c:3019
+#: locale/programs/ld-ctype.c:3036
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
 msgstr "%s: ����饯���ޥå����ʸ��`%s'��̤����Ǥ����ǥե�����ͤȤ���ɬ�פǤ�"
 
-#: locale/programs/ld-ctype.c:3024 locale/programs/ld-ctype.c:3108
-#: locale/programs/ld-ctype.c:3128 locale/programs/ld-ctype.c:3149
-#: locale/programs/ld-ctype.c:3170 locale/programs/ld-ctype.c:3191
-#: locale/programs/ld-ctype.c:3212 locale/programs/ld-ctype.c:3252
-#: locale/programs/ld-ctype.c:3273 locale/programs/ld-ctype.c:3340
+#: locale/programs/ld-ctype.c:3041 locale/programs/ld-ctype.c:3125
+#: locale/programs/ld-ctype.c:3145 locale/programs/ld-ctype.c:3166
+#: locale/programs/ld-ctype.c:3187 locale/programs/ld-ctype.c:3208
+#: locale/programs/ld-ctype.c:3229 locale/programs/ld-ctype.c:3269
+#: locale/programs/ld-ctype.c:3290 locale/programs/ld-ctype.c:3357
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: ����饯���ޥå����ʸ��`%s'��1�Х��Ȥ�ɽ���Ǥ��ޤ���"
 
-#: locale/programs/ld-ctype.c:3103 locale/programs/ld-ctype.c:3123
-#: locale/programs/ld-ctype.c:3165 locale/programs/ld-ctype.c:3186
-#: locale/programs/ld-ctype.c:3207 locale/programs/ld-ctype.c:3247
-#: locale/programs/ld-ctype.c:3268 locale/programs/ld-ctype.c:3335
-#: locale/programs/ld-ctype.c:3377 locale/programs/ld-ctype.c:3402
+#: locale/programs/ld-ctype.c:3120 locale/programs/ld-ctype.c:3140
+#: locale/programs/ld-ctype.c:3182 locale/programs/ld-ctype.c:3203
+#: locale/programs/ld-ctype.c:3224 locale/programs/ld-ctype.c:3264
+#: locale/programs/ld-ctype.c:3285 locale/programs/ld-ctype.c:3352
+#: locale/programs/ld-ctype.c:3394 locale/programs/ld-ctype.c:3419
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: ����饯��`%s'���������Ƥ��ޤ��󤬡��ǥե�����ͤȤ���ɬ�פǤ�"
 
-#: locale/programs/ld-ctype.c:3144
+#: locale/programs/ld-ctype.c:3161
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr "�ǥե�����ͤȤ���ɬ�פʥ���饯��`%s'���������Ƥ��ޤ���"
 
-#: locale/programs/ld-ctype.c:3384 locale/programs/ld-ctype.c:3409
+#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: �ǥե�����ͤȤ���ɬ�פʥ���饯��`%s'��1�Х��Ȥ�ɽ���Ǥ��ޤ���"
 
-#: locale/programs/ld-ctype.c:3464
+#: locale/programs/ld-ctype.c:3481
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "���Ϸ夬�������Ƥ��ʤ���������饯���ޥå����ɸ��̾������ޤ���"
 
-#: locale/programs/ld-ctype.c:3755
+#: locale/programs/ld-ctype.c:3772
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: ��������`%s'�Ǥ�transliteration�ǡ��������Ѳ�ǽ�ǤϤ���ޤ���"
 
-#: locale/programs/ld-ctype.c:3851
+#: locale/programs/ld-ctype.c:3868
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: ���饹 \"%s\" ���Ф���ơ��֥�: %lu �Х���\n"
 
-#: locale/programs/ld-ctype.c:3920
+#: locale/programs/ld-ctype.c:3937
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s: �ޥå� \"%s\" ���Ф���ơ��֥�: %lu �Х���\n"
 
-#: locale/programs/ld-ctype.c:4053
+#: locale/programs/ld-ctype.c:4070
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s: width ���Ф���ơ��֥�: %lu �Х���\n"
@@ -1138,37 +1138,37 @@ msgstr "%s: �ե������`%s'���Ф�������ɽ��������������ޤ���: %s"
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr "%s: �ե������`int_curr_symbol'���ͤ�Ĺ�����ְ�äƤ��ޤ�"
 
-#: locale/programs/ld-monetary.c:232
+#: locale/programs/ld-monetary.c:237
 #, c-format
 msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
 msgstr "%s: �ե������`int_curr_symbol'���ͤ�ISO 4217��˽��ä�Ŭ�ڤ�̾�����б����Ƥ��ޤ���"
 
-#: locale/programs/ld-monetary.c:250 locale/programs/ld-numeric.c:119
+#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:119
 #, c-format
 msgid "%s: value for field `%s' must not be the empty string"
 msgstr "%s: �ե������`%s'���Ф����ͤ϶���ʸ����ǤϤ����ޤ���"
 
-#: locale/programs/ld-monetary.c:278 locale/programs/ld-monetary.c:308
+#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
 msgstr "%s: �ե������`%s'���ͤ� %d...%d ���ϰϤˤʤ���Фʤ�ޤ���"
 
-#: locale/programs/ld-monetary.c:740 locale/programs/ld-numeric.c:275
+#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:275
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s: �ե������`%s'���ͤϥ��󥰥륭��饯���Ǥʤ���Ф����ޤ���"
 
-#: locale/programs/ld-monetary.c:837 locale/programs/ld-numeric.c:319
+#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:319
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1'��`%s'�ե�����ɤΡ��Ǹ�ι��ܤǤʤ���Ф����ޤ���"
 
-#: locale/programs/ld-monetary.c:859 locale/programs/ld-numeric.c:340
+#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:340
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: �ե������`%s'���Ф����ͤ�127�ʲ��Ǥʤ���Ф����ޤ���"
 
-#: locale/programs/ld-monetary.c:902
+#: locale/programs/ld-monetary.c:908
 msgid "conversion rate value cannot be zero"
 msgstr "�Ѵ��졼���ͤϥ����ˤϤǤ��ޤ���"
 
@@ -1253,62 +1253,62 @@ msgstr "%s: �ե������`%s'���ͤ� %d �ʾ�Ǥ��äƤϤ����ޤ���"
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: �ե������`%s'���ͤ� %d �ʾ�Ǥ��äƤϤ����ޤ���"
 
-#: locale/programs/ld-time.c:984
+#: locale/programs/ld-time.c:986
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr "%s: �ե������`%s'���Ф��ƾ��ʤ������ͤǤ�"
 
-#: locale/programs/ld-time.c:1029
+#: locale/programs/ld-time.c:1031
 msgid "extra trailing semicolon"
 msgstr ";�פʥ��ߥ����󤬻ĤäƤ��ޤ�"
 
-#: locale/programs/ld-time.c:1032
+#: locale/programs/ld-time.c:1034
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr "%s: �ե������`%s'���Ф���¿�������ͤǤ�"
 
-#: locale/programs/linereader.c:275
+#: locale/programs/linereader.c:130
+msgid "trailing garbage at end of line"
+msgstr "�����˥��ߤ��ĤäƤ��ޤ�"
+
+#: locale/programs/linereader.c:304
 msgid "garbage at end of number"
 msgstr "�����ν����˥��ߤ�����ޤ�"
 
-#: locale/programs/linereader.c:387
+#: locale/programs/linereader.c:416
 msgid "garbage at end of character code specification"
 msgstr "����饯�������ɻ���ν����˥��ߤ�����ޤ�"
 
-#: locale/programs/linereader.c:473
+#: locale/programs/linereader.c:502
 msgid "unterminated symbolic name"
 msgstr "����ܥ�̾����λ���Ƥ��ޤ���"
 
-#: locale/programs/linereader.c:537 catgets/gencat.c:1195
+#: locale/programs/linereader.c:566 catgets/gencat.c:1195
 msgid "invalid escape sequence"
 msgstr "��������¸����Ǥ�"
 
-#: locale/programs/linereader.c:600
+#: locale/programs/linereader.c:629
 msgid "illegal escape sequence at end of string"
 msgstr "ʸ����ν����������ʥ��������ץ������󥹤�����ޤ���"
 
-#: locale/programs/linereader.c:604 locale/programs/linereader.c:832
+#: locale/programs/linereader.c:633 locale/programs/linereader.c:861
 msgid "unterminated string"
 msgstr "ʸ���󤬽�λ���Ƥ��ޤ���"
 
-#: locale/programs/linereader.c:646
+#: locale/programs/linereader.c:675
 msgid "non-symbolic character value should not be used"
 msgstr "�󥷥�ܥ륭��饯���ͤϻ��Ѥ��٤��ǤϤ���ޤ���"
 
-#: locale/programs/linereader.c:793
+#: locale/programs/linereader.c:822
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "�����ʥ���ܥ�`%.*s'������ޤ���: ���ιԤ�̵�뤷�ޤ�"
 
-#: locale/programs/linereader.c:814
+#: locale/programs/linereader.c:843
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "����ܥ� `%.*s' ����ѡ��ȥ�ޥå���ˤ���ޤ���"
 
-#: locale/programs/linereader.h:162
-msgid "trailing garbage at end of line"
-msgstr "�����˥��ߤ��ĤäƤ��ޤ�"
-
 #: locale/programs/locale.c:75
 msgid "System information:"
 msgstr "�����ƥ����:"
@@ -1349,7 +1349,23 @@ msgstr ""
 "̾��\n"
 "[-a|-m]"
 
-#: locale/programs/locale.c:512
+#: locale/programs/locale.c:195
+msgid "Cannot set LC_CTYPE to default locale"
+msgstr "LC_CTYPE��ǥե���ȥ������������Ǥ��ޤ���Ǥ���"
+
+#: locale/programs/locale.c:197
+msgid "Cannot set LC_MESSAGES to default locale"
+msgstr "LC_MESSAGES��ǥե���ȥ������������Ǥ��ޤ���Ǥ���"
+
+#: locale/programs/locale.c:210
+msgid "Cannot set LC_COLLATE to default locale"
+msgstr "LC_COLLATE��ǥե���ȥ������������Ǥ��ޤ���Ǥ���"
+
+#: locale/programs/locale.c:226
+msgid "Cannot set LC_ALL to default locale"
+msgstr "LC_ALL��ǥե���ȥ������������Ǥ��ޤ���Ǥ���"
+
+#: locale/programs/locale.c:517
 msgid "while preparing output"
 msgstr "������������"
 
@@ -1615,15 +1631,15 @@ msgstr "���ƥ���`%s'�Υǡ�����񤭹�����˼��Ԥ��ޤ���"
 msgid "cannot create output file `%s' for category `%s'"
 msgstr "���ƥ���`%2$s'�Ѥν��ϥե�����`%1$s'������Ǥ��ޤ���"
 
-#: locale/programs/locfile.h:59
+#: locale/programs/locfile.c:781
 msgid "expect string argument for `copy'"
 msgstr "`copy'�ˤ�ʸ������������Ԥ���ޤ�"
 
-#: locale/programs/locfile.h:63
+#: locale/programs/locfile.c:785
 msgid "locale name should consist only of portable characters"
 msgstr "��������̾�ϥݡ����֥�ʸ�������ǹ������٤��Ǥ�"
 
-#: locale/programs/locfile.h:82
+#: locale/programs/locfile.c:804
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "`copy' ����Ѥ����Ȥ���¾�Τ����ʤ륭����ɤ���ꤵ��ޤ���Ǥ���"
 
@@ -1656,7 +1672,7 @@ msgid "upper limit in range is not smaller then lower limit"
 msgstr "�ϰ���ξ�¤ϲ��¤�꾮��������ޤ���"
 
 #: locale/programs/xmalloc.c:70 malloc/obstack.c:505 malloc/obstack.c:508
-#: posix/getconf.c:1002
+#: posix/getconf.c:1007
 msgid "memory exhausted"
 msgstr "�����Ȥ��̤����ޤ���"
 
@@ -1682,7 +1698,7 @@ msgstr "�ƥ��ȤΤ���κǽ��ʸ����."
 msgid "Another string for testing."
 msgstr "�ƥ��ȤΤ����¾��ʸ����."
 
-#: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:84
+#: catgets/gencat.c:111 catgets/gencat.c:115 nscd/nscd.c:88
 msgid "NAME"
 msgstr "̾��"
 
@@ -1786,11 +1802,12 @@ msgid "cannot determine escape character"
 msgstr "���������ץ���饯�������Ǥ��ޤ���"
 
 #: stdlib/../sysdeps/unix/sysv/linux/ia64/makecontext.c:63
+#, c-format
 msgid "makecontext: does not know how to handle more than 8 arguments\n"
 msgstr "makecontext: 8�����ʾ�򰷤���ˡ���狼��ޤ���\n"
 
-#: stdio-common/../sysdeps/gnu/errlist.c:12 posix/regcomp.c:133
-#: nis/nis_error.c:29 nis/ypclnt.c:787 nis/ypclnt.c:861
+#: stdio-common/../sysdeps/gnu/errlist.c:12 posix/regcomp.c:147
+#: nis/nis_error.c:29 nis/ypclnt.c:778 nis/ypclnt.c:852
 msgid "Success"
 msgstr "�����Ǥ�"
 
@@ -1888,7 +1905,7 @@ msgstr "�������ݤǤ��ޤ���"
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
 #: stdio-common/../sysdeps/gnu/errlist.c:149
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:43
-#: nis/nis_error.c:39 nis/ypclnt.c:817
+#: nis/nis_error.c:39 nis/ypclnt.c:808
 msgid "Permission denied"
 msgstr "���Ĥ�����ޤ���"
 
@@ -2205,7 +2222,7 @@ msgstr "���եȥ���������³�����Ǥ��ޤ���"
 #: stdio-common/../sysdeps/gnu/errlist.c:606
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:161
 msgid "Connection reset by peer"
-msgstr "��³��¾����ꥻ�åȤ���ޤ���"
+msgstr "��³����꤫��ꥻ�åȤ���ޤ���"
 
 #. TRANS The kernel's buffers for I/O operations are all in use.  In GNU, this
 #. TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
@@ -2220,7 +2237,7 @@ msgstr "���Ѳ�ǽ�ʶ����Хåե�������ޤ���"
 #: stdio-common/../sysdeps/gnu/errlist.c:627
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:163
 msgid "Transport endpoint is already connected"
-msgstr "ž���褬������³����Ƥ��ޤ�"
+msgstr "�̿�ü����������³����Ƥ��ޤ�"
 
 #. TRANS The socket is not connected to anything.  You get this error when you
 #. TRANS try to transmit data over a socket, without first specifying a
@@ -2229,7 +2246,7 @@ msgstr "ž���褬������³����Ƥ��ޤ�"
 #: stdio-common/../sysdeps/gnu/errlist.c:639
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:164
 msgid "Transport endpoint is not connected"
-msgstr "ž���褬��³����Ƥ��ޤ���"
+msgstr "�̿�ü������³����Ƥ��ޤ���"
 
 #. TRANS No default destination address was set for the socket.  You get this
 #. TRANS error when you try to transmit data over a connectionless socket,
@@ -2242,20 +2259,20 @@ msgstr "�����襢�ɥ쥹��ɬ�פǤ�"
 #. TRANS The socket has already been shut down.
 #: stdio-common/../sysdeps/gnu/errlist.c:659
 msgid "Cannot send after transport endpoint shutdown"
-msgstr "ž������Ĥ�����������Ǥ��ޤ���"
+msgstr "�̿�ü���Υ���åȥ������������Ǥ��ޤ���"
 
 #. TRANS ???
 #: stdio-common/../sysdeps/gnu/errlist.c:668
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:174
 msgid "Too many references: cannot splice"
-msgstr "���Ȥ�¿�����ޤ�: �Ȥ߷Ѥ��Ǥ��ޤ���"
+msgstr "���Ȥ�¿�����ޤ�: ��³�Ǥ��ޤ���"
 
 #. TRANS A socket operation with a specified timeout received no response during
 #. TRANS the timeout period.
 #: stdio-common/../sysdeps/gnu/errlist.c:678
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:175
 msgid "Connection timed out"
-msgstr "��³�����ॢ���ȤǤ�"
+msgstr "��³�������ॢ���Ȥ��ޤ���"
 
 #. TRANS A remote host refused to allow the network connection (typically because
 #. TRANS it is not running the requested service).
@@ -2935,7 +2952,7 @@ msgstr "���顼 119"
 
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:152
 msgid "Operation not supported on transport endpoint"
-msgstr "����ž����Ǥϥ��ݡ��Ȥ��Ƥ��ޤ���"
+msgstr "�̿�ü���Ǥϥ��ݡ��Ȥ���Ƥ��ʤ����Ǥ�"
 
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:154
 msgid "Address family not supported by protocol family"
@@ -2971,13 +2988,21 @@ msgstr "���顼 142"
 
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:173
 msgid "Cannot send after socket shutdown"
-msgstr "�����åȤ��Ĥ�����˥ѥ��åȤ������Ǥ��ޤ���"
+msgstr "�����åȤΥ���åȥ������������Ǥ��ޤ���"
 
 #: stdio-common/psignal.c:63
 #, c-format
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%s̤�ΤΥ����ʥ� %d �Ǥ�\n"
 
+#: dlfcn/dlinfo.c:51
+msgid "RTLD_SELF used in code not dynamically loaded"
+msgstr "��������ǻȤ��Ƥ���RTLD_SELF��ưŪ���ɤ߹���ޤ���"
+
+#: dlfcn/dlinfo.c:61
+msgid "unsupported dlinfo request"
+msgstr "̤���ݡ��Ȥ�dlinfo�ꥯ������"
+
 #: malloc/mcheck.c:346
 msgid "memory is consistent, library is buggy\n"
 msgstr "����ϰ��������äƤ��ޤ������饤�֥�꤬�Х����Ǥ�\n"
@@ -3044,346 +3069,362 @@ msgstr "�ꥢ�륿���ॷ���ʥ� %d �Ǥ�"
 msgid "Unknown signal %d"
 msgstr "̤�ΤΥ����ʥ�(%d)"
 
-#: timezone/zdump.c:175
+#: timezone/zdump.c:176
 #, c-format
-msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
-msgstr "%s: ����ˡ %s [ -v ] [ -c ���åȥ��� ] ������̾ �š�\n"
+msgid "%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
+msgstr "%s: ����ˡ %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
 
-#: timezone/zdump.c:268
+#: timezone/zdump.c:269
 msgid "Error writing standard output"
 msgstr "���顼��ɸ����Ϥ˽񤭽Ф���"
 
-#: timezone/zic.c:365
+#: timezone/zic.c:361
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: ���꤬­��ޤ���: %s\n"
 
-#: timezone/zic.c:390 misc/error.c:127 misc/error.c:155
+#: timezone/zic.c:386 misc/error.c:129 misc/error.c:157
 msgid "Unknown system error"
 msgstr "̤�ΤΥ����ƥ२�顼"
 
-#: timezone/zic.c:424
+#: timezone/zic.c:420
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", %d��: %s"
 
-#: timezone/zic.c:427
+#: timezone/zic.c:423
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (\"%s\"�����, %d��)"
 
-#: timezone/zic.c:439
+#: timezone/zic.c:435
 msgid "warning: "
 msgstr "�ٹ�: "
 
-#: timezone/zic.c:449
+#: timezone/zic.c:445
 #, c-format
 msgid ""
-"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"%s: usage is %s [ --version ] [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 msgstr ""
-"%s: ����ˡ %s [ -s ] [ -v ] [ -l ����������� ] [ -p posixrules ] \\\n"
+"%s: ����ˡ %s [ --version ] [ -s ] [ -v ] [ -l ����������� ] [ -p posixrules ] \\\n"
 "\t[ -d �ǥ��쥯�ȥ� ] [ -L ���� ] [ -y yearistype ] [ �ե�����̾ ... ]\n"
 
-#: timezone/zic.c:491
+#: timezone/zic.c:492
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: -d ���ץ����ʣ�����ꤵ��Ƥ��ޤ�\n"
 
-#: timezone/zic.c:501
+#: timezone/zic.c:502
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: -l ���ץ����ʣ�����ꤵ��Ƥ��ޤ�\n"
 
-#: timezone/zic.c:511
+#: timezone/zic.c:512
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: -p ���ץ����ʣ�����ꤵ��Ƥ��ޤ�\n"
 
-#: timezone/zic.c:521
+#: timezone/zic.c:522
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: -y ���ץ����ʣ�����ꤵ��Ƥ��ޤ�\n"
 
-#: timezone/zic.c:531
+#: timezone/zic.c:532
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: -L ���ץ����ʣ�����ꤵ��Ƥ��ޤ�\n"
 
-#: timezone/zic.c:638
+#: timezone/zic.c:639
 #, c-format
 msgid "%s: Can't unlink  %s: %s\n"
 msgstr "%s: %s�򥢥��󥯤Ǥ��ޤ���: %s\n"
 
-#: timezone/zic.c:645
+#: timezone/zic.c:646
 msgid "hard link failed, symbolic link used"
 msgstr "�ϡ��ɥ�󥯤˼��Ԥ������ᡢ����ܥ�å���󥯤�Ȥ��ޤ�"
 
-#: timezone/zic.c:653
+#: timezone/zic.c:654
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: %s����%s�إ�󥯤�ĥ��ޤ���: %s\n"
 
-#: timezone/zic.c:751 timezone/zic.c:753
+#: timezone/zic.c:752 timezone/zic.c:754
 msgid "same rule name in multiple files"
 msgstr "ʣ���ե������Ʊ���롼��̾������ޤ�"
 
-#: timezone/zic.c:794
+#: timezone/zic.c:795
 msgid "unruly zone"
 msgstr "unruly zone"
 
-#: timezone/zic.c:801
+#: timezone/zic.c:802
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s in ruleless zone"
 
-#: timezone/zic.c:822
+#: timezone/zic.c:823
 msgid "standard input"
 msgstr "ɸ������"
 
-#: timezone/zic.c:827
+#: timezone/zic.c:828
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: %s�򳫤��ޤ���: %s\n"
 
-#: timezone/zic.c:838
+#: timezone/zic.c:839
 msgid "line too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: timezone/zic.c:858
+#: timezone/zic.c:859
 msgid "input line of unknown type"
 msgstr "�����ʷ��������ϥ饤��ԤǤ�"
 
-#: timezone/zic.c:874
+#: timezone/zic.c:875
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: ���åե�����Ǥʤ��ե����� %s �� Leap �Ԥ�����ޤ�\n"
 
-#: timezone/zic.c:881 timezone/zic.c:1295 timezone/zic.c:1320
+#: timezone/zic.c:882 timezone/zic.c:1297 timezone/zic.c:1322
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: �ѥ˥å�: ������ l_value(%d)�Ǥ�\n"
 
-#: timezone/zic.c:889
+#: timezone/zic.c:890
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: %s���ɤ߹��ߥ��顼\n"
 
-#: timezone/zic.c:896
+#: timezone/zic.c:897
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: %s�򥯥�������˥��顼: %s\n"
 
-#: timezone/zic.c:901
+#: timezone/zic.c:902
 msgid "expected continuation line not found"
 msgstr "��³�Ԥ����Ԥ���ޤ��������Ĥ���ޤ���"
 
-#: timezone/zic.c:957
+#: timezone/zic.c:958
 msgid "wrong number of fields on Rule line"
 msgstr "Rule�ԤΥե�����ɿ����ְ�äƤ��ޤ�"
 
-#: timezone/zic.c:961
+#: timezone/zic.c:962
 msgid "nameless rule"
 msgstr "̾�����ʤ��롼��Ǥ�"
 
-#: timezone/zic.c:966
+#: timezone/zic.c:967
 msgid "invalid saved time"
 msgstr "��������¸����"
 
-#: timezone/zic.c:985
+#: timezone/zic.c:986
 msgid "wrong number of fields on Zone line"
 msgstr "Zone�ԤΥե�����ɿ����ְ�äƤ��ޤ�"
 
-#: timezone/zic.c:991
+#: timezone/zic.c:992
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"Zone %s\"�Ԥ� -l ���ץ�����Ʊ������Ǥ��ޤ���"
 
-#: timezone/zic.c:999
+#: timezone/zic.c:1000
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"Zone %s\"�Ԥ� -p ���ץ�����Ʊ������Ǥ��ޤ���"
 
-#: timezone/zic.c:1011
+#: timezone/zic.c:1012
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "������̾ %s ����ʣ���Ƥ��ޤ�(�ե�����\"%s\", %d ��)"
 
-#: timezone/zic.c:1027
+#: timezone/zic.c:1028
 msgid "wrong number of fields on Zone continuation line"
 msgstr "Zone continuation�ԤΥե�����ɿ����ְ�äƤ��ޤ�"
 
-#: timezone/zic.c:1067
+#: timezone/zic.c:1068
 msgid "invalid UTC offset"
 msgstr "������UTC���ե��å�"
 
-#: timezone/zic.c:1070
+#: timezone/zic.c:1071
 msgid "invalid abbreviation format"
 msgstr "�����ʾ�ά��"
 
-#: timezone/zic.c:1096
+#: timezone/zic.c:1097
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "������Ϣ³�� end time �����ιԤ� end time �����Ǥ��äƤϤʤ�ޤ���"
 
-#: timezone/zic.c:1123
+#: timezone/zic.c:1124
 msgid "wrong number of fields on Leap line"
 msgstr "Leap�ԤΥե�����ɿ����ְ�äƤ��ޤ�"
 
-#: timezone/zic.c:1132
+#: timezone/zic.c:1133
 msgid "invalid leaping year"
 msgstr "�����ʤ��뤦ǯ�Ǥ�"
 
-#: timezone/zic.c:1147 timezone/zic.c:1250
+#: timezone/zic.c:1148 timezone/zic.c:1252
 msgid "invalid month name"
 msgstr "�����ʷ�̾�Ǥ�"
 
-#: timezone/zic.c:1160 timezone/zic.c:1372 timezone/zic.c:1386
+#: timezone/zic.c:1161 timezone/zic.c:1374 timezone/zic.c:1388
 msgid "invalid day of month"
 msgstr "������1����������ˤ��Ǥ�"
 
-#: timezone/zic.c:1165
+#: timezone/zic.c:1166
 msgid "time before zero"
 msgstr "���������"
 
-#: timezone/zic.c:1173 timezone/zic.c:2049 timezone/zic.c:2068
-msgid "time overflow"
-msgstr "���֥����С��ե���"
+#: timezone/zic.c:1170
+msgid "time too small"
+msgstr "���郎���������ޤ�"
+
+#: timezone/zic.c:1174
+msgid "time too large"
+msgstr "���郎�礭�����ޤ�"
 
-#: timezone/zic.c:1176 timezone/zic.c:1279
+#: timezone/zic.c:1178 timezone/zic.c:1281
 msgid "invalid time of day"
 msgstr "1���դ�λ��֤�����"
 
-#: timezone/zic.c:1195
+#: timezone/zic.c:1197
 msgid "illegal CORRECTION field on Leap line"
 msgstr "Leap �Ԥ������� CORRECTION �ե�����ɤ�����ޤ�"
 
-#: timezone/zic.c:1199
+#: timezone/zic.c:1201
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "Leap �Ԥ������� Rolling/Stationary �ե�����ɤ�����ޤ�"
 
-#: timezone/zic.c:1214
+#: timezone/zic.c:1216
 msgid "wrong number of fields on Link line"
 msgstr "Link�ԤΥե�����ɿ����ְ�äƤ��ޤ�"
 
-#: timezone/zic.c:1218
+#: timezone/zic.c:1220
 msgid "blank FROM field on Link line"
 msgstr "Link �Ԥ� FROM �ե�����ɤ�����Ǥ�"
 
-#: timezone/zic.c:1222
+#: timezone/zic.c:1224
 msgid "blank TO field on Link line"
 msgstr "Link �Ԥ� TO �ե�����ɤ�����Ǥ�"
 
-#: timezone/zic.c:1299
+#: timezone/zic.c:1301
 msgid "invalid starting year"
 msgstr "�����ʳ���ǯ"
 
-#: timezone/zic.c:1303 timezone/zic.c:1328
+#: timezone/zic.c:1305
 msgid "starting year too low to be represented"
 msgstr "����ǯ���ͤ����������뤿��ɽ���Ǥ��ޤ���"
 
-#: timezone/zic.c:1305 timezone/zic.c:1330
+#: timezone/zic.c:1307
 msgid "starting year too high to be represented"
 msgstr "����ǯ���ͤ��礭�����뤿��ɽ���Ǥ��ޤ���"
 
-#: timezone/zic.c:1324
+#: timezone/zic.c:1326
 msgid "invalid ending year"
 msgstr "�����ʽ�λǯ"
 
-#: timezone/zic.c:1333
+#: timezone/zic.c:1330
+msgid "ending year too low to be represented"
+msgstr "��λǯ���ͤ����������뤿��ɽ���Ǥ��ޤ���"
+
+#: timezone/zic.c:1332
+msgid "ending year too high to be represented"
+msgstr "��λǯ���ͤ��礭�����뤿��ɽ���Ǥ��ޤ���"
+
+#: timezone/zic.c:1335
 msgid "starting year greater than ending year"
 msgstr "����ǯ����λǯ����礭���ʤäƤ��ޤ�"
 
-#: timezone/zic.c:1340
+#: timezone/zic.c:1342
 msgid "typed single year"
 msgstr "typed single year"
 
-#: timezone/zic.c:1377
+#: timezone/zic.c:1379
 msgid "invalid weekday name"
 msgstr "������������̾"
 
-#: timezone/zic.c:1492
+#: timezone/zic.c:1494
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: %s�����Ǥ��ޤ���: %s\n"
 
-#: timezone/zic.c:1502
+#: timezone/zic.c:1504
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: %s������Ǥ��ޤ���: %s\n"
 
-#: timezone/zic.c:1568
+#: timezone/zic.c:1570
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: %s�ν񤭹��ߥ��顼�Ǥ�\n"
 
-#: timezone/zic.c:1758
+#: timezone/zic.c:1760
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "���礦�ɤ��λ������Ѥ��륿���ॾ����ξ�ά�������Ǥ��ޤ���"
 
-#: timezone/zic.c:1801
+#: timezone/zic.c:1803
 msgid "too many transitions?!"
 msgstr "�����褬¿�����ޤ�?!"
 
-#: timezone/zic.c:1820
+#: timezone/zic.c:1822
 msgid "internal error - addtype called with bad isdst"
 msgstr "�������顼 - �ְ�ä� isdst �ȤȤ�� addtype ���ƤФ�ޤ���"
 
-#: timezone/zic.c:1824
+#: timezone/zic.c:1826
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "�������顼 - �ְ�ä� ttisstd �ȤȤ�� addtype ���ƤФ�ޤ���"
 
-#: timezone/zic.c:1828
+#: timezone/zic.c:1830
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "�������顼 - �ְ�ä� ttisgmt �ȤȤ�� addtype ���ƤФ�ޤ���"
 
-#: timezone/zic.c:1847
+#: timezone/zic.c:1849
 msgid "too many local time types"
 msgstr "����������ַ�����¿�����ޤ�"
 
-#: timezone/zic.c:1875
+#: timezone/zic.c:1877
 msgid "too many leap seconds"
 msgstr "���뤦�ä��礭�����ޤ�"
 
-#: timezone/zic.c:1881
+#: timezone/zic.c:1883
 msgid "repeated leap second moment"
 msgstr "�۴ı��äνִ�"
 
-#: timezone/zic.c:1933
+#: timezone/zic.c:1935
 msgid "Wild result from command execution"
 msgstr "���ޥ�ɼ¹Ԥ�����Ƥ����"
 
-#: timezone/zic.c:1934
+#: timezone/zic.c:1936
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: ���ޥ�ɤ�'%s', ��̤� %d�Ǥ���\n"
 
-#: timezone/zic.c:2029
+#: timezone/zic.c:2031
 msgid "Odd number of quotation marks"
 msgstr "�������Ȥ���ޡ����������ʬ��������ޤ���"
 
-#: timezone/zic.c:2115
+#: timezone/zic.c:2051 timezone/zic.c:2070
+msgid "time overflow"
+msgstr "���֥����С��ե���"
+
+#: timezone/zic.c:2117
 msgid "use of 2/29 in non leap-year"
 msgstr "��ǯ�ǤϤʤ��Τ�2/29��ȤäƤ��ޤ�"
 
-#: timezone/zic.c:2149
+#: timezone/zic.c:2151
 msgid "no day in month matches rule"
 msgstr "���������ˤ��ϥ롼��˥ޥå����Ƥ��ޤ���"
 
-#: timezone/zic.c:2172
+#: timezone/zic.c:2175
 msgid "too many, or too long, time zone abbreviations"
 msgstr "�����ॾ����ξ�ά̾��¿�����뤫Ĺ�����ޤ�"
 
-#: timezone/zic.c:2213
+#: timezone/zic.c:2216
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ�%s������Ǥ��ޤ���: %s\n"
 
-#: timezone/zic.c:2235
+#: timezone/zic.c:2238
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d ��������������ĥ���ޤ���Ǥ���\n"
 
-#: posix/../sysdeps/generic/wordexp.c:1801
+#: posix/../sysdeps/generic/wordexp.c:1797
 msgid "parameter null or not set"
 msgstr "�ѥ�᡼����NULL�����åȤ���Ƥ��ޤ���"
 
@@ -3451,249 +3492,249 @@ msgstr "���Ƥ��׵�ϴ�λ���ޤ���"
 msgid "Interrupted by a signal"
 msgstr "�����ʥ�ˤ�������"
 
-#: posix/getconf.c:889
+#: posix/getconf.c:892
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
 msgstr "����ˡ: %s [-v ����] �ѿ�̾ [�ѥ�̾]\n"
 
-#: posix/getconf.c:947
+#: posix/getconf.c:950
 #, c-format
 msgid "unknown specification \"%s\""
 msgstr "̤�Τλ��� \"%s\" �Ǥ�"
 
-#: posix/getconf.c:974 posix/getconf.c:990
+#: posix/getconf.c:979 posix/getconf.c:995
 msgid "undefined"
 msgstr "̤���"
 
-#: posix/getconf.c:1012
+#: posix/getconf.c:1017
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "�ѿ�`%s'��ǧ���Ǥ��ޤ���"
 
-#: posix/getopt.c:692 posix/getopt.c:704
+#: posix/getopt.c:692 posix/getopt.c:711
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ���ץ����`%s'��ۣ��Ǥ�\n"
 
-#: posix/getopt.c:737 posix/getopt.c:741
+#: posix/getopt.c:744 posix/getopt.c:748
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ����`--%s'�ϰ�����Ȥ�ޤ���\n"
 
-#: posix/getopt.c:750 posix/getopt.c:755
+#: posix/getopt.c:757 posix/getopt.c:762
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ����`%c%s'�ϰ�����Ȥ�ޤ���\n"
 
-#: posix/getopt.c:791 posix/getopt.c:804 posix/getopt.c:1093
-#: posix/getopt.c:1106
+#: posix/getopt.c:807 posix/getopt.c:829 posix/getopt.c:1159
+#: posix/getopt.c:1181
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ���ץ����`%s'�ˤϰ�����ɬ�פǤ�\n"
 
-#: posix/getopt.c:842 posix/getopt.c:845
+#: posix/getopt.c:867 posix/getopt.c:870
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ǧ���Ǥ��ʤ����ץ����`--%s'�Ǥ�\n"
 
-#: posix/getopt.c:853 posix/getopt.c:856
+#: posix/getopt.c:878 posix/getopt.c:881
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ǧ���Ǥ��ʤ����ץ����`%c%s'�Ǥ�\n"
 
-#: posix/getopt.c:903 posix/getopt.c:906
+#: posix/getopt.c:936 posix/getopt.c:939
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: �����ʥ��ץ����Ǥ� -- %c\n"
 
-#: posix/getopt.c:912 posix/getopt.c:915
+#: posix/getopt.c:945 posix/getopt.c:948
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ���ץ���󤬰㤤�ޤ� -- %c\n"
 
-#: posix/getopt.c:962 posix/getopt.c:973 posix/getopt.c:1159
-#: posix/getopt.c:1172
+#: posix/getopt.c:1003 posix/getopt.c:1022 posix/getopt.c:1234
+#: posix/getopt.c:1255
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ���ץ����ˤϰ�����ɬ�פǤ� -- %c\n"
 
-#: posix/getopt.c:1025 posix/getopt.c:1036
+#: posix/getopt.c:1074 posix/getopt.c:1093
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ���ץ���� `-W %s' ��ۣ��Ǥ�\n"
 
-#: posix/getopt.c:1060 posix/getopt.c:1072
+#: posix/getopt.c:1117 posix/getopt.c:1138
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ���ץ����`-W %s'�ϰ�����Ȥ�ޤ���\n"
 
-#: posix/regcomp.c:136
+#: posix/regcomp.c:150
 msgid "No match"
 msgstr "���פ��ޤ���"
 
-#: posix/regcomp.c:139
+#: posix/regcomp.c:153
 msgid "Invalid regular expression"
 msgstr "̵��������ɽ���Ǥ�"
 
-#: posix/regcomp.c:142
+#: posix/regcomp.c:156
 msgid "Invalid collation character"
 msgstr "̵���ʾȹ�ʸ���Ǥ�"
 
-#: posix/regcomp.c:145
+#: posix/regcomp.c:159
 msgid "Invalid character class name"
 msgstr "̵���ʥ���饯�����饹̾�Ǥ�"
 
-#: posix/regcomp.c:148
+#: posix/regcomp.c:162
 msgid "Trailing backslash"
 msgstr "�Хå�����å��夬�ĤäƤ��ޤ�"
 
-#: posix/regcomp.c:151
+#: posix/regcomp.c:165
 msgid "Invalid back reference"
 msgstr "̵���ʸ������ȤǤ�"
 
-#: posix/regcomp.c:154
+#: posix/regcomp.c:168
 msgid "Unmatched [ or [^"
 msgstr "[ �⤷���� [^ �����פ��ޤ���"
 
-#: posix/regcomp.c:157
+#: posix/regcomp.c:171
 msgid "Unmatched ( or \\("
 msgstr "( �⤷���� \\( �����פ��ޤ���"
 
-#: posix/regcomp.c:160
+#: posix/regcomp.c:174
 msgid "Unmatched \\{"
 msgstr "\\{ �����פ��ޤ���"
 
-#: posix/regcomp.c:163
+#: posix/regcomp.c:177
 msgid "Invalid content of \\{\\}"
 msgstr "̵���� \\{\\} �����ƤǤ�"
 
-#: posix/regcomp.c:166
+#: posix/regcomp.c:180
 msgid "Invalid range end"
 msgstr "̵���ʽ�ü�ϰϤǤ�"
 
-#: posix/regcomp.c:169
+#: posix/regcomp.c:183
 msgid "Memory exhausted"
 msgstr "�����Ȥ��Ԥ��ޤ���"
 
-#: posix/regcomp.c:172
+#: posix/regcomp.c:186
 msgid "Invalid preceding regular expression"
 msgstr "̵�������Ҥ�����ɽ���Ǥ�"
 
-#: posix/regcomp.c:175
+#: posix/regcomp.c:189
 msgid "Premature end of regular expression"
 msgstr "����ɽ���ν�ü���᤹���ޤ�"
 
-#: posix/regcomp.c:178
+#: posix/regcomp.c:192
 msgid "Regular expression too big"
 msgstr "����ɽ����Ĺ�����ޤ�"
 
-#: posix/regcomp.c:181
+#: posix/regcomp.c:195
 msgid "Unmatched ) or \\)"
 msgstr ") �⤷���� \\) �����פ��ޤ���"
 
-#: posix/regcomp.c:615
+#: posix/regcomp.c:661
 msgid "No previous regular expression"
 msgstr "����������ɽ�����������Ƥ��ޤ���"
 
-#: argp/argp-help.c:213
+#: argp/argp-help.c:224
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT �ѥ�᡼���ˤ��ͤ�ɬ�פǤ�"
 
-#: argp/argp-help.c:222
+#: argp/argp-help.c:233
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: ������ ARGP_HELP_FMT �ѥ�᡼��"
 
-#: argp/argp-help.c:234
+#: argp/argp-help.c:245
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT ��ˤ��ߤ�����ޤ�: %s"
 
-#: argp/argp-help.c:1189
+#: argp/argp-help.c:1205
 msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
-msgstr "���󥰥��ץ�����ɬ�ܤޤ���Ǥ�դΰ����ϡ�������б����륷�硼�ȥ��ץ����Ǥ�ɬ�ܤޤ���Ǥ�դǤ�."
+msgstr "���󥰥��ץ�����ɬ�ܤޤ���Ǥ�դΰ����ϡ�������б����륷�硼�ȥ��ץ����Ǥ�Ʊ���褦��ɬ�ܤޤ���Ǥ�դǤ�."
 
-#: argp/argp-help.c:1572
+#: argp/argp-help.c:1592
 msgid "Usage:"
 msgstr "����ˡ:"
 
-#: argp/argp-help.c:1576
+#: argp/argp-help.c:1596
 msgid "  or: "
 msgstr " ����: "
 
-#: argp/argp-help.c:1588
+#: argp/argp-help.c:1608
 msgid " [OPTION...]"
 msgstr " [���ץ����...]"
 
-#: argp/argp-help.c:1615
+#: argp/argp-help.c:1635
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "�ܺ٤�`%s --help'�ޤ���`%s --usage'��¹Ԥ��Ʋ�����.\n"
 
-#: argp/argp-help.c:1643
+#: argp/argp-help.c:1663
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "�Х���ȯ�������� %s ������𤷤Ʋ�����.\n"
 
-#: argp/argp-parse.c:100
+#: argp/argp-parse.c:115
 msgid "Give this help list"
 msgstr "���Υإ�פ�ɽ��"
 
-#: argp/argp-parse.c:101
+#: argp/argp-parse.c:116
 msgid "Give a short usage message"
 msgstr "û��������ˡ��ɽ��"
 
-#: argp/argp-parse.c:102
+#: argp/argp-parse.c:117
 msgid "Set the program name"
 msgstr "�ץ������̾�򥻥åȤ���"
 
-#: argp/argp-parse.c:104
+#: argp/argp-parse.c:119
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "SECS �äǥϥ� (�ǥե���� 3600)"
 
-#: argp/argp-parse.c:161
+#: argp/argp-parse.c:180
 msgid "Print program version"
 msgstr "�ץ������ΥС�������ɽ������"
 
-#: argp/argp-parse.c:177
+#: argp/argp-parse.c:196
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(�ץ�����२�顼) ̤�ΤΥС������!?"
 
-#: argp/argp-parse.c:653
+#: argp/argp-parse.c:672
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: ������¿�����ޤ�\n"
 
-#: argp/argp-parse.c:794
+#: argp/argp-parse.c:813
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(�ץ�����२�顼) ���ץ�����ǧ������Ƥ���٤��Ǥ�!?"
 
-#: resolv/herror.c:67
+#: resolv/herror.c:68
 msgid "Resolver Error 0 (no error)"
 msgstr "�꥾��Х��顼 0 (���顼�Ϥ���ޤ���)"
 
-#: resolv/herror.c:68
+#: resolv/herror.c:69
 msgid "Unknown host"
 msgstr "�����ʥۥ���"
 
-#: resolv/herror.c:69
+#: resolv/herror.c:70
 msgid "Host name lookup failure"
 msgstr "�ۥ���̾�θ����˼��Ԥ��ޤ���"
 
-#: resolv/herror.c:70
+#: resolv/herror.c:71
 msgid "Unknown server error"
 msgstr "�����ʥ����Х��顼"
 
-#: resolv/herror.c:71
+#: resolv/herror.c:72
 msgid "No address associated with name"
 msgstr "̾�����б����륢�ɥ쥹������ޤ���"
 
-#: resolv/herror.c:107
+#: resolv/herror.c:108
 msgid "Resolver internal error"
 msgstr "�꥾����������顼"
 
-#: resolv/herror.c:110
+#: resolv/herror.c:111
 msgid "Unknown resolver error"
 msgstr "�����ʥ꥾��Х��顼"
 
@@ -3745,24 +3786,24 @@ msgstr "�ǡ����١��� [���� ...]"
 msgid "Service configuration to be used"
 msgstr "���Υ����ӥ��������Ѥ���"
 
-#: nss/getent.c:136 nss/getent.c:308
+#: nss/getent.c:136 nss/getent.c:375
 #, c-format
 msgid "Enumeration not supported on %s\n"
 msgstr "���ͤ� %s �ǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: nss/getent.c:732
+#: nss/getent.c:800
 msgid "getent - get entries from administrative database."
 msgstr "getent - �����ǡ����١������饨��ȥ������"
 
-#: nss/getent.c:733
+#: nss/getent.c:801
 msgid "Supported databases:"
 msgstr "���ݡ��Ȥ���Ƥ���ǡ����١���:"
 
-#: nss/getent.c:790 nscd/nscd.c:124 nscd/nscd_nischeck.c:64
+#: nss/getent.c:858 nscd/nscd.c:131 nscd/nscd_nischeck.c:64
 msgid "wrong number of arguments"
 msgstr "�����ο����ְ�äƤ��ޤ�"
 
-#: nss/getent.c:800
+#: nss/getent.c:868
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "̤�ΤΥǡ����١���: %s\n"
@@ -4107,10 +4148,12 @@ msgid "illegal nettype :`%s'\n"
 msgstr "������ nettype �Ǥ�:`%s'\n"
 
 #: sunrpc/rpc_main.c:1104
+#, c-format
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: �����¿�����ޤ�\n"
 
 #: sunrpc/rpc_main.c:1116
+#, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr "rpcgen: �����ꥹ�ȥ����ǥ��󥰥��顼\n"
 
@@ -4122,6 +4165,7 @@ msgid "file `%s' already exists and may be overwritten\n"
 msgstr "�ե�����`%s'�ϴ���¸�ߤ��ޤ�����񤭤���뤫�⤷��ޤ���\n"
 
 #: sunrpc/rpc_main.c:1194
+#, c-format
 msgid "Cannot specify more than one input file!\n"
 msgstr "���ϥե������ʣ������Ǥ��ޤ���!\n"
 
@@ -4130,6 +4174,7 @@ msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr "���μ����Ͽ������ޤ���MT�����դʥ����ɤ򥵥ݡ��Ȥ��Ƥ��ޤ���!\n"
 
 #: sunrpc/rpc_main.c:1373
+#, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "inetd �ե饰�ȤȤ�� netid �ե饰�ϻȤ��ޤ���!\n"
 
@@ -4142,10 +4187,12 @@ msgid "Cannot use table flags with newstyle!\n"
 msgstr "���������ĥơ��֥�ե饰�ϻȤ��ޤ���!\n"
 
 #: sunrpc/rpc_main.c:1411
+#, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "�ƥ�ץ졼�������ե饰�ˤ�\"���ϥե�����\"��ɬ�פǤ�.\n"
 
 #: sunrpc/rpc_main.c:1416
+#, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "�ե����������ե饰��ʣ������Ǥ��ޤ���!\n"
 
@@ -4337,31 +4384,31 @@ msgstr "svcudp_create: ���꤬­��ޤ���\n"
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create: xp_pad��IP_PKTINFO���Ф��ƾ��������ޤ�\n"
 
-#: sunrpc/svc_udp.c:471
+#: sunrpc/svc_udp.c:493
 msgid "enablecache: cache already enabled"
 msgstr "enablecache: ����å���ϴ���ͭ���Ǥ�"
 
-#: sunrpc/svc_udp.c:477
+#: sunrpc/svc_udp.c:499
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache: ����å������ݤǤ��ޤ���Ǥ���"
 
-#: sunrpc/svc_udp.c:485
+#: sunrpc/svc_udp.c:507
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache: ����å���ǡ�������ݤǤ��ޤ���Ǥ���"
 
-#: sunrpc/svc_udp.c:492
+#: sunrpc/svc_udp.c:514
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: ����å���fifo����ݤǤ��ޤ���Ǥ���"
 
-#: sunrpc/svc_udp.c:528
+#: sunrpc/svc_udp.c:550
 msgid "cache_set: victim not found"
 msgstr "cache_set: �����ΰ褬�ߤĤ���ޤ���"
 
-#: sunrpc/svc_udp.c:539
+#: sunrpc/svc_udp.c:561
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set: �����ΰ���ݤ˼��Ԥ��ޤ���"
 
-#: sunrpc/svc_udp.c:545
+#: sunrpc/svc_udp.c:567
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: ������rpc_buffer����ݤǤ��ޤ���Ǥ���"
 
@@ -4385,7 +4432,7 @@ msgstr "svc_unix: makefd_xprt: ���꤬­��ޤ���\n"
 msgid "xdr_bytes: out of memory\n"
 msgstr "xdr_bytes: ���꤬­��ޤ���\n"
 
-#: sunrpc/xdr.c:725 sunrpc/xdr.c:728
+#: sunrpc/xdr.c:728 sunrpc/xdr.c:731
 msgid "xdr_string: out of memory\n"
 msgstr "xdr_string: ���꤬­��ޤ���\n"
 
@@ -4803,6 +4850,7 @@ msgid "Access Rights : "
 msgstr "������������  : "
 
 #: nis/nis_print.c:326
+#, c-format
 msgid ""
 "\n"
 "Time to Live  : "
@@ -4893,220 +4941,221 @@ msgstr "    �����Ū�����\n"
 msgid "    No recursive nonmembers\n"
 msgstr "    ��Ƶ�Ū�����\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:96
-#: nis/nss_nisplus/nisplus-publickey.c:172
+#: nis/nss_nisplus/nisplus-publickey.c:101
+#: nis/nss_nisplus/nisplus-publickey.c:182
 #, c-format
 msgid "DES entry for netname %s not unique\n"
 msgstr "�ͥå�̾ %s �� DES ����ȥ꤬��ʣ���Ƥ��ޤ�\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:208
+#: nis/nss_nisplus/nisplus-publickey.c:218
 #, c-format
 msgid "netname2user: missing group id list in `%s'."
 msgstr "netname2user: `%s'�˥��롼��ID�ꥹ�Ȥ�����ޤ���."
 
-#: nis/nss_nisplus/nisplus-publickey.c:285
-#: nis/nss_nisplus/nisplus-publickey.c:291
-#: nis/nss_nisplus/nisplus-publickey.c:350
-#: nis/nss_nisplus/nisplus-publickey.c:359
+#: nis/nss_nisplus/nisplus-publickey.c:300
+#: nis/nss_nisplus/nisplus-publickey.c:306
+#: nis/nss_nisplus/nisplus-publickey.c:370
+#: nis/nss_nisplus/nisplus-publickey.c:379
 #, c-format
 msgid "netname2user: (nis+ lookup): %s\n"
 msgstr "netname2user: (nis+ lookup): %s\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:304
+#: nis/nss_nisplus/nisplus-publickey.c:319
 #, c-format
 msgid "netname2user: DES entry for %s in directory %s not unique"
 msgstr "netname2user: �ǥ��쥯�ȥ� %2$s �� %1$s ���Ф��� DES ����ȥ꤬��ʣ���Ƥ��ޤ�"
 
-#: nis/nss_nisplus/nisplus-publickey.c:322
+#: nis/nss_nisplus/nisplus-publickey.c:337
 #, c-format
 msgid "netname2user: principal name `%s' too long"
 msgstr "netname2user: principal̾ `%s' ��Ĺ�����ޤ�"
 
-#: nis/nss_nisplus/nisplus-publickey.c:372
+#: nis/nss_nisplus/nisplus-publickey.c:392
 #, c-format
 msgid "netname2user: LOCAL entry for %s in directory %s not unique"
 msgstr "netname2user: �ǥ��쥯�ȥ� %2$s �� %1$s ���Ф��� LOCAL ����ȥ꤬��ʣ���Ƥ���"
 
-#: nis/nss_nisplus/nisplus-publickey.c:379
+#: nis/nss_nisplus/nisplus-publickey.c:399
 msgid "netname2user: should not have uid 0"
 msgstr "netname2user: uid 0 ��ȤäƤϤ����ޤ���"
 
-#: nis/ypclnt.c:174
+#: nis/ypclnt.c:171
 #, c-format
 msgid "YPBINDPROC_DOMAIN: %s\n"
 msgstr "YPBINDPROC_DOMAIN: %s\n"
 
-#: nis/ypclnt.c:789
+#: nis/ypclnt.c:780
 msgid "Request arguments bad"
 msgstr "�׵�����������Ǥ�"
 
-#: nis/ypclnt.c:791
+#: nis/ypclnt.c:782
 msgid "RPC failure on NIS operation"
 msgstr "NIS���ˤ�����RPC�μ��ԤǤ�"
 
-#: nis/ypclnt.c:793
+#: nis/ypclnt.c:784
 msgid "Can't bind to server which serves this domain"
 msgstr "���Υɥᥤ��򰷤������ФإХ���ɤǤ��ޤ���"
 
-#: nis/ypclnt.c:795
+#: nis/ypclnt.c:786
 msgid "No such map in server's domain"
 msgstr "�����Хɥᥤ��ˤ��Τ褦�ʥޥåפϤ���ޤ���"
 
-#: nis/ypclnt.c:797
+#: nis/ypclnt.c:788
 msgid "No such key in map"
 msgstr "�ޥåפˤ��Τ褦�ʥ����Ϥ���ޤ���"
 
-#: nis/ypclnt.c:799
+#: nis/ypclnt.c:790
 msgid "Internal NIS error"
 msgstr "NIS�������顼"
 
-#: nis/ypclnt.c:801
+#: nis/ypclnt.c:792
 msgid "Local resource allocation failure"
 msgstr "��������꥽�������ݤμ��Ԥ��ޤ���"
 
-#: nis/ypclnt.c:803
+#: nis/ypclnt.c:794
 msgid "No more records in map database"
 msgstr "�ޥåץǡ����١����ˤ���ʾ嵭Ͽ������ޤ���"
 
-#: nis/ypclnt.c:805
+#: nis/ypclnt.c:796
 msgid "Can't communicate with portmapper"
 msgstr "�ݡ��ȥޥåѡ����̿��Ǥ��ޤ���"
 
-#: nis/ypclnt.c:807
+#: nis/ypclnt.c:798
 msgid "Can't communicate with ypbind"
 msgstr "ypbind���̿��Ǥ��ޤ���"
 
-#: nis/ypclnt.c:809
+#: nis/ypclnt.c:800
 msgid "Can't communicate with ypserv"
 msgstr "ypserv���̿��Ǥ��ޤ���"
 
-#: nis/ypclnt.c:811
+#: nis/ypclnt.c:802
 msgid "Local domain name not set"
 msgstr "��������ɥᥤ��̾�����ꤵ��Ƥ��ޤ���"
 
-#: nis/ypclnt.c:813
+#: nis/ypclnt.c:804
 msgid "NIS map database is bad"
 msgstr "NIS�ޥåץǡ����١����������Ǥ�"
 
-#: nis/ypclnt.c:815
+#: nis/ypclnt.c:806
 msgid "NIS client/server version mismatch - can't supply service"
 msgstr "NIS���饤����Ȥȥ����ФΥС�����󤬰��פ��ޤ��� - �����ӥ����󶡤Ǥ��ޤ���"
 
-#: nis/ypclnt.c:819
+#: nis/ypclnt.c:810
 msgid "Database is busy"
 msgstr "�ǡ����١������ӥ������֤Ǥ�"
 
-#: nis/ypclnt.c:821
+#: nis/ypclnt.c:812
 msgid "Unknown NIS error code"
 msgstr "̤�Τ�NIS���顼������"
 
-#: nis/ypclnt.c:863
+#: nis/ypclnt.c:854
 msgid "Internal ypbind error"
 msgstr "ypbind�������顼"
 
-#: nis/ypclnt.c:865
+#: nis/ypclnt.c:856
 msgid "Domain not bound"
 msgstr "�ɥᥤ��ϥХ���ɤ���Ƥ��ޤ���"
 
-#: nis/ypclnt.c:867
+#: nis/ypclnt.c:858
 msgid "System resource allocation failure"
 msgstr "�����ƥ�꥽�����γ��ݤ˼���"
 
-#: nis/ypclnt.c:869
+#: nis/ypclnt.c:860
 msgid "Unknown ypbind error"
 msgstr "������ypbind���顼"
 
-#: nis/ypclnt.c:908
+#: nis/ypclnt.c:899
 msgid "yp_update: cannot convert host to netname\n"
 msgstr "yp_update: �ۥ��Ȥ�ͥå�̾���Ѵ��Ǥ��ޤ���\n"
 
-#: nis/ypclnt.c:920
+#: nis/ypclnt.c:911
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: �����Х��ɥ쥹�������ޤ���\n"
 
-#: nscd/cache.c:88
+#: nscd/cache.c:94
 msgid "while allocating hash table entry"
 msgstr "�ϥå���ơ��֥륨��ȥ���������"
 
-#: nscd/cache.c:150 nscd/connections.c:187
+#: nscd/cache.c:162 nscd/connections.c:184
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "�ե�����`%s'�� stat() �Ǥ��ޤ���: %s"
 
-#: nscd/connections.c:146
-msgid "cannot read configuration file; this is fatal"
-msgstr "����ե�������ɤ߹���ޤ��󡣤������̿Ū�Ǥ�"
-
-#: nscd/connections.c:153
+#: nscd/connections.c:150
 msgid "Cannot run nscd in secure mode as unprivileged user"
 msgstr "���ø��桼���ϥ����奢�⡼�ɤ�nscd��¹ԤǤ��ޤ���"
 
-#: nscd/connections.c:175
+#: nscd/connections.c:172
 #, c-format
 msgid "while allocating cache: %s"
 msgstr "��������������: %s"
 
-#: nscd/connections.c:200
+#: nscd/connections.c:197
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "�����åȤ򳫤��ޤ���: %s"
 
-#: nscd/connections.c:218
+#: nscd/connections.c:215
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "��³������դ��륽���åȤ�ͭ���ˤǤ��ޤ���: %s"
 
 #: nscd/connections.c:260
 #, c-format
-msgid "handle_request: request received (Version = %d)"
-msgstr "handle_request: �׵᤬���夷�ޤ��� (�С������ = %d)"
-
-#: nscd/connections.c:266
-#, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "�׵ᤵ�줿�Ť��С������ %d �򰷤����Ȥ��Ǥ��ޤ��󡣸��ߤΥС������� %d �Ǥ�"
 
-#: nscd/connections.c:304 nscd/connections.c:326
+#: nscd/connections.c:298 nscd/connections.c:324
 #, c-format
 msgid "cannot write result: %s"
 msgstr "��̤�񤭹���ޤ���: %s"
 
-#: nscd/connections.c:405 nscd/connections.c:499
+#: nscd/connections.c:392 nscd/connections.c:514
 #, c-format
 msgid "error getting callers id: %s"
 msgstr "�ƤӽФ�ID�μ����ǥ��顼: %s"
 
-#: nscd/connections.c:471
+#: nscd/connections.c:485
 #, c-format
 msgid "while accepting connection: %s"
 msgstr "���ե��ͥ��������: %s"
 
-#: nscd/connections.c:482
+#: nscd/connections.c:498
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "�ꥯ������: %s ���ɹ������û���ɹ��ߤǤ�"
 
-#: nscd/connections.c:518
+#: nscd/connections.c:542
 #, c-format
 msgid "key length in request too long: %d"
-msgstr "�׵ᤵ�줿����Ĺ��Ĺ�����ޤ�: %d"
+msgstr "�ꥯ�����Ȥ˴ޤޤ�륭��Ĺ��Ĺ�����ޤ�: %d"
 
-#: nscd/connections.c:532
+#: nscd/connections.c:556
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "�ꥯ�����ȥ���: %s ���ɹ������û���ɹ��ߤǤ�"
 
-#: nscd/connections.c:591 nscd/connections.c:592 nscd/connections.c:611
-#: nscd/connections.c:624 nscd/connections.c:630 nscd/connections.c:637
+#: nscd/connections.c:566
+#, c-format
+msgid "handle_request: request received (Version = %d) from PID %ld"
+msgstr "handle_request: �ꥯ�����Ȥ����� (�С������ = %d) ����PID %ld"
+
+#: nscd/connections.c:571
+#, c-format
+msgid "handle_request: request received (Version = %d)"
+msgstr "handle_request: �׵᤬���� (�С������ = %d)"
+
+#: nscd/connections.c:635 nscd/connections.c:636 nscd/connections.c:655
+#: nscd/connections.c:668 nscd/connections.c:674 nscd/connections.c:681
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "�桼�� '%s' �� nscd ��¹Ԥ���Τ˼��Ԥ��ޤ���"
 
-#: nscd/connections.c:612
+#: nscd/connections.c:656
 msgid "getgrouplist failed"
 msgstr "getgrouplist�˼��Ԥ��ޤ���"
 
-#: nscd/connections.c:625
+#: nscd/connections.c:669
 msgid "setgroups failed"
 msgstr "setgroups�˼��Ԥ��ޤ���"
 
@@ -5118,121 +5167,134 @@ msgstr "�������ԡ����������"
 msgid "while allocating cache entry"
 msgstr "����å��奨��ȥ���������"
 
-#: nscd/grpcache.c:196 nscd/hstcache.c:282 nscd/pwdcache.c:192
+#: nscd/grpcache.c:197 nscd/hstcache.c:283 nscd/pwdcache.c:193
 #, c-format
 msgid "short write in %s: %s"
 msgstr "%s �Ǥ�û���񤭹���: %s"
 
-#: nscd/grpcache.c:218
+#: nscd/grpcache.c:219
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "���롼�ץ���å���� \"%s\" �����Ĥ���ޤ���!"
 
-#: nscd/grpcache.c:284
+#: nscd/grpcache.c:285
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr "̵���� gid �ο��� \"%s\"!"
 
-#: nscd/grpcache.c:291
+#: nscd/grpcache.c:292
 #, c-format
 msgid "Haven't found \"%d\" in group cache!"
 msgstr "���롼�ץ���å������ \"%d\" �����Ĥ���ޤ���!"
 
-#: nscd/hstcache.c:304 nscd/hstcache.c:370 nscd/hstcache.c:435
-#: nscd/hstcache.c:500
+#: nscd/hstcache.c:305 nscd/hstcache.c:371 nscd/hstcache.c:436
+#: nscd/hstcache.c:501
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "�ۥ��ȥ���å���� \"%s\" �����Ĥ���ޤ���!"
 
-#: nscd/nscd.c:85
+#: nscd/nscd.c:89
 msgid "Read configuration data from NAME"
 msgstr "NAME �������������ɤ߹���"
 
-#: nscd/nscd.c:87
+#: nscd/nscd.c:91
 msgid "Do not fork and display messages on the current tty"
 msgstr "�ե��������ʤ��Ǹ��ߤ�tty�˥�å�������ɽ������"
 
-#: nscd/nscd.c:88
+#: nscd/nscd.c:92
 msgid "NUMBER"
 msgstr "�ֹ�"
 
-#: nscd/nscd.c:88
+#: nscd/nscd.c:92
 msgid "Start NUMBER threads"
 msgstr "NUMBER����åɤǵ�ư����"
 
-#: nscd/nscd.c:89
+#: nscd/nscd.c:93
 msgid "Shut the server down"
 msgstr "�����Ф�λ����"
 
-#: nscd/nscd.c:90
+#: nscd/nscd.c:94
 msgid "Print current configuration statistic"
 msgstr "���ߤΥ���ե�����졼���������פ�ɽ������"
 
-#: nscd/nscd.c:91
+#: nscd/nscd.c:95
 msgid "TABLE"
 msgstr "�ơ��֥�"
 
-#: nscd/nscd.c:92
+#: nscd/nscd.c:96
 msgid "Invalidate the specified cache"
 msgstr "���ꥭ��å����̵���Ǥ�"
 
-#: nscd/nscd.c:93
+#: nscd/nscd.c:97
 msgid "TABLE,yes"
 msgstr "�ơ��֥�,�Ϥ�"
 
-#: nscd/nscd.c:93
+#: nscd/nscd.c:97
 msgid "Use separate cache for each user"
 msgstr "�ƥ桼�����Ф��ưۤʤ륭��å������Ѥ��ޤ�"
 
-#: nscd/nscd.c:98
+#: nscd/nscd.c:102
 msgid "Name Service Cache Daemon."
 msgstr "�͡��ॵ���ӥ�����å���ǡ����."
 
-#: nscd/nscd.c:131
+#: nscd/nscd.c:141
+msgid "cannot read configuration file; this is fatal"
+msgstr "����ե�������ɤ߹���ޤ��󡣤������̿Ū�Ǥ�"
+
+#: nscd/nscd.c:152
 msgid "already running"
 msgstr "���˵�ư���Ƥ��ޤ�"
 
-#: nscd/nscd.c:243 nscd/nscd.c:263 nscd/nscd.c:269
+#: nscd/nscd.c:270 nscd/nscd.c:294 nscd/nscd_stat.c:132
 msgid "Only root is allowed to use this option!"
 msgstr "���Υ��ץ�����root�Ǥ����Ȥ��ޤ���!"
 
-#: nscd/nscd_conf.c:83
+#: nscd/nscd_conf.c:88
 #, c-format
 msgid "Parse error: %s"
 msgstr "�ѡ������顼: %s"
 
-#: nscd/nscd_conf.c:166
+#: nscd/nscd_conf.c:171
 #, c-format
 msgid "Could not create log file \"%s\""
 msgstr "�����ե�����\"%s\"������Ǥ��ޤ���Ǥ���"
 
-#: nscd/nscd_conf.c:182
+#: nscd/nscd_conf.c:187
 msgid "Must specify user name for server-user option"
-msgstr "�����Х桼�����ץ������Ф��ƥ桼��̾����ꤹ��ɬ�פ�����ޤ�"
+msgstr "server-user ���ץ������Ф��ƥ桼��̾����ꤹ��ɬ�פ�����ޤ�"
 
-#: nscd/nscd_conf.c:187
+#: nscd/nscd_conf.c:194
+msgid "Must specify user name for stat-user option"
+msgstr "stat-user ���ץ������Ф��ƥ桼��̾����ꤹ��ɬ�פ�����ޤ�"
+
+#: nscd/nscd_conf.c:205
 #, c-format
 msgid "Unknown option: %s %s %s"
 msgstr "�����ʥ��ץ����: %s %s %s"
 
-#: nscd/nscd_stat.c:87
+#: nscd/nscd_stat.c:103
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr "���פ�񤭹���ޤ���: %s"
 
-#: nscd/nscd_stat.c:105
+#: nscd/nscd_stat.c:128
+#, c-format
+msgid "Only root or %s is allowed to use this option!"
+msgstr "root �ޤ��� %s ���������Υ��ץ�������Ѥ��뤳�Ȥ��Ǥ��ޤ�!"
+
+#: nscd/nscd_stat.c:139
 msgid "nscd not running!\n"
 msgstr "nscd�ϵ�ư���Ƥ��ޤ���!\n"
 
-#: nscd/nscd_stat.c:116
+#: nscd/nscd_stat.c:150
 msgid "write incomplete"
 msgstr "����ߤ��Դ����Ǥ�"
 
-#: nscd/nscd_stat.c:128
+#: nscd/nscd_stat.c:162
 msgid "cannot read statistics data"
 msgstr "���׾�����ɤ߹���ޤ���"
 
-#: nscd/nscd_stat.c:131
+#: nscd/nscd_stat.c:165
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -5243,61 +5305,96 @@ msgstr ""
 "\n"
 "%15d  �����ФΥǥХå���٥�\n"
 
-#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148
+#: nscd/nscd_stat.c:189
+#, c-format
+msgid "%3ud %2uh %2um %2lus  server runtime\n"
+msgstr "%3ud %2uh %2um %2lus  ������ �¹Ի���\n"
+
+#: nscd/nscd_stat.c:192
+#, c-format
+msgid "    %2uh %2um %2lus  server runtime\n"
+msgstr "    %2uh %2um %2lus  ������ �¹Ի���\n"
+
+#: nscd/nscd_stat.c:194
+#, c-format
+msgid "        %2um %2lus  server runtime\n"
+msgstr "        %2um %2lus  ������ �¹Ի���\n"
+
+#: nscd/nscd_stat.c:196
+#, c-format
+msgid "            %2lus  server runtime\n"
+msgstr "            %2lus  ������ �¹Ի���\n"
+
+#: nscd/nscd_stat.c:198
+#, c-format
+msgid "%15lu  number of times clients had to wait\n"
+msgstr "%15lu  ���饤����Ȥ��Ԥ����줿���\n"
+
+#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
 msgid "      no"
 msgstr "  ������"
 
-#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148
+#: nscd/nscd_stat.c:213 nscd/nscd_stat.c:215
 msgid "     yes"
 msgstr "    �Ϥ�"
 
-#: nscd/nscd_stat.c:154
+#: nscd/nscd_stat.c:221
 #, c-format
 msgid ""
 "\n"
 "%s cache:\n"
 "\n"
 "%15s  cache is enabled\n"
-"%15Zd  suggested size\n"
-"%15ld  seconds time to live for positive entries\n"
-"%15ld  seconds time to live for negative entries\n"
-"%15ld  cache hits on positive entries\n"
-"%15ld  cache hits on negative entries\n"
-"%15ld  cache misses on positive entries\n"
-"%15ld  cache misses on negative entries\n"
-"%15ld%% cache hit rate\n"
+"%15Zu  suggested size\n"
+"%15lu  seconds time to live for positive entries\n"
+"%15lu  seconds time to live for negative entries\n"
+"%15lu  cache hits on positive entries\n"
+"%15lu  cache hits on negative entries\n"
+"%15lu  cache misses on positive entries\n"
+"%15lu  cache misses on negative entries\n"
+"%15lu%% cache hit rate\n"
+"%15lu  current number of cached values\n"
+"%15lu  maximum number of cached values\n"
+"%15lu  maximum chain length searched\n"
+"%15lu  number of delays on rdlock\n"
+"%15lu  number of delays on wrlock\n"
 "%15s  check /etc/%s for changes\n"
 msgstr ""
 "\n"
 "%s ������:\n"
 "\n"
 "%15s  ����å����ͭ��\n"
-"%15Zd  �侩����Ƥ��륵����\n"
-"%15ld  �ݥ��ƥ��֥���ȥ꤬ͭ�����ÿ�\n"
-"%15ld  �ͥ��ƥ��֥���ȥ꤬ͭ�����ÿ�\n"
-"%15ld  �ݥ��ƥ��֥���ȥ�Υ���å���ҥåȿ�\n"
-"%15ld  �ͥ��ƥ��֥���ȥ�Υ���å���ҥåȿ�\n"
-"%15ld  �ݥ��ƥ��֥���ȥ�Υ���å���ߥ���\n"
-"%15ld  �ͥ��ƥ��֥���ȥ�Υ���å���ߥ���\n"
-"%15ld%% ����å���Υҥå�Ψ\n"
+"%15Zu  �侩����Ƥ��륵����\n"
+"%15lu  �ݥ��ƥ��֥���ȥ꤬ͭ�����ÿ�\n"
+"%15lu  �ͥ��ƥ��֥���ȥ꤬ͭ�����ÿ�\n"
+"%15lu  �ݥ��ƥ��֥���ȥ�Υ���å���ҥåȿ�\n"
+"%15lu  �ͥ��ƥ��֥���ȥ�Υ���å���ҥåȿ�\n"
+"%15lu  �ݥ��ƥ��֥���ȥ�Υ���å���ߥ���\n"
+"%15lu  �ͥ��ƥ��֥���ȥ�Υ���å���ߥ���\n"
+"%15lu%% ����å���Υҥå�Ψ\n"
+"\"%15lu  ����å��夵�줿����ȥ���θ�����\n"
+"\"%15lu  ����å��夵�줿����ȥ���κ�����\n"
+"\"%15lu  ����������������Ĺ�κ�����\n"
+"\"%15lu  rdlock���ٱ��\n"
+"\"%15lu  wrlock���ٱ��\n"
 "%15s  /etc/%s���ѹ�������å�����\n"
 
-#: nscd/pwdcache.c:214
+#: nscd/pwdcache.c:215
 #, c-format
 msgid "Haven't found \"%s\" in password cache!"
 msgstr "�ѥ���ɥ���å���� \"%s\" �����Ĥ���ޤ���!"
 
-#: nscd/pwdcache.c:280
+#: nscd/pwdcache.c:281
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
 msgstr "̵���� uid �ο��� \"%s\"!"
 
-#: nscd/pwdcache.c:287
+#: nscd/pwdcache.c:288
 #, c-format
 msgid "Haven't found \"%d\" in password cache!"
 msgstr "�ѥ���ɥ���å���� \"%d\" �����Ĥ���ޤ���!"
 
-#: elf/../sysdeps/generic/dl-sysdep.c:357
+#: elf/../sysdeps/generic/dl-sysdep.c:422
 msgid "cannot create capability list"
 msgstr "�����ѥӥ�ƥ��ꥹ�Ȥ�����Ǥ��ޤ���"
 
@@ -5335,61 +5432,61 @@ msgstr "ʣ����ưŪ��������\n"
 msgid "%s is for unknown machine %d.\n"
 msgstr "%s ��̤�ΤΥޥ��� %d ���Ф����ΤǤ�.\n"
 
-#: elf/cache.c:69
+#: elf/cache.c:70
 msgid "unknown"
 msgstr "����"
 
-#: elf/cache.c:105
+#: elf/cache.c:111
 msgid "Unknown OS"
 msgstr "̤�Τ�OS"
 
-#: elf/cache.c:110
+#: elf/cache.c:116
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:136 elf/ldconfig.c:1045
+#: elf/cache.c:142 elf/ldconfig.c:1078
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "����å���ե����� %s �򳫤��ޤ���\n"
 
-#: elf/cache.c:148
+#: elf/cache.c:154
 msgid "mmap of cache file failed.\n"
 msgstr "����å���ե������mmap�˼��Ԥ��ޤ���.\n"
 
-#: elf/cache.c:152 elf/cache.c:162
+#: elf/cache.c:158 elf/cache.c:168
 msgid "File is not a cache file.\n"
 msgstr "�ե�����ϥ���å���ե�����ǤϤ���ޤ���.\n"
 
-#: elf/cache.c:195 elf/cache.c:205
+#: elf/cache.c:201 elf/cache.c:211
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d �饤�֥�꤬����å��� `%s �Ǹ��Ĥ���ޤ���\n"
 
-#: elf/cache.c:392
+#: elf/cache.c:410
 #, c-format
 msgid "Can't remove old temporary cache file %s"
 msgstr "�Ť��ƥ�ݥ�ꥭ��å���ե����� %s �����Ǥ��ޤ���"
 
-#: elf/cache.c:399
+#: elf/cache.c:417
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "�ƥ�ݥ�ꥭ��å���ե����� %s �������Ǥ��ޤ���"
 
-#: elf/cache.c:407 elf/cache.c:416 elf/cache.c:420
+#: elf/cache.c:425 elf/cache.c:434 elf/cache.c:438
 msgid "Writing of cache data failed"
 msgstr "����å���ǡ����ν���ߤ˼���"
 
-#: elf/cache.c:424
+#: elf/cache.c:442
 msgid "Writing of cache data failed."
 msgstr "����å���ǡ����ν���ߤ˼��Ԥ��ޤ���."
 
-#: elf/cache.c:431
+#: elf/cache.c:449
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "%s �Υ����������¤� %#o ���ѹ�����Τ˼��Ԥ��ޤ���"
 
-#: elf/cache.c:436
+#: elf/cache.c:454
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "%s ���� %s �ؤ�̾���ѹ��˼��Ԥ��ޤ���"
@@ -5398,7 +5495,7 @@ msgstr "%s ���� %s �ؤ�̾���ѹ��˼��Ԥ��ޤ���"
 msgid "shared object not open"
 msgstr "��ͭ���֥������Ȥ������ޤ���"
 
-#: elf/dl-close.c:486 elf/dl-open.c:444
+#: elf/dl-close.c:531 elf/dl-open.c:454
 msgid "TLS generation counter wrapped!  Please send report with the 'glibcbug' script."
 msgstr "TLS���������󥿤�������ޤ���! 'glibcbug' ������ץȤ�Ȥäƥ�ݡ��Ȥ�����������."
 
@@ -5435,135 +5532,143 @@ msgstr "�����ʥߥå���󥫤ΥХ�!!!"
 msgid "error while loading shared libraries"
 msgstr "��ͭ�饤�֥��Υ�������˥��顼"
 
-#: elf/dl-load.c:339
+#: elf/dl-load.c:347
 msgid "cannot allocate name record"
 msgstr "̾���쥳���ɤ���ݤǤ��ޤ���"
 
-#: elf/dl-load.c:441 elf/dl-load.c:520 elf/dl-load.c:612 elf/dl-load.c:707
+#: elf/dl-load.c:449 elf/dl-load.c:528 elf/dl-load.c:648 elf/dl-load.c:743
 msgid "cannot create cache for search path"
 msgstr "�������ѥ����Ф��륭��å��������Ǥ��ޤ���"
 
-#: elf/dl-load.c:543
+#: elf/dl-load.c:551
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "RUNPATH/RPATH�Υ��ԡ�������Ǥ��ޤ���"
 
-#: elf/dl-load.c:598
+#: elf/dl-load.c:634
 msgid "cannot create search path array"
 msgstr "�������ѥ����쥤������Ǥ��ޤ���"
 
-#: elf/dl-load.c:794
+#: elf/dl-load.c:830
 msgid "cannot stat shared object"
 msgstr "��ͭ���֥������Ȥ�stat�Ǥ��ޤ���"
 
-#: elf/dl-load.c:838
+#: elf/dl-load.c:874
 msgid "cannot open zero fill device"
 msgstr "����������줿�ǥХ����򳫤��ޤ���"
 
-#: elf/dl-load.c:847 elf/dl-load.c:1902
+#: elf/dl-load.c:883 elf/dl-load.c:1929
 msgid "cannot create shared object descriptor"
 msgstr "��ͭ���֥������ȵ��һҤ�����Ǥ��ޤ���"
 
-#: elf/dl-load.c:866 elf/dl-load.c:1398 elf/dl-load.c:1481
+#: elf/dl-load.c:902 elf/dl-load.c:1470 elf/dl-load.c:1553
 msgid "cannot read file data"
 msgstr "�ե�����ǡ������ɤ�ޤ���"
 
-#: elf/dl-load.c:906
+#: elf/dl-load.c:946
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF�����ɥ��ޥ�ɤΥ��饤����Ȥϥڡ������饤�󤵤�Ƥ��ޤ���"
 
-#: elf/dl-load.c:913
+#: elf/dl-load.c:953
 msgid "ELF load command address/offset not properly aligned"
 msgstr "ELF�����ɥ��ޥ�ɤΥ��ɥ쥹/���ե��åȤ�Ŭ�ڤ˥��饤�󤵤�Ƥ��ޤ���"
 
-#: elf/dl-load.c:988
+#: elf/dl-load.c:1037
 msgid "cannot allocate TLS data structures for initial thread"
 msgstr "�ǽ�Υ���åɤΤ����TLS�ǡ�����¤�Τ����ݤǤ��ޤ���"
 
-#: elf/dl-load.c:1012
+#: elf/dl-load.c:1061
 msgid "cannot handle TLS data"
 msgstr "TLS�ǡ����򰷤��ޤ���"
 
-#: elf/dl-load.c:1047
+#: elf/dl-load.c:1075
+msgid "object file has no loadable segments"
+msgstr "���֥������ȥե�����ϥ����ɲ�ǽ�������Ȥ���äƤ��ޤ���"
+
+#: elf/dl-load.c:1110
 msgid "failed to map segment from shared object"
 msgstr "��ͭ���֥������ȤΥ������Ȥ�ޥåפ���Τ˼��Ԥ��ޤ���"
 
-#: elf/dl-load.c:1071
+#: elf/dl-load.c:1135
 msgid "cannot dynamically load executable"
 msgstr "�¹ԥե������ưŪ�˥����ɤǤ��ޤ���"
 
-#: elf/dl-load.c:1132
+#: elf/dl-load.c:1191
 msgid "cannot change memory protections"
 msgstr "�����ݸ���ѹ��Ǥ��ޤ���"
 
-#: elf/dl-load.c:1151
+#: elf/dl-load.c:1210
 msgid "cannot map zero-fill pages"
 msgstr "����������줿�ڡ�����ޥåפǤ��ޤ���"
 
-#: elf/dl-load.c:1169
+#: elf/dl-load.c:1228
 msgid "cannot allocate memory for program header"
 msgstr "�ץ������إå����Ф���������ݤǤ��ޤ���"
 
-#: elf/dl-load.c:1200
+#: elf/dl-load.c:1259
 msgid "object file has no dynamic section"
 msgstr "���֥������ȥե������ưŪ������������äƤ��ޤ���"
 
-#: elf/dl-load.c:1240
+#: elf/dl-load.c:1299
 msgid "shared object cannot be dlopen()ed"
 msgstr "��ͭ���֥������Ȥ� dlopen() �Ǥ��ޤ���"
 
-#: elf/dl-load.c:1263
+#: elf/dl-load.c:1322
 msgid "cannot create searchlist"
 msgstr "�������ꥹ�Ȥ�����Ǥ��ޤ���"
 
-#: elf/dl-load.c:1398
+#: elf/dl-load.c:1352
+msgid "cannot enable executable stack as shared object requires"
+msgstr "��ͭ���֥������Ȥ�ɬ�פȤ��Ƥ���¹Բ�ǽ�����å���ͭ���ˤǤ��ޤ���"
+
+#: elf/dl-load.c:1470
 msgid "file too short"
 msgstr "�ե����뤬���������ޤ�"
 
-#: elf/dl-load.c:1421
+#: elf/dl-load.c:1493
 msgid "invalid ELF header"
 msgstr "������ELF�إå�"
 
-#: elf/dl-load.c:1430
+#: elf/dl-load.c:1502
 msgid "ELF file data encoding not big-endian"
 msgstr "ELF�ե�����ǡ������ӥå�����ǥ�����ǤϤ���ޤ���"
 
-#: elf/dl-load.c:1432
+#: elf/dl-load.c:1504
 msgid "ELF file data encoding not little-endian"
 msgstr "ELF�ե�����ǡ�������ȥ륨��ǥ�����ǤϤ���ޤ���"
 
-#: elf/dl-load.c:1436
+#: elf/dl-load.c:1508
 msgid "ELF file version ident does not match current one"
 msgstr "ELF�ե�����ΥС�������̻Ҥϸ��ߤΥե�����˰��פ��Ƥ��ޤ���"
 
-#: elf/dl-load.c:1440
+#: elf/dl-load.c:1512
 msgid "ELF file OS ABI invalid"
 msgstr "ELF�ե������OS ABI�������Ǥ�."
 
-#: elf/dl-load.c:1442
+#: elf/dl-load.c:1514
 msgid "ELF file ABI version invalid"
 msgstr "ELF�ե������ABI�С�����������Ǥ�."
 
-#: elf/dl-load.c:1445
+#: elf/dl-load.c:1517
 msgid "internal error"
 msgstr "�������顼"
 
-#: elf/dl-load.c:1452
+#: elf/dl-load.c:1524
 msgid "ELF file version does not match current one"
 msgstr "ELF�ե�����ΥС�������ֹ椬���ߤΥե�����˰��פ��Ƥ��ޤ���"
 
-#: elf/dl-load.c:1460
+#: elf/dl-load.c:1532
 msgid "ELF file's phentsize not the expected size"
 msgstr "ELF�ե������phentsize�ϴ��Ԥ���륵�����ǤϤ���ޤ���"
 
-#: elf/dl-load.c:1466
+#: elf/dl-load.c:1538
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "ET_DYN �� ET_EXEC �����������ɤǤ��ޤ���"
 
-#: elf/dl-load.c:1917
+#: elf/dl-load.c:1944
 msgid "cannot open shared object file"
 msgstr "��ͭ���֥������ȥե�����򳫤��ޤ���"
 
-#: elf/dl-lookup.c:265 elf/dl-lookup.c:430
+#: elf/dl-lookup.c:265 elf/dl-lookup.c:443
 msgid "relocation error"
 msgstr "�����֥��顼"
 
@@ -5575,37 +5680,37 @@ msgstr "���Ū�������פ��ĥ�Ǥ��ޤ���"
 msgid "empty dynamic string token substitution"
 msgstr "����ưŪʸ����ȡ����������"
 
-#: elf/dl-open.c:351 elf/dl-open.c:362
+#: elf/dl-open.c:361 elf/dl-open.c:372
 msgid "cannot create scope list"
 msgstr "�������ץꥹ�Ȥ�����Ǥ��ޤ���"
 
-#: elf/dl-open.c:424
+#: elf/dl-open.c:434
 msgid "cannot create TLS data structures"
 msgstr "TLS�ǡ�����¤�Τ�����Ǥ��ޤ���"
 
-#: elf/dl-open.c:486
+#: elf/dl-open.c:496
 msgid "invalid mode for dlopen()"
 msgstr "dlopen()���Ф��������ʥ⡼�ɤǤ�"
 
-#: elf/dl-reloc.c:58
-msgid "shared object cannot be dlopen()ed: static TLS memory too small"
-msgstr "��ͭ���֥������Ȥ� dlopen() �Ǥ��ޤ���: TLS ����Ū���꤬���������ޤ�"
+#: elf/dl-reloc.c:57
+msgid "cannot allocate memory in static TLS block"
+msgstr "��ŪTLS�֥��å��ѥ������ݤǤ��ޤ���"
 
-#: elf/dl-reloc.c:118
+#: elf/dl-reloc.c:176
 msgid "cannot make segment writable for relocation"
 msgstr "�Ƴ����ѤΥ������Ȥ����߲�ǽ�ˤǤ��ޤ���"
 
-#: elf/dl-reloc.c:219
+#: elf/dl-reloc.c:277
 #, c-format
 msgid "%s: profiler found no PLTREL in object %s\n"
 msgstr "%s: �ץ��ե����餬���֥������� %s ��� PLTREL ���ʤ����Ȥ򸫤Ĥ��ޤ���\n"
 
-#: elf/dl-reloc.c:231
+#: elf/dl-reloc.c:289
 #, c-format
 msgid "%s: profiler out of memory shadowing PLTREL of %s\n"
 msgstr "%s: %s �� PLTREL �ѥ��꤬­��ޤ���\n"
 
-#: elf/dl-reloc.c:246
+#: elf/dl-reloc.c:304
 msgid "cannot restore segment prot after reloc"
 msgstr "�����ָ�˥�������prot��ꥹ�ȥ��Ǥ��ޤ���"
 
@@ -5613,7 +5718,7 @@ msgstr "�����ָ�˥�������prot��ꥹ�ȥ��Ǥ��ޤ���"
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "��������ǻȤ��Ƥ���RTLD_NEXT��ưŪ���ɤ߹���ޤ���"
 
-#: elf/dl-version.c:302
+#: elf/dl-version.c:303
 msgid "cannot allocate version reference table"
 msgstr "�С�����󻲾ȥꥹ�Ȥ���ݤǤ��ޤ���"
 
@@ -5657,143 +5762,148 @@ msgstr "�ġ��Υ饤�֥��˼�ư�ǥ�󥯤��Ƥ�������."
 msgid "Format to use: new, old or compat (default)"
 msgstr "���ѥե����ޥå�: ��, ��, �ߴ� (�ǥե����)"
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:139
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "�����ʥߥå���󥫤Υ�󥿥���Х���ǥ��󥰤����ꤷ�ޤ�."
 
-#: elf/ldconfig.c:294
+#: elf/ldconfig.c:297
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "1��ʾ�Ϳ����줿�ѥ�`%s'"
 
-#: elf/ldconfig.c:338
+#: elf/ldconfig.c:341
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s ��̤�ΤΥ饤�֥�꥿���פǤ�"
 
-#: elf/ldconfig.c:356
+#: elf/ldconfig.c:361
 #, c-format
 msgid "Can't stat %s"
 msgstr "stat %s ���Ǥ��ޤ���"
 
-#: elf/ldconfig.c:426
+#: elf/ldconfig.c:431
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "stat %s ���Ǥ��ޤ���\n"
 
-#: elf/ldconfig.c:436
+#: elf/ldconfig.c:441
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s �ϥ���ܥ�å���󥯤ǤϤ���ޤ���\n"
 
-#: elf/ldconfig.c:455
+#: elf/ldconfig.c:460
 #, c-format
 msgid "Can't unlink %s"
 msgstr "%s �򥢥��󥯤Ǥ��ޤ���"
 
-#: elf/ldconfig.c:461
+#: elf/ldconfig.c:466
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "%s ���� %s �إ�󥯤�ĥ��ޤ���"
 
-#: elf/ldconfig.c:467
+#: elf/ldconfig.c:472
 msgid " (changed)\n"
 msgstr " (�ѹ�)\n"
 
-#: elf/ldconfig.c:469
+#: elf/ldconfig.c:474
 msgid " (SKIPPED)\n"
 msgstr " (�����å�)\n"
 
-#: elf/ldconfig.c:524
+#: elf/ldconfig.c:529
 #, c-format
 msgid "Can't find %s"
 msgstr "%s �򸫤Ĥ����ޤ���"
 
-#: elf/ldconfig.c:540
+#: elf/ldconfig.c:545
 #, c-format
 msgid "Can't lstat %s"
 msgstr "lstat %s �Ǥ��ޤ���"
 
-#: elf/ldconfig.c:547
+#: elf/ldconfig.c:552
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "�����Υե�����ǤϤʤ�����ե����� %s ��̵�뤷�ޤ�"
 
-#: elf/ldconfig.c:555
+#: elf/ldconfig.c:560
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "%s ���Ф��� soname �����Ĥ���ʤ������󥯤���������ޤ���"
 
-#: elf/ldconfig.c:646
+#: elf/ldconfig.c:651
 #, c-format
 msgid "Can't open directory %s"
 msgstr "�ǥ��쥯�ȥ� %s �򳫤��ޤ���"
 
-#: elf/ldconfig.c:701 elf/ldconfig.c:748
+#: elf/ldconfig.c:706 elf/ldconfig.c:753
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "lstat %s �Ǥ��ޤ���"
 
-#: elf/ldconfig.c:713
+#: elf/ldconfig.c:718
 #, c-format
 msgid "Cannot stat %s"
 msgstr "stat %s ���Ǥ��ޤ���"
 
-#: elf/ldconfig.c:770 elf/readlib.c:93
+#: elf/ldconfig.c:775 elf/readlib.c:92
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "���ϥե����� %s �����Ĥ���ޤ���.\n"
 
-#: elf/ldconfig.c:804
+#: elf/ldconfig.c:826
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "���ä��ǥ��쥯�ȥ����libc5�饤�֥�� %s"
 
-#: elf/ldconfig.c:807
+#: elf/ldconfig.c:829
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "���ä��ǥ��쥯�ȥ����libc6�饤�֥�� %s"
 
-#: elf/ldconfig.c:810
+#: elf/ldconfig.c:832
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "���ä��ǥ��쥯�ȥ����libc4�饤�֥�� %s "
 
-#: elf/ldconfig.c:837
+#: elf/ldconfig.c:859
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "�ǥ��쥯�ȥ� %3$s ��ˤ���饤�֥�� %1$s �� %2$s ��Ʊ��� soname �Ǥ����ۤʤä������פǤ�."
 
-#: elf/ldconfig.c:940
+#: elf/ldconfig.c:962
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "����ե����� %s �򳫤��ޤ���"
 
-#: elf/ldconfig.c:1024
+#: elf/ldconfig.c:1033
+#, c-format
+msgid "relative path `%s' used to build cache"
+msgstr "����å��������������Хѥ� `%s' �����Ѥ���ޤ���"
+
+#: elf/ldconfig.c:1057
 msgid "Can't chdir to /"
 msgstr "/ ��chdir�Ǥ��ޤ���"
 
-#: elf/ldconfig.c:1066
+#: elf/ldconfig.c:1099
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "����å���ե�����ǥ��쥯�ȥ� %s �򳫤��ޤ���\n"
 
-#: elf/readlib.c:99
+#: elf/readlib.c:98
 #, c-format
 msgid "Cannot fstat file %s.\n"
 msgstr "�ե����� %s �� fstat �Ǥ��ޤ���.\n"
 
-#: elf/readlib.c:109
+#: elf/readlib.c:108
 #, c-format
 msgid "File %s is too small, not checked."
 msgstr "�ե����� %s �Ͼ��������ޤ�, �����å�����Ƥ��ޤ���."
 
-#: elf/readlib.c:118
+#: elf/readlib.c:117
 #, c-format
 msgid "Cannot mmap file %s.\n"
 msgstr "�ե����� %s ��mmap�Ǥ��ޤ���.\n"
 
-#: elf/readlib.c:158
+#: elf/readlib.c:155
 #, c-format
 msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
 msgstr "%s ��ELF�ե�����ǤϤ���ޤ��� - �ְ�ä�magic�Х��Ȥ�ե��������Ƭ�˻��äƤ��ޤ�.\n"
@@ -5887,6 +5997,9 @@ msgstr "%s'��`%s'���Ф����������ץ��ե�����ǡ����ǤϤ���ޤ���"
 msgid "cannot allocate symbol data"
 msgstr "����ܥ�������ݤǤ��ޤ���"
 
+#~ msgid "shared object cannot be dlopen()ed: static TLS memory too small"
+#~ msgstr "��ͭ���֥������Ȥ� dlopen() �Ǥ��ޤ���: TLS ����Ū���꤬���������ޤ�"
+
 #~ 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 ���ϰϤˤʤ���Фʤ�ޤ���"