urpmi translation.

1 files changed, 202 insertions, 356 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f7502494..7ab3da50 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
-"PO-Revision-Date: 2006-08-10 22:36+0800\n"
+"POT-Creation-Date: 2007-02-23 19:44+0100\n"
+"PO-Revision-Date: 2007-02-25 18:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
 "org>\n"
@@ -31,7 +31,7 @@ msgstr "RPM 安装"
 #: ../gurpmi:44
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
-msgstr "错误：找不到文件 %s，将取消操作"
+msgstr "错误: 找不到文件 %s，将取消操作"
 
 #: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
 #, c-format
@@ -187,16 +187,16 @@ msgstr ""
 "仍然继续安装吗?"
 
 #: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
-msgstr "为了满足依赖关系，将安装下列软件包"
+msgstr "为了满足依赖关系，将安装下列软件包:"
 
 #: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "为了满足依赖关系，将安装下列软件包"
+msgstr "为了满足依赖关系，将安装下列软件包:"
 
 #: ../gurpmi2:219 ../urpmi:583
 #, c-format
@@ -249,7 +249,7 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:741
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
@@ -290,7 +290,7 @@ msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
-"用法：%s [选项]\n"
+"用法: %s [选项]\n"
 "[选项]的格式为\n"
 
 #: ../rpm-find-leaves:16
@@ -309,9 +309,9 @@ msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [组]        - 限制结果为给定组。\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy, c-format
+#, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
-msgstr "  -g             - 打印组名。\n"
+msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 
 #: ../rpm-find-leaves:20
 #, c-format
@@ -392,12 +392,12 @@ msgstr "运行于限制模式运行时，禁止执行此操作"
 #: ../urpm/args.pm:109 ../urpm/args.pm:118
 #, c-format
 msgid "bad proxy declaration on command line\n"
-msgstr "命令的代理声明无效\n"
+msgstr "命令行声明的代理服务器无效\n"
 
 #: ../urpm/args.pm:133
-#, fuzzy, c-format
+#, c-format
 msgid "chroot directory doesn't exist"
-msgstr "环境目录 %s 不存在"
+msgstr "chroot 目录不存在"
 
 #: ../urpm/args.pm:242
 #, c-format
@@ -412,12 +412,12 @@ msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 #: ../urpm/args.pm:426
 #, c-format
 msgid "Can't use %s without %s"
-msgstr ""
+msgstr "没有 %2$s 无法使用 %1$s"
 
 #: ../urpm/args.pm:429
 #, c-format
 msgid "Can't use %s with %s"
-msgstr ""
+msgstr "无法和 %2$s 一起使用 %1$s"
 
 #: ../urpm/args.pm:443
 #, c-format
@@ -435,9 +435,9 @@ msgid "Copying failed"
 msgstr "复制失败"
 
 #: ../urpm/cfg.pm:81
-#, fuzzy, c-format
+#, c-format
 msgid "syntax error in config file at line %s"
-msgstr "无法写入配置文件[%s]"
+msgstr "配置文件第 %s 行语法有错"
 
 #: ../urpm/cfg.pm:112
 #, c-format
@@ -472,7 +472,7 @@ msgstr "密码:"
 #: ../urpm/download.pm:185
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
+msgstr "未知的 webfetch“%s”!!!\n"
 
 #: ../urpm/download.pm:194
 #, c-format
@@ -482,7 +482,7 @@ msgstr "%s 失败: 退出信号为 %d"
 #: ../urpm/download.pm:195
 #, c-format
 msgid "%s failed: exited with %d"
-msgstr ""
+msgstr "%s 失败: 退出代码为 %d"
 
 #: ../urpm/download.pm:219
 #, c-format
@@ -495,54 +495,54 @@ msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
 #: ../urpm/download.pm:289
-#, fuzzy, c-format
+#, c-format
 msgid "curl is missing\n"
-msgstr "原因是丢失 %s"
+msgstr "缺少 curl\n"
 
 #: ../urpm/download.pm:411
 #, c-format
 msgid "curl failed: download canceled\n"
-msgstr ""
+msgstr "curl 失败: 下载已取消\n"
 
 #: ../urpm/download.pm:450
 #, c-format
 msgid "rsync is missing\n"
-msgstr ""
+msgstr "缺少 rsync\n"
 
 #: ../urpm/download.pm:511
 #, c-format
 msgid "ssh is missing\n"
-msgstr ""
+msgstr "缺少 ssh\n"
 
 #: ../urpm/download.pm:530
 #, c-format
 msgid "prozilla is missing\n"
-msgstr ""
+msgstr "缺少 prozilla\n"
 
 #: ../urpm/download.pm:546
 #, c-format
 msgid "Couldn't execute prozilla\n"
-msgstr ""
+msgstr "无法执行 prozilla\n"
 
 #: ../urpm/download.pm:593
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
+msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
 #: ../urpm/download.pm:595
 #, c-format
 msgid "        %s%% completed, speed = %s"
-msgstr ""
+msgstr "        %s%% 已完成，速度为 %s"
 
 #: ../urpm/download.pm:651
-#, fuzzy, c-format
+#, c-format
 msgid "retrieving %s"
-msgstr "正在删除 %s"
+msgstr "正在获取 %s"
 
 #: ../urpm/download.pm:655
-#, fuzzy, c-format
+#, c-format
 msgid "retrieved %s"
-msgstr "...获取失败: %s"
+msgstr "已获取 %s"
 
 #: ../urpm/download.pm:668
 #, c-format
@@ -565,9 +565,9 @@ msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
 #: ../urpm/get_pkgs.pm:41
-#, fuzzy, c-format
+#, c-format
 msgid "cleaning %s and %s"
-msgstr "正在 %2$s 上安装 %1$s..."
+msgstr "清除 %s 和 %s"
 
 #: ../urpm/get_pkgs.pm:56 ../urpm/get_pkgs.pm:79 ../urpm/get_pkgs.pm:110
 #, c-format
@@ -660,9 +660,9 @@ msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
 #: ../urpm/install.pm:180
-#, fuzzy, c-format
+#, c-format
 msgid "removing installed rpms (%s) from %s"
-msgstr "正在从 %2$s 安装 %1$s"
+msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
 #: ../urpm/install.pm:186
 #, c-format
@@ -670,49 +670,49 @@ msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
 #: ../urpm/ldap.pm:71
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create ldap cache directory"
-msgstr "无法写入重新打包目录 [%s]\n"
+msgstr "无法创建 ldap 缓存目录"
 
 #: ../urpm/ldap.pm:73
 #, c-format
 msgid "Cannot write cache file for ldap\n"
-msgstr ""
+msgstr "无法写入 ldap 的缓存文件\n"
 
 #: ../urpm/ldap.pm:162
 #, c-format
 msgid "No server defined, missing uri or host"
-msgstr ""
+msgstr "未定义服务器，缺少 uri 或 主机"
 
 #: ../urpm/ldap.pm:163
-#, fuzzy, c-format
+#, c-format
 msgid "No base defined"
-msgstr "未指定软件包"
+msgstr "未定义基础"
 
 #: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
-msgstr ""
+msgstr "无法连接到 ldap uri:"
 
 #: ../urpm/lock.pm:50
-#, fuzzy, c-format
+#, c-format
 msgid "%s database locked"
-msgstr "urpmi 数据库已锁定"
+msgstr "%s 数据库已锁定"
 
 #: ../urpm/md5sum.pm:23
-#, fuzzy, c-format
+#, c-format
 msgid "examining %s file"
-msgstr "正在检查 MD5SUM 文件"
+msgstr "正在检查 %s 文件"
 
 #: ../urpm/md5sum.pm:25
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
+msgstr "警告: %s 的 md5 校验和未在 MD5SUM 文件中找到"
 
 #: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
+msgstr "正在计算已有源 hdlist(或综合文件)[%s]的 md5sum"
 
 #: ../urpm/media.pm:171
 #, c-format
@@ -727,9 +727,9 @@ msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
 #: ../urpm/media.pm:183
-#, fuzzy, c-format
+#, c-format
 msgid "invalid hdlist name"
-msgstr "无效的 rpm 文件名[%s]"
+msgstr "无效的 hdlist 名称"
 
 #: ../urpm/media.pm:190
 #, c-format
@@ -737,14 +737,14 @@ msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
 #: ../urpm/media.pm:203
-#, fuzzy, c-format
+#, c-format
 msgid "\"synthesis\" should not be set (medium \"%s\")"
-msgstr "试图选择不存在的介质“%s”"
+msgstr "不应设置“synthesis”(介质“%s”)"
 
 #: ../urpm/media.pm:206
-#, fuzzy, c-format
+#, c-format
 msgid "\"synthesis\" should be set (medium \"%s\")"
-msgstr "创建介质“%s”的 hdlist 综合文件"
+msgstr "应该设置“synthesis”(介质“%s”)"
 
 #: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
 #, c-format
@@ -752,9 +752,9 @@ msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
 #: ../urpm/media.pm:215
-#, fuzzy, c-format
+#, c-format
 msgid "unable to access list file of \"%s\""
-msgstr "无法处理“%s”的 hdlist 文件"
+msgstr "无法访问“%s”的列表文件"
 
 #: ../urpm/media.pm:229
 #, c-format
@@ -799,7 +799,7 @@ msgstr "无法获取可移动介质“%s”的路径名称"
 #: ../urpm/media.pm:428
 #, c-format
 msgid "wrote %s"
-msgstr ""
+msgstr "写入 %s"
 
 #: ../urpm/media.pm:451
 #, c-format
@@ -817,23 +817,23 @@ msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
 #: ../urpm/media.pm:520
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib or --parallel"
 msgstr ""
-"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
-"parallel 一起使用"
+"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
+"distrib 或 --parallel 一起使用"
 
 #: ../urpm/media.pm:586
-#, fuzzy, c-format
+#, c-format
 msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
-msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
+msgstr "注意: 介质“%s”没有 hdlist，无法返回任何结果"
 
 #: ../urpm/media.pm:596
 #, c-format
 msgid "Search start: %s end: %s"
-msgstr "搜索开始：%s 结束：%s"
+msgstr "搜索开始: %s 结束: %s"
 
 #: ../urpm/media.pm:605 ../urpm/media.pm:1802
 #, c-format
@@ -863,27 +863,27 @@ msgstr "虚拟介质必须是本地的"
 #: ../urpm/media.pm:691
 #, c-format
 msgid "(ignored by default)"
-msgstr ""
+msgstr "(默认忽略)"
 
 #: ../urpm/media.pm:697
-#, fuzzy, c-format
+#, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
-msgstr "正在从介质“%s”读取头"
+msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
 #: ../urpm/media.pm:703
-#, fuzzy, c-format
+#, c-format
 msgid "adding medium \"%s\""
-msgstr "删除介质“%s”"
+msgstr "添加介质“%s”"
 
 #: ../urpm/media.pm:729
-#, fuzzy, c-format
+#, c-format
 msgid "unable to mount the distribution medium"
-msgstr "无法访问介质的首次安装"
+msgstr "无法挂载发行版介质"
 
 #: ../urpm/media.pm:732
-#, fuzzy, c-format
+#, c-format
 msgid "this location doesn't seem to contain any distribution"
-msgstr "此 url 似乎不包含任何发行版"
+msgstr "此位置似乎不包含任何发行版"
 
 #: ../urpm/media.pm:739
 #, c-format
@@ -896,9 +896,9 @@ msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
 #: ../urpm/media.pm:747
-#, fuzzy, c-format
+#, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
+msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
 #: ../urpm/media.pm:826
 #, c-format
@@ -933,17 +933,17 @@ msgstr "重新配置完成"
 #: ../urpm/media.pm:1033
 #, c-format
 msgid "Error generating names file: dependency %d not found"
-msgstr "声称名称文件出错：依赖关系 %d 未找到"
+msgstr "声称名称文件出错: 依赖关系 %d 未找到"
 
 #: ../urpm/media.pm:1037
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
-msgstr "声称名称文件失败：无法写入文件(%s)"
+msgstr "声称名称文件失败: 无法写入文件(%s)"
 
 #: ../urpm/media.pm:1072
-#, fuzzy, c-format
+#, c-format
 msgid "medium \"%s\" is up-to-date"
-msgstr "介质“%s”未选中"
+msgstr "介质“%s”已为最新"
 
 #: ../urpm/media.pm:1092
 #, c-format
@@ -988,9 +988,9 @@ msgid "...copying done"
 msgstr "...复制完成"
 
 #: ../urpm/media.pm:1232
-#, fuzzy, c-format
+#, c-format
 msgid "copying [%s] for medium \"%s\"..."
-msgstr "正在写入介质“%s”的列表文件"
+msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
 #: ../urpm/media.pm:1238
 #, c-format
@@ -1048,9 +1048,9 @@ msgstr ""
 "这可能是因为您在创建介质时是手动装载的目录。"
 
 #: ../urpm/media.pm:1377
-#, fuzzy, c-format
+#, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
-msgstr "介质“%s”未发现 hdlist 文件"
+msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
 #: ../urpm/media.pm:1457
 #, c-format
@@ -1088,9 +1088,9 @@ msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
 #: ../urpm/media.pm:1621 ../urpm/media.pm:1651
-#, fuzzy, c-format
+#, c-format
 msgid "updated medium \"%s\""
-msgstr "已添加介质 %s"
+msgstr "已更新介质“%s”"
 
 #: ../urpm/media.pm:1638
 #, c-format
@@ -1154,9 +1154,9 @@ msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
 #: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
+#, c-format
 msgid "medium \"%s\" is not available"
-msgstr "介质“%s”未选中"
+msgstr "介质“%s”不可用"
 
 #: ../urpm/removable.pm:143
 #, c-format
@@ -1288,9 +1288,9 @@ msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
 #: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
 #: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
-#, fuzzy, c-format
+#, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
+msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
 
 #: ../urpme:52
 #, c-format
@@ -1307,19 +1307,19 @@ msgstr ""
 "                   下安装/卸载 chroot。\n"
 
 #: ../urpme:55 ../urpmi:119 ../urpmq:74
-#, fuzzy, c-format
+#, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
-msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
+msgstr "    --probe-synthesis - 使用综合文件。\n"
 
 #: ../urpme:56 ../urpmi:120 ../urpmq:75
-#, fuzzy, c-format
+#, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
-msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
+msgstr "    --probe-hdlist - 使用 hdlist 文件。\n"
 
 #: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - 详细提示。\n"
+msgstr "  --verbose, -v  - 详细提示。\n"
 
 #: ../urpme:58
 #, c-format
@@ -1356,24 +1356,30 @@ msgstr "不需要删除任何东西。"
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:132
+#: ../urpme:133
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
 
-#: ../urpme:134
-#, fuzzy, c-format
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr "(%d MB)"
+
+#: ../urpme:137
+#, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:156
+#: ../urpme:159
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
@@ -1464,7 +1470,7 @@ msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
 #: ../urpmf:50
 #, c-format
 msgid "Pattern expressions:\n"
-msgstr "模式表达式：\n"
+msgstr "模式表达式: \n"
 
 #: ../urpmf:51
 #, c-format
@@ -1629,7 +1635,7 @@ msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n
 #: ../urpmf:137
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "格式不对：您只能使用一个多值标签"
+msgstr "格式不对: 您只能使用一个多值标签"
 
 #: ../urpmf:186 ../urpmi:254 ../urpmq:136
 #, c-format
@@ -1641,7 +1647,7 @@ msgstr "在 %s 使用指定环境\n"
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
-msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
+msgstr "注意: 由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
 
 #: ../urpmf:227
 #, c-format
@@ -1684,19 +1690,19 @@ msgid ""
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
 #: ../urpmi:93
-#, fuzzy, c-format
+#, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
-msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
+msgstr "  --auto-update  - 更新介质后再升级系统。\n"
 
 #: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
+msgstr "    --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
 #: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
 msgid "    --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
+msgstr "    --force-key    - 强制更新 gpg 密钥。\n"
 
 #: ../urpmi:96
 #, c-format
@@ -1797,9 +1803,9 @@ msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
 #: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
-#, fuzzy, c-format
+#, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --curl         - 用 crul 取远程文件。\n"
+msgstr "  --prizlla      - 用 prozilla 取远程文件。\n"
 
 #: ../urpmi:124
 #, c-format
@@ -1817,9 +1823,9 @@ msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
 #: ../urpmi:127
-#, fuzzy, c-format
+#, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
-msgstr "  --curl-options - 给 curl 传递额外的选项\n"
+msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
 #, c-format
@@ -1942,9 +1948,9 @@ msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
 #: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
-msgstr "  -q             - 安静模式。\n"
+msgstr "  --quiet, -q    - 安静模式。\n"
 
 #: ../urpmi:157
 #, c-format
@@ -1954,14 +1960,14 @@ msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 #: ../urpmi:186
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr ""
+msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
 #: ../urpmi:193
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
-msgstr "出错：要生成错误报告，请在指定命令行参数时多加 --bug。\n"
+msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
 #: ../urpmi:220
 #, c-format
@@ -1991,7 +1997,7 @@ msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
-"错误：%s 似乎是以只读方式挂载的。\n"
+"错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
 #: ../urpmi:362
@@ -2000,26 +2006,26 @@ msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
 #: ../urpmi:437
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s (to upgrade)"
-msgstr "(升级)"
+msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
 #: ../urpmi:439
-#, fuzzy, c-format
+#, c-format
 msgid "%s (to upgrade)"
-msgstr "(升级)"
+msgstr "%s (即将升级)"
 
 #: ../urpmi:441
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s (to install)"
-msgstr "(安装)"
+msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
 #: ../urpmi:443
-#, fuzzy, c-format
+#, c-format
 msgid "%s (to install)"
-msgstr "(安装)"
+msgstr "%s (即将安装)"
 
 #: ../urpmi:450
 #, c-format
@@ -2027,13 +2033,13 @@ msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
 #: ../urpmi:481
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
 "that are older than the installed ones:\n"
 "%s"
 msgstr ""
-"下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
+"下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
 #: ../urpmi:483
@@ -2043,7 +2049,7 @@ msgid ""
 "that are older than the installed ones:\n"
 "%s"
 msgstr ""
-"下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
+"下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
 #: ../urpmi:491 ../urpmi:511
@@ -2061,7 +2067,7 @@ msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
 #: ../urpmi:503
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
@@ -2079,7 +2085,7 @@ msgstr ""
 "%s"
 
 #: ../urpmi:535
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
 "has to be removed for others to be upgraded:\n"
@@ -2099,7 +2105,7 @@ msgstr ""
 "%s\n"
 
 #: ../urpmi:544
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
@@ -2135,16 +2141,11 @@ msgstr ""
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:598
-#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "继续安装 %d 个软件包吗？(%d MB)"
-
-#: ../urpmi:599
-#, fuzzy, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "继续安装 %d 个软件包吗？(%d MB)"
+#: ../urpmi:597
+#, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "继续安装 %d 个软件包吗？"
 
 #: ../urpmi:623
 #, c-format
@@ -2157,7 +2158,7 @@ msgid "Cancel"
 msgstr "取消"
 
 #: ../urpmi:672
-#, fuzzy, c-format
+#, c-format
 msgid "The following package has bad signature"
 msgstr "下列软件包的签名有错误"
 
@@ -2189,7 +2190,7 @@ msgstr "正在安装 %s"
 #: ../urpmi:762
 #, c-format
 msgid "Installation failed:"
-msgstr "安装失败："
+msgstr "安装失败: "
 
 #: ../urpmi:769
 #, c-format
@@ -2203,46 +2204,47 @@ msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
 #: ../urpmi:825
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d 安装交易失败"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d 安装交易失败"
 
-#: ../urpmi:834
+#: ../urpmi:835
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:839
+#: ../urpmi:840
 #, c-format
 msgid "Packages are up to date"
-msgstr ""
+msgstr "软件包已为最新"
 
-#: ../urpmi:847
-#, fuzzy, c-format
+#: ../urpmi:848
+#, c-format
 msgid "Package %s is already installed"
-msgstr "软件包已经安装"
+msgstr "软件包 %s 已经安装"
 
-#: ../urpmi:848
-#, fuzzy, c-format
+#: ../urpmi:849
+#, c-format
 msgid "Packages %s are already installed"
-msgstr "软件包已经安装"
+msgstr "软件包 %s 已经安装"
 
-#: ../urpmi:851
-#, fuzzy, c-format
+#: ../urpmi:852
+#, c-format
 msgid "Package %s can not be installed"
-msgstr "软件包已经安装"
+msgstr "软件包 %s 无法安装"
 
-#: ../urpmi:852
-#, fuzzy, c-format
+#: ../urpmi:853
+#, c-format
 msgid "Packages %s can not be installed"
-msgstr "软件包已经安装"
+msgstr "软件包 %s 无法安装"
 
-#: ../urpmi:871
+#: ../urpmi:872
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
 
 #: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -2254,13 +2256,13 @@ msgid ""
 "\n"
 "and [options] are from\n"
 msgstr ""
-"用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]\n"
+"用法: urpmi.addmedia [选项] <名称> <url>\n"
 "  <url> 为以下之一\n"
-"       [file:/]/<路径> with <hdlist 的相对路径文件名>\n"
-"       ftp://<登录名>:<密码>@<主机>/<路径> with <hdlist 的相对路径文件名>\n"
-"       ftp://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
-"       http://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
-"       removable://<路径> with <hdlist 的相对路径文件名>\n"
+"       [file:/]/<路径>\n"
+"       ftp://<登录名>:<密码>@<主机>/<路径>\n"
+"       ftp://<主机>/<路径>\n"
+"       http://<主机>/<路径>\n"
+"       removable://<路径>\n"
 "\n"
 "而 [options] 可以来自\n"
 
@@ -2270,22 +2272,22 @@ msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质。\n"
 
 #: ../urpmi.addmedia:55
-#, fuzzy, c-format
+#, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
-msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
+msgstr "  --probe-synthesis - 使用综合文件。\n"
 
 #: ../urpmi.addmedia:56 ../urpmi.addmedia:58
-#, fuzzy, c-format
+#, c-format
 msgid "  --probe-hdlist - use hdlist file.\n"
-msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
+msgstr "  --probe-hdlist - 使用 hdlist 文件。\n"
 
 #: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
-msgstr ""
+msgstr "  --probe-rpms   - 使用 rpm 文件(而不是综合文件/hdlist。\n"
 
 #: ../urpmi.addmedia:59
-#, fuzzy, c-format
+#, c-format
 msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
 
@@ -2358,7 +2360,7 @@ msgstr "无法更新介质“%s”\n"
 #: ../urpmi.addmedia:115
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)\n"
-msgstr ""
+msgstr "无效的 <url> (如果是本地目录，必须是绝对路径)\n"
 
 #: ../urpmi.addmedia:118
 #, c-format
@@ -2366,9 +2368,9 @@ msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
 #: ../urpmi.addmedia:121
-#, fuzzy, c-format
+#, c-format
 msgid "creating config file [%s]"
-msgstr "将创建配置文件[%s]"
+msgstr "创建配置文件[%s]"
 
 #: ../urpmi.addmedia:122
 #, c-format
@@ -2397,7 +2399,7 @@ msgstr "<hdlist 相对路径>找不到\n"
 #: ../urpmi.addmedia:169
 #, c-format
 msgid "Can't use %s with remote medium"
-msgstr ""
+msgstr "远程介质无法使用 %s"
 
 #: ../urpmi.addmedia:190
 #, c-format
@@ -2480,8 +2482,9 @@ msgstr "正在清理重新打包目录 [%s]...\n"
 
 #: ../urpmi.recover:72
 #, c-format
-msgid "%d files removed\n"
-msgstr "删除了 %d 个文件\n"
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "删除了 %d 个文件\n"
 
 #: ../urpmi.recover:82
 #, c-format
@@ -2606,10 +2609,11 @@ msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - 不更新，将介质标为启用。\n"
 
 #: ../urpmi.update:47
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
-msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
+msgstr ""
+"  --probe-rpms   - 不使用综合文件或 hdlist 文件，直接使用 rpm 文件\n"
 
 #: ../urpmi.update:48
 #, c-format
@@ -2617,9 +2621,9 @@ msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
 #: ../urpmi.update:50
-#, fuzzy, c-format
+#, c-format
 msgid "  -f             - force updating synthesis/hdlist\n"
-msgstr "  -f             - 强迫生成 hdlist 文件。\n"
+msgstr "  -f             - 强迫更新综合文件/hdlist 文件。\n"
 
 #: ../urpmi.update:71
 #, c-format
@@ -2787,9 +2791,9 @@ msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
 #: ../urpmq:97
-#, fuzzy, c-format
+#, c-format
 msgid "  -m             - equivalent to -du\n"
-msgstr "  -q             - 安静模式。\n"
+msgstr "  -m             - 与 -du 等价。\n"
 
 #: ../urpmq:98
 #, c-format
@@ -2836,23 +2840,23 @@ msgstr "--list-nodes 仅能和 --parallel 一起使用"
 #: ../urpmq:360
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgstr ""
+msgstr "由于介质“%s”没有 hdlist，软件包 %s 只返回部分结果"
 
 #: ../urpmq:361
-#, fuzzy, c-format
+#, c-format
 msgid "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
+msgstr "由于介质“%s”没有 hdlists，软件包 %s 只返回部分结果"
 
 #: ../urpmq:364
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgstr ""
+msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结果"
 
 #: ../urpmq:365
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
+msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结果"
 
 #: ../urpmq:416
 #, c-format
@@ -2864,161 +2868,3 @@ msgstr "没有找到文件列表\n"
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
-#~ msgid "(%d packages, %d MB)"
-#~ msgstr "(%d 个软件包，%d MB)"
-
-#~ msgid "medium \"%s\" is not selected"
-#~ msgstr "介质“%s”未选中"
-
-#~ msgid "Remove %d packages?"
-#~ msgstr "删除 %d 个软件包吗?"
-
-#, fuzzy
-#~ msgid "Proceed with the installation of 1 package? (%2$d MB)"
-#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-#~ msgstr[0] "继续安装 %d 个软件包吗？(%d MB)"
-
-#~ msgid "  -f             - force generation of hdlist files.\n"
-#~ msgstr "  -f             - 强迫生成 hdlist 文件。\n"
-
-#~ msgid ""
-#~ "  -P             - do not search in provides to find package (default).\n"
-#~ msgstr "  -P             - 不搜索提供中的软件包(默认)。\n"
-
-#~ msgid "  -R             - reverse search to what requires package.\n"
-#~ msgstr "  -R             - 逆序搜索需要软件包的软件包。\n"
-
-#~ msgid ""
-#~ "  -RR            - extended reverse search (includes virtual packages).\n"
-#~ msgstr "  -RR            - 扩展逆序搜索(包括虚拟软件包)。\n"
-
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "为了满足依赖性要求，将另外安装以下%d个软件包:\n"
-#~ "%s\n"
-
-#~ msgid "skipping media %s: no hdlist"
-#~ msgstr "跳过介质 %s：无 hdlist"
-
-#~ msgid "mput failed, maybe a node is unreacheable"
-#~ msgstr "mput 失败，可能节点无法连接"
-
-#~ msgid "node %s has an old version of urpme, please upgrade"
-#~ msgstr "节点 %s 的 urpme 版本太旧，请升级"
-
-#~ msgid "rshp failed, maybe a node is unreacheable"
-#~ msgstr "rshp 失败，可能节点无法连接"
-
-#~ msgid "on node %s"
-#~ msgstr "于节点 %s"
-
-#~ msgid "Propagating synthesis to nodes..."
-#~ msgstr "正在将综合文件传播到节点..."
-
-#~ msgid "Resolving dependencies on nodes..."
-#~ msgstr "正在解决节点上的依赖关系..."
-
-#~ msgid "Distributing files to nodes..."
-#~ msgstr "正在将文件分发到节点..."
-
-#~ msgid "Verifying if install is possible on nodes..."
-#~ msgstr "正在验证安装是否可以在节点上进行..."
-
-#~ msgid "Installation failed on node %s"
-#~ msgstr "节点 %s 安装失败"
-
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "正在节点上安装软件包..."
-
-#~ msgid "scp failed on host %s (%d)"
-#~ msgstr "主机 %s scp 失败(%d)"
-
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "正在将综合文件传播到 %s..."
-
-#~ msgid "Resolving dependencies on %s..."
-#~ msgstr "正在解决 %s 上的依赖关系..."
-
-#~ msgid "host %s does not have a good version of urpmi (%d)"
-#~ msgstr "主机 %s 上的 urpmi 版本不对(%d)"
-
-#~ msgid "Distributing files to %s..."
-#~ msgstr "正在将文件分发给 %s..."
-
-#~ msgid "Verifying if install is possible on %s..."
-#~ msgstr "正在验证安装是否可以在 %s 上进行..."
-
-#~ msgid "Performing install on %s..."
-#~ msgstr "正在 %s 上执行安装..."
-
-#~ msgid "Preparing install on %s..."
-#~ msgstr "正在准备在 %s 上安装..."
-
-#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-#~ msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
-
-#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-#~ msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
-
-#~ msgid "`with' missing for network media\n"
-#~ msgstr "“with”找不到网络介质\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "unknown options '%s'\n"
-#~ msgstr ""
-#~ "\n"
-#~ "未知的选项“%s”\n"
-
-#~ msgid "unable to find hdlist file for \"%s\", medium ignored"
-#~ msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
-
-#~ msgid "inconsistent list file for \"%s\", medium ignored"
-#~ msgstr "“%s”的列表文件不连贯，介质被忽略"
-
-#~ msgid "unable to inspect list file for \"%s\", medium ignored"
-#~ msgstr "无法检查“%s”的列表文件，介质被忽略"
-
-#~ msgid "there doesn't seem to be devices in the chroot in \"%s\""
-#~ msgstr "“%s”的 chroot 中似乎没有设备"
-
-#~ msgid "virtual medium \"%s\" is not local, medium ignored"
-#~ msgstr "虚拟介质“%s”不是本地的，介质被忽略"
-
-#~ msgid ""
-#~ "virtual medium \"%s\" should have valid source hdlist or synthesis, "
-#~ "medium ignored"
-#~ msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
-
-#~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
-#~ msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
-
-#~ msgid "retrieval of source hdlist (or synthesis) failed"
-#~ msgstr "获取源 hdlist(或综合文件) 失败"
-
-#~ msgid "file [%s] already used in the same medium \"%s\""
-#~ msgstr "文件[%s]已经在相同的介质“%s”中使用"
-
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "无法写入“%s”的列表文件"
-
-#~ msgid "nothing written in list file for \"%s\""
-#~ msgstr "“%s”的列表文件中没有写入内容"
-
-#~ msgid "found %d headers in cache"
-#~ msgstr "缓存中找到了 %d 个头"
-
-#~ msgid "removing %d obsolete headers in cache"
-#~ msgstr "删除缓存中的 %d 个过时头"
-
-#~ msgid "using process %d for executing transaction"
-#~ msgstr "使用进程 %d 执行交易"
-
-#~ msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
-#~ msgstr "  --norebuild    - 如果 hdlist 不可读的话，不尝试重新创建。\n"
-
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "假定下列软件包名称: %s"