From 90406ee7936ec19d44d7f171a50079411cb15409 Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Mon, 2 Feb 2004 13:04:26 +0000
Subject: fixed typo

---
 po/zh_CN.po | 417 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 213 insertions(+), 204 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3e21dd03..8955beff 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-28 16:28+0100\n"
+"POT-Creation-Date: 2004-02-02 14:04+0100\n"
 "PO-Revision-Date: 2004-01-21 00:23+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "自动安装软件包...\n"
 "您要求安装软件包 %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:516
+#: ../_irpm:33 ../urpme:28 ../urpmi:519
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
 
-#: ../_irpm:35 ../urpmi:140
+#: ../_irpm:35 ../urpmi:142
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../_irpm:36 ../urpmi:141
+#: ../_irpm:36 ../urpmi:143
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:452 ../urpmi:524
+#: ../_irpm:44 ../urpmi:455 ../urpmi:527
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -108,191 +108,191 @@ msgstr "复制失败: %s"
 msgid "wget is missing\n"
 msgstr "没有 wget\n"
 
-#: ../urpm.pm:238
+#: ../urpm.pm:239
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:242
 #, c-format
 msgid "curl is missing\n"
 msgstr "没有 curl\n"
 
-#: ../urpm.pm:337
+#: ../urpm.pm:339
 #, c-format
 msgid "curl failed: exited with %d or signal %d\n"
 msgstr "curl 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm:343 ../urpm.pm:390
+#: ../urpm.pm:345 ../urpm.pm:392
 #, c-format
 msgid "rsync is missing\n"
 msgstr "没有 rsync\n"
 
-#: ../urpm.pm:387 ../urpm.pm:434
+#: ../urpm.pm:389 ../urpm.pm:436
 #, c-format
 msgid "rsync failed: exited with %d or signal %d\n"
 msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm:391
+#: ../urpm.pm:393
 #, c-format
 msgid "ssh is missing\n"
 msgstr "没有 ssh\n"
 
-#: ../urpm.pm:444 ../urpmi:601
+#: ../urpm.pm:446 ../urpmi:605
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
 
-#: ../urpm.pm:446 ../urpmi:604
+#: ../urpm.pm:448 ../urpmi:608
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        已完成 %s%%，速度 = %s"
 
-#: ../urpm.pm:493 ../urpm.pm:506 ../urpm.pm:519
+#: ../urpm.pm:495 ../urpm.pm:508 ../urpm.pm:521
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "配置文件的第 %s 行语法错误"
 
-#: ../urpm.pm:530
+#: ../urpm.pm:532
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:536
+#: ../urpm.pm:538
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:552
+#: ../urpm.pm:554
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "无法照顾介质“%s”，因为列表文件已经被另外的介质所用"
 
-#: ../urpm.pm:558
+#: ../urpm.pm:560
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "无法给未命名介质起名为“%s”，因为该名称已被使用"
 
-#: ../urpm.pm:565
+#: ../urpm.pm:567
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "无法考虑“%s”，因为不存在列表文件[%s]"
 
-#: ../urpm.pm:569
+#: ../urpm.pm:571
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法决定此 hdlist 文件[%s]的介质"
 
-#: ../urpm.pm:578
+#: ../urpm.pm:580
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:580 ../urpm.pm:2654
+#: ../urpm.pm:582 ../urpm.pm:2656
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:604
+#: ../urpm.pm:606
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图跳过已有介质“%s”，避免中"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:614
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:617
+#: ../urpm.pm:619
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm.pm:626
+#: ../urpm.pm:628
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:633
+#: ../urpm.pm:635
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:656
+#: ../urpm.pm:658
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:666
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:697
+#: ../urpm.pm:699
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的载入点太多"
 
-#: ../urpm.pm:698
+#: ../urpm.pm:700
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm.pm:702
+#: ../urpm.pm:704
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm.pm:707 ../urpm.pm:710
+#: ../urpm.pm:709 ../urpm.pm:712
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm.pm:723
+#: ../urpm.pm:725
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:745
+#: ../urpm.pm:747
 #, c-format
 msgid "write config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:757
+#: ../urpm.pm:759
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:767
+#: ../urpm.pm:769
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:778
+#: ../urpm.pm:780
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:788
+#: ../urpm.pm:790
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:792
+#: ../urpm.pm:794
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:798
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:807
+#: ../urpm.pm:809
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -301,139 +301,139 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:858 ../urpm.pm:880 ../urpm.pm:1228 ../urpm.pm:1239
-#: ../urpm.pm:1300 ../urpm.pm:1317 ../urpm.pm:1400 ../urpm.pm:1457
-#: ../urpm.pm:1629 ../urpm.pm:1729 ../urpm.pm:1827 ../urpm.pm:1833
-#: ../urpm.pm:1932 ../urpm.pm:2011 ../urpm.pm:2015
+#: ../urpm.pm:860 ../urpm.pm:882 ../urpm.pm:1230 ../urpm.pm:1241
+#: ../urpm.pm:1302 ../urpm.pm:1319 ../urpm.pm:1402 ../urpm.pm:1459
+#: ../urpm.pm:1631 ../urpm.pm:1731 ../urpm.pm:1829 ../urpm.pm:1835
+#: ../urpm.pm:1934 ../urpm.pm:2013 ../urpm.pm:2017
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:862 ../urpm.pm:875 ../urpm.pm:884 ../urpm.pm:1231
-#: ../urpm.pm:1242 ../urpm.pm:1306 ../urpm.pm:1312 ../urpm.pm:1405
-#: ../urpm.pm:1461 ../urpm.pm:1633 ../urpm.pm:1733 ../urpm.pm:1821
-#: ../urpm.pm:1839 ../urpm.pm:2021
+#: ../urpm.pm:864 ../urpm.pm:877 ../urpm.pm:886 ../urpm.pm:1233
+#: ../urpm.pm:1244 ../urpm.pm:1308 ../urpm.pm:1314 ../urpm.pm:1407
+#: ../urpm.pm:1463 ../urpm.pm:1635 ../urpm.pm:1735 ../urpm.pm:1823
+#: ../urpm.pm:1841 ../urpm.pm:2023
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:1235
+#: ../urpm.pm:872 ../urpm.pm:1237
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:893 ../urpm.pm:1249 ../urpm.pm:1325 ../urpm.pm:1409
-#: ../urpm.pm:1737
+#: ../urpm.pm:895 ../urpm.pm:1251 ../urpm.pm:1327 ../urpm.pm:1411
+#: ../urpm.pm:1739
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:899 ../urpm.pm:1971
+#: ../urpm.pm:901 ../urpm.pm:1973
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:911
+#: ../urpm.pm:913
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:920
+#: ../urpm.pm:922
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:931 ../urpm.pm:2454 ../urpm.pm:2515 ../urpm.pm:3088
-#: ../urpm.pm:3186
+#: ../urpm.pm:933 ../urpm.pm:2456 ../urpm.pm:2517 ../urpm.pm:3091
+#: ../urpm.pm:3189
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:970
+#: ../urpm.pm:972
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:977
+#: ../urpm.pm:979
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "虚拟介质必须位于本地"
 
-#: ../urpm.pm:1009
+#: ../urpm.pm:1011
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:1025
+#: ../urpm.pm:1027
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:1029
+#: ../urpm.pm:1031
 #, c-format
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:1031 ../urpm.pm:1340 ../urpm.pm:1429
+#: ../urpm.pm:1033 ../urpm.pm:1342 ../urpm.pm:1431
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:1031 ../urpm.pm:1340 ../urpm.pm:1433
+#: ../urpm.pm:1033 ../urpm.pm:1342 ../urpm.pm:1435
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:1033 ../urpm.pm:1052 ../urpm.pm:1077
+#: ../urpm.pm:1035 ../urpm.pm:1054 ../urpm.pm:1079
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "无法访问首次安装介质(未发现 Mandrake/base/hdlists 文件)"
 
-#: ../urpm.pm:1039
+#: ../urpm.pm:1041
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:1046 ../urpm.pm:1719 ../urpm.pm:2282 ../urpm.pm:2962
+#: ../urpm.pm:1048 ../urpm.pm:1721 ../urpm.pm:2284 ../urpm.pm:2965
 #: ../urpmi.addmedia:159
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:1048 ../urpm.pm:1703 ../urpm.pm:1712 ../urpm.pm:2285
-#: ../urpm.pm:2965 ../urpmi:612 ../urpmi.addmedia:161
+#: ../urpm.pm:1050 ../urpm.pm:1705 ../urpm.pm:1714 ../urpm.pm:2287
+#: ../urpm.pm:2968 ../urpmi:616 ../urpmi.addmedia:161
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:1068
+#: ../urpm.pm:1070
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:1110
+#: ../urpm.pm:1112
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:1112
+#: ../urpm.pm:1114
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:1112
+#: ../urpm.pm:1114
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm:1128
+#: ../urpm.pm:1130
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:1276
+#: ../urpm.pm:1278
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -443,224 +443,224 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1329
+#: ../urpm.pm:1331
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1337
+#: ../urpm.pm:1339
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1360 ../urpm.pm:1589
+#: ../urpm.pm:1362 ../urpm.pm:1591
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1371 ../urpm.pm:1600
+#: ../urpm.pm:1373 ../urpm.pm:1602
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:1425
+#: ../urpm.pm:1427
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1438 ../urpm.pm:1444
+#: ../urpm.pm:1440 ../urpm.pm:1446
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "复制[%s]失败"
 
-#: ../urpm.pm:1442
+#: ../urpm.pm:1444
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1465 ../urpm.pm:1637 ../urpm.pm:1935
+#: ../urpm.pm:1467 ../urpm.pm:1639 ../urpm.pm:1937
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1504
+#: ../urpm.pm:1506
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1523
+#: ../urpm.pm:1525
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1528
+#: ../urpm.pm:1530
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1655
+#: ../urpm.pm:1657
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1674
+#: ../urpm.pm:1676
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1710
+#: ../urpm.pm:1712
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1712
+#: ../urpm.pm:1714
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1793
+#: ../urpm.pm:1795
 #, c-format
-msgid "retrieve of source hdlist (or synthesis) failed"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1800
+#: ../urpm.pm:1802
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1811 ../urpm.pm:1863
+#: ../urpm.pm:1813 ../urpm.pm:1865
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1849
+#: ../urpm.pm:1851
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1887
+#: ../urpm.pm:1889
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1894
+#: ../urpm.pm:1896
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1896
+#: ../urpm.pm:1898
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1909
+#: ../urpm.pm:1911
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1916
+#: ../urpm.pm:1918
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1919
+#: ../urpm.pm:1921
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1985
+#: ../urpm.pm:1987
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1990
+#: ../urpm.pm:1992
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:2002 ../urpm.pm:2031 ../urpmi:362
+#: ../urpm.pm:2004 ../urpm.pm:2033 ../urpmi:365
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:2051
+#: ../urpm.pm:2053
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:2055
+#: ../urpm.pm:2057
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:2225
+#: ../urpm.pm:2227
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:2238
+#: ../urpm.pm:2240
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:2260
+#: ../urpm.pm:2262
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "depslist 中重新分配了 %s 项"
 
-#: ../urpm.pm:2261
+#: ../urpm.pm:2263
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "depslist 中没有重新分配项"
 
-#: ../urpm.pm:2274
+#: ../urpm.pm:2276
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:2282
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:2287 ../urpm.pm:3130
+#: ../urpm.pm:2289 ../urpm.pm:3133
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2292
+#: ../urpm.pm:2294
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:2295
+#: ../urpm.pm:2297
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2396
+#: ../urpm.pm:2398
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2399 ../urpme:96
+#: ../urpm.pm:2401 ../urpme:96
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2591 ../urpm.pm:2635 ../urpm.pm:2661
+#: ../urpm.pm:2593 ../urpm.pm:2637 ../urpm.pm:2663
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2646
+#: ../urpm.pm:2648
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2673
+#: ../urpm.pm:2675
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -669,138 +669,138 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2677
+#: ../urpm.pm:2679
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2689
+#: ../urpm.pm:2691
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2729 ../urpm.pm:2744 ../urpm.pm:2768 ../urpm.pm:2783
+#: ../urpm.pm:2731 ../urpm.pm:2746 ../urpm.pm:2770 ../urpm.pm:2785
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2835 ../urpm.pm:2838 ../urpm.pm:2868
+#: ../urpm.pm:2837 ../urpm.pm:2840 ../urpm.pm:2870
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2864
+#: ../urpm.pm:2866
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2872
+#: ../urpm.pm:2874
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2885
+#: ../urpm.pm:2887
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2946
+#: ../urpm.pm:2948
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2953
+#: ../urpm.pm:2955
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:3031 ../urpmi:690
+#: ../urpm.pm:3034 ../urpmi:694
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../urpm.pm:3062
+#: ../urpm.pm:3065
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:3092
+#: ../urpm.pm:3095
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:3095
+#: ../urpm.pm:3098
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:3106
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3105
+#: ../urpm.pm:3108
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3115
+#: ../urpm.pm:3118
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:3118
+#: ../urpm.pm:3121
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:3317 ../urpm.pm:3348
+#: ../urpm.pm:3320 ../urpm.pm:3351
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3318 ../urpm.pm:3346
+#: ../urpm.pm:3321 ../urpm.pm:3349
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3319
+#: ../urpm.pm:3322
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3320
+#: ../urpm.pm:3323
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3341
+#: ../urpm.pm:3344
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3353
+#: ../urpm.pm:3356
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3355
+#: ../urpm.pm:3358
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3371
+#: ../urpm.pm:3374
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3398
+#: ../urpm.pm:3401
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3400
+#: ../urpm.pm:3403
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
@@ -832,7 +832,7 @@ msgstr "  --help         - 打印帮助信息。\n"
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:42 ../urpmi:122
+#: ../urpme:42 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
@@ -863,7 +863,7 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:48 ../urpmi:131 ../urpmq:73
+#: ../urpme:48 ../urpmi:133 ../urpmq:73
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             -详细的提示。\n"
@@ -908,12 +908,12 @@ msgstr "检查删除下列软件包"
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
-#: ../urpme:116 ../urpmi:478 ../urpmi:636
+#: ../urpme:116 ../urpmi:481 ../urpmi:640
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:119 ../urpmi:679
+#: ../urpme:119 ../urpmi:683
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
@@ -923,7 +923,7 @@ msgstr "正在删除 %s"
 msgid "Removing failed"
 msgstr "删除失败"
 
-#: ../urpme:152 ../urpmi:874
+#: ../urpme:152 ../urpmi:878
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
@@ -1066,7 +1066,7 @@ msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
 
-#: ../urpmf:56 ../urpmi:115 ../urpmq:70
+#: ../urpmf:56 ../urpmi:117 ../urpmq:70
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1125,7 +1125,7 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:259 ../urpmq:180
+#: ../urpmf:148 ../urpmi:262 ../urpmq:180
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1254,7 +1254,16 @@ msgstr "  --curl         - 用 crul 取远程文件。\n"
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:109
+#, fuzzy, c-format
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
+msgstr ""
+"  --verify-rpm   - 安装之前验证 rpm 签署。\n"
+"                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
+
+#: ../urpmi:111 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1263,7 +1272,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1272,7 +1281,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   口令(格式如 <用户: 口令>)。\n"
 
-#: ../urpmi:113
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1281,12 +1290,12 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:117
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - 使用 X 界面。\n"
 
-#: ../urpmi:118
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1295,7 +1304,7 @@ msgstr ""
 "  --best-output  - 根据运行环境选择最好的界面:\n"
 "                   X 或文本模式。\n"
 
-#: ../urpmi:120
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1304,110 +1313,110 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:123
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:124
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:125 ../urpmq:76
+#: ../urpmi:127 ../urpmq:76
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:126
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmi:127 ../urpmq:78
+#: ../urpmi:129 ../urpmq:78
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpmi:128 ../urpmq:80
+#: ../urpmi:130 ../urpmq:80
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:129 ../urpmq:81
+#: ../urpmi:131 ../urpmq:81
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:130
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:132
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:185 ../urpmi:192 ../urpmi.addmedia:98 ../urpmi.addmedia:105
+#: ../urpmi:188 ../urpmi:195 ../urpmi.addmedia:98 ../urpmi.addmedia:105
 #: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpmi:224
+#: ../urpmi:227
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: 未知选项“-%s”，用--help 检查用法\n"
 
-#: ../urpmi:244
+#: ../urpmi:247
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:251
+#: ../urpmi:254
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:251
+#: ../urpmi:254
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:270
+#: ../urpmi:273
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:403
+#: ../urpmi:406
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "需要下列软件包之一才能安装 %s:"
 
-#: ../urpmi:404
+#: ../urpmi:407
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../urpmi:411
+#: ../urpmi:414
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:421 ../urpmi:538
+#: ../urpmi:424 ../urpmi:541
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../urpmi:421 ../urpmi:538
+#: ../urpmi:424 ../urpmi:541
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../urpmi:442
+#: ../urpmi:445
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1416,12 +1425,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:447 ../urpmi:473
+#: ../urpmi:450 ../urpmi:476
 #, c-format
 msgid "do you agree ?"
 msgstr "您同意吗?"
 
-#: ../urpmi:462
+#: ../urpmi:465
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1431,7 +1440,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:468
+#: ../urpmi:471
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1440,14 +1449,14 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:506 ../urpmi:515
+#: ../urpmi:509 ../urpmi:518
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
 
-#: ../urpmi:512
+#: ../urpmi:515
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1456,37 +1465,37 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:533 ../urpmq:353
+#: ../urpmi:536 ../urpmq:353
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../urpmi:548
+#: ../urpmi:551
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签“%s”的介质到设备 [%s]"
 
-#: ../urpmi:549
+#: ../urpmi:552
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:589
+#: ../urpmi:593
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../urpmi:623
+#: ../urpmi:627
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:624
+#: ../urpmi:628
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:644 ../urpmi:766
+#: ../urpmi:648 ../urpmi:770
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1497,52 +1506,52 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../urpmi:654 ../urpmi:707 ../urpmi:726 ../urpmi:744
+#: ../urpmi:658 ../urpmi:711 ../urpmi:730 ../urpmi:748
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi:669
+#: ../urpmi:673
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:677
+#: ../urpmi:681
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:692
+#: ../urpmi:696
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../urpmi:714
+#: ../urpmi:718
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:731
+#: ../urpmi:735
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:771
+#: ../urpmi:775
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:779
+#: ../urpmi:783
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:782
+#: ../urpmi:786
 #, c-format
 msgid "Everything already installed"
 msgstr "全部安装完成"
 
-#: ../urpmi:796
+#: ../urpmi:800
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新启动 urpmi"
-- 
cgit v1.2.1