2.5-18.1

[jlayton/glibc.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9754fb30f5469b35bb96f96995a82db7bff1a6ab..30f27220737754c0f43b3fa1941903159fce9217 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -259,7 +259,7 @@ msgstr "
 
 #: iconv/iconv_prog.c:241
 #, c-format
-msgid "conversion from `%s' and to `%s' are not supported"
+msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "²»Ö§³Ö´Ó¡°%s¡±µ½¡°%s¡±µÄת»»"
 
 #: iconv/iconv_prog.c:246
@@ -351,7 +351,7 @@ msgid "Prefix used for all file accesses"
 msgstr "ÓÃÓÚËùÓÐÎļþ·ÃÎʵÄǰ׺"
 
 #: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
-msgid "no output file produced because warning were issued"
+msgid "no output file produced because warnings were issued"
 msgstr "ÓÉÓÚ³öÏÖ¾¯¸æ¶øδÉú³ÉÊä³öÎļþ"
 
 #: iconv/iconvconfig.c:405
@@ -726,7 +726,7 @@ msgstr ""
 
 #: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467
 #, c-format
-msgid "`%s' and `%.*s' are no valid names for symbolic range"
+msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
 #: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712
@@ -1623,7 +1623,7 @@ msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "¼´Î´¸ø³ö <Uxxxx> Ҳδ¸ø³ö <Uxxxxxxxx>"
 
 #: locale/programs/repertoire.c:332
-msgid "cannot safe new repertoire map"
+msgid "cannot save new repertoire map"
 msgstr ""
 
 #: locale/programs/repertoire.c:343
@@ -3033,7 +3033,7 @@ msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s£ºÓ÷¨Îª %s [ -v ] [ -c cutoff ] ÇøÓòÃû ...\n"
 
 #: timezone/zdump.c:268
-msgid "Error writing standard output"
+msgid "Error writing to standard output"
 msgstr "дÈë±ê×¼Êä³ö³ö´í"
 
 #: timezone/zic.c:365
@@ -5054,7 +5054,7 @@ msgstr "
 
 #: nscd/connections.c:405 nscd/connections.c:499
 #, c-format
-msgid "error getting callers id: %s"
+msgid "error getting caller's id: %s"
 msgstr ""
 
 #: nscd/connections.c:471