The following commit has been merged in the sid branch:
commit fae8a2bd6e28818623f55e650825226a03a88961
Author: Aron Xu <happyaron...@gmail.com>
Date: Sat Aug 28 14:33:14 2010 +0200
Simplified Chinese translation update
diff --git a/debian/changelog b/debian/changelog
index 856a540..f24b2c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ dpkg (1.15.8.5) UNRELEASED; urgency=low
* Italian (Milo Casagrande). Closes: #592953
* Swedish (Peter Krefting).
* French (Christian Perrier).
+ * Simplified Chinese (Aron Xu). Closes: #594513
[ Updated man page translations ]
* German (Helge Kreutzmann).
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24c16cd..c3208c9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,16 +8,16 @@
# Carlos Z.F. Liu <carlos...@users.sourceforge.net>, 2004,2006.
# Anthony Wong <ypw...@debian.org.hk>, 2007.
# Deng Xiyue <manphiz-gu...@users.alioth.debian.org>, 2007, 2008, 2009.
-# Aron Xu <happyaron...@gmail.com>, 2009.
+# Aron Xu <happyaron...@gmail.com>, 2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: dpkg\n"
"Report-Msgid-Bugs-To: debian-d...@lists.debian.org\n"
"POT-Creation-Date: 2010-08-21 20:15+0200\n"
-"PO-Revision-Date: 2009-12-15 15:21+0800\n"
+"PO-Revision-Date: 2010-08-26 22:24+0800\n"
"Last-Translator: Aron Xu <happyaron...@gmail.com>\n"
-"Language-Team: Simplified Chinese <debian-chinese...@lists.debian.org>\n"
+"Language-Team: Chinese (simplified) <i18n...@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,40 +25,39 @@ msgstr ""
#: lib/dpkg/ar.c:54 lib/dpkg/ar.c:70 lib/dpkg/ar.c:81 lib/dpkg/ar.c:85
#: lib/dpkg/ar.c:104
-#, fuzzy, c-format
+#, c-format
msgid "unable to write file '%s'"
-msgstr "无法打开原始文件“%.250s”"
+msgstr "无法写入文件“%s”"
#: lib/dpkg/ar.c:67
#, c-format
msgid "generated corrupt ar header for '%s'"
-msgstr ""
+msgstr "ar 生成的 %s 损坏头"
#: lib/dpkg/ar.c:95
-#, fuzzy, c-format
-#| msgid "failed to fstat tmpfile (data)"
+#, c-format
msgid "failed to fstat ar member file (%s)"
-msgstr "fstat 临时文件(数据)失败"
+msgstr "fstat ar 成员文件失败(%s)"
#: lib/dpkg/buffer.c:254
-#, fuzzy, c-format
+#, c-format
msgid "failed to read on buffer copy for %s"
-msgstr "无法 buffer_copy (%s)"
+msgstr "为 %s 读取缓冲副本失败"
#: lib/dpkg/buffer.c:256
-#, fuzzy, c-format
+#, c-format
msgid "failed in write on buffer copy for %s"
-msgstr "无法 buffer_copy (%s)"
+msgstr "为 %s 写入缓冲副本失败"
#: lib/dpkg/buffer.c:258
-#, fuzzy, c-format
+#, c-format
msgid "short read on buffer copy for %s"
-msgstr "buffer_copy (%s) 未读完所有数据"
+msgstr "为 %s 短暂读取缓冲副本"
#: lib/dpkg/command.c:182
-#, fuzzy, c-format
+#, c-format
msgid "unable to execute %s (%s)"
-msgstr "无法运行 %s"
+msgstr "无法运行 %s (%s)"
#: lib/dpkg/compress.c:76
#, c-format
@@ -73,71 +72,71 @@ msgstr "%s：压缩"
#: lib/dpkg/compress.c:107
#, c-format
msgid "%s: error binding input to gzip stream"
-msgstr ""
+msgstr "%s：绑定输入到 gzip 流失败"
#: lib/dpkg/compress.c:119
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal gzip read error: '%s'"
-msgstr "%s：内部 gzip 错误：“%s”"
+msgstr "%s：内部 gzip 读取错误：%s"
#: lib/dpkg/compress.c:127 lib/dpkg/compress.c:131
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal gzip write error"
-msgstr "%s：内部 gzip 错误：“%s”"
+msgstr "%s：内部 gzip 写入错误"
#: lib/dpkg/compress.c:147
#, c-format
msgid "%s: error binding output to gzip stream"
-msgstr ""
+msgstr "%s：绑定输出到 gzip 流出错"
#: lib/dpkg/compress.c:154
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal gzip read error"
-msgstr "%s：内部 gzip 错误：“%s”"
+msgstr "%s：内部 gzip 读取错误"
#: lib/dpkg/compress.c:164
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal gzip write error: '%s'"
-msgstr "%s：内部 gzip 错误：“%s”"
+msgstr "%s：内部 gzip 写入错误：%s"
#: lib/dpkg/compress.c:177
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal gzip write error: %s"
-msgstr "%s：内部 gzip 错误：“%s”"
+msgstr "%s：内部 gzip 写入错误：%s"
#: lib/dpkg/compress.c:219
#, c-format
msgid "%s: error binding input to bzip2 stream"
-msgstr ""
+msgstr "%s：绑定输入到 bzip2 流失败"
#: lib/dpkg/compress.c:231
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal bzip2 read error: '%s'"
-msgstr "%s：内部 bzip2 错误：“%s”"
+msgstr "%s：内部 bzip2 读取错误：%s"
#: lib/dpkg/compress.c:239 lib/dpkg/compress.c:243 lib/dpkg/compress.c:295
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal bzip2 write error"
-msgstr "%s：内部 bzip2 错误：“%s”"
+msgstr "%s：内部 bzip2 写入错误"
#: lib/dpkg/compress.c:259
#, c-format
msgid "%s: error binding output to bzip2 stream"
-msgstr ""
+msgstr "%s：绑定输出到 bzip2 流出错"
#: lib/dpkg/compress.c:266
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal bzip2 read error"
-msgstr "%s：内部 bzip2 错误：“%s”"
+msgstr "%s：内部 bzip2 读取错误"
#: lib/dpkg/compress.c:276 lib/dpkg/compress.c:287
-#, fuzzy, c-format
+#, c-format
msgid "%s: internal bzip2 write error: '%s'"
-msgstr "%s：内部 bzip2 错误：“%s”"
+msgstr "%s：内部 bzip2 写入错误：%s"
#: lib/dpkg/compress.c:283
msgid "unexpected bzip2 error"
-msgstr ""
+msgstr "未预料的 bzip2 错误"
#: lib/dpkg/database.c:196
#, c-format
@@ -188,10 +187,9 @@ msgid "unable to seek to start of %.250s after padding"
msgstr "无法在填充 %.250s 后找到起始位置"
#: lib/dpkg/dbmodify.c:161
-#, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
+#, c-format
msgid "unable to open lock file %s for testing"
-msgstr "无法为 vsnprintf 新建临时文件"
+msgstr "无法打开锁文件 %s 以测试"
#: lib/dpkg/dbmodify.c:193
msgid "you do not have permission to lock the dpkg status database"
@@ -262,44 +260,44 @@ msgid "failed to write details of `%.50s' to `%.250s'"
msgstr "将“%.50s”详情写入至“%.250s”失败"
#: lib/dpkg/dump.c:380
-#, fuzzy, c-format
+#, c-format
msgid "failed to open '%s' for writing %s database"
-msgstr "无法打开“%s”以写入“%s”信息"
+msgstr "无法打开“%s”以写入“%s”数据库"
#: lib/dpkg/dump.c:383
-#, fuzzy, c-format
+#, c-format
msgid "unable to set buffering on %s database file"
-msgstr "无法为状态文件设置缓冲区"
+msgstr "无法为数据库文件 %s 设置缓冲区"
#: lib/dpkg/dump.c:393
-#, fuzzy, c-format
+#, c-format
msgid "failed to write %s database record about '%.50s' to '%.250s'"
-msgstr "写入 %s 记录失败(“%.50s”到“%.250s”)"
+msgstr "写入 %s 数据库记录失败(“%.50s”到“%.250s”)"
#: lib/dpkg/dump.c:401
-#, fuzzy, c-format
+#, c-format
msgid "failed to flush %s database to '%.250s'"
-msgstr "刷新 %s 信息到“%.250s”失败"
+msgstr "清空 %s 数据库到“%.250s”失败"
#: lib/dpkg/dump.c:403
-#, fuzzy, c-format
+#, c-format
msgid "failed to fsync %s database to '%.250s'"
-msgstr "同步 %s 信息到“%.250s”失败"
+msgstr "fsync %s 数据库到“%.250s”失败"
#: lib/dpkg/dump.c:406
-#, fuzzy, c-format
+#, c-format
msgid "failed to close '%.250s' after writing %s database"
-msgstr "写入 %s 信息后，关闭“%.250s”失败"
+msgstr "写入 %2$s 数据库后，关闭“%1$.250s”失败"
#: lib/dpkg/dump.c:410
-#, fuzzy, c-format
+#, c-format
msgid "failed to link '%.250s' to '%.250s' for backup of %s database"
-msgstr "建立“%.250s”到“%.250s”的链接时失败(该链接用于备份 %s 信息)"
+msgstr "建立“%.250s”到“%.250s”的链接时失败(该链接用于备份 %s 数据库)"
#: lib/dpkg/dump.c:413
-#, fuzzy, c-format
+#, c-format
msgid "failed to install '%.250s' as '%.250s' containing %s database"
-msgstr "将包含 %s 信息的“%.250s”安装为“%.250s”时失败"
+msgstr "将包含 %3$s 数据库的“%1$.250s”安装为“%2$.250s”时失败"
#: lib/dpkg/ehandle.c:91
#, c-format
@@ -416,10 +414,9 @@ msgid "third (status) word in `status' field"
msgstr "“status”字段的第三个词(status)"
#: lib/dpkg/fields.c:182
-#, fuzzy, c-format
-#| msgid "error in Version string `%.250s': %.250s"
+#, c-format
msgid "error in Version string '%.250s'"
-msgstr "版本字符串“%.250s”中有错误: %.250s"
+msgstr "版本字符串“%.250s”中有错误"
#: lib/dpkg/fields.c:191
msgid "obsolete `Revision' or `Package-Revision' field used"
@@ -430,10 +427,9 @@ msgid "value for `config-version' field not allowed in
this context"
msgstr "“config-version”字段的值在该环境中不被允许"
#: lib/dpkg/fields.c:211
-#, fuzzy, c-format
-#| msgid "error in Config-Version string `%.250s': %.250s"
+#, c-format
msgid "error in Config-Version string '%.250s'"
-msgstr "Config-Version 字符串“%.250s”中有错误: %.250s"
+msgstr "Config-Version 字符串“%.250s”中有错误"
#: lib/dpkg/fields.c:236
#, c-format
@@ -512,10 +508,9 @@ msgid "`%s' field, reference to `%.255s': version
unterminated"
msgstr "“%s”字段，于“%.255s”：版本号不应就此终止"
#: lib/dpkg/fields.c:422
-#, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#, c-format
msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "“%s”字段，于“%.255s”：解析版本号时出错：%.255s"
+msgstr "“%s”字段，于“%.255s”：解析版本号时出错"
#: lib/dpkg/fields.c:432
#, c-format
@@ -525,7 +520,7 @@ msgstr "“%s”字段，在引用软件包“%.255s”后发现语法错误"
#: lib/dpkg/fields.c:439
#, c-format
msgid "alternatives (`|') not allowed in %s field"
-msgstr "在 %s 字段中不能含有替换项(“|”)"
+msgstr "在 %s 字段中不能含有候选项(“|”)"
#: lib/dpkg/fields.c:493
msgid "value for `triggers-pending' field not allowed in this context"
@@ -556,28 +551,28 @@ msgid "duplicate awaited trigger package `%.255s'"
msgstr "重复的等待触发包“%.255s”"
#: lib/dpkg/file.c:45
-#, fuzzy, c-format
+#, c-format
msgid "unable to stat source file '%.250s'"
-msgstr "无法打开原始文件“%.250s”"
+msgstr "无法打开源文件“%.250s”"
#: lib/dpkg/file.c:49
-#, fuzzy, c-format
+#, c-format
msgid "unable to change ownership of target file '%.250s'"
-msgstr "无法改变新发布版的 conffile “%.250s”的属主"
+msgstr "无法改变目标文件“%.250s”的属主"
#: lib/dpkg/file.c:53
-#, fuzzy, c-format
+#, c-format
msgid "unable to set mode of target file '%.250s'"
-msgstr "无法设置新发布版的 conffile “%.250s”的权限位"
+msgstr "无法设置文件“%.250s”的权限位"
#: lib/dpkg/file.c:77
msgid "unable to unlock dpkg status database"
msgstr "无法为 dpkg 的状态数据库解锁"
#: lib/dpkg/file.c:100
-#, fuzzy, c-format
+#, c-format
msgid "unable to check file '%s' lock status"
-msgstr "无法打开原始文件“%.250s”"
+msgstr "无法检查文件 %s 的锁状态”"
#: lib/dpkg/log.c:52
#, c-format
@@ -883,16 +878,12 @@ msgid "nothing after colon in version number"
msgstr "版本号的冒号后面没有任何东西"
#: lib/dpkg/parsehelp.c:272
-#, fuzzy
-#| msgid "nothing after colon in version number"
msgid "invalid character in version number"
-msgstr "版本号的冒号后面没有任何东西"
+msgstr "版本号后的字符串无效"
#: lib/dpkg/parsehelp.c:276
-#, fuzzy
-#| msgid "nothing after colon in version number"
msgid "invalid character in revision number"
-msgstr "版本号的冒号后面没有任何东西"
+msgstr "版本号后的字符串无效"
#: lib/dpkg/parsehelp.c:343 lib/dpkg/parsehelp.c:356
#, c-format
@@ -957,9 +948,9 @@ msgid "subprocess %s failed with wait status code %d"
msgstr "子进程 %s 出错，所获得的等待状态数为 %d"
#: lib/dpkg/subproc.c:156 utils/update-alternatives.c:387
-#, fuzzy, c-format
+#, c-format
msgid "wait for subprocess %s failed"
-msgstr "等待子进程 %s 退出时出错"
+msgstr "等待子进程 %s 时出错"
#: lib/dpkg/trigdeferred.l:72
#, c-format
@@ -1064,14 +1055,14 @@ msgid "unable to write new trigger interest file
`%.250s'"
msgstr "无法写入新的触发关注文件“%.250s”"
#: lib/dpkg/triglib.c:428
-#, fuzzy, c-format
+#, c-format
msgid "unable to flush new trigger interest file '%.250s'"
-msgstr "无法创建新的触发关注文件“%.250s”"
+msgstr "无法清空新的触发关注文件“%.250s”"
#: lib/dpkg/triglib.c:431
-#, fuzzy, c-format
+#, c-format
msgid "unable to sync new trigger interest file '%.250s'"
-msgstr "无法创建新的触发关注文件“%.250s”"
+msgstr "无法同步新的触发关注文件“%.250s”"
#: lib/dpkg/triglib.c:435
#, c-format
@@ -1100,14 +1091,14 @@ msgid "unable to write new file triggers file `%.250s'"
msgstr "无法写入新的文件触发文件“%.250s”"
#: lib/dpkg/triglib.c:538
-#, fuzzy, c-format
+#, c-format
msgid "unable to flush new file triggers file '%.250s'"
-msgstr "无法创建新的文件触发文件“%.250s”"
+msgstr "无法清空新的文件触发文件“%.250s”"
#: lib/dpkg/triglib.c:541
-#, fuzzy, c-format
+#, c-format
msgid "unable to sync new file triggers file '%.250s'"
-msgstr "无法创建新的文件触发文件“%.250s”"
+msgstr "无法同步新的文件触发文件“%.250s”"
#: lib/dpkg/triglib.c:545
#, c-format
@@ -1361,14 +1352,14 @@ msgid "unable to install new version of `%.255s'"
msgstr "无法安装“%.255s”的新版本"
#: src/archives.c:882
-#, fuzzy, c-format
+#, c-format
msgid "unable to open '%.255s'"
-msgstr "无法创建“%.255s”"
+msgstr "无法打开“%.255s”"
#: src/archives.c:884
-#, fuzzy, c-format
+#, c-format
msgid "unable to sync file '%.255s'"
-msgstr "无法关闭文件缓冲“%.255s”"
+msgstr "无法同步文件“%.255s”"
#: src/archives.c:932
#, c-format
@@ -1506,9 +1497,8 @@ msgid "--%s --recursive needs at least one path argument"
msgstr "--%s --递归执行需要至少一个路径作为参数"
#: src/archives.c:1177
-#, fuzzy
msgid "find for dpkg --recursive"
-msgstr "无法启用 --recursive 选项执行 find"
+msgstr "启用 --recursive 选项执行 find"
#: src/archives.c:1199
msgid "failed to fdopen find's pipe"
@@ -1594,10 +1584,9 @@ msgid "unable to restore backup version of `%.250s'"
msgstr "无法恢复“%.250s”的备份版本"
#: src/cleanup.c:96
-#, fuzzy, c-format
-#| msgid "unable to restore backup version of `%.250s'"
+#, c-format
msgid "unable to remove backup copy of '%.250s'"
-msgstr "无法恢复“%.250s”的备份版本"
+msgstr "无法删除“%.250s”的备份版本"
#: src/cleanup.c:100
#, c-format
@@ -1610,10 +1599,9 @@ msgid "unable to remove newly-extracted version of
`%.250s'"
msgstr "无法删除“%.250s”的新近解压的版本"
#: src/configure.c:101
-#, fuzzy, c-format
-#| msgid "unable to stat new dist conffile `%.250s'"
+#, c-format
msgid "unable to stat new distributed conffile '%.250s'"
-msgstr "无法获取新发布版的 conffile “%.250s”的信息"
+msgstr "无法获取新发布版的 conffile “%.250s”"
#: src/configure.c:111
#, c-format
@@ -1647,8 +1635,7 @@ msgid "%s: failed to remove '%.250s': %s"
msgstr "%s：删除“%.250s”失败：%s"
#: src/configure.c:185
-#, fuzzy, c-format
-#| msgid "%s: failed to remove old distrib version '%.250s': %s"
+#, c-format
msgid "%s: failed to remove old distributed version '%.250s': %s"
msgstr "%s：无法删除以前的发布版本“%.250s”：%s"
@@ -1873,7 +1860,7 @@ msgid " ==> Using new config file as default.\n"
msgstr " ==> 按照默认设置，安装新的配置文件。\n"
#: src/configure.c:656
-#, fuzzy, c-format
+#, c-format
msgid ""
" What would you like to do about it ? Your options are:\n"
" Y or I : install the package maintainer's version\n"
@@ -2043,7 +2030,7 @@ msgstr " %.250s 提供了 %.250s 并已存在而且 %s。\n"
#: src/divertcmd.c:50 src/querycmd.c:643 src/statcmd.c:52
msgid "Use --help for help about querying packages."
-msgstr ""
+msgstr "使用 --help 查看关于查询软件包的帮助。"
#: src/divertcmd.c:67 src/statcmd.c:57 utils/update-alternatives.c:80
#, c-format
@@ -2051,24 +2038,20 @@ msgid "Debian %s version %s.\n"
msgstr "Debian %s 版本 %s。\n"
#: src/divertcmd.c:70
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Copyright (C) 1995 Ian Jackson.\n"
-#| "Copyright (C) 2000,2001 Wichert Akkerman."
+#, c-format
msgid ""
"Copyright (C) 1995 Ian Jackson.\n"
"Copyright (C) 2000,2001 Wichert Akkerman.\n"
"Copyright (C) 2010 Guillem Jover.\n"
msgstr ""
-"\n"
-"版权所有 (C) 1995 Ian Jackson。\n"
-"版权所有 (C) 2000,2001 Wichert Akkerman。"
+"版权所有 (C) 1995 Ian Jackson\n"
+"版权所有 (C) 2000,2001 Wichert Akkerman\n"
+"版权所有 (C) 2010 Guillem Jover\n"
#: src/divertcmd.c:75 src/main.c:62 src/querycmd.c:590 src/statcmd.c:64
#: src/trigcmd.c:57 dpkg-deb/main.c:58 dpkg-split/main.c:50
#: utils/update-alternatives.c:89
-#, fuzzy, c-format
+#, c-format
msgid ""
"This is free software; see the GNU General Public License version 2 or\n"
"later for copying conditions. There is NO warranty.\n"
@@ -2097,37 +2080,16 @@ msgid ""
" --truename <file> return the diverted file.\n"
"\n"
msgstr ""
+"命令：\n"
+" [--add] <文件名> 添加一个转移项。\n"
+" --remove <文件名> 删除这个转移项。\n"
+" --list [<glob 模式>] 列出各文件转移项。\n"
+" --listpackage <文件> 显示哪个软件包转移了指定文件。\n"
+" --truename <文件名> 返回被转移的原始文件。\n"
+"\n"
#: src/divertcmd.c:100
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [<option> ...] <command>\n"
-#| "\n"
-#| "Commands:\n"
-#| " [--add] <file> add a diversion.\n"
-#| " --remove <file> remove the diversion.\n"
-#| " --list [<glob-pattern>] show file diversions.\n"
-#| " --listpackage <file> show what package diverts the file.\n"
-#| " --truename <file> return the diverted file.\n"
-#| "\n"
-#| "Options:\n"
-#| " --package <package> name of the package whose copy of <file> will "
-#| "not\n"
-#| " be diverted.\n"
-#| " --local all packages' versions are diverted.\n"
-#| " --divert <divert-to> the name used by other packages' versions.\n"
-#| " --rename actually move the file aside (or back).\n"
-#| " --admindir <directory> set the directory with the diversions file.\n"
-#| " --test don't do anything, just demonstrate.\n"
-#| " --quiet quiet operation, minimal output.\n"
-#| " --help show this help message.\n"
-#| " --version show the version.\n"
-#| "\n"
-#| "When adding, default is --local and --divert <original>.distrib.\n"
-#| "When removing, --package or --local and --divert must match if "
-#| "specified.\n"
-#| "Package preinst/postrm scripts should always specify --package and --"
-#| "divert.\n"
+#, c-format
msgid ""
"Options:\n"
" --package <package> name of the package whose copy of <file> will "
@@ -2143,15 +2105,6 @@ msgid ""
" --version show the version.\n"
"\n"
msgstr ""
-"用法：%s [<选项> ...] <命令>\n"
-"\n"
-"命令：\n"
-" [--add] <文件名> 添加一个转移项。\n"
-" --remove <文件名> 删除这个转移项。\n"
-" --list [<glob 模式>] 列出各文件转移项。\n"
-" --listpackage <文件> 显示哪个软件包转移了指定文件。\n"
-" --truename <文件名> 返回被转移的原始文件。\n"
-"\n"
"选项：\n"
" --package <软件包名> 该软件包中的 <文件名> 副本将不会被转移。\n"
" --local 所有软件包的版本均会被转移。\n"
@@ -2163,9 +2116,6 @@ msgstr ""
" --help 显示本帮助信息。\n"
" --version 显示版本信息。\n"
"\n"
-"当添加转移项的时候，默认的选项是 --local 和 --divert <原始文件名>.distrib。\n"
-"在删除转移项的时候，--package 或 --local 选项和 --divert 选项必须一致。\n"
-"软件包的 preinst 和 postrm 脚本通常应当指定 --package 和 --divert 选项。\n"
#: src/divertcmd.c:114
#, c-format
@@ -2175,18 +2125,19 @@ msgid ""
"Package preinst/postrm scripts should always specify --package and --"
"divert.\n"
msgstr ""
+"当添加转移项的时候，默认的选项是 --local 和 --divert <原始文件名>.distrib。\n"
+"在删除转移项的时候，--package 或 --local 选项和 --divert 选项必须一致。\n"
+"软件包的 preinst 和 postrm 脚本通常应当指定 --package 和 --divert 选项。\n"
#: src/divertcmd.c:150
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
+#, c-format
msgid "cannot stat file '%s'"
-msgstr "无法取得旧名称 “%s” 的信息：%s"
+msgstr "无法访问文件 %s"
#: src/divertcmd.c:168
-#, fuzzy, c-format
-#| msgid "error checking `%s': %s"
+#, c-format
msgid "error checking '%s'"
-msgstr "处理 “%s” 时出错：%s"
+msgstr "检查 %s 时出错"
#: src/divertcmd.c:203
#, c-format
@@ -2199,96 +2150,81 @@ msgstr ""
#: src/divertcmd.c:225
msgid "file copy"
-msgstr ""
+msgstr "文件副本"
#: src/divertcmd.c:270
-#, fuzzy, c-format
-#| msgid "rename: remove duplicate old link `%s': %s"
+#, c-format
msgid "rename: remove duplicate old link '%s'"
-msgstr "改名：移除重复的旧连接 “%s”：%s"
+msgstr "改名：移除重复的旧连接 %s"
#: src/divertcmd.c:274
-#, fuzzy, c-format
-#| msgid "cannot stat new name `%s': %s"
+#, c-format
msgid "cannot rename '%s' to '%s'"
-msgstr "无法取得新名称 “%s” 的信息：%s"
+msgstr "无法重命名 %s 为 %s"
#: src/divertcmd.c:296
-#, fuzzy, c-format
-#| msgid "local diversion to: %s\n"
+#, c-format
msgid "local diversion of %s"
-msgstr "本地转移至：%s\n"
+msgstr "本地转移至：%s"
#: src/divertcmd.c:298
-#, fuzzy, c-format
-#| msgid "local diversion to: %s\n"
+#, c-format
msgid "local diversion of %s to %s"
-msgstr "本地转移至：%s\n"
+msgstr "本地转移 %s 到 %s"
#: src/divertcmd.c:302
-#, fuzzy, c-format
-#| msgid "diversion by %s"
+#, c-format
msgid "diversion of %s by %s"
-msgstr "被 %s 转移"
+msgstr "被 %2$s 转移的 %1$s"
#: src/divertcmd.c:305
-#, fuzzy, c-format
-#| msgid "diversion by %s to: %s\n"
+#, c-format
msgid "diversion of %s to %s by %s"
-msgstr "%s 导致转移至：%s\n"
+msgstr "%3$s 导致 %1$s 转移至 %2$s"
#: src/divertcmd.c:321
-#, fuzzy, c-format
-#| msgid "diversion by %s"
+#, c-format
msgid "any diversion of %s"
-msgstr "被 %s 转移"
+msgstr ""
#: src/divertcmd.c:323
-#, fuzzy, c-format
-#| msgid "diversion by %s to: %s\n"
+#, c-format
msgid "any diversion of %s to %s"
-msgstr "%s 导致转移至：%s\n"
+msgstr ""
#: src/divertcmd.c:371
-#, fuzzy, c-format
-#| msgid "cannot open GPL file"
+#, c-format
msgid "cannot create new %s file"
-msgstr "无法打开 GPL 许可证文件"
+msgstr "无法新建 %s 文件"
#: src/divertcmd.c:389 src/statcmd.c:235 dpkg-deb/build.c:524
#: dpkg-split/join.c:73 dpkg-split/queue.c:185
-#, fuzzy, c-format
+#, c-format
msgid "unable to flush file '%s'"
-msgstr "vsnprintf 无法 flush"
+msgstr "无法清空文件 %s"
#: src/divertcmd.c:391 src/statcmd.c:237 dpkg-deb/build.c:526
#: dpkg-split/join.c:75 dpkg-split/queue.c:187
-#, fuzzy, c-format
+#, c-format
msgid "unable to sync file '%s'"
-msgstr "无法打开原始文件“%.250s”"
+msgstr "无法同步文件 %s"
#: src/divertcmd.c:393
-#, fuzzy, c-format
+#, c-format
msgid "unable to close file '%s'"
-msgstr "vsnprintf 无法 flush"
+msgstr "无法关闭文件 %s"
#: src/divertcmd.c:396
-#, fuzzy
-#| msgid "remove old diversions-old: %s"
msgid "error removing old diversions-old"
-msgstr "移除旧有的转移项：%s"
+msgstr "删除旧的转移项备份出错"
#: src/divertcmd.c:398
-#, fuzzy
-#| msgid "error creating new statoverride-old"
msgid "error creating new diversions-old"
-msgstr "建立新的 statoverride-old 时出错：%s"
+msgstr "建立新的转移项备份出错"
#: src/divertcmd.c:400
-#, fuzzy
-#| msgid "error installing new statoverride"
msgid "error installing new diversions"
-msgstr "安装新的 statoverride 时出错：%s"
+msgstr "安装新的转移项出错"
#: src/divertcmd.c:420 src/divertcmd.c:517 src/divertcmd.c:624
#: src/divertcmd.c:644 src/statcmd.c:310
@@ -2310,15 +2246,14 @@ msgid "Cannot divert directories"
msgstr "不能转移目录"
#: src/divertcmd.c:447
-#, fuzzy, c-format
+#, c-format
msgid "cannot divert file '%s' to itself"
-msgstr "不能转移目录"
+msgstr "不能转移文件 %s 到其本身"
#: src/divertcmd.c:467
-#, fuzzy, c-format
-#| msgid "Leaving `%s'"
+#, c-format
msgid "Leaving '%s'\n"
-msgstr "正在离开 “%s”"
+msgstr "正在离开 %s\n"
#: src/divertcmd.c:472
#, c-format
@@ -2326,16 +2261,14 @@ msgid "`%s' clashes with `%s'"
msgstr "“%s” 与 “%s” 冲突"
#: src/divertcmd.c:495
-#, fuzzy, c-format
-#| msgid "Adding `%s'"
+#, c-format
msgid "Adding '%s'\n"
-msgstr "正在添加 “%s”"
+msgstr "正在添加 %s\n"
#: src/divertcmd.c:524
-#, fuzzy, c-format
-#| msgid "No diversion `%s', none removed"
+#, c-format
msgid "No diversion '%s', none removed.\n"
-msgstr "没有 “%s” 转移项，因此没有作出删除"
+msgstr "没有转移项 %s，因此没有删除。\n"
#: src/divertcmd.c:539
#, c-format
@@ -2360,10 +2293,9 @@ msgstr ""
" 发现了“%s”"
#: src/divertcmd.c:553
-#, fuzzy, c-format
-#| msgid "Removing `%s'"
+#, c-format
msgid "Removing '%s'\n"
-msgstr "正在删除 “%s”"
+msgstr "正在删除 %s\n"
#: src/divertcmd.c:672 src/main.c:224 src/querycmd.c:651 src/statcmd.c:113
#: dpkg-deb/main.c:198 dpkg-split/main.c:167
@@ -2468,6 +2400,8 @@ msgid ""
"Another process has locked the database for writing, and might currently be\n"
"modifying it, some of the following problems might just be due to that.\n"
msgstr ""
+"另一进程已经锁定数据库以写入，并可能正在对其进行修改，一些问题可能正是由此导"
+"致的。\n"
#: src/enquiry.c:185
msgid "<unknown>"
@@ -2706,17 +2640,17 @@ msgid "error: PATH is not set."
msgstr "错误：没有设置 PATH 环境变量。"
#: src/help.c:128
-#, fuzzy, c-format
+#, c-format
msgid "'%s' not found in PATH or not executable."
-msgstr "在 PATH 环境变量中找不到“%s”。"
+msgstr "在 PATH 环境变量中找不到 %s 或没有可执行权限。"
#: src/help.c:136
-#, fuzzy, c-format
+#, c-format
msgid ""
"%d expected program(s) not found in PATH or not executable.\n"
"NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
msgstr ""
-"共有 %d 个程序没在 PATH 中找到。\n"
+"共有 %d 个程序没在 PATH 中找到或没有可执行权限。\n"
"提示：root 的 PATH 环境变量通常应当包含 /usr/local/sbin、/usr/sbin 和 /sbin"
#: src/help.c:184
@@ -2851,7 +2785,7 @@ msgstr ""
#: src/main.c:109 src/querycmd.c:618 src/trigcmd.c:79 dpkg-deb/main.c:87
#: dpkg-split/main.c:76
-#, fuzzy, c-format
+#, c-format
msgid ""
" -h|--help Show this help message.\n"
" --version Show the version.\n"
@@ -2859,7 +2793,6 @@ msgid ""
msgstr ""
" -h|--help 显示本帮助信息。\n"
" --version 显示版本信息。\n"
-" --license | --licence 显示版权和许可证条文。\n"
"\n"
#: src/main.c:114
@@ -2887,39 +2820,7 @@ msgstr ""
"\n"
#: src/main.c:124
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| " --admindir=<directory> Use <directory> instead of %s.\n"
-#| " --root=<directory> Install on a different root directory.\n"
-#| " --instdir=<directory> Change installation dir without changing "
-#| "admin dir.\n"
-#| " -O|--selected-only Skip packages not selected for install/"
-#| "upgrade.\n"
-#| " -E|--skip-same-version Skip packages whose same version is "
-#| "installed.\n"
-#| " -G|--refuse-downgrade Skip packages with earlier version than "
-#| "installed.\n"
-#| " -B|--auto-deconfigure Install even if it would break some other "
-#| "package.\n"
-#| " --[no-]triggers Skip or force consequential trigger "
-#| "processing.\n"
-#| " --no-debsig Do not try to verify package signatures.\n"
-#| " --no-act|--dry-run|--simulate\n"
-#| " Just say what we would do - don't do it.\n"
-#| " -D|--debug=<octal> Enable debugging (see -Dhelp or --"
-#| "debug=help).\n"
-#| " --status-fd <n> Send status change updates to file "
-#| "descriptor <n>.\n"
-#| " --log=<filename> Log status changes and actions to "
-#| "<filename>.\n"
-#| " --ignore-depends=<package>,...\n"
-#| " Ignore dependencies involving <package>.\n"
-#| " --force-... Override problems (see --force-help).\n"
-#| " --no-force-...|--refuse-...\n"
-#| " Stop when problems encountered.\n"
-#| " --abort-after <n> Abort after encountering <n> errors.\n"
-#| "\n"
+#, c-format
msgid ""
"Options:\n"
" --admindir=<directory> Use <directory> instead of %s.\n"
@@ -2974,7 +2875,7 @@ msgstr ""
" --force-... 忽视遇到的问题(参见 --force-help)。\n"
" --no-force-...|--refuse-...\n"
" 当遇到问题时中止运行。\n"
-" --abort-after <n> 遇到<n>个错误后终止。\n"
+" --abort-after <n> 遇到 <n> 个错误后终止。\n"
"\n"
#: src/main.c:150
@@ -3000,7 +2901,6 @@ msgid "Use `dselect' or `aptitude' for user-friendly
package management.\n"
msgstr "“dselect”和“aptitude”提供了更为易用的的软件包管理工具。\n"
#: src/main.c:167
-#, fuzzy
msgid ""
"Type dpkg --help for help about installing and deinstalling packages [*];\n"
"Use `dselect' or `aptitude' for user-friendly package management;\n"
@@ -3016,7 +2916,6 @@ msgstr ""
"输入 dpkg -Dhelp 可看到 dpkg 除错标志的值的列表；\n"
"输入 dpkg --force-help 可获得所有强制操作选项的列表；\n"
"输入 dpkg-deb --help 可获得有关操作 *.deb 文件的帮助；\n"
-"输入 dpkg --license 可阅读版权许可证和无担保的说明 (GNU GPL) [*]。\n"
"\n"
"带有 [*] 的选项将会输出较大篇幅的文字 - 可使用管道将其输出连接"
"到“less”或“more”！"
@@ -3095,51 +2994,10 @@ msgstr "<包状态和进度文件描述符>"
#: src/main.c:386
#, c-format
msgid "error executing hook '%s', exit code %d"
-msgstr ""
+msgstr "执行钩子 %s 出错，退出状态书为 %d"
#: src/main.c:400
-#, fuzzy, c-format
-#| msgid ""
-#| "%s forcing options - control behaviour when problems found:\n"
-#| " warn but continue: --force-<thing>,<thing>,...\n"
-#| " stop with error: --refuse-<thing>,<thing>,... | --no-force-"
-#| "<thing>,...\n"
-#| " Forcing things:\n"
-#| " all [!] Set all force options\n"
-#| " downgrade [*] Replace a package with a lower version\n"
-#| " configure-any Configure any package which may help this one\n"
-#| " hold Process incidental packages even when on hold\n"
-#| " bad-path PATH is missing important programs, problems "
-#| "likely\n"
-#| " not-root Try to (de)install things even when not root\n"
-#| " overwrite Overwrite a file from one package with another\n"
-#| " overwrite-diverted Overwrite a diverted file with an undiverted "
-#| "version\n"
-#| " bad-verify Install a package even if it fails authenticity "
-#| "check\n"
-#| " depends-version [!] Turn dependency version problems into warnings\n"
-#| " depends [!] Turn all dependency problems into warnings\n"
-#| " confnew [!] Always use the new config files, don't prompt\n"
-#| " confold [!] Always use the old config files, don't prompt\n"
-#| " confdef [!] Use the default option for new config files if "
-#| "one\n"
-#| " is available, don't prompt. If no default can be "
-#| "found,\n"
-#| " you will be prompted unless one of the confold "
-#| "or\n"
-#| " confnew options is also given\n"
-#| " confmiss [!] Always install missing config files\n"
-#| " breaks [!] Install even if it would break another package\n"
-#| " conflicts [!] Allow installation of conflicting packages\n"
-#| " architecture [!] Process even packages with wrong architecture\n"
-#| " overwrite-dir [!] Overwrite one package's directory with another's "
-#| "file\n"
-#| " remove-reinstreq [!] Remove packages which require installation\n"
-#| " remove-essential [!] Remove an essential package\n"
-#| "\n"
-#| "WARNING - use of options marked [!] can seriously damage your "
-#| "installation.\n"
-#| "Forcing options marked [*] are enabled by default.\n"
+#, c-format
msgid ""
"%s forcing options - control behaviour when problems found:\n"
" warn but continue: --force-<thing>,<thing>,...\n"
@@ -3203,6 +3061,8 @@ msgstr ""
" 若是没有，同时也没有使用 confold 或 confnew \n"
" 选项的话，将会询问您，并由您作出选择\n"
" confmiss [!] 总是安装缺失的配置文件\n"
+" confask [!] 没有新版本时询问替换配置文件\n"
+" breaks [!] 即使损坏其他软件包也继续安装\n"
" conflicts [!] 让相互冲突的软件包也得以安装\n"
" architecture [!] 即使软件包所属的体系架构与环境不符，它也将被处理\n"
" overwrite-dir [!] 用来自一个软件包的文件覆盖原本属于另一软件包的目录\n"
@@ -3348,7 +3208,7 @@ msgstr "%s (%s)提供 %s。\n"
#: src/packages.c:471
#, c-format
msgid " Version of %s to be configured is %s.\n"
-msgstr "将被配置的 %s 的版本为 %s。\n"
+msgstr " 将被配置的 %s 的版本为 %s。\n"
#: src/packages.c:572
msgid " depends on "
@@ -3361,7 +3221,7 @@ msgstr "；然而：\n"
#: src/processarc.c:74
#, c-format
msgid ".../%s"
-msgstr ""
+msgstr ".../%s"
#: src/processarc.c:132
msgid "cannot access archive"
@@ -3411,9 +3271,8 @@ msgid "passed\n"
msgstr "验证通过\n"
#: src/processarc.c:200
-#, fuzzy
msgid "unable to create temporary directory"
-msgstr "生成临时目录的目录名失败"
+msgstr "无法创建临时目录"
#: src/processarc.c:227
msgid "failed to exec dpkg-deb to extract control information"
@@ -3600,7 +3459,6 @@ msgid "unable to delete disappearing control info file
`%.250s'"
msgstr "无法删除已经消失了的控制信息文件“%.250s”"
#: src/querycmd.c:112
-#, fuzzy
msgid ""
"Desired=Unknown/Install/Remove/Purge/Hold\n"
"| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-"
@@ -3608,9 +3466,9 @@ msgid ""
"|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)\n"
msgstr ""
"期望状态=未知(u)/安装(i)/删除(r)/清除(p)/保持(h)\n"
-"| 当前状态=未(n)/已安装(i)/仅存配置(c)/仅解压缩(U)/配置失败(F)/不完全安装(H)/"
+"| 状态=未安装(n)/已安装(i)/仅存配置(c)/仅解压缩(U)/配置失败(F)/不完全安装(H)/"
"触发器等待(W)/触发器未决(T)\n"
-"|/ 错误?=(无)/保持(H)/须重装(R)/两者兼有(X) (状态，错误：大写=故障)\n"
+"|/ 错误?=(无)/须重装(R) (状态，错误：大写=故障)\n"
#: src/querycmd.c:116
msgid "Name"
@@ -3622,7 +3480,7 @@ msgstr "版本"
#: src/querycmd.c:116
msgid "Description"
-msgstr "简介"
+msgstr "描述"
#: src/querycmd.c:181 src/querycmd.c:448 src/select.c:73
#, c-format
@@ -3702,9 +3560,9 @@ msgstr ""
"还可以通过 dpkg --contents (= dpkg-deb --contents) 来列出它们的内容。\n"
#: src/querycmd.c:557
-#, fuzzy, c-format
+#, c-format
msgid "--%s takes at most two arguments"
-msgstr "--build 至多可有两个参数"
+msgstr "--%s 至多可有两个参数"
#: src/querycmd.c:565
#, c-format
@@ -3712,9 +3570,9 @@ msgid "control file contains %c"
msgstr "主控文件包含 %c"
#: src/querycmd.c:587
-#, fuzzy, c-format
+#, c-format
msgid "Debian %s package management program query tool version %s.\n"
-msgstr "Debian %s 软件包管理程序 %s 版。\n"
+msgstr "Debian %s 软件包管理程序查询工具 %s 版。\n"
#: src/querycmd.c:606
#, c-format
@@ -4082,8 +3940,7 @@ msgid "unexpected end of line in statoverride file"
msgstr "statoverride 文件有非预期的行结束符"
#: src/statdb.c:215
-#, fuzzy, c-format
-#| msgid "multiple statusoverides present for file '%.250s'"
+#, c-format
msgid "multiple statusoverrides present for file '%.250s'"
msgstr "存在多个 statoverride 用于文件 “%.250s”"
@@ -4092,9 +3949,9 @@ msgid "Type dpkg-trigger --help for help about this
utility."
msgstr "输入 dpkg-trigger --help 以获取此功能的帮助信息。"
#: src/trigcmd.c:53
-#, fuzzy, c-format
+#, c-format
msgid "Debian %s package trigger utility version %s.\n"
-msgstr "”Debian %s 软件包触发器功能。\n"
+msgstr "”Debian %s 软件包触发器工具 %s 版。\n"
#: src/trigcmd.c:69
#, c-format
@@ -4236,9 +4093,9 @@ msgid "file name '%.50s...' is too long"
msgstr "文件名“%.50s...”太长了"
#: dpkg-deb/build.c:165
-#, fuzzy, c-format
+#, c-format
msgid "unable to stat file name '%.250s'"
-msgstr "无法打开原始文件“%.250s”"
+msgstr "无法 stat 文件名 %.250s"
#: dpkg-deb/build.c:229 utils/update-alternatives.c:2099
#: utils/update-alternatives.c:2106
@@ -4546,10 +4403,9 @@ msgid "archive has malformatted control length `%s'"
msgstr "压缩文件中的控制信息长度 “%s” 格式有误"
#: dpkg-deb/extract.c:233
-#, fuzzy, c-format
-#| msgid "skipped member data from %s"
+#, c-format
msgid "skipped control area from %s"
-msgstr "忽略了 %s 中的成员数据"
+msgstr "忽略了 %s 中的控制区域"
#: dpkg-deb/extract.c:237
#, c-format
@@ -4635,9 +4491,8 @@ msgid "failed to chdir to `/' for cleanup"
msgstr "进行清理工作时，chdir 到“/”目录失败"
#: dpkg-deb/info.c:79
-#, fuzzy
msgid "failed to create temporary directory"
-msgstr "生成临时目录的目录名失败"
+msgstr "创建临时目录失败"
#: dpkg-deb/info.c:106
msgid "info_spew"
@@ -4762,7 +4617,7 @@ msgstr ""
"\n"
#: dpkg-deb/main.c:98
-#, fuzzy, c-format
+#, c-format
msgid ""
"Options:\n"
" --showformat=<format> Use alternative format for --show.\n"
@@ -4811,14 +4666,14 @@ msgstr ""
"输入 dpkg --help 可获得有关安装和卸载软件包的帮助。"
#: dpkg-deb/main.c:151
-#, fuzzy, c-format
+#, c-format
msgid "invalid integer for -%c: '%.250s'"
-msgstr "--%s 有一个无效的数字参数：“%.250s”"
+msgstr "无效的整型参数 -%c：%.250s"
#: dpkg-deb/main.c:154
-#, fuzzy, c-format
+#, c-format
msgid "invalid compression level for -%c: %ld'"
-msgstr "--%s 有一个无效的数字参数：“%.250s”"
+msgstr "无效的压缩等级 -%c：%ld”"
#: dpkg-deb/main.c:208
#, c-format
@@ -5212,14 +5067,12 @@ msgid "Deleted %s.\n"
msgstr "已将 %s 删除。\n"
#: dpkg-split/split.c:68
-#, fuzzy
-#| msgid "failed to exec dpkg-deb to extract control information"
msgid "failed to exec dpkg-deb to extract field value"
-msgstr "无法 exec dpkg-deb，通过它来解压缩控制信息"
+msgstr "无法执行 dpkg-deb 来释放域值"
#: dpkg-split/split.c:74 dpkg-split/split.c:79
msgid "dpkg-deb field extraction"
-msgstr ""
+msgstr "dpkg-deb 域释放"
#: dpkg-split/split.c:129
#, c-format
@@ -5236,9 +5089,9 @@ msgid "source file `%.250s' not a plain file"
msgstr "原始文件“%.250s”不是普通文件"
#: dpkg-split/split.c:201
-#, fuzzy, c-format
+#, c-format
msgid "unable to open file '%s'"
-msgstr "无法打开原始文件“%.250s”"
+msgstr "无法打开文件 %s"
#: dpkg-split/split.c:252
msgid "--split needs a source filename argument"
@@ -5249,60 +5102,18 @@ msgid "--split takes at most a source filename and
destination prefix"
msgstr "--split 需要至多一个原始文件，以及目标文件的文件名前缀作为参数"
#: utils/update-alternatives.c:84
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Copyright (C) 1995 Ian Jackson.\n"
-#| "Copyright (C) 2000,2001 Wichert Akkerman."
+#, c-format
msgid ""
"Copyright (C) 1995 Ian Jackson.\n"
"Copyright (C) 2000-2002 Wichert Akkerman.\n"
"Copyright (C) 2009-2010 Raphael Hertzog.\n"
msgstr ""
-"\n"
-"版权所有 (C) 1995 Ian Jackson。\n"
-"版权所有 (C) 2000,2001 Wichert Akkerman。"
+"版权所有 (C) 1995 Ian Jackson\n"
+"版权所有 (C) 2000,2001 Wichert Akkerman\n"
+"版权所有 (C) 2009-2010 Raphael Hertzog\n"
#: utils/update-alternatives.c:97
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [<option> ...] <command>\n"
-#| "\n"
-#| "Commands:\n"
-#| " --install <link> <name> <path> <priority>\n"
-#| " [--slave <link> <name> <path>] ...\n"
-#| " add a group of alternatives to the system.\n"
-#| " --remove <name> <path> remove <path> from the <name> group "
-#| "alternative.\n"
-#| " --remove-all <name> remove <name> group from the alternatives "
-#| "system.\n"
-#| " --auto <name> switch the master link <name> to automatic "
-#| "mode.\n"
-#| " --display <name> display information about the <name> group.\n"
-#| " --list <name> display all targets of the <name> group.\n"
-#| " --config <name> show alternatives for the <name> group and ask "
-#| "the\n"
-#| " user to select which one to use.\n"
-#| " --set <name> <path> set <path> as alternative for <name>.\n"
-#| " --all call --config on all alternatives.\n"
-#| "\n"
-#| "<link> is the symlink pointing to %s/<name>.\n"
-#| " (e.g. /usr/bin/pager)\n"
-#| "<name> is the master name for this link group.\n"
-#| " (e.g. pager)\n"
-#| "<path> is the location of one of the alternative target files.\n"
-#| " (e.g. /usr/bin/less)\n"
-#| "<priority> is an integer; options with higher numbers have higher "
-#| "priority in\n"
-#| " automatic mode.\n"
-#| "\n"
-#| "Options:\n"
-#| " --altdir <directory> change the alternatives directory.\n"
-#| " --admindir <directory> change the administrative directory.\n"
-#| " --verbose verbose operation, more output.\n"
-#| " --quiet quiet operation, minimal output.\n"
-#| " --help show this help message.\n"
-#| " --version show the version.\n"
+#, c-format
msgid ""
"Usage: %s [<option> ...] <command>\n"
"\n"
@@ -5349,22 +5160,22 @@ msgstr ""
"命令：\n"
" --install <链接> <名称> <路径> <优先级>\n"
" [--slave <链接> <名称> <路径>] ...\n"
-" 在系统中加入一组替换项。\n"
+" 在系统中加入一组候选项。\n"
" --remove <名称> <路径> 从 <名称> 替换组中去除 <路径> 项。\n"
" --remove-all <名称> 从替换系统中删除 <名称> 替换组。\n"
" --auto <名称> 将 <名称> 的主链接切换到自动模式。\n"
" --display <名称> 显示关于 <名称> 替换组的信息。\n"
-" --list <名称> 列出 <名称> 替换组中所有的可用替换项。\n"
+" --list <名称> 列出 <名称> 替换组中所有的可用候选项。\n"
" --config <名称> 列出 <名称> 替换组中的可选项，并就使用其中\n"
" 哪一个，征询用户的意见。\n"
-" --set <名称> <路径> 将 <路径> 设置为 <名称> 的替换项。\n"
+" --set <名称> <路径> 将 <路径> 设置为 <名称> 的候选项。\n"
" --all 对所有可选项一一调用 --config 命令。\n"
"\n"
"<链接> 是指向 %s/<名称> 的符号链接。\n"
" (如 /usr/bin/pager)\n"
"<名称> 是该链接替换组的主控名。\n"
" (如 pager)\n"
-"<路径> 是替换项目标文件的位置。\n"
+"<路径> 是候选项目标文件的位置。\n"
" (如 /usr/bin/less)\n"
"<优先级> 是一个整数，在自动模式下，这个数字越高的选项，其优先级也就越高。\n"
"\n"
@@ -5377,18 +5188,15 @@ msgstr ""
" --version 显示版本信息。\n"
#: utils/update-alternatives.c:140
-#, fuzzy
-#| msgid "Error"
msgid "error"
msgstr "错误"
#: utils/update-alternatives.c:270 utils/update-alternatives.c:594
#: utils/update-alternatives.c:1112 utils/update-alternatives.c:1319
#: utils/update-alternatives.c:1568
-#, fuzzy, c-format
-#| msgid "cannot stat old name `%s': %s"
+#, c-format
msgid "cannot stat %s: %s"
-msgstr "无法取得旧名称 “%s” 的信息：%s"
+msgstr "无法 stat %s：%s"
#: utils/update-alternatives.c:281
#, c-format
@@ -5396,33 +5204,29 @@ msgid "readlink(%s) failed: %s"
msgstr "readlink(%s) 失败：%s"
#: utils/update-alternatives.c:307
-#, fuzzy, c-format
-#| msgid "two commands specified: %s and --%s"
+#, c-format
msgid "two commands specified: --%s and --%s"
-msgstr "指定了两个命令：%s 和 --%s"
+msgstr "指定了两个命令：--%s 和 --%s"
#: utils/update-alternatives.c:321
-#, fuzzy, c-format
-#| msgid "%s: can't open %s: %s"
+#, c-format
msgid "cannot append to %s: %s"
-msgstr "%s：无法打开 %s：%s"
+msgstr "无法追加至 %s：%s"
#: utils/update-alternatives.c:358
-#, fuzzy, c-format
-#| msgid "readlink(%s) failed: %s"
+#, c-format
msgid "scan of %s failed: %s"
-msgstr "readlink(%s) 失败：%s"
+msgstr "扫描 %s 失败：%s"
#: utils/update-alternatives.c:383
-#, fuzzy, c-format
-#| msgid "failed to exec %s"
+#, c-format
msgid "failed to execute %s: %s"
-msgstr "执行 %s 失败"
+msgstr "执行 %s 失败：%s"
#: utils/update-alternatives.c:464
#, c-format
msgid "unable to make %s a symlink to %s: %s"
-msgstr "无法创建 %s 为 %s 的符号链接(symlink)：%s"
+msgstr "无法创建 %s 为 %s 的符号链接：%s"
#: utils/update-alternatives.c:472
#, c-format
@@ -5435,10 +5239,9 @@ msgid "unable to remove %s: %s"
msgstr "无法移除 %s：%s"
#: utils/update-alternatives.c:998
-#, fuzzy, c-format
-#| msgid "unexpected end of file in %s while trying to read %s"
+#, c-format
msgid "unexpected end of file while trying to read %s"
-msgstr "在读取 %2$s 时在 %1$s 中遇到非预期的文件结束符"
+msgstr "在读取 %s 时遇到非预期的文件结束符"
#: utils/update-alternatives.c:1000 utils/update-alternatives.c:1856
#, c-format
@@ -5446,10 +5249,9 @@ msgid "while reading %s: %s"
msgstr "当读取 %s 时：%s"
#: utils/update-alternatives.c:1006
-#, fuzzy, c-format
-#| msgid "unexpected end of file in %s while trying to read %s"
+#, c-format
msgid "line not terminated while trying to read %s"
-msgstr "在读取 %2$s 时在 %1$s 中遇到非预期的文件结束符"
+msgstr "尝试读取 %s 时行未结束"
#: utils/update-alternatives.c:1027
#, c-format
@@ -5503,7 +5305,7 @@ msgstr "重复路径 %s"
msgid ""
"alternative %s (part of link group %s) doesn't exist. Removing from list of "
"alternatives."
-msgstr "替换项 %s(链接组 %s 的一部分)不存在。从替换项列表中移除。"
+msgstr "候选项 %s(链接组 %s 的一部分)不存在。从候选项列表中移除。"
#: utils/update-alternatives.c:1120 utils/update-alternatives.c:1131
msgid "priority"
@@ -5519,10 +5321,9 @@ msgid "priority of %s: %s"
msgstr "%s 的优先级：%s"
#: utils/update-alternatives.c:1175
-#, fuzzy, c-format
-#| msgid "unable to create %s: %s"
+#, c-format
msgid "unable to stat %s: %s"
-msgstr "无法创建 %s：%s"
+msgstr "无法 stat %s：%s"
#: utils/update-alternatives.c:1185
#, c-format
@@ -5538,9 +5339,8 @@ msgid "invalid status"
msgstr "无效状态"
#: utils/update-alternatives.c:1196
-#, fuzzy
msgid "master link"
-msgstr "主要文件"
+msgstr "主链接"
#: utils/update-alternatives.c:1206 utils/update-alternatives.c:1292
#, c-format
@@ -5553,10 +5353,9 @@ msgid "discarding obsolete slave link %s (%s)."
msgstr "舍弃废弃的次要链接 %s(%s)。"
#: utils/update-alternatives.c:1261
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
+#, c-format
msgid "cannot write %s: %s"
-msgstr "无法写进 %s：%s"
+msgstr "无法写入 %s：%s"
#: utils/update-alternatives.c:1384 utils/update-alternatives.c:1448
#: utils/update-alternatives.c:2406
@@ -5569,28 +5368,26 @@ msgid "manual mode"
msgstr "手动模式"
#: utils/update-alternatives.c:1387
-#, fuzzy, c-format
+#, c-format
msgid " link currently points to %s"
msgstr " 链接目前指向 %s"
#: utils/update-alternatives.c:1390
-#, fuzzy
msgid " link currently absent"
msgstr " 链接目前不存在"
#: utils/update-alternatives.c:1394
-#, fuzzy, c-format
-#| msgid "%s - priority %s"
+#, c-format
msgid "%s - priority %d"
-msgstr "%s - 优先级 %s"
+msgstr "%s - 优先级 %d"
#: utils/update-alternatives.c:1397
-#, fuzzy, c-format
+#, c-format
msgid " slave %s: %s"
-msgstr " slave %s：%s"
+msgstr " slave %s：%s"
#: utils/update-alternatives.c:1404
-#, fuzzy, c-format
+#, c-format
msgid "Current 'best' version is '%s'."
msgstr "目前“最佳”的版本为 %s。"
@@ -5599,10 +5396,9 @@ msgid "No versions available."
msgstr "无适用版本。"
#: utils/update-alternatives.c:1432
-#, fuzzy, c-format
-#| msgid "There are %s choices for the alternative %s (providing %s)."
+#, c-format
msgid "There are %d choices for the alternative %s (providing %s)."
-msgstr "有 %s 个选项可用于替换项 %s (提供 %s)。"
+msgstr "有 %d 个候选项可用于替换 %s (提供 %s)。"
#: utils/update-alternatives.c:1439
msgid "Selection"
@@ -5633,7 +5429,7 @@ msgstr "未将 %s 替换为链接。"
#: utils/update-alternatives.c:1595
#, c-format
msgid "can't install unknown choice %s"
-msgstr ""
+msgstr "无法安装未知的选择 %s"
#: utils/update-alternatives.c:1613
#, c-format
@@ -5650,24 +5446,23 @@ msgstr "调用 %s。"
#: utils/update-alternatives.c:1833
#, c-format
msgid "Alternative %s unchanged because choice %s is not available."
-msgstr "替换项 %s 未改变，因为选项 %s 不可用。"
+msgstr "候选项 %s 未改变，因为选项 %s 不可用。"
#: utils/update-alternatives.c:1837
#, c-format
msgid "Skip unknown alternative %s."
-msgstr "跳过位置替换项 %s。"
+msgstr "跳过位置候选项 %s。"
#: utils/update-alternatives.c:1862
-#, fuzzy, c-format
-#| msgid "unexpected end of file in %s while trying to read %s"
+#, c-format
msgid "line too long or not terminated while trying to read %s"
-msgstr "在读取 %2$s 时在 %1$s 中遇到非预期的文件结束符"
+msgstr "尝试读取 %s 时行过长或没有结束"
#: utils/update-alternatives.c:1875 utils/update-alternatives.c:1888
#: utils/update-alternatives.c:1898
#, c-format
msgid "Skip invalid line: %s"
-msgstr ""
+msgstr "跳过无效行：%s"
#: utils/update-alternatives.c:1917
#, c-format
@@ -5745,10 +5540,6 @@ msgid "unknown option `%s'"
msgstr "未知选项 “%s”"
#: utils/update-alternatives.c:2123
-#, fuzzy
-#| msgid ""
-#| "need --display, --query, --list, --get-selections, --config,--set, --set-"
-#| "selections, --install, --remove, --all, --remove-all or --auto"
msgid ""
"need --display, --query, --list, --get-selections, --config, --set, --set-"
"selections, --install, --remove, --all, --remove-all or --auto"
@@ -5764,7 +5555,7 @@ msgstr "这是 %s 的一个次要项"
#: utils/update-alternatives.c:2168
#, c-format
msgid "alternative %s can't be master: %s"
-msgstr "替换项 %s 不能是主要项：%s"
+msgstr "候选项 %s 不能是主要项：%s"
#: utils/update-alternatives.c:2178 utils/update-alternatives.c:2220
#, c-format
@@ -5793,7 +5584,7 @@ msgstr "替换名称(%s)不可包含“/”和空格。"
#: utils/update-alternatives.c:2208
msgid "it is a master alternative."
-msgstr "这是一个主替换项。"
+msgstr "这是一个主候选项。"
#: utils/update-alternatives.c:2212
#, c-format
@@ -5801,15 +5592,13 @@ msgid "alternative %s can't be slave of %s: %s"
msgstr "替代项 %s 作为 %s 的次要项：%s"
#: utils/update-alternatives.c:2258
-#, fuzzy
-#| msgid "<standard output>"
msgid "<standard input>"
-msgstr "<标准输出>"
+msgstr "<标准输入>"
#: utils/update-alternatives.c:2267 utils/update-alternatives.c:2270
#, c-format
msgid "no alternatives for %s."
-msgstr "无 %s 的替换项。"
+msgstr "无 %s 的候选项。"
#: utils/update-alternatives.c:2296
#, c-format
@@ -5831,7 +5620,7 @@ msgstr "正在设置 %s 的自动选择。"
#: utils/update-alternatives.c:2318
#, c-format
msgid "alternative %s for %s not registered, not setting."
-msgstr "%2$s 的替换项 %1$s 没有注册，不予设置。"
+msgstr "%2$s 的候选项 %1$s 没有注册，不予设置。"
#: utils/update-alternatives.c:2326
#, c-format
@@ -5845,12 +5634,12 @@ msgstr "无需配置。"
#: utils/update-alternatives.c:2336
#, c-format
msgid "There is only one alternative in link group %s: %s"
-msgstr "链接组 %s 中只有一个替换项：%s"
+msgstr "链接组 %s 中只有一个候选项：%s"
#: utils/update-alternatives.c:2347
#, c-format
msgid "alternative %s for %s not registered, not removing."
-msgstr "%2$s 的替换项 %1$s 没有注册，不予移除。"
+msgstr "%2$s 的候选项 %1$s 没有注册，不予移除。"
#: utils/update-alternatives.c:2355
#, c-format
@@ -5873,16 +5662,15 @@ msgid "using %s to provide %s (%s) in %s."
msgstr "使用 %s 来提供 %s (%s)，于 %s 中。"
#: utils/update-alternatives.c:2412
-#, fuzzy, c-format
-#| msgid "There is only one alternative in link group %s: %s"
+#, c-format
msgid ""
"forcing reinstallation of alternative %s because link group %s is broken."
-msgstr "链接组 %s 中只有一个替换项：%s"
+msgstr "链接组 %2$s 已损坏，故强制重新安装候选项 %1$ss"
#: utils/update-alternatives.c:2419
#, c-format
msgid "current alternative %s is unknown, switching to %s for link group %s."
-msgstr ""
+msgstr "当前候选项 %1$s 未知，为链接组 %3$s 切换至 %2$s"
#~ msgid "cat (data)"
#~ msgstr "cat (数据)"
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
