updated pot file

1 files changed, 344 insertions, 337 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c786cfed..e13d50c2 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: 2004-11-26 11:39+0100\n"
+"POT-Creation-Date: 2005-01-03 13:52+0100\n"
 "PO-Revision-Date: 2004-12-05 01:16+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "自动安装软件包...\n"
 "您要求安装软件包 %s\n"
 
-#: ../_irpm:33 ../urpme:29 ../urpmi:554
+#: ../_irpm:33 ../urpme:29 ../urpmi:471
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
 
-#: ../_irpm:35 ../urpm/msg.pm:41
+#: ../_irpm:35
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../_irpm:36 ../urpm/msg.pm:42
+#: ../_irpm:36
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:459 ../urpmi:482 ../urpmi:562
+#: ../_irpm:44 ../urpmi:386 ../urpmi:404 ../urpmi:475
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -122,129 +122,129 @@ msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm:195
+#: ../urpm.pm:200
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:196
+#: ../urpm.pm:201
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:209 ../urpm.pm:1201 ../urpm.pm:1211
+#: ../urpm.pm:214 ../urpm.pm:1222 ../urpm.pm:1232
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:212 ../urpm.pm:2346
+#: ../urpm.pm:217 ../urpm.pm:2370
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:240
+#: ../urpm.pm:245
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图跳过已有介质“%s”，避免中"
 
-#: ../urpm.pm:248
+#: ../urpm.pm:253
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:258
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm.pm:262
+#: ../urpm.pm:267
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:269
+#: ../urpm.pm:274
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:291
+#: ../urpm.pm:296
 #, c-format
 msgid "inconsistent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:299
+#: ../urpm.pm:304
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:332
+#: ../urpm.pm:337
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的载入点太多"
 
-#: ../urpm.pm:333
+#: ../urpm.pm:338
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm.pm:337
+#: ../urpm.pm:342
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm.pm:342 ../urpm.pm:345
+#: ../urpm.pm:347 ../urpm.pm:350
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm.pm:370
+#: ../urpm.pm:375
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:374
+#: ../urpm.pm:379
 #, c-format
 msgid "unable to write file [%s]"
 msgstr "无法写入文件[%s]"
 
-#: ../urpm.pm:381
+#: ../urpm.pm:386
 #, c-format
 msgid "write config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:393
+#: ../urpm.pm:398
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:402
+#: ../urpm.pm:407
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:412
+#: ../urpm.pm:417
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:422
+#: ../urpm.pm:427
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:426
+#: ../urpm.pm:431
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:430
+#: ../urpm.pm:435
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:446
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -253,158 +253,158 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:502 ../urpm.pm:528 ../urpm.pm:960 ../urpm.pm:971 ../urpm.pm:1040
-#: ../urpm.pm:1057 ../urpm.pm:1125 ../urpm.pm:1184 ../urpm.pm:1393
-#: ../urpm.pm:1514 ../urpm.pm:1629 ../urpm.pm:1635 ../urpm.pm:1735
-#: ../urpm.pm:1820 ../urpm.pm:1824
+#: ../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
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:506 ../urpm.pm:521 ../urpm.pm:534 ../urpm.pm:963 ../urpm.pm:974
-#: ../urpm.pm:1046 ../urpm.pm:1052 ../urpm.pm:1130 ../urpm.pm:1188
-#: ../urpm.pm:1397 ../urpm.pm:1518 ../urpm.pm:1623 ../urpm.pm:1641
-#: ../urpm.pm:1830
+#: ../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
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:516 ../urpm.pm:967
+#: ../urpm.pm:521 ../urpm.pm:986
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:546
+#: ../urpm.pm:551
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始：%s 结束：%s"
 
-#: ../urpm.pm:551 ../urpm.pm:981 ../urpm.pm:1065 ../urpm.pm:1134
-#: ../urpm.pm:1522
+#: ../urpm.pm:556 ../urpm.pm:1000 ../urpm.pm:1084 ../urpm.pm:1155
+#: ../urpm.pm:1546
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:557 ../urpm.pm:1773
+#: ../urpm.pm:562 ../urpm.pm:1797
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:572
+#: ../urpm.pm:577
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:585
+#: ../urpm.pm:590
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:596 ../urpm.pm:2159 ../urpm.pm:2223 ../urpm.pm:2787
-#: ../urpm.pm:2904
+#: ../urpm.pm:601 ../urpm.pm:2183 ../urpm.pm:2247 ../urpm.pm:2816
+#: ../urpm.pm:2930
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:633
+#: ../urpm.pm:640
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:640
+#: ../urpm.pm:647
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr "虚拟介质必须是本地的"
 
-#: ../urpm.pm:666
+#: ../urpm.pm:673
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:686
+#: ../urpm.pm:695
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:690
+#: ../urpm.pm:699
 #, c-format
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:692 ../urpm.pm:1079 ../urpm.pm:1154
+#: ../urpm.pm:701 ../urpm.pm:1100 ../urpm.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:693 ../urpm.pm:1080 ../urpm.pm:1229 ../urpm.pm:1285
-#: ../urpm.pm:1461 ../urpm.pm:1468
+#: ../urpm.pm:702 ../urpm.pm:1101 ../urpm.pm:1250 ../urpm.pm:1309
+#: ../urpm.pm:1485 ../urpm.pm:1492
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:696 ../urpm.pm:719 ../urpm.pm:750
+#: ../urpm.pm:705 ../urpm.pm:729 ../urpm.pm:763
 #, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
 
-#: ../urpm.pm:702
+#: ../urpm.pm:712
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:713 ../urpm.pm:1504 ../urpm.pm:1968 ../urpm.pm:2660
+#: ../urpm.pm:723 ../urpm.pm:1528 ../urpm.pm:1992 ../urpm.pm:2684
 #: ../urpmi.addmedia:167
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:715 ../urpm.pm:1488 ../urpm.pm:1497 ../urpm.pm:1971
-#: ../urpm.pm:2662 ../urpmi.addmedia:169
+#: ../urpm.pm:725 ../urpm.pm:1512 ../urpm.pm:1521 ../urpm.pm:1995
+#: ../urpm.pm:2686 ../urpmi.addmedia:169
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:735
+#: ../urpm.pm:747
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:800
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:788
+#: ../urpm.pm:802
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:788
+#: ../urpm.pm:802 ../urpmi.update:94
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:818
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:855
+#: ../urpm.pm:869
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm.pm:884
+#: ../urpm.pm:898
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm.pm:891
+#: ../urpm.pm:905
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm.pm:1018
+#: ../urpm.pm:1037
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -414,231 +414,231 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1069
+#: ../urpm.pm:1088
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1077
+#: ../urpm.pm:1098
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1101 ../urpm.pm:1369
+#: ../urpm.pm:1122 ../urpm.pm:1393
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1150
+#: ../urpm.pm:1171
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1164
+#: ../urpm.pm:1185
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1169
+#: ../urpm.pm:1190
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1171
+#: ../urpm.pm:1192
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1192 ../urpm.pm:1401 ../urpm.pm:1738
+#: ../urpm.pm:1213 ../urpm.pm:1425 ../urpm.pm:1762
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1242
+#: ../urpm.pm:1267
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1257
+#: ../urpm.pm:1282
 #, c-format
 msgid "no rpms read"
 msgstr "没有读到 rpm"
 
-#: ../urpm.pm:1267
+#: ../urpm.pm:1292
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1272
+#: ../urpm.pm:1297
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1419
+#: ../urpm.pm:1443
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1446
+#: ../urpm.pm:1470
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1495
+#: ../urpm.pm:1519
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1497
+#: ../urpm.pm:1521
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1593
+#: ../urpm.pm:1617
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1600
+#: ../urpm.pm:1624
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1611 ../urpm.pm:1665
+#: ../urpm.pm:1635 ../urpm.pm:1689
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1651
+#: ../urpm.pm:1675
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1688
+#: ../urpm.pm:1712
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1695
+#: ../urpm.pm:1719
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1697
+#: ../urpm.pm:1721
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1712
+#: ../urpm.pm:1736
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1719
+#: ../urpm.pm:1743
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1746
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1787
+#: ../urpm.pm:1811
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1792
+#: ../urpm.pm:1816
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:1807 ../urpm.pm:1842
+#: ../urpm.pm:1831 ../urpm.pm:1866
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm.pm:1810 ../urpm.pm:1845 ../urpmi:360
+#: ../urpm.pm:1834 ../urpm.pm:1869 ../urpmi:307
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1866
+#: ../urpm.pm:1890
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1870
+#: ../urpm.pm:1894
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:1920
+#: ../urpm.pm:1944
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:1936
+#: ../urpm.pm:1960
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:1960
+#: ../urpm.pm:1984
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:1966
+#: ../urpm.pm:1990
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:1973 ../urpm.pm:2829
+#: ../urpm.pm:1997 ../urpm.pm:2858
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:1978
+#: ../urpm.pm:2002
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:1981
+#: ../urpm.pm:2005
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2005
+#: ../urpm.pm:2029
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../urpm.pm:2096
+#: ../urpm.pm:2120
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2099 ../urpme:88
+#: ../urpm.pm:2123 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2283 ../urpm.pm:2327 ../urpm.pm:2353
+#: ../urpm.pm:2307 ../urpm.pm:2351 ../urpm.pm:2377
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2338
+#: ../urpm.pm:2362
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2365
+#: ../urpm.pm:2389
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -647,168 +647,168 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2369
+#: ../urpm.pm:2393
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2381
+#: ../urpm.pm:2405
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2421 ../urpm.pm:2436 ../urpm.pm:2460 ../urpm.pm:2475
+#: ../urpm.pm:2445 ../urpm.pm:2460 ../urpm.pm:2484 ../urpm.pm:2499
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2527 ../urpm.pm:2530 ../urpm.pm:2560
+#: ../urpm.pm:2551 ../urpm.pm:2554 ../urpm.pm:2584
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2556
+#: ../urpm.pm:2580
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2564
+#: ../urpm.pm:2588
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2576
+#: ../urpm.pm:2600
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2638
+#: ../urpm.pm:2662
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2645
+#: ../urpm.pm:2669
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2726 ../urpmi:714
+#: ../urpm.pm:2751
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../urpm.pm:2760
+#: ../urpm.pm:2789
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2791
+#: ../urpm.pm:2820
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2794
+#: ../urpm.pm:2823
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2801
+#: ../urpm.pm:2830
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2803
+#: ../urpm.pm:2832
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2813
+#: ../urpm.pm:2842
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:2816
+#: ../urpm.pm:2845
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:2878
+#: ../urpm.pm:2905
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
-#: ../urpm.pm:3036 ../urpm.pm:3069
+#: ../urpm.pm:3062 ../urpm.pm:3095
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3037 ../urpm.pm:3067
+#: ../urpm.pm:3063 ../urpm.pm:3093
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3038
+#: ../urpm.pm:3064
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3039
+#: ../urpm.pm:3065
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3062
+#: ../urpm.pm:3088
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3074
+#: ../urpm.pm:3100
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3076
+#: ../urpm.pm:3102
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3092
+#: ../urpm.pm:3118
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3124
+#: ../urpm.pm:3150
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3126
+#: ../urpm.pm:3152
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm.pm:3175
+#: ../urpm.pm:3201
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:3184
+#: ../urpm.pm:3210
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm/args.pm:89 ../urpm/args.pm:96
+#: ../urpm/args.pm:92 ../urpm/args.pm:99
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:231
+#: ../urpm/args.pm:230
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/msg.pm:83
+#: ../urpm/msg.pm:63
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
@@ -829,35 +829,35 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:41 ../urpmf:32 ../urpmi:75 ../urpmi.addmedia:47
+#: ../urpme:41 ../urpmf:32 ../urpmi:76 ../urpmi.addmedia:47
 #: ../urpmi.removemedia:44 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpme:42 ../urpmi:82
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:43 ../urpmi:123
+#: ../urpme:43 ../urpmi:121
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpme:44 ../urpmi:96 ../urpmq:64
+#: ../urpme:44 ../urpmi:97 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:45 ../urpmi:101 ../urpmq:65
+#: ../urpme:45 ../urpmi:102 ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:46 ../urpmi:102
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
@@ -871,8 +871,8 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:49 ../urpmi:137 ../urpmi.addmedia:79 ../urpmi.removemedia:49
-#: ../urpmi.update:46 ../urpmq:90
+#: ../urpme:49 ../urpmi:135 ../urpmi.addmedia:79 ../urpmi.removemedia:49
+#: ../urpmi.update:48 ../urpmq:90
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             -详细的提示。\n"
@@ -908,16 +908,17 @@ msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
 #: ../urpme:106
-#, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
-#: ../urpme:108 ../urpmi:512 ../urpmi:660
+#: ../urpme:108 ../urpmi:429 ../urpmi:549
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:111 ../urpmi:703
+#: ../urpme:111 ../urpmi:597
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
@@ -943,22 +944,22 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:33 ../urpmi:76 ../urpmq:44
+#: ../urpmf:33 ../urpmi:77 ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:34 ../urpmi:77 ../urpmq:45
+#: ../urpmf:34 ../urpmi:78 ../urpmq:45
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:35 ../urpmi:79 ../urpmq:47
+#: ../urpmf:35 ../urpmi:80 ../urpmq:47
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:36 ../urpmi:80 ../urpmq:48
+#: ../urpmf:36 ../urpmi:81 ../urpmq:48
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1070,7 +1071,7 @@ msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
 
-#: ../urpmf:58 ../urpmi:116 ../urpmq:74
+#: ../urpmf:58 ../urpmi:117 ../urpmq:74
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1129,7 +1130,7 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:124 ../urpmi:253 ../urpmq:114
+#: ../urpmf:124 ../urpmi:200 ../urpmq:114
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1146,7 +1147,7 @@ msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
 
-#: ../urpmi:70
+#: ../urpmi:71
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1162,32 +1163,32 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:78 ../urpmq:46
+#: ../urpmi:79 ../urpmq:46
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
-#: ../urpmi:81
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmi:83 ../urpmq:50
+#: ../urpmi:84 ../urpmq:50
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:84
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:85 ../urpmq:52
+#: ../urpmi:86 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1195,7 +1196,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:87
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1205,37 +1206,37 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:90
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:91 ../urpmq:51
+#: ../urpmi:92 ../urpmq:51
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmi:92 ../urpmq:60
+#: ../urpmi:93 ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmi:93
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:94
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean        -  首先删除缓存中的rpm。\n"
 
-#: ../urpmi:95
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
 
-#: ../urpmi:97
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1244,7 +1245,7 @@ msgstr ""
 "  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
 "                   就安装软件包。\n"
 
-#: ../urpmi:99
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1253,7 +1254,7 @@ msgstr ""
 "  --allow-force  - 允许提示用户安装软件包而不\n"
 "                   检查依赖性和完整性。\n"
 
-#: ../urpmi:103
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1262,22 +1263,22 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:105 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:68
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:68
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:106 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:69
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:69
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:50 ../urpmi.update:33
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:108
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1286,7 +1287,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:110 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:70
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:70
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1295,7 +1296,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:72
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:72
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1304,7 +1305,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   口令(格式如 <用户: 口令>)。\n"
 
-#: ../urpmi:114
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1313,45 +1314,31 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:118
-#, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - 使用 X 界面。\n"
-
 #: ../urpmi:119
 #, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - 根据运行环境选择最好的界面:\n"
-"                   X 或文本模式。\n"
-
-#: ../urpmi:121
-#, c-format
-msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:124
+#: ../urpmi:122
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:125
+#: ../urpmi:123
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:126
+#: ../urpmi:124
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:127
+#: ../urpmi:125
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -1359,161 +1346,97 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:129 ../urpmi.addmedia:75 ../urpmi.update:41
+#: ../urpmi:127 ../urpmi.addmedia:75 ../urpmi.update:41
 #, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr "  --norebuild    - 如果 hdlist 不可读的话，不尝试重新创建。\n"
 
-#: ../urpmi:130
+#: ../urpmi:128
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:131 ../urpmq:77
+#: ../urpmi:129 ../urpmq:77
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:132
+#: ../urpmi:130
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmi:133
+#: ../urpmi:131
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpmi:134 ../urpmq:91
+#: ../urpmi:132 ../urpmq:91
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:135 ../urpmq:88
+#: ../urpmi:133 ../urpmq:88
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:136 ../urpmi.addmedia:78 ../urpmi.removemedia:48
-#: ../urpmi.update:45
+#: ../urpmi:134 ../urpmi.addmedia:78 ../urpmi.removemedia:48
+#: ../urpmi.update:47
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:138
+#: ../urpmi:136
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:145
-#, c-format
-msgid "Choose location to save file"
-msgstr "选择保存文件的位置"
-
-#: ../urpmi:201
+#: ../urpmi:181
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:208
-#, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"您选择了源软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改然后进\n"
-"行编译)。\n"
-"\n"
-"您想要执行什么操作?"
-
-#: ../urpmi:216
-#, c-format
-msgid "Do nothing"
-msgstr "什么也不做"
-
-#: ../urpmi:217
-#, c-format
-msgid "Yes, really install it"
-msgstr "是，进行安装"
-
-#: ../urpmi:218 ../urpmi:235
-#, c-format
-msgid "Save file"
-msgstr "保存文件"
-
-#: ../urpmi:229
-#, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"您即将在您的计算机上安装下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"您也可以选择只是保存相应的软件包。您要进行什么操作?"
-
-#: ../urpmi:234
-#, c-format
-msgid "Install it"
-msgstr "安装"
-
-#: ../urpmi:243
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:244
+#: ../urpmi:191
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:247 ../urpmi:370
+#: ../urpmi:194 ../urpmi:317
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:264
+#: ../urpmi:211
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:403
+#: ../urpmi:220
+#, c-format
+msgid ""
+"Error: %s appears to be mounted read-only.\n"
+"Use --allow-force to force operation."
+msgstr ""
+
+#: ../urpmi:350
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../urpmi:416
+#: ../urpmi:353
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:424 ../urpmi:575
-#, c-format
-msgid "Package installation..."
-msgstr "软件包安装..."
-
-#: ../urpmi:424 ../urpmi:575
-#, c-format
-msgid "Initializing..."
-msgstr "正在初始化..."
-
-#: ../urpmi:447
+#: ../urpmi:378
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1523,12 +1446,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
 "%s"
 
-#: ../urpmi:453 ../urpmi:476 ../urpmi:507
-#, c-format
-msgid "do you agree ?"
-msgstr "您同意吗?"
-
-#: ../urpmi:459 ../urpmi:482
+#: ../urpmi:386 ../urpmi:404
 #, c-format
 msgid ""
 "\n"
@@ -1537,7 +1455,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../urpmi:471
+#: ../urpmi:397
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1546,7 +1464,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:496
+#: ../urpmi:417
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1556,7 +1474,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:502
+#: ../urpmi:423
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1565,21 +1483,21 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:541 ../urpmi:552
+#: ../urpmi:458 ../urpmi:469
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
 "(%d MB)"
 msgstr "为了满足依赖性要求，将另外安装以下%d个软件包(%d MB)"
 
-#: ../urpmi:542 ../urpmi:553
+#: ../urpmi:459 ../urpmi:470
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr "为了满足依赖性要求，将另外安装下列软件包(%d MB)"
 
-#: ../urpmi:548
+#: ../urpmi:465
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1588,37 +1506,32 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:571 ../urpmq:302
+#: ../urpmi:483 ../urpmq:302
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../urpmi:585
+#: ../urpmi:494
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
 
-#: ../urpmi:586
+#: ../urpmi:495
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:630
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr "正在下载软件包“%s”..."
-
-#: ../urpmi:647
+#: ../urpmi:540
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:648
+#: ../urpmi:541
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:668 ../urpmi:795
+#: ../urpmi:556 ../urpmi:672
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1629,52 +1542,52 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../urpmi:678 ../urpmi:733 ../urpmi:754 ../urpmi:774
+#: ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi:693
+#: ../urpmi:581
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:701
-#, c-format
-msgid "installing %s"
+#: ../urpmi:592
+#, fuzzy, c-format
+msgid "installing %s from %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:716
+#: ../urpmi:594
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安装软件包“%s”(%s/%s)..."
+msgid "installing %s"
+msgstr "正在安装 %s"
 
-#: ../urpmi:740
+#: ../urpmi:617
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:759
+#: ../urpmi:636
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:800
+#: ../urpmi:677
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:808
+#: ../urpmi:685
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:811
+#: ../urpmi:688
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "全部安装完成"
 
-#: ../urpmi:825
+#: ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新启动 urpmi"
@@ -1780,12 +1693,12 @@ msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file://
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:76 ../urpmi.removemedia:46 ../urpmi.update:43
+#: ../urpmi.addmedia:76 ../urpmi.removemedia:46 ../urpmi.update:45
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia:77 ../urpmi.update:44
+#: ../urpmi.addmedia:77 ../urpmi.update:46
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件。\n"
@@ -1912,21 +1825,31 @@ msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
 
 #: ../urpmi.update:42
+#, fuzzy, c-format
+msgid "  --ignore       - don't update, mark the media as ignored.\n"
+msgstr "  --norebuild    - 如果 hdlist 不可读的话，不尝试重新创建。\n"
+
+#: ../urpmi.update:43
+#, c-format
+msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
+msgstr ""
+
+#: ../urpmi.update:44
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update:63
+#: ../urpmi.update:64
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:71
+#: ../urpmi.update:72
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:90
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1935,6 +1858,16 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
+#: ../urpmi.update:95
+#, fuzzy, c-format
+msgid "ignoring media %s"
+msgstr "删除介质“%s”"
+
+#: ../urpmi.update:95
+#, fuzzy, c-format
+msgid "enabling media %s"
+msgstr "删除介质“%s”"
+
 #: ../urpmq:38
 #, c-format
 msgid ""
@@ -2092,3 +2025,77 @@ msgstr "没有找到文件列表\n"
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
+
+#~ msgid "  --X            - use X interface.\n"
+#~ msgstr "  --X            - 使用 X 界面。\n"
+
+#~ msgid ""
+#~ "  --best-output  - choose best interface according to the environment:\n"
+#~ "                   X or text mode.\n"
+#~ msgstr ""
+#~ "  --best-output  - 根据运行环境选择最好的界面:\n"
+#~ "                   X 或文本模式。\n"
+
+#~ msgid "Choose location to save file"
+#~ msgstr "选择保存文件的位置"
+
+#~ msgid ""
+#~ "You have selected a source package:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "You probably didn't want to install it on your computer (installing it\n"
+#~ "would allow you to make modifications to its sourcecode then compile "
+#~ "it).\n"
+#~ "\n"
+#~ "What would you like to do?"
+#~ msgstr ""
+#~ "您选择了源软件包:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改然后进\n"
+#~ "行编译)。\n"
+#~ "\n"
+#~ "您想要执行什么操作?"
+
+#~ msgid "Do nothing"
+#~ msgstr "什么也不做"
+
+#~ msgid "Yes, really install it"
+#~ msgstr "是，进行安装"
+
+#~ msgid "Save file"
+#~ msgstr "保存文件"
+
+#~ msgid ""
+#~ "You are about to install the following software package on your "
+#~ "computer:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "You may prefer to just save it. What is your choice?"
+#~ msgstr ""
+#~ "您即将在您的计算机上安装下列软件包:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "您也可以选择只是保存相应的软件包。您要进行什么操作?"
+
+#~ msgid "Install it"
+#~ msgstr "安装"
+
+#~ msgid "Package installation..."
+#~ msgstr "软件包安装..."
+
+#~ msgid "Initializing..."
+#~ msgstr "正在初始化..."
+
+#~ msgid "do you agree ?"
+#~ msgstr "您同意吗?"
+
+#~ msgid "Downloading package `%s'..."
+#~ msgstr "正在下载软件包“%s”..."
+
+#~ msgid "Installing package `%s' (%s/%s)..."
+#~ msgstr "正在安装软件包“%s”(%s/%s)..."