Merge po files

1 files changed, 200 insertions, 196 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fc55c285..374701e5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-06 15:42+0100\n"
+"POT-Creation-Date: 2005-01-19 19:11+0100\n"
 "PO-Revision-Date: 2005-01-09 02:43+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -53,7 +53,7 @@ msgstr ""
 "自动安装软件包...\n"
 "您要求安装软件包 %s\n"
 
-#: ../_irpm:33 ../urpme:29 ../urpmi:471
+#: ../_irpm:33 ../urpme:29 ../urpmi:465
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
@@ -68,7 +68,7 @@ msgstr "确定"
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:386 ../urpmi:404 ../urpmi:475
+#: ../_irpm:44 ../urpmi:381 ../urpmi:399 ../urpmi:469
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -78,32 +78,22 @@ msgstr "(是(Y)/否(n))[是]"
 msgid "%s: command not found\n"
 msgstr "%s: 命令没找到\n"
 
-#: ../gurpmi:99
-#, c-format
-msgid "Please wait..."
-msgstr "请稍候..."
-
-#: ../gurpmi:110
+#: ../gurpmi:83 ../gurpmi2:106
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知选项 %s"
 
-#: ../gurpmi:114
+#: ../gurpmi:87 ../gurpmi2:110
 #, c-format
 msgid "No packages specified"
 msgstr "没有指定软件包"
 
-#: ../gurpmi:118
-#, c-format
-msgid "Must be root"
-msgstr "必须是 root"
-
-#: ../gurpmi:128
+#: ../gurpmi:97 ../gurpmi2:122
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
 
-#: ../gurpmi:141
+#: ../gurpmi:110
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -119,12 +109,12 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改后再"
-"编译)。\n"
+"您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改后再编"
+"译)。\n"
 "\n"
 "您想要执行什么操作?"
 
-#: ../gurpmi:149
+#: ../gurpmi:118
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -139,7 +129,7 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../gurpmi:154
+#: ../gurpmi:123
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -154,62 +144,73 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../gurpmi:164
+#: ../gurpmi:133
 #, c-format
 msgid "_Install"
 msgstr "安装(_I)"
 
-#: ../gurpmi:165
+#: ../gurpmi:134
 #, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:166 ../gurpmi:229
+#: ../gurpmi:135 ../gurpmi2:190
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gurpmi:170
+#: ../gurpmi:145
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../gurpmi:220
+#: ../gurpmi2:94
+#, c-format
+msgid "Please wait..."
+msgstr "请稍候..."
+
+#: ../gurpmi2:112
+#, c-format
+msgid "Must be root"
+msgstr "必须是 root"
+
+#: ../gurpmi2:142
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"某些要求的软件包无法安装:\n"
+"%s\n"
+"继续吗?"
+
+#: ../gurpmi2:181
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi:221
+#: ../gurpmi2:182
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi:225 ../urpmi:350
+#: ../gurpmi2:186 ../urpmi:346
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi:230 ../gurpmi:246
+#: ../gurpmi2:191 ../gurpmi2:207
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi:247
+#: ../gurpmi2:208
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi:276
-#, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"Continue?"
-msgstr ""
-"某些要求的软件包无法安装:\n"
-"%s\n继续吗?"
-
-#: ../gurpmi:287
+#: ../gurpmi2:228
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -217,37 +218,40 @@ msgid ""
 "Continue?"
 msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
-"%s\n继续吗?"
+"%s\n"
+"继续吗?"
 
-#: ../gurpmi:300
+#: ../gurpmi2:242
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr "为了满足依赖性要求，将另外安装以下%d个软件包:\n%s\n"
+msgstr ""
+"为了满足依赖性要求，将另外安装以下%d个软件包:\n"
+"%s\n"
 
-#: ../gurpmi:307
+#: ../gurpmi2:249
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi:309 ../urpmi:483 ../urpmq:302
+#: ../gurpmi2:251 ../urpmi:477 ../urpmq:302
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi:323 ../urpmi:494
+#: ../gurpmi2:265 ../urpmi:488
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
 
-#: ../gurpmi:350
+#: ../gurpmi2:292
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi:365
+#: ../gurpmi2:307
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -261,7 +265,7 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../gurpmi:372 ../gurpmi:421 ../urpmi:556 ../urpmi:672
+#: ../gurpmi2:314 ../gurpmi2:363 ../urpmi:550 ../urpmi:666
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -272,37 +276,37 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi:379 ../urpme:111 ../urpmi:597
+#: ../gurpmi2:321 ../urpme:111 ../urpmi:591
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi:387 ../urpm.pm:2751
+#: ../gurpmi2:329 ../urpm.pm:2757
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi:389
+#: ../gurpmi2:331
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi:407 ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
+#: ../gurpmi2:349 ../urpmi:560 ../urpmi:604 ../urpmi:625 ../urpmi:645
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../gurpmi:416
+#: ../gurpmi2:358
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi:424 ../urpmi:688
+#: ../gurpmi2:366 ../urpmi:682
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "全部安装完成"
 
-#: ../gurpmi:426
+#: ../gurpmi2:368
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
@@ -361,12 +365,12 @@ msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:214 ../urpm.pm:1222 ../urpm.pm:1232
+#: ../urpm.pm:214 ../urpm.pm:1228 ../urpm.pm:1238
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:217 ../urpm.pm:2370
+#: ../urpm.pm:217 ../urpm.pm:2376
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
@@ -482,23 +486,23 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:507 ../urpm.pm:533 ../urpm.pm:979 ../urpm.pm:990 ../urpm.pm:1059
-#: ../urpm.pm:1076 ../urpm.pm:1146 ../urpm.pm:1205 ../urpm.pm:1417
-#: ../urpm.pm:1538 ../urpm.pm:1653 ../urpm.pm:1659 ../urpm.pm:1759
-#: ../urpm.pm:1844 ../urpm.pm:1848
+#: ../urpm.pm:507 ../urpm.pm:533 ../urpm.pm:985 ../urpm.pm:996 ../urpm.pm:1065
+#: ../urpm.pm:1082 ../urpm.pm:1152 ../urpm.pm:1211 ../urpm.pm:1423
+#: ../urpm.pm:1544 ../urpm.pm:1659 ../urpm.pm:1665 ../urpm.pm:1765
+#: ../urpm.pm:1850 ../urpm.pm:1854
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:511 ../urpm.pm:526 ../urpm.pm:539 ../urpm.pm:982 ../urpm.pm:993
-#: ../urpm.pm:1065 ../urpm.pm:1071 ../urpm.pm:1151 ../urpm.pm:1209
-#: ../urpm.pm:1421 ../urpm.pm:1542 ../urpm.pm:1647 ../urpm.pm:1665
-#: ../urpm.pm:1854
+#: ../urpm.pm:511 ../urpm.pm:526 ../urpm.pm:539 ../urpm.pm:988 ../urpm.pm:999
+#: ../urpm.pm:1071 ../urpm.pm:1077 ../urpm.pm:1157 ../urpm.pm:1215
+#: ../urpm.pm:1427 ../urpm.pm:1548 ../urpm.pm:1653 ../urpm.pm:1671
+#: ../urpm.pm:1860
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:521 ../urpm.pm:986
+#: ../urpm.pm:521 ../urpm.pm:992
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
@@ -508,13 +512,13 @@ msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 msgid "Search start: %s end: %s"
 msgstr "搜索开始：%s 结束：%s"
 
-#: ../urpm.pm:556 ../urpm.pm:1000 ../urpm.pm:1084 ../urpm.pm:1155
-#: ../urpm.pm:1546
+#: ../urpm.pm:556 ../urpm.pm:1006 ../urpm.pm:1090 ../urpm.pm:1161
+#: ../urpm.pm:1552
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:562 ../urpm.pm:1797
+#: ../urpm.pm:562 ../urpm.pm:1803
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
@@ -529,8 +533,8 @@ msgstr "跳过软件包 %s"
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:601 ../urpm.pm:2183 ../urpm.pm:2247 ../urpm.pm:2816
-#: ../urpm.pm:2930
+#: ../urpm.pm:601 ../urpm.pm:2189 ../urpm.pm:2253 ../urpm.pm:2822
+#: ../urpm.pm:2936
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
@@ -550,90 +554,90 @@ msgstr "虚拟介质必须是本地的"
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:695
+#: ../urpm.pm:700
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:699
+#: ../urpm.pm:704
 #, c-format
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:701 ../urpm.pm:1100 ../urpm.pm:1175
+#: ../urpm.pm:706 ../urpm.pm:1106 ../urpm.pm:1181
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:702 ../urpm.pm:1101 ../urpm.pm:1250 ../urpm.pm:1309
-#: ../urpm.pm:1485 ../urpm.pm:1492
+#: ../urpm.pm:707 ../urpm.pm:1107 ../urpm.pm:1256 ../urpm.pm:1315
+#: ../urpm.pm:1491 ../urpm.pm:1498
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:705 ../urpm.pm:729 ../urpm.pm:763
+#: ../urpm.pm:710 ../urpm.pm:734 ../urpm.pm:769
 #, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
 
-#: ../urpm.pm:712
+#: ../urpm.pm:717
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:723 ../urpm.pm:1528 ../urpm.pm:1992 ../urpm.pm:2684
+#: ../urpm.pm:728 ../urpm.pm:1534 ../urpm.pm:1998 ../urpm.pm:2690
 #: ../urpmi.addmedia:167
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:725 ../urpm.pm:1512 ../urpm.pm:1521 ../urpm.pm:1995
-#: ../urpm.pm:2686 ../urpmi.addmedia:169
+#: ../urpm.pm:730 ../urpm.pm:1518 ../urpm.pm:1527 ../urpm.pm:2001
+#: ../urpm.pm:2692 ../urpmi.addmedia:169
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:747
+#: ../urpm.pm:752
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:806
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:802
+#: ../urpm.pm:808
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:802 ../urpmi.update:94
+#: ../urpm.pm:808 ../urpmi.update:94
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm:818
+#: ../urpm.pm:824
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:869
+#: ../urpm.pm:875
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm.pm:898
+#: ../urpm.pm:904
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm.pm:905
+#: ../urpm.pm:911
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:1043
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -643,231 +647,231 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1088
+#: ../urpm.pm:1094
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1098
+#: ../urpm.pm:1104
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1122 ../urpm.pm:1393
+#: ../urpm.pm:1128 ../urpm.pm:1399
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1171
+#: ../urpm.pm:1177
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1185
+#: ../urpm.pm:1191
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1190
+#: ../urpm.pm:1196
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1192
+#: ../urpm.pm:1198
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1213 ../urpm.pm:1425 ../urpm.pm:1762
+#: ../urpm.pm:1219 ../urpm.pm:1431 ../urpm.pm:1768
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1267
+#: ../urpm.pm:1273
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1282
+#: ../urpm.pm:1288
 #, c-format
 msgid "no rpms read"
 msgstr "没有读到 rpm"
 
-#: ../urpm.pm:1292
+#: ../urpm.pm:1298
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1297
+#: ../urpm.pm:1303
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1443
+#: ../urpm.pm:1449
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1470
+#: ../urpm.pm:1476
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1519
+#: ../urpm.pm:1525
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1521
+#: ../urpm.pm:1527
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1617
+#: ../urpm.pm:1623
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1624
+#: ../urpm.pm:1630
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1635 ../urpm.pm:1689
+#: ../urpm.pm:1641 ../urpm.pm:1695
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1675
+#: ../urpm.pm:1681
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1712
+#: ../urpm.pm:1718
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1719
+#: ../urpm.pm:1725
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1721
+#: ../urpm.pm:1727
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1736
+#: ../urpm.pm:1742
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1743
+#: ../urpm.pm:1749
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1746
+#: ../urpm.pm:1752
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1811
+#: ../urpm.pm:1817
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1816
+#: ../urpm.pm:1822
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:1831 ../urpm.pm:1866
+#: ../urpm.pm:1837 ../urpm.pm:1872
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm.pm:1834 ../urpm.pm:1869 ../urpmi:307
+#: ../urpm.pm:1840 ../urpm.pm:1875 ../urpmi:303
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1890
+#: ../urpm.pm:1896
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1894
+#: ../urpm.pm:1900
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:1944
+#: ../urpm.pm:1950
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:1960
+#: ../urpm.pm:1966
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:1984
+#: ../urpm.pm:1990
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:1990
+#: ../urpm.pm:1996
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:1997 ../urpm.pm:2858
+#: ../urpm.pm:2003 ../urpm.pm:2864
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:2008
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:2005
+#: ../urpm.pm:2011
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2029
+#: ../urpm.pm:2035
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../urpm.pm:2120
+#: ../urpm.pm:2126
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2123 ../urpme:88
+#: ../urpm.pm:2129 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2307 ../urpm.pm:2351 ../urpm.pm:2377
+#: ../urpm.pm:2313 ../urpm.pm:2357 ../urpm.pm:2383
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2362
+#: ../urpm.pm:2368
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2389
+#: ../urpm.pm:2395
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -876,158 +880,158 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2393
+#: ../urpm.pm:2399
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2405
+#: ../urpm.pm:2411
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2445 ../urpm.pm:2460 ../urpm.pm:2484 ../urpm.pm:2499
+#: ../urpm.pm:2451 ../urpm.pm:2466 ../urpm.pm:2490 ../urpm.pm:2505
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2551 ../urpm.pm:2554 ../urpm.pm:2584
+#: ../urpm.pm:2557 ../urpm.pm:2560 ../urpm.pm:2590
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2580
+#: ../urpm.pm:2586
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2588
+#: ../urpm.pm:2594
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2600
+#: ../urpm.pm:2606
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2662
+#: ../urpm.pm:2668
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2669
+#: ../urpm.pm:2675
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2789
+#: ../urpm.pm:2795
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2820
+#: ../urpm.pm:2826
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2823
+#: ../urpm.pm:2829
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2830
+#: ../urpm.pm:2836
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2832
+#: ../urpm.pm:2838
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2842
+#: ../urpm.pm:2848
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:2845
+#: ../urpm.pm:2851
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:2905
+#: ../urpm.pm:2911
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
-#: ../urpm.pm:3062 ../urpm.pm:3095
+#: ../urpm.pm:3068 ../urpm.pm:3101
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3063 ../urpm.pm:3093
+#: ../urpm.pm:3069 ../urpm.pm:3099
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3064
+#: ../urpm.pm:3070
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3065
+#: ../urpm.pm:3071
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3088
+#: ../urpm.pm:3094
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3100
+#: ../urpm.pm:3106
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3102
+#: ../urpm.pm:3108
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3118
+#: ../urpm.pm:3124
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3150
+#: ../urpm.pm:3156
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3152
+#: ../urpm.pm:3158
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm.pm:3201
+#: ../urpm.pm:3207
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:3210
+#: ../urpm.pm:3216
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm/args.pm:92 ../urpm/args.pm:99
+#: ../urpm/args.pm:90 ../urpm/args.pm:97
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:230
+#: ../urpm/args.pm:229
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
@@ -1137,7 +1141,7 @@ msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
 
-#: ../urpme:108 ../urpmi:429 ../urpmi:549
+#: ../urpme:108 ../urpmi:423 ../urpmi:543
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
@@ -1349,7 +1353,7 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:124 ../urpmi:200 ../urpmq:114
+#: ../urpmf:124 ../urpmi:198 ../urpmq:114
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1611,46 +1615,46 @@ msgstr "  -q             - 安静模式。\n"
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:181
+#: ../urpmi:179
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:190
+#: ../urpmi:188
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:191
+#: ../urpmi:189
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:194 ../urpmi:317
+#: ../urpmi:192 ../urpmi:313
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:211
+#: ../urpmi:209
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:220
+#: ../urpmi:218
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:353
+#: ../urpmi:348
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:378
+#: ../urpmi:373
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1660,7 +1664,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
 "%s"
 
-#: ../urpmi:386 ../urpmi:404
+#: ../urpmi:381 ../urpmi:399
 #, c-format
 msgid ""
 "\n"
@@ -1669,7 +1673,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../urpmi:397
+#: ../urpmi:392
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1678,7 +1682,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:417
+#: ../urpmi:412
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1688,7 +1692,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:423
+#: ../urpmi:417
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1697,21 +1701,21 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:458 ../urpmi:469
+#: ../urpmi:452 ../urpmi:463
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
 "(%d MB)"
 msgstr "为了满足依赖性要求，将另外安装以下%d个软件包(%d MB)"
 
-#: ../urpmi:459 ../urpmi:470
+#: ../urpmi:453 ../urpmi:464
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr "为了满足依赖性要求，将另外安装下列软件包(%d MB)"
 
-#: ../urpmi:465
+#: ../urpmi:459
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1720,57 +1724,57 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:495
+#: ../urpmi:489
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:540
+#: ../urpmi:534
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:541
+#: ../urpmi:535
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:581
+#: ../urpmi:575
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:592
+#: ../urpmi:586
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpmi:594
+#: ../urpmi:588
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:617
+#: ../urpmi:611
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:636
+#: ../urpmi:630
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:677
+#: ../urpmi:671
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:685
+#: ../urpmi:679
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:703
+#: ../urpmi:698
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新启动 urpmi"