sync with code

1 files changed, 134 insertions, 134 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a115f08b..12dabb63 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-08-29 19:51+0200\n"
+"POT-Creation-Date: 2008-09-04 18:36+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:32 ../gurpmi2:73
+#: ../gurpmi:31 ../gurpmi2:74
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
 
-#: ../gurpmi:46
+#: ../gurpmi:45
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
+#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi:67
+#: ../gurpmi:66
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../gurpmi:75 ../gurpmi:86
+#: ../gurpmi:74 ../gurpmi:85
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../gurpmi:81
+#: ../gurpmi:80
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -89,22 +89,22 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../gurpmi:99
+#: ../gurpmi:98
 #, c-format
 msgid "_Install"
 msgstr "安装(_I)"
 
-#: ../gurpmi:100
+#: ../gurpmi:99
 #, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:101 ../gurpmi2:171
+#: ../gurpmi:100 ../gurpmi2:175
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gurpmi:109
+#: ../gurpmi:108
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
@@ -203,17 +203,17 @@ msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包�
 msgid "No packages specified"
 msgstr "未指定软件包"
 
-#: ../gurpmi2:52
+#: ../gurpmi2:53
 #, c-format
 msgid "Please wait..."
 msgstr "请稍候..."
 
-#: ../gurpmi2:61
+#: ../gurpmi2:62
 #, c-format
 msgid "Must be root"
 msgstr "必须是 root"
 
-#: ../gurpmi2:103
+#: ../gurpmi2:106
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -224,42 +224,42 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:131
+#: ../gurpmi2:134
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:131 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:171
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:168
+#: ../gurpmi2:172
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:175
 #, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:172
+#: ../gurpmi2:176
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:196
+#: ../gurpmi2:200
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:218
+#: ../gurpmi2:222
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -270,60 +270,60 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:237 ../urpmi:607
+#: ../gurpmi2:241 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:238 ../urpmi:608
+#: ../gurpmi2:242 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:240
+#: ../gurpmi2:244
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 个软件包，%d MB)"
 
-#: ../gurpmi2:246
+#: ../gurpmi2:250
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:248 ../urpm/main_loop.pm:49
+#: ../gurpmi2:252 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:262 ../urpm/install.pm:88
+#: ../gurpmi2:266 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi2:266
+#: ../gurpmi2:270
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:283 ../urpmi:635
+#: ../gurpmi2:287 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
 
-#: ../gurpmi2:294
+#: ../gurpmi2:298
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:320
+#: ../gurpmi2:324
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:328 ../urpm/main_loop.pm:111
+#: ../gurpmi2:332 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -334,28 +334,28 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:338 ../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 "安装失败: "
 
-#: ../gurpmi2:339
+#: ../gurpmi2:343
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:341
+#: ../gurpmi2:345
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:342 ../urpme:167
+#: ../gurpmi2:346 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:350 ../urpmi:702
+#: ../gurpmi2:354 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -414,59 +414,64 @@ msgstr "创建目录 %s 失败"
 msgid "invalid owner for directory %s"
 msgstr "目录 %s 的所有者无效"
 
-#: ../urpm.pm:258
+#: ../urpm.pm:124
+#, fuzzy, c-format
+msgid "Can not download packages into %s"
+msgstr "无法写入重新打包目录 [%s]\n"
+
+#: ../urpm.pm:274
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:272
+#: ../urpm.pm:288
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:278
+#: ../urpm.pm:294
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226
+#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
-#: ../urpm/media.pm:1474
+#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
+#: ../urpm/media.pm:1486
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:288
+#: ../urpm.pm:304
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:293
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:301
+#: ../urpm.pm:317
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:303
+#: ../urpm.pm:319
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:307
+#: ../urpm.pm:323
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:394
+#: ../urpm.pm:410
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
@@ -526,7 +531,7 @@ msgstr "无法和 %2$s 一起使用 %1$s"
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:48 ../urpmi:258
+#: ../urpm/bug_report.pm:51 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -568,127 +573,127 @@ msgstr "无法读取配置文件[%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "介质“%s”定义了两次，正在退出"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm/download.pm:109
+#: ../urpm/download.pm:113
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr ""
 
-#: ../urpm/download.pm:134
+#: ../urpm/download.pm:138
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入访问代理服务器所需的认证信息\n"
 
-#: ../urpm/download.pm:135
+#: ../urpm/download.pm:139
 #, c-format
 msgid "User name:"
 msgstr "用户名:"
 
-#: ../urpm/download.pm:135
+#: ../urpm/download.pm:139
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../urpm/download.pm:219
+#: ../urpm/download.pm:214
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "未知的 webfetch“%s”!!!\n"
 
-#: ../urpm/download.pm:228
+#: ../urpm/download.pm:222
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失败: 退出信号为 %d"
 
-#: ../urpm/download.pm:229
+#: ../urpm/download.pm:223
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:252
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:264
+#: ../urpm/download.pm:258
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:331
+#: ../urpm/download.pm:325
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:456
+#: ../urpm/download.pm:450
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:495
+#: ../urpm/download.pm:489
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:563
+#: ../urpm/download.pm:557
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:582
+#: ../urpm/download.pm:576
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:598
+#: ../urpm/download.pm:592
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:606
+#: ../urpm/download.pm:600
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:718
+#: ../urpm/download.pm:715
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:720
+#: ../urpm/download.pm:717
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:783
+#: ../urpm/download.pm:782
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:787
+#: ../urpm/download.pm:786
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:815
+#: ../urpm/download.pm:834
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:836
+#: ../urpm/download.pm:862
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 不可用，默认回到 %s"
 
-#: ../urpm/download.pm:840
+#: ../urpm/download.pm:866
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:886
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -703,12 +708,7 @@ msgstr "清除 %s 和 %s"
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm/get_pkgs.pm:218
-#, fuzzy, c-format
-msgid "Can not download packages into %s"
-msgstr "无法写入重新打包目录 [%s]\n"
-
-#: ../urpm/get_pkgs.pm:222
+#: ../urpm/get_pkgs.pm:213
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
@@ -919,27 +919,27 @@ msgstr "无法访问“%s”的综合文件，介质被忽略"
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "试图覆盖已有介质“%s”，正跳过"
 
-#: ../urpm/media.pm:445
+#: ../urpm/media.pm:456
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr "迁移可移动设备失败，忽略介质"
 
-#: ../urpm/media.pm:488 ../urpm/media.pm:494
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm/media.pm:537
+#: ../urpm/media.pm:548
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm/media.pm:545
+#: ../urpm/media.pm:556
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm/media.pm:561
+#: ../urpm/media.pm:572
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -948,217 +948,217 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib 或 --parallel 一起使用"
 
-#: ../urpm/media.pm:655
+#: ../urpm/media.pm:666
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始: %s 结束: %s"
 
-#: ../urpm/media.pm:672
+#: ../urpm/media.pm:683
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm/media.pm:688
+#: ../urpm/media.pm:699
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm/media.pm:713
+#: ../urpm/media.pm:724
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm/media.pm:756
+#: ../urpm/media.pm:767
 #, c-format
 msgid "(ignored by default)"
 msgstr "(默认忽略)"
 
-#: ../urpm/media.pm:762
+#: ../urpm/media.pm:773
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
-#: ../urpm/media.pm:768
+#: ../urpm/media.pm:779
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
-#: ../urpm/media.pm:797
+#: ../urpm/media.pm:808
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目录 %s 不存在"
 
-#: ../urpm/media.pm:805
+#: ../urpm/media.pm:816
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
 
-#: ../urpm/media.pm:823
+#: ../urpm/media.pm:834
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:837
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:844
+#: ../urpm/media.pm:855
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "跳过不兼容的介质“%s”(原因是 %s)"
 
-#: ../urpm/media.pm:896
+#: ../urpm/media.pm:907
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在获取 media.cfg 文件..."
 
-#: ../urpm/media.pm:937
+#: ../urpm/media.pm:948
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:951
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:960
+#: ../urpm/media.pm:971
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:1043
+#: ../urpm/media.pm:1055
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1089
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:1083
+#: ../urpm/media.pm:1095
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1099
+#: ../urpm/media.pm:1111
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成命名文件出错：依赖关系 %d 未找到"
 
-#: ../urpm/media.pm:1120
+#: ../urpm/media.pm:1132
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1131
+#: ../urpm/media.pm:1143
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1151
+#: ../urpm/media.pm:1163
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
+#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
+#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1217
+#: ../urpm/media.pm:1229
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
+#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1253
+#: ../urpm/media.pm:1265
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1298
+#: ../urpm/media.pm:1310
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源综合文件的 md5sum"
 
-#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
+#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "获取[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1327
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "在 %s 上 genhdlist2 失败"
 
-#: ../urpm/media.pm:1325
+#: ../urpm/media.pm:1337
 #, c-format
 msgid "comparing %s and %s"
 msgstr "比较 %s 和 %s"
 
-#: ../urpm/media.pm:1350
+#: ../urpm/media.pm:1362
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1376
+#: ../urpm/media.pm:1388
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在复制“%s”的 MD5SUM..."
 
-#: ../urpm/media.pm:1418
+#: ../urpm/media.pm:1430
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm/media.pm:1449
+#: ../urpm/media.pm:1461
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源综合文件..."
 
-#: ../urpm/media.pm:1466
+#: ../urpm/media.pm:1478
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "发现探测的综合文件 为 %s"
 
-#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
+#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现综合文件"
 
-#: ../urpm/media.pm:1524
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1548
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1540
+#: ../urpm/media.pm:1552
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1614
+#: ../urpm/media.pm:1626
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1734
+#: ../urpm/media.pm:1746
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "获取[%s]失败"
@@ -1168,17 +1168,17 @@ msgstr "获取[%s]失败"
 msgid "trying again with mirror %s"
 msgstr "正在重试连接镜像 %s"
 
-#: ../urpm/mirrors.pm:52
+#: ../urpm/mirrors.pm:71
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "无法从镜像列表 %s 里找到一个镜像"
 
-#: ../urpm/mirrors.pm:181
+#: ../urpm/mirrors.pm:194
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 
-#: ../urpm/mirrors.pm:226
+#: ../urpm/mirrors.pm:239
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"