summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/zh_CN.po341
1 files changed, 169 insertions, 172 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7ab3da50..09cea6fe 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: 2007-02-23 19:44+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2007-02-25 18:03+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -109,12 +109,12 @@ msgstr "取消(_C)"
msgid "Choose location to save file"
msgstr "选择保存文件的位置"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "未知的选项 %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "未指定软件包"
@@ -145,7 +145,7 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "确定"
@@ -238,7 +238,7 @@ msgstr ""
"\n"
"您想要继续安装吗?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,7 +249,7 @@ msgstr ""
"%s\n"
"您可能需要更新您的 urpmi 数据库"
-#: ../gurpmi2:292 ../urpme:141 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "正在删除 %s"
@@ -269,10 +269,10 @@ msgstr "正在安装软件包“%s”(%s/%s)..."
msgid "_Done"
msgstr "完成(_D)"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "安装失败"
+msgid "Installation failed:"
+msgstr "安装失败: "
#: ../gurpmi2:344
#, c-format
@@ -328,63 +328,63 @@ msgstr "只允许超级用户安装软件包"
msgid "Running urpmi in restricted mode..."
msgstr "正在以限制模式运行 urpmi..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "无法打开 rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "在缓存中找到了 %d 个 rpm 头,删除了 %d 个过期头"
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "无效的 rpm 文件名[%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "正在获取 rpm 文件[%s]..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...获取完成"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...获取失败: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "无法访问 rpm 文件[%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "无法处理 spec 文件 %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "无法访问注册 rpm 文件"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "RPM 的架构不兼容[%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "注册本地软件包出错"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "运行于限制模式运行时,禁止执行此操作"
@@ -424,7 +424,7 @@ msgstr "无法和 %2$s 一起使用 %1$s"
msgid "Too many arguments\n"
msgstr "参数太多\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "创建介质“%s”的 hdlist 综合文件"
@@ -449,7 +449,7 @@ msgstr "无法读取配置文件[%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "介质“%s”定义了两次,正在退出"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "无法写入配置文件[%s]"
@@ -579,7 +579,7 @@ msgstr "有多个文件名都为“%s”的 rpm 软件包"
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "无法正确处理[%s]为值“%s”"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "无法访问“%s”的列表文件,介质被忽略"
@@ -714,109 +714,109 @@ msgstr "警告: %s 的 md5 校验和未在 MD5SUM 文件中找到"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "正在计算已有源 hdlist(或综合文件)[%s]的 md5sum"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义,介质被忽略"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "虚拟介质“%s”应该有清楚的 URL,介质被忽略"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "无效的 hdlist 名称"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "找不到“%s”的列表文件,介质被忽略"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "不应设置“synthesis”(介质“%s”)"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "应该设置“synthesis”(介质“%s”)"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "无法访问“%s”的 hdlist 文件,介质被忽略"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "无法访问“%s”的列表文件"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "介质“%s”试图使用已经用过的 hdlist,介质被忽略"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "介质“%s”试图打开已经用过的列表,介质被忽略"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "试图覆盖已有介质“%s”,正跳过"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "可移动介质“%s”的挂载点太多"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "将可移动设备认作“%s”"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "介质“%s”是一个 ISO 映像,将会被实时挂载"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "无法获取可移动介质“%s”的路径名称"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "写入 %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "写入配置文件[%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "无法与发行模式一起使用并行模式"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "并行模式时使用关联介质: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -825,219 +825,219 @@ msgstr ""
"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
"distrib 或 --parallel 一起使用"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr "注意: 介质“%s”没有 hdlist,无法返回任何结果"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "搜索开始: %s 结束: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "正在执行第二遍依赖关系的计算\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "跳过软件包 %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "将安装而非升级软件包 %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "介质“%s”已存在"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "虚拟介质必须是本地的"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(默认忽略)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "添加介质“%s”"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "无法挂载发行版介质"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "此位置似乎不包含任何发行版"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "正在获取 media.cfg 文件..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "无法分析 media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "试图选择不存在的介质“%s”"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "选择多个介质: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "删除介质“%s”"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "正在从介质“%s”重新配置 urpmi"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...重新配置失败"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "重新配置完成"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "声称名称文件出错: 依赖关系 %d 未找到"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "声称名称文件失败: 无法写入文件(%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "介质“%s”已为最新"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "正在检查 hdlist 文件 [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "正在检查综合文件 [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "正在创建 hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...复制失败"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "正在复制“%s”的描述文件..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...复制完成"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "正在复制介质“%2$s”的 [%1$s]..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "复制 [%s] 失败(文件太小了)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "复制[%s]失败(md5sum 不匹配)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...获取失败: md5sum 不匹配"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] 中未发现 rpm 文件"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "正在从[%s]读取 rpm 文件"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "无法从[%s]读取 rpm 文件: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "没有读到 rpm"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1047,78 +1047,78 @@ msgstr ""
"无法访问介质“%s”,\n"
"这可能是因为您在创建介质时是手动装载的目录。"
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "发现探测的 hdlist(或综合文件) 为 %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "介质“%s”未发现 hdlist 文件"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "正在检查“%s”的公共密钥文件..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "无法导入“%s”的公共密钥文件"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "正在写入介质“%s”的列表文件"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "已更新介质“%s”"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "无法处理“%s”的 hdlist 文件"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "读取介质“%s”的综合文件出现问题"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "正在从介质“%s”读取头"
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "nN否"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "yY是"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "对不起,选择无效,请再试一次\n"
@@ -1173,47 +1173,47 @@ msgstr "非连贯介质“%s”标为可移动但实际不是"
msgid "unable to access medium \"%s\""
msgstr "无法访问介质“%s”"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "没有叫做 %s 的软件包"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "下列软件包里有 %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "原因是丢失 %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "原因是不满足 %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "正在试图推广 %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "为了保留 %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "为了安装 %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "原因是与 %s 冲突"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "未请求"
@@ -1374,7 +1374,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "删除 %d 个软件包吗?"
-#: ../urpme:137 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr "(是(y)/否(N))[否]"
@@ -1627,7 +1627,7 @@ msgstr " --vendor - 提供者\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - 软件包所在介质\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - 和名称一起打印版本、发行号和平台。\n"
@@ -1637,19 +1637,19 @@ msgstr " -f - 和名称一起打印版本、发行号和平台。\n
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "格式不对: 您只能使用一个多值标签"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "在 %s 使用指定环境\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr "注意: 由于没有介质使用 hdlists 搜索,urpmf 无法返回任何结果\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
@@ -1932,7 +1932,7 @@ msgstr " --nolock - 不锁定 rpm 数据库。\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 更新只限于相同体系的软件包。\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - 在命令行选择所有匹配。\n"
@@ -2152,93 +2152,93 @@ msgstr[0] "继续安装 %d 个软件包吗?"
msgid "Press Enter when ready..."
msgstr "准备好后按 Enter 键..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr "下列软件包的签名有错误"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "下列软件包的签名有错误"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "您想继续安装吗?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "正在分发 %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "正在从 %2$s 安装 %1$s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "正在安装 %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "安装失败: "
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
-#: ../urpmi:825
+#: ../urpmi:815
#, c-format
msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "%d 安装交易失败"
-#: ../urpmi:835
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "可以安装"
-#: ../urpmi:840
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "软件包已为最新"
-#: ../urpmi:848
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr "软件包 %s 已经安装"
-#: ../urpmi:849
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr "软件包 %s 已经安装"
-#: ../urpmi:852
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "软件包 %s 无法安装"
-#: ../urpmi:853
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr "软件包 %s 无法安装"
-#: ../urpmi:872
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "重新启动 urpmi"
@@ -2612,8 +2612,7 @@ msgstr " --no-ignore - 不更新,将介质标为启用。\n"
#, c-format
msgid ""
" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
-msgstr ""
-" --probe-rpms - 不使用综合文件或 hdlist 文件,直接使用 rpm 文件\n"
+msgstr " --probe-rpms - 不使用综合文件或 hdlist 文件,直接使用 rpm 文件\n"
#: ../urpmi.update:48
#, c-format
@@ -2765,105 +2764,103 @@ msgstr ""
" --whatrequires-recursive\n"
" - 扩展逆序搜索(包括虚拟软件包)。\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" --whatprovides, -p\n"
+" - 允许在 provides 中寻找软件包。\n"
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - 要删除的软件包的完整输出。\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - 扩展软件包依赖性查询。\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - 打印组名。\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - 以人类可读的格式打印有用信息。\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - 列出软件包中的文件。\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - 与 -du 等价。\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - 允许在提供的项目中寻找软件包。\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - 和名称一起打印版本和发行号。\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - 下一个软件包是源程序包(和 --src 一样)。\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - 如果更新的版本已经安装,就删除软件包。\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - 利用模糊查询(和 --fuzzy 一样)。\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - 类似于 -y,但强制不区分大小写匹配。\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " 需要在命令行给出名称或 rpm 文件。\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes 仅能和 --parallel 一起使用"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr "由于介质“%s”没有 hdlist,软件包 %s 只返回部分结果"
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr "由于介质“%s”没有 hdlists,软件包 %s 只返回部分结果"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr "由于介质“%s”没有 hdlists,软件包 %s 无法返回任何结果"
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr "由于介质“%s”没有 hdlists,软件包 %s 无法返回任何结果"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "没有找到文件列表\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "没有找到更新日志\n"