updated pot file

1 files changed, 255 insertions, 221 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a16feaaa..6ced739f 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-06-30 09:14+0200\n"
+"POT-Creation-Date: 2004-07-17 12:34+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:514
+#: ../_irpm:33 ../urpme:29 ../urpmi:516
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
@@ -68,7 +68,7 @@ msgstr "确定"
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:446 ../urpmi:522
+#: ../_irpm:44 ../urpmi:444 ../urpmi:524
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -132,7 +132,7 @@ msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:195 ../urpm.pm:2268
+#: ../urpm.pm:195 ../urpm.pm:2262
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
@@ -248,34 +248,34 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:478 ../urpm.pm:504 ../urpm.pm:882 ../urpm.pm:893 ../urpm.pm:954
-#: ../urpm.pm:971 ../urpm.pm:1054 ../urpm.pm:1111 ../urpm.pm:1304
-#: ../urpm.pm:1424 ../urpm.pm:1539 ../urpm.pm:1545 ../urpm.pm:1646
-#: ../urpm.pm:1725 ../urpm.pm:1729
+#: ../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
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:482 ../urpm.pm:497 ../urpm.pm:510 ../urpm.pm:885 ../urpm.pm:896
-#: ../urpm.pm:960 ../urpm.pm:966 ../urpm.pm:1059 ../urpm.pm:1115
-#: ../urpm.pm:1308 ../urpm.pm:1428 ../urpm.pm:1533 ../urpm.pm:1551
-#: ../urpm.pm:1735
+#: ../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
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:492 ../urpm.pm:889
+#: ../urpm.pm:492 ../urpm.pm:896
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:520 ../urpm.pm:903 ../urpm.pm:979 ../urpm.pm:1063
-#: ../urpm.pm:1432
+#: ../urpm.pm:520 ../urpm.pm:910 ../urpm.pm:986 ../urpm.pm:1070
+#: ../urpm.pm:1439
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:526 ../urpm.pm:1685
+#: ../urpm.pm:526 ../urpm.pm:1692
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
@@ -290,8 +290,8 @@ msgstr "跳过软件包 %s"
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:566 ../urpm.pm:2068 ../urpm.pm:2131 ../urpm.pm:2710
-#: ../urpm.pm:2808
+#: ../urpm.pm:566 ../urpm.pm:2076 ../urpm.pm:2139 ../urpm.pm:2705
+#: ../urpm.pm:2822
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
@@ -321,13 +321,13 @@ msgstr "无法访问介质的首次安装"
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:666 ../urpm.pm:994 ../urpm.pm:1083 ../urpm.pm:1146
-#: ../urpm.pm:1203 ../urpm.pm:1374 ../urpm.pm:1380
+#: ../urpm.pm:666 ../urpm.pm:1001 ../urpm.pm:1090 ../urpm.pm:1153
+#: ../urpm.pm:1210 ../urpm.pm:1381 ../urpm.pm:1387
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:666 ../urpm.pm:994 ../urpm.pm:1087
+#: ../urpm.pm:666 ../urpm.pm:1001 ../urpm.pm:1094
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
@@ -344,14 +344,14 @@ msgstr "无法访问首次安装介质(未发现 Mandrake/base/hdlists 文件)"
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:685 ../urpm.pm:1414 ../urpm.pm:1879 ../urpm.pm:2583
-#: ../urpmi.addmedia:144
+#: ../urpm.pm:685 ../urpm.pm:1421 ../urpm.pm:1887 ../urpm.pm:2577
+#: ../urpmi.addmedia:151
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:687 ../urpm.pm:1398 ../urpm.pm:1407 ../urpm.pm:1882
-#: ../urpm.pm:2585 ../urpmi:613 ../urpmi.addmedia:146
+#: ../urpm.pm:687 ../urpm.pm:1405 ../urpm.pm:1414 ../urpm.pm:1890
+#: ../urpm.pm:2579 ../urpmi:615 ../urpmi.addmedia:153
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
@@ -361,27 +361,27 @@ msgstr "...获取失败: %s"
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:752
+#: ../urpm.pm:756
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:754
+#: ../urpm.pm:758
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:754
+#: ../urpm.pm:758
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm:770
+#: ../urpm.pm:774
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:930
+#: ../urpm.pm:937
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -391,229 +391,229 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:983
+#: ../urpm.pm:990
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:991
+#: ../urpm.pm:998
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1014 ../urpm.pm:1264
+#: ../urpm.pm:1021 ../urpm.pm:1271
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1025 ../urpm.pm:1275
+#: ../urpm.pm:1032 ../urpm.pm:1282
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:1079
+#: ../urpm.pm:1086
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1092
+#: ../urpm.pm:1099
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1096
+#: ../urpm.pm:1103
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1098
+#: ../urpm.pm:1105
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1119 ../urpm.pm:1312 ../urpm.pm:1649
+#: ../urpm.pm:1126 ../urpm.pm:1319 ../urpm.pm:1656
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1161
+#: ../urpm.pm:1168
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1186
+#: ../urpm.pm:1193
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1191
+#: ../urpm.pm:1198
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1330
+#: ../urpm.pm:1337
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1359
+#: ../urpm.pm:1366
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1405
+#: ../urpm.pm:1412
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1407
+#: ../urpm.pm:1414
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1503
+#: ../urpm.pm:1510
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1510
+#: ../urpm.pm:1517
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1521 ../urpm.pm:1575
+#: ../urpm.pm:1528 ../urpm.pm:1582
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1561
+#: ../urpm.pm:1568
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1599
+#: ../urpm.pm:1606
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1606
+#: ../urpm.pm:1613
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1608
+#: ../urpm.pm:1615
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1623
+#: ../urpm.pm:1630
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1630
+#: ../urpm.pm:1637
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1633
+#: ../urpm.pm:1640
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1699
+#: ../urpm.pm:1706
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1704
+#: ../urpm.pm:1711
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:1716 ../urpm.pm:1745 ../urpmi:355
+#: ../urpm.pm:1723 ../urpm.pm:1752 ../urpmi:353
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1765
+#: ../urpm.pm:1772
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1769
+#: ../urpm.pm:1776
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:1819
+#: ../urpm.pm:1827
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:1835
+#: ../urpm.pm:1843
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:1857
+#: ../urpm.pm:1865
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "depslist 中重新分配了 %s 项"
 
-#: ../urpm.pm:1858
+#: ../urpm.pm:1866
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "depslist 中没有重新分配项"
 
-#: ../urpm.pm:1871
+#: ../urpm.pm:1879
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:1877
+#: ../urpm.pm:1885
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:1884 ../urpm.pm:2752
+#: ../urpm.pm:1892 ../urpm.pm:2747
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:1889
+#: ../urpm.pm:1897
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:1892
+#: ../urpm.pm:1900
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2005
+#: ../urpm.pm:2013
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2008 ../urpme:88
+#: ../urpm.pm:2016 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2205 ../urpm.pm:2249 ../urpm.pm:2275
+#: ../urpm.pm:2199 ../urpm.pm:2243 ../urpm.pm:2269
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2260
+#: ../urpm.pm:2254
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2287
+#: ../urpm.pm:2281
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -622,148 +622,153 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2291
+#: ../urpm.pm:2285
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:2297
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2343 ../urpm.pm:2358 ../urpm.pm:2382 ../urpm.pm:2397
+#: ../urpm.pm:2337 ../urpm.pm:2352 ../urpm.pm:2376 ../urpm.pm:2391
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2449 ../urpm.pm:2452 ../urpm.pm:2482
+#: ../urpm.pm:2443 ../urpm.pm:2446 ../urpm.pm:2476
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2478
+#: ../urpm.pm:2472
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2486
+#: ../urpm.pm:2480
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2499
+#: ../urpm.pm:2493
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2561
+#: ../urpm.pm:2555
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2568
+#: ../urpm.pm:2562
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2650 ../urpmi:691
+#: ../urpm.pm:2644 ../urpmi:693
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../urpm.pm:2683
+#: ../urpm.pm:2678
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2714
+#: ../urpm.pm:2709
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2717
+#: ../urpm.pm:2712
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2725
+#: ../urpm.pm:2719
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2727
+#: ../urpm.pm:2721
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2737
+#: ../urpm.pm:2731
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:2740
+#: ../urpm.pm:2734
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:2940 ../urpm.pm:2973
+#: ../urpm.pm:2796
+#, fuzzy, c-format
+msgid "More information on package %s"
+msgstr "无法删除软件包 %s"
+
+#: ../urpm.pm:2954 ../urpm.pm:2987
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:2941 ../urpm.pm:2971
+#: ../urpm.pm:2955 ../urpm.pm:2985
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:2942
+#: ../urpm.pm:2956
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:2943
+#: ../urpm.pm:2957
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:2966
+#: ../urpm.pm:2980
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:2978
+#: ../urpm.pm:2992
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:2980
+#: ../urpm.pm:2994
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:2996
+#: ../urpm.pm:3010
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3028
+#: ../urpm.pm:3042
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3030
+#: ../urpm.pm:3044
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm/args.pm:87 ../urpm/args.pm:94
+#: ../urpm/args.pm:88 ../urpm/args.pm:95
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:223
+#: ../urpm/args.pm:224
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
@@ -789,35 +794,35 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
-#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#: ../urpme:41 ../urpmf:32 ../urpmi:74 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:38 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpme:42 ../urpmi:83
+#: ../urpme:42 ../urpmi:80
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:43 ../urpmi:124
+#: ../urpme:43 ../urpmi:121
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpme:44 ../urpmi:97 ../urpmq:63
+#: ../urpme:44 ../urpmi:94 ../urpmq:63
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:45 ../urpmi:102 ../urpmq:64
+#: ../urpme:45 ../urpmi:99 ../urpmq:64
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:46 ../urpmi:103
+#: ../urpme:46 ../urpmi:100
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
@@ -831,7 +836,7 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:49 ../urpmi:133 ../urpmq:76
+#: ../urpme:49 ../urpmi:131 ../urpmq:76
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             -详细的提示。\n"
@@ -871,12 +876,12 @@ msgstr "检查删除下列软件包"
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
-#: ../urpme:108 ../urpmi:476 ../urpmi:637
+#: ../urpme:108 ../urpmi:474 ../urpmi:639
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:111 ../urpmi:680
+#: ../urpme:111 ../urpmi:682
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
@@ -902,22 +907,22 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:33 ../urpmi:78 ../urpmq:44
+#: ../urpmf:33 ../urpmi:75 ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#: ../urpmf:34 ../urpmi:76 ../urpmq:45
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#: ../urpmf:35 ../urpmi:77 ../urpmq:46
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:36 ../urpmi:81 ../urpmq:47
+#: ../urpmf:36 ../urpmi:78 ../urpmq:47
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1024,7 +1029,7 @@ msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
 
-#: ../urpmf:57 ../urpmi:117 ../urpmq:73
+#: ../urpmf:57 ../urpmi:114 ../urpmq:73
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1083,7 +1088,7 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:119 ../urpmi:249 ../urpmq:112
+#: ../urpmf:119 ../urpmi:247 ../urpmq:112
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1095,7 +1100,7 @@ msgid ""
 "result\n"
 msgstr ""
 
-#: ../urpmi:72
+#: ../urpmi:69
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1111,25 +1116,25 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:82
+#: ../urpmi:79
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmi:84 ../urpmq:49
+#: ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:85
+#: ../urpmi:82
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:86 ../urpmq:51
+#: ../urpmi:83 ../urpmq:51
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1137,7 +1142,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:88
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1147,37 +1152,37 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:91
+#: ../urpmi:88
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:92 ../urpmq:50
+#: ../urpmi:89 ../urpmq:50
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmi:93 ../urpmq:59
+#: ../urpmi:90 ../urpmq:59
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmi:94
+#: ../urpmi:91
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:95
+#: ../urpmi:92
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean        -  首先删除缓存中的rpm。\n"
 
-#: ../urpmi:96
+#: ../urpmi:93
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
 
-#: ../urpmi:98
+#: ../urpmi:95
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1186,7 +1191,7 @@ msgstr ""
 "  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
 "                   就安装软件包。\n"
 
-#: ../urpmi:100
+#: ../urpmi:97
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1195,7 +1200,7 @@ msgstr ""
 "  --allow-force  - 允许提示用户安装软件包而不\n"
 "                   检查依赖性和完整性。\n"
 
-#: ../urpmi:104
+#: ../urpmi:101
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1204,22 +1209,22 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
+#: ../urpmi:103 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
+#: ../urpmi:104 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#: ../urpmi:105 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:109
+#: ../urpmi:106
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1228,7 +1233,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
+#: ../urpmi:108 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1237,7 +1242,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
+#: ../urpmi:110 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1246,7 +1251,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   口令(格式如 <用户: 口令>)。\n"
 
-#: ../urpmi:115
+#: ../urpmi:112
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1255,12 +1260,12 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:119
+#: ../urpmi:116
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - 使用 X 界面。\n"
 
-#: ../urpmi:120
+#: ../urpmi:117
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1269,7 +1274,7 @@ msgstr ""
 "  --best-output  - 根据运行环境选择最好的界面:\n"
 "                   X 或文本模式。\n"
 
-#: ../urpmi:122
+#: ../urpmi:119
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1278,62 +1283,67 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:125
+#: ../urpmi:122
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:126
+#: ../urpmi:123
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:127 ../urpmq:79
+#: ../urpmi:124
+#, fuzzy, c-format
+msgid "  --skip         - packages which installation should be skipped\n"
+msgstr "  --test         - 验证安装是否可以正确进行。\n"
+
+#: ../urpmi:125 ../urpmq:79
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:128
+#: ../urpmi:126
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmi:129
+#: ../urpmi:127
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpmi:130 ../urpmq:84
+#: ../urpmi:128 ../urpmq:84
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:131 ../urpmq:85
+#: ../urpmi:129 ../urpmq:85
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:132
+#: ../urpmi:130
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:134
+#: ../urpmi:132
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:141
+#: ../urpmi:139
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../urpmi:197
+#: ../urpmi:195
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:204
+#: ../urpmi:202
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1354,22 +1364,22 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../urpmi:212
+#: ../urpmi:210
 #, c-format
 msgid "Do nothing"
 msgstr "什么也不做"
 
-#: ../urpmi:213
+#: ../urpmi:211
 #, c-format
 msgid "Yes, really install it"
 msgstr "是，进行安装"
 
-#: ../urpmi:214 ../urpmi:231
+#: ../urpmi:212 ../urpmi:229
 #, c-format
 msgid "Save file"
 msgstr "保存文件"
 
-#: ../urpmi:225
+#: ../urpmi:223
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1384,54 +1394,54 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../urpmi:230
+#: ../urpmi:228
 #, c-format
 msgid "Install it"
 msgstr "安装"
 
-#: ../urpmi:239
+#: ../urpmi:237
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:240
+#: ../urpmi:238
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:243 ../urpmi:365
+#: ../urpmi:241 ../urpmi:363
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:260
+#: ../urpmi:258
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:396
+#: ../urpmi:394
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../urpmi:403
+#: ../urpmi:401
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:412 ../urpmi:535
+#: ../urpmi:410 ../urpmi:537
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../urpmi:412 ../urpmi:535
+#: ../urpmi:410 ../urpmi:537
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../urpmi:435
+#: ../urpmi:433
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1440,19 +1450,19 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:440 ../urpmi:471
+#: ../urpmi:438 ../urpmi:469
 #, c-format
 msgid "do you agree ?"
 msgstr "您同意吗?"
 
-#: ../urpmi:446
+#: ../urpmi:444
 #, c-format
 msgid ""
 "\n"
 "Continue?"
 msgstr ""
 
-#: ../urpmi:460
+#: ../urpmi:458
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1462,7 +1472,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:466
+#: ../urpmi:464
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1471,13 +1481,20 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:504 ../urpmi:513
+#: ../urpmi:503 ../urpmi:514
 #, 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
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following package is going to be installed (%d "
+"MB)"
+msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
+
 #: ../urpmi:510
 #, c-format
 msgid ""
@@ -1487,47 +1504,47 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:531 ../urpmq:297
+#: ../urpmi:533 ../urpmq:297
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../urpmi:545
+#: ../urpmi:547
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签“%s”的介质到设备 [%s]"
 
-#: ../urpmi:546
+#: ../urpmi:548
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:590
+#: ../urpmi:592
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../urpmi:602
+#: ../urpmi:604
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
 
-#: ../urpmi:605
+#: ../urpmi:607
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        已完成 %s%%，速度 = %s"
 
-#: ../urpmi:624
+#: ../urpmi:626
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:625
+#: ../urpmi:627
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:645 ../urpmi:772
+#: ../urpmi:647 ../urpmi:774
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1538,58 +1555,58 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../urpmi:655 ../urpmi:710 ../urpmi:731 ../urpmi:751
+#: ../urpmi:657 ../urpmi:712 ../urpmi:733 ../urpmi:753
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi:670
+#: ../urpmi:672
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:678
+#: ../urpmi:680
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:693
+#: ../urpmi:695
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../urpmi:717
+#: ../urpmi:719
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:736
+#: ../urpmi:738
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:777
+#: ../urpmi:779
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:785
+#: ../urpmi:787
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:788
+#: ../urpmi:790
 #, c-format
 msgid "Everything already installed"
 msgstr "全部安装完成"
 
-#: ../urpmi:802
+#: ../urpmi:804
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新启动 urpmi"
 
 #: ../urpmi.addmedia:38
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -1604,8 +1621,9 @@ msgid ""
 msgstr ""
 "用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]\n"
 "  <url> 为以下之一\n"
-"       file://<路径>\n"
+"       file://<路径> with <hdlist 的相对路径文件名>\n"
 "       ftp://<登录名>:<口令>@<主机>/<路径> with <hdlist 的相对路径文件名>\n"
+"       ftp://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
 "       http://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
 "       removable://<路径>\n"
 "\n"
@@ -1662,18 +1680,19 @@ msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
 "                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"                   installed mandrakelinux-release package.\n"
 msgstr ""
-"  --version      - 使用指定发行版本，默认版本是所安装的 mandrake 发行包。\n"
+"  --version      - 使用指定发行版本，默认版本是所安装的 mandrakelinux 发行"
+"包。\n"
 
 #: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"                   mandrakelinux-release package installed.\n"
 msgstr ""
-"  --arch         - 使用指定的架构，默认是所安装的 mandrake 发行版本的软件包\n"
-"                   架构。\n"
+"  --arch         - 使用指定的架构，默认是所安装的 mandrakelinux 发行版本的\n"
+"                   软件包架构。\n"
 
 #: ../urpmi.addmedia:72
 #, c-format
@@ -1687,7 +1706,7 @@ msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file://
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:40 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
@@ -1697,42 +1716,47 @@ msgstr "  -c             - 直接清除软件包头缓存。\n"
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:130
+#: ../urpmi.addmedia:109
+#, fuzzy, c-format
+msgid "Only superuser is allowed to add media"
+msgstr "只允许超级用户安装软件包"
+
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "无法添加 cooker 发行版的更新\n"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:142
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "正在获取 %s 处的镜像..."
 
-#: ../urpmi.addmedia:179
+#: ../urpmi.addmedia:186
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia:186 ../urpmi.addmedia:209
+#: ../urpmi.addmedia:193 ../urpmi.addmedia:216
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia:197
+#: ../urpmi.addmedia:204
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist相对路径>找不到\n"
 
-#: ../urpmi.addmedia:199
+#: ../urpmi.addmedia:206
 #, c-format
 msgid "`with' missing for network media\n"
 msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:207
+#: ../urpmi.addmedia:214
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
 
-#: ../urpmi.removemedia:34
+#: ../urpmi.removemedia:36
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -1741,12 +1765,17 @@ msgstr ""
 "用法: urpmi.removemedia -a <名称> ...\n"
 "其中 <名称> 是要删除的介质名。\n"
 
-#: ../urpmi.removemedia:37
+#: ../urpmi.removemedia:39
 #, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质。\n"
 
-#: ../urpmi.removemedia:39
+#: ../urpmi.removemedia:41
+#, fuzzy, c-format
+msgid "  -y             - fuzzy match on media names.\n"
+msgstr "  -a             - 在命令行选择所有匹配。\n"
+
+#: ../urpmi.removemedia:42
 #, c-format
 msgid ""
 "\n"
@@ -1756,11 +1785,16 @@ msgstr ""
 "未知的选项“%s”\n"
 
 #: ../urpmi.removemedia:48
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove media"
+msgstr "只允许超级用户安装软件包"
+
+#: ../urpmi.removemedia:55
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi.removemedia:50
+#: ../urpmi.removemedia:57
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1793,12 +1827,17 @@ msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update:63
+#: ../urpmi.update:58
+#, fuzzy, c-format
+msgid "Only superuser is allowed to update media"
+msgstr "只允许超级用户安装软件包"
+
+#: ../urpmi.update:66
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:75
+#: ../urpmi.update:78
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2030,11 +2069,6 @@ msgstr ""
 #~ msgstr "urpmi: 未知选项“-%s”，用--help 检查用法\n"
 
 #~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed "
-#~ "(%d MB)"
-#~ msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
-
-#~ msgid ""
 #~ "%s\n"
 #~ "no need to give <relative path of hdlist> with --distrib"
 #~ msgstr ""