summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-05-24 21:38:07 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-05-24 21:38:07 +0000
commit47a97b733b5462a27975fb44102e948bb10d8538 (patch)
tree95e9d5d9b4352379589c46ec4511c6003f40339a /po/zh_CN.po
parentdf6689e496db0bf173bb0007ef4fbfca2fbacc7c (diff)
parent416e9e40f1313cec23e3865105c6bc9ce6cc41f2 (diff)
merge bubulle@debian.org--2005/apt--main--0
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-66 Italian translation complete * bubulle@debian.org--2005/apt--main--0--patch-67 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-68 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-69 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-70 Re-generate the POT and PO files from sources * bubulle@debian.org--2005/apt--main--0--patch-71 Update French translation * bubulle@debian.org--2005/apt--main--0--patch-72 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-73 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-74 Hebres translation update * bubulle@debian.org--2005/apt--main--0--patch-75 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-76 Correct the Hebrew translation for #306658 * bubulle@debian.org--2005/apt--main--0--patch-77 Update French man pages translations * bubulle@debian.org--2005/apt--main--0--patch-78 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-79 Correct syntax errors in Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-80 Revert changes to debian/changelog and debian/apt.cron.daily * bubulle@debian.org--2005/apt--main--0--patch-81 Portuguese translation update * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1 Passage sous arch
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po25
1 files changed, 13 insertions, 12 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 163917e05..d6fa9be1d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 22:10+0100\n"
+"POT-Creation-Date: 2005-03-29 07:17+0200\n"
"PO-Revision-Date: 2005-02-09 17:34+0800\n"
"Last-Translator: Tchaikov <chaisave@263.net>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -322,6 +322,7 @@ msgid "Error processing contents %s"
msgstr "处理 Contents %s 时出错"
#: ftparchive/apt-ftparchive.cc:551
+#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -360,7 +361,7 @@ msgid ""
" --no-delink Enable delinking debug mode\n"
" --contents Control contents file generation\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option"
+" -o=? Set an arbitrary configuration option"
msgstr ""
"用法: apt-ftparchive [选项] 命令\n"
"命令: packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
@@ -1523,7 +1524,7 @@ msgid "Internal error adding a diversion"
msgstr "添加 diversion 时出现内部错误"
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
msgstr "必须首先初始化软件包缓存"
#: apt-inst/deb/dpkgdb.cc:386
@@ -2348,37 +2349,37 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
msgstr "处理 %s (NewPackage)时出错"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr "处理 %s (UsePackage1)时出错"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr "处理 %s (UsePackage2)时出错"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "处理 %s (NewFileVer1)时出错"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr "处理 %s (NewVersion1)时出错"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr "处理 %s (UsePackage3)时出错"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr "处理 %s (NewVersion2)时出错"
#: apt-pkg/pkgcachegen.cc:207
@@ -2395,12 +2396,12 @@ msgstr "糟了,依赖关系的数量超出了本程序的处理能力。"
#: apt-pkg/pkgcachegen.cc:241
#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
msgstr "处理 %s (FindPkg)时出错"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "处理 %s (CollectFileProvides)时出错"
#: apt-pkg/pkgcachegen.cc:260