Updated POT file.

1 files changed, 193 insertions, 174 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1bed17c6..5dd5483d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-05 18:43+0800\n"
-"PO-Revision-Date: 2006-03-05 18:54+0800\n"
+"POT-Creation-Date: 2006-04-01 16:35+0800\n"
+"PO-Revision-Date: 2006-04-01 16:41+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
 "org>\n"
@@ -103,12 +103,12 @@ msgstr "取消(_C)"
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../gurpmi.pm:75
+#: ../gurpmi.pm:76
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知的选项 %s"
 
-#: ../gurpmi.pm:83
+#: ../gurpmi.pm:86
 msgid "No packages specified"
 msgstr "未指定软件包"
 
@@ -185,12 +185,12 @@ msgstr "无法读取源软件包，中止"
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:236
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:250
+#: ../gurpmi2:251
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -205,7 +205,7 @@ msgstr ""
 "您想要继续安装吗?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:257 ../gurpmi2:313 ../urpmi:651 ../urpmi:782
+#: ../gurpmi2:258 ../gurpmi2:314 ../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:264 ../urpme:129 ../urpmi:698
+#: ../gurpmi2:265 ../urpme:128 ../urpmi:698
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:272 ../urpm.pm:2907
+#: ../gurpmi2:272 ../urpm.pm:2916
 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:299 ../urpmi:663 ../urpmi:721 ../urpmi:741 ../urpmi:759
+#: ../gurpmi2:300 ../urpmi:663 ../urpmi:721 ../urpmi:741 ../urpmi:759
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../gurpmi2:308
+#: ../gurpmi2:309
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:316 ../urpmi:799
+#: ../gurpmi2:317 ../urpmi:799
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:318
+#: ../gurpmi2:319
 msgid "Installation finished"
 msgstr "安装完成"
 
@@ -283,11 +283,16 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:72
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
+#: ../urpm.pm:101
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s 不可用，默认回到 %s"
+
 #: ../urpm.pm:109
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
@@ -308,14 +313,14 @@ msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:236 ../urpm.pm:1311 ../urpm.pm:1321
+#: ../urpm.pm:236 ../urpm.pm:1313 ../urpm.pm:1323
 #, 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:239 ../urpm.pm:2517
+#: ../urpm.pm:239 ../urpm.pm:2521
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
@@ -444,23 +449,23 @@ 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:571 ../urpm.pm:597 ../urpm.pm:1083 ../urpm.pm:1094
-#: ../urpm.pm:1166 ../urpm.pm:1183 ../urpm.pm:1238 ../urpm.pm:1294
-#: ../urpm.pm:1504 ../urpm.pm:1624 ../urpm.pm:1741 ../urpm.pm:1747
-#: ../urpm.pm:1850 ../urpm.pm:1936 ../urpm.pm:1940
+#: ../urpm.pm:571 ../urpm.pm:597 ../urpm.pm:1085 ../urpm.pm:1096
+#: ../urpm.pm:1168 ../urpm.pm:1185 ../urpm.pm:1240 ../urpm.pm:1296
+#: ../urpm.pm:1506 ../urpm.pm:1626 ../urpm.pm:1743 ../urpm.pm:1749
+#: ../urpm.pm:1852 ../urpm.pm:1938 ../urpm.pm:1942
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:575 ../urpm.pm:590 ../urpm.pm:603 ../urpm.pm:1086
-#: ../urpm.pm:1097 ../urpm.pm:1172 ../urpm.pm:1178 ../urpm.pm:1243
-#: ../urpm.pm:1298 ../urpm.pm:1508 ../urpm.pm:1628 ../urpm.pm:1735
-#: ../urpm.pm:1753 ../urpm.pm:1946
+#: ../urpm.pm:575 ../urpm.pm:590 ../urpm.pm:603 ../urpm.pm:1088
+#: ../urpm.pm:1099 ../urpm.pm:1174 ../urpm.pm:1180 ../urpm.pm:1245
+#: ../urpm.pm:1300 ../urpm.pm:1510 ../urpm.pm:1630 ../urpm.pm:1737
+#: ../urpm.pm:1755 ../urpm.pm:1948
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:585 ../urpm.pm:1090
+#: ../urpm.pm:585 ../urpm.pm:1092
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
@@ -471,13 +476,13 @@ msgid "Search start: %s end: %s"
 msgstr "搜索开始：%s 结束：%s"
 
 #. - this is almost a fatal error, ignore it by default?
-#: ../urpm.pm:620 ../urpm.pm:1104 ../urpm.pm:1191 ../urpm.pm:1247
-#: ../urpm.pm:1632
+#: ../urpm.pm:620 ../urpm.pm:1106 ../urpm.pm:1193 ../urpm.pm:1249
+#: ../urpm.pm:1634
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:627 ../urpm.pm:1888
+#: ../urpm.pm:627 ../urpm.pm:1890
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
@@ -493,94 +498,94 @@ msgstr "将安装而非升级软件包 %s"
 
 #. - beware this can be a child process or the main process now...
 #. - open in read/write mode unless testing installation.
-#: ../urpm.pm:667 ../urpm.pm:2325 ../urpm.pm:2386 ../urpm.pm:2574
-#: ../urpm.pm:2972 ../urpm.pm:3090
+#: ../urpm.pm:667 ../urpm.pm:2329 ../urpm.pm:2390 ../urpm.pm:2579
+#: ../urpm.pm:2982 ../urpm.pm:3109
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:707
+#: ../urpm.pm:708
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:714
+#: ../urpm.pm:715
 msgid "virtual medium needs to be local"
 msgstr "虚拟介质必须是本地的"
 
-#: ../urpm.pm:739
+#: ../urpm.pm:740
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:784
+#: ../urpm.pm:786
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:788
+#: ../urpm.pm:790
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:790 ../urpm.pm:1207 ../urpm.pm:1264
+#: ../urpm.pm:792 ../urpm.pm:1209 ../urpm.pm:1266
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:791 ../urpm.pm:1208 ../urpm.pm:1339 ../urpm.pm:1402
-#: ../urpm.pm:1570 ../urpm.pm:1577
+#: ../urpm.pm:793 ../urpm.pm:1210 ../urpm.pm:1341 ../urpm.pm:1404
+#: ../urpm.pm:1572 ../urpm.pm:1579
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:794 ../urpm.pm:819 ../urpm.pm:858
+#: ../urpm.pm:796 ../urpm.pm:821 ../urpm.pm:860
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
 
-#: ../urpm.pm:801
+#: ../urpm.pm:803
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:813 ../urpm.pm:1614 ../urpm.pm:2115 ../urpm.pm:2832
+#: ../urpm.pm:815 ../urpm.pm:1616 ../urpm.pm:2117 ../urpm.pm:2837
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:815 ../urpm.pm:1598 ../urpm.pm:2119 ../urpm.pm:2834
+#: ../urpm.pm:817 ../urpm.pm:1600 ../urpm.pm:2121 ../urpm.pm:2839
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:839
+#: ../urpm.pm:841
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:895
+#: ../urpm.pm:897
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
 #. - several elements in found and/or foundi lists.
-#: ../urpm.pm:897
+#: ../urpm.pm:899
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:913
+#: ../urpm.pm:915
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:964
+#: ../urpm.pm:966
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm.pm:993
+#: ../urpm.pm:995
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm.pm:1000
+#: ../urpm.pm:1002
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm.pm:1144
+#: ../urpm.pm:1146
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -590,233 +595,242 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1195
+#: ../urpm.pm:1197
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1205
+#: ../urpm.pm:1207
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1260
+#: ../urpm.pm:1262
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1274
+#: ../urpm.pm:1276
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1279
+#: ../urpm.pm:1281
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1281
+#: ../urpm.pm:1283
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1302 ../urpm.pm:1512 ../urpm.pm:1853
+#: ../urpm.pm:1304 ../urpm.pm:1514 ../urpm.pm:1855
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1360
+#: ../urpm.pm:1362
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1375
+#: ../urpm.pm:1377
 msgid "no rpms read"
 msgstr "没有读到 rpm"
 
-#: ../urpm.pm:1385
+#: ../urpm.pm:1387
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1390
+#: ../urpm.pm:1392
 #, 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:1527
+#: ../urpm.pm:1529
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1555
+#: ../urpm.pm:1557
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1605
+#: ../urpm.pm:1607
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1607
+#: ../urpm.pm:1609
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "...获取失败: md5sum 不匹配"
 
-#: ../urpm.pm:1705
+#: ../urpm.pm:1707
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1712
+#: ../urpm.pm:1714
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1723 ../urpm.pm:1777
+#: ../urpm.pm:1725 ../urpm.pm:1779
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1763
+#: ../urpm.pm:1765
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1802
+#: ../urpm.pm:1804
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1810
+#: ../urpm.pm:1812
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1814
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1827
+#: ../urpm.pm:1829
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1834
+#: ../urpm.pm:1836
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm.pm:1837
+#: ../urpm.pm:1839
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1902
+#: ../urpm.pm:1904
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1907
+#: ../urpm.pm:1909
 #, 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:1922 ../urpm.pm:1958
+#: ../urpm.pm:1924 ../urpm.pm:1960
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm.pm:1926 ../urpm.pm:1962 ../urpmi:370
+#: ../urpm.pm:1928 ../urpm.pm:1964 ../urpmi:370
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1985
+#: ../urpm.pm:1987
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1989
+#: ../urpm.pm:1991
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:2010
+#: ../urpm.pm:2012
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "声称名称文件出错：依赖关系 %d 未找到"
 
-#: ../urpm.pm:2015
+#: ../urpm.pm:2017
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr "声称名称文件失败：无法写入文件(%s)"
 
-#: ../urpm.pm:2051
+#: ../urpm.pm:2053
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:2075
+#: ../urpm.pm:2077
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:2100
+#: ../urpm.pm:2102
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:2106
+#: ../urpm.pm:2108
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:2124
+#: ../urpm.pm:2126
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2129
+#: ../urpm.pm:2131
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:2139
+#: ../urpm.pm:2141
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
 #: ../urpm.pm:2143
+#, c-format
+msgid "Incompatible architecture for rpm [%s]"
+msgstr "RPM 的架构不兼容[%s]"
+
+#: ../urpm.pm:2147
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2253
+#: ../urpm.pm:2257
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm.pm:2255 ../urpme:102
+#: ../urpm.pm:2259 ../urpme:101
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2448 ../urpm.pm:2494 ../urpm.pm:2525
+#: ../urpm.pm:2452 ../urpm.pm:2498 ../urpm.pm:2530
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2508
+#: ../urpm.pm:2512
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2541
+#: ../urpm.pm:2522
+msgid "(retry as root?)"
+msgstr "(以 root 身份重试?)"
+
+#: ../urpm.pm:2546
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -825,160 +839,164 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2545
+#: ../urpm.pm:2550
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2557
+#: ../urpm.pm:2562
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2608 ../urpm.pm:2622 ../urpm.pm:2642 ../urpm.pm:2656
+#: ../urpm.pm:2613 ../urpm.pm:2627 ../urpm.pm:2647 ../urpm.pm:2661
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2708 ../urpm.pm:2713 ../urpm.pm:2739
+#: ../urpm.pm:2713 ../urpm.pm:2718 ../urpm.pm:2744
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
 #. - fallback to use other method for retrieving the file later.
-#: ../urpm.pm:2735
+#: ../urpm.pm:2740
 #, 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:2743
+#: ../urpm.pm:2748
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2755
+#: ../urpm.pm:2760
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2810
+#: ../urpm.pm:2815
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "URL 格式错误: [%s]"
 
-#: ../urpm.pm:2817
+#: ../urpm.pm:2822
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2945
+#: ../urpm.pm:2921
+msgid "[repackaging]"
+msgstr "[重新打包]"
+
+#: ../urpm.pm:2954
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2977
+#: ../urpm.pm:2987
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2980
+#: ../urpm.pm:2990
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2998
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2990
+#: ../urpm.pm:3000
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3002
+#: ../urpm.pm:3012
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm.pm:3008
+#: ../urpm.pm:3018
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:3011
+#: ../urpm.pm:3021
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:3061
+#: ../urpm.pm:3071
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
-#: ../urpm.pm:3233 ../urpm.pm:3271
+#: ../urpm.pm:3252 ../urpm.pm:3290
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3234 ../urpm.pm:3269
+#: ../urpm.pm:3253 ../urpm.pm:3288
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3240
+#: ../urpm.pm:3259
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3241
+#: ../urpm.pm:3260
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3264
+#: ../urpm.pm:3283
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3275
+#: ../urpm.pm:3294
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3276
+#: ../urpm.pm:3295
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3295
+#: ../urpm.pm:3314
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3328
+#: ../urpm.pm:3347
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3330
+#: ../urpm.pm:3349
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm.pm:3389
+#: ../urpm.pm:3408
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:3399
+#: ../urpm.pm:3418
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm.pm:3410
+#: ../urpm.pm:3429
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:3440
+#: ../urpm.pm:3459
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
@@ -986,11 +1004,11 @@ msgstr "运行于限制模式运行时，禁止执行此操作"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:229
+#: ../urpm/args.pm:230
 msgid "You need to be root to use --use-distrib"
 msgstr "你必须是 root 才能使用 --use-distrib 命令"
 
-#: ../urpm/args.pm:261
+#: ../urpm/args.pm:262
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
@@ -1181,47 +1199,47 @@ msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:96
+#: ../urpme:95
 msgid "unknown package"
 msgstr "未知的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:96
+#: ../urpme:95
 msgid "unknown packages"
 msgstr "未知的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:108 ../urpmi:488
+#: ../urpme:107 ../urpmi:488
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:111
+#: ../urpme:110
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:116
+#: ../urpme:115
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:123
+#: ../urpme:122
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
 
-#: ../urpme:125 ../urpmi:510 ../urpmi:643
+#: ../urpme:124 ../urpmi:510 ../urpmi:643
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:125
+#: ../urpme:124
 #, c-format
 msgid "Remove %d packages?"
 msgstr "删除 %d 个软件包吗?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:149
+#: ../urpme:148
 msgid "Removal failed"
 msgstr "删除失败"
 
@@ -1468,7 +1486,7 @@ msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包�
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
-msgstr ""
+msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
 #: ../urpmi:88 ../urpmq:51
 msgid ""
@@ -1708,7 +1726,7 @@ msgstr "复制失败"
 #: ../urpmi:230
 #, c-format
 msgid "Environment directory %s does not exist"
-msgstr ""
+msgstr "环境目录 %s 不存在"
 
 #: ../urpmi:248
 #, c-format
@@ -1781,7 +1799,7 @@ msgstr ""
 
 #: ../urpmi:503
 msgid "(test only, removal will not be actually done)"
-msgstr ""
+msgstr "(只是测试，删除将不会实际发生)"
 
 #: ../urpmi:539 ../urpmi:551
 msgid ""
@@ -1808,7 +1826,7 @@ msgstr ""
 
 #: ../urpmi:554
 msgid "(test only, installation will not be actually done)"
-msgstr ""
+msgstr "(只是测试，安装将不会实际发生)"
 
 #: ../urpmi:556
 #, c-format
@@ -1980,15 +1998,15 @@ msgstr "无法创建配置文件[%s]"
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist 的相对路径>"
 
-#: ../urpmi.addmedia:134
+#: ../urpmi.addmedia:145
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 相对路径>找不到\n"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:147
 msgid "`with' missing for network media\n"
 msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:153
+#: ../urpmi.addmedia:169
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -2027,89 +2045,92 @@ msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - 列出 rpmdb 中的全部交易(较长)\n"
 
 #: ../urpmi.recover:38
+msgid "  --list-safe    - list transactions since checkpoint\n"
+msgstr "  --list-safe    - 列出自检查点之后的交易\n"
+
+#: ../urpmi.recover:39
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
-msgstr ""
-"  --rollback     - 回滚到指定的日期或回滚指定数量的交易\n"
+msgstr "  --rollback     - 回滚到指定的日期或回滚指定数量的交易\n"
 
-#: ../urpmi.recover:40
+#: ../urpmi.recover:41
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - 关闭软件包重新打包\n"
 
-#: ../urpmi.recover:55
+#: ../urpmi.recover:56
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "无效的日期或时长 [%s]\n"
 
-#: ../urpmi.recover:63
+#: ../urpmi.recover:64
 msgid "Repackage directory not defined\n"
 msgstr "重新打包目录未定义\n"
 
-#: ../urpmi.recover:66
+#: ../urpmi.recover:67
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "无法写入重新打包目录 [%s]\n"
 
-#: ../urpmi.recover:68
+#: ../urpmi.recover:69
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "正在清理重新打包目录 [%s]...\n"
 
-#: ../urpmi.recover:70
+#: ../urpmi.recover:71
 #, c-format
 msgid "%d files removed\n"
 msgstr "删除了 %d 个文件\n"
 
-#: ../urpmi.recover:80
+#: ../urpmi.recover:81
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr ""
 
-#: ../urpmi.recover:82
+#: ../urpmi.recover:83
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr ""
+msgstr "您不能同时指定 --checkpoint 和 --rollback\n"
 
-#: ../urpmi.recover:84
+#: ../urpmi.recover:85
 msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr ""
+msgstr "您不能同时指定 --checkpoint 和 --list\n"
 
-#: ../urpmi.recover:86
+#: ../urpmi.recover:87
 msgid "You can't specify --rollback and --list at the same time\n"
-msgstr ""
+msgstr "您不能同时指定 --rollback 和 --list\n"
 
-#: ../urpmi.recover:88
+#: ../urpmi.recover:89
 msgid "You can't specify --disable along with another option"
-msgstr ""
+msgstr "您不能将 --disable 与其它选项一起使用"
 
-#: ../urpmi.recover:110
+#: ../urpmi.recover:114
 #, c-format
 msgid "No transaction found since %s\n"
-msgstr ""
+msgstr "自 %s 后无交易\n"
 
 #. - check we're running as root
-#: ../urpmi.recover:125
+#: ../urpmi.recover:129
 msgid "You must be superuser to do this"
-msgstr ""
+msgstr "您必须是超级用户才能执行此操作"
 
 #. - write rpm config file
-#: ../urpmi.recover:138 ../urpmi.recover:204
+#: ../urpmi.recover:142 ../urpmi.recover:208
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "正在写入 rpm 宏文件[%s]...\n"
 
-#: ../urpmi.recover:180
+#: ../urpmi.recover:184
 msgid "No rollback date found\n"
 msgstr "未找到回滚日期\n"
 
-#: ../urpmi.recover:183
+#: ../urpmi.recover:187
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "回滚至 %s...\n"
 
-#: ../urpmi.recover:190
+#: ../urpmi.recover:194
 msgid "Disabling repackaging\n"
-msgstr ""
+msgstr "禁止重新打包\n"
 
 #: ../urpmi.removemedia:52
 msgid ""
@@ -2274,9 +2295,8 @@ msgid ""
 msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
 #: ../urpmq:64
-#, fuzzy
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --arch         - 体系\n"
+msgstr "  --ignorearch   - 允许查询架构不匹配的 RPM。\n"
 
 #: ../urpmq:66
 msgid ""
@@ -2372,4 +2392,3 @@ msgstr "没有找到文件列表\n"
 #: ../urpmq:413
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
-