From 7f0d62494dd698d607426c6e82f6ff04cd531f87 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 25 Feb 2008 10:15:04 +0000
Subject: sync with code

---
 po/zh_CN.po | 1002 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 534 insertions(+), 468 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a014aa88..27aa5a8a 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-02-14 13:05+0100\n"
+"POT-Creation-Date: 2008-02-25 11:14+0100\n"
 "PO-Revision-Date: 2007-08-22 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:114 ../urpmi:625
+#: ../gurpmi2:114 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -186,13 +186,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:215 ../urpmi:591
+#: ../gurpmi2:215 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:216 ../urpmi:592
+#: ../gurpmi2:216 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -224,7 +224,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:260 ../urpmi:619
+#: ../gurpmi2:260 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
@@ -305,7 +305,7 @@ msgstr "                    默认为 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -315,68 +315,68 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:108
+#: ../urpm.pm:110
 #, c-format
 msgid "fail to create directory %s"
 msgstr "创建目录 %s 失败"
 
-#: ../urpm.pm:109
+#: ../urpm.pm:111
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "目录 %s 的所有者无效"
 
-#: ../urpm.pm:208
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:222
+#: ../urpm.pm:224
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:228
+#: ../urpm.pm:230
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:230 ../urpm/get_pkgs.pm:158
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:233 ../urpm/download.pm:686 ../urpm/get_pkgs.pm:160
-#: ../urpm/media.pm:742 ../urpm/media.pm:1144 ../urpm/media.pm:1320
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:238
+#: ../urpm.pm:240
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:243
+#: ../urpm.pm:245
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:251
+#: ../urpm.pm:253
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:255
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:257
+#: ../urpm.pm:259
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:355
+#: ../urpm.pm:357
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
@@ -391,32 +391,32 @@ msgstr "命令行声明的代理服务器无效\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:352
+#: ../urpm/args.pm:353
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:419
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:437
+#: ../urpm/args.pm:438
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:440 ../urpm/args.pm:443
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:451
+#: ../urpm/args.pm:452
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:48 ../urpmi:246
+#: ../urpm/bug_report.pm:48 ../urpmi:247
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -436,7 +436,7 @@ msgstr "无法读取配置文件[%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "介质“%s”定义了两次，正在退出"
 
-#: ../urpm/cfg.pm:248 ../urpm/media.pm:443 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
@@ -471,87 +471,87 @@ msgstr "%s 失败: 退出信号为 %d"
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:229
+#: ../urpm/download.pm:234
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:235
+#: ../urpm/download.pm:240
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:300
+#: ../urpm/download.pm:305
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:425
+#: ../urpm/download.pm:430
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:464
+#: ../urpm/download.pm:469
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:530
+#: ../urpm/download.pm:535
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:549
+#: ../urpm/download.pm:554
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:565
+#: ../urpm/download.pm:570
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:573
+#: ../urpm/download.pm:578
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:676
+#: ../urpm/download.pm:681
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:678
+#: ../urpm/download.pm:683
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:735
+#: ../urpm/download.pm:740
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:739
+#: ../urpm/download.pm:744
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:752
+#: ../urpm/download.pm:772
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:772
+#: ../urpm/download.pm:792
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 不可用，默认回到 %s"
 
-#: ../urpm/download.pm:776
+#: ../urpm/download.pm:796
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:797
+#: ../urpm/download.pm:817
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -566,17 +566,17 @@ msgstr "清除 %s 和 %s"
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm/get_pkgs.pm:134
+#: ../urpm/get_pkgs.pm:136
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "URL 格式错误: [%s]"
 
-#: ../urpm/get_pkgs.pm:147
+#: ../urpm/get_pkgs.pm:149
 #, 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:154
+#: ../urpm/get_pkgs.pm:156
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
@@ -597,32 +597,42 @@ msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:179
+#: ../urpm/install.pm:180
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:190
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:227
+#: ../urpm/install.pm:196
+#, fuzzy, c-format
+msgid "removing bad rpm (%s) from %s"
+msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
+
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
+#, fuzzy, c-format
+msgid "removing %s failed: %s"
+msgstr "...获取失败: %s"
+
+#: ../urpm/install.pm:235
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:228
+#: ../urpm/install.pm:236
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:243
+#: ../urpm/install.pm:252
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:260
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -718,37 +728,44 @@ msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
 #: ../urpm/main_loop.pm:264
+#, fuzzy, c-format
+msgid ""
+"Installation failed, bad rpms:\n"
+"%s"
+msgstr "安装失败: "
+
+#: ../urpm/main_loop.pm:270
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] "%d 安装交易失败"
 
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:281
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpm/main_loop.pm:280
+#: ../urpm/main_loop.pm:286
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:294
 #, c-format
 msgid "Package %s is already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/main_loop.pm:289
+#: ../urpm/main_loop.pm:295
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/main_loop.pm:292
+#: ../urpm/main_loop.pm:298
 #, c-format
 msgid "Package %s can not be installed"
 msgstr "软件包 %s 无法安装"
 
-#: ../urpm/main_loop.pm:293
+#: ../urpm/main_loop.pm:299
 #, c-format
 msgid "Packages %s can not be installed"
 msgstr "软件包 %s 无法安装"
@@ -763,67 +780,67 @@ msgstr "正在检查 %s 文件"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告: %s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm/media.pm:185
+#: ../urpm/media.pm:187
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm/media.pm:187
+#: ../urpm/media.pm:189
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm/media.pm:194
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的综合文件，介质被忽略"
 
-#: ../urpm/media.pm:221
+#: ../urpm/media.pm:223
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "试图覆盖已有介质“%s”，正跳过"
 
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:409
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的挂载点太多"
 
-#: ../urpm/media.pm:403
+#: ../urpm/media.pm:410
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm/media.pm:406
+#: ../urpm/media.pm:413
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr "介质“%s”是一个 ISO 映像，将会被实时挂载"
 
-#: ../urpm/media.pm:409
+#: ../urpm/media.pm:416
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm/media.pm:414 ../urpm/media.pm:417
+#: ../urpm/media.pm:421 ../urpm/media.pm:424
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm/media.pm:445 ../urpm/media.pm:451
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:501
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm/media.pm:502
+#: ../urpm/media.pm:509
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm/media.pm:518
+#: ../urpm/media.pm:525
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -832,162 +849,162 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib 或 --parallel 一起使用"
 
-#: ../urpm/media.pm:602
+#: ../urpm/media.pm:612
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始: %s 结束: %s"
 
-#: ../urpm/media.pm:617
+#: ../urpm/media.pm:627
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm/media.pm:633
+#: ../urpm/media.pm:643
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm/media.pm:658
+#: ../urpm/media.pm:668
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm/media.pm:686
+#: ../urpm/media.pm:710
 #, c-format
 msgid "(ignored by default)"
 msgstr "(默认忽略)"
 
-#: ../urpm/media.pm:692
+#: ../urpm/media.pm:716
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
-#: ../urpm/media.pm:698
+#: ../urpm/media.pm:722
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
-#: ../urpm/media.pm:725
+#: ../urpm/media.pm:750
 #, c-format
 msgid "unable to mount the distribution medium"
 msgstr "无法挂载发行版介质"
 
-#: ../urpm/media.pm:728
+#: ../urpm/media.pm:753
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
 
-#: ../urpm/media.pm:735
-#, c-format
-msgid "retrieving media.cfg file..."
-msgstr "正在获取 media.cfg 文件..."
-
-#: ../urpm/media.pm:740
+#: ../urpm/media.pm:769
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
-#: ../urpm/media.pm:743
+#: ../urpm/media.pm:772
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:790
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "跳过不兼容的介质“%s”(原因是 %s)"
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:839
+#, c-format
+msgid "retrieving media.cfg file..."
+msgstr "正在获取 media.cfg 文件..."
+
+#: ../urpm/media.pm:880
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:840
+#: ../urpm/media.pm:883
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:860
+#: ../urpm/media.pm:903
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:926
+#: ../urpm/media.pm:979
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:1017
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:970
+#: ../urpm/media.pm:1023
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:991
+#: ../urpm/media.pm:1044
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1002
+#: ../urpm/media.pm:1055
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1022
+#: ../urpm/media.pm:1075
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1035 ../urpm/media.pm:1117
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1037 ../urpm/media.pm:1092 ../urpm/media.pm:1336
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1088
+#: ../urpm/media.pm:1141
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1090 ../urpm/media.pm:1121
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1123
+#: ../urpm/media.pm:1177
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1210
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm/media.pm:1157 ../urpm/media.pm:1572
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1172
+#: ../urpm/media.pm:1227
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm/media.pm:1182
+#: ../urpm/media.pm:1237
 #, c-format
 msgid "comparing %s and %s"
 msgstr "比较 %s 和 %s"
 
-#: ../urpm/media.pm:1202
+#: ../urpm/media.pm:1257
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -997,64 +1014,84 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm/media.pm:1215
+#: ../urpm/media.pm:1270
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1241
+#: ../urpm/media.pm:1296
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1295
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm/media.pm:1312
+#: ../urpm/media.pm:1367
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1425
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1425
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1382
+#: ../urpm/media.pm:1437
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1386
+#: ../urpm/media.pm:1441
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1455
+#: ../urpm/media.pm:1512
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1566
+#: ../urpm/media.pm:1623
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
 
-#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:521 ../urpmi:610
+#: ../urpm/mirrors.pm:19
+#, c-format
+msgid "trying again with mirror %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:60
+#, c-format
+msgid "Could not find a mirror from mirrorlist %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:133
+#, c-format
+msgid "found geolocalisation %s %.2f %.2f from timezone %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:178
+#, c-format
+msgid "getting mirror list from %s"
+msgstr ""
+
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:522 ../urpmi:561
-#: ../urpmi:611 ../urpmi:641 ../urpmi:647 ../urpmi.addmedia:122
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
 #, c-format
 msgid "Yy"
 msgstr "yY是"
@@ -1174,224 +1211,7 @@ msgstr "非连贯介质“%s”标为可移动但实际不是"
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm/select.pm:21
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi 已经重新启动，而优先的软件包列表未更新"
-
-#: ../urpm/select.pm:23
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改：%s vs %s"
-
-#: ../urpm/select.pm:184
-#, c-format
-msgid "No package named %s"
-msgstr "没有叫做 %s 的软件包"
-
-#: ../urpm/select.pm:186 ../urpme:107
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s"
-
-#: ../urpm/select.pm:495 ../urpm/select.pm:538
-#, c-format
-msgid "due to missing %s"
-msgstr "原因是丢失 %s"
-
-#: ../urpm/select.pm:496
-#, c-format
-msgid "due to already installed %s"
-msgstr "原因是已经安装 %s"
-
-#: ../urpm/select.pm:497 ../urpm/select.pm:536
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "原因是不满足 %s"
-
-#: ../urpm/select.pm:503
-#, c-format
-msgid "trying to promote %s"
-msgstr "正在试图推广 %s"
-
-#: ../urpm/select.pm:504
-#, c-format
-msgid "in order to keep %s"
-msgstr "为了保留 %s"
-
-#: ../urpm/select.pm:532
-#, c-format
-msgid "in order to install %s"
-msgstr "为了安装 %s"
-
-#: ../urpm/select.pm:542
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "原因是与 %s 冲突"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "无效的签名(%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "无效的密钥 ID(%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "缺少签名(%s)"
-
-#: ../urpm/sys.pm:221
-#, c-format
-msgid "Can't write file"
-msgstr "无法写入文件"
-
-#: ../urpm/sys.pm:221
-#, c-format
-msgid "Can't open file"
-msgstr "无法打开文件"
-
-#: ../urpme:40
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 1999-2006 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpme:45 ../urpmf:35 ../urpmi:74 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 打印帮助信息。\n"
-
-#: ../urpme:46
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自动选中软件包。\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - 验证删除是否可以正确进行。\n"
-
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
-
-#: ../urpme:49 ../urpmi:109 ../urpmq:67
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
-
-#: ../urpme:50 ../urpmi:140
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - 在删除之前重新对文件打包\n"
-
-#: ../urpme:51
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
-
-#: ../urpme:52 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:60
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:69
-#, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - 不执行软件包脚本。\n"
-
-#: ../urpme:54
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
-"                   下安装/卸载 chroot。\n"
-
-#: ../urpme:56 ../urpmi:151 ../urpmq:84
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - 详细提示。\n"
-
-#: ../urpme:57
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
-
-#: ../urpme:70
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "只允许超级用户删除软件包"
-
-#: ../urpme:100
-#, c-format
-msgid "unknown packages"
-msgstr "未知的软件包"
-
-#: ../urpme:100
-#, c-format
-msgid "unknown package"
-msgstr "未知的软件包"
-
-#: ../urpme:113 ../urpmi:535
-#, c-format
-msgid "removing package %s will break your system"
-msgstr "如果删除软件包 %s 会破坏您的系统"
-
-#: ../urpme:115
-#, c-format
-msgid "Nothing to remove"
-msgstr "不需要删除任何东西。"
-
-#: ../urpme:120
-#, c-format
-msgid "Checking to remove the following packages"
-msgstr "检查删除下列软件包"
-
-#: ../urpme:124
-#, 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
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "删除 %d 个软件包吗?"
-
-#: ../urpme:128 ../urpmi:562 ../urpmi:642 ../urpmi.addmedia:125
-#, c-format
-msgid " (y/N) "
-msgstr "(是(y)/否(N))[否]"
-
-#: ../urpme:150
-#, c-format
-msgid "Removal failed"
-msgstr "删除失败"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1407,278 +1227,502 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../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"
+
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:131 ../urpmq:79
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:76 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:41 ../urpmi:75 ../urpmq:47
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
+
+#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:42 ../urpmi:79 ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:80 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:77 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 详细提示。\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "模式表达式: \n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 操作符。\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 操作符。\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT。\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括号。\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "标记清单:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 指定类似 printf 的输出格式\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   例如:“%%name:%%files”\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 体系\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 编译主机\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 编译时间\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 配置文件\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - conflict 标签\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - 软件包描述\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 发行版\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 周期\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --fiename      - 软件包文件名\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出软件包中包含的文件\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 分组\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - 许可协议\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 软件包名称\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsolets 标签\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provides 标签\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - requires 标签\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安装大小\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - suggests 标签\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:85 ../urpmq:94
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:197
+#: ../urpm/search.pm:197 ../urpmf:197
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:247 ../urpmi:253 ../urpmq:136
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "介质“%s”的 hdlist 不可用"
 
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "介质“%s”的综合文件不可用"
 
-#: ../urpmf:304
+#: ../urpm/search.pm:304 ../urpmf:306
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "介质“%s”没有可用的 xml-info"
 
+#: ../urpm/select.pm:21
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi 已经重新启动，而优先的软件包列表未更新"
+
+#: ../urpm/select.pm:23
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改：%s vs %s"
+
+#: ../urpm/select.pm:184
+#, c-format
+msgid "No package named %s"
+msgstr "没有叫做 %s 的软件包"
+
+#: ../urpm/select.pm:186 ../urpme:107
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s"
+
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
+#, c-format
+msgid "due to missing %s"
+msgstr "原因是丢失 %s"
+
+#: ../urpm/select.pm:496
+#, c-format
+msgid "due to already installed %s"
+msgstr "原因是已经安装 %s"
+
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "原因是不满足 %s"
+
+#: ../urpm/select.pm:503
+#, c-format
+msgid "trying to promote %s"
+msgstr "正在试图推广 %s"
+
+#: ../urpm/select.pm:504
+#, c-format
+msgid "in order to keep %s"
+msgstr "为了保留 %s"
+
+#: ../urpm/select.pm:532
+#, c-format
+msgid "in order to install %s"
+msgstr "为了安装 %s"
+
+#: ../urpm/select.pm:542
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "原因是与 %s 冲突"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "无效的签名(%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "无效的密钥 ID(%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "缺少签名(%s)"
+
+#: ../urpm/sys.pm:221
+#, c-format
+msgid "Can't write file"
+msgstr "无法写入文件"
+
+#: ../urpm/sys.pm:221
+#, c-format
+msgid "Can't open file"
+msgstr "无法打开文件"
+
+#: ../urpm/sys.pm:234
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "无法和 %2$s 一起使用 %1$s"
+
+#: ../urpme:40
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 1999-2006 Mandriva。\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpme:46
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自动选中软件包。\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - 验证删除是否可以正确进行。\n"
+
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
+
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
+
+#: ../urpme:50 ../urpmi:140
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - 在删除之前重新对文件打包\n"
+
+#: ../urpme:51
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - 不执行软件包脚本。\n"
+
+#: ../urpme:54
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
+"                   下安装/卸载 chroot。\n"
+
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - 详细提示。\n"
+
+#: ../urpme:57
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
+
+#: ../urpme:70
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "只允许超级用户删除软件包"
+
+#: ../urpme:100
+#, c-format
+msgid "unknown packages"
+msgstr "未知的软件包"
+
+#: ../urpme:100
+#, c-format
+msgid "unknown package"
+msgstr "未知的软件包"
+
+#: ../urpme:113 ../urpmi:536
+#, c-format
+msgid "removing package %s will break your system"
+msgstr "如果删除软件包 %s 会破坏您的系统"
+
+#: ../urpme:115
+#, c-format
+msgid "Nothing to remove"
+msgstr "不需要删除任何东西。"
+
+#: ../urpme:120
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "检查删除下列软件包"
+
+#: ../urpme:124
+#, 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
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "删除 %d 个软件包吗?"
+
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
+#, c-format
+msgid " (y/N) "
+msgstr "(是(y)/否(N))[否]"
+
+#: ../urpme:150
+#, c-format
+msgid "Removal failed"
+msgstr "删除失败"
+
 #: ../urpmi:69
 #, c-format
 msgid ""
@@ -1865,7 +1909,7 @@ msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 给 aria2 传递额外的选项\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:49 ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
@@ -1879,7 +1923,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:125 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1888,7 +1932,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:127 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1996,51 +2040,56 @@ msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
 #: ../urpmi:152
+#, fuzzy, c-format
+msgid "  --debug        - very verbose mode.\n"
+msgstr "  --verbose      - 详细提示。\n"
+
+#: ../urpmi:153
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:180
+#: ../urpmi:181
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:187
+#: ../urpmi:188
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:214
+#: ../urpmi:215
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:240
+#: ../urpmi:241
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:241
+#: ../urpmi:242
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpmi:274
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2049,48 +2098,48 @@ msgstr ""
 "错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:361
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:446
+#: ../urpmi:447
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:448
+#: ../urpmi:449
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:454
+#: ../urpmi:455
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:457
+#: ../urpmi:458
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:498
+#: ../urpmi:499
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2100,7 +2149,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:501
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2110,7 +2159,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:507 ../urpmi:523
+#: ../urpmi:508 ../urpmi:524
 #, c-format
 msgid ""
 "\n"
@@ -2119,12 +2168,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:508 ../urpmi:524 ../urpmi:612 ../urpmi.addmedia:125
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:516
+#: ../urpmi:517
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2133,7 +2182,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:518
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2142,7 +2191,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:544
+#: ../urpmi:545
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2152,7 +2201,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:546
+#: ../urpmi:547
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2162,7 +2211,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:554
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2171,7 +2220,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:554
+#: ../urpmi:555
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2180,12 +2229,12 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:556
+#: ../urpmi:557
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:577
+#: ../urpmi:578
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2193,38 +2242,38 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:594
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:600
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:601
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:602
+#: ../urpmi:603
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:620
+#: ../urpmi:621
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:625
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:664
+#: ../urpmi:665
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -2232,7 +2281,7 @@ msgstr "重新启动 urpmi"
 #. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
 #. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -2242,6 +2291,15 @@ msgid ""
 "       http://<host>/<path>\n"
 "       removable://<path>\n"
 "\n"
+"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
+"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
+"\n"
+"examples:\n"
+"\n"
+"  urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+"  urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+"\n"
+"\n"
 "and [options] are from\n"
 msgstr ""
 "用法: urpmi.addmedia [选项] <名称> <url>\n"
@@ -2254,27 +2312,27 @@ msgstr ""
 "\n"
 "而 [options] 可以来自\n"
 
-#: ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prizlla      - 用 prozilla 取远程文件。\n"
 
-#: ../urpmi.addmedia:54
+#: ../urpmi.addmedia:63
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质。\n"
 
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:64
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2282,113 +2340,116 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:66
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 使用综合文件。\n"
 
-#: ../urpmi.addmedia:58
+#: ../urpmi.addmedia:67
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - 使用 rpm 文件(而不是综合文件)。\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:68
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件文件。\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:72
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 对于 --distrib，请求每个介质的确认\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:73
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 对于 --distrib，添加列出的每个介质\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:74
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:67
-#, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+#: ../urpmi.addmedia:76
+#, fuzzy, c-format
+msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
 
-#: ../urpmi.addmedia:69 ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:78
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
 
-#: ../urpmi.addmedia:94
+#: ../urpmi.addmedia:102
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:102
+#: ../urpmi.addmedia:113
+#, c-format
+msgid "no argument needed for --distrib --mirrorlist <url>"
+msgstr ""
+
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "无效的 <url> (如果是本地目录，必须是绝对路径)"
 
-#: ../urpmi.addmedia:105
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:108
+#: ../urpmi.addmedia:125
 #, c-format
 msgid "creating config file [%s]"
 msgstr "创建配置文件[%s]"
 
-#: ../urpmi.addmedia:109
+#: ../urpmi.addmedia:126
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:134
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "使用 --distrib 不需要提供 <综合文件的相对路径>"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:142
 #, c-format
 msgid ""
 "\n"
@@ -2397,16 +2458,21 @@ msgstr ""
 "\n"
 "您是否想要添加介质“%s”"
 
-#: ../urpmi.addmedia:150
+#: ../urpmi.addmedia:168
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<综合文件的相对路径>找不到\n"
 
-#: ../urpmi.addmedia:153
+#: ../urpmi.addmedia:171
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
+#: ../urpmi.addmedia:183
+#, fuzzy, c-format
+msgid "unable to add medium"
+msgstr "无法访问介质“%s”"
+
 #: ../urpmi.recover:28
 #, c-format
 msgid ""
@@ -2859,29 +2925,29 @@ msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:358
+#: ../urpmq:360
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr "由于介质“%s”没有 hdlist，软件包 %s 只返回部分结果"
 
-#: ../urpmq:359
+#: ../urpmq:361
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 只返回部分结果"
 
-#: ../urpmq:362
+#: ../urpmq:364
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:363
+#: ../urpmq:365
 #, fuzzy, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:427
+#: ../urpmq:429
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
-- 
cgit v1.2.1