updated pot file

1 files changed, 336 insertions, 268 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2cae96f9..8f7b553d 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-07-17 12:34+0200\n"
+"POT-Creation-Date: 2004-08-07 12:19+0200\n"
 "PO-Revision-Date: 2004-04-27 12:08+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:516
+#: ../_irpm:33 ../urpme:29 ../urpmi:522
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
@@ -68,7 +68,7 @@ msgstr "确定"
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:444 ../urpmi:524
+#: ../_irpm:44 ../urpmi:450 ../urpmi:530
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -102,144 +102,144 @@ msgstr "  -g [组]         - 限制结果为给定组。\n"
 msgid "                    defaults is %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../urpm.pm:59
+#: ../urpm.pm:67
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm:89
+#: ../urpm.pm:100
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm.pm:105
+#: ../urpm.pm:116
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm:177
+#: ../urpm.pm:190
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:178
+#: ../urpm.pm:191
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:192
+#: ../urpm.pm:205
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:195 ../urpm.pm:2262
+#: ../urpm.pm:208 ../urpm.pm:2343
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:223
+#: ../urpm.pm:236
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图跳过已有介质“%s”，避免中"
 
-#: ../urpm.pm:231
+#: ../urpm.pm:244
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:236
+#: ../urpm.pm:249
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm.pm:245
+#: ../urpm.pm:258
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:252
+#: ../urpm.pm:265
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:275
+#: ../urpm.pm:287
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:283
+#: ../urpm.pm:295
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:316
+#: ../urpm.pm:328
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的载入点太多"
 
-#: ../urpm.pm:317
+#: ../urpm.pm:329
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm.pm:321
+#: ../urpm.pm:333
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm.pm:326 ../urpm.pm:329
+#: ../urpm.pm:338 ../urpm.pm:341
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:366
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:358
+#: ../urpm.pm:370
 #, fuzzy, c-format
 msgid "unable to write file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:365
+#: ../urpm.pm:377
 #, c-format
 msgid "write config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:377
+#: ../urpm.pm:389
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:387
+#: ../urpm.pm:399
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:398
+#: ../urpm.pm:409
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:408
+#: ../urpm.pm:419
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:412
+#: ../urpm.pm:423
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:416
+#: ../urpm.pm:427
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:427
+#: ../urpm.pm:438
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -248,140 +248,148 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:478 ../urpm.pm:504 ../urpm.pm:889 ../urpm.pm:900 ../urpm.pm:961
-#: ../urpm.pm:978 ../urpm.pm:1061 ../urpm.pm:1118 ../urpm.pm:1311
-#: ../urpm.pm:1431 ../urpm.pm:1546 ../urpm.pm:1552 ../urpm.pm:1653
-#: ../urpm.pm:1732 ../urpm.pm:1736
+#: ../urpm.pm:489 ../urpm.pm:515 ../urpm.pm:946 ../urpm.pm:957 ../urpm.pm:1026
+#: ../urpm.pm:1043 ../urpm.pm:1127 ../urpm.pm:1185 ../urpm.pm:1401
+#: ../urpm.pm:1519 ../urpm.pm:1634 ../urpm.pm:1640 ../urpm.pm:1740
+#: ../urpm.pm:1819 ../urpm.pm:1823
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:482 ../urpm.pm:497 ../urpm.pm:510 ../urpm.pm:892 ../urpm.pm:903
-#: ../urpm.pm:967 ../urpm.pm:973 ../urpm.pm:1066 ../urpm.pm:1122
-#: ../urpm.pm:1315 ../urpm.pm:1435 ../urpm.pm:1540 ../urpm.pm:1558
-#: ../urpm.pm:1742
+#: ../urpm.pm:493 ../urpm.pm:508 ../urpm.pm:521 ../urpm.pm:949 ../urpm.pm:960
+#: ../urpm.pm:1032 ../urpm.pm:1038 ../urpm.pm:1132 ../urpm.pm:1189
+#: ../urpm.pm:1405 ../urpm.pm:1523 ../urpm.pm:1628 ../urpm.pm:1646
+#: ../urpm.pm:1829
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:492 ../urpm.pm:896
+#: ../urpm.pm:503 ../urpm.pm:953
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:520 ../urpm.pm:910 ../urpm.pm:986 ../urpm.pm:1070
-#: ../urpm.pm:1439
+#: ../urpm.pm:531 ../urpm.pm:967 ../urpm.pm:1051 ../urpm.pm:1136
+#: ../urpm.pm:1527
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:526 ../urpm.pm:1692
+#: ../urpm.pm:537 ../urpm.pm:1779
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:541
+#: ../urpm.pm:552
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:554
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:566 ../urpm.pm:2076 ../urpm.pm:2139 ../urpm.pm:2705
-#: ../urpm.pm:2822
+#: ../urpm.pm:576 ../urpm.pm:2157 ../urpm.pm:2220 ../urpm.pm:2785
+#: ../urpm.pm:2902
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:605
+#: ../urpm.pm:614
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:612
-#, c-format
-msgid "virtual medium needs to be local"
-msgstr "虚拟介质必须位于本地"
-
-#: ../urpm.pm:644
+#: ../urpm.pm:659
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:660
+#: ../urpm.pm:679
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:683
 #, c-format
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:666 ../urpm.pm:1001 ../urpm.pm:1090 ../urpm.pm:1153
-#: ../urpm.pm:1210 ../urpm.pm:1381 ../urpm.pm:1387
+#: ../urpm.pm:685 ../urpm.pm:1066 ../urpm.pm:1220 ../urpm.pm:1277
+#: ../urpm.pm:1469 ../urpm.pm:1475
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:666 ../urpm.pm:1001 ../urpm.pm:1094
+#: ../urpm.pm:686 ../urpm.pm:1067 ../urpm.pm:1160
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:668 ../urpm.pm:691 ../urpm.pm:719
-#, c-format
-msgid ""
-"unable to access first installation medium (no media/media_info/hdlists file "
-"found)"
+#: ../urpm.pm:688 ../urpm.pm:711 ../urpm.pm:738
+#, fuzzy, c-format
+msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "无法访问首次安装介质(未发现 media/media_info/hdlists 文件)"
 
-#: ../urpm.pm:674
+#: ../urpm.pm:694
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:685 ../urpm.pm:1421 ../urpm.pm:1887 ../urpm.pm:2577
-#: ../urpmi.addmedia:151
+#: ../urpm.pm:705 ../urpm.pm:1509 ../urpm.pm:1973 ../urpm.pm:2657
+#: ../urpmi.addmedia:162
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:687 ../urpm.pm:1405 ../urpm.pm:1414 ../urpm.pm:1890
-#: ../urpm.pm:2579 ../urpmi:615 ../urpmi.addmedia:153
+#: ../urpm.pm:707 ../urpm.pm:1493 ../urpm.pm:1502 ../urpm.pm:1976
+#: ../urpm.pm:2659 ../urpmi:621 ../urpmi.addmedia:164
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:707
+#: ../urpm.pm:726
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:756
+#: ../urpm.pm:775
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:758
+#: ../urpm.pm:777
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:758
+#: ../urpm.pm:777
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm:774
+#: ../urpm.pm:793
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:937
+#: ../urpm.pm:844
+#, fuzzy, c-format
+msgid "reconfiguring urpmi for media \"%s\""
+msgstr "正在从介质“%s”上获取 rpm 文件..."
+
+#: ../urpm.pm:870
+#, fuzzy, c-format
+msgid "...reconfiguration failed"
+msgstr "...复制失败"
+
+#: ../urpm.pm:877
+#, c-format
+msgid "reconfiguration done"
+msgstr ""
+
+#: ../urpm.pm:1004
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -391,229 +399,229 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:990
+#: ../urpm.pm:1055
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:998
+#: ../urpm.pm:1063
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1021 ../urpm.pm:1271
+#: ../urpm.pm:1087 ../urpm.pm:1361
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1032 ../urpm.pm:1282
+#: ../urpm.pm:1098 ../urpm.pm:1372
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:1086
+#: ../urpm.pm:1152
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1099
+#: ../urpm.pm:1165
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1103
+#: ../urpm.pm:1170
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1105
+#: ../urpm.pm:1172
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1126 ../urpm.pm:1319 ../urpm.pm:1656
+#: ../urpm.pm:1193 ../urpm.pm:1409 ../urpm.pm:1743
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1168
+#: ../urpm.pm:1235
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1193
+#: ../urpm.pm:1260
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1198
+#: ../urpm.pm:1265
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1337
+#: ../urpm.pm:1427
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1366
+#: ../urpm.pm:1454
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1412
+#: ../urpm.pm:1500
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1414
+#: ../urpm.pm:1502
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1510
+#: ../urpm.pm:1598
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1517
+#: ../urpm.pm:1605
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1528 ../urpm.pm:1582
+#: ../urpm.pm:1616 ../urpm.pm:1670
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1568
+#: ../urpm.pm:1656
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1606
+#: ../urpm.pm:1693
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1613
+#: ../urpm.pm:1700
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1615
+#: ../urpm.pm:1702
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1630
+#: ../urpm.pm:1717
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1637
+#: ../urpm.pm:1724
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1640
+#: ../urpm.pm:1727
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1706
+#: ../urpm.pm:1793
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1711
+#: ../urpm.pm:1798
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:1723 ../urpm.pm:1752 ../urpmi:353
+#: ../urpm.pm:1810 ../urpm.pm:1839 ../urpmi:355
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1772
+#: ../urpm.pm:1859
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1776
+#: ../urpm.pm:1863
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:1827
+#: ../urpm.pm:1913
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:1843
+#: ../urpm.pm:1929
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:1865
+#: ../urpm.pm:1951
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "depslist 中重新分配了 %s 项"
 
-#: ../urpm.pm:1866
+#: ../urpm.pm:1952
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "depslist 中没有重新分配项"
 
-#: ../urpm.pm:1879
+#: ../urpm.pm:1965
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:1885
+#: ../urpm.pm:1971
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:1892 ../urpm.pm:2747
+#: ../urpm.pm:1978 ../urpm.pm:2827
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:1897
+#: ../urpm.pm:1983
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:1900
+#: ../urpm.pm:1986
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2013
+#: ../urpm.pm:2094
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2016 ../urpme:88
+#: ../urpm.pm:2097 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2199 ../urpm.pm:2243 ../urpm.pm:2269
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2254
+#: ../urpm.pm:2335
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2281
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -622,143 +630,143 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2285
+#: ../urpm.pm:2366
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2297
+#: ../urpm.pm:2378
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2337 ../urpm.pm:2352 ../urpm.pm:2376 ../urpm.pm:2391
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2443 ../urpm.pm:2446 ../urpm.pm:2476
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2472
+#: ../urpm.pm:2553
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2480
+#: ../urpm.pm:2561
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2493
+#: ../urpm.pm:2573
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2555
+#: ../urpm.pm:2635
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2562
+#: ../urpm.pm:2642
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2644 ../urpmi:693
+#: ../urpm.pm:2724 ../urpmi:699
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../urpm.pm:2678
+#: ../urpm.pm:2758
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2709
+#: ../urpm.pm:2789
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2712
+#: ../urpm.pm:2792
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2799
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2721
+#: ../urpm.pm:2801
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2811
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:2734
+#: ../urpm.pm:2814
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:2796
+#: ../urpm.pm:2876
 #, fuzzy, c-format
 msgid "More information on package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2954 ../urpm.pm:2987
+#: ../urpm.pm:3034 ../urpm.pm:3067
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:2955 ../urpm.pm:2985
+#: ../urpm.pm:3035 ../urpm.pm:3065
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:2956
+#: ../urpm.pm:3036
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:2957
+#: ../urpm.pm:3037
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:2980
+#: ../urpm.pm:3060
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:2992
+#: ../urpm.pm:3072
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:2994
+#: ../urpm.pm:3074
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3010
+#: ../urpm.pm:3090
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3042
+#: ../urpm.pm:3122
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3044
+#: ../urpm.pm:3124
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
@@ -768,7 +776,7 @@ msgstr "缺少签名(%s)"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:224
+#: ../urpm/args.pm:226
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
@@ -779,23 +787,23 @@ msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
 #: ../urpme:36
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
+"Copyright (C) 1999-2004 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"urpme 版本 %s\n"
-"版权 (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
-"这是自由软件, 可以依照 GNU GPL 重新发布。\n"
+"urpmf 版本 %s\n"
+"版权 (C) 2002 Mandrakesoft.\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
 "\n"
 "用法:\n"
 
 #: ../urpme:41 ../urpmf:32 ../urpmi:74 ../urpmi.addmedia:47
-#: ../urpmi.removemedia:38 ../urpmi.update:30 ../urpmq:43
+#: ../urpmi.removemedia:41 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
@@ -836,7 +844,8 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:49 ../urpmi:131 ../urpmq:76
+#: ../urpme:49 ../urpmi:133 ../urpmi.addmedia:78 ../urpmi.removemedia:46
+#: ../urpmi.update:45 ../urpmq:76
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             -详细的提示。\n"
@@ -876,12 +885,12 @@ msgstr "检查删除下列软件包"
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
-#: ../urpme:108 ../urpmi:474 ../urpmi:639
+#: ../urpme:108 ../urpmi:480 ../urpmi:645
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:111 ../urpmi:682
+#: ../urpme:111 ../urpmi:688
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
@@ -960,126 +969,131 @@ msgid "  --all          - print all tags.\n"
 msgstr "  --all           - 打印全部标识符。\n"
 
 #: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --name         - print only package names.\n"
+msgstr "  --all           - 打印全部标识符。\n"
+
+#: ../urpmf:44
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - 打印标识符组: 分组。\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - 打印标识符大小: 大小。\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch          - 打印标识符周期: 周期。\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - 打印标识符摘要: 摘要。\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   -打印标识符描述: 描述。\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - 打印标识符源 rpm: 源 rpm。\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - 打印标识符打包者: 打包者。\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - 打印标识符创建主机: 创建主机。\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - 打印标识符 url: url。\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - 打印提供标识符: 所有的提供。\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - 打印需要标识符: 所有需要。\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - 打印文件标识符: 所有文件。\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
 
-#: ../urpmf:57 ../urpmi:114 ../urpmq:73
+#: ../urpmf:58 ../urpmi:114 ../urpmq:73
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmf:60 ../urpmq:89
+#: ../urpmf:61 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - 一元 NOT，如果表达为假，则为真。\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - 左括号用来打开一组表达。\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - 右括号用来关闭一组表达。\n"
 
-#: ../urpmf:114
+#: ../urpmf:115
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1088,31 +1102,36 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:119 ../urpmi:247 ../urpmq:112
+#: ../urpmf:120 ../urpmi:249 ../urpmq:113
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:150
+#: ../urpmf:151
 #, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmi:69
+#: ../urpmf:152
 #, c-format
+msgid "You may want to use --name to search for package names.\n"
+msgstr ""
+
+#: ../urpmi:69
+#, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
+"Copyright (C) 1999-2004 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"urpmi 版本 %s\n"
-"版权 (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
-"这是自由软件, 可以依照 GNU GPL 重新发布。\n"
+"urpmf 版本 %s\n"
+"版权 (C) 2002 Mandrakesoft.\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
 "\n"
 "用法:\n"
 
@@ -1298,52 +1317,60 @@ msgstr "  --excludedocs  - 排除文档文件。\n"
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpmi:125 ../urpmq:79
+#: ../urpmi:125
+#, c-format
+msgid ""
+"  --more-choices - when several packages are found, propose more choices\n"
+"                   than the default.\n"
+msgstr ""
+
+#: ../urpmi:127 ../urpmq:79
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:126
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmi:127
+#: ../urpmi:129
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpmi:128 ../urpmq:84
+#: ../urpmi:130 ../urpmq:84
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:129 ../urpmq:85
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:130
+#: ../urpmi:132 ../urpmi.addmedia:77 ../urpmi.removemedia:45
+#: ../urpmi.update:44
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:132
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:139
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../urpmi:195
+#: ../urpmi:197
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:202
+#: ../urpmi:204
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1364,22 +1391,22 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../urpmi:210
+#: ../urpmi:212
 #, c-format
 msgid "Do nothing"
 msgstr "什么也不做"
 
-#: ../urpmi:211
+#: ../urpmi:213
 #, c-format
 msgid "Yes, really install it"
 msgstr "是，进行安装"
 
-#: ../urpmi:212 ../urpmi:229
+#: ../urpmi:214 ../urpmi:231
 #, c-format
 msgid "Save file"
 msgstr "保存文件"
 
-#: ../urpmi:223
+#: ../urpmi:225
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1394,54 +1421,54 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../urpmi:228
+#: ../urpmi:230
 #, c-format
 msgid "Install it"
 msgstr "安装"
 
-#: ../urpmi:237
+#: ../urpmi:239
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:238
+#: ../urpmi:240
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:241 ../urpmi:363
+#: ../urpmi:243 ../urpmi:365
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:258
+#: ../urpmi:260
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:394
+#: ../urpmi:400
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../urpmi:401
+#: ../urpmi:407
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:410 ../urpmi:537
+#: ../urpmi:416 ../urpmi:543
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../urpmi:410 ../urpmi:537
+#: ../urpmi:416 ../urpmi:543
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../urpmi:433
+#: ../urpmi:439
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1450,19 +1477,19 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:438 ../urpmi:469
+#: ../urpmi:444 ../urpmi:475
 #, c-format
 msgid "do you agree ?"
 msgstr "您同意吗?"
 
-#: ../urpmi:444
+#: ../urpmi:450
 #, c-format
 msgid ""
 "\n"
 "Continue?"
 msgstr ""
 
-#: ../urpmi:458
+#: ../urpmi:464
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1472,7 +1499,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:464
+#: ../urpmi:470
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1481,21 +1508,21 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:514
+#: ../urpmi:509 ../urpmi:520
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
 "(%d MB)"
 msgstr "为了满足依赖性要求，将另外安装以下%d个软件包(%d MB)"
 
-#: ../urpmi:504 ../urpmi:515
+#: ../urpmi:510 ../urpmi:521
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
 
-#: ../urpmi:510
+#: ../urpmi:516
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1504,47 +1531,47 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:533 ../urpmq:297
+#: ../urpmi:539 ../urpmq:300
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../urpmi:547
+#: ../urpmi:553
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签“%s”的介质到设备 [%s]"
 
-#: ../urpmi:548
+#: ../urpmi:554
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:592
+#: ../urpmi:598
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../urpmi:604
+#: ../urpmi:610
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
 
-#: ../urpmi:607
+#: ../urpmi:613
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        已完成 %s%%，速度 = %s"
 
-#: ../urpmi:626
+#: ../urpmi:632
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:627
+#: ../urpmi:633
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:647 ../urpmi:774
+#: ../urpmi:653 ../urpmi:780
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1555,62 +1582,62 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../urpmi:657 ../urpmi:712 ../urpmi:733 ../urpmi:753
+#: ../urpmi:663 ../urpmi:718 ../urpmi:739 ../urpmi:759
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi:672
+#: ../urpmi:678
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:680
+#: ../urpmi:686
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:695
+#: ../urpmi:701
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../urpmi:719
+#: ../urpmi:725
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:738
+#: ../urpmi:744
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:779
+#: ../urpmi:785
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:787
+#: ../urpmi:793
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:790
+#: ../urpmi:796
 #, c-format
 msgid "Everything already installed"
 msgstr "全部安装完成"
 
-#: ../urpmi:804
+#: ../urpmi:810
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新启动 urpmi"
 
 #: ../urpmi.addmedia:38
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
-"       file://<path> with <relative filename of hdlist>\n"
+"       [file:/]/<path> with <relative filename of hdlist>\n"
 "       ftp://<login>:<password>@<host>/<path> with <relative filename of "
 "hdlist>\n"
 "       ftp://<host>/<path> with <relative filename of hdlist>\n"
@@ -1706,7 +1733,7 @@ msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file://
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:75 ../urpmi.removemedia:40 ../urpmi.update:42
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:43 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
@@ -1716,47 +1743,52 @@ msgstr "  -c             - 直接清除软件包头缓存。\n"
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:109
+#: ../urpmi.addmedia:115
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi.addmedia:137
+#: ../urpmi.addmedia:144
+#, c-format
+msgid "found version %s and arch %d ..."
+msgstr ""
+
+#: ../urpmi.addmedia:148
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "无法添加 cooker 发行版的更新\n"
 
-#: ../urpmi.addmedia:142
+#: ../urpmi.addmedia:153
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "正在获取 %s 处的镜像..."
 
-#: ../urpmi.addmedia:186
+#: ../urpmi.addmedia:206
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia:193 ../urpmi.addmedia:216
+#: ../urpmi.addmedia:213 ../urpmi.addmedia:236
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia:204
+#: ../urpmi.addmedia:224
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist相对路径>找不到\n"
 
-#: ../urpmi.addmedia:206
+#: ../urpmi.addmedia:226
 #, c-format
 msgid "`with' missing for network media\n"
 msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:214
+#: ../urpmi.addmedia:234
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
 
-#: ../urpmi.removemedia:36
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -1765,17 +1797,17 @@ msgstr ""
 "用法: urpmi.removemedia -a <名称> ...\n"
 "其中 <名称> 是要删除的介质名。\n"
 
-#: ../urpmi.removemedia:39
+#: ../urpmi.removemedia:42
 #, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质。\n"
 
-#: ../urpmi.removemedia:41
+#: ../urpmi.removemedia:44
 #, fuzzy, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi.removemedia:42
+#: ../urpmi.removemedia:47
 #, c-format
 msgid ""
 "\n"
@@ -1784,17 +1816,17 @@ msgstr ""
 "\n"
 "未知的选项“%s”\n"
 
-#: ../urpmi.removemedia:48
+#: ../urpmi.removemedia:53
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:63
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:65
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1827,17 +1859,17 @@ msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update:58
+#: ../urpmi.update:62
 #, fuzzy, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi.update:66
+#: ../urpmi.update:70
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1954,51 +1986,87 @@ msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆序搜索所需的软件包。\n"
 
-#: ../urpmq:86
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
+msgstr "  -a             - 在命令行选择所有匹配。\n"
+
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:87
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:88
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:90
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:91
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:151
+#: ../urpmq:152
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:328
+#: ../urpmq:331
 #, c-format
 msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpmq:389
+#: ../urpmq:392
 #, c-format
 msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpmq:399
+#: ../urpmq:402
 #, c-format
 msgid "No changelog found\n"
 msgstr ""
 
+#~ msgid "virtual medium needs to be local"
+#~ msgstr "虚拟介质必须位于本地"
+
+#~ msgid ""
+#~ "urpme version %s\n"
+#~ "Copyright (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpme 版本 %s\n"
+#~ "版权 (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
+#~ "这是自由软件, 可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
+
+#~ msgid ""
+#~ "urpmi version %s\n"
+#~ "Copyright (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmi 版本 %s\n"
+#~ "版权 (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
+#~ "这是自由软件, 可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
+
 #~ msgid "syntax error in config file at line %s"
 #~ msgstr "配置文件的第 %s 行语法错误"