Merge strings

1 files changed, 418 insertions, 280 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1bae662d..9179306f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-02 19:45+0800\n"
+"POT-Creation-Date: 2006-02-14 14:40+0100\n"
 "PO-Revision-Date: 2005-12-17 20:30+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -143,7 +143,7 @@ msgstr "(安装)"
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:124 ../urpmi:402
+#: ../gurpmi2:124 ../urpmi:414
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
@@ -176,11 +176,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:190 ../urpmi:556
+#: ../gurpmi2:190 ../urpmi:569
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:203 ../urpmi:566
+#: ../gurpmi2:203 ../urpmi:579
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
@@ -205,7 +205,7 @@ msgstr ""
 "您想要继续安装吗?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:253 ../gurpmi2:302 ../urpmi:638 ../urpmi:764
+#: ../gurpmi2:253 ../gurpmi2:309 ../urpmi:651 ../urpmi:782
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -217,12 +217,12 @@ msgstr ""
 "您可能需要更新您的 urpmi 数据库"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:260 ../urpme:124 ../urpmi:682
+#: ../gurpmi2:260 ../urpme:129 ../urpmi:698
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:268 ../urpm.pm:2895
+#: ../gurpmi2:268 ../urpm.pm:2905
 msgid "Preparing..."
 msgstr "正在准备..."
 
@@ -232,19 +232,19 @@ msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:288 ../urpmi:649 ../urpmi:703 ../urpmi:723 ../urpmi:741
+#: ../gurpmi2:295 ../urpmi:663 ../urpmi:721 ../urpmi:741 ../urpmi:759
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:304
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:305 ../urpmi:781
+#: ../gurpmi2:312 ../urpmi:799
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:307
+#: ../gurpmi2:314
 msgid "Installation finished"
 msgstr "安装完成"
 
@@ -275,7 +275,7 @@ msgid "                    defaults is %s.\n"
 msgstr "                    默认为 %s。\n"
 
 #. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:239
+#: ../rurpmi:11 ../urpmi:242
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
@@ -283,151 +283,151 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:68
+#: ../urpm.pm:73
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm:104
+#: ../urpm.pm:109
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm.pm:120
+#: ../urpm.pm:125
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm:215
+#: ../urpm.pm:221
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:216
+#: ../urpm.pm:222
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:229 ../urpm.pm:1304 ../urpm.pm:1314
+#: ../urpm.pm:235 ../urpm.pm:1310 ../urpm.pm:1320
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
 #. list file exists but isn't readable
 #. report error only if no result found, list files are only readable by root
-#: ../urpm.pm:232 ../urpm.pm:2510
+#: ../urpm.pm:238 ../urpm.pm:2516
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:260
+#: ../urpm.pm:266
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "试图覆盖已有介质“%s”，正跳过"
 
-#: ../urpm.pm:271
+#: ../urpm.pm:277
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:276
+#: ../urpm.pm:282
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm.pm:285
+#: ../urpm.pm:291
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:292
+#: ../urpm.pm:298
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:316
+#: ../urpm.pm:322
 #, c-format
 msgid "inconsistent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:326
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件，介质被忽略"
 
 #. - return value is suitable for an hash.
-#: ../urpm.pm:366
+#: ../urpm.pm:372
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的挂载点太多"
 
-#: ../urpm.pm:367
+#: ../urpm.pm:373
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm.pm:370
+#: ../urpm.pm:376
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr "介质“%s”是一个 ISO 映像，将会被实时挂载"
 
-#: ../urpm.pm:373
+#: ../urpm.pm:379
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm.pm:378 ../urpm.pm:381
+#: ../urpm.pm:384 ../urpm.pm:387
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm.pm:407
+#: ../urpm.pm:413
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:417
+#: ../urpm.pm:423
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:445
+#: ../urpm.pm:451
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:455
+#: ../urpm.pm:461
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:467
+#: ../urpm.pm:473
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:478
+#: ../urpm.pm:484
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:482
+#: ../urpm.pm:488
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:486
+#: ../urpm.pm:492
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:494
+#: ../urpm.pm:500
 #, c-format
 msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr "“%s”的 chroot 中似乎没有设备"
 
-#: ../urpm.pm:500
+#: ../urpm.pm:506
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
@@ -444,143 +444,143 @@ msgstr ""
 #. - (However links need to be managed. see bug #12391.)
 #. - as previously done, just read synthesis file here, this is enough.
 #. - read default synthesis (we have to make sure nothing get out of depslist).
-#: ../urpm.pm:564 ../urpm.pm:590 ../urpm.pm:1076 ../urpm.pm:1087
-#: ../urpm.pm:1159 ../urpm.pm:1176 ../urpm.pm:1231 ../urpm.pm:1287
-#: ../urpm.pm:1497 ../urpm.pm:1617 ../urpm.pm:1734 ../urpm.pm:1740
-#: ../urpm.pm:1843 ../urpm.pm:1929 ../urpm.pm:1933
+#: ../urpm.pm:570 ../urpm.pm:596 ../urpm.pm:1082 ../urpm.pm:1093
+#: ../urpm.pm:1165 ../urpm.pm:1182 ../urpm.pm:1237 ../urpm.pm:1293
+#: ../urpm.pm:1503 ../urpm.pm:1623 ../urpm.pm:1740 ../urpm.pm:1746
+#: ../urpm.pm:1849 ../urpm.pm:1935 ../urpm.pm:1939
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:568 ../urpm.pm:583 ../urpm.pm:596 ../urpm.pm:1079
-#: ../urpm.pm:1090 ../urpm.pm:1165 ../urpm.pm:1171 ../urpm.pm:1236
-#: ../urpm.pm:1291 ../urpm.pm:1501 ../urpm.pm:1621 ../urpm.pm:1728
-#: ../urpm.pm:1746 ../urpm.pm:1939
+#: ../urpm.pm:574 ../urpm.pm:589 ../urpm.pm:602 ../urpm.pm:1085
+#: ../urpm.pm:1096 ../urpm.pm:1171 ../urpm.pm:1177 ../urpm.pm:1242
+#: ../urpm.pm:1297 ../urpm.pm:1507 ../urpm.pm:1627 ../urpm.pm:1734
+#: ../urpm.pm:1752 ../urpm.pm:1945
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:578 ../urpm.pm:1083
+#: ../urpm.pm:584 ../urpm.pm:1089
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:608
+#: ../urpm.pm:614
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始：%s 结束：%s"
 
 #. - this is almost a fatal error, ignore it by default?
-#: ../urpm.pm:613 ../urpm.pm:1097 ../urpm.pm:1184 ../urpm.pm:1240
-#: ../urpm.pm:1625
+#: ../urpm.pm:619 ../urpm.pm:1103 ../urpm.pm:1190 ../urpm.pm:1246
+#: ../urpm.pm:1631
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:620 ../urpm.pm:1881
+#: ../urpm.pm:626 ../urpm.pm:1887
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:636
+#: ../urpm.pm:642
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:649
+#: ../urpm.pm:655
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
 #. - beware this can be a child process or the main process now...
 #. - open in read/write mode unless testing installation.
-#: ../urpm.pm:660 ../urpm.pm:2316 ../urpm.pm:2377 ../urpm.pm:2567
-#: ../urpm.pm:2960 ../urpm.pm:3084
+#: ../urpm.pm:666 ../urpm.pm:2324 ../urpm.pm:2385 ../urpm.pm:2573
+#: ../urpm.pm:2970 ../urpm.pm:3087
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:700
+#: ../urpm.pm:706
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:707
+#: ../urpm.pm:713
 msgid "virtual medium needs to be local"
 msgstr "虚拟介质必须是本地的"
 
-#: ../urpm.pm:732
+#: ../urpm.pm:738
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:777
+#: ../urpm.pm:783
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:781
+#: ../urpm.pm:787
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:783 ../urpm.pm:1200 ../urpm.pm:1257
+#: ../urpm.pm:789 ../urpm.pm:1206 ../urpm.pm:1263
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:784 ../urpm.pm:1201 ../urpm.pm:1332 ../urpm.pm:1395
-#: ../urpm.pm:1563 ../urpm.pm:1570
+#: ../urpm.pm:790 ../urpm.pm:1207 ../urpm.pm:1338 ../urpm.pm:1401
+#: ../urpm.pm:1569 ../urpm.pm:1576
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:787 ../urpm.pm:812 ../urpm.pm:851
+#: ../urpm.pm:793 ../urpm.pm:818 ../urpm.pm:857
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
 
-#: ../urpm.pm:794
+#: ../urpm.pm:800
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:806 ../urpm.pm:1607 ../urpm.pm:2105 ../urpm.pm:2825
+#: ../urpm.pm:812 ../urpm.pm:1613 ../urpm.pm:2114 ../urpm.pm:2831
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:808 ../urpm.pm:1591 ../urpm.pm:2109 ../urpm.pm:2827
+#: ../urpm.pm:814 ../urpm.pm:1597 ../urpm.pm:2118 ../urpm.pm:2833
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:832
+#: ../urpm.pm:838
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:888
+#: ../urpm.pm:894
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
 #. - several elements in found and/or foundi lists.
-#: ../urpm.pm:890
+#: ../urpm.pm:896
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:906
+#: ../urpm.pm:912
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:957
+#: ../urpm.pm:963
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm.pm:986
+#: ../urpm.pm:992
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm.pm:993
+#: ../urpm.pm:999
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm.pm:1137
+#: ../urpm.pm:1143
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -590,237 +590,233 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1188
+#: ../urpm.pm:1194
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1198
+#: ../urpm.pm:1204
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1253
+#: ../urpm.pm:1259
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1267
+#: ../urpm.pm:1273
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1272
+#: ../urpm.pm:1278
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1274
+#: ../urpm.pm:1280
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1295 ../urpm.pm:1505 ../urpm.pm:1846
+#: ../urpm.pm:1301 ../urpm.pm:1511 ../urpm.pm:1852
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1353
+#: ../urpm.pm:1359
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1368
+#: ../urpm.pm:1374
 msgid "no rpms read"
 msgstr "没有读到 rpm"
 
-#: ../urpm.pm:1378
+#: ../urpm.pm:1384
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1383
+#: ../urpm.pm:1389
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
 #. - try to probe for possible with_hdlist parameter, unless
 #. - it is already defined (and valid).
-#: ../urpm.pm:1520
+#: ../urpm.pm:1526
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1548
+#: ../urpm.pm:1554
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1598
+#: ../urpm.pm:1604
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1600
+#: ../urpm.pm:1606
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "...获取失败: md5sum 不匹配"
 
-#: ../urpm.pm:1698
+#: ../urpm.pm:1704
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1705
+#: ../urpm.pm:1711
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1716 ../urpm.pm:1770
+#: ../urpm.pm:1722 ../urpm.pm:1776
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1756
+#: ../urpm.pm:1762
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1795
+#: ../urpm.pm:1801
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1803
+#: ../urpm.pm:1809
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1811
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1820
+#: ../urpm.pm:1826
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1827
+#: ../urpm.pm:1833
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm.pm:1830
+#: ../urpm.pm:1836
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1895
+#: ../urpm.pm:1901
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1900
+#: ../urpm.pm:1906
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
 #. - XXX this happens when building a synthesis for a local media from RPMs... why ?
-#: ../urpm.pm:1915 ../urpm.pm:1951
+#: ../urpm.pm:1921 ../urpm.pm:1957
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm.pm:1919 ../urpm.pm:1955 ../urpmi:359
+#: ../urpm.pm:1925 ../urpm.pm:1961 ../urpmi:370
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1978
+#: ../urpm.pm:1984
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1982
+#: ../urpm.pm:1988
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:2003
+#: ../urpm.pm:2009
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "声称名称文件出错：依赖关系 %d 未找到"
 
-#: ../urpm.pm:2008
+#: ../urpm.pm:2014
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr "声称名称文件失败：无法写入文件(%s)"
 
-#: ../urpm.pm:2044
+#: ../urpm.pm:2050
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:2066
+#: ../urpm.pm:2074
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:2090
+#: ../urpm.pm:2099
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:2096
+#: ../urpm.pm:2105
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:2114
+#: ../urpm.pm:2123
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2119
+#: ../urpm.pm:2128
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:2129
+#: ../urpm.pm:2138
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:2133
+#: ../urpm.pm:2142
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2157
-msgid "Search"
-msgstr "搜索"
-
-#: ../urpm.pm:2244
+#: ../urpm.pm:2252
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm.pm:2246 ../urpme:97
+#: ../urpm.pm:2254 ../urpme:102
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2440 ../urpm.pm:2487 ../urpm.pm:2518
+#: ../urpm.pm:2447 ../urpm.pm:2493 ../urpm.pm:2524
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2501
+#: ../urpm.pm:2507
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2534
+#: ../urpm.pm:2540
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -829,189 +825,189 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2538
+#: ../urpm.pm:2544
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2550
+#: ../urpm.pm:2556
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2601 ../urpm.pm:2615 ../urpm.pm:2635 ../urpm.pm:2649
+#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2701 ../urpm.pm:2706 ../urpm.pm:2732
+#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
 #. - fallback to use other method for retrieving the file later.
-#: ../urpm.pm:2728
+#: ../urpm.pm:2734
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
 #. - we have a removable device that is not removable, well...
-#: ../urpm.pm:2736
+#: ../urpm.pm:2742
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2748
+#: ../urpm.pm:2754
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2803
+#: ../urpm.pm:2809
 #, fuzzy, c-format
 msgid "malformed URL: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2810
+#: ../urpm.pm:2816
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2933
+#: ../urpm.pm:2943
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2964
+#: ../urpm.pm:2975
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2967
+#: ../urpm.pm:2978
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2975
+#: ../urpm.pm:2986
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2977
+#: ../urpm.pm:2988
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2989
+#: ../urpm.pm:3000
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:3006
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:2998
+#: ../urpm.pm:3009
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:3055
+#: ../urpm.pm:3058
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
-#: ../urpm.pm:3227 ../urpm.pm:3265
+#: ../urpm.pm:3230 ../urpm.pm:3268
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3228 ../urpm.pm:3263
+#: ../urpm.pm:3231 ../urpm.pm:3266
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3234
+#: ../urpm.pm:3237
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3235
+#: ../urpm.pm:3238
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3258
+#: ../urpm.pm:3261
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3269
+#: ../urpm.pm:3272
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3270
+#: ../urpm.pm:3273
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3288
+#: ../urpm.pm:3291
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3321
+#: ../urpm.pm:3324
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3323
+#: ../urpm.pm:3326
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3385
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:3392
+#: ../urpm.pm:3395
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm.pm:3403
+#: ../urpm.pm:3406
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:3433
+#: ../urpm.pm:3436
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:105 ../urpm/args.pm:114
+#: ../urpm/args.pm:106 ../urpm/args.pm:115
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:224
+#: ../urpm/args.pm:229
 msgid "You need to be root to use --use-distrib"
 msgstr "你必须是 root 才能使用 --use-distrib 命令"
 
-#: ../urpm/args.pm:256
+#: ../urpm/args.pm:261
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
 #. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../urpm/msg.pm:46 ../urpme:33 ../urpmi:439 ../urpmi:457 ../urpmi:495
-#: ../urpmi:545 ../urpmi:628 ../urpmi:709
+#: ../urpm/msg.pm:46 ../urpme:32 ../urpmi:452 ../urpmi:470 ../urpmi:508
+#: ../urpmi:558 ../urpmi:641 ../urpmi:727
 msgid "Nn"
 msgstr "nN否"
 
 #. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:47 ../urpme:35 ../urpmi:440 ../urpmi:458 ../urpmi:496
-#: ../urpmi:546 ../urpmi:629 ../urpmi:710
+#: ../urpm/msg.pm:47 ../urpme:34 ../urpmi:453 ../urpmi:471 ../urpmi:509
+#: ../urpmi:559 ../urpmi:642 ../urpmi:728
 msgid "Yy"
 msgstr "yY是"
 
-#: ../urpm/msg.pm:85
+#: ../urpm/msg.pm:92
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
@@ -1059,7 +1055,7 @@ msgid "Installation failed on node %s"
 msgstr "节点 %s 安装失败"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:778
+#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:796
 msgid "Installation is possible"
 msgstr "可以安装"
 
@@ -1114,15 +1110,11 @@ msgstr "正在 %2$s 上安装 %1$s..."
 msgid "Preparing install on %s..."
 msgstr "正在准备在 %s 上安装..."
 
-#: ../urpme:31
-msgid "Is this OK?"
-msgstr "这样好了吗?"
-
-#: ../urpme:38
-#, c-format
+#: ../urpme:37
+#, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1134,46 +1126,53 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:43 ../urpmf:34 ../urpmi:80 ../urpmi.addmedia:44
-#: ../urpmi.removemedia:50 ../urpmi.update:31 ../urpmq:44
+#: ../urpme:42 ../urpmf:34 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:31 ../urpmi.removemedia:54 ../urpmi.update:31 ../urpmq:44
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpme:44
+#: ../urpme:43
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:45
+#: ../urpme:44
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:46 ../urpmi:102 ../urpmq:63
+#: ../urpme:45 ../urpmi:102 ../urpmq:63
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:47 ../urpmi:107 ../urpmq:64
+#: ../urpme:46 ../urpmi:107 ../urpmq:65
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
+#: ../urpme:47 ../urpmi:134
+#, fuzzy
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - 打包者\n"
+
 #: ../urpme:48
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:49 ../urpmi:132
-msgid "  --noscripts    - do not execute package scriptlet(s)\n"
+#: ../urpme:49
+#, fuzzy
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
 #: ../urpme:50
+#, fuzzy
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:52 ../urpmi:143 ../urpmi.addmedia:70 ../urpmi.removemedia:55
-#: ../urpmi.update:49 ../urpmq:90
+#: ../urpme:52 ../urpmi:145 ../urpmi.addmedia:70 ../urpmi.removemedia:59
+#: ../urpmi.update:49 ../urpmq:91
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
 
@@ -1181,54 +1180,59 @@ msgstr "  -v             - 详细的提示。\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:69
+#: ../urpme:70
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:91
+#: ../urpme:96
 msgid "unknown package"
 msgstr "未知的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:91
+#: ../urpme:96
 msgid "unknown packages"
 msgstr "未知的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:103 ../urpmi:475
+#: ../urpme:108 ../urpmi:488
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:106
+#: ../urpme:111
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:111
+#: ../urpme:116
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:118
+#: ../urpme:123
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
 
-#: ../urpme:120 ../urpmi:497 ../urpmi:630
+#: ../urpme:125 ../urpmi:510 ../urpmi:643
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
+#: ../urpme:125
+#, fuzzy, c-format
+msgid "Remove %d packages?"
+msgstr "无法删除软件包 %s"
+
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:142
+#: ../urpme:149
 msgid "Removal failed"
 msgstr "删除失败"
 
 #: ../urpmf:28
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
-"Copyright (C) 2002-2005 Mandriva.\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1244,7 +1248,7 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:36 ../urpmi:125 ../urpmq:73
+#: ../urpmf:36 ../urpmi:125 ../urpmq:74
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
@@ -1419,7 +1423,7 @@ msgstr "  --vendor       - 提供者\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:79 ../urpmq:79
+#: ../urpmf:79 ../urpmq:80
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
@@ -1427,7 +1431,7 @@ msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对：您只能使用一个多值标签"
 
-#: ../urpmf:173 ../urpmi:228 ../urpmq:125
+#: ../urpmf:173 ../urpmi:231 ../urpmq:126
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1443,10 +1447,10 @@ msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
 
 #: ../urpmi:75
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1553,11 +1557,11 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:67
+#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:68
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:68
+#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:69
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
@@ -1585,7 +1589,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:119 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:69
+#: ../urpmi:119 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:70
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1593,7 +1597,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:71
+#: ../urpmi:121 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:72
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1637,72 +1641,86 @@ msgstr "  --excludedocs  - 排除文档文件。\n"
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
+#: ../urpmi:132
+#, fuzzy
+msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
+msgstr "  --arch         - 体系\n"
+
 #: ../urpmi:133
+msgid "  --noscripts    - do not execute package scriptlet(s)\n"
+msgstr "  --noscripts    - 不执行软件包脚本。\n"
+
+#: ../urpmi:135
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:134
+#: ../urpmi:136
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:136 ../urpmi.addmedia:64 ../urpmi.update:42
+#: ../urpmi:138 ../urpmi.addmedia:64 ../urpmi.update:42
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr "  --norebuild    - 如果 hdlist 不可读的话，不尝试重新创建。\n"
 
-#: ../urpmi:137
+#: ../urpmi:139
 #, fuzzy
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:138
+#: ../urpmi:140
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:139 ../urpmq:76
+#: ../urpmi:141 ../urpmq:77
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:140
+#: ../urpmi:142
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:141
+#: ../urpmi:143
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:142 ../urpmi.addmedia:69 ../urpmi.removemedia:54
+#: ../urpmi:144 ../urpmi.addmedia:69 ../urpmi.removemedia:58
 #: ../urpmi.update:48
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:144
+#: ../urpmi:146
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:195
+#: ../urpmi:197
 #, fuzzy
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:218
+#: ../urpmi:220
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:219
+#: ../urpmi:221
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:222 ../urpmi:369
+#: ../urpmi:224 ../urpmi:380
 msgid "Copying failed"
 msgstr "复制失败"
 
+#: ../urpmi:230
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
 #: ../urpmi:248
 #, c-format
 msgid ""
@@ -1713,16 +1731,16 @@ msgstr ""
 "请使用 --allow-force 强制操作。"
 
 #. - For translators : there are several media here
-#: ../urpmi:321
+#: ../urpmi:332
 msgid "Updating media..."
 msgstr "正在更新介质..."
 
-#: ../urpmi:404
+#: ../urpmi:417
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:434
+#: ../urpmi:447
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1732,7 +1750,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
 "%s"
 
-#: ../urpmi:442 ../urpmi:460
+#: ../urpmi:455 ../urpmi:473
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1740,11 +1758,11 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:442 ../urpmi:460 ../urpmi:547
+#: ../urpmi:455 ../urpmi:473 ../urpmi:560
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:453
+#: ../urpmi:466
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -1753,7 +1771,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:483
+#: ../urpmi:496
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1763,7 +1781,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:488
+#: ../urpmi:501
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1772,25 +1790,25 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:490
+#: ../urpmi:503
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:526 ../urpmi:538
+#: ../urpmi:539 ../urpmi:551
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
 msgstr "为了满足依赖性要求，将另外安装以下软件包"
 
-#: ../urpmi:527 ../urpmi:539
+#: ../urpmi:540 ../urpmi:552
 msgid "To satisfy dependencies, the following package is going to be installed"
 msgstr "为了满足依赖关系，将安装下列软件包"
 
-#: ../urpmi:528
+#: ../urpmi:541
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d 个软件包，%d MB)"
 
-#: ../urpmi:534
+#: ../urpmi:547
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1799,70 +1817,70 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:541
+#: ../urpmi:554
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:543
+#: ../urpmi:556
 #, c-format
 msgid "Proceed with the installation of the %d packages? (%d MB)"
 msgstr "继续安装 %d 个软件包吗？(%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:580
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:573
+#: ../urpmi:586
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:573
+#: ../urpmi:586
 msgid "Ok"
 msgstr "确定"
 
-#: ../urpmi:620
+#: ../urpmi:633
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:621
+#: ../urpmi:634
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:666
+#: ../urpmi:682
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
 #. - there's a common prefix, simplify message
-#: ../urpmi:677
+#: ../urpmi:693
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpmi:679
+#: ../urpmi:695
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:711
+#: ../urpmi:729
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:729
+#: ../urpmi:747
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpmi:769
+#: ../urpmi:787
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:785
+#: ../urpmi:803
 #, c-format
 msgid "The following package names were assumed: %s"
 msgstr "假定下列软件包名称: %s"
 
-#: ../urpmi:802
+#: ../urpmi:820
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
 
@@ -1942,7 +1960,7 @@ msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:67 ../urpmi.removemedia:52 ../urpmi.update:46
+#: ../urpmi.addmedia:67 ../urpmi.removemedia:56 ../urpmi.update:46
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
@@ -1986,7 +2004,116 @@ msgstr "“with”找不到网络介质\n"
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
 
-#: ../urpmi.removemedia:48
+#: ../urpmi.recover:26
+#, fuzzy, c-format
+msgid ""
+"urpmi.recover version %s\n"
+"Copyright (C) 2006 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) 1999-2005 Mandriva。\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpmi.recover:32
+msgid "  --checkpoint   - set repackaging start now\n"
+msgstr ""
+
+#: ../urpmi.recover:33
+#, fuzzy
+msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
+msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
+
+#: ../urpmi.recover:34
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+
+#: ../urpmi.recover:35
+#, fuzzy
+msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
+
+#: ../urpmi.recover:36
+msgid ""
+"  --rollback     - rollback until specified date,\n"
+"                   or rollback the specified number of transactions\n"
+msgstr ""
+
+#: ../urpmi.recover:52
+#, c-format
+msgid "Invalid date or duration [%s]\n"
+msgstr ""
+
+#: ../urpmi.recover:62
+#, c-format
+msgid "Spurious command-line arguments [%s]\n"
+msgstr ""
+
+#: ../urpmi.recover:64
+msgid "You can't specify --checkpoint and --rollback at the same time\n"
+msgstr ""
+
+#: ../urpmi.recover:66
+msgid "You can't specify --checkpoint and --list at the same time\n"
+msgstr ""
+
+#: ../urpmi.recover:68
+msgid "You can't specify --rollback and --list at the same time\n"
+msgstr ""
+
+#: ../urpmi.recover:90
+#, c-format
+msgid "No transaction found since %s\n"
+msgstr ""
+
+#. - check we're running as root
+#: ../urpmi.recover:105
+msgid "You must be superuser to do this"
+msgstr ""
+
+#: ../urpmi.recover:114
+#, fuzzy
+msgid "Repackage directory not defined\n"
+msgstr "未找到软件包 %s。"
+
+#: ../urpmi.recover:117
+#, c-format
+msgid "Can't write to repackage directory [%s]\n"
+msgstr ""
+
+#: ../urpmi.recover:122
+#, c-format
+msgid "Cleaning up repackage directory [%s]...\n"
+msgstr ""
+
+#: ../urpmi.recover:124
+#, c-format
+msgid "%d files removed\n"
+msgstr ""
+
+#. - write rpm config file
+#: ../urpmi.recover:128
+#, fuzzy, c-format
+msgid "Writing rpm macros file [%s]...\n"
+msgstr "正在获取 rpm 文件[%s]..."
+
+#: ../urpmi.recover:170
+#, fuzzy
+msgid "No rollback date found\n"
+msgstr "没有找到文件列表\n"
+
+#: ../urpmi.recover:173
+#, c-format
+msgid "Rollback until %s...\n"
+msgstr ""
+
+#: ../urpmi.removemedia:52
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -1994,15 +2121,15 @@ msgstr ""
 "用法: urpmi.removemedia [-a] <名称> ...\n"
 "其中 <名称> 是要删除的介质名。\n"
 
-#: ../urpmi.removemedia:51
+#: ../urpmi.removemedia:55
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质。\n"
 
-#: ../urpmi.removemedia:53
+#: ../urpmi.removemedia:57
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - 介质名称使用模糊匹配。\n"
 
-#: ../urpmi.removemedia:56
+#: ../urpmi.removemedia:60
 #, c-format
 msgid ""
 "\n"
@@ -2011,15 +2138,15 @@ msgstr ""
 "\n"
 "未知的选项“%s”\n"
 
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "只允许超级用户删除介质"
 
-#: ../urpmi.removemedia:76
+#: ../urpmi.removemedia:81
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:83
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2089,10 +2216,10 @@ msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
 #: ../urpmq:39
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2005 Mandriva.\n"
+"Copyright (C) 2000-2006 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -2148,101 +2275,112 @@ msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
-#: ../urpmq:65
+#: ../urpmq:64
+#, fuzzy
+msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
+msgstr "  --arch         - 体系\n"
+
+#: ../urpmq:66
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr "  --use-distrib  - 从发行版树中实时配置 urpmi。这将允许查询发行版。\n"
 
-#: ../urpmq:74
+#: ../urpmq:75
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印更新日志。\n"
 
-#: ../urpmq:75
+#: ../urpmq:76
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 打印摘要。\n"
 
-#: ../urpmq:77
+#: ../urpmq:78
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:78
+#: ../urpmq:79
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 扩展软件包依赖性查询。\n"
 
-#: ../urpmq:80
+#: ../urpmq:81
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:81
+#: ../urpmq:82
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:82
+#: ../urpmq:83
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:83
+#: ../urpmq:84
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - 不搜索提供中的软件包(默认)。\n"
 
-#: ../urpmq:84
+#: ../urpmq:85
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmq:85
+#: ../urpmq:86
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:86
+#: ../urpmq:87
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆序搜索需要软件包的软件包。\n"
 
-#: ../urpmq:87
+#: ../urpmq:88
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - 扩展逆序搜索(包括虚拟软件包)。\n"
 
-#: ../urpmq:88
+#: ../urpmq:89
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmq:89
+#: ../urpmq:90
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:91
+#: ../urpmq:92
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmq:92
+#: ../urpmq:93
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 类似于 -y，但强制不区分大小写匹配。\n"
 
-#: ../urpmq:93
+#: ../urpmq:94
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:166
+#: ../urpmq:170
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:323
+#: ../urpmq:327
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "跳过介质 %s：无 hdlist"
 
-#: ../urpmq:397
+#: ../urpmq:401
 msgid "No filelist found\n"
 msgstr "没有找到文件列表\n"
 
-#: ../urpmq:409
+#: ../urpmq:413
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid "Search"
+#~ msgstr "搜索"
+
+#~ msgid "Is this OK?"
+#~ msgstr "这样好了吗?"
+
 #~ msgid ""
 #~ "  --version      - use specified distribution version, the default is "
 #~ "taken\n"