updated pot file

1 files changed, 495 insertions, 323 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7d0a3daf..b2fcfd63 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-20 20:00+0200\n"
+"POT-Creation-Date: 2005-10-27 16:02+0200\n"
 "PO-Revision-Date: 2005-06-19 09:44+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@linux-mandrake."
@@ -54,22 +54,22 @@ msgstr ""
 "自动安装软件包...\n"
 "您要求安装软件包 %s\n"
 
-#: ../_irpm:33 ../urpme:31 ../urpmi:494
+#: ../_irpm:33 ../urpme:31 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
 
-#: ../_irpm:35 ../urpmi:525
+#: ../_irpm:35 ../urpmi:529
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../_irpm:36 ../urpmi:525
+#: ../_irpm:36 ../urpmi:529
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:400 ../urpmi:418 ../urpmi:498
+#: ../_irpm:44 ../urpmi:404 ../urpmi:422 ../urpmi:502
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -166,11 +166,11 @@ msgid "Must be root"
 msgstr "必须是 root"
 
 #: ../gurpmi2:75
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
+"Some requested packages cannot be installed:\n"
 "%s\n"
-"Continue?"
+"Continue installation anyway?"
 msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s\n"
@@ -196,7 +196,7 @@ msgstr "软件包选择"
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi2:120 ../urpmi:360
+#: ../gurpmi2:120 ../urpmi:364
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
@@ -207,11 +207,11 @@ msgid "_Abort"
 msgstr "中止(_A)"
 
 #: ../gurpmi2:163
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"Continue?"
+"Continue installation anyway?"
 msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
@@ -232,12 +232,12 @@ msgstr ""
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:186 ../urpmi:507 ../urpmq:308
+#: ../gurpmi2:186 ../urpmi:511 ../urpmq:307
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:200 ../urpmi:518
+#: ../gurpmi2:200 ../urpmi:522
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
@@ -261,7 +261,7 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../gurpmi2:251 ../gurpmi2:300 ../urpmi:588 ../urpmi:704
+#: ../gurpmi2:251 ../gurpmi2:300 ../urpmi:593 ../urpmi:710
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -272,12 +272,12 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:258 ../urpme:118 ../urpmi:631
+#: ../gurpmi2:258 ../urpme:118 ../urpmi:636
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:266 ../urpm.pm:2879
+#: ../gurpmi2:266 ../urpm.pm:2901
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
@@ -287,7 +287,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:598 ../urpmi:649 ../urpmi:667 ../urpmi:683
+#: ../gurpmi2:286 ../urpmi:603 ../urpmi:655 ../urpmi:673 ../urpmi:689
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
@@ -297,7 +297,7 @@ msgstr "安装失败"
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:303 ../urpmi:720
+#: ../gurpmi2:303 ../urpmi:726
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
@@ -336,7 +336,7 @@ msgstr "   -g [组]        - 限制结果为给定组。\n"
 msgid "                    defaults is %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../rurpmi:8 ../urpmi:223
+#: ../rurpmi:8 ../urpmi:227
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -371,12 +371,12 @@ msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:225 ../urpm.pm:1294 ../urpm.pm:1304
+#: ../urpm.pm:225 ../urpm.pm:1314 ../urpm.pm:1324
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:228 ../urpm.pm:2485
+#: ../urpm.pm:228 ../urpm.pm:2508
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
@@ -453,42 +453,42 @@ msgstr "无法写入配置文件[%s]"
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:424
+#: ../urpm.pm:440
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:434
+#: ../urpm.pm:450
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:446
+#: ../urpm.pm:462
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:457
+#: ../urpm.pm:473
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:461
+#: ../urpm.pm:477
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:465
+#: ../urpm.pm:481
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:473
+#: ../urpm.pm:489
 #, c-format
 msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr "“%s”的 chroot 中似乎没有设备"
 
-#: ../urpm.pm:479
+#: ../urpm.pm:495
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -497,152 +497,151 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:540 ../urpm.pm:566 ../urpm.pm:1048 ../urpm.pm:1059
-#: ../urpm.pm:1131 ../urpm.pm:1148 ../urpm.pm:1218 ../urpm.pm:1277
-#: ../urpm.pm:1492 ../urpm.pm:1616 ../urpm.pm:1733 ../urpm.pm:1739
-#: ../urpm.pm:1842 ../urpm.pm:1927 ../urpm.pm:1931
+#: ../urpm.pm:556 ../urpm.pm:582 ../urpm.pm:1068 ../urpm.pm:1079
+#: ../urpm.pm:1151 ../urpm.pm:1168 ../urpm.pm:1238 ../urpm.pm:1297
+#: ../urpm.pm:1512 ../urpm.pm:1635 ../urpm.pm:1752 ../urpm.pm:1758
+#: ../urpm.pm:1861 ../urpm.pm:1946 ../urpm.pm:1950
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:544 ../urpm.pm:559 ../urpm.pm:572 ../urpm.pm:1051
-#: ../urpm.pm:1062 ../urpm.pm:1137 ../urpm.pm:1143 ../urpm.pm:1223
-#: ../urpm.pm:1281 ../urpm.pm:1496 ../urpm.pm:1620 ../urpm.pm:1727
-#: ../urpm.pm:1745 ../urpm.pm:1937
+#: ../urpm.pm:560 ../urpm.pm:575 ../urpm.pm:588 ../urpm.pm:1071
+#: ../urpm.pm:1082 ../urpm.pm:1157 ../urpm.pm:1163 ../urpm.pm:1243
+#: ../urpm.pm:1301 ../urpm.pm:1516 ../urpm.pm:1639 ../urpm.pm:1746
+#: ../urpm.pm:1764 ../urpm.pm:1956
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:554 ../urpm.pm:1055
+#: ../urpm.pm:570 ../urpm.pm:1075
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:584
+#: ../urpm.pm:600
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始：%s 结束：%s"
 
-#: ../urpm.pm:589 ../urpm.pm:1069 ../urpm.pm:1156 ../urpm.pm:1227
-#: ../urpm.pm:1624
+#: ../urpm.pm:605 ../urpm.pm:1089 ../urpm.pm:1176 ../urpm.pm:1247
+#: ../urpm.pm:1643
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:596 ../urpm.pm:1880
+#: ../urpm.pm:612 ../urpm.pm:1899
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:628
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:641
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:636 ../urpm.pm:2292 ../urpm.pm:2353 ../urpm.pm:2542
-#: ../urpm.pm:2944 ../urpm.pm:3066
+#: ../urpm.pm:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2565
+#: ../urpm.pm:2966 ../urpm.pm:3088
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:676
+#: ../urpm.pm:692
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:683
+#: ../urpm.pm:699
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr "虚拟介质必须是本地的"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:724
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:752
+#: ../urpm.pm:769
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:756
+#: ../urpm.pm:773
 #, c-format
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:758 ../urpm.pm:1172 ../urpm.pm:1247
+#: ../urpm.pm:775 ../urpm.pm:1192 ../urpm.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:759 ../urpm.pm:1173 ../urpm.pm:1322 ../urpm.pm:1381
-#: ../urpm.pm:1561 ../urpm.pm:1568
+#: ../urpm.pm:776 ../urpm.pm:1193 ../urpm.pm:1342 ../urpm.pm:1401
+#: ../urpm.pm:1581 ../urpm.pm:1588
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:762 ../urpm.pm:787 ../urpm.pm:826
+#: ../urpm.pm:779 ../urpm.pm:804 ../urpm.pm:843
 #, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
 
-#: ../urpm.pm:769
+#: ../urpm.pm:786
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:781 ../urpm.pm:1606 ../urpm.pm:2096 ../urpm.pm:2812
+#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2834
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:783 ../urpm.pm:1589 ../urpm.pm:1599 ../urpm.pm:2099
-#: ../urpm.pm:2814
+#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2836
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:807
+#: ../urpm.pm:824
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:863
+#: ../urpm.pm:880
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:865
+#: ../urpm.pm:882
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:881
+#: ../urpm.pm:898
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:932
+#: ../urpm.pm:949
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm.pm:961
+#: ../urpm.pm:978
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm.pm:968
+#: ../urpm.pm:985
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm.pm:1109
+#: ../urpm.pm:1129
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -652,231 +651,231 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1160
+#: ../urpm.pm:1180
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1170
+#: ../urpm.pm:1190
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1194 ../urpm.pm:1468
+#: ../urpm.pm:1214 ../urpm.pm:1488
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1243
+#: ../urpm.pm:1263
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1257
+#: ../urpm.pm:1277
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1262
+#: ../urpm.pm:1282
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1264
+#: ../urpm.pm:1284
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1285 ../urpm.pm:1500 ../urpm.pm:1845
+#: ../urpm.pm:1305 ../urpm.pm:1520 ../urpm.pm:1864
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1339
+#: ../urpm.pm:1359
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1354
+#: ../urpm.pm:1374
 #, c-format
 msgid "no rpms read"
 msgstr "没有读到 rpm"
 
-#: ../urpm.pm:1364
+#: ../urpm.pm:1384
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1369
+#: ../urpm.pm:1389
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1518
+#: ../urpm.pm:1538
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1546
+#: ../urpm.pm:1566
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1596
+#: ../urpm.pm:1616
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1599
+#: ../urpm.pm:1618
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum 不匹配"
+msgid "...retrieving failed: md5sum mismatch"
+msgstr "...获取失败: md5sum 不匹配"
 
-#: ../urpm.pm:1697
+#: ../urpm.pm:1716
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1704
+#: ../urpm.pm:1723
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1715 ../urpm.pm:1769
+#: ../urpm.pm:1734 ../urpm.pm:1788
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1755
+#: ../urpm.pm:1774
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1794
+#: ../urpm.pm:1813
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1802
+#: ../urpm.pm:1821
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1804
+#: ../urpm.pm:1823
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1819
+#: ../urpm.pm:1838
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1826
+#: ../urpm.pm:1845
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm.pm:1829
+#: ../urpm.pm:1848
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1894
+#: ../urpm.pm:1913
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1918
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:1914 ../urpm.pm:1949
+#: ../urpm.pm:1933 ../urpm.pm:1968
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm.pm:1917 ../urpm.pm:1952 ../urpmi:317
+#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:321
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1975
+#: ../urpm.pm:1994
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1979
+#: ../urpm.pm:1998
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:2035
+#: ../urpm.pm:2054
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:2057
+#: ../urpm.pm:2076
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:2081
+#: ../urpm.pm:2100
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:2087
+#: ../urpm.pm:2106
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:2101
+#: ../urpm.pm:2124
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2106
+#: ../urpm.pm:2129
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:2109
+#: ../urpm.pm:2132
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2133
+#: ../urpm.pm:2156
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../urpm.pm:2220
+#: ../urpm.pm:2243
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2222 ../urpme:94
+#: ../urpm.pm:2245 ../urpme:94
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2416 ../urpm.pm:2462 ../urpm.pm:2493
+#: ../urpm.pm:2439 ../urpm.pm:2485 ../urpm.pm:2516
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2476
+#: ../urpm.pm:2499
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2509
+#: ../urpm.pm:2532
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -885,168 +884,173 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2513
+#: ../urpm.pm:2536
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2525
+#: ../urpm.pm:2548
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2583 ../urpm.pm:2597 ../urpm.pm:2617 ../urpm.pm:2631
+#: ../urpm.pm:2606 ../urpm.pm:2620 ../urpm.pm:2640 ../urpm.pm:2654
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2683 ../urpm.pm:2688 ../urpm.pm:2714
+#: ../urpm.pm:2706 ../urpm.pm:2711 ../urpm.pm:2737
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2710
+#: ../urpm.pm:2733
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2718
+#: ../urpm.pm:2741
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2730
+#: ../urpm.pm:2753
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2789
+#: ../urpm.pm:2812
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2796
+#: ../urpm.pm:2819
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2917
+#: ../urpm.pm:2939
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2948
+#: ../urpm.pm:2970
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2951
+#: ../urpm.pm:2973
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2959
+#: ../urpm.pm:2981
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2961
+#: ../urpm.pm:2983
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2973
+#: ../urpm.pm:2995
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm.pm:2979
+#: ../urpm.pm:3001
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:2982
+#: ../urpm.pm:3004
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:3041
+#: ../urpm.pm:3063
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
-#: ../urpm.pm:3206 ../urpm.pm:3239
+#: ../urpm.pm:3228 ../urpm.pm:3261
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3207 ../urpm.pm:3237
+#: ../urpm.pm:3229 ../urpm.pm:3259
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3208
+#: ../urpm.pm:3230
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3209
+#: ../urpm.pm:3231
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3232
+#: ../urpm.pm:3254
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3243
+#: ../urpm.pm:3265
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3244
+#: ../urpm.pm:3266
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3260
+#: ../urpm.pm:3282
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3292
+#: ../urpm.pm:3314
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3294
+#: ../urpm.pm:3316
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm.pm:3343
+#: ../urpm.pm:3365
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:3354
+#: ../urpm.pm:3376
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm.pm:3376
+#: ../urpm.pm:3398
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:93 ../urpm/args.pm:102
+#: ../urpm/args.pm:99 ../urpm/args.pm:108
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:242
+#: ../urpm/args.pm:217
+#, fuzzy, c-format
+msgid "You need to be root to use --use-distrib"
+msgstr "你必须是根用户才能使用这一命令！\n"
+
+#: ../urpm/args.pm:249
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
@@ -1072,7 +1076,7 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:43 ../urpmf:32 ../urpmi:79 ../urpmi.addmedia:43
+#: ../urpme:43 ../urpmf:33 ../urpmi:79 ../urpmi.addmedia:43
 #: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
@@ -1114,7 +1118,7 @@ msgstr ""
 "                   下安装/卸载 chroot。\n"
 
 #: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
-#: ../urpmi.update:48 ../urpmq:92
+#: ../urpmi.update:48 ../urpmq:91
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
@@ -1139,7 +1143,7 @@ msgstr "未知的软件包"
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:99 ../urpmi:433
+#: ../urpme:99 ../urpmi:437
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
@@ -1160,7 +1164,7 @@ msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
 
-#: ../urpme:115 ../urpmi:452 ../urpmi:581
+#: ../urpme:115 ../urpmi:456 ../urpmi:586
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
@@ -1171,14 +1175,14 @@ msgid "Removing failed"
 msgstr "删除失败"
 
 #: ../urpmf:27
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
+"Copyright (C) 2002-2005 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
-"usage:\n"
+"usage: urpmf [options] pattern-expression\n"
 msgstr ""
 "urpmf 版本 %s\n"
 "版权 (C) 2002-2004 Mandriva。\n"
@@ -1186,204 +1190,253 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:44
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 只使用升级介质。\n"
+#: ../urpmf:34
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:45
+#: ../urpmf:35 ../urpmi:121 ../urpmq:74
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:35 ../urpmi:83 ../urpmq:47
+#: ../urpmf:36 ../urpmi:83 ../urpmq:47
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:36 ../urpmi:84 ../urpmq:48
+#: ../urpmf:37
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
 
-#: ../urpmf:37 ../urpmq:49
+#: ../urpmf:38 ../urpmi:81 ../urpmq:45
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:38
+#: ../urpmf:39 ../urpmi:84 ../urpmq:48
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 详细提示。\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmf:39
+#: ../urpmf:40 ../urpmi:85 ../urpmq:49
 #, c-format
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-"  --quiet        - 不打印标签名称(如果没有在命令行指定标签，默认设置\n"
-"                   就是不打印，与会话方式不相兼容)。\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
 #: ../urpmf:41
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:42
+#: ../urpmf:42 ../urpmi:80 ../urpmq:44
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - 打印全部标签。\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 只使用升级介质。\n"
 
 #: ../urpmf:43
 #, c-format
-msgid "  --name         - print only package names.\n"
-msgstr "  --name         - 只打印软件包名称。\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 详细提示。\n"
 
 #: ../urpmf:44
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - 打印标签 group: 分组。\n"
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
 #: ../urpmf:45
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - 打印标签 size: 大小。\n"
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
 
 #: ../urpmf:46
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - 打印标签 epoch: 周期。\n"
+msgid "Pattern expressions:\n"
+msgstr ""
 
 #: ../urpmf:47
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - 打印标签 summary: 摘要。\n"
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
 
 #: ../urpmf:48
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - 打印标签 description: 描述。\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
 #: ../urpmf:49
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - 打印标签 sourcerpm: 源 rpm。\n"
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - 二元 AND 操作符.\n"
 
 #: ../urpmf:50
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - 打印标签 packager: 打包者。\n"
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - 二元 OR 操作符.\n"
 
 #: ../urpmf:51
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - 打印标签 buildhost: 创建主机。\n"
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - 一元 NOT.\n"
 
 #: ../urpmf:52
-#, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - 打印标签 url: url。\n"
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - 右括号用来关闭一组表达式。\n"
 
 #: ../urpmf:53
-#, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - 打印标签 provides: 所有的提供。\n"
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"要恢复数据的清单: \n"
+"\n"
 
 #: ../urpmf:54
-#, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - 打印标签 requires: 所有需要。\n"
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - 使用 X 界面。\n"
 
 #: ../urpmf:55
-#, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - 打印标签 files: 所有文件。\n"
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    默认为 %s。\n"
 
 #: ../urpmf:56
-#, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - 打印标签 conflicts: 所有的冲突。\n"
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - 打印标签 url: url。\n"
 
 #: ../urpmf:57
-#, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - 打印标签 obsoletes: 所有的废除。\n"
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - 打印标签 buildhost: 创建主机。\n"
 
-#: ../urpmf:58 ../urpmi:121 ../urpmq:74
+#: ../urpmf:58
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "将更改应用到配置文件"
 
 #: ../urpmf:60
-#, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - 忽略各种情况下的冲突。\n"
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - 打印标签 conflicts: 所有的冲突。\n"
 
-#: ../urpmf:61 ../urpmq:81
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - 打印标签 description: 描述。\n"
 
 #: ../urpmf:62
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
+msgid "  --distribution - distribution\n"
+msgstr ""
 
 #: ../urpmf:63
-#, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - 打印标签 epoch: 周期。\n"
 
 #: ../urpmf:64
-#, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - 只打印软件包名称。\n"
 
 #: ../urpmf:65
-#, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - 一元 NOT，如果表达为假，则为真。\n"
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - 列出软件包中的文件。\n"
 
 #: ../urpmf:66
-#, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - 左括号用来打开一组表达式。\n"
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - 打印标签 group: 分组。\n"
 
 #: ../urpmf:67
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - 只打印软件包名称。\n"
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - 打印标签 obsoletes: 所有的废除。\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - 打印标签 packager: 打包者。\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - 打印标签 provides: 所有的提供。\n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - 打印标签 requires: 所有需要。\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - 打印标签 size: 大小。\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - 打印标签 sourcerpm: 源 rpm。\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - 打印摘要。\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - 打印标签 url: url。\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - 详细提示。\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - 列出软件包中的文件。\n"
+
+#: ../urpmf:78 ../urpmq:80
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - 右括号用来关闭一组表达式。\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:119
+#: ../urpmf:130
 #, c-format
-msgid ""
-"callback is:\n"
-"%s\n"
+msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
-"召回是:\n"
-"%s\n"
 
-#: ../urpmf:124 ../urpmi:212 ../urpmq:116
+#: ../urpmf:172 ../urpmi:216 ../urpmq:115
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:157
+#: ../urpmf:218
 #, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
 
-#: ../urpmf:158
+#: ../urpmf:219
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
@@ -1411,11 +1464,6 @@ msgid ""
 "packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
-#: ../urpmi:85
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
-
 #: ../urpmi:87 ../urpmq:50
 #, c-format
 msgid ""
@@ -1561,7 +1609,7 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1570,22 +1618,27 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:125
+#: ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
+#: ../urpmi:127
+#, fuzzy, c-format
+msgid "  --ignoresize   - don't verify disk space before installation.\n"
+msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
+
 #: ../urpmi:128
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
@@ -1609,7 +1662,7 @@ msgstr "  --norebuild    - 如果 hdlist 不可读的话，不尝试重新创建
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:133 ../urpmq:78
+#: ../urpmi:133 ../urpmq:77
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
@@ -1624,12 +1677,12 @@ msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:136 ../urpmq:93
+#: ../urpmi:136 ../urpmq:92
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:137 ../urpmq:90
+#: ../urpmi:137 ../urpmq:89
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
@@ -1645,29 +1698,29 @@ msgstr "  -q             - 安静模式。\n"
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:183
+#: ../urpmi:187
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:202
+#: ../urpmi:206
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:203
+#: ../urpmi:207
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:206 ../urpmi:327
+#: ../urpmi:210 ../urpmi:331
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:232
+#: ../urpmi:236
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1676,12 +1729,12 @@ msgstr ""
 "错误：%s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:362
+#: ../urpmi:366
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:392
+#: ../urpmi:396
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1691,25 +1744,23 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
 "%s"
 
-#: ../urpmi:400 ../urpmi:418
-#, c-format
+#: ../urpmi:404 ../urpmi:422
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Continue?"
-msgstr ""
-"\n"
-"继续吗?"
+"Continue installation anyway?"
+msgstr "仍然继续吗?"
 
-#: ../urpmi:411
+#: ../urpmi:415
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
+"Some requested packages cannot be installed:\n"
 "%s"
 msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:441
+#: ../urpmi:445
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1719,7 +1770,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:446
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1728,21 +1779,21 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:481 ../urpmi:492
+#: ../urpmi:485 ../urpmi:496
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
 "(%d MB)"
 msgstr "为了满足依赖关系，将安装下列%d个软件包(%d MB)"
 
-#: ../urpmi:482 ../urpmi:493
+#: ../urpmi:486 ../urpmi:497
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr "为了满足依赖关系，将安装下列软件包(%d MB)"
 
-#: ../urpmi:488
+#: ../urpmi:492
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1751,62 +1802,62 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:519
+#: ../urpmi:523
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:572
+#: ../urpmi:577
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:573
+#: ../urpmi:578
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:615
+#: ../urpmi:620
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:626
+#: ../urpmi:631
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpmi:628
+#: ../urpmi:633
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:656
+#: ../urpmi:662
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:672
+#: ../urpmi:678
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:709
+#: ../urpmi:715
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:717
+#: ../urpmi:723
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:724
+#: ../urpmi:730
 #, c-format
 msgid "The following package names were assumed: %s"
 msgstr "假定下列软件包名称: %s"
 
-#: ../urpmi:741
+#: ../urpmi:747
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -1957,7 +2008,7 @@ msgstr "<hdlist 相对路径>找不到\n"
 msgid "`with' missing for network media\n"
 msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:156
+#: ../urpmi.addmedia:157
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -2146,101 +2197,222 @@ msgid ""
 "                   This permit to querying a distro.\n"
 msgstr "  --use-distrib  - 从发行版树中实时配置 urpmi。这将允许查询发行版。\n"
 
-#: ../urpmq:76
+#: ../urpmq:75
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印更新日志。\n"
 
-#: ../urpmq:77
+#: ../urpmq:76
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 打印摘要。\n"
 
-#: ../urpmq:79
+#: ../urpmq:78
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:80
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 扩展软件包依赖性查询。\n"
 
-#: ../urpmq:82
+#: ../urpmq:81
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:83
+#: ../urpmq:82
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:84
+#: ../urpmq:83
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:85
+#: ../urpmq:84
 #, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - 不搜索提供中的软件包(默认)。\n"
 
-#: ../urpmq:86
+#: ../urpmq:85
 #, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmq:87
+#: ../urpmq:86
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:88
+#: ../urpmq:87
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆序搜索需要软件包的软件包。\n"
 
-#: ../urpmq:89
+#: ../urpmq:88
 #, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - 扩展逆序搜索(包括虚拟软件包)。\n"
 
-#: ../urpmq:91
+#: ../urpmq:90
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:94
+#: ../urpmq:93
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 类似于 -y，但强制不区分大小写匹配。\n"
 
-#: ../urpmq:95
+#: ../urpmq:94
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:157
+#: ../urpmq:156
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:344
+#: ../urpmq:343
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "跳过介质 %s：无 hdlist"
 
-#: ../urpmq:415
+#: ../urpmq:414
 #, c-format
 msgid "No filelist found\n"
 msgstr "没有找到文件列表\n"
 
-#: ../urpmq:425
+#: ../urpmq:424
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
+
+#~ msgid ""
+#~ "Some package requested cannot be installed:\n"
+#~ "%s\n"
+#~ "Continue?"
+#~ msgstr ""
+#~ "某些要求的软件包无法安装:\n"
+#~ "%s\n"
+#~ "继续吗?"
+
+#~ msgid ""
+#~ "The following packages have to be removed for others to be upgraded:\n"
+#~ "%s\n"
+#~ "Continue?"
+#~ msgstr ""
+#~ "要升级其它软件包，需要先删除下列软件包:\n"
+#~ "%s\n"
+#~ "继续吗?"
+
+#~ msgid "md5sum mismatch"
+#~ msgstr "md5sum 不匹配"
+
+#~ msgid ""
+#~ "urpmf version %s\n"
+#~ "Copyright (C) 2002-2004 Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmf 版本 %s\n"
+#~ "版权 (C) 2002-2004 Mandriva。\n"
+#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
+
+#~ msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#~ msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
+
+#~ msgid ""
+#~ "  --quiet        - do not print tag name (default if no tag given on "
+#~ "command\n"
+#~ "                   line, incompatible with interactive mode).\n"
+#~ msgstr ""
+#~ "  --quiet        - 不打印标签名称(如果没有在命令行指定标签，默认设置\n"
+#~ "                   就是不打印，与会话方式不相兼容)。\n"
+
+#~ msgid "  --uniq         - do not print identical lines.\n"
+#~ msgstr "  --uniq         - 不打印相同行。\n"
+
+#~ msgid "  --all          - print all tags.\n"
+#~ msgstr "  --all          - 打印全部标签。\n"
+
+#~ msgid "  --summary      - print tag summary: summary.\n"
+#~ msgstr "  --summary      - 打印标签 summary: 摘要。\n"
+
+#~ msgid "  --description  - print tag description: description.\n"
+#~ msgstr "  --description  - 打印标签 description: 描述。\n"
+
+#~ msgid "  --buildhost    - print tag buildhost: build host.\n"
+#~ msgstr "  --buildhost    - 打印标签 buildhost: 创建主机。\n"
+
+#~ msgid "  --provides     - print tag provides: all provides.\n"
+#~ msgstr "  --provides     - 打印标签 provides: 所有的提供。\n"
+
+#~ msgid "  --requires     - print tag requires: all requires.\n"
+#~ msgstr "  --requires     - 打印标签 requires: 所有需要。\n"
+
+#~ msgid "  --files        - print tag files: all files.\n"
+#~ msgstr "  --files        - 打印标签 files: 所有文件。\n"
+
+#~ msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+#~ msgstr "  --obsoletes    - 打印标签 obsoletes: 所有的废除。\n"
+
+#~ msgid ""
+#~ "  --env          - use specific environment (typically a bug\n"
+#~ "                   report).\n"
+#~ msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
+
+#~ msgid "  -i             - ignore case distinctions in every pattern.\n"
+#~ msgstr "  -i             - 忽略各种情况下的冲突。\n"
+
+#~ msgid ""
+#~ "  -a             - binary AND operator, true if both expression are "
+#~ "true.\n"
+#~ msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
+
+#~ msgid ""
+#~ "  -o             - binary OR operator, true if one expression is true.\n"
+#~ msgstr ""
+#~ "  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
+
+#~ msgid "  !              - unary NOT, true if expression is false.\n"
+#~ msgstr "  !              - 一元 NOT，如果表达为假，则为真。\n"
+
+#~ msgid "  (              - left parenthesis to open group expression.\n"
+#~ msgstr "  (              - 左括号用来打开一组表达式。\n"
+
+#~ msgid "  )              - right parenthesis to close group expression.\n"
+#~ msgstr "  )              - 右括号用来关闭一组表达式。\n"
+
+#~ msgid ""
+#~ "callback is:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "召回是:\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Continue?"
+#~ msgstr ""
+#~ "\n"
+#~ "继续吗?"
+
+#~ msgid ""
+#~ "Some package requested cannot be installed:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "某些要求的软件包无法安装:\n"
+#~ "%s"