[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r3050 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/ po/ sysdeps/unix/sysv/linux/powerpc/pow...



Author: eglibc
Date: Mon Aug  6 00:02:41 2007
New Revision: 3050

Log:
Import glibc-mainline for 2007-08-06

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
    fsf/trunk/libc/po/zh_CN.po
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Aug  6 00:02:41 2007
@@ -1,3 +1,12 @@
+2007-08-05  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* po/zh_CN.po: Updated translation from translation team.
+
+2007-08-05  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S (__socket):
+	Don't use CGOTSETUP and CGOTRESTORE macros.
+
 2007-08-04  Roland McGrath  <roland@xxxxxxxxxx>
 
 	* posix/Makefile ($(objpfx)getconf.speclist): Fix typo.

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Mon Aug  6 00:02:41 2007
@@ -1,3 +1,11 @@
+2007-08-05  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h (PSEUDO):
+	Don't use CGOTSETUP and CGOTRESTORE macros.
+	(CGOTSETUP, CGOTRESTORE): Remove.
+	<IS_IN_rtld> (CENABLE, CDISABLE): Don't use JUMPTARGET, branch to
+	@local symbol.
+
 2007-08-01  Kaz Kojima  <kkojima@xxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S: Remove

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h Mon Aug  6 00:02:41 2007
@@ -1,5 +1,5 @@
 /* Cancellable system call stubs.  Linux/PowerPC version.
-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Franz Sirl <Franz.Sirl-kernel@xxxxxxxxxxxxxx>, 2003.
 
@@ -44,7 +44,6 @@
     mflr 9;								\
     stw 9,52(1);							\
     cfi_offset (lr, 4);							\
-    CGOTSETUP;								\
     DOCARGS_##args;	/* save syscall args around CENABLE.  */	\
     CENABLE;								\
     stw 3,16(1);	/* store CENABLE return value (MASK).  */	\
@@ -58,7 +57,6 @@
     lwz 4,52(1);							\
     lwz 0,12(1);	/* restore CR/R3. */				\
     lwz 3,8(1);								\
-    CGOTRESTORE;							\
     mtlr 4;								\
     mtcr 0;								\
     addi 1,1,48;
@@ -84,9 +82,6 @@
 # define DOCARGS_6	stw 8,40(1); DOCARGS_5
 # define UNDOCARGS_6	lwz 8,40(1); UNDOCARGS_5
 
-# define CGOTSETUP
-# define CGOTRESTORE
-
 # ifdef IS_IN_libpthread
 #  define CENABLE	bl __pthread_enable_asynccancel@local
 #  define CDISABLE	bl __pthread_disable_asynccancel@local
@@ -94,20 +89,8 @@
 #  define CENABLE	bl __libc_enable_asynccancel@local
 #  define CDISABLE	bl __libc_disable_asynccancel@local
 # elif defined IS_IN_librt
-#  define CENABLE	bl JUMPTARGET(__librt_enable_asynccancel)
-#  define CDISABLE	bl JUMPTARGET(__librt_disable_asynccancel)
-#  if defined HAVE_AS_REL16 && defined PIC
-#   undef CGOTSETUP
-#   define CGOTSETUP							\
-    bcl 20,31,1f;							\
- 1: stw 30,44(1);							\
-    mflr 30;								\
-    addis 30,30,_GLOBAL_OFFSET_TABLE-1b@ha;				\
-    addi 30,30,_GLOBAL_OFFSET_TABLE-1b@l
-#   undef CGOTRESTORE
-#   define CGOTRESTORE							\
-    lwz 30,44(1)
-#  endif
+#  define CENABLE	bl __librt_enable_asynccancel@local
+#  define CDISABLE	bl __librt_disable_asynccancel@local
 # else
 #  error Unsupported library
 # endif

Modified: fsf/trunk/libc/po/zh_CN.po
==============================================================================
--- fsf/trunk/libc/po/zh_CN.po (original)
+++ fsf/trunk/libc/po/zh_CN.po Mon Aug  6 00:02:41 2007
@@ -1,300 +1,147 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+# LI Daobing <lidaobing@xxxxxxxxx>, 2007.
 # Wang Li <charles@xxxxxxxxxxxx>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.3.2\n"
-"POT-Creation-Date: 2003-02-22 15:34-0800\n"
-"PO-Revision-Date: 2003-06-06 15:10+0800\n"
-"Last-Translator: Wang Li <charles@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese (simplified) <i18n-translation@xxxxxxxxxxxxxxxxxx>\n"
+"Project-Id-Version: libc 2.6.1\n"
+"POT-Creation-Date: 2007-08-04 11:37+0200\n"
+"PO-Revision-Date: 2007-08-05 16:31+0800\n"
+"Last-Translator: LI Daobing <lidaobing@xxxxxxxxx>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn@xxxxxxxxxxxxxxxxxxxxx>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
-msgid "Hangup"
-msgstr "¹ÒÆð"
-
-#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
-msgid "Interrupt"
-msgstr "ÖжÏ"
-
-#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
-msgid "Quit"
-msgstr "Í˳ö"
-
-#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
-msgid "Illegal instruction"
-msgstr "·Ç·¨Ö¸Áî"
-
-#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
-msgid "Trace/breakpoint trap"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:34
-msgid "Aborted"
-msgstr "ÒÑ·ÅÆú"
-
-#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
-msgid "Floating point exception"
-msgstr "¸¡µãÊýÀýÍâ"
-
-#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
-msgid "Killed"
-msgstr "ÒÑɱËÀ"
-
-#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
-msgid "Bus error"
-msgstr "×ÜÏß´íÎó"
-
-#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
-msgid "Segmentation fault"
-msgstr "¶Î´íÎó"
-
-#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
-#. TRANS Every library function that returns this error code also generates a
-#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
-#. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
-#. TRANS unless it has handled or blocked @code{SIGPIPE}.
-#: sysdeps/generic/siglist.h:39 stdio-common/../sysdeps/gnu/errlist.c:351
-#: stdio-common/../sysdeps/unix/siglist.c:39
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:62
-msgid "Broken pipe"
-msgstr "¶Ï¿ªµÄ¹ÜµÀ"
-
-#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
-msgid "Alarm clock"
-msgstr "ÄÖÖÓ"
-
-#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
-msgid "Terminated"
-msgstr "ÒÑÖÕÖ¹"
-
-#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
-msgid "Urgent I/O condition"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
-msgid "Stopped (signal)"
-msgstr "Í£Ö¹ (ÐźÅ)"
-
-#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
-msgid "Stopped"
-msgstr "Í£Ö¹"
-
-#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
-msgid "Continued"
-msgstr "¼ÌÐø"
-
-#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
-msgid "Child exited"
-msgstr "×Ó½ø³ÌÒÑÍ˳ö"
-
-#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
-msgid "Stopped (tty input)"
-msgstr "Í£Ö¹ (tty ÊäÈë)"
-
-#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
-msgid "Stopped (tty output)"
-msgstr "Í£Ö¹ (tty Êä³ö)"
-
-#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
-msgid "I/O possible"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
-msgid "CPU time limit exceeded"
-msgstr "³¬³ö CPU ʱÏÞ"
-
-#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "Îļþ´óС³¬³öÏÞÖÆ"
-
-#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
-msgid "Virtual timer expired"
-msgstr "ÐéÄâ¼ÆʱÆ÷³¬Ê±"
-
-#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53
-msgid "Profiling timer expired"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54
-msgid "Window changed"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56
-msgid "User defined signal 1"
-msgstr "Óû§¶¨ÒåÐźŠ1"
-
-#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57
-msgid "User defined signal 2"
-msgstr "Óû§¶¨ÒåÐźŠ2"
-
-#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33
-msgid "EMT trap"
-msgstr ""
-
-#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
-msgid "Bad system call"
-msgstr "´íÎóµÄϵͳµ÷ÓÃ"
-
-#: sysdeps/generic/siglist.h:66
-msgid "Stack fault"
-msgstr "ջʧЧ"
-
-#: sysdeps/generic/siglist.h:69
-msgid "Information request"
-msgstr "ÐÅÏ¢ÇëÇó"
-
-#: sysdeps/generic/siglist.h:71
-msgid "Power failure"
-msgstr "µçԴʧЧ"
-
-#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
-msgid "Resource lost"
-msgstr "×ÊÔ´¶ªÊ§"
-
-#: sysdeps/mach/hurd/mips/dl-machine.c:68
-#: string/../sysdeps/mach/_strerror.c:57
-msgid "Error in unknown error system: "
-msgstr "δ֪µÄ´íÎóϵͳÖгö´í£º"
-
-#: sysdeps/mach/hurd/mips/dl-machine.c:83
-#: string/../sysdeps/generic/_strerror.c:44
-#: string/../sysdeps/mach/_strerror.c:87
-msgid "Unknown error "
-msgstr "δ֪µÄ´íÎó "
-
-#: sysdeps/unix/sysv/linux/lddlibc4.c:64
-#, c-format
-msgid "cannot open `%s'"
-msgstr "ÎÞ·¨´ò¿ª¡°%s¡±"
-
-#: sysdeps/unix/sysv/linux/lddlibc4.c:68
-#, c-format
-msgid "cannot read header from `%s'"
-msgstr "ÎÞ·¨´Ó¡°%s¡±ÖжÁÈëÍ·"
-
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:293 catgets/gencat.c:288
-#, c-format
-msgid "cannot open input file `%s'"
-msgstr "ÎÞ·¨´ò¿ªÊäÈëÎļþ¡°%s¡±"
-
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:311
-#, c-format
-msgid "error while closing input `%s'"
-msgstr "¹Ø±ÕÊäÈë¡°%s¡±Ê±³ö´í"
-
-#: iconv/iconv_charmap.c:443
-#, c-format
-msgid "illegal input sequence at position %Zd"
-msgstr "λÓÚ %Zd µÄ·Ç·¨ÊäÈëÐòÁÐ"
-
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:503
-msgid "incomplete character or shift sequence at end of buffer"
-msgstr "λÓÚ»º³åÇøĩβµÄ²»ÍêÕû×Ö·û»òתÒåÐòÁÐ"
-
-#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:546
-#: iconv/iconv_prog.c:582
-msgid "error while reading the input"
-msgstr "¶ÁÈ¡ÊäÈëʱ³ö´í"
-
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:564
-msgid "unable to allocate buffer for input"
-msgstr "ÎÞ·¨ÎªÊäÈë·ÖÅ仺³åÇø"
-
-#: iconv/iconv_prog.c:61
-msgid "Input/Output format specification:"
-msgstr "ÊäÈë/Êä³ö¸ñʽ¹æ·¶£º"
-
-#: iconv/iconv_prog.c:62
-msgid "encoding of original text"
-msgstr "ԭʼÎı¾±àÂë"
-
-#: iconv/iconv_prog.c:63
-msgid "encoding for output"
-msgstr "Êä³ö±àÂë"
-
-#: iconv/iconv_prog.c:64
-msgid "Information:"
-msgstr "ÐÅÏ¢£º"
-
-#: iconv/iconv_prog.c:65
-msgid "list all known coded character sets"
-msgstr "ÁоÙËùÓÐÒÑÖªµÄ×Ö·û¼¯"
-
-#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
-msgid "Output control:"
-msgstr "Êä³ö¿ØÖÆ£º"
-
-#: iconv/iconv_prog.c:67
-msgid "omit invalid characters from output"
-msgstr "´ÓÊä³öÖкöÂÔÎÞЧµÄ×Ö·û"
-
-#: iconv/iconv_prog.c:68
-msgid "output file"
-msgstr "Êä³öÎļþ"
-
-#: iconv/iconv_prog.c:69
-msgid "suppress warnings"
-msgstr "¹Ø±Õ¾¯¸æ"
-
-#: iconv/iconv_prog.c:70
-msgid "print progress information"
-msgstr "´òÓ¡½ø¶ÈÐÅÏ¢"
-
-#: iconv/iconv_prog.c:75
-msgid "Convert encoding of given files from one encoding to another."
-msgstr "ת»»¸ø¶¨ÎļþµÄ±àÂë¡£"
-
-#: iconv/iconv_prog.c:79
-msgid "[FILE...]"
-msgstr "[Îļþ...]"
-
-#: iconv/iconv_prog.c:199
-msgid "cannot open output file"
-msgstr "ÎÞ·¨´ò¿ªÊä³öÎļþ"
-
-#: iconv/iconv_prog.c:241
-#, c-format
-msgid "conversions from `%s' and to `%s' are not supported"
-msgstr "²»Ö§³Ö´Ó¡°%s¡±µ½¡°%s¡±µÄת»»"
-
-#: iconv/iconv_prog.c:246
-#, c-format
-msgid "conversion from `%s' is not supported"
-msgstr "²»Ö§³ÖÒÔ¡°%s¡±ÎªÔ´Í·µÄת»»"
-
-#: iconv/iconv_prog.c:253
-#, c-format
-msgid "conversion to `%s' is not supported"
-msgstr "²»Ö§³ÖÒÔ¡°%s¡±ÎªÄ¿±êµÄת»»"
-
-#: iconv/iconv_prog.c:257
-#, c-format
-msgid "conversion from `%s' to `%s' is not supported"
-msgstr "²»Ö§³Ö´Ó¡°%s¡±µ½¡°%s¡±µÄת»»"
-
-#: iconv/iconv_prog.c:263
-msgid "failed to start conversion processing"
-msgstr "Æô¶¯×ª»»´¦Àíʧ°Ü"
-
-#: iconv/iconv_prog.c:358
-msgid "error while closing output file"
-msgstr "¹Ø±ÕÊä³öÎļþʱ³ö´í"
-
-#: iconv/iconv_prog.c:407 iconv/iconvconfig.c:357 locale/programs/locale.c:274
-#: locale/programs/localedef.c:372 catgets/gencat.c:233
-#: malloc/memusagestat.c:602 debug/pcprofiledump.c:199
-msgid "Report bugs using the `glibcbug' script to <bugs@xxxxxxx>.\n"
-msgstr "Óá°glibcbug¡±½Å±¾½«´íÎ󱨸æ¸ø <bugs@xxxxxxx>¡£\n"
-
-#: iconv/iconv_prog.c:421 iconv/iconvconfig.c:371 locale/programs/locale.c:287
-#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:910
-#: nss/getent.c:74 nscd/nscd.c:330 nscd/nscd_nischeck.c:90 elf/ldconfig.c:271
-#: elf/sprof.c:349
+#: argp/argp-help.c:228
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
+msgstr "%.*s:参数 ARGP_HELP_FMT 需要一个值"
+
+#: argp/argp-help.c:238
+#, c-format
+msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
+msgstr "%.*s:未知的 ARGP_HELP_FMT 参数"
+
+#: argp/argp-help.c:251
+#, c-format
+msgid "Garbage in ARGP_HELP_FMT: %s"
+msgstr "ARGP_HELP_FMT 中有垃圾: %s"
+
+#: argp/argp-help.c:1215
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "长选项的强制或可选参数对对应的短选项也是强制或可选的。"
+
+#: argp/argp-help.c:1601
+msgid "Usage:"
+msgstr "用法:"
+
+#: argp/argp-help.c:1605
+msgid "  or: "
+msgstr "  或:"
+
+#: argp/argp-help.c:1617
+msgid " [OPTION...]"
+msgstr " [选项...]"
+
+#: argp/argp-help.c:1644
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "试用“%s --help”或“%s --usage”以获取更多信息。\n"
+
+#: argp/argp-help.c:1672
+#, c-format
+msgid "Report bugs to %s.\n"
+msgstr "将错误报告给 %s。\n"
+
+#: argp/argp-parse.c:102
+msgid "Give this help list"
+msgstr "给出该系统求助列表"
+
+#: argp/argp-parse.c:103
+msgid "Give a short usage message"
+msgstr "给出简要的用法信息"
+
+#: argp/argp-parse.c:104
+msgid "Set the program name"
+msgstr "设定程序名"
+
+#: argp/argp-parse.c:106
+msgid "Hang for SECS seconds (default 3600)"
+msgstr "挂起 SECS 秒 (默认 3600)"
+
+#: argp/argp-parse.c:167
+msgid "Print program version"
+msgstr "打印程序版本号"
+
+#: argp/argp-parse.c:183
+msgid "(PROGRAM ERROR) No version known!?"
+msgstr "(程序错误) 不知道版本号!?"
+
+#: argp/argp-parse.c:623
+#, c-format
+msgid "%s: Too many arguments\n"
+msgstr "%s:过多的选项\n"
+
+#: argp/argp-parse.c:766
+msgid "(PROGRAM ERROR) Option should have been recognized!?"
+msgstr "(程序错误) 选项应该可识别!?"
+
+#: assert/assert-perr.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgstr "%s%s%s:%u:%s%s意外的错误:%s。\n"
+
+#: assert/assert.c:57
+#, c-format
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+msgstr "%s%s%s:%u:%s%s断言“%s”失败。\n"
+
+#: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:97 nss/makedb.c:61
+msgid "NAME"
+msgstr "名称"
+
+#: catgets/gencat.c:111
+msgid "Create C header file NAME containing symbol definitions"
+msgstr "创建含有符号定义的给定名称的 C 头文件"
+
+#: catgets/gencat.c:113
+msgid "Do not use existing catalog, force new output file"
+msgstr "不使用现有的分类,强制创建新输出文件"
+
+#: catgets/gencat.c:114 nss/makedb.c:61
+msgid "Write output to file NAME"
+msgstr "将输出写入到指定文件中"
+
+#: catgets/gencat.c:119
+msgid ""
+"Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
+"is -, output is written to standard output.\n"
+msgstr ""
+
+#: catgets/gencat.c:124
+msgid ""
+"-o OUTPUT-FILE [INPUT-FILE]...\n"
+"[OUTPUT-FILE [INPUT-FILE]...]"
+msgstr ""
+"-o 输出文件 [输入文件]...\n"
+"[输出文件 [输入文件]...]"
+
+#: catgets/gencat.c:232 debug/pcprofiledump.c:199 iconv/iconv_prog.c:411
+#: iconv/iconvconfig.c:380 locale/programs/localedef.c:371
+#: login/programs/pt_chown.c:88 malloc/memusagestat.c:526 nss/makedb.c:231
+msgid ""
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+
+#: catgets/gencat.c:246 debug/xtrace.sh:64 elf/ldconfig.c:287
+#: elf/ldd.bash.in:39 elf/sprof.c:355 iconv/iconv_prog.c:426
+#: iconv/iconvconfig.c:395 locale/programs/locale.c:275
+#: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
+#: malloc/memusage.sh:71 nscd/nscd.c:406 nss/getent.c:83 nss/makedb.c:245
+#: posix/getconf.c:1012
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -302,33 +149,1100 @@
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: iconv/iconv_prog.c:426 iconv/iconvconfig.c:376 locale/programs/locale.c:292
-#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:915
-#: nss/getent.c:79 nscd/nscd.c:335 nscd/nscd_nischeck.c:95 elf/ldconfig.c:276
-#: elf/sprof.c:355
+#: catgets/gencat.c:251 debug/xtrace.sh:68 elf/ldconfig.c:292 elf/sprof.c:361
+#: iconv/iconv_prog.c:431 iconv/iconvconfig.c:400 locale/programs/locale.c:280
+#: locale/programs/localedef.c:392 malloc/memusage.sh:75 nscd/nscd.c:411
+#: nss/getent.c:88 nss/makedb.c:250 posix/getconf.c:1017
 #, c-format
 msgid "Written by %s.\n"
-msgstr "ÓÉ %s ±àд¡£\n"
-
-#: iconv/iconv_prog.c:456 iconv/iconv_prog.c:482
+msgstr "由 %s 编写。\n"
+
+#: catgets/gencat.c:282
+msgid "*standard input*"
+msgstr "*标准输入*"
+
+#: catgets/gencat.c:288 iconv/iconv_charmap.c:158 iconv/iconv_prog.c:298
+#: nss/makedb.c:170
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "无法打开输入文件“%s”"
+
+#: catgets/gencat.c:417 catgets/gencat.c:494
+msgid "illegal set number"
+msgstr "非法的集合编号"
+
+#: catgets/gencat.c:444
+msgid "duplicate set definition"
+msgstr "重复的集合定义"
+
+#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677
+msgid "this is the first definition"
+msgstr "这是第一个定义"
+
+#: catgets/gencat.c:522
+#, c-format
+msgid "unknown set `%s'"
+msgstr "未知集合“%s”"
+
+#: catgets/gencat.c:563
+msgid "invalid quote character"
+msgstr "无效的引用字符"
+
+#: catgets/gencat.c:576
+#, c-format
+msgid "unknown directive `%s': line ignored"
+msgstr "未知的指令“%s”:忽略此行"
+
+#: catgets/gencat.c:621
+msgid "duplicated message number"
+msgstr "重复的消息编号"
+
+#: catgets/gencat.c:674
+msgid "duplicated message identifier"
+msgstr "重复的消息标识符"
+
+#: catgets/gencat.c:731
+msgid "invalid character: message ignored"
+msgstr "无效的字符:忽略消息"
+
+#: catgets/gencat.c:774
+msgid "invalid line"
+msgstr "无效的行"
+
+#: catgets/gencat.c:828
+msgid "malformed line ignored"
+msgstr ""
+
+#: catgets/gencat.c:992 catgets/gencat.c:1033 nss/makedb.c:183
+#, c-format
+msgid "cannot open output file `%s'"
+msgstr "无法打开输出文件“%s”"
+
+#: catgets/gencat.c:1195 locale/programs/linereader.c:560
+msgid "invalid escape sequence"
+msgstr "无效的转义序列"
+
+#: catgets/gencat.c:1217
+msgid "unterminated message"
+msgstr "未终止的消息"
+
+#: catgets/gencat.c:1241
+#, c-format
+msgid "while opening old catalog file"
+msgstr "在打开旧分类文件时"
+
+#: catgets/gencat.c:1332
+#, c-format
+msgid "conversion modules not available"
+msgstr "转换模块不可用"
+
+#: catgets/gencat.c:1358
+#, c-format
+msgid "cannot determine escape character"
+msgstr "无法确定转义字符"
+
+#: debug/pcprofiledump.c:52
+msgid "Don't buffer output"
+msgstr "不要对输出进行缓冲"
+
+#: debug/pcprofiledump.c:57
+msgid "Dump information generated by PC profiling."
+msgstr ""
+
+#: debug/pcprofiledump.c:60
+msgid "[FILE]"
+msgstr "[文件]"
+
+#: debug/pcprofiledump.c:100
+#, c-format
+msgid "cannot open input file"
+msgstr "无法打开输入文件"
+
+#: debug/pcprofiledump.c:106
+#, c-format
+msgid "cannot read header"
+msgstr "无法读入头"
+
+#: debug/pcprofiledump.c:170
+#, c-format
+msgid "invalid pointer size"
+msgstr "无效的指针大小"
+
+#: debug/xtrace.sh:27 debug/xtrace.sh:45
+msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
+msgstr ""
+
+#: debug/xtrace.sh:33
+msgid "Try \\`xtrace --help' for more information.\\n"
+msgstr "试用“xtrace --help”以获取更多信息。\\n"
+
+#: debug/xtrace.sh:39
+msgid "xtrace: option \\`$1' requires an argument.\\n"
+msgstr "xtrace: 选项“$1”需要一个参数\\n"
+
+#: debug/xtrace.sh:46
+msgid ""
+"Trace execution of program by printing currently executed function.\n"
+"\n"
+"     --data=FILE          Don't run the program, just print the data from FILE.\n"
+"\n"
+"   -?,--help              Print this help and exit\n"
+"      --usage             Give a short usage message\n"
+"   -V,--version           Print version information and exit\n"
+"\n"
+"Mandatory arguments to long options are also mandatory for any corresponding\n"
+"short options.\n"
+"\n"
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\\n"
+msgstr ""
+
+#: debug/xtrace.sh:125
+msgid "xtrace: unrecognized option \\`$1'\\n"
+msgstr "xtrace:无法识别的选项“$1”\\n"
+
+#: debug/xtrace.sh:138
+msgid "No program name given\\n"
+msgstr "未指定程序名"
+
+#: debug/xtrace.sh:146
+#, sh-format
+msgid "executable \\`$program' not found\\n"
+msgstr ""
+
+#: debug/xtrace.sh:150
+#, sh-format
+msgid "\\`$program' is no executable\\n"
+msgstr "“$program”不可执行\\n"
+
+#: dlfcn/dlinfo.c:64
+msgid "RTLD_SELF used in code not dynamically loaded"
+msgstr ""
+
+#: dlfcn/dlinfo.c:73
+msgid "unsupported dlinfo request"
+msgstr "不支持的 dlinfo 请求"
+
+#: dlfcn/dlmopen.c:64
+msgid "invalid namespace"
+msgstr "无效的名字空间"
+
+#: dlfcn/dlmopen.c:69
+msgid "invalid mode"
+msgstr "无效的模式"
+
+#: dlfcn/dlopen.c:64
+msgid "invalid mode parameter"
+msgstr "无效的模式参数"
+
+#: elf/cache.c:68
+msgid "unknown"
+msgstr "未知"
+
+#: elf/cache.c:111
+msgid "Unknown OS"
+msgstr "未知的操作系统"
+
+#: elf/cache.c:116
+#, c-format
+msgid ", OS ABI: %s %d.%d.%d"
+msgstr ", OS ABI: %s %d.%d.%d"
+
+#: elf/cache.c:142 elf/ldconfig.c:1236
+#, c-format
+msgid "Can't open cache file %s\n"
+msgstr "无法打开缓冲文件 %s\n"
+
+#: elf/cache.c:154
+#, c-format
+msgid "mmap of cache file failed.\n"
+msgstr "缓冲文件的 mmap 失败。\n"
+
+#: elf/cache.c:158 elf/cache.c:168
+#, c-format
+msgid "File is not a cache file.\n"
+msgstr "文件不是缓冲区文件。\n"
+
+#: elf/cache.c:201 elf/cache.c:211
+#, c-format
+msgid "%d libs found in cache `%s'\n"
+msgstr "在缓冲区“%2$s”中找到 %1$d 个库\n"
+
+#: elf/cache.c:410
+#, c-format
+msgid "Can't remove old temporary cache file %s"
+msgstr "无法删除旧临时缓冲文件 %s"
+
+#: elf/cache.c:417
+#, c-format
+msgid "Can't create temporary cache file %s"
+msgstr "无法创建临时缓冲文件 %s"
+
+#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:443
+#, c-format
+msgid "Writing of cache data failed"
+msgstr "写缓冲数据失败"
+
+#: elf/cache.c:450
+#, c-format
+msgid "Changing access rights of %s to %#o failed"
+msgstr "将 %s 的访问权限改变为 %#o 失败"
+
+#: elf/cache.c:455
+#, c-format
+msgid "Renaming of %s to %s failed"
+msgstr "将 %s 改名为 %s 失败"
+
+#: elf/dl-close.c:378 elf/dl-open.c:460
+msgid "cannot create scope list"
+msgstr "无法创建范围列表"
+
+#: elf/dl-close.c:724
+msgid "shared object not open"
+msgstr "共享库未打开"
+
+#: elf/dl-deps.c:112
+msgid "DST not allowed in SUID/SGID programs"
+msgstr "在 SUID/SGID 程序中不允许 DST"
+
+#: elf/dl-deps.c:125 elf/dl-open.c:282
+msgid "empty dynamic string token substitution"
+msgstr "空动态字符串替换"
+
+#: elf/dl-deps.c:131
+#, c-format
+msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
+msgstr ""
+
+#: elf/dl-deps.c:472
+msgid "cannot allocate dependency list"
+msgstr "无法分配倚赖列表"
+
+#: elf/dl-deps.c:505 elf/dl-deps.c:560
+msgid "cannot allocate symbol search list"
+msgstr "无法分配符号搜索列表"
+
+#: elf/dl-deps.c:545
+msgid "Filters not supported with LD_TRACE_PRELINKING"
+msgstr ""
+
+#: elf/dl-error.c:77
+msgid "DYNAMIC LINKER BUG!!!"
+msgstr "动态链接器 BUG!!!"
+
+#: elf/dl-error.c:124
+msgid "error while loading shared libraries"
+msgstr "装入共享库时出错"
+
+#: elf/dl-fptr.c:88
+msgid "cannot map pages for fdesc table"
+msgstr "无法为 fdesc 表映射页"
+
+#: elf/dl-fptr.c:192
+msgid "cannot map pages for fptr table"
+msgstr "无法为 fptr 表映射页"
+
+#: elf/dl-fptr.c:221
+msgid "internal error: symidx out of range of fptr table"
+msgstr "内部错误: symidx 超出 fptr 表的范围"
+
+#: elf/dl-load.c:372
+msgid "cannot allocate name record"
+msgstr "无法分配名记录"
+
+#: elf/dl-load.c:474 elf/dl-load.c:582 elf/dl-load.c:667 elf/dl-load.c:780
+msgid "cannot create cache for search path"
+msgstr "无法创建搜索路径缓冲器"
+
+#: elf/dl-load.c:565
+msgid "cannot create RUNPATH/RPATH copy"
+msgstr "无法创建 RUNPATH/RPATH 的副本"
+
+#: elf/dl-load.c:653
+msgid "cannot create search path array"
+msgstr "无法创建搜索路径数组"
+
+#: elf/dl-load.c:864
+msgid "cannot stat shared object"
+msgstr "无法对共享目标进行 stat 操作"
+
+#: elf/dl-load.c:934
+msgid "cannot open zero fill device"
+msgstr "无法打开零填充设备"
+
+#: elf/dl-load.c:979 elf/dl-load.c:2224
+msgid "cannot create shared object descriptor"
+msgstr "无法创建共享对象描述符"
+
+#: elf/dl-load.c:998 elf/dl-load.c:1656 elf/dl-load.c:1748
+msgid "cannot read file data"
+msgstr "无法读入文件数据"
+
+#: elf/dl-load.c:1042
+msgid "ELF load command alignment not page-aligned"
+msgstr "ELF 加载命令对齐不是按页对齐的"
+
+#: elf/dl-load.c:1049
+msgid "ELF load command address/offset not properly aligned"
+msgstr "ELF 装入命令的地址/偏移量没有正确地对齐"
+
+#: elf/dl-load.c:1132
+msgid "cannot allocate TLS data structures for initial thread"
+msgstr ""
+
+#: elf/dl-load.c:1155
+msgid "cannot handle TLS data"
+msgstr "无法处理 TLS 数据"
+
+#: elf/dl-load.c:1174
+msgid "object file has no loadable segments"
+msgstr "目标文件没有可加载段"
+
+#: elf/dl-load.c:1210
+msgid "failed to map segment from shared object"
+msgstr "无法从共享目标中映射段"
+
+#: elf/dl-load.c:1236
+msgid "cannot dynamically load executable"
+msgstr "无法动态装入可执行文件"
+
+#: elf/dl-load.c:1298
+msgid "cannot change memory protections"
+msgstr "无法改变内存保护"
+
+#: elf/dl-load.c:1317
+msgid "cannot map zero-fill pages"
+msgstr "无法映射用零填充的页"
+
+#: elf/dl-load.c:1331
+msgid "object file has no dynamic section"
+msgstr "目标文件没有动态节"
+
+#: elf/dl-load.c:1354
+msgid "shared object cannot be dlopen()ed"
+msgstr "无法用 dlopen() 打开共享库"
+
+#: elf/dl-load.c:1367
+msgid "cannot allocate memory for program header"
+msgstr "无法为程序头分配内存"
+
+#: elf/dl-load.c:1384 elf/dl-open.c:218
+msgid "invalid caller"
+msgstr "无效的调用者"
+
+#: elf/dl-load.c:1423
+msgid "cannot enable executable stack as shared object requires"
+msgstr "无法启用共享目标需要的执行栈"
+
+#: elf/dl-load.c:1436
+msgid "cannot close file descriptor"
+msgstr "无法关闭文件描述符"
+
+#: elf/dl-load.c:1478
+msgid "cannot create searchlist"
+msgstr "无法创建搜索列表"
+
+#: elf/dl-load.c:1656
+msgid "file too short"
+msgstr "文件过短"
+
+#: elf/dl-load.c:1685
+msgid "invalid ELF header"
+msgstr "无效的 ELF 头"
+
+#: elf/dl-load.c:1697
+msgid "ELF file data encoding not big-endian"
+msgstr "ELF 文件数据编码不是 big-endian"
+
+#: elf/dl-load.c:1699
+msgid "ELF file data encoding not little-endian"
+msgstr "ELF 文件数据编码不是 little-endian"
+
+#: elf/dl-load.c:1703
+msgid "ELF file version ident does not match current one"
+msgstr ""
+
+#: elf/dl-load.c:1707
+msgid "ELF file OS ABI invalid"
+msgstr "ELF 文件 OS ABI 无效"
+
+#: elf/dl-load.c:1709
+msgid "ELF file ABI version invalid"
+msgstr "ELF 文件 ABI 版本无效"
+
+#: elf/dl-load.c:1712
+msgid "internal error"
+msgstr "内部错误"
+
+#: elf/dl-load.c:1719
+msgid "ELF file version does not match current one"
+msgstr "ELF 文件版本与当前版本不匹配"
+
+#: elf/dl-load.c:1727
+msgid "only ET_DYN and ET_EXEC can be loaded"
+msgstr ""
+
+#: elf/dl-load.c:1733
+msgid "ELF file's phentsize not the expected size"
+msgstr ""
+
+#: elf/dl-load.c:2240
+msgid "wrong ELF class: ELFCLASS64"
+msgstr "错误 ELF 类: ELFCLASS64"
+
+#: elf/dl-load.c:2241
+msgid "wrong ELF class: ELFCLASS32"
+msgstr "错误 ELF 类: ELFCLASS32"
+
+#: elf/dl-load.c:2244
+msgid "cannot open shared object file"
+msgstr "无法打开共享对象文件"
+
+#: elf/dl-lookup.c:261
+msgid "relocation error"
+msgstr "重定位错误"
+
+#: elf/dl-lookup.c:289
+msgid "symbol lookup error"
+msgstr "符号查询错误"
+
+#: elf/dl-open.c:114
+msgid "cannot extend global scope"
+msgstr "无法扩展全局范围"
+
+#: elf/dl-open.c:512
+msgid "TLS generation counter wrapped!  Please report this."
+msgstr ""
+
+#: elf/dl-open.c:549
+msgid "invalid mode for dlopen()"
+msgstr "无效的 dlopen() 模式"
+
+#: elf/dl-open.c:566
+msgid "no more namespaces available for dlmopen()"
+msgstr ""
+
+#: elf/dl-open.c:579
+msgid "invalid target namespace in dlmopen()"
+msgstr "dlmopen() 中无效的目标名字空间"
+
+#: elf/dl-reloc.c:54
+msgid "cannot allocate memory in static TLS block"
+msgstr "无法在静态 TLS 块中分配内存"
+
+#: elf/dl-reloc.c:196
+msgid "cannot make segment writable for relocation"
+msgstr ""
+
+#: elf/dl-reloc.c:277
+#, c-format
+msgid "%s: no PLTREL found in object %s\n"
+msgstr ""
+
+#: elf/dl-reloc.c:288
+#, c-format
+msgid "%s: out of memory to store relocation results for %s\n"
+msgstr ""
+
+#: elf/dl-reloc.c:304
+msgid "cannot restore segment prot after reloc"
+msgstr "重定位后无法恢复段 prot"
+
+#: elf/dl-reloc.c:329
+msgid "cannot apply additional memory protection after relocation"
+msgstr "无法在重定位后应用额外的内存保护"
+
+#: elf/dl-sym.c:161
+msgid "RTLD_NEXT used in code not dynamically loaded"
+msgstr ""
+
+#: elf/dl-sysdep.c:474 elf/dl-sysdep.c:486
+msgid "cannot create capability list"
+msgstr "无法创建功能列表"
+
+#: elf/dl-tls.c:825
+msgid "cannot create TLS data structures"
+msgstr "无法创建 TLS 数据结构"
+
+#: elf/dl-version.c:303
+msgid "cannot allocate version reference table"
+msgstr "无法分配版本引用表格"
+
+#: elf/ldconfig.c:135
+msgid "Print cache"
+msgstr "打印缓冲区"
+
+#: elf/ldconfig.c:136
+msgid "Generate verbose messages"
+msgstr "生成详细消息"
+
+#: elf/ldconfig.c:137
+msgid "Don't build cache"
+msgstr "不要创建缓冲区"
+
+#: elf/ldconfig.c:138
+msgid "Don't generate links"
+msgstr "不要生成连接"
+
+#: elf/ldconfig.c:139
+msgid "Change to and use ROOT as root directory"
+msgstr "进入 ROOT 目录并将其作为根目录"
+
+#: elf/ldconfig.c:139
+msgid "ROOT"
+msgstr "ROOT"
+
+#: elf/ldconfig.c:140
+msgid "CACHE"
+msgstr "CACHE"
+
+#: elf/ldconfig.c:140
+msgid "Use CACHE as cache file"
+msgstr "将 CACHE 用作缓冲区文件"
+
+#: elf/ldconfig.c:141
+msgid "CONF"
+msgstr "CONF"
+
+#: elf/ldconfig.c:141
+msgid "Use CONF as configuration file"
+msgstr "将 CONF 用作配置文件"
+
+#: elf/ldconfig.c:142
+msgid "Only process directories specified on the command line.  Don't build cache."
+msgstr "只在命令行中给出了进程目录。未创建缓冲区。"
+
+#: elf/ldconfig.c:143
+msgid "Manually link individual libraries."
+msgstr "手工连接独立的库。"
+
+#: elf/ldconfig.c:144
+msgid "FORMAT"
+msgstr "FORMAT"
+
+#: elf/ldconfig.c:144
+msgid "Format to use: new, old or compat (default)"
+msgstr "采用的格式:新、旧或兼容(默认)"
+
+#: elf/ldconfig.c:152
+msgid "Configure Dynamic Linker Run Time Bindings."
+msgstr ""
+
+#: elf/ldconfig.c:310
+#, c-format
+msgid "Path `%s' given more than once"
+msgstr "多次给出路径“%s”"
+
+#: elf/ldconfig.c:350
+#, c-format
+msgid "%s is not a known library type"
+msgstr "%s 不是已知类型的库"
+
+#: elf/ldconfig.c:375
+#, c-format
+msgid "Can't stat %s"
+msgstr "无法对 %s 进行 stat 操作"
+
+#: elf/ldconfig.c:449
+#, c-format
+msgid "Can't stat %s\n"
+msgstr "无法对 %s 进行 stat 操作\n"
+
+#: elf/ldconfig.c:459
+#, c-format
+msgid "%s is not a symbolic link\n"
+msgstr "%s 不是符号连接\n"
+
+#: elf/ldconfig.c:478
+#, c-format
+msgid "Can't unlink %s"
+msgstr ""
+
+#: elf/ldconfig.c:484
+#, c-format
+msgid "Can't link %s to %s"
+msgstr "无法将 %s 连接到 %s"
+
+#: elf/ldconfig.c:490
+msgid " (changed)\n"
+msgstr " (改变)\n"
+
+#: elf/ldconfig.c:492
+msgid " (SKIPPED)\n"
+msgstr " (跳过)\n"
+
+#: elf/ldconfig.c:547
+#, c-format
+msgid "Can't find %s"
+msgstr "无法找到 %s"
+
+#: elf/ldconfig.c:563 elf/ldconfig.c:737 elf/ldconfig.c:784
+#, c-format
+msgid "Cannot lstat %s"
+msgstr "无法对 %s 进行 lstat 操作"
+
+#: elf/ldconfig.c:570
+#, c-format
+msgid "Ignored file %s since it is not a regular file."
+msgstr "由于不是一个普通文件,忽略文件 %s"
+
+#: elf/ldconfig.c:578
+#, c-format
+msgid "No link created since soname could not be found for %s"
+msgstr "未创建链接,因为 %s 无法找到 soname"
+
+#: elf/ldconfig.c:669
+#, c-format
+msgid "Can't open directory %s"
+msgstr "无法打开目录 %s"
+
+#: elf/ldconfig.c:749
+#, c-format
+msgid "Cannot stat %s"
+msgstr "无法对 %s 进行 stat 操作"
+
+#: elf/ldconfig.c:806 elf/readlib.c:91
+#, c-format
+msgid "Input file %s not found.\n"
+msgstr "未找到输入文件 %s。\n"
+
+#: elf/ldconfig.c:857
+#, c-format
+msgid "libc5 library %s in wrong directory"
+msgstr "libc5 的库 %s 处于错误的目录中"
+
+#: elf/ldconfig.c:860
+#, c-format
+msgid "libc6 library %s in wrong directory"
+msgstr "libc5 的库 %s 处于错误的目录中"
+
+#: elf/ldconfig.c:863
+#, c-format
+msgid "libc4 library %s in wrong directory"
+msgstr "libc4 的库 %s 处于错误的目录中"
+
+#: elf/ldconfig.c:890
+#, c-format
+msgid "libraries %s and %s in directory %s have same soname but different type."
+msgstr "目录 %3$s 中的 %1$s 和 %2$s 的 so 名称相同但类型不同。"
+
+#: elf/ldconfig.c:997
+#, c-format
+msgid "Can't open configuration file %s"
+msgstr "无法打开配置文件 %s"
+
+#: elf/ldconfig.c:1061
+#, c-format
+msgid "%s:%u: bad syntax in hwcap line"
+msgstr ""
+
+#: elf/ldconfig.c:1067
+#, c-format
+msgid "%s:%u: hwcap index %lu above maximum %u"
+msgstr ""
+
+#: elf/ldconfig.c:1074 elf/ldconfig.c:1082
+#, c-format
+msgid "%s:%u: hwcap index %lu already defined as %s"
+msgstr ""
+
+#: elf/ldconfig.c:1085
+#, c-format
+msgid "%s:%u: duplicate hwcap %lu %s"
+msgstr ""
+
+#: elf/ldconfig.c:1107
+#, c-format
+msgid "need absolute file name for configuration file when using -r"
+msgstr ""
+
+#: elf/ldconfig.c:1114 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1163
+#, c-format
+msgid "memory exhausted"
+msgstr "内存耗尽"
+
+#: elf/ldconfig.c:1144
+#, c-format
+msgid "%s:%u: cannot read directory %s"
+msgstr "%s:%u: 无法读取目录 %s"
+
+#: elf/ldconfig.c:1189
+#, c-format
+msgid "relative path `%s' used to build cache"
+msgstr ""
+
+#: elf/ldconfig.c:1215
+#, c-format
+msgid "Can't chdir to /"
+msgstr "无法改变目录到 /"
+
+#: elf/ldconfig.c:1257
+#, c-format
+msgid "Can't open cache file directory %s\n"
+msgstr "无法打开缓冲文件目录 %s\n"
+
+#: elf/ldd.bash.in:43
+msgid "Written by %s and %s.\n"
+msgstr "由 %s 和 %s 编写。\n"
+
+#: elf/ldd.bash.in:48
+msgid ""
+"Usage: ldd [OPTION]... FILE...\n"
+"      --help              print this help and exit\n"
+"      --version           print version information and exit\n"
+"  -d, --data-relocs       process data relocations\n"
+"  -r, --function-relocs   process data and function relocations\n"
+"  -u, --unused            print unused direct dependencies\n"
+"  -v, --verbose           print all information\n"
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>."
+msgstr ""
+
+#: elf/ldd.bash.in:80
+msgid "ldd: option \\`$1' is ambiguous"
+msgstr "ldd: 选项“$1”具有二义性"
+
+#: elf/ldd.bash.in:87
+msgid "unrecognized option"
+msgstr "无法识别的选项"
+
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
+msgid "Try \\`ldd --help' for more information."
+msgstr "试用“ldd --help”以获取更多信息。"
+
+#: elf/ldd.bash.in:125
+msgid "missing file arguments"
+msgstr "缺少文件参数"
+
+#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
+#. TRANS for ordinary files that are referenced in contexts where they are
+#. TRANS expected to already exist.
+#: elf/ldd.bash.in:148 sysdeps/gnu/errlist.c:36
+msgid "No such file or directory"
+msgstr "没有那个文件或目录"
+
+#: elf/ldd.bash.in:151 inet/rcmd.c:483
+msgid "not regular file"
+msgstr "不是普通文件"
+
+#: elf/ldd.bash.in:154
+msgid "warning: you do not have execution permission for"
+msgstr "警告: 你没有执行权限 "
+
+#: elf/ldd.bash.in:183
+msgid "\tnot a dynamic executable"
+msgstr "\t不是动态可执行文件"
+
+#: elf/ldd.bash.in:191
+msgid "exited with unknown exit code"
+msgstr "以未知的退出码退出"
+
+#: elf/ldd.bash.in:196
+msgid "error: you do not have read permission for"
+msgstr "错误: 你没有读权限 "
+
+#: elf/readelflib.c:35
+#, c-format
+msgid "file %s is truncated\n"
+msgstr "文件 %s 己被截断\n"
+
+#: elf/readelflib.c:67
+#, c-format
+msgid "%s is a 32 bit ELF file.\n"
+msgstr "%s 是一个 32 位 ELF 文件。\n"
+
+#: elf/readelflib.c:69
+#, c-format
+msgid "%s is a 64 bit ELF file.\n"
+msgstr "%s 是一个 64 位 ELF 文件。\n"
+
+#: elf/readelflib.c:71
+#, c-format
+msgid "Unknown ELFCLASS in file %s.\n"
+msgstr "文件 %s 中未知的 ELFCLASS。\n"
+
+#: elf/readelflib.c:78
+#, c-format
+msgid "%s is not a shared object file (Type: %d).\n"
+msgstr "%s 不是共享目标文件 (类型:%d)。\n"
+
+#: elf/readelflib.c:109
+#, c-format
+msgid "more than one dynamic segment\n"
+msgstr "多于一个动态段\n"
+
+#: elf/readlib.c:97
+#, c-format
+msgid "Cannot fstat file %s.\n"
+msgstr "无法对文件 %s 进行 fstat 操作。\n"
+
+#: elf/readlib.c:108
+#, c-format
+msgid "File %s is empty, not checked."
+msgstr "文件 %s 为空,未检查。"
+
+#: elf/readlib.c:114
+#, c-format
+msgid "File %s is too small, not checked."
+msgstr "文件 %s 过小,未检查。"
+
+#: elf/readlib.c:124
+#, c-format
+msgid "Cannot mmap file %s.\n"
+msgstr "无法对文件 %s 进行 mmap 操作。\n"
+
+#: elf/readlib.c:162
+#, c-format
+msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
+msgstr "%s 不是 ELF 文件 - 它起始的魔数错误。\n"
+
+#: elf/sprof.c:77
+msgid "Output selection:"
+msgstr "输出选择:"
+
+#: elf/sprof.c:79
+msgid "print list of count paths and their number of use"
+msgstr "打印当前路径的列表和他们的使用次数"
+
+#: elf/sprof.c:81
+msgid "generate flat profile with counts and ticks"
+msgstr ""
+
+#: elf/sprof.c:82
+msgid "generate call graph"
+msgstr "生成调用图"
+
+#: elf/sprof.c:89
+msgid ""
+"Read and display shared object profiling data.\vFor bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
+msgstr ""
+
+#: elf/sprof.c:94
+msgid "SHOBJ [PROFDATA]"
+msgstr "SHOBJ [PROFDATA]"
+
+#: elf/sprof.c:400
+#, c-format
+msgid "failed to load shared object `%s'"
+msgstr "装入共享目标文件“%s”失败"
+
+#: elf/sprof.c:409
+#, c-format
+msgid "cannot create internal descriptors"
+msgstr "无法创建内部描述符"
+
+#: elf/sprof.c:528
+#, c-format
+msgid "Reopening shared object `%s' failed"
+msgstr "重现打开共享对象“%s”失败"
+
+#: elf/sprof.c:535 elf/sprof.c:629
+#, c-format
+msgid "reading of section headers failed"
+msgstr "读取节头部失败"
+
+#: elf/sprof.c:543 elf/sprof.c:637
+#, c-format
+msgid "reading of section header string table failed"
+msgstr "读取节头部字符串表失败"
+
+#: elf/sprof.c:569
+#, c-format
+msgid "*** Cannot read debuginfo file name: %m\n"
+msgstr "*** 无法读取调试信息文件名: %m\n"
+
+#: elf/sprof.c:589
+#, c-format
+msgid "cannot determine file name"
+msgstr "无法确定文件名"
+
+#: elf/sprof.c:622
+#, c-format
+msgid "reading of ELF header failed"
+msgstr "读取 ELF 头部失败"
+
+#: elf/sprof.c:658
+#, c-format
+msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
+msgstr "*** 文件“%s”已剥离:不可能进行细节分析\n"
+
+#: elf/sprof.c:688
+#, c-format
+msgid "failed to load symbol data"
+msgstr "装入符号数据失败"
+
+#: elf/sprof.c:755
+#, c-format
+msgid "cannot load profiling data"
+msgstr "无法加载 profile 数据"
+
+#: elf/sprof.c:764
+#, c-format
+msgid "while stat'ing profiling data file"
+msgstr "当分析 profile 数据文件"
+
+#: elf/sprof.c:772
+#, c-format
+msgid "profiling data file `%s' does not match shared object `%s'"
+msgstr ""
+
+#: elf/sprof.c:783
+#, c-format
+msgid "failed to mmap the profiling data file"
+msgstr ""
+
+#: elf/sprof.c:791
+#, c-format
+msgid "error while closing the profiling data file"
+msgstr ""
+
+#: elf/sprof.c:800 elf/sprof.c:870
+#, c-format
+msgid "cannot create internal descriptor"
+msgstr "无法创建内部描述符"
+
+#: elf/sprof.c:846
+#, c-format
+msgid "`%s' is no correct profile data file for `%s'"
+msgstr ""
+
+#: elf/sprof.c:1027 elf/sprof.c:1085
+#, c-format
+msgid "cannot allocate symbol data"
+msgstr "无法分配符号数据"
+
+#: iconv/iconv_charmap.c:176 iconv/iconv_prog.c:316
+#, c-format
+msgid "error while closing input `%s'"
+msgstr "关闭输入“%s”时出错"
+
+#: iconv/iconv_charmap.c:450
+#, c-format
+msgid "illegal input sequence at position %Zd"
+msgstr "位于 %Zd 的非法输入序列"
+
+#: iconv/iconv_charmap.c:469 iconv/iconv_prog.c:526
+#, c-format
+msgid "incomplete character or shift sequence at end of buffer"
+msgstr "位于缓冲区末尾的不完整字符或转义序列"
+
+#: iconv/iconv_charmap.c:514 iconv/iconv_charmap.c:550 iconv/iconv_prog.c:569
+#: iconv/iconv_prog.c:605
+#, c-format
+msgid "error while reading the input"
+msgstr "读取输入时出错"
+
+#: iconv/iconv_charmap.c:532 iconv/iconv_prog.c:587
+#, c-format
+msgid "unable to allocate buffer for input"
+msgstr "无法为输入分配缓冲区"
+
+#: iconv/iconv_prog.c:60
+msgid "Input/Output format specification:"
+msgstr "输入/输出格式规范:"
+
+#: iconv/iconv_prog.c:61
+msgid "encoding of original text"
+msgstr "原始文本编码"
+
+#: iconv/iconv_prog.c:62
+msgid "encoding for output"
+msgstr "输出编码"
+
+#: iconv/iconv_prog.c:63
+msgid "Information:"
+msgstr "信息:"
+
+#: iconv/iconv_prog.c:64
+msgid "list all known coded character sets"
+msgstr "列举所有已知的字符集"
+
+#: iconv/iconv_prog.c:65 locale/programs/localedef.c:127
+msgid "Output control:"
+msgstr "输出控制:"
+
+#: iconv/iconv_prog.c:66
+msgid "omit invalid characters from output"
+msgstr "从输出中忽略无效的字符"
+
+#: iconv/iconv_prog.c:67
+msgid "output file"
+msgstr "输出文件"
+
+#: iconv/iconv_prog.c:68
+msgid "suppress warnings"
+msgstr "关闭警告"
+
+#: iconv/iconv_prog.c:69
+msgid "print progress information"
+msgstr "打印进度信息"
+
+#: iconv/iconv_prog.c:74
+msgid "Convert encoding of given files from one encoding to another."
+msgstr "转换给定文件的编码。"
+
+#: iconv/iconv_prog.c:78
+msgid "[FILE...]"
+msgstr "[文件...]"
+
+#: iconv/iconv_prog.c:200
+#, c-format
+msgid "cannot open output file"
+msgstr "无法打开输出文件"
+
+#: iconv/iconv_prog.c:242
+#, c-format
+msgid "conversions from `%s' and to `%s' are not supported"
+msgstr "不支持从“%s”到“%s”的转换"
+
+#: iconv/iconv_prog.c:247
+#, c-format
+msgid "conversion from `%s' is not supported"
+msgstr "不支持以“%s”为源头的转换"
+
+#: iconv/iconv_prog.c:254
+#, c-format
+msgid "conversion to `%s' is not supported"
+msgstr "不支持以“%s”为目标的转换"
+
+#: iconv/iconv_prog.c:258
+#, c-format
+msgid "conversion from `%s' to `%s' is not supported"
+msgstr "不支持从“%s”到“%s”的转换"
+
+#: iconv/iconv_prog.c:268
+#, c-format
+msgid "failed to start conversion processing"
+msgstr "启动转换处理失败"
+
+#: iconv/iconv_prog.c:362
+#, c-format
+msgid "error while closing output file"
+msgstr "关闭输出文件时出错"
+
+#: iconv/iconv_prog.c:471 iconv/iconv_prog.c:497
+#, c-format
 msgid "conversion stopped due to problem in writing the output"
-msgstr "ÓÉÓÚдÈëÊä³öʱ³öÏÖµÄÎÊÌâת»»Í£Ö¹"
-
-#: iconv/iconv_prog.c:499
+msgstr "由于写入输出时出现的问题转换停止"
+
+#: iconv/iconv_prog.c:522
 #, c-format
 msgid "illegal input sequence at position %ld"
-msgstr "δ֪ %ld ´¦µÄ·Ç·¨ÊäÈëÐòÁÐ"
-
-#: iconv/iconv_prog.c:507
+msgstr "未知 %ld 处的非法输入序列"
+
+#: iconv/iconv_prog.c:530
+#, c-format
 msgid "internal error (illegal descriptor)"
-msgstr "ÄÚ²¿´íÎó (·Ç·¨µÄÃèÊö·û)"
-
-#: iconv/iconv_prog.c:510
+msgstr "内部错误 (非法的描述符)"
+
+#: iconv/iconv_prog.c:533
 #, c-format
 msgid "unknown iconv() error %d"
-msgstr "δ֪µÄ iconv() ´íÎó %d"
-
-#: iconv/iconv_prog.c:753
+msgstr "未知的 iconv() 错误 %d"
+
+#: iconv/iconv_prog.c:779
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -340,1110 +1254,1225 @@
 
 #: iconv/iconvconfig.c:110
 msgid "Create fastloading iconv module configuration file."
-msgstr "´´½¨¿ìËÙ×°Èë iconv Ä£¿éÅäÖÃÎļþ¡£"
+msgstr "创建快速装入 iconv 模块配置文件。"
 
 #: iconv/iconvconfig.c:114
 msgid "[DIR...]"
-msgstr "[Ŀ¼...]"
-
-#: iconv/iconvconfig.c:126
+msgstr "[目录...]"
+
+#: iconv/iconvconfig.c:127
 msgid "Prefix used for all file accesses"
-msgstr "ÓÃÓÚËùÓÐÎļþ·ÃÎʵÄǰ׺"
-
-#: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
+msgstr "用于所有文件访问的前缀"
+
+#: iconv/iconvconfig.c:128
+msgid "Put output in FILE instead of installed location (--prefix does not apply to FILE)"
+msgstr ""
+
+#: iconv/iconvconfig.c:132
+msgid "Do not search standard directories, only those on the command line"
+msgstr ""
+
+#: iconv/iconvconfig.c:301
+#, c-format
+msgid "Directory arguments required when using --nostdlib"
+msgstr ""
+
+#: iconv/iconvconfig.c:343 locale/programs/localedef.c:291
+#, c-format
 msgid "no output file produced because warnings were issued"
-msgstr "ÓÉÓÚ³öÏÖ¾¯¸æ¶øδÉú³ÉÊä³öÎļþ"
-
-#: iconv/iconvconfig.c:405
+msgstr "由于出现警告而未生成输出文件"
+
+#: iconv/iconvconfig.c:429
+#, c-format
 msgid "while inserting in search tree"
-msgstr "²åÈëËÑË÷Ê÷ʱ"
-
-#: iconv/iconvconfig.c:1204
+msgstr "插入搜索树时"
+
+#: iconv/iconvconfig.c:1238
+#, c-format
 msgid "cannot generate output file"
-msgstr "ÎÞ·¨Éú³ÉÊä³öÎļþ"
-
-#: locale/programs/charmap-dir.c:59
+msgstr "无法生成输出文件"
+
+#: inet/rcmd.c:157
+msgid "rcmd: Cannot allocate memory\n"
+msgstr "rcmd:无法分配内存\n"
+
+#: inet/rcmd.c:172
+msgid "rcmd: socket: All ports in use\n"
+msgstr "rcmd:socket:所有端口都已在使用了\n"
+
+#: inet/rcmd.c:200
+#, c-format
+msgid "connect to address %s: "
+msgstr "连接到地址 %s:"
+
+#: inet/rcmd.c:213
+#, c-format
+msgid "Trying %s...\n"
+msgstr "正在尝试 %s...\n"
+
+#: inet/rcmd.c:249
+#, c-format
+msgid "rcmd: write (setting up stderr): %m\n"
+msgstr ""
+
+#: inet/rcmd.c:265
+#, c-format
+msgid "rcmd: poll (setting up stderr): %m\n"
+msgstr ""
+
+#: inet/rcmd.c:268
+msgid "poll: protocol failure in circuit setup\n"
+msgstr ""
+
+#: inet/rcmd.c:301
+msgid "socket: protocol failure in circuit setup\n"
+msgstr ""
+
+#: inet/rcmd.c:325
+#, c-format
+msgid "rcmd: %s: short read"
+msgstr ""
+
+#: inet/rcmd.c:481
+msgid "lstat failed"
+msgstr "lstat 操作失败"
+
+#: inet/rcmd.c:488
+msgid "cannot open"
+msgstr "无法打开"
+
+#: inet/rcmd.c:490
+msgid "fstat failed"
+msgstr "fstat 失败"
+
+#: inet/rcmd.c:492
+msgid "bad owner"
+msgstr "错误的拥有者"
+
+#: inet/rcmd.c:494
+msgid "writeable by other than owner"
+msgstr "可由除所有者之外的人写入"
+
+#: inet/rcmd.c:496
+msgid "hard linked somewhere"
+msgstr "某处的硬连接"
+
+#: inet/ruserpass.c:170 inet/ruserpass.c:193
+msgid "out of memory"
+msgstr "内存不足"
+
+#: inet/ruserpass.c:184
+msgid "Error: .netrc file is readable by others."
+msgstr "错误:.netrc 对其它人是可读的。"
+
+#: inet/ruserpass.c:185
+msgid "Remove password or make file unreadable by others."
+msgstr "删除不能由其它人读入的口令或 make 文件"
+
+#: inet/ruserpass.c:277
+#, c-format
+msgid "Unknown .netrc keyword %s"
+msgstr "未知的 .netrc 关键字 %s"
+
+#: libidn/nfkc.c:464
+msgid "Character out of range for UTF-8"
+msgstr "字符超出 UTF-8 的范围"
+
+#: locale/programs/charmap-dir.c:58
 #, c-format
 msgid "cannot read character map directory `%s'"
-msgstr "ÎÞ·¨¶ÁÈë×ÖĸӳÉäĿ¼¡°%s¡±"
-
-#: locale/programs/charmap.c:135
+msgstr "无法读入字母映射目录“%s”"
+
+#: locale/programs/charmap.c:138
 #, c-format
 msgid "character map file `%s' not found"
-msgstr "ÕÒ²»µ½×Ö·ûÓ³ÉäÎļþ¡°%s¡±"
-
-#: locale/programs/charmap.c:193
+msgstr "找不到字符映射文件“%s”"
+
+#: locale/programs/charmap.c:195
 #, c-format
 msgid "default character map file `%s' not found"
-msgstr "ÕÒ²»µ½Ä¬ÈÏ×Ö·ûÓ³ÉäÎļþ¡°%s¡±"
-
-#: locale/programs/charmap.c:255
+msgstr "找不到默认字符映射文件“%s”"
+
+#: locale/programs/charmap.c:258
 #, c-format
 msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr ""
 
-#: locale/programs/charmap.c:332
+#: locale/programs/charmap.c:337
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
-msgstr "%s£º<mb_cur_max> ±ØÐë´óÓÚ <mb_cur_min>\n"
-
-#: locale/programs/charmap.c:352 locale/programs/charmap.c:369
+msgstr "%s:<mb_cur_max> 必须大于 <mb_cur_min>\n"
+
+#: locale/programs/charmap.c:357 locale/programs/charmap.c:374
 #: locale/programs/repertoire.c:175
 #, c-format
 msgid "syntax error in prolog: %s"
-msgstr "ÐòÑÔÖÐÓï·¨´íÎó£º%s"
-
-#: locale/programs/charmap.c:353
+msgstr "序言中语法错误:%s"
+
+#: locale/programs/charmap.c:358
 msgid "invalid definition"
-msgstr "ÎÞЧµÄ¶¨Òå"
-
-#: locale/programs/charmap.c:370 locale/programs/locfile.c:126
+msgstr "无效的定义"
+
+#: locale/programs/charmap.c:375 locale/programs/locfile.c:126
 #: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
 msgid "bad argument"
-msgstr "´íÎóµÄ²ÎÊý"
-
-#: locale/programs/charmap.c:398
+msgstr "错误的参数"
+
+#: locale/programs/charmap.c:403
 #, c-format
 msgid "duplicate definition of <%s>"
-msgstr "Öظ´¶¨Òå <%s>"
-
-#: locale/programs/charmap.c:405
+msgstr "重复定义 <%s>"
+
+#: locale/programs/charmap.c:410
 #, c-format
 msgid "value for <%s> must be 1 or greater"
-msgstr "<%s>µÄÖµ±ØÐëÊÇ 1 »ò¸ü´ó"
-
-#: locale/programs/charmap.c:417
+msgstr "<%s>的值必须是 1 或更大"
+
+#: locale/programs/charmap.c:422
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
-msgstr "<%s> µÄÖµ±ØÐë´óÓÚµÈÓÚ <%s> µÄÖµ"
-
-#: locale/programs/charmap.c:440 locale/programs/repertoire.c:184
+msgstr "<%s> 的值必须大于等于 <%s> 的值"
+
+#: locale/programs/charmap.c:445 locale/programs/repertoire.c:184
 #, c-format
 msgid "argument to <%s> must be a single character"
-msgstr "<%s>µÄ²ÎÊý±ØÐëÊǵ¥¸ö×Ö·û"
-
-#: locale/programs/charmap.c:466
+msgstr "<%s>的参数必须是单个字符"
+
+#: locale/programs/charmap.c:471
 msgid "character sets with locking states are not supported"
-msgstr "²»Ö§³Ö´øÓÐËø¶¨×´Ì¬µÄ×Ö·û¼¯"
-
-#: locale/programs/charmap.c:493 locale/programs/charmap.c:547
-#: locale/programs/charmap.c:579 locale/programs/charmap.c:673
-#: locale/programs/charmap.c:728 locale/programs/charmap.c:769
-#: locale/programs/charmap.c:810
+msgstr "不支持带有锁定状态的字符集"
+
+#: locale/programs/charmap.c:498 locale/programs/charmap.c:552
+#: locale/programs/charmap.c:584 locale/programs/charmap.c:678
+#: locale/programs/charmap.c:733 locale/programs/charmap.c:774
+#: locale/programs/charmap.c:815
 #, c-format
 msgid "syntax error in %s definition: %s"
-msgstr "%s µÄ¶¨ÒåÖеÄÓï·¨´íÎó£º%s"
-
-#: locale/programs/charmap.c:494 locale/programs/charmap.c:674
-#: locale/programs/charmap.c:770 locale/programs/repertoire.c:231
+msgstr "%s 的定义中的语法错误:%s"
+
+#: locale/programs/charmap.c:499 locale/programs/charmap.c:679
+#: locale/programs/charmap.c:775 locale/programs/repertoire.c:231
 msgid "no symbolic name given"
-msgstr "ûÓиø³ö·ûºÅÃû"
-
-#: locale/programs/charmap.c:548
+msgstr "没有给出符号名"
+
+#: locale/programs/charmap.c:553
 msgid "invalid encoding given"
-msgstr "¸ø³öÎÞЧµÄ±àÂë"
-
-#: locale/programs/charmap.c:557
+msgstr "给出无效的编码"
+
+#: locale/programs/charmap.c:562
 msgid "too few bytes in character encoding"
-msgstr "×Ö·û±àÂëÖÐ×Ö½ÚÊý¹ýÉÙ"
-
-#: locale/programs/charmap.c:559
+msgstr "字符编码中字节数过少"
+
+#: locale/programs/charmap.c:564
 msgid "too many bytes in character encoding"
-msgstr "×Ö·û±àÂëÖÐ×Ö½ÚÊý¹ý¶à"
-
-#: locale/programs/charmap.c:581 locale/programs/charmap.c:729
-#: locale/programs/charmap.c:812 locale/programs/repertoire.c:297
+msgstr "字符编码中字节数过多"
+
+#: locale/programs/charmap.c:586 locale/programs/charmap.c:734
+#: locale/programs/charmap.c:817 locale/programs/repertoire.c:297
 msgid "no symbolic name given for end of range"
-msgstr "ûÓÐΪ·¶Î§µÄ½áÊø¸ø³ö·ûºÅ»¯µÄÃû³Æ"
-
-#: locale/programs/charmap.c:605 locale/programs/locfile.h:96
+msgstr "没有为范围的结束给出符号化的名称"
+
+#: locale/programs/charmap.c:610 locale/programs/ld-address.c:600
+#: locale/programs/ld-collate.c:2677 locale/programs/ld-collate.c:3828
+#: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
+#: locale/programs/ld-identification.c:452
+#: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
+#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
+#: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
+#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
 #: locale/programs/repertoire.c:314
 #, c-format
-msgid "`%1$s' definition does not end with `END %1$s'"
-msgstr "¶Ô¡°%1$s¡±µÄ¶¨Òå²¢²»ÒÔ¡°END %1%s¡±½áÊø"
-
-#: locale/programs/charmap.c:638
+msgid "%1$s: definition does not end with `END %1$s'"
+msgstr "%1$s:定义不以“END %1$s”结尾"
+
+#: locale/programs/charmap.c:643
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr ""
 
-#: locale/programs/charmap.c:646 locale/programs/charmap.c:709
+#: locale/programs/charmap.c:651 locale/programs/charmap.c:714
 #, c-format
 msgid "value for %s must be an integer"
-msgstr "%s µÄÖµ±ØÐëΪÕûÊý"
-
-#: locale/programs/charmap.c:837
+msgstr "%s 的值必须为整数"
+
+#: locale/programs/charmap.c:842
 #, c-format
 msgid "%s: error in state machine"
-msgstr "%s£º×´Ì¬»ú³ö´í"
-
-#: locale/programs/charmap.c:845 locale/programs/ld-address.c:605
-#: locale/programs/ld-collate.c:2635 locale/programs/ld-collate.c:3793
-#: locale/programs/ld-ctype.c:2216 locale/programs/ld-ctype.c:2977
-#: locale/programs/ld-identification.c:469
-#: locale/programs/ld-measurement.c:255 locale/programs/ld-messages.c:349
-#: locale/programs/ld-monetary.c:952 locale/programs/ld-name.c:324
-#: locale/programs/ld-numeric.c:392 locale/programs/ld-paper.c:258
-#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1217
-#: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
+msgstr "%s:状态机出错"
+
+#: locale/programs/charmap.c:850 locale/programs/ld-address.c:616
+#: locale/programs/ld-collate.c:2674 locale/programs/ld-collate.c:3844
+#: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
+#: locale/programs/ld-identification.c:468
+#: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
+#: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
+#: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
+#: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:325
 #, c-format
 msgid "%s: premature end of file"
-msgstr "%s£ºÎļþ²»ÍêÕû"
-
-#: locale/programs/charmap.c:864 locale/programs/charmap.c:875
+msgstr "%s:文件不完整"
+
+#: locale/programs/charmap.c:869 locale/programs/charmap.c:880
 #, c-format
 msgid "unknown character `%s'"
-msgstr "δ֪µÄ×Ö·û¡°%s¡±"
-
-#: locale/programs/charmap.c:883
+msgstr "未知的字符“%s”"
+
+#: locale/programs/charmap.c:888
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr ""
 
-#: locale/programs/charmap.c:987 locale/programs/ld-collate.c:2915
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2957
 #: locale/programs/repertoire.c:420
 msgid "invalid names for character range"
 msgstr ""
 
-#: locale/programs/charmap.c:999 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:432
 msgid "hexadecimal range format should use only capital characters"
 msgstr ""
 
-#: locale/programs/charmap.c:1017
-#, c-format
-msgid "<%s> and <%s> are illegal names for range"
-msgstr "<%s> ºÍ <%s> ÊÇ·Ç·¨µÄ·¶Î§Ãû"
-
-#: locale/programs/charmap.c:1023
-msgid "upper limit in range is not higher then lower limit"
-msgstr "·¶Î§µÄÉÏÏÞ²¢²»¸ßÓÚÏÂÏÞ"
-
-#: locale/programs/charmap.c:1081
+#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:450
+#, c-format
+msgid "<%s> and <%s> are invalid names for range"
+msgstr "<%s> 和 <%s> 是无效的范围名"
+
+#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:457
+msgid "upper limit in range is smaller than lower limit"
+msgstr "范围的上限小于下限"
+
+#: locale/programs/charmap.c:1087
 msgid "resulting bytes for range not representable."
 msgstr ""
 
-#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1519
-#: locale/programs/ld-ctype.c:416 locale/programs/ld-identification.c:134
-#: locale/programs/ld-measurement.c:95 locale/programs/ld-messages.c:98
-#: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:95
-#: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:92
-#: locale/programs/ld-telephone.c:95 locale/programs/ld-time.c:160
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1536
+#: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
+#: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
+#: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
+#: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
+#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:159
 #, c-format
 msgid "No definition for %s category found"
 msgstr ""
 
-#: locale/programs/ld-address.c:145 locale/programs/ld-address.c:183
-#: locale/programs/ld-address.c:201 locale/programs/ld-address.c:228
-#: locale/programs/ld-address.c:290 locale/programs/ld-address.c:309
-#: locale/programs/ld-address.c:322 locale/programs/ld-identification.c:147
-#: locale/programs/ld-measurement.c:106 locale/programs/ld-monetary.c:206
-#: locale/programs/ld-monetary.c:244 locale/programs/ld-monetary.c:260
-#: locale/programs/ld-monetary.c:272 locale/programs/ld-name.c:106
-#: locale/programs/ld-name.c:143 locale/programs/ld-numeric.c:113
-#: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:103
-#: locale/programs/ld-paper.c:112 locale/programs/ld-telephone.c:106
-#: locale/programs/ld-telephone.c:163 locale/programs/ld-time.c:176
-#: locale/programs/ld-time.c:197
+#: locale/programs/ld-address.c:144 locale/programs/ld-address.c:182
+#: locale/programs/ld-address.c:200 locale/programs/ld-address.c:229
+#: locale/programs/ld-address.c:301 locale/programs/ld-address.c:320
+#: locale/programs/ld-address.c:333 locale/programs/ld-identification.c:146
+#: locale/programs/ld-measurement.c:105 locale/programs/ld-monetary.c:206
+#: locale/programs/ld-monetary.c:250 locale/programs/ld-monetary.c:266
+#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:105
+#: locale/programs/ld-name.c:142 locale/programs/ld-numeric.c:112
+#: locale/programs/ld-numeric.c:126 locale/programs/ld-paper.c:102
+#: locale/programs/ld-paper.c:111 locale/programs/ld-telephone.c:105
+#: locale/programs/ld-telephone.c:162 locale/programs/ld-time.c:175
+#: locale/programs/ld-time.c:196
 #, c-format
 msgid "%s: field `%s' not defined"
-msgstr "%s£ºÓò¡°%s¡±Î´¶¨Òå"
-
-#: locale/programs/ld-address.c:157 locale/programs/ld-address.c:209
-#: locale/programs/ld-address.c:235 locale/programs/ld-address.c:265
-#: locale/programs/ld-name.c:118 locale/programs/ld-telephone.c:118
+msgstr "%s:域“%s”未定义"
+
+#: locale/programs/ld-address.c:156 locale/programs/ld-address.c:208
+#: locale/programs/ld-address.c:238 locale/programs/ld-address.c:276
+#: locale/programs/ld-name.c:117 locale/programs/ld-telephone.c:117
 #, c-format
 msgid "%s: field `%s' must not be empty"
-msgstr "%s£ºÓò¡°%s¡±²»ÄÜΪ¿Õ"
-
-#: locale/programs/ld-address.c:169
+msgstr "%s:域“%s”不能为空"
+
+#: locale/programs/ld-address.c:168
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
-msgstr "%1$s£ºÓò¡°%3$s¡±ÖÐÎÞЧµÄתÒå¡°%%%2$c¡±ÐòÁÐ"
-
-#: locale/programs/ld-address.c:220
+msgstr "%1$s:域“%3$s”中无效的转义“%%%2$c”序列"
+
+#: locale/programs/ld-address.c:219
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-address.c:247 locale/programs/ld-address.c:276
+#: locale/programs/ld-address.c:244
+#, c-format
+msgid "%s: field `%s' must not be defined"
+msgstr "%s:域“%s”必须未定义"
+
+#: locale/programs/ld-address.c:258 locale/programs/ld-address.c:287
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
-msgstr "%s£ºÎ´¶¨ÒåµÄÓïÑÔËõд¡°%s¡±"
-
-#: locale/programs/ld-address.c:254 locale/programs/ld-address.c:282
-#: locale/programs/ld-address.c:316 locale/programs/ld-address.c:328
+msgstr "%s:未定义的语言缩写“%s”"
+
+#: locale/programs/ld-address.c:265 locale/programs/ld-address.c:293
+#: locale/programs/ld-address.c:327 locale/programs/ld-address.c:339
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
-msgstr "%s£º¡°%s¡±µÄÖµ²»ÄÜÆ¥Åä¡°%s¡±µÄÖµ"
-
-#: locale/programs/ld-address.c:301
+msgstr "%s:“%s”的值不能匹配“%s”的值"
+
+#: locale/programs/ld-address.c:312
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
-msgstr "%s£ºÊýÖµ¹ú¼Ò±àÂë¡°%d¡±ÎÞЧ"
-
-#: locale/programs/ld-address.c:497 locale/programs/ld-address.c:534
-#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2592
-#: locale/programs/ld-identification.c:365
-#: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:302
-#: locale/programs/ld-monetary.c:694 locale/programs/ld-monetary.c:729
-#: locale/programs/ld-monetary.c:770 locale/programs/ld-name.c:281
-#: locale/programs/ld-numeric.c:264 locale/programs/ld-paper.c:225
-#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1106
-#: locale/programs/ld-time.c:1148
+msgstr "%s:数值国家编码“%d”无效"
+
+#: locale/programs/ld-address.c:508 locale/programs/ld-address.c:545
+#: locale/programs/ld-address.c:583 locale/programs/ld-ctype.c:2608
+#: locale/programs/ld-identification.c:364
+#: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301
+#: locale/programs/ld-monetary.c:701 locale/programs/ld-monetary.c:736
+#: locale/programs/ld-monetary.c:777 locale/programs/ld-name.c:280
+#: locale/programs/ld-numeric.c:263 locale/programs/ld-paper.c:224
+#: locale/programs/ld-telephone.c:288 locale/programs/ld-time.c:1126
+#: locale/programs/ld-time.c:1168
 #, c-format
 msgid "%s: field `%s' declared more than once"
-msgstr "%s£º¶à´ÎÉùÃ÷Óò¡°%s¡±"
-
-#: locale/programs/ld-address.c:501 locale/programs/ld-address.c:539
-#: locale/programs/ld-identification.c:369 locale/programs/ld-messages.c:312
-#: locale/programs/ld-monetary.c:698 locale/programs/ld-monetary.c:733
-#: locale/programs/ld-name.c:285 locale/programs/ld-numeric.c:268
-#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1000
-#: locale/programs/ld-time.c:1069 locale/programs/ld-time.c:1111
+msgstr "%s:多次声明域“%s”"
+
+#: locale/programs/ld-address.c:512 locale/programs/ld-address.c:550
+#: locale/programs/ld-identification.c:368 locale/programs/ld-messages.c:311
+#: locale/programs/ld-monetary.c:705 locale/programs/ld-monetary.c:740
+#: locale/programs/ld-name.c:284 locale/programs/ld-numeric.c:267
+#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:1020
+#: locale/programs/ld-time.c:1089 locale/programs/ld-time.c:1131
 #, c-format
 msgid "%s: unknown character in field `%s'"
-msgstr "%s£ºÓò¡°%s¡±Öк¬ÓÐδ֪×Ö·û"
-
-#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3775
-#: locale/programs/ld-ctype.c:2957 locale/programs/ld-identification.c:450
-#: locale/programs/ld-measurement.c:236 locale/programs/ld-messages.c:331
-#: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:306
-#: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:240
-#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1199
+msgstr "%s:域“%s”中含有未知字符"
+
+#: locale/programs/ld-address.c:597 locale/programs/ld-collate.c:3826
+#: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
+#: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
+#: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
+#: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239
+#: locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1219
 #, c-format
 msgid "%s: incomplete `END' line"
-msgstr "%s£º²»ÍêÕûµÄ¡°END¡±ÐÐ"
-
-#: locale/programs/ld-address.c:589 locale/programs/ld-collate.c:2638
-#: locale/programs/ld-collate.c:3777 locale/programs/ld-ctype.c:2219
-#: locale/programs/ld-ctype.c:2960 locale/programs/ld-identification.c:453
-#: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
-#: locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:308
-#: locale/programs/ld-numeric.c:376 locale/programs/ld-paper.c:242
-#: locale/programs/ld-telephone.c:314 locale/programs/ld-time.c:1201
-#, c-format
-msgid "%1$s: definition does not end with `END %1$s'"
-msgstr "%1$s£º¶¨Òå²»ÒÔ¡°END %1$s¡±½áβ"
-
-#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:520
-#: locale/programs/ld-collate.c:572 locale/programs/ld-collate.c:869
-#: locale/programs/ld-collate.c:882 locale/programs/ld-collate.c:2625
-#: locale/programs/ld-collate.c:3784 locale/programs/ld-ctype.c:1947
-#: locale/programs/ld-ctype.c:2206 locale/programs/ld-ctype.c:2782
-#: locale/programs/ld-ctype.c:2968 locale/programs/ld-identification.c:460
-#: locale/programs/ld-measurement.c:246 locale/programs/ld-messages.c:340
-#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:315
-#: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:249
-#: locale/programs/ld-telephone.c:321 locale/programs/ld-time.c:1208
+msgstr "%s:不完整的“END”行"
+
+#: locale/programs/ld-address.c:607 locale/programs/ld-collate.c:522
+#: locale/programs/ld-collate.c:574 locale/programs/ld-collate.c:870
+#: locale/programs/ld-collate.c:883 locale/programs/ld-collate.c:2664
+#: locale/programs/ld-collate.c:3835 locale/programs/ld-ctype.c:1960
+#: locale/programs/ld-ctype.c:2219 locale/programs/ld-ctype.c:2806
+#: locale/programs/ld-ctype.c:2992 locale/programs/ld-identification.c:459
+#: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
+#: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
+#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
+#: locale/programs/ld-telephone.c:320 locale/programs/ld-time.c:1228
 #, c-format
 msgid "%s: syntax error"
-msgstr "%s£ºÓï·¨´íÎó"
-
-#: locale/programs/ld-collate.c:395
+msgstr "%s:语法错误"
+
+#: locale/programs/ld-collate.c:397
 #, c-format
 msgid "`%.*s' already defined in charmap"
-msgstr "ÒѾ­ÔÚ×Ö·ûÓ³Éä±íÖж¨ÒåÁË¡°%.*s¡±"
-
-#: locale/programs/ld-collate.c:404
+msgstr "已经在字符映射表中定义了“%.*s”"
+
+#: locale/programs/ld-collate.c:406
 #, c-format
 msgid "`%.*s' already defined in repertoire"
-msgstr "ÒѾ­ÔÚÖ¸Áî±íÖж¨ÒåÁË¡°%.*s¡±"
-
-#: locale/programs/ld-collate.c:411
+msgstr "已经在指令表中定义了“%.*s”"
+
+#: locale/programs/ld-collate.c:413
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:418
+#: locale/programs/ld-collate.c:420
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr ""
 
-#: locale/programs/ld-collate.c:449 locale/programs/ld-collate.c:475
+#: locale/programs/ld-collate.c:451 locale/programs/ld-collate.c:477
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
-msgstr "%s£º¡°forward¡±ºÍ¡°backward¡±ÊÇ»¥³âµÄ"
-
-#: locale/programs/ld-collate.c:459 locale/programs/ld-collate.c:485
-#: locale/programs/ld-collate.c:501
+msgstr "%s:“forward”和“backward”是互斥的"
+
+#: locale/programs/ld-collate.c:461 locale/programs/ld-collate.c:487
+#: locale/programs/ld-collate.c:503
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:557
+#: locale/programs/ld-collate.c:559
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
-msgstr "%s£º¹æÔò¹ý¶à£»µÚÒ»¸öÌõÄ¿Ö»º¬ÓÐ %d"
-
-#: locale/programs/ld-collate.c:593
+msgstr "%s:规则过多;第一个条目只含有 %d"
+
+#: locale/programs/ld-collate.c:595
 #, c-format
 msgid "%s: not enough sorting rules"
-msgstr "%s£ºÅÅÐò¹æÔò²»×ã"
-
-#: locale/programs/ld-collate.c:759
+msgstr "%s:排序规则不足"
+
+#: locale/programs/ld-collate.c:760
 #, c-format
 msgid "%s: empty weight string not allowed"
-msgstr "%s£º²»ÔÊÐí¿ÕȨ×Ö·û´®"
-
-#: locale/programs/ld-collate.c:854
+msgstr "%s:不允许空权字符串"
+
+#: locale/programs/ld-collate.c:855
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:910
+#: locale/programs/ld-collate.c:911
 #, c-format
 msgid "%s: too many values"
-msgstr "%s£ºÖµ¹ý¶à"
-
-#: locale/programs/ld-collate.c:1023 locale/programs/ld-collate.c:1194
+msgstr "%s:值过多"
+
+#: locale/programs/ld-collate.c:1031 locale/programs/ld-collate.c:1206
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1073
+#: locale/programs/ld-collate.c:1081
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1100
+#: locale/programs/ld-collate.c:1108
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
-msgstr "%s£º×Ö½ÚÐòÁеĵÚÒ»¸öºÍ×îºóÒ»¸ö×Ö·ûµÄ³Ì¶È±ØÐëÏàͬ"
-
-#: locale/programs/ld-collate.c:1142
-#, c-format
-msgid "%s: byte sequence of first character of sequence is not lower than that of the last character"
-msgstr ""
-
-#: locale/programs/ld-collate.c:1263
+msgstr "%s:字节序列的第一个和最后一个字符的长度必须相同"
+
+#: locale/programs/ld-collate.c:1150
+#, c-format
+msgid "%s: byte sequence of first character of range is not lower than that of the last character"
+msgstr "%s:范围的字节序列的第一个字符不小于最后一个字符"
+
+#: locale/programs/ld-collate.c:1275
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1267
+#: locale/programs/ld-collate.c:1279
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
+#: locale/programs/ld-collate.c:1299 locale/programs/ld-ctype.c:1477
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
-msgstr ""
-
-#: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
+msgstr "“%s”和“%.*s”是无效的符号范围名"
+
+#: locale/programs/ld-collate.c:1349 locale/programs/ld-collate.c:3763
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1342
+#: locale/programs/ld-collate.c:1358
 #, c-format
 msgid "%s: `%s' must be a character"
-msgstr "%s£º¡°%s¡±±ØÐëÊÇÒ»¸ö×Ö·û"
-
-#: locale/programs/ld-collate.c:1535
+msgstr "%s:“%s”必须是一个字符"
+
+#: locale/programs/ld-collate.c:1552
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1560
+#: locale/programs/ld-collate.c:1577
 #, c-format
 msgid "symbol `%s' not defined"
-msgstr "·ûºÅ¡°%s¡±Î´¶¨Òå"
-
-#: locale/programs/ld-collate.c:1636 locale/programs/ld-collate.c:1742
+msgstr "符号“%s”未定义"
+
+#: locale/programs/ld-collate.c:1653 locale/programs/ld-collate.c:1759
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1640 locale/programs/ld-collate.c:1746
+#: locale/programs/ld-collate.c:1657 locale/programs/ld-collate.c:1763
 #, c-format
 msgid "symbol `%s'"
-msgstr "·ûºÅ¡°%s¡±"
-
-#: locale/programs/ld-collate.c:1788
+msgstr "符号“%s”"
+
+#: locale/programs/ld-collate.c:1805
+#, c-format
 msgid "no definition of `UNDEFINED'"
-msgstr "ûÓйØÓÚ¡°UNDEFINIED¡±µÄ¶¨Òå"
-
-#: locale/programs/ld-collate.c:1817
+msgstr "没有关于“UNDEFINIED”的定义"
+
+#: locale/programs/ld-collate.c:1834
+#, c-format
 msgid "too many errors; giving up"
-msgstr "´íÎó¹ý¶à£»·ÅÆú"
-
-#: locale/programs/ld-collate.c:2720
+msgstr "错误过多;放弃"
+
+#: locale/programs/ld-collate.c:2762
 #, c-format
 msgid "%s: duplicate definition of `%s'"
-msgstr "%s£ºÖظ´¶¨Òå¡°%s¡±"
-
-#: locale/programs/ld-collate.c:2756
+msgstr "%s:重复定义“%s”"
+
+#: locale/programs/ld-collate.c:2798
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
-msgstr "%s£ºÖظ´ÉùÃ÷½Ú¡°%s¡±"
-
-#: locale/programs/ld-collate.c:2895
+msgstr "%s:重复声明节“%s”"
+
+#: locale/programs/ld-collate.c:2937
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3027
+#: locale/programs/ld-collate.c:3069
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
-msgstr "%s£ºµÈ¼Û¶¨ÒåÃûÖÐδ֪µÄ×Ö·û"
-
-#: locale/programs/ld-collate.c:3040
+msgstr "%s:等价定义名中未知的字符"
+
+#: locale/programs/ld-collate.c:3082
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
-msgstr "%s£ºµÈ¼Û¶¨ÒåÖµÖÐδ֪µÄ×Ö·û"
-
-#: locale/programs/ld-collate.c:3050
+msgstr "%s:等价定义值中未知的字符"
+
+#: locale/programs/ld-collate.c:3092
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
-msgstr "%s£ºµÈ¼Û¶¨ÒåÖÐδ֪µÄ·ûºÅ¡°%s¡±"
-
-#: locale/programs/ld-collate.c:3059
+msgstr "%s:等价定义中未知的符号“%s”"
+
+#: locale/programs/ld-collate.c:3101
 msgid "error while adding equivalent collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3089
+#: locale/programs/ld-collate.c:3131
 #, c-format
 msgid "duplicate definition of script `%s'"
-msgstr "Öظ´¶¨Òå½Å±¾¡°%s¡±"
-
-#: locale/programs/ld-collate.c:3137
-#, c-format
-msgid "%s: unknown section name `%s'"
-msgstr "%s£ºÎ´ÖªµÄ½ÚÃû¡°%s¡±"
-
-#: locale/programs/ld-collate.c:3165
+msgstr "重复定义脚本“%s”"
+
+#: locale/programs/ld-collate.c:3179
+#, c-format
+msgid "%s: unknown section name `%.*s'"
+msgstr "%s:未知的节名“%.*s”"
+
+#: locale/programs/ld-collate.c:3208
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
-msgstr "%s£º¹ØÓÚ¡°%s¡±½Ú³öÏÖ¶à¸ö˳Ðò¶¨Òå"
-
-#: locale/programs/ld-collate.c:3190
+msgstr "%s:关于“%s”节出现多个顺序定义"
+
+#: locale/programs/ld-collate.c:3233
 #, c-format
 msgid "%s: invalid number of sorting rules"
-msgstr "%s£ºÅÅÐò¹æÔòµÄÊýÁ¿ÎÞЧ"
-
-#: locale/programs/ld-collate.c:3217
+msgstr "%s:排序规则的数量无效"
+
+#: locale/programs/ld-collate.c:3260
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
-msgstr "%s£º¹ØÓÚδÃüÃû½Ú³öÏÖ¶à¸ö˳Ðò¶¨Òå"
-
-#: locale/programs/ld-collate.c:3271 locale/programs/ld-collate.c:3394
-#: locale/programs/ld-collate.c:3753
+msgstr "%s:关于未命名节出现多个顺序定义"
+
+#: locale/programs/ld-collate.c:3314 locale/programs/ld-collate.c:3442
+#: locale/programs/ld-collate.c:3804
 #, c-format
 msgid "%s: missing `order_end' keyword"
-msgstr "%s£ºÒÅ©¹Ø¼ü×Ö¡°order_end¡±"
-
-#: locale/programs/ld-collate.c:3329
+msgstr "%s:遗漏关键字“order_end”"
+
+#: locale/programs/ld-collate.c:3375
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3345
+#: locale/programs/ld-collate.c:3393
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3356
+#: locale/programs/ld-collate.c:3404
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3408 locale/programs/ld-collate.c:3765
+#: locale/programs/ld-collate.c:3456 locale/programs/ld-collate.c:3816
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
-msgstr "%s£ºÒÔºó¹Ø¼ü×Ö¡°reorder-end¡±"
-
-#: locale/programs/ld-collate.c:3442 locale/programs/ld-collate.c:3637
+msgstr "%s:以后关键字“reorder-end”"
+
+#: locale/programs/ld-collate.c:3490 locale/programs/ld-collate.c:3688
 #, c-format
 msgid "%s: section `%.*s' not known"
-msgstr "%s£ºÎ´ÖªµÄ½Ú¡°%.*s¡±"
-
-#: locale/programs/ld-collate.c:3507
+msgstr "%s:未知的节“%.*s”"
+
+#: locale/programs/ld-collate.c:3555
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3700
+#: locale/programs/ld-collate.c:3751
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3749
+#: locale/programs/ld-collate.c:3800
 #, c-format
 msgid "%s: empty category description not allowed"
-msgstr "%s£º²»ÔÊÐí¿Õ·¶³ëÃèÊö"
-
-#: locale/programs/ld-collate.c:3768
+msgstr "%s:不允许空范畴描述"
+
+#: locale/programs/ld-collate.c:3819
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
-msgstr "%s£ºÒÅ©¹Ø¼ü×Ö¡°reorder-sections-end¡±"
-
-#: locale/programs/ld-ctype.c:435
+msgstr "%s:遗漏关键字“reorder-sections-end”"
+
+#: locale/programs/ld-ctype.c:439
+#, c-format
 msgid "No character set name specified in charmap"
-msgstr "×Ö·ûÓ³Éä±íÖÐδ¸ø³ö×Ö·û¼¯Ãû³Æ"
-
-#: locale/programs/ld-ctype.c:464
+msgstr "字符映射表中未给出字符集名称"
+
+#: locale/programs/ld-ctype.c:468
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr ""
 
-# msgstr "Àà¡°%2$s¡±ÖеÄ×Ö·û L'\\u%0*x' ±ØÐëÊôÓÚÀà¡°%3$s¡±"
-#: locale/programs/ld-ctype.c:479
+# msgstr "类“%2$s”中的字符 L'\\u%0*x' 必须属于类“%3$s”"
+#: locale/programs/ld-ctype.c:483
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:493 locale/programs/ld-ctype.c:551
+#: locale/programs/ld-ctype.c:497 locale/programs/ld-ctype.c:555
 #, c-format
 msgid "internal error in %s, line %u"
-msgstr "ÔÚ %s µÄµÚ %u ÐгöÏÖÄÚ²¿´íÎó"
-
-#: locale/programs/ld-ctype.c:522
+msgstr "在 %s 的第 %u 行出现内部错误"
+
+#: locale/programs/ld-ctype.c:526
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
-msgstr "Àà¡°%2$s¡±ÖеÄ×Ö·û¡°%1$s¡±±ØÐëÊôÓÚÀà¡°%3$s¡±"
-
-#: locale/programs/ld-ctype.c:538
+msgstr "类“%2$s”中的字符“%1$s”必须属于类“%3$s”"
+
+#: locale/programs/ld-ctype.c:542
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
-msgstr "Àà¡°%2$s¡±ÖеÄ×Ö·û¡°%1$s¡±²»µÃÊôÓÚÀà¡°%3$s¡±"
-
-#: locale/programs/ld-ctype.c:568 locale/programs/ld-ctype.c:606
+msgstr "类“%2$s”中的字符“%1$s”不得属于类“%3$s”"
+
+#: locale/programs/ld-ctype.c:572 locale/programs/ld-ctype.c:610
 #, c-format
 msgid "<SP> character not in class `%s'"
-msgstr "×Ö·û <SP> ²»ÔÚÀà¡°%s¡±ÖÐ"
-
-#: locale/programs/ld-ctype.c:580 locale/programs/ld-ctype.c:617
+msgstr "字符 <SP> 不在类“%s”中"
+
+#: locale/programs/ld-ctype.c:584 locale/programs/ld-ctype.c:621
 #, c-format
 msgid "<SP> character must not be in class `%s'"
-msgstr "×Ö·û <SP> ²»ÄÜÊôÓÚÀà¡°%s¡±"
-
-#: locale/programs/ld-ctype.c:595
+msgstr "字符 <SP> 不能属于类“%s”"
+
+#: locale/programs/ld-ctype.c:599
+#, c-format
 msgid "character <SP> not defined in character map"
-msgstr "×Ö·ûÓ³ÉäÖÐ䶨Òå×Ö·û <SP>"
-
-#: locale/programs/ld-ctype.c:709
+msgstr "字符映射中未定义字符 <SP>"
+
+#: locale/programs/ld-ctype.c:714
+#, c-format
 msgid "`digit' category has not entries in groups of ten"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:758
+#: locale/programs/ld-ctype.c:763
+#, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:823
+#: locale/programs/ld-ctype.c:828
+#, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:840
+#: locale/programs/ld-ctype.c:845
+#, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1235
+#: locale/programs/ld-ctype.c:1245
 #, c-format
 msgid "character class `%s' already defined"
-msgstr "×Ö·ûÀà¡°%s¡±ÒѶ¨Òå"
-
-#: locale/programs/ld-ctype.c:1241
+msgstr "字符类“%s”已定义"
+
+#: locale/programs/ld-ctype.c:1251
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1267
+#: locale/programs/ld-ctype.c:1277
 #, c-format
 msgid "character map `%s' already defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1273
+#: locale/programs/ld-ctype.c:1283
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
-msgstr "ʵÏÖÏÞÖÆ£º²»µÃ¶àÓÚ %d ¸ö×Ö·ûÓ³Éä±í"
-
-#: locale/programs/ld-ctype.c:1538 locale/programs/ld-ctype.c:1663
-#: locale/programs/ld-ctype.c:1769 locale/programs/ld-ctype.c:2455
-#: locale/programs/ld-ctype.c:3443
+msgstr "实现限制:不得多于 %d 个字符映射表"
+
+#: locale/programs/ld-ctype.c:1548 locale/programs/ld-ctype.c:1673
+#: locale/programs/ld-ctype.c:1779 locale/programs/ld-ctype.c:2471
+#: locale/programs/ld-ctype.c:3467
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
-msgstr "%s£ºÓò¡°%s¡±º¬ÓÐÌõÄ¿µÄ¸öÊý²»ÊÇÊ®¸ö"
-
-#: locale/programs/ld-ctype.c:1566 locale/programs/ld-ctype.c:2137
+msgstr "%s:域“%s”含有条目的个数不是十个"
+
+#: locale/programs/ld-ctype.c:1576 locale/programs/ld-ctype.c:2150
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1693
+#: locale/programs/ld-ctype.c:1703
 msgid "start and end character sequence of range must have the same length"
-msgstr "·¶Î§µÄÆðʼºÍÖÕÖ¹×Ö·ûÐòÁбØÐë¾ßÓÐÏàͬµÄ³¤¶È"
-
-#: locale/programs/ld-ctype.c:1700
+msgstr "范围的起始和终止字符序列必须具有相同的长度"
+
+#: locale/programs/ld-ctype.c:1710
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2057 locale/programs/ld-ctype.c:2108
+#: locale/programs/ld-ctype.c:2070 locale/programs/ld-ctype.c:2121
 msgid "premature end of `translit_ignore' definition"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2063 locale/programs/ld-ctype.c:2114
-#: locale/programs/ld-ctype.c:2156
+#: locale/programs/ld-ctype.c:2076 locale/programs/ld-ctype.c:2127
+#: locale/programs/ld-ctype.c:2169
 msgid "syntax error"
-msgstr "Óï·¨´íÎó"
-
-#: locale/programs/ld-ctype.c:2287
+msgstr "语法错误"
+
+#: locale/programs/ld-ctype.c:2303
 #, c-format
 msgid "%s: syntax error in definition of new character class"
-msgstr "%s£ºÔÚ¶¨ÒåÐÂ×Ö·û¼¯ºÏÖгöÏÖÓï·¨´íÎó"
-
-#: locale/programs/ld-ctype.c:2302
+msgstr "%s:在定义新字符集合中出现语法错误"
+
+#: locale/programs/ld-ctype.c:2318
 #, c-format
 msgid "%s: syntax error in definition of new character map"
-msgstr "%s£ºÔÚÐÂ×Ö·ûÓ³ÉäÖгöÏÖÓï·¨´íÎó"
-
-#: locale/programs/ld-ctype.c:2477
+msgstr "%s:在新字符映射中出现语法错误"
+
+#: locale/programs/ld-ctype.c:2493
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2486
+#: locale/programs/ld-ctype.c:2502
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2501
+#: locale/programs/ld-ctype.c:2517
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2515
+#: locale/programs/ld-ctype.c:2531
 msgid "with character code range values one must use the absolute ellipsis `...'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2666
+#: locale/programs/ld-ctype.c:2682
 #, c-format
 msgid "duplicated definition for mapping `%s'"
-msgstr "Öظ´¶¨ÒåÓ³Éä¡°%s¡±"
-
-#: locale/programs/ld-ctype.c:2744 locale/programs/ld-ctype.c:2888
+msgstr "重复定义映射“%s”"
+
+#: locale/programs/ld-ctype.c:2768 locale/programs/ld-ctype.c:2912
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
-msgstr "%s£º¡°translit_start¡±½Ú²»ÒÔ¡°translit_end¡±½áÊø"
-
-#: locale/programs/ld-ctype.c:2839
+msgstr "%s:“translit_start”节不以“translit_end”结束"
+
+#: locale/programs/ld-ctype.c:2863
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
-msgstr "%s£ºÖظ´¶¨Òå¡°default_missing¡±"
-
-#: locale/programs/ld-ctype.c:2844
+msgstr "%s:重复定义“default_missing”"
+
+#: locale/programs/ld-ctype.c:2868
 msgid "previous definition was here"
-msgstr "Ç°Ò»¸ö¶¨ÒåÔÚÕâÀï"
-
-#: locale/programs/ld-ctype.c:2866
+msgstr "前一个定义在这里"
+
+#: locale/programs/ld-ctype.c:2890
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3019
-#, c-format
-msgid "%s: character `%s' not defined in charmap while needed as default value"
-msgstr ""
-
-#: locale/programs/ld-ctype.c:3024 locale/programs/ld-ctype.c:3108
-#: locale/programs/ld-ctype.c:3128 locale/programs/ld-ctype.c:3149
-#: locale/programs/ld-ctype.c:3170 locale/programs/ld-ctype.c:3191
-#: locale/programs/ld-ctype.c:3212 locale/programs/ld-ctype.c:3252
-#: locale/programs/ld-ctype.c:3273 locale/programs/ld-ctype.c:3340
+#: locale/programs/ld-ctype.c:3043 locale/programs/ld-ctype.c:3127
+#: locale/programs/ld-ctype.c:3147 locale/programs/ld-ctype.c:3168
+#: locale/programs/ld-ctype.c:3189 locale/programs/ld-ctype.c:3210
+#: locale/programs/ld-ctype.c:3231 locale/programs/ld-ctype.c:3271
+#: locale/programs/ld-ctype.c:3292 locale/programs/ld-ctype.c:3359
+#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
+#, c-format
+msgid "%s: character `%s' not defined while needed as default value"
+msgstr ""
+

[... 8494 lines stripped ...]