really sync with code (pixel sucks :-())

1 files changed, 533 insertions, 403 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7d840121..8e0ec278 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-22 20:19+0200\n"
+"POT-Creation-Date: 2008-07-10 21:25+0200\n"
 "PO-Revision-Date: 2008-03-30 14:22+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -23,22 +23,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:30 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:72
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
 
-#: ../gurpmi:44
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:45 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi:65
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../gurpmi:73 ../gurpmi:84
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../gurpmi:79
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -89,27 +89,27 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../gurpmi:97
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "安装(_I)"
 
-#: ../gurpmi:98
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:99 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:166
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gurpmi:107
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../gurpmi.pm:39 ../urpmi:69
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -130,26 +130,26 @@ msgstr ""
 msgid "Options:"
 msgstr "选项："
 
-#: ../gurpmi.pm:46 ../urpme:45 ../urpmf:35 ../urpmi:74 ../urpmi.addmedia:54
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
 #: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../gurpmi.pm:47 ../urpmi:81
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -164,7 +164,7 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
@@ -179,7 +179,7 @@ msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:55 ../urpmi:111 ../urpmq:68
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
@@ -191,7 +191,7 @@ msgid ""
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../gurpmi.pm:57 ../urpmi:78
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
@@ -228,7 +228,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:126 ../urpmi:638
+#: ../gurpmi2:126 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -269,13 +269,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:232 ../urpmi:604
+#: ../gurpmi2:232 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:233 ../urpmi:605
+#: ../gurpmi2:233 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -292,12 +292,12 @@ msgstr[0] "(%d 个软件包，%d MB)"
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:48
+#: ../gurpmi2:243 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:257 ../urpm/install.pm:81
+#: ../gurpmi2:257 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
@@ -307,7 +307,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:633
+#: ../gurpmi2:278 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
@@ -322,7 +322,7 @@ msgstr "正在下载软件包“%s”..."
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:261
+#: ../gurpmi2:316 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -333,8 +333,8 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:199 ../urpm/main_loop.pm:217
-#: ../urpm/main_loop.pm:235
+#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
@@ -349,17 +349,17 @@ msgstr "软件包已经安装"
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:330 ../urpme:132
+#: ../gurpmi2:330 ../urpme:165
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:338 ../urpmi:692
+#: ../gurpmi2:338 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -368,27 +368,27 @@ msgstr ""
 "用法: %s [选项]\n"
 "[选项]的格式为\n"
 
-#: ../rpm-find-leaves:16
+#: ../rpm-find-leaves:17
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - 打印帮助信息。\n"
 
-#: ../rpm-find-leaves:17
+#: ../rpm-find-leaves:18
 #, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <路径>  - 使用给定的根而不是 /\n"
 
-#: ../rpm-find-leaves:18
+#: ../rpm-find-leaves:19
 #, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [组]        - 限制结果为给定组。\n"
 
-#: ../rpm-find-leaves:19
+#: ../rpm-find-leaves:20
 #, c-format
 msgid "                    defaults to %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../rpm-find-leaves:20
+#: ../rpm-find-leaves:21
 #, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
@@ -403,123 +403,124 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:110
+#: ../urpm.pm:111
 #, c-format
 msgid "fail to create directory %s"
 msgstr "创建目录 %s 失败"
 
-#: ../urpm.pm:111
+#: ../urpm.pm:112
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "目录 %s 的所有者无效"
 
-#: ../urpm.pm:233
+#: ../urpm.pm:258
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:247
+#: ../urpm.pm:272
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:278
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:255 ../urpm/get_pkgs.pm:171
+#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:258 ../urpm/download.pm:714 ../urpm/get_pkgs.pm:173
-#: ../urpm/media.pm:793 ../urpm/media.pm:1237 ../urpm/media.pm:1405
+#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
+#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
+#: ../urpm/media.pm:1473
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:263
+#: ../urpm.pm:288
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:268
+#: ../urpm.pm:293
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:276
+#: ../urpm.pm:301
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:278
+#: ../urpm.pm:303
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:282
+#: ../urpm.pm:307
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:367
+#: ../urpm.pm:394
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:142 ../urpm/args.pm:151
+#: ../urpm/args.pm:145 ../urpm/args.pm:154
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:300
+#: ../urpm/args.pm:299
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "模式表达式: \n"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:377
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "缺少签名(%s)"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:383
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:388
+#: ../urpm/args.pm:387
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "模式表达式: \n"
 
-#: ../urpm/args.pm:397
+#: ../urpm/args.pm:396
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:469
+#: ../urpm/args.pm:464
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:488
+#: ../urpm/args.pm:483
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:491 ../urpm/args.pm:494
+#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:502
+#: ../urpm/args.pm:497
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
@@ -546,7 +547,7 @@ msgstr ""
 msgid "medium \"%s\" is not available"
 msgstr "介质“%s”不可用"
 
-#: ../urpm/cdrom.pm:207
+#: ../urpm/cdrom.pm:205
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
@@ -566,127 +567,127 @@ msgstr "无法读取配置文件[%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "介质“%s”定义了两次，正在退出"
 
-#: ../urpm/cfg.pm:250 ../urpm/media.pm:456 ../urpm/media.pm:462
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm/download.pm:100
+#: ../urpm/download.pm:109
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr ""
 
-#: ../urpm/download.pm:125
+#: ../urpm/download.pm:134
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入访问代理服务器所需的认证信息\n"
 
-#: ../urpm/download.pm:126
+#: ../urpm/download.pm:135
 #, c-format
 msgid "User name:"
 msgstr "用户名:"
 
-#: ../urpm/download.pm:126
+#: ../urpm/download.pm:135
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../urpm/download.pm:210
+#: ../urpm/download.pm:219
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "未知的 webfetch“%s”!!!\n"
 
-#: ../urpm/download.pm:219
+#: ../urpm/download.pm:228
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失败: 退出信号为 %d"
 
-#: ../urpm/download.pm:220
+#: ../urpm/download.pm:229
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:249
+#: ../urpm/download.pm:258
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:255
+#: ../urpm/download.pm:264
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:322
+#: ../urpm/download.pm:331
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:447
+#: ../urpm/download.pm:456
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:486
+#: ../urpm/download.pm:495
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:552
+#: ../urpm/download.pm:563
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:571
+#: ../urpm/download.pm:582
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:587
+#: ../urpm/download.pm:598
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:595
+#: ../urpm/download.pm:606
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:698
+#: ../urpm/download.pm:718
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:700
+#: ../urpm/download.pm:720
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:783
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:767
+#: ../urpm/download.pm:787
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:795
+#: ../urpm/download.pm:815
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:815
+#: ../urpm/download.pm:836
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 不可用，默认回到 %s"
 
-#: ../urpm/download.pm:819
+#: ../urpm/download.pm:840
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:840
+#: ../urpm/download.pm:866
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -696,78 +697,73 @@ msgstr "无法处理协议: %s"
 msgid "cleaning %s and %s"
 msgstr "清除 %s 和 %s"
 
-#: ../urpm/get_pkgs.pm:101
+#: ../urpm/get_pkgs.pm:127
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm/get_pkgs.pm:149
-#, c-format
-msgid "malformed URL: [%s]"
-msgstr "URL 格式错误: [%s]"
-
-#: ../urpm/get_pkgs.pm:160
-#, c-format
-msgid "sorry, you can't use --install-src to install remote .src.rpm files"
-msgstr "抱歉，您无法用 --install-src 安装远程 .src.rpm 文件"
+#: ../urpm/get_pkgs.pm:218
+#, fuzzy, c-format
+msgid "Can not download packages into %s"
+msgstr "无法写入重新打包目录 [%s]\n"
 
-#: ../urpm/get_pkgs.pm:167
+#: ../urpm/get_pkgs.pm:222
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:95
 #, c-format
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm/install.pm:154
+#: ../urpm/install.pm:175
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm/install.pm:157
+#: ../urpm/install.pm:178
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:201
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:214
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:196
+#: ../urpm/install.pm:217
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
 
-#: ../urpm/install.pm:197 ../urpm/install.pm:254
+#: ../urpm/install.pm:218 ../urpm/install.pm:275
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "删除 %s 失败: %s"
 
-#: ../urpm/install.pm:235
+#: ../urpm/install.pm:256
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:236
+#: ../urpm/install.pm:257
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:252
+#: ../urpm/install.pm:273
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:260
+#: ../urpm/install.pm:281
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -812,157 +808,137 @@ msgstr "中止"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s 数据库已锁定(其它程序正在使用它)"
 
-#: ../urpm/main_loop.pm:113
+#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
+#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#, c-format
+msgid "Try to go on anyway? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:121
+#, c-format
+msgid ""
+"Installation failed, bad rpms:\n"
+"%s"
+msgstr ""
+"安装失败，rpm 有问题:\n"
+"%s"
+
+#: ../urpm/main_loop.pm:139
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:114
+#: ../urpm/main_loop.pm:140
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:115
+#: ../urpm/main_loop.pm:141
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:128 ../urpm/main_loop.pm:206 ../urpm/main_loop.pm:224
-#, c-format
-msgid "Installation failed"
-msgstr "安装失败"
-
-#: ../urpm/main_loop.pm:132
+#: ../urpm/main_loop.pm:158
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "删除已安装的 rpm(%s)"
 
-#: ../urpm/main_loop.pm:152
+#: ../urpm/main_loop.pm:178
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpm/main_loop.pm:167
+#: ../urpm/main_loop.pm:193
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpm/main_loop.pm:169
+#: ../urpm/main_loop.pm:195
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:207
+#: ../urpm/main_loop.pm:231
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm/main_loop.pm:225
+#: ../urpm/main_loop.pm:249
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
-#, c-format
-msgid "Error"
-msgstr "出错"
-
-#: ../urpm/main_loop.pm:267
-#, c-format
-msgid ""
-"Installation failed, bad rpms:\n"
-"%s"
-msgstr ""
-"安装失败，rpm 有问题:\n"
-"%s"
-
-#: ../urpm/main_loop.pm:273
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d 安装交易失败"
-
-#: ../urpm/main_loop.pm:286
+#: ../urpm/main_loop.pm:295
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:294
-#, c-format
-msgid "Package %s is already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpm/main_loop.pm:295
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpm/main_loop.pm:298
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "软件包 %s 无法安装"
-
-#: ../urpm/main_loop.pm:299
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "软件包 %s 无法安装"
-
-#: ../urpm/main_loop.pm:307
+#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpm/md5sum.pm:20
+#: ../urpm/md5sum.pm:26
 #, c-format
 msgid "examining %s file"
 msgstr "正在检查 %s 文件"
 
-#: ../urpm/md5sum.pm:22
+#: ../urpm/md5sum.pm:27
+#, c-format
+msgid "invalid MD5SUM file"
+msgstr ""
+
+#: ../urpm/md5sum.pm:28
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告: %s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm/media.pm:194
+#: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm/media.pm:196
+#: ../urpm/media.pm:206
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:213
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的综合文件，介质被忽略"
 
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:240
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "试图覆盖已有介质“%s”，正跳过"
 
-#: ../urpm/media.pm:415
+#: ../urpm/media.pm:445
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr "迁移可移动设备失败，忽略介质"
 
-#: ../urpm/media.pm:458 ../urpm/media.pm:464
+#: ../urpm/media.pm:488 ../urpm/media.pm:494
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm/media.pm:507
+#: ../urpm/media.pm:537
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm/media.pm:515
+#: ../urpm/media.pm:545
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm/media.pm:531
+#: ../urpm/media.pm:561
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -971,212 +947,217 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib 或 --parallel 一起使用"
 
-#: ../urpm/media.pm:624
+#: ../urpm/media.pm:654
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始: %s 结束: %s"
 
-#: ../urpm/media.pm:641
+#: ../urpm/media.pm:671
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm/media.pm:657
+#: ../urpm/media.pm:687
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm/media.pm:682
+#: ../urpm/media.pm:712
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:755
 #, c-format
 msgid "(ignored by default)"
 msgstr "(默认忽略)"
 
-#: ../urpm/media.pm:730
+#: ../urpm/media.pm:761
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
-#: ../urpm/media.pm:736
+#: ../urpm/media.pm:767
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
-#: ../urpm/media.pm:765
+#: ../urpm/media.pm:796
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目录 %s 不存在"
 
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:804
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
 
-#: ../urpm/media.pm:791
+#: ../urpm/media.pm:822
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
-#: ../urpm/media.pm:794
+#: ../urpm/media.pm:825
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:812
+#: ../urpm/media.pm:843
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "跳过不兼容的介质“%s”(原因是 %s)"
 
-#: ../urpm/media.pm:861
+#: ../urpm/media.pm:895
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在获取 media.cfg 文件..."
 
-#: ../urpm/media.pm:902
+#: ../urpm/media.pm:936
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:905
+#: ../urpm/media.pm:939
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:925
+#: ../urpm/media.pm:959
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:1001
+#: ../urpm/media.pm:1042
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:1039
+#: ../urpm/media.pm:1076
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:1045
+#: ../urpm/media.pm:1082
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1061
+#: ../urpm/media.pm:1098
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成命名文件出错：依赖关系 %d 未找到"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1119
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1093
+#: ../urpm/media.pm:1130
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1113
+#: ../urpm/media.pm:1150
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1126 ../urpm/media.pm:1209
+#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1128 ../urpm/media.pm:1183 ../urpm/media.pm:1421
+#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1179
+#: ../urpm/media.pm:1216
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1181 ../urpm/media.pm:1213
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1215
+#: ../urpm/media.pm:1252
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1248
+#: ../urpm/media.pm:1297
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源综合文件的 md5sum"
 
-#: ../urpm/media.pm:1250 ../urpm/media.pm:1671
+#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "获取[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1314
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "在 %s 上 genhdlist2 失败"
 
-#: ../urpm/media.pm:1275
+#: ../urpm/media.pm:1324
 #, c-format
 msgid "comparing %s and %s"
 msgstr "比较 %s 和 %s"
 
-#: ../urpm/media.pm:1300
+#: ../urpm/media.pm:1349
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1326
+#: ../urpm/media.pm:1375
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在复制“%s”的 MD5SUM..."
 
-#: ../urpm/media.pm:1380
+#: ../urpm/media.pm:1417
+#, fuzzy, c-format
+msgid "invalid MD5SUM file (downloaded from %s)"
+msgstr "无效的 rpm 文件名[%s]"
+
+#: ../urpm/media.pm:1448
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源综合文件..."
 
-#: ../urpm/media.pm:1397
+#: ../urpm/media.pm:1465
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "发现探测的综合文件 为 %s"
 
-#: ../urpm/media.pm:1404 ../urpm/media.pm:1512
+#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现综合文件"
 
-#: ../urpm/media.pm:1455
+#: ../urpm/media.pm:1523
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1467
+#: ../urpm/media.pm:1535
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1471
+#: ../urpm/media.pm:1539
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1545
+#: ../urpm/media.pm:1613
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1665
+#: ../urpm/media.pm:1733
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "获取[%s]失败"
@@ -1186,7 +1167,7 @@ msgstr "获取[%s]失败"
 msgid "trying again with mirror %s"
 msgstr "正在重试连接镜像 %s"
 
-#: ../urpm/mirrors.pm:55
+#: ../urpm/mirrors.pm:52
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "无法从镜像列表 %s 里找到一个镜像"
@@ -1201,14 +1182,14 @@ msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
-#: ../urpm/msg.pm:63 ../urpmi:518 ../urpmi:534 ../urpmi:624
+#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:37 ../urpmi:519 ../urpmi:535 ../urpmi:574
-#: ../urpmi:625 ../urpmi:661 ../urpmi:667 ../urpmi.addmedia:138
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpmi.addmedia:140
 #, c-format
 msgid "Yy"
 msgstr "yY是"
@@ -1278,6 +1259,16 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
+#: ../urpm/orphans.pm:305
+#, c-format
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+
 #: ../urpm/parallel.pm:14
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
@@ -1298,17 +1289,54 @@ msgstr "找到结点的并行处理: %s"
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm/removable.pm:26
+#: ../urpm/parallel.pm:93
+#, c-format
+msgid "on node %s"
+msgstr ""
+
+#: ../urpm/parallel.pm:293
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "安装失败"
+
+#: ../urpm/parallel_ka_run.pm:58
+#, c-format
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:80
+#, c-format
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:27
+#, c-format
+msgid "scp failed on host %s (%d)"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:39
+#, c-format
+msgid "cp failed on host %s (%d)"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:86
+#, c-format
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+
+#: ../urpm/removable.pm:32
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "无法访问介质“%s”。"
 
-#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm/removable.pm:97
+#: ../urpm/removable.pm:103
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
@@ -1329,42 +1357,57 @@ msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:193 ../urpme:107
+#: ../urpm/select.pm:193 ../urpme:114
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm/select.pm:516 ../urpm/select.pm:559
+#: ../urpm/select.pm:296
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "软件包 %s 无法安装"
+
+#: ../urpm/select.pm:539
+#, c-format
+msgid "Package %s is already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/select.pm:540
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/select.pm:558 ../urpm/select.pm:609
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm/select.pm:517
+#: ../urpm/select.pm:559
 #, c-format
 msgid "due to already installed %s"
 msgstr "原因是已经安装 %s"
 
-#: ../urpm/select.pm:518 ../urpm/select.pm:557
+#: ../urpm/select.pm:560 ../urpm/select.pm:607
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:524
+#: ../urpm/select.pm:566
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:525
+#: ../urpm/select.pm:567
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:553
+#: ../urpm/select.pm:603
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:613
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
@@ -1394,22 +1437,22 @@ msgstr ""
 msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpm/sys.pm:271
+#: ../urpm/sys.pm:276
 #, c-format
 msgid "Can't write file"
 msgstr "无法写入文件"
 
-#: ../urpm/sys.pm:271
+#: ../urpm/sys.pm:276
 #, c-format
 msgid "Can't open file"
 msgstr "无法打开文件"
 
-#: ../urpm/sys.pm:284
+#: ../urpm/sys.pm:289
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "无法将文件 %s 移动到 %s"
 
-#: ../urpme:40
+#: ../urpme:41
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -1425,43 +1468,48 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:47
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:49 ../urpmi:110 ../urpmq:67
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:50 ../urpmi:141
+#: ../urpme:52 ../urpmi:141
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 
-#: ../urpme:51
+#: ../urpme:53
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:52 ../urpmf:40 ../urpmi:112 ../urpmi.addmedia:69
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:46 ../urpmq:69
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
 
-#: ../urpme:53
+#: ../urpme:55
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpme:54
+#: ../urpme:56
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1470,69 +1518,86 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:56 ../urpmi:152 ../urpmq:86
+#: ../urpme:58 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
 
-#: ../urpme:57
+#: ../urpme:59
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:70
+#: ../urpme:72
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:100
+#: ../urpme:105
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:100
+#: ../urpme:105
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:113 ../urpmi:548
-#, c-format
-msgid "removing package %s will break your system"
-msgstr "如果删除软件包 %s 会破坏您的系统"
+#: ../urpme:119
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:115
+#: ../urpme:124
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:120
-#, c-format
-msgid "Checking to remove the following packages"
-msgstr "检查删除下列软件包"
+#: ../urpme:141
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "不需要删除任何东西。"
 
-#: ../urpme:124
+#: ../urpme:147
 #, c-format
 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:128
+#: ../urpme:152
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "未知的软件包"
+
+#: ../urpme:159
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:128 ../urpmi:575 ../urpmi:662 ../urpmi.addmedia:141
+#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:150
+#: ../urpme:164
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:178
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
 
+#: ../urpme:180
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "删除失败"
+
 #: ../urpmf:29
 #, c-format
 msgid ""
@@ -1554,12 +1619,12 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:79
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:76 ../urpmq:49
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
@@ -1570,7 +1635,7 @@ msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:42 ../urpmi:79 ../urpmq:50
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1581,7 +1646,7 @@ msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:80 ../urpmq:51
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
@@ -1591,7 +1656,7 @@ msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:77 ../urpmq:46
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
@@ -1786,7 +1851,7 @@ msgstr "  --vendor       - 提供者\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:85 ../urpmq:96
+#: ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
@@ -1801,7 +1866,7 @@ msgstr "模式表达式: \n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:141
+#: ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1821,39 +1886,44 @@ msgstr "介质“%s”的综合文件不可用"
 msgid "no xml-info available for medium \"%s\""
 msgstr "介质“%s”没有可用的 xml-info"
 
-#: ../urpmi:83
+#: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 更新介质后再升级系统。\n"
 
-#: ../urpmi:84
+#: ../urpmi:82
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi:85
+#: ../urpmi:83
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi:86 ../urpmq:53
+#: ../urpmi:84
+#, c-format
+msgid "  --auto-orphans - remove orphans without asking\n"
+msgstr ""
+
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - 不自动选择“推荐的”软件包。\n"
 
-#: ../urpmi:87
+#: ../urpmi:86
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:88
+#: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:89 ../urpmq:55
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1861,7 +1931,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:91
+#: ../urpmi:90
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1871,67 +1941,67 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 利用模糊查询。\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
 #, c-format
 msgid "  --buildrequires - install the buildrequires of the packages\n"
 msgstr "  --buildrequires - 安装软件包构建需求\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:100
+#: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:102
+#: ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
 
-#: ../urpmi:103
+#: ../urpmi:102
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - 强制安装已经安装过的软件包。\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
 #, fuzzy, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - 不自动选择“推荐的”软件包。\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1940,6 +2010,11 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
+#, c-format
+msgid "  --metalink     - generate and use a local metalink.\n"
+msgstr ""
+
 #: ../urpmi:115
 #, c-format
 msgid ""
@@ -1974,7 +2049,7 @@ msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 给 aria2 传递额外的选项\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:58 ../urpmi.update:36
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
@@ -1988,7 +2063,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:126 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1997,7 +2072,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:128 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2068,7 +2143,7 @@ msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:148 ../urpmq:94
+#: ../urpmi:148 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
@@ -2147,48 +2222,48 @@ msgstr ""
 "错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:374
+#: ../urpmi:361
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:453
+#: ../urpmi:448
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:455
+#: ../urpmi:450
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:459
+#: ../urpmi:454
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:461
+#: ../urpmi:456
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:467
+#: ../urpmi:462
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:470
+#: ../urpmi:465
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:511
+#: ../urpmi:507
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2198,7 +2273,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:509
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2208,7 +2283,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:520 ../urpmi:536
+#: ../urpmi:515 ../urpmi:530
 #, c-format
 msgid ""
 "\n"
@@ -2217,12 +2292,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:521 ../urpmi:537 ../urpmi:626 ../urpmi.addmedia:141
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:529
+#: ../urpmi:524
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2231,7 +2306,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:525
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2240,7 +2315,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:557
+#: ../urpmi:542
+#, c-format
+msgid "removing package %s will break your system"
+msgstr "如果删除软件包 %s 会破坏您的系统"
+
+#: ../urpmi:551
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2250,7 +2330,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:559
+#: ../urpmi:553
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2260,7 +2340,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:566
+#: ../urpmi:560
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2269,7 +2349,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:567
+#: ../urpmi:561
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2278,12 +2358,12 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:569
+#: ../urpmi:563
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:590
+#: ../urpmi:583
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2293,38 +2373,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:607
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "The following orphan package will be removed."
+msgid_plural "The following orphan packages will be removed."
+msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
+
+#: ../urpmi:610
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:613
+#: ../urpmi:616
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:614
+#: ../urpmi:617
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:615
+#: ../urpmi:618
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:616
+#: ../urpmi:619
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:638
+#: ../urpmi:640
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:646
+#: ../urpmi:648
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -2372,27 +2458,32 @@ msgstr ""
 "\n"
 "而 [选项] 可以来自\n"
 
-#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prizlla      - 用 prozilla 取远程文件。\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:58 ../urpmi.update:36
+#, fuzzy, c-format
+msgid "  --aria2        - use aria2 to retrieve distant files.\n"
+msgstr "  --curl         - 用 crul 取远程文件。\n"
+
+#: ../urpmi.addmedia:65
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质。\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:66
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2403,111 +2494,111 @@ msgstr ""
 "                   以下中的一个: never, on-demand, update-only, always. cf "
 "urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:68
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 使用综合文件。\n"
 
-#: ../urpmi.addmedia:67
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - 使用 rpm 文件(而不是综合文件)。\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件文件。\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:74
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 对于 --distrib，请求每个介质的确认\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 对于 --distrib，添加列出的每个介质\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:76
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:78
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质。\n"
 
-#: ../urpmi.addmedia:77 ../urpmi.update:42
+#: ../urpmi.addmedia:79 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:80
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 
-#: ../urpmi.addmedia:79
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
 
-#: ../urpmi.addmedia:101
+#: ../urpmi.addmedia:103
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "已知的 xml-info 策略是 %s"
 
-#: ../urpmi.addmedia:112
+#: ../urpmi.addmedia:114
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "没有参数需要于 --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:119
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "无效的 <url> (如果是本地目录，必须是绝对路径)"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:123
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:124
+#: ../urpmi.addmedia:126
 #, c-format
 msgid "creating config file [%s]"
 msgstr "创建配置文件[%s]"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "使用 --distrib 不需要提供 <综合文件的相对路径>"
 
-#: ../urpmi.addmedia:141
+#: ../urpmi.addmedia:143
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2516,17 +2607,17 @@ msgstr ""
 "\n"
 "您是否想要添加介质“%s”"
 
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:169
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<综合文件的相对路径>找不到\n"
 
-#: ../urpmi.addmedia:170
+#: ../urpmi.addmedia:172
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
-#: ../urpmi.addmedia:182
+#: ../urpmi.addmedia:184
 #, c-format
 msgid "unable to add medium"
 msgstr "无法添加介质"
@@ -2713,57 +2804,57 @@ msgstr ""
 "用法: urpmi.update [选项] <名称> ...\n"
 "其中 <名称> 是要删除的介质名...\n"
 
-#: ../urpmi.update:41
+#: ../urpmi.update:43
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - 只使用更新介质。\n"
 
-#: ../urpmi.update:43
+#: ../urpmi.update:45
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi.update:44
+#: ../urpmi.update:46
 #, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - 不更新，将介质标为忽略。\n"
 
-#: ../urpmi.update:45
+#: ../urpmi.update:47
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - 不更新，将介质标为启用。\n"
 
-#: ../urpmi.update:47
+#: ../urpmi.update:49
 #, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
 msgstr "  --probe-rpms   - 不使用综合文件，直接使用 rpm 文件\n"
 
-#: ../urpmi.update:48
+#: ../urpmi.update:50
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update:49
+#: ../urpmi.update:51
 #, c-format
 msgid "  -f             - force updating synthesis\n"
 msgstr "  -f             - 强迫更新综合文件。\n"
 
-#: ../urpmi.update:50
+#: ../urpmi.update:52
 #, c-format
 msgid "  -ff            - really force updating synthesis\n"
 msgstr "  -ff            - 强迫更新综合文件。\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:69
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:75
+#: ../urpmi.update:77
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:93
+#: ../urpmi.update:95
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2772,17 +2863,17 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:97
+#: ../urpmi.update:99
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpmi.update:98
+#: ../urpmi.update:100
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
-#: ../urpmi.update:98
+#: ../urpmi.update:100
 #, c-format
 msgid "enabling media %s"
 msgstr "启用介质 %s"
@@ -2810,96 +2901,111 @@ msgid ""
 "packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
-#: ../urpmq:54
+#: ../urpmq:53
+#, c-format
+msgid "  --auto-orphans - list orphans\n"
+msgstr ""
+
+#: ../urpmq:55
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmq:57
+#: ../urpmq:58
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的软件包。\n"
 
-#: ../urpmq:58
+#: ../urpmq:59
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 列出可用的介质。\n"
 
-#: ../urpmq:59
+#: ../urpmq:60
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
-#: ../urpmq:60
+#: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
 
-#: ../urpmq:61
+#: ../urpmq:62
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
-#: ../urpmq:62
+#: ../urpmq:63
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
-#: ../urpmq:63
+#: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmq:64
+#: ../urpmq:65
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
-#: ../urpmq:66
+#: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许查询架构不匹配的 RPM。\n"
 
-#: ../urpmq:70
+#: ../urpmq:71
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr "  --use-distrib  - 从发行版树中实时配置 urpmi。这将允许查询发行版。\n"
 
-#: ../urpmq:80
+#: ../urpmq:81
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印更新日志。\n"
 
-#: ../urpmq:81
+#: ../urpmq:82
 #, c-format
 msgid "  --conflicts    - print conflicts.\n"
 msgstr "  --conflicts    - 打印 conflict 标签。\n"
 
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid "  --obsoletes    - print obsoletes.\n"
+msgstr "  --obsoletes    - obsolets 标签\n"
+
+#: ../urpmq:84
 #, c-format
 msgid "  --provides     - print provides.\n"
 msgstr "  --provides     - 打印 provides。\n"
 
-#: ../urpmq:83
+#: ../urpmq:85
 #, c-format
 msgid "  --requires     - print requires.\n"
 msgstr "  --requires     - 打印 requires 标签。\n"
 
-#: ../urpmq:84
+#: ../urpmq:86
+#, fuzzy, c-format
+msgid "  --suggests     - print suggests.\n"
+msgstr "  --suggests     - suggests 标签\n"
+
+#: ../urpmq:87
 #, c-format
 msgid "  --sourcerpm    - print sourcerpm.\n"
 msgstr "  --sourcerpm    - 打印源 rpm 名称。\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 打印摘要。\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
 #, c-format
 msgid ""
 "  --requires-recursive, -d\n"
@@ -2908,12 +3014,12 @@ msgstr ""
 "  --requires-recursive, -d\n"
 "                   - 查询软件包依赖关系。\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr "  --whatrequires - 逆序搜索需要软件包的软件包。\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
@@ -2922,7 +3028,7 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                   - 扩展逆序搜索(包括虚拟软件包)。\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
 #, c-format
 msgid ""
 "  --whatprovides, -p\n"
@@ -2931,96 +3037,120 @@ msgstr ""
 "  --whatprovides, -p\n"
 "                   - 允许在 provides 中寻找软件包。\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:97
+#: ../urpmq:100
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:98
+#: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:99
+#: ../urpmq:102
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:100
+#: ../urpmq:103
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -m             - 与 -du 等价。\n"
 
-#: ../urpmq:101
+#: ../urpmq:104
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:102
+#: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmq:103
+#: ../urpmq:106
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:104
+#: ../urpmq:107
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmq:105
+#: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 类似于 -y，但强制不区分大小写匹配。\n"
 
-#: ../urpmq:106
+#: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:185
+#: ../urpmq:156
+#, c-format
+msgid "usage: \"urpmq --auto-orphans\" with no argument"
+msgstr ""
+
+#: ../urpmq:209
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:209
+#: ../urpmq:233
 #, c-format
 msgid "use -l to list files"
 msgstr "使用 -l 可列出文件"
 
-#: ../urpmq:382
+#: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 只返回部分结果"
 
-#: ../urpmq:383
+#: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 只返回部分结果"
 
-#: ../urpmq:386
+#: ../urpmq:408
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:387
+#: ../urpmq:409
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:451
+#: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
+
+#~ msgid "malformed URL: [%s]"
+#~ msgstr "URL 格式错误: [%s]"
+
+#~ msgid "sorry, you can't use --install-src to install remote .src.rpm files"
+#~ msgstr "抱歉，您无法用 --install-src 安装远程 .src.rpm 文件"
+
+#~ msgid "Error"
+#~ msgstr "出错"
+
+#~ msgid "%d installation transaction failed"
+#~ msgid_plural "%d installation transactions failed"
+#~ msgstr[0] "%d 安装交易失败"
+
+#~ msgid "Package %s can not be installed"
+#~ msgstr "软件包 %s 无法安装"
+
+#~ msgid "Checking to remove the following packages"
+#~ msgstr "检查删除下列软件包"