* merged from the apt--pdiff branch

[apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c6af55e98f2d1b7ee0e33dcf563b4188faadf99b..06ea0e977ccf3d23a68da9fd10b51d870cff410a 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1685,11 +1685,12 @@ msgstr "无法找到该文件"
 
 #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 #: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/gzip.cc:141 methods/gzip.cc:150
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
 #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
-#: methods/rred.cc:240
+#: methods/rred.cc:240 methods/gzip.cc:147
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
@@ -1937,12 +1938,12 @@ msgid ""
 "available:\n"
 msgstr "由于没有公钥，下列签名无法进行验证：\n"
 
-#: methods/gzip.cc:57
+#: methods/gzip.cc:57 methods/gzip.cc:64
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "无法为 %s 开启管道"
 
-#: methods/gzip.cc:102
+#: methods/gzip.cc:102 methods/gzip.cc:109
 #, c-format
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
@@ -2089,12 +2090,12 @@ msgstr "语法错误 %s:%u: 不支持的指令“%s”"
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
 
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... 有错误!"
 
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
@@ -2226,108 +2227,110 @@ msgstr "用 unlink 删除文件时出错"
 msgid "Problem syncing the file"
 msgstr "同步文件时出错"
 
-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 
-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
 msgid "The package cache file is corrupted"
 msgstr "软件包缓存区文件损坏了"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”这个版本控制系统"
 
-#: apt-pkg/pkgcache.cc:158
+#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的主机构造的"
 
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
 msgid "Depends"
 msgstr "依赖"
 
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
 msgid "PreDepends"
 msgstr "预依赖"
 
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
 msgid "Suggests"
 msgstr "建议"
 
-#: apt-pkg/pkgcache.cc:230
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
 msgid "Recommends"
 msgstr "推荐"
 
-#: apt-pkg/pkgcache.cc:230
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
 msgid "Conflicts"
 msgstr "冲突"
 
-#: apt-pkg/pkgcache.cc:230
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
 msgid "Replaces"
 msgstr "替换"
 
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
 msgid "Obsoletes"
 msgstr "废弃"
 
-#: apt-pkg/pkgcache.cc:242
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:242
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
 msgid "required"
 msgstr "必要"
 
-#: apt-pkg/pkgcache.cc:242
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
 msgid "standard"
 msgstr "标准"
 
-#: apt-pkg/pkgcache.cc:243
+#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
 msgid "optional"
 msgstr "可选"
 
-#: apt-pkg/pkgcache.cc:243
+#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
 msgid "extra"
 msgstr "额外"
 
-#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
+#: apt-pkg/depcache.cc:127
 msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"
 
-#: apt-pkg/depcache.cc:102
+#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
 msgid "Candidate versions"
 msgstr "候选版本"
 
-#: apt-pkg/depcache.cc:131
+#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
 msgid "Dependency generation"
 msgstr "生成依赖关系"
 
 #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
+#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
 #, fuzzy
 msgid "Reading state information"
 msgstr "正在合并现有信息"
 
-#: apt-pkg/depcache.cc:199
+#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "无法打开 %s"
 
-#: apt-pkg/depcache.cc:205
+#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入文件 %s"
 
-#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "无法解析软件包文件 %s (1)"
 
-#: apt-pkg/tagfile.cc:186
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
@@ -2599,6 +2602,7 @@ msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 
 #: apt-pkg/acquire-item.cc:1097
+#, fuzzy
 msgid "There are no public key available for the following key IDs:\n"
 msgstr "以下 key ID 没有可用的公钥：\n"
 
@@ -2789,6 +2793,11 @@ msgstr "无法打开文件 %s"
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
+#: apt-pkg/acquire-item.cc:1097
+#, fuzzy
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "以下 key ID 没有可用的公钥：\n"
+
 #~ msgid "File date has changed %s"
 #~ msgstr "文件 %s 的时间已被改动"