updated po files

1 files changed, 79 insertions, 350 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1c9842c3..f8d37741 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,13 +5,14 @@
 # Jesse Kuang <kjx@mandrakesoft.com>
 # Funda Wang <mandrake@en2china.com>,2002
 # Shiyu Tang <shiyutang@netscape.net>, 2003
+# Funda Wang <mandrake@en2china.com>,2003
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "POT-Creation-Date: 2003-02-21 19:42+0100\n"
-"PO-Revision-Date: 2003-02-10 19:36+0800\n"
-"Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
+"PO-Revision-Date: 2003-02-23 05:26+0800\n"
+"Last-Translator: Funda Wang <mandrake@en2china.com>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=gb2312\n"
@@ -60,12 +61,12 @@ msgstr "yY 是"
 #: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:380 ../urpmi_.c:422
 #: ../urpmi_.c:471
 msgid " (Y/n) "
-msgstr "（是(Y)/否(n)）[是]"
+msgstr "(是(Y)/否(n))[是]"
 
 #: ../_irpm_.c:63
 #, c-format
 msgid "%s: command not found\n"
-msgstr "%s：命令没找到\n"
+msgstr "%s: 命令没找到\n"
 
 #: ../urpm.pm_.c:178
 #, c-format
@@ -79,17 +80,17 @@ msgstr "%s 中定义了未知的协议"
 
 #: ../urpm.pm_.c:210
 msgid "no webfetch (curl or wget currently) found\n"
-msgstr "没有发现下载工具（curl 或 wget）\n"
+msgstr "没有发现下载工具(curl 或 wget)\n"
 
 #: ../urpm.pm_.c:226
 #, c-format
 msgid "unable to handle protocol: %s"
-msgstr "无法处理协议：%s"
+msgstr "无法处理协议: %s"
 
 #: ../urpm.pm_.c:246
-#, fuzzy, c-format
+#, c-format
 msgid "copy failed: %s"
-msgstr "...复制失败"
+msgstr "复制失败: %s"
 
 #: ../urpm.pm_.c:251
 msgid "wget is missing\n"
@@ -98,7 +99,7 @@ msgstr "没有 wget\n"
 #: ../urpm.pm_.c:288
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget 失败：退出代码 %d 或信号 %d\n"
+msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
 
 #: ../urpm.pm_.c:291
 msgid "curl is missing\n"
@@ -107,7 +108,7 @@ msgstr "没有 curl\n"
 #: ../urpm.pm_.c:373
 #, c-format
 msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl 失败：退出代码 %d 或信号 %d\n"
+msgstr "curl 失败: 退出代码 %d 或信号 %d\n"
 
 #: ../urpm.pm_.c:377 ../urpm.pm_.c:419
 msgid "rsync is missing\n"
@@ -116,7 +117,7 @@ msgstr "没有 rsync\n"
 #: ../urpm.pm_.c:416 ../urpm.pm_.c:458
 #, c-format
 msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync 失败：退出代码 %d 或信号 %d\n"
+msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
 
 #: ../urpm.pm_.c:420
 msgid "ssh is missing\n"
@@ -133,9 +134,8 @@ msgid "        %s%% completed, speed = %s"
 msgstr "        已完成 %s%%，速度 = %s"
 
 #: ../urpm.pm_.c:2433 ../urpm.pm_.c:2517
-#, fuzzy
 msgid "unable to open rpmdb"
-msgstr "无法注册 rpm 文件"
+msgstr "无法打开 rpmdb"
 
 #: ../urpm.pm_.c:2440
 #, c-format
@@ -240,7 +240,7 @@ msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 #: ../urpme_.c:64
 #, c-format
 msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme：未知选项“-%s”，请用--help 检查用法\n"
+msgstr "urpme: 未知选项“-%s”，请用--help 检查用法\n"
 
 #: ../urpme_.c:83
 msgid "unknown package"
@@ -253,7 +253,7 @@ msgstr "未知的软件包"
 #: ../urpme_.c:88
 #, c-format
 msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s：%s"
+msgstr "下列软件包里有 %s: %s"
 
 #: ../urpme_.c:93
 #, c-format
@@ -273,7 +273,7 @@ msgstr "检查删除下列软件包"
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
 "MB)"
-msgstr "为满足相关性要求，需要删除下列软件包（%d MB）"
+msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
 #: ../urpme_.c:113
 msgid "Removing failed"
@@ -300,9 +300,8 @@ msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
 #: ../urpmf_.c:33 ../urpmi_.c:74 ../urpmq_.c:42
-#, fuzzy
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - 只使用列出的介质。\n"
+msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
 #: ../urpmf_.c:34 ../urpmq_.c:43
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
@@ -318,9 +317,9 @@ msgid ""
 "command\n"
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --quiet         - 不打印标题名称（如果没有在命令行指定标识符，缺省设置\n"
+"  --quiet         - 不打印标题名称(如果没有在命令行指定标识符，缺省设置\n"
 "就是不打印，\n"
-"与会话方式不相兼容）。\n"
+"与会话方式不相兼容)。\n"
 
 #: ../urpmf_.c:38
 msgid "  --all          - print all tags.\n"
@@ -331,51 +330,50 @@ msgid ""
 "  --name         - print tag name: rpm filename (assumed if no tag given on\n"
 "                   command line but without package name).\n"
 msgstr ""
-"  --name          - 打印名称标识符：rpm 文件名（假设没有在命令行给出标识"
-"符，\n"
-"                   没有软件包名称）。\n"
+"  --name          - 打印名称标识符: rpm 文件名(假设没有在命令行给出标识符，\n"
+"                   没有软件包名称)。\n"
 
 #: ../urpmf_.c:41
 msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - 打印标识符组：分组。\n"
+msgstr "  --group         - 打印标识符组: 分组。\n"
 
 #: ../urpmf_.c:42
 msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - 打印标识符大小：大小。\n"
+msgstr "  --size          - 打印标识符大小: 大小。\n"
 
 #: ../urpmf_.c:43
 msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - 打印标识符周期：周期。\n"
+msgstr "  --epoch          - 打印标识符周期: 周期。\n"
 
 #: ../urpmf_.c:44
 msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - 打印标识符摘要：摘要。\n"
+msgstr "  --summary       - 打印标识符摘要: 摘要。\n"
 
 #: ../urpmf_.c:45
 msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   -打印标识符描述：描述。\n"
+msgstr "  --description   -打印标识符描述: 描述。\n"
 
 #: ../urpmf_.c:46
 msgid "  --provides     - print tag provides: all provides (multiple lines).\n"
-msgstr "  --provides      - 打印提供标识符：所有的提供（多行）。\n"
+msgstr "  --provides      - 打印提供标识符: 所有的提供(多行)。\n"
 
 #: ../urpmf_.c:47
 msgid "  --requires     - print tag requires: all requires (multiple lines).\n"
-msgstr "  --requires      - 打印需要标识符：所有的需要（多行）。\n"
+msgstr "  --requires      - 打印需要标识符: 所有的需要(多行)。\n"
 
 #: ../urpmf_.c:48
 msgid "  --files        - print tag files: all files (multiple lines).\n"
-msgstr "  --files         - 打印文件标识符: 所有的文件（多行）。\n"
+msgstr "  --files         - 打印文件标识符: 所有的文件(多行)。\n"
 
 #: ../urpmf_.c:49
 msgid ""
 "  --conflicts    - print tag conflicts: all conflicts (multiple lines).\n"
-msgstr "  --conflicts     - 打印冲突标识符：所有的冲突（多行）。\n"
+msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突(多行)。\n"
 
 #: ../urpmf_.c:50
 msgid ""
 "  --obsoletes    - print tag obsoletes: all obsoletes (multiple lines).\n"
-msgstr "  --obsoletes     - 打印废除标识符: 所有的废除（多行）。\n"
+msgstr "  --obsoletes     - 打印废除标识符: 所有的废除(多行)。\n"
 
 #: ../urpmf_.c:51
 msgid "  -i             - ignore case distinctions in every pattern.\n"
@@ -418,7 +416,7 @@ msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
-"召回是：\n"
+"召回是:\n"
 "%s\n"
 
 #. Translator: The URI types strings 'file:', 'ftp:', 'http:',
@@ -465,7 +463,7 @@ msgid ""
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，缺省的端口号是\n"
-"                   1080（格式如 <proxyhost[:port]>）。\n"
+"                   1080(格式如 <proxyhost[:port]>)。\n"
 
 #: ../urpmi.addmedia_.c:59 ../urpmi.update_.c:68 ../urpmi_.c:94 ../urpmq_.c:60
 msgid ""
@@ -473,7 +471,7 @@ msgid ""
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
-"                   口令（格式如 <用户：口令>）。\n"
+"                   口令(格式如 <用户: 口令>)。\n"
 
 #: ../urpmi.addmedia_.c:61
 msgid "  --update       - create an update medium.\n"
@@ -502,13 +500,12 @@ msgid ""
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
 #: ../urpmi.addmedia_.c:69
-#, fuzzy
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
 "                   from the version of the distribution told by the\n"
 "                   installed mandrake-release package.\n"
 msgstr ""
-"  --version      - 使用指定版本，默认版本是所安装的 mandrake 发行包。\n"
+"  --version      - 使用指定发行版本，默认版本是所安装的 mandrake 发行包。\n"
 
 #: ../urpmi.addmedia_.c:72
 msgid ""
@@ -596,7 +593,7 @@ msgstr ""
 
 #: ../urpmi.removemedia_.c:48
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "没有可删除的（用 urpmi.addmedia 增加介质）\n"
+msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
 #: ../urpmi.removemedia_.c:50
 #, c-format
@@ -605,7 +602,7 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 "找不到要删除的项\n"
-"（%s中的一个）\n"
+"(%s中的一个)\n"
 
 #: ../urpmi.update_.c:60
 msgid ""
@@ -630,7 +627,7 @@ msgstr "  -d             - 强迫完成 depslist.ordered 文件的计算。\n"
 
 #: ../urpmi.update_.c:85
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "没有东西要升级（用urpmi.addmedia增加介质）\n"
+msgstr "没有东西要升级(用urpmi.addmedia增加介质)\n"
 
 #: ../urpmi.update_.c:97
 #, c-format
@@ -639,7 +636,7 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 "找不到要升级的项\n"
-"（%s 中之一）\n"
+"(%s 中之一)\n"
 
 #: ../urpmi_.c:67
 #, c-format
@@ -668,15 +665,15 @@ msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
 #: ../urpmi_.c:78 ../urpmq_.c:45
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - 利用模糊查询（和 -y 一样）。\n"
+msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
 #: ../urpmi_.c:79 ../urpmq_.c:50
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - 下一个软件包是源程序包（和 -s 一样）。\n"
+msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
 #: ../urpmi_.c:80
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - 只安装源代码包（无二进制文件）。\n"
+msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
 #: ../urpmi_.c:81
 msgid "  --clean        - remove rpm from cache before anything else.\n"
@@ -719,7 +716,7 @@ msgstr ""
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
-msgstr "  --env          - 使用指定的环境（特别是进行故障报告时）。\n"
+msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
 #: ../urpmi_.c:100
 msgid "  --X            - use X interface.\n"
@@ -739,7 +736,7 @@ msgid ""
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
-"\t\t（--no-verify-rpm 禁止它，缺省是激活的）。\n"
+"\t\t(--no-verify-rpm 禁止它，缺省是激活的)。\n"
 
 #: ../urpmi_.c:106
 msgid "  --excludepath  - exclude path separated by comma.\n"
@@ -759,11 +756,11 @@ msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
 #: ../urpmi_.c:110 ../urpmq_.c:68
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - 利用模糊查询（和 --fuzzy 一样）。\n"
+msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
 #: ../urpmi_.c:111 ../urpmq_.c:69
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - 下一个软件包是源程序包（和 --src 一样）。\n"
+msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
 #: ../urpmi_.c:112
 msgid "  -q             - quiet mode.\n"
@@ -803,16 +800,16 @@ msgstr "只允许超级用户安装软件包"
 #: ../urpmi_.c:339
 #, c-format
 msgid "One of the following packages is needed to install %s:"
-msgstr "需要下列软件包之一才能安装 %s："
+msgstr "需要下列软件包之一才能安装 %s:"
 
 #: ../urpmi_.c:340
 msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一："
+msgstr "需要下列软件包之一:"
 
 #: ../urpmi_.c:348
 #, c-format
 msgid "What is your choice? (1-%d) "
-msgstr "请输入您的选择：（1-%d）"
+msgstr "请输入您的选择:(1-%d)"
 
 #: ../urpmi_.c:351
 msgid "Sorry, bad choice, try again\n"
@@ -825,9 +822,9 @@ msgid ""
 "%s\n"
 "do you agree ?"
 msgstr ""
-"某些要求的软件包无法安装：\n"
+"某些要求的软件包无法安装:\n"
 "%s\n"
-"可以吗？"
+"可以吗?"
 
 #: ../urpmi_.c:394
 #, c-format
@@ -860,16 +857,16 @@ msgid ""
 "%s\n"
 "do you agree ?"
 msgstr ""
-"要升级其它软件包，需要先删除下列软件包：\n"
+"要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
-"您同意吗？"
+"您同意吗?"
 
 #: ../urpmi_.c:451 ../urpmi_.c:460
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
-msgstr "我将另外安装下列软件包（%d MB），以满足相关性要求"
+msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
 
 #: ../urpmi_.c:457
 #, c-format
@@ -877,7 +874,7 @@ msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
-"您必须以 root 身份安装下列满足依赖性需要的软件包：\n"
+"您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
 #: ../urpmi_.c:479 ../urpmq_.c:297
@@ -899,11 +896,11 @@ msgstr "下列软件包的签名有错误"
 
 #: ../urpmi_.c:526
 msgid "Do you want to continue installation ?"
-msgstr "您想继续安装吗？"
+msgstr "您想继续安装吗?"
 
 #: ../urpmi_.c:540
 msgid " (y/N) "
-msgstr "（是(y)/否(N)）[否]"
+msgstr "(是(y)/否(N))[否]"
 
 #: ../urpmi_.c:548
 #, c-format
@@ -912,7 +909,7 @@ msgid ""
 "%s\n"
 "You may want to update your urpmi database"
 msgstr ""
-"安装失败，缺少下列文件：\n"
+"安装失败，缺少下列文件:\n"
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
@@ -928,11 +925,11 @@ msgstr "正在分发 %s\n"
 
 #: ../urpmi_.c:604
 msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗？（是(y)/否(N)）[否]"
+msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
 #: ../urpmi_.c:614
 msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "尝试更激烈的安装方式吗？（使用 --force）（是(y)/否(N)）[否] "
+msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
 #: ../urpmi_.c:631
 msgid "Everything already installed"
@@ -952,7 +949,7 @@ msgstr ""
 "版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "这是自由软件，可以依照 GNU GPL 重新发布。\n"
 "\n"
-"用法：\n"
+"用法:\n"
 
 #: ../urpmq_.c:46
 msgid "  --list         - list available packages.\n"
@@ -976,12 +973,12 @@ msgid ""
 "                   stdout (root only).\n"
 msgstr ""
 "  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
-"                   用 stdout 输出（root 专用）。\n"
+"                   用 stdout 输出(root 专用)。\n"
 
 #: ../urpmq_.c:53
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - 下载前给出所有的源文件包（root 专用）。\n"
+msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
 #: ../urpmq_.c:63
 msgid "  -d             - extend query to package dependencies.\n"
@@ -994,7 +991,6 @@ msgid ""
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
 #: ../urpmq_.c:65
-#, fuzzy
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
@@ -1035,16 +1031,16 @@ msgstr "这是一个自由软件，可以按照 GNU GPL 重新发布。"
 
 #: placeholder.h:21 placeholder.h:38
 msgid "usage: urpmf [options] <file>"
-msgstr "用法：urpmf [选项] <文件>"
+msgstr "用法: urpmf [选项] <文件>"
 
 #: placeholder.h:22
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
-msgstr "  --quiet         - 不打印标题名称（如果没有在命令行指定标识符，"
+msgstr "  --quiet         - 不打印标题名称(如果没有在命令行指定标识符，"
 
 #: placeholder.h:23
 msgid "                    line, incompatible with interactive mode)."
-msgstr "                    缺省设置就是不打印，与交互模式不兼容）。"
+msgstr "                    缺省设置就是不打印，与交互模式不兼容)。"
 
 #: placeholder.h:24
 msgid "  --all           - print all tags."
@@ -1053,57 +1049,57 @@ msgstr "  --all           - 打印全部标识符。"
 #: placeholder.h:25
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr "  --name          - 打印名称标识符：rpm 文件名（假设没有在命令行"
+msgstr "  --name          - 打印名称标识符: rpm 文件名(假设没有在命令行"
 
 #: placeholder.h:26
 msgid "                    command line but without package name)."
-msgstr "                    给出标识符，没有软件包名称）。"
+msgstr "                    给出标识符，没有软件包名称)。"
 
 #: placeholder.h:27
 msgid "  --group         - print tag group: group."
-msgstr "  --group         - 打印分组标识符：分组。"
+msgstr "  --group         - 打印分组标识符: 分组。"
 
 #: placeholder.h:28
 msgid "  --size          - print tag size: size."
-msgstr "  --size          - 打印大小标识符：大小。"
+msgstr "  --size          - 打印大小标识符: 大小。"
 
 #: placeholder.h:29
 msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - 打印序列标识符：序列。"
+msgstr "  --serial        - 打印序列标识符: 序列。"
 
 #: placeholder.h:30
 msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - 打印摘要标识符：摘要。"
+msgstr "  --summary       - 打印摘要标识符: 摘要。"
 
 #: placeholder.h:31
 msgid "  --description   - print tag description: description."
-msgstr "  --description   -打印描述标识符：描述。"
+msgstr "  --description   -打印描述标识符: 描述。"
 
 #: placeholder.h:32
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - 打印提供标识符：所有的提供（多行）。"
+msgstr "  --provides      - 打印提供标识符: 所有的提供(多行)。"
 
 #: placeholder.h:33
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - 打印需要标识符：所有的需要（多行）。"
+msgstr "  --requires      - 打印需要标识符: 所有的需要(多行)。"
 
 #: placeholder.h:34
 msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - 打印文件标识符：所有的文件（多行）。"
+msgstr "  --files         - 打印文件标识符: 所有的文件(多行)。"
 
 #: placeholder.h:35
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr "  --conflicts     - 打印冲突标识符：所有的冲突（多行）。"
+msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突(多行)。"
 
 #: placeholder.h:36
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - 打印废除标识符：所有的废除（多行）。"
+msgstr "  --obsoletes     - 打印废除标识符: 所有的废除(多行)。"
 
 #: placeholder.h:37
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - 打印前提条件标识符：所有的前提（多行）。"
+msgstr "  --prereqs       - 打印前提条件标识符: 所有的前提(多行)。"
 
 #: placeholder.h:39
 msgid "try urpmf --help for more options"
@@ -1112,270 +1108,3 @@ msgstr "尝试 urpmf --help 了解更多选项"
 #: placeholder.h:40
 msgid "no full media list was found"
 msgstr "没有找到完整的介质清单"
-
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "配置文件的的 %s 行由语法错误"
-
-#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-#~ msgstr "介质“%s”试图使用一个已经使用的 hdlist, 忽略介质"
-
-#~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
-#~ msgstr "介质“%s”试图使用已经使用的列表, 忽略介质"
-
-#~ msgid ""
-#~ "unable to take care of medium \"%s\" as list file is already used by "
-#~ "another medium"
-#~ msgstr "无法处理介质“%s”, 其它介质在使用列表文件"
-
-#~ msgid ""
-#~ "unable to use name \"%s\" for unnamed medium because it is already used"
-#~ msgstr "不能把这个介质命名为“%s”, 这个名字已经被使用"
-
-#~ msgid ""
-#~ "unable to take medium \"%s\" into account as no list file [%s] exists"
-#~ msgstr "不能计算介质“%s”, 它的列表文件 [%s] 不存在"
-
-#~ msgid "unable to determine medium of this hdlist file [%s]"
-#~ msgstr "无法判断 hdlist文件的介质 [%s]"
-
-#~ msgid "unable to access hdlist file of \"%s\", medium ignored"
-#~ msgstr "无法访问“%s”的 hdlist 文件, 忽略该介质"
-
-#~ msgid "unable to access list file of \"%s\", medium ignored"
-#~ msgstr "无法访问“%s”的列表文件, 忽略介质"
-
-#~ msgid "trying to bypass existing medium \"%s\", avoiding"
-#~ msgstr "试图略过现有的介质“%s”, 避免"
-
-#~ msgid "unable to find hdlist file for \"%s\", medium ignored"
-#~ msgstr "无法找到“%s”的 hdlist 文件, 忽略该介质"
-
-#~ msgid "unable to find list file for \"%s\", medium ignored"
-#~ msgstr "无法找到“%s”的列表文件, 忽略该介质"
-
-#~ msgid "incoherent list file for \"%s\", medium ignored"
-#~ msgstr "“%s”的列表文件不连贯, 忽略该介质"
-
-#~ msgid "unable to inspect list file for \"%s\", medium ignored"
-#~ msgstr "无法检查“%s”的列表文件, 忽略该介质"
-
-#~ msgid "too many mount points for removable medium \"%s\""
-#~ msgstr "可移动介质“%s”加载次数太多"
-
-#~ msgid "taking removable device as \"%s\""
-#~ msgstr "把可移动设备当作“%s”"
-
-#~ msgid "using different removable device [%s] for \"%s\""
-#~ msgstr "为“%2$s”使用不同的可移动设备 [%1$s]"
-
-#~ msgid "unable to retrieve pathname for removable medium \"%s\""
-#~ msgstr "无法取得可移动介质“%s”的路径"
-
-#~ msgid "unable to write config file [%s]"
-#~ msgstr "无法写入配置文件 [%s]"
-
-#~ msgid "write config file [%s]"
-#~ msgstr "写入配置文件 [%s]"
-
-#~ msgid "unable to parse \"%s\" in file [%s]"
-#~ msgstr "无法解读文件[%2$s]中的“%1$s”"
-
-#~ msgid "examining parallel handler in file [%s]"
-#~ msgstr "检查文件 [%s] 中的并行处理"
-
-#~ msgid "found parallel handler for nodes: %s"
-#~ msgstr "发现下列节点的并行处理: %s"
-
-#~ msgid "using associated media for parallel mode: %s"
-#~ msgstr "将相关的介质用于并行处理: %s"
-
-#~ msgid "unable to use parallel option \"%s\""
-#~ msgstr "无法使用并行处理选项“%s”"
-
-#~ msgid "--synthesis cannot be used with --media, --update or --parallel"
-#~ msgstr "--synthesis 不能和 --media, --update 或 --parallel 一起使用"
-
-#~ msgid "examining hdlist file [%s]"
-#~ msgstr "正在检查 hdlist 文件 [%s]"
-
-#~ msgid "examining synthesis file [%s]"
-#~ msgstr "正在检查综合文件 [%s]"
-
-#~ msgid "problem reading hdlist file of medium \"%s\""
-#~ msgstr "读取“%s”的 hdlist 文件有问题"
-
-#~ msgid "problem reading synthesis file of medium \"%s\""
-#~ msgstr "无法读取介质“%s”的综合文件"
-
-#~ msgid "medium \"%s\" already exists"
-#~ msgstr "介质“%s”已经存在"
-
-#~ msgid "added medium %s"
-#~ msgstr "添加介质 %s"
-
-#~ msgid "unable to access first installation medium"
-#~ msgstr "无法访问最初的安装介质"
-
-#~ msgid "copying hdlists file..."
-#~ msgstr "正在复制 hdlists 文件..."
-
-#~ msgid "...copying done"
-#~ msgstr "...复制完成"
-
-#~ msgid ""
-#~ "unable to access first installation medium (no Mandrake/base/hdlists file "
-#~ "found)"
-#~ msgstr "无法访问最初的安装介质 (没有找到 Mandrake/base/hdlists) "
-
-#~ msgid "retrieving hdlists file..."
-#~ msgstr "正在获取 hdlists 文件..."
-
-#~ msgid "...retrieving done"
-#~ msgstr "...获取完成"
-
-#~ msgid "...retrieving failed: %s"
-#~ msgstr "...获取失败: %s"
-
-#~ msgid "invalid hdlist description \"%s\" in hdlists file"
-#~ msgstr "hdlist 文件中错误的描述“%s”"
-
-#~ msgid "trying to select inexistent medium \"%s\""
-#~ msgstr "试图选择不存在的介质“%s”"
-
-#~ msgid "\"%s\""
-#~ msgstr "“%s”"
-
-#~ msgid "selecting multiple media: %s"
-#~ msgstr "选择多个介质 %s"
-
-#~ msgid "removing medium \"%s\""
-#~ msgstr "删除介质“%s”"
-
-#~ msgid "urpmi database locked"
-#~ msgstr "urpmi 数据库被锁定"
-
-#~ msgid "unable to access medium \"%s\""
-#~ msgstr "无法访问介质“%s”"
-
-#~ msgid "copying description file of \"%s\"..."
-#~ msgstr "复制“%s”的描述文件"
-
-#~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
-#~ msgstr "正在复制源“%s”的 hdlist 或综合文件..."
-
-#~ msgid "copy of [%s] failed"
-#~ msgstr "复制 [%s] 失败"
-
-#~ msgid "examining MD5SUM file"
-#~ msgstr "正在检查 MD5SUM 文件"
-
-#~ msgid "copying source list of \"%s\"..."
-#~ msgstr "正在复制“%s”的源文件列表..."
-
-#~ msgid "reading rpm files from [%s]"
-#~ msgstr "从 [%s] 读取 rpm 文件"
-
-#~ msgid "unable to read rpm files from [%s]: %s"
-#~ msgstr "无法从 [%s] 读取 rpm 文件: %s"
-
-#~ msgid "no rpm files found from [%s]"
-#~ msgstr "[%s] 没有发现rpm 文件"
-
-#~ msgid "retrieving description file of \"%s\"..."
-#~ msgstr "正在获取“%s”的描述文件..."
-
-#~ msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-#~ msgstr "正在获取“%s”的源 hdlist (或综合文件)..."
-
-#~ msgid "retrieve of source hdlist (or synthesis) failed"
-#~ msgstr "获取源的 hdlist (或 synthesis)失败"
-
-#~ msgid "no hdlist file found for medium \"%s\""
-#~ msgstr "没有找到介质“%s”的 hdlist 文件"
-
-#~ msgid "file [%s] already used in the same medium \"%s\""
-#~ msgstr "文件 [%s] 已经被同样的介质“%s”使用"
-
-#~ msgid "unable to parse hdlist file of \"%s\""
-#~ msgstr "无法分析hdlist文件“%s”"
-
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "无法写入列表文件“%s”"
-
-#~ msgid "writing list file for medium \"%s\""
-#~ msgstr "正在写入介质“%s”的列表文件"
-
-#~ msgid "nothing written in list file for \"%s\""
-#~ msgstr "“%s”没有写入列表文件"
-
-#~ msgid "performing second pass to compute dependencies\n"
-#~ msgstr "进行第二轮, 计算依赖性\n"
-
-#~ msgid "reading headers from medium \"%s\""
-#~ msgstr "正在从介质“%s”读取软件包头信息"
-
-#~ msgid "building hdlist [%s]"
-#~ msgstr "正在创建hdlist [%s]"
-
-#~ msgid "built hdlist synthesis file for medium \"%s\""
-#~ msgstr "为介质“%s”创建 hdlist 综合文件"
-
-#~ msgid "found %d headers in cache"
-#~ msgstr "缓存中有 %d 个文件头"
-
-#~ msgid "removing %d obsolete headers in cache"
-#~ msgstr "从缓存删除 %d 过时的头"
-
-#~ msgid "mounting %s"
-#~ msgstr "正在装配 %s"
-
-#~ msgid "unmounting %s"
-#~ msgstr "正在拆卸 %s"
-
-#~ msgid "relocated %s entries in depslist"
-#~ msgstr "在depslist中重新定位 %s"
-
-#~ msgid "no entries relocated in depslist"
-#~ msgstr "在depslist中没有重新定位的条目"
-
-#~ msgid "invalid rpm file name [%s]"
-#~ msgstr "非法 rpm 文件名 [%s]"
-
-#~ msgid "retrieving rpm file [%s] ..."
-#~ msgstr "正在获取 rpm 文件[%s]..."
-
-#~ msgid "error registering local packages"
-#~ msgstr "注册本地软件包出错"
-
-#~ msgid "no package named %s"
-#~ msgstr "没有名为 %s 的软件包"
-
-#~ msgid "there are multiple packages with the same rpm filename \"%s\""
-#~ msgstr "多个软件包使用相同的 rpm 文件名“%s”"
-
-#~ msgid "unable to correctly parse [%s] on value \"%s\""
-#~ msgstr "无法正确的解析 [%s] 的值“%s”"
-
-#~ msgid "medium \"%s\" does not define any location for rpm files"
-#~ msgstr "介质“%s”没有定义 rpm 文件的任何位置"
-
-#~ msgid "package %s is not found."
-#~ msgstr "没有找到软件包 %s."
-
-#~ msgid "medium \"%s\" is not selected"
-#~ msgstr "介质“%s”没有选中"
-
-#~ msgid "unable to read rpm file [%s] from medium \"%s\""
-#~ msgstr "无法从介质“%2$s”读取rpm文件[%1$s]"
-
-#~ msgid "incoherent medium \"%s\" marked removable but not really"
-#~ msgstr "不连贯的介质“%s”标记为可移动但其实不是"
-
-#~ msgid "malformed input: [%s]"
-#~ msgstr "输入格式错误: [%s]"
-
-#~ msgid "retrieving rpm files from medium \"%s\"..."
-#~ msgstr "正在从介质“%s”获取 rpm 文件..."
-
-#~ msgid "Preparing..."
-#~ msgstr "准备中..."