about summary refs log tree commit diff
path: root/po
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2001-04-26 06:51:00 +0000
committerAndreas Jaeger <aj@suse.de>2001-04-26 06:51:00 +0000
commit736d48a0cc4c6801d0856d9ac69c8cd33f5f2afc (patch)
tree8d756de6c361c8030c32c7552095a60a01c1e8b5 /po
parentc3fa6e3dc7db4a926f65be9855a077da9babd5b6 (diff)
downloadglibc-736d48a0cc4c6801d0856d9ac69c8cd33f5f2afc.tar.gz
glibc-736d48a0cc4c6801d0856d9ac69c8cd33f5f2afc.tar.xz
glibc-736d48a0cc4c6801d0856d9ac69c8cd33f5f2afc.zip
Update from taiwanese translation team.
Diffstat (limited to 'po')
-rw-r--r--po/zh_TW.po1313
1 files changed, 649 insertions, 664 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2fcc273021..cfdbaaadc1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 # Tung-Han Hsieh <thhsieh@linux.org.tw>, 2000
 # Yuan-Chung Cheng <platin@ch.ntu.edu.tw>, 2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libc 2.1.90\n"
-"POT-Creation-Date: 2000-08-01 00:45-0400\n"
+"POT-Creation-Date: 2001-01-21 08:03-0800\n"
 "PO-Revision-Date: 2000-08-DA HO:MI+DIST\n"
 "Last-Translator: Tung-Han Hsieh <thhsieh@linux.org.tw>\n"
 "                 Yuan-Chung Cheng <platin@ch.ntu.edu.tw>\n"
@@ -23,24 +23,27 @@ msgstr "\t\t�s���v�� : "
 msgid "\t\tAttributes    : "
 msgstr "\t\t�ݩ�     : "
 
-#: sunrpc/rpc_main.c:1430
+#: sunrpc/rpc_main.c:1425
 #, c-format
 msgid ""
 "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
 "infile\n"
-msgstr "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
+msgstr ""
+"\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
+"infile\n"
 
-#: sunrpc/rpc_main.c:1432
+#: sunrpc/rpc_main.c:1427
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
-msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
+msgstr ""
+"\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 
-#: sunrpc/rpc_main.c:1435
+#: sunrpc/rpc_main.c:1430
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n netid]* [-o outfile] [infile]\n"
 
-#: sunrpc/rpc_main.c:1434
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s nettype]* [-o outfile] [infile]\n"
@@ -206,102 +209,103 @@ msgstr "    ���j������:\n"
 msgid "   program vers proto   port\n"
 msgstr "   �{���ĥΪ���w�s����\n"
 
-#: argp/argp-help.c:1568
+#: argp/argp-help.c:1572
 msgid "  or: "
 msgstr "  �Ϊ�: "
 
-#: elf/ldconfig.c:389
+#: elf/ldconfig.c:448
 msgid " (SKIPPED)\n"
 msgstr " (����)\n"
 
-#: elf/ldconfig.c:387
+#: elf/ldconfig.c:446
 msgid " (changed)\n"
 msgstr " (�w����)\n"
 
-#: timezone/zic.c:423
+#: timezone/zic.c:421
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (�W�h�Ӧ� \"%s\", �� %d ��)"
 
-#: argp/argp-help.c:1580
+#: argp/argp-help.c:1584
 msgid " [OPTION...]"
 msgstr " [�Ѽ�...]"
 
-#: locale/programs/ld-collate.c:1712 locale/programs/ld-ctype.c:4039
-msgid " done\n"
-msgstr " ����\n"
-
-#: timezone/zic.c:420
+#: timezone/zic.c:418
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", �� %d ��: %s"
 
-#: timezone/zic.c:984
+#: timezone/zic.c:983
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"�Ϭq %s\" ��M -l �ﶵ�O������"
 
-#: timezone/zic.c:992
+#: timezone/zic.c:991
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"�Ϭq %s\" ��M -p �ﶵ�O������"
 
-#: sunrpc/rpc_main.c:1415
+#: sunrpc/rpc_main.c:1410
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "\"infile\" �O�˪����ͺX�Щһݪ�\n"
 
-#: argp/argp-help.c:205
+#: argp/argp-help.c:209
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT �Ѽƻݭn�@�ӭ�"
 
-#: argp/argp-help.c:214
+#: argp/argp-help.c:218
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: ������ ARGP_HELP_FMT �Ѽ�"
 
-#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2727
-#: locale/programs/ld-collate.c:3820 locale/programs/ld-ctype.c:2736
-#: locale/programs/ld-identification.c:440
+#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2593
+#: locale/programs/ld-collate.c:3719 locale/programs/ld-ctype.c:2110
+#: locale/programs/ld-ctype.c:2847 locale/programs/ld-identification.c:440
 #: locale/programs/ld-measurement.c:232 locale/programs/ld-messages.c:326
 #: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:300
 #: locale/programs/ld-numeric.c:370 locale/programs/ld-paper.c:233
-#: locale/programs/ld-telephone.c:308 locale/programs/ld-time.c:1151
+#: locale/programs/ld-telephone.c:308 locale/programs/ld-time.c:1172
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: �w�q�èS���H `END %1$s' ��������"
 
-#: elf/cache.c:160 elf/cache.c:170
+#: elf/cache.c:165 elf/cache.c:175
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d �禡�w�b�֨� `%s' �����\n"
 
-#: timezone/zic.c:794
+#: timezone/zic.c:793
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s �b�S���W�h���Ϭq"
 
-#: elf/../sysdeps/generic/readelflib.c:64
+#: elf/../sysdeps/generic/readelflib.c:65
 #, c-format
 msgid "%s is a 32 bit ELF file.\n"
 msgstr "%s �O�@�� 32 �줸�� ELF �ɮסC\n"
 
-#: elf/../sysdeps/generic/readelflib.c:66
+#: elf/../sysdeps/generic/readelflib.c:67
 #, c-format
 msgid "%s is a 64 bit ELF file.\n"
 msgstr "%s �O�@�� 64 �줸�� ELF �ɮסC\n"
 
-#: elf/ldconfig.c:287
+#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:48
+#, c-format
+msgid "%s is for unknown machine %d.\n"
+msgstr "%s �O������������ %d�C\n"
+
+#: elf/ldconfig.c:329
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s ���O�@�Ӥw�����禡�w���A"
 
-#: elf/../sysdeps/generic/readelflib.c:75
+#: elf/../sysdeps/generic/readelflib.c:76
 #, c-format
 msgid "%s is not a shared object file (Type: %d).\n"
 msgstr "%s ���O�@�Ӧ@�Υت��� (���A: %d)�C\n"
 
-#: elf/ldconfig.c:356
+#: elf/ldconfig.c:415
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s ���O�@�ӲŸ��s����\n"
@@ -326,125 +330,125 @@ msgstr "%s%s%s:%u: %s%s�L�k�w�ƪ����~: %s�C\n"
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%s�������T�� %d\n"
 
-#: timezone/zic.c:2229
+#: timezone/zic.c:2228
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d �L�k���T�a���i�T��\n"
 
-#: locale/programs/charmap.c:289
+#: locale/programs/charmap.c:326
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> �����j�� <mb_cur_min>\n"
 
-#: sunrpc/rpc_main.c:422
+#: sunrpc/rpc_main.c:423
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr "%s: C �e�m�B�z�����ġA�䵲���X�� %d\n"
 
-#: sunrpc/rpc_main.c:419
+#: sunrpc/rpc_main.c:420
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr "%s: C �e�m�B�z�����ġA��T���Ȭ� %d\n"
 
-#: timezone/zic.c:1495
+#: timezone/zic.c:1494
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: �L�k���� %s: %s\n"
 
-#: timezone/zic.c:2207
+#: timezone/zic.c:2206
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: �L�k�إߥؿ� %s: %s\n"
 
-#: timezone/zic.c:646
+#: timezone/zic.c:645
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: �L�k�q %s �s���� %s: %s\n"
 
-#: timezone/zic.c:820
+#: timezone/zic.c:819
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: �L�k�}�� %s: %s\n"
 
-#: timezone/zic.c:1485
+#: timezone/zic.c:1484
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: �L�k���� %s: %s\n"
 
-#: timezone/zic.c:631
+#: timezone/zic.c:630
 #, c-format
 msgid "%s: Can't unlink  %s: %s\n"
 msgstr "%s: �L�k�����s�� %s: %s\n"
 
-#: timezone/zic.c:889
+#: timezone/zic.c:888
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: �������~ %s: %s\n"
 
-#: timezone/zic.c:882
+#: timezone/zic.c:881
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: Ū�����~ %s\n"
 
-#: timezone/zdump.c:266
+#: timezone/zdump.c:267
 #, c-format
 msgid "%s: Error writing "
 msgstr "%s: �g�J���~ "
 
-#: timezone/zic.c:1561
+#: timezone/zic.c:1560
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: �g�J���~ %s\n"
 
-#: timezone/zic.c:867
+#: timezone/zic.c:866
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: �|�ɳ]�w�� (leap line) �X�{�b���t�|�����]�w�� %s ��\n"
 
-#: timezone/zic.c:361
+#: timezone/zic.c:359
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: �O����w��: %s\n"
 
-#: timezone/zic.c:526
+#: timezone/zic.c:525
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: �z�ϥΤF�W�L�@�� -L �ﶵ\n"
 
-#: timezone/zic.c:486
+#: timezone/zic.c:485
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: �z�ϥΤF�W�L�@�� -d �ﶵ\n"
 
-#: timezone/zic.c:496
+#: timezone/zic.c:495
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: �z�ϥΤF�W�L�@�� -l �ﶵ\n"
 
-#: timezone/zic.c:506
+#: timezone/zic.c:505
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: �z�ϥΤF�W�L�@�� -p �ﶵ\n"
 
-#: timezone/zic.c:516
+#: timezone/zic.c:515
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: �z�ϥΤF�W�L�@�� -y �ﶵ\n"
 
-#: argp/argp-parse.c:640
+#: argp/argp-parse.c:646
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: �Ӧh���޼�\n"
 
-#: locale/programs/ld-collate.c:423 locale/programs/ld-collate.c:449
-#: locale/programs/ld-collate.c:465
+#: locale/programs/ld-collate.c:457 locale/programs/ld-collate.c:483
+#: locale/programs/ld-collate.c:499
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' ���u�@���a�b�v�� %d ���Q����"
 
-#: locale/programs/ld-collate.c:1282
+#: locale/programs/ld-collate.c:1323
 #, c-format
-msgid "%s: `%s' must be a charater"
+msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' �����O�@�Ӧr��"
 
 #: locale/programs/ld-address.c:248 locale/programs/ld-address.c:276
@@ -458,86 +462,91 @@ msgstr "%s: `%s' �ȻP `%s' �Ȥ��ŦX"
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1' �b `%s' ��줤�����O�̫�@�Ӷ���"
 
-#: locale/programs/ld-collate.c:413 locale/programs/ld-collate.c:439
+#: locale/programs/ld-collate.c:447 locale/programs/ld-collate.c:473
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: `forward' �H�� `backward' �������۱ƥ�"
 
-#: locale/programs/ld-collate.c:1475
+#: locale/programs/ld-collate.c:1515
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position' �����b�Ҧ��϶��̯S�w�����Ť��ϥΡA�_�h����ϥ�"
 
-#: locale/programs/ld-collate.c:1082
+#: locale/programs/ld-ctype.c:2635 locale/programs/ld-ctype.c:2775
+#, c-format
+msgid "%s: `translit_start' section does not end with `translit_end'"
+msgstr "%s: `translit_start' �p�`�èS���H `translit_end' ��������"
+
+#: locale/programs/ld-collate.c:1123
 #, c-format
 msgid ""
 "%s: byte sequence of first character of sequence is not lower than that of "
 "the last character"
 msgstr "%s: �Ĥ@�Ӧr���ǦC���줸�էǦC�èS���C��̫�@�Ӧr�����줸�էǦC"
 
-#: locale/programs/ld-collate.c:1040
+#: locale/programs/ld-collate.c:1081
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: �Ĥ@�ӻP�̫�@�Ӧr�����줸�էǦC�������ۦP������"
 
-#: locale/programs/ld-collate.c:3742
+#: locale/programs/ld-collate.c:3642
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: �L�k�� `%s' �����ٲ��Ϭq������"
 
-#: locale/programs/ld-collate.c:3421
+#: locale/programs/ld-collate.c:3308
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: �L�k���s�ƦC�b %.*s ����: �������Ÿ�"
 
-#: locale/programs/ld-ctype.c:2797 locale/programs/ld-ctype.c:2881
-#: locale/programs/ld-ctype.c:2901 locale/programs/ld-ctype.c:2922
-#: locale/programs/ld-ctype.c:2943 locale/programs/ld-ctype.c:2964
-#: locale/programs/ld-ctype.c:2985 locale/programs/ld-ctype.c:3025
-#: locale/programs/ld-ctype.c:3046 locale/programs/ld-ctype.c:3113
+#: locale/programs/ld-ctype.c:2910 locale/programs/ld-ctype.c:2994
+#: locale/programs/ld-ctype.c:3014 locale/programs/ld-ctype.c:3035
+#: locale/programs/ld-ctype.c:3056 locale/programs/ld-ctype.c:3077
+#: locale/programs/ld-ctype.c:3098 locale/programs/ld-ctype.c:3138
+#: locale/programs/ld-ctype.c:3159 locale/programs/ld-ctype.c:3226
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: �r����Ӫ������r�� `%s' �L�k���ܬ���@�줸��"
 
-#: locale/programs/ld-ctype.c:3157 locale/programs/ld-ctype.c:3182
+#: locale/programs/ld-ctype.c:3270 locale/programs/ld-ctype.c:3295
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: �����w�]�ȩһݪ��r�� `%s' �L�k���ܬ���@�줸��"
 
-#: locale/programs/ld-ctype.c:2792
+#: locale/programs/ld-ctype.c:2905
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
 msgstr "%s: �r�� `%s' �b�r����Ӫ����S���w�q�A�����O���ݪ��w�]��"
 
-#: locale/programs/ld-ctype.c:2876 locale/programs/ld-ctype.c:2896
-#: locale/programs/ld-ctype.c:2938 locale/programs/ld-ctype.c:2959
-#: locale/programs/ld-ctype.c:2980 locale/programs/ld-ctype.c:3020
-#: locale/programs/ld-ctype.c:3041 locale/programs/ld-ctype.c:3108
-#: locale/programs/ld-ctype.c:3150 locale/programs/ld-ctype.c:3175
+#: locale/programs/ld-ctype.c:2989 locale/programs/ld-ctype.c:3009
+#: locale/programs/ld-ctype.c:3051 locale/programs/ld-ctype.c:3072
+#: locale/programs/ld-ctype.c:3093 locale/programs/ld-ctype.c:3133
+#: locale/programs/ld-ctype.c:3154 locale/programs/ld-ctype.c:3221
+#: locale/programs/ld-ctype.c:3263 locale/programs/ld-ctype.c:3288
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: �r�� `%s' �S���w�q�A�����O���ݪ��w�]��"
 
-#: timezone/zic.c:1928
+#: timezone/zic.c:1927
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: ��J�R�O�� '%s', ���G�� %d\n"
 
-#: locale/programs/ld-time.c:223
+#: locale/programs/ld-time.c:225
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr "%s: �b `era' ��쪺�r�� %Zd ���A��V�X�ЬJ���O '+' �]���O '-'"
 
-#: locale/programs/ld-time.c:235
+#: locale/programs/ld-time.c:237
 #, c-format
 msgid ""
 "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr "%s: �b `era' ��쪺�r�� %Zd ���A��V�X�Ф��O�@�ӳ�@�r��"
 
-#: locale/programs/ld-ctype.c:2643
+#: locale/programs/ld-ctype.c:2727
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: ���ƪ� `default_missing' �w�q"
@@ -547,39 +556,39 @@ msgstr "%s: ���ƪ� `default_missing' �w�q"
 msgid "%s: duplicate category version definition"
 msgstr "%s: ���ƪ����O�����w�q"
 
-#: locale/programs/ld-collate.c:2845
+#: locale/programs/ld-collate.c:2711
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: ���ƪ� `%s' �϶��ŧi"
 
-#: locale/programs/ld-collate.c:2809
+#: locale/programs/ld-collate.c:2675
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: ���ƪ��w�q `%s'"
 
-#: locale/programs/ld-collate.c:3792
+#: locale/programs/ld-collate.c:3691
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: �ťժ����O�y�z�O�����\��"
 
-#: locale/programs/ld-collate.c:717
+#: locale/programs/ld-collate.c:755
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: �ťժ��v���r��O�����\��"
 
-#: locale/programs/charmap.c:794
+#: locale/programs/charmap.c:831
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: ���A�����~"
 
-#: locale/programs/ld-ctype.c:2411
+#: locale/programs/ld-ctype.c:2483
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s: `%s' ��줣�u�@���a�ŧi"
 
-#: locale/programs/ld-ctype.c:1493 locale/programs/ld-ctype.c:1618
-#: locale/programs/ld-ctype.c:1724 locale/programs/ld-ctype.c:2274
-#: locale/programs/ld-ctype.c:3216
+#: locale/programs/ld-ctype.c:1525 locale/programs/ld-ctype.c:1650
+#: locale/programs/ld-ctype.c:1756 locale/programs/ld-ctype.c:2346
+#: locale/programs/ld-ctype.c:3329
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: `%s' ���S����T�]�t�Q�Ӷ���"
@@ -608,32 +617,32 @@ msgstr "%s: ��� `%s' �S���w�q"
 msgid "%s: field `%s' undefined"
 msgstr "%s: ��� `%s' �S���w�q"
 
-#: locale/programs/ld-time.c:256
+#: locale/programs/ld-time.c:258
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr "%s: �L�Ϊ���ơA�b `era' ���B�r�� %Zd ���������첾��"
 
-#: locale/programs/ld-time.c:316
+#: locale/programs/ld-time.c:318
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr "%s: �L�Ϊ���ơA�b `era' ���B�r�� %Zd ���������_�l���"
 
-#: locale/programs/ld-time.c:393
+#: locale/programs/ld-time.c:395
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr "%s: �L�Ϊ���ơA�b `era' �ϰ�B�r�� %Zd ���������������"
 
-#: posix/getopt.c:791
+#: posix/getopt.c:795
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ���X�k���ﶵ -- %c\n"
 
-#: locale/programs/ld-address.c:573 locale/programs/ld-collate.c:3818
-#: locale/programs/ld-ctype.c:2733 locale/programs/ld-identification.c:437
+#: locale/programs/ld-address.c:573 locale/programs/ld-collate.c:3717
+#: locale/programs/ld-ctype.c:2844 locale/programs/ld-identification.c:437
 #: locale/programs/ld-measurement.c:229 locale/programs/ld-messages.c:324
 #: locale/programs/ld-monetary.c:932 locale/programs/ld-name.c:298
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:231
-#: locale/programs/ld-telephone.c:306 locale/programs/ld-time.c:1149
+#: locale/programs/ld-telephone.c:306 locale/programs/ld-time.c:1170
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: �����㪺 `END' ��"
@@ -648,27 +657,27 @@ msgstr "%s: ���A�Ϊ�����ǦC `%%%c', �b��� `%s' ��"
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr "%s: �b��� `%s' ��������ǦC���A��"
 
-#: locale/programs/ld-time.c:248
+#: locale/programs/ld-time.c:250
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr "%s: �b `era' ���B�r�� %Zd �����첾�Ʀr���A��"
 
-#: locale/programs/ld-collate.c:3269
+#: locale/programs/ld-collate.c:3143
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: ���A�Ϊ��ƧdzW�h�ƥ�"
 
-#: posix/getopt.c:794
+#: posix/getopt.c:798
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ���A�Ϊ��ﶵ -- %c\n"
 
-#: locale/programs/ld-time.c:307
+#: locale/programs/ld-time.c:309
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr "%s: �b `era' ���B�r�� %Zd �����_�l������A��"
 
-#: locale/programs/ld-time.c:384
+#: locale/programs/ld-time.c:386
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr "%s: �b `era' ���B�r�� %Zd ��������������A��"
@@ -683,38 +692,38 @@ msgstr "%s: �b��� `%s' �����Ȥ��A��"
 msgid "%s: language abbreviation `%s' not defined"
 msgstr "%s: �y���Y�g `%s' �S���w�q"
 
-#: locale/programs/ld-collate.c:3347 locale/programs/ld-collate.c:3460
-#: locale/programs/ld-collate.c:3796
+#: locale/programs/ld-collate.c:3223 locale/programs/ld-collate.c:3346
+#: locale/programs/ld-collate.c:3695
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: �ʤ� `order_end' ����r"
 
-#: locale/programs/ld-collate.c:3474 locale/programs/ld-collate.c:3808
+#: locale/programs/ld-collate.c:3360 locale/programs/ld-collate.c:3707
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: �ʤ� `reorder-end' ����r"
 
-#: locale/programs/ld-collate.c:3811
+#: locale/programs/ld-collate.c:3710
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: �ʤ� `reorder-sections-end' ����r"
 
-#: locale/programs/ld-time.c:433
+#: locale/programs/ld-time.c:435
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr "%s: �ʤ� era �榡�A�b `era' ���B�r�� %Zd ��"
 
-#: locale/programs/ld-time.c:421
+#: locale/programs/ld-time.c:423
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr "%s: �ʤ� era �W�١A�b `era' ���B�r�� %Zd ��"
 
-#: locale/programs/ld-collate.c:3247
+#: locale/programs/ld-collate.c:3119
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: `%s' �϶������h�Ӷ��ǩw�q"
 
-#: locale/programs/ld-collate.c:3295
+#: locale/programs/ld-collate.c:3169
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: ���R�W���϶������h�Ӷ��ǩw�q"
@@ -729,7 +738,12 @@ msgstr "%s: �S������� `%s' ���T���`�W���ܦ��G %s"
 msgid "%s: no identification for category `%s'"
 msgstr "%s: ���O `%s' �S���{��"
 
-#: locale/programs/ld-collate.c:557
+#: locale/programs/ld-ctype.c:2753
+#, c-format
+msgid "%s: no representable `default_missing' definition found"
+msgstr "%s: �䤣��i���ܬ� `default_missing' ���w�q"
+
+#: locale/programs/ld-collate.c:591
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: �ƧdzW�h����"
@@ -739,143 +753,139 @@ msgstr "%s: �ƧdzW�h����"
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: ��a�Ʀr�N�X `%d' ���~"
 
-#: locale/programs/ld-ctype.c:2613
-#, c-format
-msgid "%s: only one `include' instruction allowed"
-msgstr "%s: �u���\�@�� `include' ���O"
-
-#: posix/getopt.c:714
+#: posix/getopt.c:718
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: �ﶵ `%c%s' �����\���[�޼�\n"
 
-#: posix/getopt.c:684
+#: posix/getopt.c:688
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: �ﶵ `%s' �t�q���M\n"
 
-#: posix/getopt.c:732 posix/getopt.c:905
+#: posix/getopt.c:736 posix/getopt.c:909
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: �ﶵ `%s' �ݭn�@�Ӥ޼�\n"
 
-#: posix/getopt.c:709
+#: posix/getopt.c:713
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: �ﶵ `--%s' �����\���[�޼�\n"
 
-#: posix/getopt.c:889
+#: posix/getopt.c:893
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: �ﶵ `-W %s' �����\���[�޼�\n"
 
-#: posix/getopt.c:871
+#: posix/getopt.c:875
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: �ﶵ `-W %s' �t�q���M\n"
 
-#: posix/getopt.c:824 posix/getopt.c:954
+#: posix/getopt.c:828 posix/getopt.c:958
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: �ﶵ�ݭn�@�Ӥ޼� -- %c\n"
 
-#: locale/programs/ld-collate.c:1273 locale/programs/ld-collate.c:3755
+#: locale/programs/ld-collate.c:1314 locale/programs/ld-collate.c:3654
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s' �����Ǥw�b %s:%Zu ���w�q"
 
-#: locale/programs/ld-collate.c:3409
+#: locale/programs/ld-collate.c:3297
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: ��Ӥ��� %.*s �����ǩ|���w�q"
 
-#: locale/programs/ld-collate.c:3390
+#: locale/programs/ld-collate.c:3281
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: ��ӲŸ� %.*s �����ǩ|���w�q"
 
-#: sunrpc/rpc_main.c:288
+#: sunrpc/rpc_main.c:289
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr "%s: ��X�N�|�л\ %s\n"
 
-#: timezone/zic.c:874 timezone/zic.c:1288 timezone/zic.c:1313
+#: timezone/zic.c:873 timezone/zic.c:1287 timezone/zic.c:1312
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: �Y�����~: ���~������ (l_value) %d\n"
 
-#: locale/programs/charmap.c:801 locale/programs/ld-address.c:592
-#: locale/programs/ld-collate.c:2724 locale/programs/ld-collate.c:3836
-#: locale/programs/ld-ctype.c:2753 locale/programs/ld-identification.c:456
+#: locale/programs/charmap.c:838 locale/programs/ld-address.c:592
+#: locale/programs/ld-collate.c:2590 locale/programs/ld-collate.c:3735
+#: locale/programs/ld-ctype.c:2107 locale/programs/ld-ctype.c:2864
+#: locale/programs/ld-identification.c:456
 #: locale/programs/ld-measurement.c:248 locale/programs/ld-messages.c:342
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:316
 #: locale/programs/ld-numeric.c:386 locale/programs/ld-paper.c:249
-#: locale/programs/ld-telephone.c:324 locale/programs/ld-time.c:1167
+#: locale/programs/ld-telephone.c:324 locale/programs/ld-time.c:1188
 #: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: �������w�F�ɮת�����"
 
-#: locale/programs/ld-collate.c:3508 locale/programs/ld-collate.c:3680
+#: locale/programs/ld-collate.c:3394 locale/programs/ld-collate.c:3580
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: �������϶� `%.*s'"
 
-#: locale/programs/ld-time.c:335
+#: locale/programs/ld-time.c:337
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr "%s: �b `era' �ϰ쪺�r�� %Zd �����ҩl����O���A�Ϊ�"
 
-#: locale/programs/ld-time.c:412
+#: locale/programs/ld-time.c:414
 #, c-format
 msgid "%s: stopping date is invalid in string %Zd in `era' field"
 msgstr "%s: �b `era' �ϰ쪺�r�� %Zd ������������O���A�Ϊ�"
 
-#: locale/programs/ld-collate.c:1207
+#: locale/programs/ld-collate.c:1248
 #, c-format
 msgid "%s: symbolic range ellipsis must not be direct followed by `order_end'"
 msgstr "%s: �Ÿ��d�򪺬ٲ����i�H�����b `order_end' ���e"
 
-#: locale/programs/ld-collate.c:1203
+#: locale/programs/ld-collate.c:1244
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: �Ÿ��d�򪺬ٲ����i�H�����b `order_start' ����"
 
-#: locale/programs/ld-address.c:583 locale/programs/ld-collate.c:484
-#: locale/programs/ld-collate.c:536 locale/programs/ld-collate.c:827
-#: locale/programs/ld-collate.c:840 locale/programs/ld-collate.c:2715
-#: locale/programs/ld-collate.c:3827 locale/programs/ld-ctype.c:1808
-#: locale/programs/ld-ctype.c:2592 locale/programs/ld-ctype.c:2744
-#: locale/programs/ld-identification.c:447
+#: locale/programs/ld-address.c:583 locale/programs/ld-collate.c:518
+#: locale/programs/ld-collate.c:570 locale/programs/ld-collate.c:865
+#: locale/programs/ld-collate.c:878 locale/programs/ld-collate.c:2581
+#: locale/programs/ld-collate.c:3726 locale/programs/ld-ctype.c:1840
+#: locale/programs/ld-ctype.c:2098 locale/programs/ld-ctype.c:2673
+#: locale/programs/ld-ctype.c:2855 locale/programs/ld-identification.c:447
 #: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:377 locale/programs/ld-paper.c:240
-#: locale/programs/ld-telephone.c:315 locale/programs/ld-time.c:1158
+#: locale/programs/ld-telephone.c:315 locale/programs/ld-time.c:1179
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: �y�k���~"
 
-#: locale/programs/ld-ctype.c:2106
+#: locale/programs/ld-ctype.c:2178
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s: �b�w�q�s�r�����O�ɻy�k���~"
 
-#: locale/programs/ld-ctype.c:2121
+#: locale/programs/ld-ctype.c:2193
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s: �b�w�q�s�r�������ɻy�k���~"
 
-#: locale/programs/ld-ctype.c:4131
+#: locale/programs/ld-ctype.c:3735
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: ���O \"%s\" ����: %lu �줸��\n"
 
-#: locale/programs/ld-ctype.c:4221
+#: locale/programs/ld-ctype.c:3803
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s: ��M�� \"%s\" ����: %lu �줸��\n"
 
-#: locale/programs/ld-ctype.c:4453
+#: locale/programs/ld-ctype.c:3935
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s: �e�ת���: %lu �줸��\n"
@@ -885,88 +895,86 @@ msgstr "%s: �e�ת���: %lu �줸��\n"
 msgid "%s: terminology language code `%s' not defined"
 msgstr "%s: �N�y�y���s�X `%s' ���w�q"
 
-#: locale/programs/ld-collate.c:1014
+#: locale/programs/ld-collate.c:1054
 #, c-format
-msgid "%s: the start end the end symbol of a range must stand for characters"
+msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: �ҩl�P�����Ÿ��d�򥲶��N���r��"
 
-#: locale/programs/ld-time.c:462
+#: locale/programs/ld-time.c:464
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr "%s: ��� `%s' �Ȫ��ĤT�ӹB�⤸���i�H�� %d �j"
 
-#: locale/programs/ld-collate.c:521
+#: locale/programs/ld-collate.c:555
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: �Ӧh�W�h�F�Ĥ@�Ӷ��إu�]�t %d"
 
-#: locale/programs/ld-collate.c:868
+#: locale/programs/ld-collate.c:906
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: �Ӧh�ܼƭ�"
 
-#: locale/programs/ld-ctype.c:4483
+#: locale/programs/ld-ctype.c:3639
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
-msgstr "%s: locale `%s' ����Ķ��Ƥ��s�b"
+msgstr "%s: �ϰ�Ƹ�Ʈw (locale) `%s' ����Ķ��Ƥ��s�b"
 
-#: sunrpc/rpc_main.c:295
+#: sunrpc/rpc_main.c:296
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr "%s: �L�k�}�� %s: %m\n"
 
-#: locale/programs/ld-collate.c:2982
+#: locale/programs/ld-collate.c:2849
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: �������r���b��ӲŸ��W�٤�"
 
-#: locale/programs/ld-collate.c:3111
+#: locale/programs/ld-collate.c:2981
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: �������r���b�P�q�w�q�W�٤�"
 
-#: locale/programs/ld-collate.c:3124
+#: locale/programs/ld-collate.c:2994
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: �������r���b�P�q�w�q�Ȥ�"
 
-#: locale/programs/ld-time.c:1020
+#: locale/programs/ld-time.c:1040
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: �������r���b��� `%s' ��"
 
-#: locale/programs/ld-collate.c:3221
+#: locale/programs/ld-collate.c:3091
 #, c-format
 msgid "%s: unknown section name `%s'"
 msgstr "%s: �������϶��W�� `%s'"
 
-#: locale/programs/ld-collate.c:3134
+#: locale/programs/ld-collate.c:3004
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: �������Ÿ� `%s' �b�P�q�w�q��"
 
-#: posix/getopt.c:765
+#: posix/getopt.c:769
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: �������ﶵ `%c%s'\n"
 
-#: posix/getopt.c:761
+#: posix/getopt.c:765
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: �������ﶵ `--%s'\n"
 
-#: timezone/zic.c:445
+#: timezone/zic.c:443
 #, c-format
 msgid ""
-"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d "
-"directory ]\n"
-"\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 msgstr ""
-"%s: �ϥΤ覡: %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d "
-"directory ]\n"
-"\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"%s: �ϥΤ覡: %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 
-#: timezone/zdump.c:174
+#: timezone/zdump.c:175
 #, c-format
 msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: �ϥΤ覡: %s [ -v ] [ -c cutoff ] zonename ...\n"
@@ -998,31 +1006,31 @@ msgstr "%s: ��� `int_curr_symbol' �Ȫ����׿��~"
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: ��� `%s' ���ȥ����p�� 127"
 
-#: locale/programs/ld-time.c:486
+#: locale/programs/ld-time.c:488
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: ��� `%s' ���Ȥ��i�H�j�� %d"
 
-#: locale/programs/ld-time.c:470 locale/programs/ld-time.c:478
+#: locale/programs/ld-time.c:472 locale/programs/ld-time.c:480
 #, c-format
 msgid "%s: values of field `%s' must not be larger than %d"
 msgstr "%s: ��� `%s' ���Ȥ��i�H�j�� %d"
 
-#: locale/programs/ld-collate.c:812
+#: locale/programs/ld-collate.c:850
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: �v�������ϥλP�W�٬ۦP���ٲ��Ÿ�"
 
-#: sunrpc/rpc_main.c:307
+#: sunrpc/rpc_main.c:308
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr "%s: ���b�g�X��X %s ��: %m"
 
-#: argp/argp-parse.c:164
+#: argp/argp-parse.c:170
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(�{�����~) �S���{�o������!?"
 
-#: argp/argp-parse.c:781
+#: argp/argp-parse.c:787
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(�{�����~) �ﶵ���Ӥw�g�i�G��!?"
 
@@ -1044,11 +1052,11 @@ msgstr "(����)"
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr "*** �ɮ� `%s' �Q���ŤF: �L�k���ԲӪ����R\n"
 
-#: catgets/gencat.c:267
+#: catgets/gencat.c:282
 msgid "*standard input*"
 msgstr "*�зǿ�J*"
 
-#: catgets/gencat.c:121
+#: catgets/gencat.c:125
 msgid ""
 "-o OUTPUT-FILE [INPUT-FILE]...\n"
 "[OUTPUT-FILE [INPUT-FILE]...]"
@@ -1070,7 +1078,7 @@ msgstr "; �C���� = %lu, ������ = %lu"
 msgid "; why = "
 msgstr "; ��] = "
 
-#: locale/programs/charmap.c:962
+#: locale/programs/charmap.c:999
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
 msgstr "<%s> �H�� <%s> �O���X�k���d��W��"
@@ -1080,12 +1088,12 @@ msgstr "<%s> �H�� <%s> �O���X�k���d��W��"
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> �H�� <%s> �O���A���d��W��"
 
-#: locale/programs/ld-ctype.c:542 locale/programs/ld-ctype.c:577
+#: locale/programs/ld-ctype.c:565 locale/programs/ld-ctype.c:600
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> �r�����i�H�b���O `%s' ��"
 
-#: locale/programs/ld-ctype.c:530 locale/programs/ld-ctype.c:566
+#: locale/programs/ld-ctype.c:553 locale/programs/ld-ctype.c:589
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> �r�����b���O `%s' ��"
@@ -1147,6 +1155,10 @@ msgstr "�P�ɹ��`�O����ɥζq�@��"
 msgid "Anode table overflow"
 msgstr "Anode ���淸�X"
 
+#: intl/tst-gettext2.c:37
+msgid "Another string for testing."
+msgstr "�t�@�Ө����ժ��r��C"
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:37
 msgid "Arg list too long"
 msgstr "Arg ��C�Ӫ�"
@@ -1235,7 +1247,7 @@ msgstr "���~���t�ΩI�s"
 msgid "Bad value for ai_flags"
 msgstr "���~�� ai_flags ��"
 
-#: locale/programs/localedef.c:99
+#: locale/programs/localedef.c:104
 msgid "Be strictly POSIX conform"
 msgstr "�Y����q POSIX"
 
@@ -1296,15 +1308,10 @@ msgstr "�L�k����������ɨ禡�w"
 msgid "Can't bind to server which serves this domain"
 msgstr "�L�k�P�A�ȩ󦹺��쪺���A���pô"
 
-#: elf/ldconfig.c:778
+#: elf/ldconfig.c:934
 msgid "Can't chdir to /"
 msgstr "�L�k�ܧ�ؿ��� /"
 
-#: elf/ldconfig.c:775
-#, c-format
-msgid "Can't chroot to %s"
-msgstr "�L�k�ܧ�ڸ��|�� %s"
-
 #: nis/ypclnt.c:804
 msgid "Can't communicate with portmapper"
 msgstr "�L�k�P portmapper �q�T"
@@ -1317,47 +1324,57 @@ msgstr "�L�k�P ypbind �q�T"
 msgid "Can't communicate with ypserv"
 msgstr "�L�k�P ypserv �q�T"
 
-#: elf/cache.c:353
+#: elf/cache.c:359
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "�L�k���ͼȮɪ��֨��� %s"
 
-#: elf/ldconfig.c:381
+#: elf/ldconfig.c:502
+#, c-format
+msgid "Can't find %s"
+msgstr "�䤣�� %s"
+
+#: elf/ldconfig.c:440
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "�L�k�q %s �s���� %s"
 
-#: elf/ldconfig.c:439 elf/ldconfig.c:563
+#: elf/ldconfig.c:518 elf/ldconfig.c:672
 #, c-format
 msgid "Can't lstat %s"
 msgstr "�L�k lstat %s"
 
-#: elf/cache.c:103
+#: elf/cache.c:108 elf/ldconfig.c:955
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "�L�k�}�ҧ֨��� %s\n"
 
-#: elf/ldconfig.c:716
+#: elf/ldconfig.c:976
+#, c-format
+msgid "Can't open cache file directory %s\n"
+msgstr "�L�k�}�ҧ֨��ɮץؿ� %s\n"
+
+#: elf/ldconfig.c:865
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "�L�k�}�ҳ]�w�� %s"
 
-#: elf/ldconfig.c:528
+#: elf/ldconfig.c:621
 #, c-format
 msgid "Can't open directory %s"
 msgstr "�L�k�}�ҥؿ� %s"
 
-#: elf/cache.c:347
+#: elf/cache.c:353
 #, c-format
 msgid "Can't remove old temporary cache file %s"
 msgstr "�L�k�R���ª��Ȯɧ֨��� %s"
 
-#: elf/ldconfig.c:346
+#: elf/ldconfig.c:405
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "�L�k stat %s\n"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:434
 #, c-format
 msgid "Can't unlink %s"
 msgstr "�L�k�����s�� %s"
@@ -1389,7 +1406,7 @@ msgstr "���ઽ������@�Ӥ��ɨ禡�w"
 msgid "Cannot fstat file %s.\n"
 msgstr "�L�k fstat �ɮ� %s�C\n"
 
-#: sunrpc/rpc_main.c:1420
+#: sunrpc/rpc_main.c:1415
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "�L�k�ϥζW�L�@�Ӫ��ɮײ��ͺX��!\n"
 
@@ -1402,7 +1419,7 @@ msgstr "�L�k mmap �ɮ� %s�C\n"
 msgid "Cannot receive reply to broadcast"
 msgstr "�L�k�����s���᪺�^��"
 
-#: sunrpc/pmap_clnt.c:134
+#: sunrpc/pmap_clnt.c:136
 msgid "Cannot register service"
 msgstr "�L�k���U�A��"
 
@@ -1423,27 +1440,27 @@ msgstr "�L�k�ǰe�s���ʥ]"
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "�L�k�]�w socket �ﶵ SO_BROADCAST"
 
-#: sunrpc/rpc_main.c:1198
+#: sunrpc/rpc_main.c:1195
 msgid "Cannot specify more than one input file!\n"
 msgstr "�L�k���w�W�L�@�ӿ�J��!\n"
 
-#: sunrpc/rpc_main.c:1377
+#: sunrpc/rpc_main.c:1372
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "�L�k�N netid �X�лP inetd �X�Ф@�_�ϥ�!\n"
 
-#: sunrpc/rpc_main.c:1389
+#: sunrpc/rpc_main.c:1384
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr "�L�k�b�S�� TIRPC �ɨϥ� netid �X��!\n"
 
-#: sunrpc/rpc_main.c:1396
+#: sunrpc/rpc_main.c:1391
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "�L�k�N����X�лP newstyle �@�_�ϥ�!\n"
 
-#: elf/ldconfig.c:129
+#: elf/ldconfig.c:131
 msgid "Change to and use ROOT as root directory"
 msgstr "�ܴ��� ROOT �ؿ��åH�������ڥؿ�"
 
-#: elf/cache.c:384
+#: elf/cache.c:390
 #, c-format
 msgid "Changing access rights of %s to 0644 failed"
 msgstr "��� %s ���s���v���� 0644 ����"
@@ -1475,9 +1492,9 @@ msgstr "��             :\n"
 msgid "Communication error on send"
 msgstr "�b�ǰe�ɳq�T���~"
 
-#: locale/programs/localedef.c:107
+#: locale/programs/localedef.c:112
 msgid "Compile locale specification"
-msgstr "�sĶ locale �]�w"
+msgstr "�sĶ�ϰ�Ƹ�Ʈw (locale) �]�w"
 
 # This is error EIEIO, errno 104
 #
@@ -1516,15 +1533,7 @@ msgstr "�sĶ locale �]�w"
 msgid "Computer bought the farm"
 msgstr "�o�x�q���R�F�@���a�o"
 
-#: locale/programs/ld-ctype.c:3995
-msgid "Computing table size for character classes might take a while..."
-msgstr "���b�p��r�����O������j�p�A�i��n���I�ɶ� ..."
-
-#: locale/programs/ld-collate.c:1648
-msgid "Computing table size for collation table might take a while..."
-msgstr "���b�p���Ӫ���j�p�A�i��n���I�ɶ� ..."
-
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:141
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "�]�w����ɴ��ʺA�s��"
 
@@ -1558,20 +1567,17 @@ msgstr "�~��"
 msgid "Convert encoding of given files from one encoding to another."
 msgstr "�q���w���ɮת��r���s�X�ഫ��t�@��"
 
-#: nss/makedb.c:60
-msgid "Convert key to lower case"
-msgstr "�N key �ഫ���p�g"
-
-#: catgets/gencat.c:237 elf/ldconfig.c:252 elf/sprof.c:355
-#: iconv/iconv_prog.c:351 locale/programs/locale.c:267
-#: locale/programs/localedef.c:303 nscd/nscd.c:287 nscd/nscd_nischeck.c:90
-#: nss/getent.c:66 nss/makedb.c:244 posix/getconf.c:751
+#: catgets/gencat.c:246 elf/ldconfig.c:264 elf/sprof.c:355
+#: iconv/iconv_prog.c:351 locale/programs/locale.c:269
+#: locale/programs/localedef.c:311 nscd/nscd.c:287 nscd/nscd_nischeck.c:90
+#: nss/getent.c:63 posix/getconf.c:751
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-msgstr "���v (C) %s �ۥѳn�����|\n"
+msgstr ""
+"���v (C) %s �ۥѳn�����|\n"
 "�o�O�@�Ӧۥѳn��F�Ш����l�X�����v���ڡC�o�بS����O�F�Ʀܤ]�S���M���P\n"
 "��Ϊ̾A�X�Y�ǯS���ت��C\n"
 
@@ -1580,22 +1586,18 @@ msgstr "���v (C) %s �ۥѳn�����|\n"
 msgid "Could not create log file \"%s\""
 msgstr "�L�k���ͰT���� \"%s\""
 
-#: catgets/gencat.c:108
+#: catgets/gencat.c:112
 msgid "Create C header file NAME containing symbol definitions"
 msgstr "���ͪ� C ���Y�ɦW���t�Ÿ��w�q"
 
-#: locale/programs/localedef.c:98
+#: locale/programs/localedef.c:102
 msgid "Create old-style tables"
 msgstr "�����®榡������"
 
-#: locale/programs/localedef.c:97
+#: locale/programs/localedef.c:101
 msgid "Create output even if warning messages were issued"
 msgstr "���Ϳ�X�Y�ϬO��ĵ�i�T��"
 
-#: nss/makedb.c:70
-msgid "Create simple DB database from textual input."
-msgstr "�ѥ��媺��J����²�檺 DB ��Ʈw"
-
 #: nis/nis_print.c:326
 #, c-format
 msgid "Creation Time : %s"
@@ -1627,7 +1629,7 @@ msgstr "DNANS"
 msgid "DNS"
 msgstr "DNS"
 
-#: elf/dl-open.c:106
+#: elf/dl-open.c:189
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST �����\�b SUID/SGID ���{����"
 
@@ -1667,15 +1669,6 @@ msgstr "�˸m���L��"
 msgid "Device not a stream"
 msgstr "�˸m���O��Ƭy"
 
-#. TRANS No such device or address.  The system tried to use the device
-#. TRANS represented by a file you specified, and it couldn't find the device.
-#. TRANS This can mean that the device file was installed incorrectly, or that
-#. TRANS the physical device is missing or not correctly attached to the
-#. TRANS computer.
-#: stdio-common/../sysdeps/gnu/errlist.c:62
-msgid "Device not configured"
-msgstr "�˸m�|���]�w�N��"
-
 #. TRANS Resource busy; a system resource that can't be shared is already in use.
 #. TRANS For example, if you try to delete a file that is the root of a currently
 #. TRANS mounted filesystem, you get this error.
@@ -1713,11 +1706,7 @@ msgstr "�w�� quota ���F"
 msgid "Do not fork and display messages on the current tty"
 msgstr "���b�ثe�� tty ���ͤl��{ (fork) �H����ܰT��"
 
-#: nss/makedb.c:63
-msgid "Do not print messages while building database"
-msgstr "���b�إ߸�Ʈw�ɦL�X�T��"
-
-#: catgets/gencat.c:110
+#: catgets/gencat.c:114
 msgid "Do not use existing catalog, force new output file"
 msgstr "���ϥβ{�s�� catalog, �j��ϥηs����X��"
 
@@ -1725,11 +1714,11 @@ msgstr "���ϥβ{�s�� catalog, �j��ϥηs����X��"
 msgid "Domain not bound"
 msgstr "����䤣��"
 
-#: elf/ldconfig.c:127
+#: elf/ldconfig.c:129
 msgid "Don't build cache"
 msgstr "���إߧ֨�"
 
-#: elf/ldconfig.c:128
+#: elf/ldconfig.c:130
 msgid "Don't generate links"
 msgstr "�����ͳs��"
 
@@ -1737,43 +1726,31 @@ msgstr "�����ͳs��"
 msgid "Dump information generated by PC profiling."
 msgstr "�N���ͩ� PC ���t��������ƶɨ��X��"
 
-#: elf/dl-load.c:811
-msgid "ELF file ABI version invalid."
+#: elf/dl-load.c:1290
+msgid "ELF file ABI version invalid"
 msgstr "ELF �� ABI �������A��"
 
-#: elf/dl-load.c:809
-msgid "ELF file OS ABI invalid."
+#: elf/dl-load.c:1287
+msgid "ELF file OS ABI invalid"
 msgstr "ELF �� OS ABI �������A��"
 
-#: elf/dl-load.c:793
-msgid "ELF file class not 32-bit"
-msgstr "ELF �����O���O 32 �줸"
-
-#: elf/dl-load.c:795
-msgid "ELF file class not 64-bit"
-msgstr "ELF �����O���O 64 �줸"
-
-#: elf/dl-load.c:818
-msgid "ELF file machine architecture does not match"
-msgstr "ELF �ɪ��w�鵲�c��Ƥ��ŦX"
-
-#: elf/dl-load.c:816
-msgid "ELF file version does not not match current one"
+#: elf/dl-load.c:1296
+msgid "ELF file version does not match current one"
 msgstr "ELF �ɪ������ŦX�ثe������"
 
-#: elf/dl-load.c:805
+#: elf/dl-load.c:1283
 msgid "ELF file version ident does not match current one"
 msgstr "ELF �ɪ��� ident ���ŦX�ثe�ҨϥΪ�"
 
-#: elf/dl-load.c:821
+#: elf/dl-load.c:1307
 msgid "ELF file's phentsize not the expected size"
 msgstr "ELF �ɪ� phentsize �ä��O�w�������j�p"
 
-#: elf/dl-load.c:894
+#: elf/dl-load.c:876
 msgid "ELF load command address/offset not properly aligned"
 msgstr "ELF ���J�R�O��}/�첾�èS���A���a���"
 
-#: elf/dl-load.c:891
+#: elf/dl-load.c:873
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF ���J�R�O����èS�����ӰO������� (page) ���"
 
@@ -1793,6 +1770,11 @@ msgstr "�s�X���\n"
 msgid "Entry/table type mismatch"
 msgstr "����/����κA����"
 
+#: nss/getent.c:127 nss/getent.c:292
+#, c-format
+msgid "Enumeration not supported on %s\n"
+msgstr "�����ئb %s �����Q�䴩\n"
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:30
 msgid "Error 0"
 msgstr "�� 0 �����~"
@@ -1925,7 +1907,7 @@ msgstr "RPC �l�t��~"
 msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
 msgstr "�s�� NIS+ ��l�Ұ��ɿ��~�C���w�� NIS+ �ܡH"
 
-#: string/../sysdeps/mach/_strerror.c:57
+#: string/../sysdeps/mach/_strerror.c:58
 #: sysdeps/mach/hurd/mips/dl-machine.c:68
 msgid "Error in unknown error system: "
 msgstr "�������D�t��~: "
@@ -1949,11 +1931,11 @@ msgstr "�洫�w�R��"
 msgid "Exec format error"
 msgstr "�i�����ɮ榡���~"
 
-#: locale/programs/localedef.c:185
+#: locale/programs/localedef.c:190
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "�Y�����~: �t�ΨS���w�q `_POSIX2_LOCALEDEF'"
 
-#: locale/programs/localedef.c:93
+#: locale/programs/localedef.c:97
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr "�ɮ� FILE ���t�Ÿ��W�P UCS4 �s�X��������M"
 
@@ -1983,7 +1965,7 @@ msgstr "�ɮױԭz���B����~���A"
 msgid "File exists"
 msgstr "�ɮפw�s�b"
 
-#: elf/cache.c:119 elf/cache.c:129
+#: elf/cache.c:124 elf/cache.c:134
 msgid "File is not a cache file.\n"
 msgstr "�ɮרëD�֨��ɡC\n"
 
@@ -2017,6 +1999,10 @@ msgstr "�ɮת��w��"
 msgid "File too large"
 msgstr "�ɮפӤj"
 
+#: intl/tst-gettext2.c:36
+msgid "First string for testing."
+msgstr "�Ĥ@�Ӧr�걵�����աC"
+
 #: nis/nis_error.c:38
 msgid "First/next chain broken"
 msgstr "�Ĥ@��/�U�@�ӧǦC�a���F"
@@ -2025,7 +2011,7 @@ msgstr "�Ĥ@��/�U�@�ӧǦC�a���F"
 msgid "Floating point exception"
 msgstr "�B�I�ƥX��"
 
-#: elf/ldconfig.c:134
+#: elf/ldconfig.c:136
 msgid "Format to use: new, old or compat (default)"
 msgstr "�N�ϥή榡: �s�B�©άۮe (�w�])"
 
@@ -2046,7 +2032,7 @@ msgstr "�\��S����@"
 msgid "GROUP\n"
 msgstr "�s��\n"
 
-#: argp/argp-help.c:226
+#: argp/argp-help.c:230
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT ���L����T: %s"
@@ -2055,7 +2041,7 @@ msgstr "ARGP_HELP_FMT ���L����T: %s"
 msgid "Generate graphic from memory profiling data"
 msgstr "�q�O����ʯ���ո�Ʋ��͹Ϲ�"
 
-#: catgets/gencat.c:116
+#: catgets/gencat.c:120
 msgid ""
 "Generate message catalog.\\vIf INPUT-FILE is -, input is read from standard "
 "input.  If OUTPUT-FILE\n"
@@ -2068,10 +2054,9 @@ msgstr ""
 msgid ""
 "Generate output linear to time (default is linear to number of function "
 "calls)"
-msgstr ""
-"���Ϳ�X�P�ɶ��e�u�����Y (�w�]�O�P�禡�I�s�ƥاe�u�����Y)"
+msgstr "���Ϳ�X�P�ɶ��e�u�����Y (�w�]�O�P�禡�I�s�ƥاe�u�����Y)"
 
-#: elf/ldconfig.c:126
+#: elf/ldconfig.c:128
 msgid "Generate verbose messages"
 msgstr "���ͧ�h���T��"
 
@@ -2079,15 +2064,15 @@ msgstr "���ͧ�h���T��"
 msgid "Generic system error"
 msgstr "�@��t��~"
 
-#: locale/programs/locale.c:75
+#: locale/programs/locale.c:77
 msgid "Get locale-specific information."
-msgstr "���o locale �S�w����T"
+msgstr "���o�ϰ�Ƹ�Ʈw (locale) �S�w����T"
 
-#: argp/argp-parse.c:88
+#: argp/argp-parse.c:94
 msgid "Give a short usage message"
 msgstr "���X²�u���ϥΰT��"
 
-#: argp/argp-parse.c:87
+#: argp/argp-parse.c:93
 msgid "Give this help list"
 msgstr "���X�o�ӨϥΤ覡�C��"
 
@@ -2110,7 +2095,7 @@ msgstr "�s�պX�� :"
 msgid "Group entry for \"%s.%s\" group:\n"
 msgstr "�s�� \"%s.%s\" �s�ն���:\n"
 
-#: argp/argp-parse.c:91
+#: argp/argp-parse.c:97
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "SECS ���᱾�_ (�w�]�O 3600)"
 
@@ -2118,7 +2103,7 @@ msgstr "SECS ���᱾�_ (�w�]�O 3600)"
 msgid "Hangup"
 msgstr "���_"
 
-#: nscd/grpcache.c:252
+#: nscd/grpcache.c:253
 #, c-format
 msgid "Haven't found \"%d\" in group cache!"
 msgstr "�|���b�s�է֨������ \"%d\"!"
@@ -2128,7 +2113,7 @@ msgstr "�|���b�s�է֨������ \"%d\"!"
 msgid "Haven't found \"%d\" in password cache!"
 msgstr "�|���b�K�X�֨������ \"%d\"!"
 
-#: nscd/grpcache.c:213
+#: nscd/grpcache.c:214
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "�|���b�s�է֨������ \"%s\"!"
@@ -2162,16 +2147,6 @@ msgstr "I/O ���~"
 msgid "I/O possible"
 msgstr "I/O �i��"
 
-#: nss/makedb.c:73
-msgid ""
-"INPUT-FILE OUTPUT-FILE\n"
-"-o OUTPUT-FILE INPUT-FILE\n"
-"-u INPUT-FILE"
-msgstr ""
-"��J�ɮצW��  ��X�ɮצW��\n"
-"-o ��X�ɮצW�� ��J�ɮצW��\n"
-"-u ��X�ɮצW��"
-
 #: stdio-common/../sysdeps/unix/siglist.c:32
 msgid "IOT trap"
 msgstr "IOT ����"
@@ -2185,7 +2160,7 @@ msgstr "IVY"
 msgid "Identifier removed"
 msgstr "�ѧO�Ÿ�����"
 
-#: elf/ldconfig.c:446
+#: elf/ldconfig.c:525
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "�����ɮ� %s �]�������O�@�ӥ��`���ɮסC"
@@ -2242,11 +2217,11 @@ msgstr "�ݭn���"
 msgid "Information:"
 msgstr "���:"
 
-#: locale/programs/localedef.c:88
+#: locale/programs/localedef.c:92
 msgid "Input Files:"
 msgstr "��J��:"
 
-#: elf/readlib.c:92
+#: elf/ldconfig.c:698 elf/readlib.c:92
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "��J�� %s �䤣��C\n"
@@ -2295,11 +2270,11 @@ msgstr "���_���t�ΩI�s�������s�Ұ�"
 msgid "Invalid argument"
 msgstr "���A�Ϊ��޼�"
 
-#: posix/regex.c:1098
+#: posix/regex.c:1102
 msgid "Invalid back reference"
 msgstr "���A�Ϊ��᳡����"
 
-#: posix/regex.c:1092
+#: posix/regex.c:1096
 msgid "Invalid character class name"
 msgstr "���A���r�����O�W"
 
@@ -2311,11 +2286,11 @@ msgstr "���A�Ϊ��ШD�ݨ����{��"
 msgid "Invalid client verifier"
 msgstr "���A�Ϊ��ШD�ݻ{��"
 
-#: posix/regex.c:1089
+#: posix/regex.c:1093
 msgid "Invalid collation character"
 msgstr "���A�Ϊ���Ӧr��"
 
-#: posix/regex.c:1110
+#: posix/regex.c:1114
 msgid "Invalid content of \\{\\}"
 msgstr "���A�� \\{\\} ���e"
 
@@ -2340,15 +2315,15 @@ msgstr "���A���B�@����"
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr "���A�ΩΤ����㪺�h�줸�զr���μe�r��"
 
-#: posix/regex.c:1119
+#: posix/regex.c:1123
 msgid "Invalid preceding regular expression"
 msgstr "���A�Ϊ��e�m�`�W���ܦ�"
 
-#: posix/regex.c:1113
+#: posix/regex.c:1117
 msgid "Invalid range end"
 msgstr "���A�Ϊ��d�򵲧�"
 
-#: posix/regex.c:1086
+#: posix/regex.c:1090
 msgid "Invalid regular expression"
 msgstr "���A�Ϊ��`�W���ܦ�"
 
@@ -2465,14 +2440,13 @@ msgstr "�������b������"
 msgid "Malformed name, or illegal name"
 msgstr "�_�Ǫ��W�r�A�Τ��X�k���W�r"
 
-#: argp/argp-help.c:1181
+#: argp/argp-help.c:1185
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
-msgstr ""
-"���ﶵ�������Υi��Ϊ��޼Ƥ]�O�۹����u�ﶵ�������Υi��Ϊ��޼ơC"
+msgstr "���ﶵ�������Υi��Ϊ��޼Ƥ]�O�۹����u�ﶵ�������Υi��Ϊ��޼ơC"
 
-#: elf/ldconfig.c:133
+#: elf/ldconfig.c:135
 msgid "Manually link individual libraries."
 msgstr "��ʭӧO�s���禡�w"
 
@@ -2488,7 +2462,7 @@ msgstr "�D�n���A�����L���A���s�i�槹���ƶɨ��Ƶ{�C"
 msgid "Memory allocation failure"
 msgstr "�O����t�m����"
 
-#: posix/regex.c:1116
+#: posix/regex.c:1120
 msgid "Memory exhausted"
 msgstr "�O������F"
 
@@ -2520,7 +2494,7 @@ msgstr "�ק異��"
 msgid "Modify operation failed"
 msgstr "�ק�B�@�覡����"
 
-#: locale/programs/locale.c:68
+#: locale/programs/locale.c:70
 msgid "Modify output format:"
 msgstr "�ק��X�榡:"
 
@@ -2533,12 +2507,12 @@ msgstr "���� Multihop"
 msgid "Must specify user name for server-user option"
 msgstr "���������A���ϥΪ̿ﶵ���w�ϥΪ̦W��"
 
-#: catgets/gencat.c:107 catgets/gencat.c:111 locale/programs/localedef.c:110
-#: nscd/nscd.c:83 nss/makedb.c:61
+#: catgets/gencat.c:111 catgets/gencat.c:115 locale/programs/localedef.c:115
+#: nscd/nscd.c:83
 msgid "NAME"
 msgstr "�W��"
 
-#: locale/programs/locale.c:78
+#: locale/programs/locale.c:80
 msgid ""
 "NAME\n"
 "[-a|-m]"
@@ -2668,6 +2642,10 @@ msgstr "�S������"
 msgid "No buffer space available"
 msgstr "�S���i�Ϊ��w�ĪŶ��F"
 
+#: locale/programs/ld-ctype.c:425
+msgid "No character set name specified in charmap"
+msgstr "�b�r������ (charmap) ���S���]�w�r���W��"
+
 #. TRANS There are no child processes.  This error happens on operations that are
 #. TRANS supposed to manipulate child processes, when there aren't any processes
 #. TRANS to manipulate.
@@ -2681,12 +2659,12 @@ msgstr "�S���l�{�Ǧs�b"
 msgid "No data available"
 msgstr "�S���i�����"
 
-#: locale/programs/ld-address.c:131 locale/programs/ld-collate.c:1460
-#: locale/programs/ld-ctype.c:384 locale/programs/ld-identification.c:132
+#: locale/programs/ld-address.c:131 locale/programs/ld-collate.c:1500
+#: locale/programs/ld-ctype.c:407 locale/programs/ld-identification.c:132
 #: locale/programs/ld-measurement.c:93 locale/programs/ld-messages.c:98
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
 #: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:91
-#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:158
+#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:160
 #, c-format
 msgid "No definition for %s category found"
 msgstr "�䤣�� %s ���O���w�q"
@@ -2695,7 +2673,7 @@ msgstr "�䤣�� %s ���O���w�q"
 msgid "No file space on server"
 msgstr "���A���W�S���ɮתŶ�"
 
-#: elf/ldconfig.c:454
+#: elf/ldconfig.c:532
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "�ѩ�䤣�� %s ���@�Ϊ���W�١A�s���å��Q�إ�"
@@ -2708,7 +2686,7 @@ msgstr "�ѩ�䤣�� %s ���@�Ϊ���W�١A�s���å��Q�إ�"
 msgid "No locks available"
 msgstr "�L�k��w���"
 
-#: posix/regex.c:1083
+#: posix/regex.c:1087
 msgid "No match"
 msgstr "�S���ŦX������"
 
@@ -2725,7 +2703,7 @@ msgstr "�S���ŦX�ݨD�榡���T��"
 msgid "No more records in map database"
 msgstr "�b��M����Ʈw���S����L�����F"
 
-#: posix/regex.c:5936
+#: posix/regex.c:5955
 msgid "No previous regular expression"
 msgstr "���e�å��ϥιL�`�W���ܦ�"
 
@@ -2757,6 +2735,12 @@ msgstr "�˸m�W�w�L�h�l�Ŷ�"
 msgid "No such device"
 msgstr "�S�����@�˸m"
 
+#. TRANS No such device or address.  The system tried to use the device
+#. TRANS represented by a file you specified, and it couldn't find the device.
+#. TRANS This can mean that the device file was installed incorrectly, or that
+#. TRANS the physical device is missing or not correctly attached to the
+#. TRANS computer.
+#: stdio-common/../sysdeps/gnu/errlist.c:62
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:36
 msgid "No such device or address"
 msgstr "�S�����@�˸m�Φ�}"
@@ -2783,10 +2767,6 @@ msgstr "�b���A��������Ƥ��䤣�즹�@��M��"
 msgid "No such process"
 msgstr "�S�����@�{��"
 
-#: nss/makedb.c:142
-msgid "No usable database library found."
-msgstr "�䤣��i�Ϊ���Ʈw�����禡�w"
-
 #: nis/nis_error.c:61
 msgid "Non NIS+ namespace encountered"
 msgstr "�D�J�H�� NIS+ �R�W�W�h���W��"
@@ -2917,11 +2897,11 @@ msgstr "�ؼ��ɮצ�󻷺�"
 msgid "Object with same name exists"
 msgstr "�P�W���ؼФw�g�s�b"
 
-#: timezone/zic.c:2023
+#: timezone/zic.c:2022
 msgid "Odd number of quotation marks"
 msgstr "�޸��ƥج��_��"
 
-#: elf/ldconfig.c:132
+#: elf/ldconfig.c:134
 msgid ""
 "Only process directories specified on the command line.  Don't build cache."
 msgstr "�u�B�z�b�R�O�C�޼Ƥ������w���ؿ��A���إߧ֨��ɮסC"
@@ -2992,6 +2972,10 @@ msgstr "�ާ@�N�|�Ȱ�"
 msgid "Option not supported by protocol"
 msgstr "�q�T��w�ä��䴩���Ѽ�"
 
+#: locale/programs/localedef.c:103
+msgid "Optional output file prefix"
+msgstr "�i���i�L����X�ɸ��|"
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:93
 msgid "Out of stream resources"
 msgstr "��Ƭy�귽�κ�"
@@ -3000,7 +2984,7 @@ msgstr "��Ƭy�귽�κ�"
 msgid "Out of streams resources"
 msgstr "�Ҧ���Ƭy���귽���w�κ�"
 
-#: iconv/iconv_prog.c:60 locale/programs/localedef.c:95
+#: iconv/iconv_prog.c:60 locale/programs/localedef.c:99
 msgid "Output control:"
 msgstr "��X����:"
 
@@ -3035,7 +3019,7 @@ msgstr "�������\"
 msgid "Passed object is not the same object on server"
 msgstr "�g�L������P���A���W���ä��ۦP"
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:287
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "���| `%s' �ϥζW�L�@��"
@@ -3051,27 +3035,23 @@ msgstr "�ڵ������v�����ާ@"
 msgid "Power failure"
 msgstr "�q���Y�����~"
 
-#: posix/regex.c:1122
+#: posix/regex.c:1126
 msgid "Premature end of regular expression"
 msgstr "�`�W���ܦ��Ӧ������F"
 
-#: elf/ldconfig.c:125
+#: elf/ldconfig.c:127
 msgid "Print cache"
 msgstr "�C�L�֨�"
 
-#: nss/makedb.c:65
-msgid "Print content of database file, one entry a line"
-msgstr "�L�X��Ʈw�ɮת����e�A�C�Ӷ��ؤ@��"
-
 #: nscd/nscd.c:89
 msgid "Print current configuration statistic"
 msgstr "�L�X�ثe���պA�έp"
 
-#: locale/programs/localedef.c:102
+#: locale/programs/localedef.c:107
 msgid "Print more messages"
 msgstr "�L�X��h���T��"
 
-#: argp/argp-parse.c:148
+#: argp/argp-parse.c:154
 msgid "Print program version"
 msgstr "�L�X�{������"
 
@@ -3245,7 +3225,7 @@ msgstr "RPC: ��������w"
 msgid "RSA (%d bits)\n"
 msgstr "RSA (%d �줸)\n"
 
-#: elf/dl-sym.c:66 elf/dl-sym.c:116
+#: elf/dl-sym.c:68 elf/dl-sym.c:125
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "�{���X�ҨϥΪ� RTLD_NEXT �S���ʺA���J"
 
@@ -3268,7 +3248,7 @@ msgstr "��Ū���ɮרt��"
 msgid "Real-time signal %d"
 msgstr "�Y�ɪ��T�� %d"
 
-#: posix/regex.c:1125
+#: posix/regex.c:1129
 msgid "Regular expression too big"
 msgstr "���W���ܦ��Ӫ��F"
 
@@ -3286,7 +3266,7 @@ msgstr "���ݦ�}���ܤF"
 msgid "Remove password or make file unreadable by others."
 msgstr "�����K�X�����L�H�L�kŪ���ɮ�"
 
-#: elf/cache.c:388
+#: elf/cache.c:394
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "�N %s ��W�� %s ����"
@@ -3300,14 +3280,14 @@ msgstr "���s�}�Ҧ@�Υت��� %s ����"
 msgid "Replicate :\n"
 msgstr "�ƻs :\n"
 
-#: argp/argp-help.c:1635
+#: argp/argp-help.c:1639
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "�бN�{�����D�^���� %s�C\n"
 
-#: catgets/gencat.c:224 debug/pcprofiledump.c:181 iconv/iconv_prog.c:337
-#: locale/programs/locale.c:254 locale/programs/localedef.c:289
-#: malloc/memusagestat.c:602 nss/makedb.c:231
+#: catgets/gencat.c:233 debug/pcprofiledump.c:181 iconv/iconv_prog.c:337
+#: locale/programs/locale.c:256 locale/programs/localedef.c:297
+#: malloc/memusagestat.c:602
 msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
 msgstr "�Шϥ� `glibcbug' �妸�{���N���D�^���� <bugs@gnu.org>�C\n"
 
@@ -3418,7 +3398,7 @@ msgstr "���A���ڵ��{��"
 msgid "Servname not supported for ai_socktype"
 msgstr "���䴩 ai_socktype �����A�W��"
 
-#: argp/argp-parse.c:89
+#: argp/argp-parse.c:95
 msgid "Set the program name"
 msgstr "�]�w�{���W��"
 
@@ -3452,7 +3432,7 @@ msgstr "�n��y���s�u���_"
 msgid "Sorry. You are not root\n"
 msgstr "���n�N��A�A�ä��O root �ϥΪ�\n"
 
-#: locale/programs/localedef.c:91
+#: locale/programs/localedef.c:95
 msgid "Source definitions are found in FILE"
 msgstr "��l��Ʃw�q�b�ɮ� FILE ��"
 
@@ -3508,16 +3488,20 @@ msgstr "��Ƭy�޽u���~"
 msgid "Structure needs cleaning"
 msgstr "���c�ݭn�M�z"
 
-#: nis/nis_error.c:29 nis/ypclnt.c:786 nis/ypclnt.c:860 posix/regex.c:1080
+#: nis/nis_error.c:29 nis/ypclnt.c:786 nis/ypclnt.c:860 posix/regex.c:1084
 #: stdio-common/../sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr "���\"
 
-#: locale/programs/localedef.c:101
+#: nss/getent.c:703
+msgid "Supported databases:"
+msgstr "�䴩����Ʈw:"
+
+#: locale/programs/localedef.c:106
 msgid "Suppress warnings and information messages"
 msgstr "����ĵ�i�P���ܰT��"
 
-#: locale/programs/localedef.c:90
+#: locale/programs/localedef.c:94
 msgid "Symbolic character names defined in FILE"
 msgstr "�Ÿ��r�����W�٩w�q�b�ɮ� FILE ��"
 
@@ -3525,7 +3509,7 @@ msgstr "�Ÿ��r�����W�٩w�q�b�ɮ� FILE ��"
 msgid "System error"
 msgstr "�t��~"
 
-#: locale/programs/locale.c:63
+#: locale/programs/locale.c:65
 msgid "System information:"
 msgstr "�t������T:"
 
@@ -3533,7 +3517,7 @@ msgstr "�t������T:"
 msgid "System resource allocation failure"
 msgstr "�t�θ귽�t�m����"
 
-#: locale/programs/localedef.c:284
+#: locale/programs/localedef.c:292
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -3588,12 +3572,15 @@ msgid ""
 "the FROM and TO command line parameters.  One coded character set can be\n"
 "listed with several different names (aliases).\n"
 "\n"
+"  "
 msgstr ""
 "�H�U���C���]�t�Ҧ��w�����s�X�r���A���o���N���Ҧ����r���W�ٲզX�ҥi�Ω�\n"
 "�R�O�C�� \"�ӷ�\" �H�� \"�ت�\" �޼ơC�@�ӽs�X�r���i�H�δX�Ӥ��P���W��\n"
 "�Ӫ��� (�Y \"�ΦW\")�C\n"
+"\n"
+"  "
 
-#: sunrpc/rpc_main.c:1369
+#: sunrpc/rpc_main.c:1364
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr "����@�覡���䴩�s���Φ��Φh�w������Ǫ��{��!\n"
 
@@ -3671,7 +3658,7 @@ msgstr "�Ӧh�ϥΪ�"
 msgid "Trace/breakpoint trap"
 msgstr "�l�ܻP���_�I����"
 
-#: posix/regex.c:1095
+#: posix/regex.c:1099
 msgid "Trailing backslash"
 msgstr "���ݪ��ϱ׽u"
 
@@ -3698,7 +3685,7 @@ msgstr "�ǿ骺��ݤw�g�����s�u�F"
 msgid "Transport endpoint is not connected"
 msgstr "�ǿ骺��ݩ|���s�u"
 
-#: argp/argp-help.c:1607
+#: argp/argp-help.c:1611
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "�иյۥ� `%s --help' �� `%s --usage' ����o��h�����T���C\n"
@@ -3738,7 +3725,7 @@ msgstr "������ (�κA = %d�A�줸 = %d)\n"
 msgid "Unknown .netrc keyword %s"
 msgstr "������ .netrc ����r %s"
 
-#: elf/../sysdeps/generic/readelflib.c:68
+#: elf/../sysdeps/generic/readelflib.c:69
 #, c-format
 msgid "Unknown ELFCLASS in file %s.\n"
 msgstr "�ɮ� %s �������� ELFCLASS�C\n"
@@ -3747,7 +3734,7 @@ msgstr "�ɮ� %s �������� ELFCLASS�C\n"
 msgid "Unknown NIS error code"
 msgstr "������ NIS ���~�X"
 
-#: nss/getent.c:513
+#: nss/getent.c:771
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "��������Ʈw: %s\n"
@@ -3757,7 +3744,7 @@ msgid "Unknown error"
 msgstr "���������~"
 
 #: string/../sysdeps/generic/_strerror.c:48
-#: string/../sysdeps/mach/_strerror.c:87
+#: string/../sysdeps/mach/_strerror.c:88
 #: sysdeps/mach/hurd/mips/dl-machine.c:83
 msgid "Unknown error "
 msgstr "���������~ "
@@ -3788,7 +3775,7 @@ msgstr "���������A�����~"
 msgid "Unknown signal %d"
 msgstr "�������T�� %d"
 
-#: misc/error.c:108 timezone/zic.c:386
+#: misc/error.c:114 timezone/zic.c:384
 msgid "Unknown system error"
 msgstr "�������t��~"
 
@@ -3796,19 +3783,19 @@ msgstr "�������t��~"
 msgid "Unknown ypbind error"
 msgstr "������ ypbind ���~"
 
-#: posix/regex.c:1104
+#: posix/regex.c:1108
 msgid "Unmatched ( or \\("
 msgstr "( �� \\( ����ǰt"
 
-#: posix/regex.c:1128
+#: posix/regex.c:1132
 msgid "Unmatched ) or \\)"
 msgstr ") �� \\) ����ǰt"
 
-#: posix/regex.c:1101
+#: posix/regex.c:1105
 msgid "Unmatched [ or [^"
 msgstr "[ �� [^ ����ǰt"
 
-#: posix/regex.c:1107
+#: posix/regex.c:1111
 msgid "Unmatched \\{"
 msgstr "\\{ ����ǰt"
 
@@ -3821,7 +3808,7 @@ msgstr "�L�k�ѧO���ܼ� `%s'"
 msgid "Urgent I/O condition"
 msgstr "��檺��X�J���A"
 
-#: argp/argp-help.c:1564
+#: argp/argp-help.c:1568
 msgid "Usage:"
 msgstr "�ϥΤ覡:"
 
@@ -3834,11 +3821,11 @@ msgstr "�ϥΤ覡: %s variable_name [pathname]\n"
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 msgstr "�ϥΤ覡: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 
-#: elf/ldconfig.c:130
+#: elf/ldconfig.c:132
 msgid "Use CACHE as cache file"
 msgstr "�ϥ� CACHE ���@�֨��ɮ�"
 
-#: elf/ldconfig.c:131
+#: elf/ldconfig.c:133
 msgid "Use CONF as configuration file"
 msgstr "�ϥ� CONF ���@�]�w��"
 
@@ -3863,7 +3850,7 @@ msgstr "���w�q����ƫ��O�ȤӤj"
 msgid "Virtual timer expired"
 msgstr "�����p�ɾ��w�L�ɨ����F"
 
-#: timezone/zic.c:1927
+#: timezone/zic.c:1926
 msgid "Wild result from command execution"
 msgstr "�R�O����ɦܩ_�Ǫ����G"
 
@@ -3871,38 +3858,38 @@ msgstr "�R�O����ɦܩ_�Ǫ����G"
 msgid "Window changed"
 msgstr "�d����ܤF"
 
-#: locale/programs/locale.c:67
+#: locale/programs/locale.c:69
 msgid "Write names of available charmaps"
 msgstr "�g�X�s�b���r����Ӫ��W��"
 
-#: locale/programs/locale.c:65
+#: locale/programs/locale.c:67
 msgid "Write names of available locales"
-msgstr "�g�X�s�b���ϰ�Ƹ�Ʈw�W��"
+msgstr "�g�X�s�b���ϰ�Ƹ�Ʈw (locale) �W��"
 
-#: locale/programs/locale.c:69
+#: locale/programs/locale.c:71
 msgid "Write names of selected categories"
 msgstr "�g�X��������O�W��"
 
-#: locale/programs/locale.c:70
+#: locale/programs/locale.c:72
 msgid "Write names of selected keywords"
 msgstr "�g�X���������r�W��"
 
-#: catgets/gencat.c:111 nss/makedb.c:61
+#: catgets/gencat.c:115
 msgid "Write output to file NAME"
 msgstr "�N��X�g���ɮ� NAME ��"
 
-#: elf/cache.c:360 elf/cache.c:369 elf/cache.c:373
+#: elf/cache.c:366 elf/cache.c:375 elf/cache.c:379
 msgid "Writing of cache data failed"
 msgstr "�g�J�֨���Ʈɵo�Ϳ��~"
 
-#: elf/cache.c:377
+#: elf/cache.c:383
 msgid "Writing of cache data failed."
 msgstr "�g�J�֨���Ʈɵo�Ϳ��~"
 
-#: catgets/gencat.c:242 elf/ldconfig.c:257 elf/sprof.c:361
-#: iconv/iconv_prog.c:356 locale/programs/locale.c:272
-#: locale/programs/localedef.c:308 nscd/nscd.c:292 nscd/nscd_nischeck.c:95
-#: nss/getent.c:71 nss/makedb.c:249 posix/getconf.c:756
+#: catgets/gencat.c:251 elf/ldconfig.c:269 elf/sprof.c:361
+#: iconv/iconv_prog.c:356 locale/programs/locale.c:274
+#: locale/programs/localedef.c:316 nscd/nscd.c:292 nscd/nscd_nischeck.c:95
+#: nss/getent.c:68 posix/getconf.c:756
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�� %s �Ӽg�X�C\n"
@@ -3933,7 +3920,7 @@ msgstr "�O���A42 �N�O�s�b���N�q"
 msgid "You really blew it this time"
 msgstr "�o���u���Q�z���ѤF"
 
-#: timezone/zic.c:1089
+#: timezone/zic.c:1088
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "�ɰϱ���檺�����ɶ����b�W�@�檺�����ɶ�����"
 
@@ -3949,33 +3936,33 @@ msgstr "[FILE]"
 msgid "__get_myaddress: ioctl (get interface configuration)"
 msgstr "__get_myaddress: ioctl (���o�����պA)"
 
-#: locale/programs/ld-collate.c:383
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' �w�Q�w�q����Ӥ���"
 
-#: locale/programs/ld-collate.c:376
+#: locale/programs/ld-collate.c:410
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' �w�Q�w�q����ӲŸ�"
 
-#: locale/programs/ld-collate.c:360
+#: locale/programs/ld-collate.c:394
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' �b�r����Ӫ����w�g�w�q�L�F"
 
-#: locale/programs/ld-collate.c:369
+#: locale/programs/ld-collate.c:403
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' �b�s�X��M�ɤ��w�g�Q�w�q�L�F"
 
-#: locale/programs/charmap.c:562 locale/programs/locfile.h:96
+#: locale/programs/charmap.c:599 locale/programs/locfile.h:96
 #: locale/programs/repertoire.c:314
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "`%1$s' �w�q�S���H `END %1$s' ����"
 
-#: locale/programs/ld-collate.c:1227 locale/programs/ld-ctype.c:1424
+#: locale/programs/ld-collate.c:1268 locale/programs/ld-ctype.c:1454
 #, c-format
 msgid "`%s' and `%.*s' are no valid names for symbolic range"
 msgstr "`%s' �M `%.*s' �ҫD�Ÿ��d�򤤾A�Ϊ��W��"
@@ -3985,7 +3972,7 @@ msgstr "`%s' �M `%.*s' �ҫD�Ÿ��d�򤤾A�Ϊ��W��"
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr "`%s' ���O `%s' �����T�����t���������"
 
-#: locale/programs/ld-ctype.c:668
+#: locale/programs/ld-ctype.c:691
 msgid "`digit' category has not entries in groups of ten"
 msgstr "`digit' ���O�b�s�� \"�Q\" ���S������"
 
@@ -4001,7 +3988,7 @@ msgstr "ai_socktype �S���䴩"
 msgid "already running"
 msgstr "�w�b����"
 
-#: locale/programs/charmap.c:397 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:434 locale/programs/repertoire.c:184
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "�� <%s> ���޼ƥ����O�@�ӳ�r��"
@@ -4019,7 +4006,7 @@ msgstr "auth_none.c - �Y�����Ƨǰ��D"
 msgid "authunix_create: out of memory\n"
 msgstr "authunix_create: �O���餣��\n"
 
-#: locale/programs/charmap.c:327 locale/programs/locfile.c:118
+#: locale/programs/charmap.c:364 locale/programs/locfile.c:118
 #: locale/programs/locfile.c:145 locale/programs/repertoire.c:176
 msgid "bad argument"
 msgstr "���~���޼�"
@@ -4028,11 +4015,11 @@ msgstr "���~���޼�"
 msgid "bad owner"
 msgstr "���~���֦���"
 
-#: timezone/zic.c:1211
+#: timezone/zic.c:1210
 msgid "blank FROM field on Link line"
 msgstr "Link �椤�ťժ� FROM ���"
 
-#: timezone/zic.c:1215
+#: timezone/zic.c:1214
 msgid "blank TO field on Link line"
 msgstr "Link �椤�ťժ� TO ���"
 
@@ -4052,24 +4039,19 @@ msgstr "broadcast: ioctl (���o�����]�w��)"
 msgid "broadcast: ioctl (get interface flags)"
 msgstr "broadcast: ioctl (���o�����X��)"
 
-#: elf/ldconfig.c:557
-#, c-format
-msgid "buffer for snprintf too small for %s/%s--file is ignored\n"
-msgstr "�� snprintf ���w�ĪŶ��Ӥp�A�L�k %s/%s--�������@�ɮ�\n"
-
-#: sunrpc/svc_udp.c:528 sunrpc/svc_udp6.c:447
+#: sunrpc/svc_udp.c:528
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: �L�k�t�m�s�����ݵ{�ǩI�s�w�İ� (rpc_buffer)"
 
-#: sunrpc/svc_udp.c:522 sunrpc/svc_udp6.c:441
+#: sunrpc/svc_udp.c:522
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set: victim �t�m����"
 
-#: sunrpc/svc_udp.c:511 sunrpc/svc_udp6.c:430
+#: sunrpc/svc_udp.c:511
 msgid "cache_set: victim not found"
 msgstr "cache_set: �䤣�� victim"
 
-#: timezone/zic.c:1752
+#: timezone/zic.c:1751
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "�L�k�M�w�b�����ɶ� (untiltime) �H��ӨϥΪ��ɰ�²�g"
 
@@ -4078,24 +4060,24 @@ msgstr "�L�k�M�w�b�����ɶ� (untiltime) �H��ӨϥΪ��ɰ�²�g"
 msgid "can't reassign procedure number %ld\n"
 msgstr "���୫�ƫ��w�{�Ǹ��X %ld\n"
 
-#: elf/dl-reloc.c:150
+#: elf/dl-reloc.c:152
 msgid "can't restore segment prot after reloc"
 msgstr "�b reloc ����L�k�_�� segment port"
 
-#: locale/programs/localedef.c:477
+#: locale/programs/localedef.c:487
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
-msgstr " `%s' �ϰ��Ƥw�g�ιL�A���୫�ƥ[�J"
+msgstr " `%s' �ϰ��� (locale) �w�g�ιL�A���୫�ƥ[�J"
 
-#: elf/dl-deps.c:458
+#: elf/dl-deps.c:470
 msgid "cannot allocate dependency list"
 msgstr "�L�k�t�m�����ʦC��"
 
-#: elf/dl-load.c:1042
+#: elf/dl-load.c:1031
 msgid "cannot allocate memory for program header"
 msgstr "�L�k�t�m�O���鵹�{�����Y�Ϩϥ�"
 
-#: elf/dl-load.c:317
+#: elf/dl-load.c:339
 msgid "cannot allocate name record"
 msgstr "�L�k�t�m�W�٬���"
 
@@ -4103,7 +4085,7 @@ msgstr "�L�k�t�m�W�٬���"
 msgid "cannot allocate symbol data"
 msgstr "�L�k�t�m�禡�Ÿ����"
 
-#: elf/dl-deps.c:476
+#: elf/dl-deps.c:501
 msgid "cannot allocate symbol search list"
 msgstr "�L�k�t�m�Ÿ��j�M�C��"
 
@@ -4111,20 +4093,20 @@ msgstr "�L�k�t�m�Ÿ��j�M�C��"
 msgid "cannot allocate version reference table"
 msgstr "�L�k�t�m�����ѷӪ�"
 
-#: elf/dl-load.c:1011
+#: elf/dl-load.c:1000
 msgid "cannot change memory protections"
 msgstr "�L�k���ܰO����O�@���A"
 
-#: elf/dl-load.c:489
+#: elf/dl-load.c:533
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "�L�k�إ� RUNPATH/RPATH ���ƥ�"
 
-#: elf/dl-load.c:416 elf/dl-load.c:477 elf/dl-load.c:502 elf/dl-load.c:542
-#: elf/dl-load.c:634
+#: elf/dl-load.c:418 elf/dl-load.c:518 elf/dl-load.c:546 elf/dl-load.c:593
+#: elf/dl-load.c:685
 msgid "cannot create cache for search path"
 msgstr "�L�k���j�M���|�إߧ֨�"
 
-#: elf/dl-support.c:139
+#: elf/dl-support.c:191
 msgid "cannot create capability list"
 msgstr "�L�k�إ� capability �C��"
 
@@ -4136,37 +4118,45 @@ msgstr "�L�k�إߤ����ԭz��"
 msgid "cannot create internal descriptors"
 msgstr "�L�k�إߤ����ԭz��"
 
-#: elf/dl-load.c:532
+#: elf/dl-load.c:583
 msgid "cannot create search path array"
 msgstr "�L�k�إ߷j�M���|�}�C"
 
-#: elf/dl-load.c:1146
+#: elf/dl-load.c:1137
 msgid "cannot create searchlist"
 msgstr "�L�k�إ߷j�M�C��"
 
-#: elf/dl-load.c:839 elf/dl-load.c:1559
+#: elf/dl-load.c:822 elf/dl-load.c:1682
 msgid "cannot create shared object descriptor"
 msgstr "�L�k�إߦ@�Υت��ɱԭz��"
 
+#: catgets/gencat.c:1316
+msgid "cannot determine escape character"
+msgstr "�L�k�M�w���� (escape) �r��"
+
+#: elf/dl-load.c:950
+msgid "cannot dynamically load executable"
+msgstr "�L�k�ʺA���J������"
+
 #: nscd/connections.c:183
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "�L�k�}�� socket �ӱ����s�u: %s"
 
-#: elf/dl-open.c:251
+#: elf/dl-open.c:121
 msgid "cannot extend global scope"
 msgstr "�L�k���i�����ܼƪ��@�ΰ�"
 
-#: sunrpc/rpc_main.c:342
+#: sunrpc/rpc_main.c:343
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr "�䤣�� C �e�m�B�z��: %s \n"
 
-#: sunrpc/rpc_main.c:350
+#: sunrpc/rpc_main.c:351
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr "�䤣����� C �e�m�B�z�� (cpp)\n"
 
-#: nscd/connections.c:224
+#: nscd/connections.c:225
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "����B�z�� %d �����ШD�F�ثe�ϥΪ������O %d"
@@ -4175,11 +4165,15 @@ msgstr "����B�z�� %d �����ШD�F�ثe�ϥΪ������O %d"
 msgid "cannot load profiling data"
 msgstr "�L�k���J���ո��"
 
-#: elf/dl-reloc.c:62
+#: elf/dl-deps.c:586
+msgid "cannot load shared object file"
+msgstr "�L�k���J�@�Υت���"
+
+#: elf/dl-reloc.c:63
 msgid "cannot make segment writable for relocation"
 msgstr "�b���s�w�}�H��L�k�N�Ϭq�]���i�g�J���A"
 
-#: elf/dl-load.c:1027
+#: elf/dl-load.c:1016
 msgid "cannot map zero-fill pages"
 msgstr "�L�k�����H�s�񺡪�������"
 
@@ -4192,31 +4186,26 @@ msgstr "�L�k�}��"
 msgid "cannot open `%s'"
 msgstr "�L�k�}�� `%s'"
 
-#: nss/makedb.c:149
-#, c-format
-msgid "cannot open database file `%s': %s"
-msgstr "�L�k�}�Ҹ�Ʈw�ɮ� `%s': %s"
-
 #: debug/pcprofiledump.c:96
 msgid "cannot open input file"
 msgstr "�L�k�}�ҿ�J��"
 
-#: catgets/gencat.c:273 iconv/iconv_prog.c:225 nss/makedb.c:170
+#: catgets/gencat.c:288 iconv/iconv_prog.c:225
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "�L�k�}�ҿ�J�� `%s'"
 
-#: locale/programs/localedef.c:198 locale/programs/localedef.c:213
-#: locale/programs/localedef.c:503 locale/programs/localedef.c:523
+#: locale/programs/localedef.c:203 locale/programs/localedef.c:218
+#: locale/programs/localedef.c:513 locale/programs/localedef.c:533
 #, c-format
 msgid "cannot open locale definition file `%s'"
-msgstr "�L�k�}�Ұϰ��Ʃw�q�� `%s'"
+msgstr "�L�k�}�Ұϰ�Ƹ�Ʈw (locale) �w�q�� `%s'"
 
 #: iconv/iconv_prog.c:194
 msgid "cannot open output file"
 msgstr "�L�k�}�ҿ�X��"
 
-#: catgets/gencat.c:780 catgets/gencat.c:821 nss/makedb.c:183
+#: catgets/gencat.c:944 catgets/gencat.c:985
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr "�L�k�}�ҿ�X�� `%s'"
@@ -4226,7 +4215,7 @@ msgstr "�L�k�}�ҿ�X�� `%s'"
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "�L�k�}�ҿ�X�� `%s' �����O `%s' �ϥ�"
 
-#: elf/dl-load.c:1572
+#: elf/dl-load.c:1695
 msgid "cannot open shared object file"
 msgstr "�L�k�}�Ҧ@�Υت���"
 
@@ -4235,11 +4224,11 @@ msgstr "�L�k�}�Ҧ@�Υت���"
 msgid "cannot open socket: %s"
 msgstr "�L�k�}�� socket: %s"
 
-#: elf/dl-load.c:831
+#: elf/dl-load.c:814
 msgid "cannot open zero fill device"
 msgstr "�L�k�}�ҥH�s�񺡪��˸m"
 
-#: locale/programs/locale.c:462
+#: locale/programs/charmap-dir.c:61
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "�L�kŪ���r������ɥؿ� `%s'"
@@ -4248,7 +4237,7 @@ msgstr "�L�kŪ���r������ɥؿ� `%s'"
 msgid "cannot read configuration file; this is fatal"
 msgstr "�L�kŪ���]�w�ɡA�o�O�@���Y�����~"
 
-#: elf/dl-load.c:768 elf/dl-load.c:856
+#: elf/dl-load.c:838 elf/dl-load.c:1244
 msgid "cannot read file data"
 msgstr "�L�kŪ���ɮ׸��"
 
@@ -4261,10 +4250,10 @@ msgstr "�L�kŪ�����Y���"
 msgid "cannot read header from `%s'"
 msgstr "�L�k�q `%s' Ū�����Y���"
 
-#: locale/programs/locale.c:306
+#: locale/programs/locale.c:308
 #, c-format
 msgid "cannot read locale directory `%s'"
-msgstr "�L�kŪ���ϰ��ƥؿ� `%s'"
+msgstr "�L�kŪ���ϰ��� (locale) �ؿ� `%s'"
 
 #: nscd/nscd_stat.c:128
 msgid "cannot read statistics data"
@@ -4274,7 +4263,7 @@ msgstr "�L�kŪ���έp���"
 msgid "cannot safe new repertoire map"
 msgstr "�L�k�x�s�s���s�X��M��"
 
-#: elf/dl-load.c:737
+#: elf/dl-load.c:776
 msgid "cannot stat shared object"
 msgstr "�L�k stat �@�Υت���"
 
@@ -4283,12 +4272,12 @@ msgstr "�L�k stat �@�Υت���"
 msgid "cannot stat() file `%s': %s"
 msgstr "�L�k stat() �ɮ� `%s': %s"
 
-#: locale/programs/localedef.c:225
+#: locale/programs/localedef.c:230
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "�L�k�N��X�ɮ׼g�J `%s'"
 
-#: nscd/connections.c:260 nscd/connections.c:281
+#: nscd/connections.c:261 nscd/connections.c:282
 #, c-format
 msgid "cannot write result: %s"
 msgstr "�L�k�g�J���G: %s"
@@ -4298,62 +4287,63 @@ msgstr "�L�k�g�J���G: %s"
 msgid "cannot write statistics: %s"
 msgstr "�L�k�g�J�έp���: %s"
 
-#: locale/programs/ld-ctype.c:486
+#: locale/programs/ld-ctype.c:509
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "�r�� '%s' (��b���O `%s' ����) �����b���O `%s' �̭�"
 
-#: locale/programs/ld-ctype.c:501
+#: locale/programs/ld-ctype.c:524
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "�r�� '%s' (��b���O `%s' ����) ����b���O `%s' �̭�"
 
-#: locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:579
 msgid "character <SP> not defined in character map"
 msgstr "�r�� <SP> �b�r������ɤ��S���w�q"
 
-#: locale/programs/linereader.c:710
-#, c-format
-msgid "character <U%0*X> not in repertoire map"
-msgstr "�r�� <U%0*X> �ä��b�s�X��M�ɸ̭�"
-
-#: locale/programs/ld-ctype.c:430
+#: locale/programs/ld-ctype.c:453
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "character L'\\u%0*x' (��b���O `%s' ����) �����b���O `%s' �̭�"
 
-#: locale/programs/ld-ctype.c:444
+#: locale/programs/ld-ctype.c:467
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "character L'\\u%0*x' (��b���O `%s' ����) ����b���O `%s' �̭�"
 
-#: locale/programs/ld-ctype.c:2917
+#: locale/programs/ld-ctype.c:3030
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr "�����Ψӧ@���w�]�Ȫ��r�� `%s' �S���Q�w�q��"
 
-#: locale/programs/ld-ctype.c:1205
+#: locale/programs/ld-ctype.c:1215
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "�r�����O `%s' �w�g�w�q�L�F"
 
-#: locale/programs/ld-ctype.c:1237
+#: locale/programs/ld-ctype.c:1247
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "�r������� `%s' �w�g�w�q�L�F"
 
-#: locale/programs/charmap.c:119
+#: locale/programs/charmap.c:249
+#, c-format
+msgid ""
+"character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
+msgstr "�r������ `%s' ���O ASCII �ۮe�X�A�ϰ�Ƹ�Ʈw���ŦX ISO C\n"
+
+#: locale/programs/charmap.c:135
 #, c-format
 msgid "character map file `%s' not found"
 msgstr "�䤣��r������� `%s'"
 
-#: locale/programs/charmap.c:423
+#: locale/programs/charmap.c:460
 msgid "character sets with locking states are not supported"
 msgstr "���䴩�ϥ� locking ���A���r����"
 
-#: locale/programs/localedef.c:472
+#: locale/programs/localedef.c:482
 msgid "circular dependencies between locale definitions"
-msgstr "���ϰ��Ʀb�w�q�ɵo�ʹ`�����������p"
+msgstr "���ϰ��� (locale) �b�w�q�ɵo�ʹ`�����������p"
 
 #: sunrpc/clnt_raw.c:111
 msgid "clnt_raw.c - Fatal header serialization error."
@@ -4363,7 +4353,7 @@ msgstr "clnt_raw.c - �Y�������Y�ǦC�ƿ��~�C"
 msgid "clnttcp_create: out of memory\n"
 msgstr "clnttcp_create: �O���餣��\n"
 
-#: sunrpc/clnt_udp.c:126 sunrpc/clnt_udp.c:136
+#: sunrpc/clnt_udp.c:131 sunrpc/clnt_udp.c:141
 msgid "clntudp_create: out of memory\n"
 msgstr "clntudp_create: �O���餣��\n"
 
@@ -4380,8 +4370,12 @@ msgstr "���ӭn���`�Ʃ��ѧO�Ÿ��~��"
 msgid "conversion from `%s' to `%s' not supported"
 msgstr "���䴩�q `%s' �� `%s' ���ഫ"
 
+#: catgets/gencat.c:1290
+msgid "conversion modules not available"
+msgstr "�ഫ�Ҳդ��s�b"
+
 #: locale/programs/ld-monetary.c:900
-msgid "conversion rate valze cannot be zero"
+msgid "conversion rate value cannot be zero"
 msgstr "�ഫ�v���Ȥ��i�H�O�s"
 
 #: iconv/iconv_prog.c:385 iconv/iconv_prog.c:410
@@ -4397,52 +4391,48 @@ msgstr "���ಣ�ͻ��ݵ{�ǩI�s���A�{��\n"
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr "����N�{�� %ld ���U�� %ld\n"
 
-#: nss/getent.c:50
+#: nss/getent.c:51
 msgid "database [key ...]"
 msgstr "��Ʈw [���...]"
 
-#: locale/programs/charmap.c:213
+#: locale/programs/charmap.c:192
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "�䤣��w�]���r������� `%s'"
 
-#: locale/programs/charmap.c:355
+#: locale/programs/charmap.c:392
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "<%s> ���w�q���ƤF"
 
-#: locale/programs/ld-collate.c:3173
+#: locale/programs/ld-collate.c:3043
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "�ԭz `%s' ���w�q���ƤF"
 
-#: nss/makedb.c:330
-msgid "duplicate key"
-msgstr "�ƻs���"
-
-#: catgets/gencat.c:389
+#: catgets/gencat.c:430
 msgid "duplicate set definition"
 msgstr "�ƻs���X�w�q"
 
-#: timezone/zic.c:1004
+#: timezone/zic.c:1003
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "�ƻs�ɰϦW�� %s (�ɮ� \"%s\", �� %d ��)"
 
-#: locale/programs/ld-ctype.c:2485
+#: locale/programs/ld-ctype.c:2557
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "��M `%s' ���w�q���ƤF"
 
-#: catgets/gencat.c:556
+#: catgets/gencat.c:631
 msgid "duplicated message identifier"
 msgstr "���ƪ��T���ѧO�Ÿ�"
 
-#: catgets/gencat.c:528
+#: catgets/gencat.c:603
 msgid "duplicated message number"
 msgstr "���ƪ��T���s��"
 
-#: locale/programs/ld-ctype.c:2296
+#: locale/programs/ld-ctype.c:2368
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "�ٲ��ϰ쥲���Ψ�ӫ��O�ۦP���B�⤸�ХܥX��"
 
@@ -4450,23 +4440,23 @@ msgstr "�ٲ��ϰ쥲���Ψ�ӫ��O�ۦP���B�⤸�ХܥX��"
 msgid "empty char string"
 msgstr "�Ū��r���r��"
 
-#: elf/dl-open.c:140
+#: elf/dl-open.c:223
 msgid "empty dynamic string token substitution"
 msgstr "�Ū��ʺA�r��O������"
 
-#: sunrpc/svc_udp.c:454 sunrpc/svc_udp6.c:373
+#: sunrpc/svc_udp.c:454
 msgid "enablecache: cache already enabled"
 msgstr "enablecache: �֨��w�g�}��"
 
-#: sunrpc/svc_udp.c:460 sunrpc/svc_udp6.c:379
+#: sunrpc/svc_udp.c:460
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache: �L�k�t�m�֨�"
 
-#: sunrpc/svc_udp.c:468 sunrpc/svc_udp6.c:387
+#: sunrpc/svc_udp.c:468
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache: �L�k�t�m�֨����"
 
-#: sunrpc/svc_udp.c:475 sunrpc/svc_udp6.c:394
+#: sunrpc/svc_udp.c:475
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: �L�k�t�m�֨� fifo �޽u"
 
@@ -4478,12 +4468,12 @@ msgstr "�Ψӿ�X���s�X"
 msgid "encoding of original text"
 msgstr "��l��r���s�X"
 
-#: nscd/connections.c:360 nscd/connections.c:452
+#: nscd/connections.c:361 nscd/connections.c:453
 #, c-format
 msgid "error getting callers id: %s"
 msgstr "���o�I�s�{���ѧO�X�ɵo�Ϳ��~: %s"
 
-#: locale/programs/ld-collate.c:3143
+#: locale/programs/ld-collate.c:3013
 msgid "error while adding equivalent collating symbol"
 msgstr "���b�[�J�P�q��ӲŸ��ɵo�Ϳ��~"
 
@@ -4508,7 +4498,7 @@ msgstr "���bŪ�J��ƪ��ɭԵo�Ϳ��~"
 msgid "expect string argument for `copy'"
 msgstr "`copy' ���Ѽ����ӬO�r��~��"
 
-#: timezone/zic.c:894
+#: timezone/zic.c:893
 msgid "expected continuation line not found"
 msgstr "�䤣��w���������"
 
@@ -4521,7 +4511,7 @@ msgstr "�}�Ҧ@�Υت��� `%s' ����"
 msgid "failed to load symbol data"
 msgstr "���J�禡�Ÿ���ƥ���"
 
-#: elf/dl-load.c:722
+#: elf/dl-load.c:763
 msgid "failed to map segment from shared object"
 msgstr "�q�@�Υت��ɤ���M�Ϭq����"
 
@@ -4544,20 +4534,24 @@ msgstr "fcntl: F_SETFD"
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1153
+#: sunrpc/rpc_main.c:1150
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr "�ɮ� `%s' �w�g�s�b�æ��i��|�Q�л\��\n"
 
+#: elf/dl-load.c:1244
+msgid "file too short"
+msgstr "�ɮפӤp"
+
 #: inet/rcmd.c:422
 msgid "fstat failed"
 msgstr "fstat ����"
 
-#: locale/programs/linereader.c:376
+#: locale/programs/linereader.c:383
 msgid "garbage at end of character code specification"
 msgstr "�r���s�X�]�w������m���L��"
 
-#: locale/programs/linereader.c:265
+#: locale/programs/linereader.c:271
 msgid "garbage at end of number"
 msgstr "���X������m���L��"
 
@@ -4573,16 +4567,16 @@ msgstr "�q���榸�ƻP�g���ɶ�����Ƥ����ͪ��������t���G"
 msgid "get_myaddress: ioctl (get interface configuration)"
 msgstr "get_myaddress: ioctl (���o�����]�w���)"
 
-#: nss/getent.c:54
+#: nss/getent.c:702
 msgid "getent - get entries from administrative database."
 msgstr "getent - �q�޲z��Ʈw�����o���ؤ��e�C"
 
-#: nscd/connections.c:219
+#: nscd/connections.c:220
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: �ШD�w�Q���� (������ %d)"
 
-#: timezone/zic.c:638
+#: timezone/zic.c:637
 msgid "hard link failed, symbolic link used"
 msgstr "����s�����ѡA�ϥβŸ��s���N��"
 
@@ -4590,15 +4584,15 @@ msgstr "����s�����ѡA�ϥβŸ��s���N��"
 msgid "hard linked somewhere"
 msgstr "�Q����s����Y�B"
 
-#: locale/programs/charmap.c:944 locale/programs/repertoire.c:430
+#: locale/programs/charmap.c:981 locale/programs/repertoire.c:430
 msgid "hexadecimal range format should use only capital characters"
 msgstr "�b���ܤQ���i�쪺�d��ɥu��Τj�g���^��r������"
 
-#: timezone/zic.c:1188
+#: timezone/zic.c:1187
 msgid "illegal CORRECTION field on Leap line"
 msgstr "�b�|�ɳ]�w�椤�����X�k�� CORRECTION ���"
 
-#: timezone/zic.c:1192
+#: timezone/zic.c:1191
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "�b�|�ɳ]�w�椤�����X�k�� Rolling/Stationary ���"
 
@@ -4606,7 +4600,7 @@ msgstr "�b�|�ɳ]�w�椤�����X�k�� Rolling/Stationary ���"
 msgid "illegal character in file: "
 msgstr "�ɮפ������X�k���r��: "
 
-#: locale/programs/linereader.c:588
+#: locale/programs/linereader.c:595
 msgid "illegal escape sequence at end of string"
 msgstr "�r�굲�������X�k������ǦC"
 
@@ -4615,21 +4609,21 @@ msgstr "�r�굲�������X�k������ǦC"
 msgid "illegal input sequence at position %ld"
 msgstr "��m %ld �����X�k����J�ǦC"
 
-#: sunrpc/rpc_main.c:466
+#: sunrpc/rpc_main.c:463
 #, c-format
 msgid "illegal nettype :`%s'\n"
 msgstr "���X�k�� nettype :`%s'\n"
 
-#: catgets/gencat.c:362 catgets/gencat.c:439
+#: catgets/gencat.c:403 catgets/gencat.c:480
 msgid "illegal set number"
 msgstr "���X�k�����X�s��"
 
-#: locale/programs/ld-ctype.c:1211
+#: locale/programs/ld-ctype.c:1221
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "�{����@������: ����ϥζW�L %Zd �Ӧr�����O"
 
-#: locale/programs/ld-ctype.c:1243
+#: locale/programs/ld-ctype.c:1253
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "�{����@������: ����ϥζW�L %d �Ӧr�������"
@@ -4638,15 +4632,11 @@ msgstr "�{����@������: ����ϥζW�L %d �Ӧr�������"
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "�w�İϵ��������������r���� shift sequence"
 
-#: nss/makedb.c:151
-msgid "incorrectly formatted file"
-msgstr "�S�����T�榡�ƪ��ɮ�"
-
-#: timezone/zic.c:851
+#: timezone/zic.c:850
 msgid "input line of unknown type"
 msgstr "�������O����J��"
 
-#: elf/dl-load.c:812
+#: elf/dl-load.c:1291
 msgid "internal error"
 msgstr "�������~"
 
@@ -4654,68 +4644,76 @@ msgstr "�������~"
 msgid "internal error (illegal descriptor)"
 msgstr "�������~ (���X�k���ԭz��)"
 
-#: timezone/zic.c:1814
+#: timezone/zic.c:1813
 msgid "internal error - addtype called with bad isdst"
 msgstr "�������~ - �ο��~�� isdst �I�s addtype �禡"
 
-#: timezone/zic.c:1822
+#: timezone/zic.c:1821
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "�������~ - �ο��~�� ttisgmt �I�s addtype �禡"
 
-#: timezone/zic.c:1818
+#: timezone/zic.c:1817
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "�������~ - �ο��~�� ttisstd �I�s addtype �禡"
 
-#: locale/programs/ld-ctype.c:457 locale/programs/ld-ctype.c:513
+#: locale/programs/ld-ctype.c:480 locale/programs/ld-ctype.c:536
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "%s ���� %u ��o�ͤ������~"
 
-#: elf/dl-load.c:789
+#: elf/dl-load.c:1264
 msgid "invalid ELF header"
 msgstr "�L�Ī� ELF ���Y"
 
-#: timezone/zic.c:1060
+#: timezone/zic.c:1059
 msgid "invalid UTC offset"
 msgstr "�L�Ī� UTC �첾��"
 
-#: timezone/zic.c:1063
+#: timezone/zic.c:1062
 msgid "invalid abbreviation format"
 msgstr "�L�Ī��Y�g�榡"
 
-#: timezone/zic.c:1153 timezone/zic.c:1365 timezone/zic.c:1379
+#: catgets/gencat.c:687
+msgid "invalid character: message ignored"
+msgstr "���A���r��: �������T��"
+
+#: timezone/zic.c:1152 timezone/zic.c:1364 timezone/zic.c:1378
 msgid "invalid day of month"
 msgstr "�L�Ī�����Ʀr"
 
-#: locale/programs/charmap.c:310
+#: locale/programs/charmap.c:347
 msgid "invalid definition"
 msgstr "�L�Ī��w�q"
 
-#: locale/programs/charmap.c:505
+#: locale/programs/charmap.c:542
 msgid "invalid encoding given"
 msgstr "�������s�X�O�L�Ī�"
 
-#: timezone/zic.c:1317
+#: timezone/zic.c:1316
 msgid "invalid ending year"
 msgstr "�L�Ī������~��"
 
-#: locale/programs/linereader.c:526
+#: catgets/gencat.c:1147 locale/programs/linereader.c:533
 msgid "invalid escape sequence"
 msgstr "�L�Ī�����ǦC"
 
-#: timezone/zic.c:1125
+#: timezone/zic.c:1124
 msgid "invalid leaping year"
 msgstr "�L�Ī��|�~"
 
-#: elf/dl-open.c:315
+#: catgets/gencat.c:726
+msgid "invalid line"
+msgstr "�L�Ī���J�C"
+
+#: elf/dl-open.c:371
 msgid "invalid mode for dlopen()"
 msgstr "�L�Ī� dlopen() �Ҧ�"
 
-#: timezone/zic.c:1140 timezone/zic.c:1243
+#: timezone/zic.c:1139 timezone/zic.c:1242
 msgid "invalid month name"
 msgstr "�L�Ī�����W��"
 
-#: locale/programs/charmap.c:932 locale/programs/ld-collate.c:3001
+#: locale/programs/charmap.c:969 locale/programs/ld-collate.c:2869
 #: locale/programs/repertoire.c:418
 msgid "invalid names for character range"
 msgstr "�L�Ī��r���d��W��"
@@ -4724,48 +4722,54 @@ msgstr "�L�Ī��r���d��W��"
 msgid "invalid pointer size"
 msgstr "�L�Ī����Фj�p"
 
-#: timezone/zic.c:959
+#: catgets/gencat.c:549
+msgid "invalid quote character"
+msgstr "���A�Ϊ��ޥΦr��"
+
+#: timezone/zic.c:958
 msgid "invalid saved time"
 msgstr "�L�Ī��`���ɶ�"
 
-#: timezone/zic.c:1292
+#: timezone/zic.c:1291
 msgid "invalid starting year"
 msgstr "�L�Ī��_�l�~��"
 
-#: timezone/zic.c:1169 timezone/zic.c:1272
+#: timezone/zic.c:1168 timezone/zic.c:1271
 msgid "invalid time of day"
 msgstr "�L�Ī��ɶ��Ʀr"
 
-#: timezone/zic.c:1370
+#: timezone/zic.c:1369
 msgid "invalid weekday name"
 msgstr "�L�Ī��u�@�� (weekday) �W��"
 
-#: nscd/connections.c:469
-msgid "key length in request too long: %zd"
-msgstr "�b���ШD�T�����ϥΪ���ȤӪ��F: %zd"
+#: nscd/connections.c:470
+#, c-format
+msgid "key length in request too long: %d"
+msgstr "�b���ШD���ϥΪ���ȤӪ��F: %d"
 
-#: elf/ldconfig.c:606
+#: elf/ldconfig.c:738
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 �禡�w %s �\���ؿ��F"
 
-#: elf/ldconfig.c:600
+#: elf/ldconfig.c:732
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 �禡�w %s �\���ؿ��F"
 
-#: elf/ldconfig.c:603
+#: elf/ldconfig.c:735
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6 �禡�w %s �\���ؿ��F"
 
-#: elf/ldconfig.c:633
+#: elf/ldconfig.c:765
 #, c-format
 msgid ""
 "libraries %s and %s in directory %s have same soname but different type."
-msgstr "�禡�w %s �� %s (�b�ؿ� %s ���U) ���@�P���@�Ψ禡�w�W�١A���L��榡�o���P"
+msgstr ""
+"�禡�w %s �� %s (�b�ؿ� %s ���U) ���@�P���@�Ψ禡�w�W�١A���L��榡�o���P"
 
-#: timezone/zic.c:831
+#: timezone/zic.c:830
 msgid "line too long"
 msgstr "�檺���׹L��"
 
@@ -4775,7 +4779,7 @@ msgstr "�C�X�Ҧ��w�����s�X�r����"
 
 #: locale/programs/locfile.h:63
 msgid "locale name should consist only of portable characters"
-msgstr "locale ���W�����ӥΪx�Φr�� (portable characters) �զ�"
+msgstr "�ϰ�Ƹ�Ʈw (locale) ���W�����ӥΪx�Φr�� (portable characters) �զ�"
 
 #: inet/rcmd.c:413
 msgid "lstat failed"
@@ -4789,7 +4793,7 @@ msgstr "�]�w��X���ϧΰ��׬� VALUE �ӹ���"
 msgid "make output graphic VALUE pixel wide"
 msgstr "�]�w��X���ϧμe�׬� VALUE �ӹ���"
 
-#: catgets/gencat.c:625
+#: catgets/gencat.c:780
 msgid "malformed line ignored"
 msgstr "�����_�Ǫ���"
 
@@ -4810,7 +4814,7 @@ msgid "memory clobbered past end of allocated block\n"
 msgstr "�O����b�g�L�t�m���϶������� clobbered �F\n"
 
 #: locale/programs/locfile.c:334 locale/programs/xmalloc.c:70
-#: malloc/obstack.c:471 posix/getconf.c:809
+#: malloc/obstack.c:477 posix/getconf.c:809
 msgid "memory exhausted"
 msgstr "�O����Ӻ�"
 
@@ -4818,15 +4822,15 @@ msgstr "�O����Ӻ�"
 msgid "memory is consistent, library is buggy\n"
 msgstr "�O���餺�e�@�P�A�禡�w�����D\n"
 
-#: elf/cache.c:115
+#: elf/cache.c:120
 msgid "mmap of cache file failed.\n"
 msgstr "�֨��ɮ� mmap ���ѡC\n"
 
-#: elf/../sysdeps/generic/readelflib.c:107
+#: elf/../sysdeps/generic/readelflib.c:108
 msgid "more than one dynamic segment\n"
 msgstr "�W�L�@�Ӫ��ʺA�Ϭq\n"
 
-#: timezone/zic.c:954
+#: timezone/zic.c:953
 msgid "nameless rule"
 msgstr "�W�h�S���W��"
 
@@ -4875,11 +4879,11 @@ msgstr "�d�U���n���U�{�� %d\n"
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "�S�����w <Uxxxx> �� <Uxxxxxxxx> ����"
 
-#: timezone/zic.c:2143
+#: timezone/zic.c:2142
 msgid "no day in month matches rule"
 msgstr "�b�����Ƥ��䤣��ŦX�W�h�����"
 
-#: locale/programs/ld-collate.c:1814
+#: locale/programs/ld-collate.c:1757
 msgid "no definition of `UNDEFINED'"
 msgstr "�S����� `UNDEFINED' ���w�q"
 
@@ -4889,7 +4893,7 @@ msgid ""
 "no filename for profiling data given and shared object `%s' has no soname"
 msgstr "�S���������ո�ƪ��ɦW�A�ӥB�@�Υت��� `%s' �]�S���@�Ψ禡�w�W��"
 
-#: locale/programs/ld-ctype.c:716
+#: locale/programs/ld-ctype.c:739
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr "�S���w�q��J�Ʀr�A�b�r������ɤ��]�䤣��۲Ū��зǦW��"
 
@@ -4897,33 +4901,33 @@ msgstr "�S���w�q��J�Ʀr�A�b�r������ɤ��]�䤣��۲Ū��зǦW��"
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "�ϥ� `copy' ���ɭԤ����ӦA�Ψ�����L������r�F"
 
-#: locale/programs/ld-ctype.c:3236
+#: locale/programs/ld-ctype.c:3349
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "�S���w�q��X�Ʀr�A�b�r������ɤ��]�䤣��۲Ū��зǦW��"
 
-#: locale/programs/localedef.c:231
+#: locale/programs/localedef.c:236
 msgid "no output file produced because warning were issued"
 msgstr "�]���o�X�Lĵ�i�T���A�ҥH�S���s�y�����X��"
 
-#: locale/programs/charmap.c:451 locale/programs/charmap.c:631
-#: locale/programs/charmap.c:727 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:488 locale/programs/charmap.c:668
+#: locale/programs/charmap.c:764 locale/programs/repertoire.c:231
 msgid "no symbolic name given"
 msgstr "�S�������Ÿ��W��"
 
-#: locale/programs/charmap.c:538 locale/programs/charmap.c:686
-#: locale/programs/charmap.c:769 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:575 locale/programs/charmap.c:723
+#: locale/programs/charmap.c:806 locale/programs/repertoire.c:297
 msgid "no symbolic name given for end of range"
 msgstr "�S�������Ϫ��̫�@�Ӧr���Ÿ��W��"
 
-#: locale/programs/linereader.c:634
+#: locale/programs/linereader.c:641
 msgid "non-symbolic character value should not be used"
 msgstr "�D�Ÿ��ʪ��r���Ȥ����ӳQ�ϥΤ~��"
 
-#: locale/programs/ld-ctype.c:781
+#: locale/programs/ld-ctype.c:804
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "�b�r����Ӫ����L�k���Y�Ǧb `outdigit' ���Ψ쪺�r��"
 
-#: locale/programs/ld-ctype.c:798
+#: locale/programs/ld-ctype.c:821
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "�b�s�X��M�ɤ��L�k���Y�Ǧb `outdigit' ���Ψ쪺�r��"
 
@@ -4946,7 +4950,7 @@ msgstr ""
 msgid "nscd not running!\n"
 msgstr "nscd �èS���b����!\n"
 
-#: elf/dl-load.c:1062
+#: elf/dl-load.c:1051
 msgid "object file has no dynamic section"
 msgstr "�@�Υت��ɤ��S���ʺA�`��"
 
@@ -4954,11 +4958,15 @@ msgstr "�@�Υت��ɤ��S���ʺA�`��"
 msgid "omit invalid characters from output"
 msgstr "�ٲ��L�Ħr������X"
 
-#: locale/programs/charmap.c:595
+#: elf/dl-load.c:1311
+msgid "only ET_DYN and ET_EXEC can be loaded"
+msgstr "�u�� ET_DYN �H�� ET_EXEC �i�H���J"
+
+#: locale/programs/charmap.c:632
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "�u�� WIDTH �w�q�~�ઽ���g�b CHARMAP �w�q����"
 
-#: locale/programs/ld-collate.c:968 locale/programs/ld-collate.c:1134
+#: locale/programs/ld-collate.c:1005 locale/programs/ld-collate.c:1175
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s' �����Ǥw�g�b %s:%Zu �̭��w�q�F"
@@ -4983,7 +4991,7 @@ msgstr "pmap_getmaps ���ݵ{�ǩI�s���D"
 msgid "poll: protocol failure in circuit setup\n"
 msgstr "poll: �q�T��w�b�]�w�u���ɥ���\n"
 
-#: locale/programs/ld-ctype.c:1917 locale/programs/ld-ctype.c:1968
+#: locale/programs/ld-ctype.c:1949 locale/programs/ld-ctype.c:2000
 msgid "premature end of `translit_ignore' definition"
 msgstr "`translit_ignore' �w�q�S�����ɵ���"
 
@@ -4991,7 +4999,7 @@ msgstr "`translit_ignore' �w�q�S�����ɵ���"
 msgid "preprocessor error"
 msgstr "�e�m�B�z�����~"
 
-#: locale/programs/ld-ctype.c:2647
+#: locale/programs/ld-ctype.c:2731
 msgid "previous definition was here"
 msgstr "���e���]�w�b��"
 
@@ -5003,11 +5011,6 @@ msgstr "�C�X�p�ƪ����|�H�Υ��̨ϥΪ�����"
 msgid "print progress information"
 msgstr "�L�X�{�Ǭ�����T"
 
-#: nss/makedb.c:347
-#, c-format
-msgid "problems while reading `%s'"
-msgstr "���bŪ�� `%s' �ɵo�Ͱ��D"
-
 #: elf/sprof.c:687
 #, c-format
 msgid "profiling data file `%s' does not match shared object `%s'"
@@ -5053,7 +5056,7 @@ msgstr "rcmd: write (���b�]�w�зǿ��~��X): %m\n"
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc: �O���餣��\n"
 
-#: timezone/zic.c:1875
+#: timezone/zic.c:1874
 msgid "repeated leap second moment"
 msgstr "���ƪ��|���]�w"
 
@@ -5062,15 +5065,15 @@ msgstr "���ƪ��|���]�w"
 msgid "repertoire map file `%s' not found"
 msgstr "�䤣��s�X��M�� `%s'"
 
-#: locale/programs/charmap.c:1026
+#: locale/programs/charmap.c:1063
 msgid "resulting bytes for range not representable."
 msgstr "�Ψөw�q�d�򪺦줸�յL�k�Q���z�X��"
 
-#: sunrpc/rpc_main.c:1120
+#: sunrpc/rpc_main.c:1117
 msgid "rpcgen: arglist coding error\n"
 msgstr "rpcgen: arglist �s�X���~\n"
 
-#: sunrpc/rpc_main.c:1108
+#: sunrpc/rpc_main.c:1105
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: �Ӧh define �F\n"
 
@@ -5098,29 +5101,29 @@ msgstr "rpcinfo: �s������: %s\n"
 msgid "rpcinfo: can't contact portmapper"
 msgstr "rpcinfo: �L�k�إ߸� portmapper �������s�u"
 
-#: timezone/zic.c:744 timezone/zic.c:746
+#: timezone/zic.c:743 timezone/zic.c:745
 msgid "same rule name in multiple files"
 msgstr "�b�h���ɮ׸̭����ۦP���W�h�W��"
 
-#: elf/dl-load.c:1126
+#: elf/dl-load.c:1116
 msgid "shared object cannot be dlopen()ed"
 msgstr "�@�Υت��ɵL�k�Q dlopen()"
 
-#: elf/dl-close.c:57
+#: elf/dl-close.c:63
 msgid "shared object not open"
 msgstr "�@�Υت��ɮרS���}��"
 
-#: nscd/connections.c:481
+#: nscd/connections.c:482
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "Ū���ШD����Ȯɵo�{��J�ȹL�u: %s"
 
-#: nscd/connections.c:435
+#: nscd/connections.c:436
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "Ū���ШD�ɵo�{��J�ȹL�u: %s"
 
-#: nscd/grpcache.c:192 nscd/hstcache.c:278 nscd/pwdcache.c:189
+#: nscd/grpcache.c:193 nscd/hstcache.c:278 nscd/pwdcache.c:189
 #, c-format
 msgid "short write in %s: %s"
 msgstr "�g�J %s ����ƹL�u: %s"
@@ -5129,78 +5132,75 @@ msgstr "�g�J %s ����ƹL�u: %s"
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket: �q�T��w�b�]�w�u���ɥ���\n"
 
-#: timezone/zic.c:815
+#: timezone/zic.c:814
 msgid "standard input"
 msgstr "�зǿ�J"
 
-#: timezone/zdump.c:268
+#: timezone/zdump.c:269
 msgid "standard output"
 msgstr "�зǿ�X"
 
-#: locale/programs/ld-ctype.c:1648
+#: locale/programs/ld-ctype.c:1680
 msgid "start and end character sequence of range must have the same length"
 msgstr "�q�_�l�쵲���������r���ǦC���׸�s�X�d�򥲶��ۦP"
 
-#: timezone/zic.c:1326
+#: timezone/zic.c:1325
 msgid "starting year greater than ending year"
 msgstr "�_�l�~���񵲧��~���٭n�j"
 
-#: timezone/zic.c:1298 timezone/zic.c:1323
+#: timezone/zic.c:1297 timezone/zic.c:1322
 msgid "starting year too high to be represented"
 msgstr "�_�l�~���Ӱ��A�L�k����"
 
-#: timezone/zic.c:1296 timezone/zic.c:1321
+#: timezone/zic.c:1295 timezone/zic.c:1320
 msgid "starting year too low to be represented"
 msgstr "�_�l�~���ӧC�A�L�k����"
 
 #: iconv/iconv_prog.c:63
-msgid "supress warnings"
-msgstr "����ĵ�i�T��"
+msgid "suppress warnings"
+msgstr "�����Xĵ�i�T��"
 
 #: sunrpc/svc_run.c:76
 msgid "svc_run: - poll failed"
 msgstr "svc_run: - poll ����"
 
-#: sunrpc/svc_tcp.c:161 sunrpc/svc_tcp6.c:161
+#: sunrpc/svc_tcp.c:161
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr "svc_tcp.c - �L�k getsockname �� listen"
 
-#: sunrpc/svc_tcp.c:146 sunrpc/svc_tcp6.c:146
+#: sunrpc/svc_tcp.c:146
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr "svc_tcp.c - tcp socket �إߵo�Ͱ��D"
 
-#: sunrpc/svc_tcp.c:210 sunrpc/svc_tcp.c:216 sunrpc/svc_tcp6.c:210
-#: sunrpc/svc_tcp6.c:216
+#: sunrpc/svc_tcp.c:210 sunrpc/svc_tcp.c:216
 msgid "svc_tcp: makefd_xprt: out of memory\n"
 msgstr "svc_tcp: makefd_xprt: �O���餣��\n"
 
-#: sunrpc/svc_unix.c:136
+#: sunrpc/svc_unix.c:137
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr "svc_unix.c - AF_UNIX socket �إߦ����D"
 
-#: sunrpc/svc_unix.c:152
+#: sunrpc/svc_unix.c:153
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c - �L�k getsockname �� listen"
 
-#: sunrpc/svc_unix.c:202 sunrpc/svc_unix.c:208
+#: sunrpc/svc_unix.c:203 sunrpc/svc_unix.c:209
 msgid "svc_unix: makefd_xprt: out of memory\n"
 msgstr "svc_unix: makefd_xprt: �O���餣��\n"
 
-#: sunrpc/svc_tcp.c:169 sunrpc/svc_tcp.c:177 sunrpc/svc_tcp6.c:169
-#: sunrpc/svc_tcp6.c:177
+#: sunrpc/svc_tcp.c:169 sunrpc/svc_tcp.c:177
 msgid "svctcp_create: out of memory\n"
 msgstr "svctcp_create: �O���餣��\n"
 
-#: sunrpc/svc_udp.c:141 sunrpc/svc_udp6.c:136
+#: sunrpc/svc_udp.c:141
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create - �L�k getsockname"
 
 #: sunrpc/svc_udp.c:149 sunrpc/svc_udp.c:155 sunrpc/svc_udp.c:161
-#: sunrpc/svc_udp6.c:144 sunrpc/svc_udp6.c:150 sunrpc/svc_udp6.c:156
 msgid "svcudp_create: out of memory\n"
 msgstr "svcudp_create: �O���餣��\n"
 
-#: sunrpc/svc_udp.c:127 sunrpc/svc_udp6.c:122
+#: sunrpc/svc_udp.c:127
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create: socket �إߦ����D"
 
@@ -5208,54 +5208,49 @@ msgstr "svcudp_create: socket �إߦ����D"
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create: xp_pad �Ӥp�H�P��L�k IP_PKTINFO\n"
 
-#: sunrpc/svc_unix.c:161 sunrpc/svc_unix.c:169
+#: sunrpc/svc_unix.c:162 sunrpc/svc_unix.c:170
 msgid "svcunix_create: out of memory\n"
 msgstr "svcunix_create: �O���餣��\n"
 
-#: locale/programs/linereader.c:749
+#: locale/programs/linereader.c:745
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "�Ÿ� `%.*s' �ä��b�r����Ӫ���"
 
-#: locale/programs/linereader.c:770
+#: locale/programs/linereader.c:766
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "�Ÿ� `%.*s' �ä��b�s�X��M�ɤ�"
 
-#: locale/programs/ld-collate.c:1577 locale/programs/ld-collate.c:1778
+#: locale/programs/ld-collate.c:1617 locale/programs/ld-collate.c:1716
 #, c-format
 msgid "symbol `%s'"
 msgstr "�Ÿ� `%s'"
 
-#: locale/programs/ld-collate.c:1574 locale/programs/ld-collate.c:1775
+#: locale/programs/ld-collate.c:1614 locale/programs/ld-collate.c:1713
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "��Ÿ� `%s' ���ۦP���s�X: "
 
-#: locale/programs/ld-collate.c:1499
+#: locale/programs/ld-collate.c:1539
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "�å��w�q `%s' �Ÿ�"
 
-#: locale/programs/linereader.c:725
-#, c-format
-msgid "symbol `%s' not in charmap"
-msgstr "�Ÿ�`%s' �ä��b�r����Ӫ���"
-
-#: locale/programs/ld-ctype.c:1923 locale/programs/ld-ctype.c:1974
-#: locale/programs/ld-ctype.c:2016
+#: locale/programs/ld-ctype.c:1955 locale/programs/ld-ctype.c:2006
+#: locale/programs/ld-ctype.c:2048
 msgid "syntax error"
 msgstr "�y�k���~"
 
-#: locale/programs/charmap.c:450 locale/programs/charmap.c:504
-#: locale/programs/charmap.c:536 locale/programs/charmap.c:630
-#: locale/programs/charmap.c:685 locale/programs/charmap.c:726
-#: locale/programs/charmap.c:767
+#: locale/programs/charmap.c:487 locale/programs/charmap.c:541
+#: locale/programs/charmap.c:573 locale/programs/charmap.c:667
+#: locale/programs/charmap.c:722 locale/programs/charmap.c:763
+#: locale/programs/charmap.c:804
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "�w�q %s ���y�k���~: %s"
 
-#: locale/programs/charmap.c:309 locale/programs/charmap.c:326
+#: locale/programs/charmap.c:346 locale/programs/charmap.c:363
 #: locale/programs/repertoire.c:175
 #, c-format
 msgid "syntax error in prolog: %s"
@@ -5269,58 +5264,58 @@ msgstr "�s�X��M�ɤ����w�q���y�k���~: %s"
 
 #: locale/programs/locfile.c:243
 msgid "syntax error: not inside a locale definition section"
-msgstr "�y�k���~: ����b locale �w�q�϶��̭��ϥ�"
+msgstr "�y�k���~: ����b�ϰ�Ƹ�Ʈw (locale) �w�q�϶��̭��ϥ�"
 
 #: iconv/iconv_prog.c:143
 msgid "target encoding not specified using `-t'"
 msgstr "�S���� `-t' ���w�ؼнs�X"
 
-#: catgets/gencat.c:391 catgets/gencat.c:530 catgets/gencat.c:559
+#: catgets/gencat.c:432 catgets/gencat.c:605 catgets/gencat.c:634
 msgid "this is the first definition"
 msgstr "�����Ĥ@�өw�q"
 
-#: timezone/zic.c:1158
+#: timezone/zic.c:1157
 msgid "time before zero"
 msgstr "�b�s���e���ɶ�"
 
-#: timezone/zic.c:1166 timezone/zic.c:2043 timezone/zic.c:2062
+#: timezone/zic.c:1165 timezone/zic.c:2042 timezone/zic.c:2061
 msgid "time overflow"
 msgstr "�ɶ�����"
 
-#: locale/programs/ld-ctype.c:1521 locale/programs/ld-ctype.c:1997
+#: locale/programs/ld-ctype.c:1553 locale/programs/ld-ctype.c:2029
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "�ϰ�w�q�������� <U%0*X> ��_�l�� <U%0*X> �٭n�p"
 
-#: locale/programs/ld-ctype.c:1655
+#: locale/programs/ld-ctype.c:1687
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "�r���ǦC�w�q�������Ȥ�_�l���٭n�p"
 
-#: locale/programs/charmap.c:514
+#: locale/programs/charmap.c:551
 msgid "too few bytes in character encoding"
 msgstr "�r���w�q�����줸�դӤ֤F"
 
-#: locale/programs/charmap.c:516
+#: locale/programs/charmap.c:553
 msgid "too many bytes in character encoding"
 msgstr "�r���w�q�����줸�դӦh�F"
 
-#: timezone/zic.c:1869
+#: timezone/zic.c:1868
 msgid "too many leap seconds"
 msgstr "�Ӧh�|���F"
 
-#: timezone/zic.c:1841
+#: timezone/zic.c:1840
 msgid "too many local time types"
 msgstr "�Ӧh���a�ɶ��榡�F"
 
-#: timezone/zic.c:1795
+#: timezone/zic.c:1794
 msgid "too many transitions?!"
 msgstr "�Ӧh�ɶ��ഫ�F?!"
 
-#: timezone/zic.c:2166
+#: timezone/zic.c:2165
 msgid "too many, or too long, time zone abbreviations"
 msgstr "�ɰ��Y�g�Ӧh�Ϊ̤Ӫ��F"
 
-#: locale/programs/linereader.h:156
+#: locale/programs/linereader.h:157
 msgid "trailing garbage at end of line"
 msgstr "�浲�����L�Φr��"
 
@@ -5329,7 +5324,7 @@ msgstr "�浲�����L�Φr��"
 msgid "trouble replying to prog %d\n"
 msgstr "�^���{�� %d �ɵo�ͧx��\n"
 
-#: timezone/zic.c:1333
+#: timezone/zic.c:1332
 msgid "typed single year"
 msgstr "��J���~���O�P�@�~"
 
@@ -5345,12 +5340,12 @@ msgstr "�L�k����Ѽ�"
 msgid "undefined"
 msgstr "���w�q"
 
-#: locale/programs/charmap.c:819 locale/programs/charmap.c:830
+#: locale/programs/charmap.c:856 locale/programs/charmap.c:867
 #, c-format
 msgid "unknown character `%s'"
 msgstr "�������r�� `%s'"
 
-#: catgets/gencat.c:488
+#: catgets/gencat.c:562
 #, c-format
 msgid "unknown directive `%s': line ignored"
 msgstr "���������O `%s': ���橿��"
@@ -5360,20 +5355,20 @@ msgstr "���������O `%s': ���橿��"
 msgid "unknown iconv() error %d"
 msgstr "������ iconv() ���~ %d"
 
-#: catgets/gencat.c:467
+#: catgets/gencat.c:508
 #, c-format
 msgid "unknown set `%s'"
 msgstr "���������X `%s'"
 
-#: timezone/zic.c:787
+#: timezone/zic.c:786
 msgid "unruly zone"
 msgstr "�S���W�h���ɰ�"
 
-#: catgets/gencat.c:977
+#: catgets/gencat.c:1169
 msgid "unterminated message"
 msgstr "�S���������T��"
 
-#: locale/programs/linereader.c:592 locale/programs/linereader.c:788
+#: locale/programs/linereader.c:599 locale/programs/linereader.c:784
 msgid "unterminated string"
 msgstr "�S���������r��"
 
@@ -5381,11 +5376,11 @@ msgstr "�S���������r��"
 msgid "unterminated string constant"
 msgstr "�S���������r��`��"
 
-#: locale/programs/linereader.c:462
+#: locale/programs/linereader.c:469
 msgid "unterminated symbolic name"
 msgstr "�S���������Ÿ��W��"
 
-#: locale/programs/charmap.c:968
+#: locale/programs/charmap.c:1005
 msgid "upper limit in range is not higher then lower limit"
 msgstr "�ϰ�w�q�����̤j�ȨS����̤p���٭n�j"
 
@@ -5393,40 +5388,40 @@ msgstr "�ϰ�w�q�����̤j�ȨS����̤p���٭n�j"
 msgid "upper limit in range is not smaller then lower limit"
 msgstr "�ϰ�w�q�����̤j�ȨS����̤p���٭n�p"
 
-#: sunrpc/rpc_main.c:1429
+#: sunrpc/rpc_main.c:1424
 #, c-format
 msgid "usage: %s infile\n"
 msgstr "�Ϊk: %s infile\n"
 
-#: timezone/zic.c:2109
+#: timezone/zic.c:2108
 msgid "use of 2/29 in non leap-year"
 msgstr "�b�D�|�~�ɥΨ� 2/29 ��"
 
-#: locale/programs/charmap.c:603 locale/programs/charmap.c:666
+#: locale/programs/charmap.c:640 locale/programs/charmap.c:703
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s ���ȥ����O��Ƥ~��"
 
-#: locale/programs/charmap.c:362
+#: locale/programs/charmap.c:399
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "<%s> ���ȥ����� 1 �Ϊ̧�j"
 
-#: locale/programs/charmap.c:374
+#: locale/programs/charmap.c:411
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> ���ȥ�������Τj�� <%s> ����"
 
-#: timezone/zic.c:435
+#: timezone/zic.c:433
 msgid "warning: "
 msgstr "ĵ�i: "
 
-#: nscd/connections.c:426
+#: nscd/connections.c:427
 #, c-format
 msgid "while accepting connection: %s"
 msgstr "�b�����s�u��: %s"
 
-#: nscd/grpcache.c:149 nscd/hstcache.c:165 nscd/pwdcache.c:143
+#: nscd/grpcache.c:150 nscd/hstcache.c:165 nscd/pwdcache.c:143
 msgid "while allocating cache entry"
 msgstr "�b�t�m�֨����خ�"
 
@@ -5434,41 +5429,33 @@ msgstr "�b�t�m�֨����خ�"
 msgid "while allocating hash table entry"
 msgstr "�b�t�m hash ���涵�خ�"
 
-#: nscd/grpcache.c:99 nscd/hstcache.c:108 nscd/pwdcache.c:106
+#: nscd/grpcache.c:100 nscd/hstcache.c:108 nscd/pwdcache.c:106
 msgid "while allocating key copy"
 msgstr "�b�t�m��Ȱƥ���"
 
-#: catgets/gencat.c:1007
+#: catgets/gencat.c:1199
 msgid "while opening old catalog file"
 msgstr "�b�}���ª����O�ɮ׮�"
 
-#: locale/programs/locale.c:359
+#: locale/programs/locale.c:361
 msgid "while preparing output"
 msgstr "�b�dzƿ�X��"
 
-#: nss/makedb.c:367 nss/makedb.c:384
-msgid "while reading database"
-msgstr "�bŪ����Ʈw��"
-
 #: elf/sprof.c:679
 msgid "while stat'ing profiling data file"
 msgstr "�b����ո���ɮ׶i��έp���ɭ�"
 
-#: nss/makedb.c:336
-msgid "while writing database file"
-msgstr "�b�g�J��Ʈw�ɮ׮�"
-
-#: locale/programs/ld-ctype.c:2320
+#: locale/programs/ld-ctype.c:2392
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr "�Ψӫ��w UCS �Ȫ��d��ɱo�ΤQ���i����ܪ��ٲ��Ÿ� `..'"
 
-#: locale/programs/ld-ctype.c:2334
+#: locale/programs/ld-ctype.c:2406
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr "�Ψӫ��w�r���s�X�Ȫ��d��ɱo�ε����m���ٲ��Ÿ� `...'"
 
-#: locale/programs/ld-ctype.c:2305
+#: locale/programs/ld-ctype.c:2377
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr "�βŸ��W�٨ӫ��w�r���s�X�d��ɤ��i�H�ε����m���ٲ��Ÿ� `...'"
@@ -5481,27 +5468,27 @@ msgstr "�g�J������"
 msgid "writeable by other than owner"
 msgstr "�ϥΪ̥H�~���H��i�g�J"
 
-#: nscd/nscd.c:123 nscd/nscd_nischeck.c:64 nss/getent.c:400 nss/makedb.c:123
+#: nscd/nscd.c:123 nscd/nscd_nischeck.c:64 nss/getent.c:761
 msgid "wrong number of arguments"
 msgstr "�ѼƼƥؤ���"
 
-#: timezone/zic.c:1116
+#: timezone/zic.c:1115
 msgid "wrong number of fields on Leap line"
 msgstr "�|�ɳ]�w�檺���ƥؿ��~"
 
-#: timezone/zic.c:1207
+#: timezone/zic.c:1206
 msgid "wrong number of fields on Link line"
 msgstr "�s���]�w�檺���ƥؿ��~"
 
-#: timezone/zic.c:950
+#: timezone/zic.c:949
 msgid "wrong number of fields on Rule line"
 msgstr "�W�h�]�w�檺���ƥؿ��~"
 
-#: timezone/zic.c:1020
+#: timezone/zic.c:1019
 msgid "wrong number of fields on Zone continuation line"
 msgstr "�ɰϱ���檺���ƥؤ���"
 
-#: timezone/zic.c:978
+#: timezone/zic.c:977
 msgid "wrong number of fields on Zone line"
 msgstr "�ɰϳ]�w�檺���ƥؿ��~"
 
@@ -5521,5 +5508,3 @@ msgstr "yp_update: �L�k�ഫ�D���������W��\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: �L�k���o���A����}\n"
 
-#~ msgid "%s: cannot get modification time"
-#~ msgstr ""