summary refs log tree commit diff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-09-22 06:07:26 +0000
committerUlrich Drepper <drepper@redhat.com>2006-09-22 06:07:26 +0000
commit4a132246b1a34c6fe5d777a810e332236977e66a (patch)
tree050ae55eddfe9707b9acf30602175dfba782b47c /po/zh_CN.po
parentc69136aeed1f6e7ba0649b0e0a6ec425ded37df8 (diff)
downloadglibc-4a132246b1a34c6fe5d777a810e332236977e66a.tar.gz
glibc-4a132246b1a34c6fe5d777a810e332236977e66a.tar.xz
glibc-4a132246b1a34c6fe5d777a810e332236977e66a.zip
2006-09-21  Jakub Jelinek  <jakub@redhat.com>
	[BZ #3225]
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (PTR_MANGLE3,
	PTR_DEMANGLE3): Define.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (PTR_MANGLE3,
	PTR_DEMANGLE3): Likewise.
	* sysdeps/powerpc/powerpc32/__longjmp-common.S (__longjmp): Use them.
	* sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S (__longjmp):
	Likewise.
	* sysdeps/powerpc/powerpc64/__longjmp-common.S (__longjmp): Likewise.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po12
1 files changed, 6 insertions, 6 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9754fb30f5..30f2722073 100644
--- 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 "无法写入结果:“%s”"
 
 #: 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