summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1052
1 files changed, 473 insertions, 579 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e18be9c5..83ccd673 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: 2005-11-16 22:47+0800\n"
-"PO-Revision-Date: 2005-06-19 09:44+0800\n"
+"POT-Creation-Date: 2005-12-04 13:39+0800\n"
+"PO-Revision-Date: 2005-12-04 13:43+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@linux-mandrake."
"com>\n"
@@ -22,38 +22,20 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
-#. you can put here the letters for 'yes' for your language, so people
-#. can hit those keys in their keyboard to reply.
-#. please keep the 'Yy' for compatibility reasons
-#.
-#: placeholder.h:11
-msgid "Yy"
-msgstr "yY是"
-
-#. This is a list of chars acceptable as a 'no' answer to a Yes/No question;
-#. you can put here the letters for 'no' for your language, so people
-#. can hit those keys in their keyboard to reply.
-#. please keep the 'Nn' for compatibility reasons
-#.
-#: placeholder.h:17
-msgid "Nn"
-msgstr "nN否"
-
-#: ../gurpmi:29 ../gurpmi2:55
+#: ../gurpmi:30 ../gurpmi2:56
msgid "RPM installation"
msgstr "RPM 安装"
-#: ../gurpmi:42
+#: ../gurpmi:43
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
msgstr "错误:找不到文件 %s,将取消操作"
-#: ../gurpmi:43 ../gurpmi2:122 ../gurpmi2:145
+#: ../gurpmi:44 ../gurpmi2:123 ../gurpmi2:146
msgid "_Ok"
msgstr "确定(_O)"
-#: ../gurpmi:57
+#: ../gurpmi:58
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -74,7 +56,7 @@ msgstr ""
"\n"
"您想要执行什么操作?"
-#: ../gurpmi:65 ../gurpmi:76
+#: ../gurpmi:66 ../gurpmi:77
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -89,7 +71,7 @@ msgstr ""
"\n"
"继续吗?"
-#: ../gurpmi:71
+#: ../gurpmi:72
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -105,40 +87,40 @@ msgstr ""
"您也可以选择只是保存相应的软件包。您要进行什么操作?"
#. - buttons
-#: ../gurpmi:86
+#: ../gurpmi:87
msgid "_Install"
msgstr "安装(_I)"
-#: ../gurpmi:87
+#: ../gurpmi:88
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:88 ../gurpmi2:122
+#: ../gurpmi:89 ../gurpmi2:123
msgid "_Cancel"
msgstr "取消(_C)"
-#: ../gurpmi:98
+#: ../gurpmi:99
msgid "Choose location to save file"
msgstr "选择保存文件的位置"
-#: ../gurpmi.pm:62
+#: ../gurpmi.pm:65
#, c-format
msgid "Unknown option %s"
msgstr "未知的选项 %s"
-#: ../gurpmi.pm:70
+#: ../gurpmi.pm:73
msgid "No packages specified"
msgstr "未指定软件包"
-#: ../gurpmi2:36
+#: ../gurpmi2:37
msgid "Please wait..."
msgstr "请稍候..."
-#: ../gurpmi2:45
+#: ../gurpmi2:46
msgid "Must be root"
msgstr "必须是 root"
-#: ../gurpmi2:78
+#: ../gurpmi2:79
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -149,27 +131,27 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:118
+#: ../gurpmi2:119
msgid " (to upgrade)"
msgstr "(升级)"
-#: ../gurpmi2:119
+#: ../gurpmi2:120
msgid " (to install)"
msgstr "(安装)"
-#: ../gurpmi2:122
+#: ../gurpmi2:123
msgid "Package choice"
msgstr "软件包选择"
-#: ../gurpmi2:123 ../urpmi:366
+#: ../gurpmi2:124 ../urpmi:372
msgid "One of the following packages is needed:"
msgstr "需要下列软件包之一:"
-#: ../gurpmi2:146
+#: ../gurpmi2:147
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:166
+#: ../gurpmi2:167
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -180,7 +162,7 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:180
+#: ../gurpmi2:181
#, c-format
msgid ""
"To satisfy dependencies, the following %d packages are going to be "
@@ -190,25 +172,25 @@ msgstr ""
"为了满足依赖性要求,将另外安装以下%d个软件包:\n"
"%s\n"
-#: ../gurpmi2:187
+#: ../gurpmi2:188
msgid "Package installation..."
msgstr "软件包安装..."
-#: ../gurpmi2:189 ../urpmi:513 ../urpmq:308
+#: ../gurpmi2:190 ../urpmi:520 ../urpmq:309
msgid "unable to get source packages, aborting"
msgstr "无法读取源软件包,中止"
-#: ../gurpmi2:203 ../urpmi:524
+#: ../gurpmi2:204 ../urpmi:531
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "请将标签为“%s”的介质插入到设备 [%s]"
-#: ../gurpmi2:232
+#: ../gurpmi2:233
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
-#: ../gurpmi2:247
+#: ../gurpmi2:248
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -222,7 +204,8 @@ msgstr ""
"\n"
"您想要继续安装吗?"
-#: ../gurpmi2:254 ../gurpmi2:303 ../urpmi:595 ../urpmi:713
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../gurpmi2:255 ../gurpmi2:304 ../urpmi:603 ../urpmi:726
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -233,33 +216,35 @@ msgstr ""
"%s\n"
"您可能需要更新您的 urpmi 数据库"
-#: ../gurpmi2:261 ../urpme:118 ../urpmi:638
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../gurpmi2:262 ../urpme:123 ../urpmi:647
#, c-format
msgid "removing %s"
msgstr "正在删除 %s"
-#: ../gurpmi2:269 ../urpm.pm:2903
+#: ../gurpmi2:270 ../urpm.pm:2913
msgid "Preparing..."
msgstr "正在准备..."
-#: ../gurpmi2:271
+#: ../gurpmi2:272
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安装软件包“%s”(%s/%s)..."
-#: ../gurpmi2:289 ../urpmi:605 ../urpmi:658 ../urpmi:676 ../urpmi:692
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../gurpmi2:290 ../urpmi:614 ../urpmi:668 ../urpmi:687 ../urpmi:704
msgid "Installation failed"
msgstr "安装失败"
-#: ../gurpmi2:298
+#: ../gurpmi2:299
msgid "_Done"
msgstr "完成(_D)"
-#: ../gurpmi2:306 ../urpmi:729
+#: ../gurpmi2:307 ../urpmi:743
msgid "The package(s) are already installed"
msgstr "软件包已经安装"
-#: ../gurpmi2:308
+#: ../gurpmi2:309
msgid "Installation finished"
msgstr "安装完成"
@@ -290,159 +275,159 @@ msgid " defaults is %s.\n"
msgstr " 默认为 %s。\n"
#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:8 ../urpmi:229
+#: ../rurpmi:11 ../urpmi:235
msgid "Only superuser is allowed to install packages"
msgstr "只允许超级用户安装软件包"
-#: ../rurpmi:15
+#: ../rurpmi:18
msgid "Running urpmi in restricted mode..."
msgstr "正在以限制模式运行 urpmi..."
-#: ../urpm.pm:70
+#: ../urpm.pm:68
#, c-format
msgid "unknown protocol defined for %s"
msgstr "%s 中定义了未知的协议"
-#: ../urpm.pm:103
+#: ../urpm.pm:104
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "未找到 webfetch,支持的 webfetch 是: %s\n"
-#: ../urpm.pm:119
+#: ../urpm.pm:120
#, c-format
msgid "unable to handle protocol: %s"
msgstr "无法处理协议: %s"
-#: ../urpm.pm:210
+#: ../urpm.pm:215
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "介质“%s”试图使用已经用过的 hdlist,介质被忽略"
-#: ../urpm.pm:211
+#: ../urpm.pm:216
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "介质“%s”试图打开已经用过的列表,介质被忽略"
-#: ../urpm.pm:224 ../urpm.pm:1314 ../urpm.pm:1324
+#: ../urpm.pm:229 ../urpm.pm:1322 ../urpm.pm:1332
#, 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:227 ../urpm.pm:2509
+#: ../urpm.pm:232 ../urpm.pm:2519
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "无法访问“%s”的列表文件,介质被忽略"
-#: ../urpm.pm:255
+#: ../urpm.pm:260
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "试图覆盖已有介质“%s”,正跳过"
-#: ../urpm.pm:266
+#: ../urpm.pm:271
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义,介质被忽略"
-#: ../urpm.pm:271
+#: ../urpm.pm:276
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "虚拟介质“%s”应该有清楚的 URL,介质被忽略"
-#: ../urpm.pm:280
+#: ../urpm.pm:285
#, c-format
msgid "unable to find hdlist file for \"%s\", medium ignored"
msgstr "找不到“%s”的 hdlist 文件,介质被忽略"
-#: ../urpm.pm:287
+#: ../urpm.pm:292
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "找不到“%s”的列表文件,介质被忽略"
-#: ../urpm.pm:311
+#: ../urpm.pm:316
#, c-format
msgid "inconsistent list file for \"%s\", medium ignored"
msgstr "“%s”的列表文件不连贯,介质被忽略"
-#: ../urpm.pm:321
+#: ../urpm.pm:326
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "无法检查“%s”的列表文件,介质被忽略"
#. - return value is suitable for an hash.
-#: ../urpm.pm:361
+#: ../urpm.pm:366
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "可移动介质“%s”的挂载点太多"
-#: ../urpm.pm:362
+#: ../urpm.pm:367
#, c-format
msgid "taking removable device as \"%s\""
msgstr "将可移动设备认作“%s”"
-#: ../urpm.pm:365
+#: ../urpm.pm:370
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "介质“%s”是一个 ISO 映像,将会被实时挂载"
-#: ../urpm.pm:368
+#: ../urpm.pm:373
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
-#: ../urpm.pm:373 ../urpm.pm:376
+#: ../urpm.pm:378 ../urpm.pm:381
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "无法获取可移动介质“%s”的路径名称"
-#: ../urpm.pm:402
+#: ../urpm.pm:407
#, c-format
msgid "unable to write config file [%s]"
msgstr "无法写入配置文件[%s]"
-#: ../urpm.pm:412
+#: ../urpm.pm:417
#, c-format
msgid "wrote config file [%s]"
msgstr "写入配置文件[%s]"
-#: ../urpm.pm:440
+#: ../urpm.pm:445
msgid "Can't use parallel mode with use-distrib mode"
msgstr "无法与发行模式一起使用并行模式"
-#: ../urpm.pm:450
+#: ../urpm.pm:455
#, c-format
msgid "unable to parse \"%s\" in file [%s]"
msgstr "无法处理文件[%2$s]中的“%1$s”"
-#: ../urpm.pm:462
+#: ../urpm.pm:467
#, c-format
msgid "examining parallel handler in file [%s]"
msgstr "正在检查文件[%s]中的并行处理"
-#: ../urpm.pm:473
+#: ../urpm.pm:478
#, c-format
msgid "found parallel handler for nodes: %s"
msgstr "找到结点的并行处理: %s"
-#: ../urpm.pm:477
+#: ../urpm.pm:482
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "并行模式时使用关联介质: %s"
-#: ../urpm.pm:481
+#: ../urpm.pm:486
#, c-format
msgid "unable to use parallel option \"%s\""
msgstr "无法使用并行选项“%s”"
-#: ../urpm.pm:489
+#: ../urpm.pm:494
#, c-format
msgid "there doesn't seem to be devices in the chroot in \"%s\""
msgstr "“%s”的 chroot 中似乎没有设备"
-#: ../urpm.pm:495
+#: ../urpm.pm:500
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update or --parallel"
@@ -459,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:556 ../urpm.pm:582 ../urpm.pm:1068 ../urpm.pm:1079
-#: ../urpm.pm:1151 ../urpm.pm:1168 ../urpm.pm:1238 ../urpm.pm:1297
-#: ../urpm.pm:1512 ../urpm.pm:1635 ../urpm.pm:1752 ../urpm.pm:1758
-#: ../urpm.pm:1861 ../urpm.pm:1946 ../urpm.pm:1950
+#: ../urpm.pm:564 ../urpm.pm:590 ../urpm.pm:1076 ../urpm.pm:1087
+#: ../urpm.pm:1159 ../urpm.pm:1176 ../urpm.pm:1246 ../urpm.pm:1305
+#: ../urpm.pm:1520 ../urpm.pm:1643 ../urpm.pm:1760 ../urpm.pm:1766
+#: ../urpm.pm:1869 ../urpm.pm:1955 ../urpm.pm:1959
#, c-format
msgid "examining synthesis file [%s]"
msgstr "正在检查综合文件 [%s]"
-#: ../urpm.pm:560 ../urpm.pm:575 ../urpm.pm:588 ../urpm.pm:1071
-#: ../urpm.pm:1082 ../urpm.pm:1157 ../urpm.pm:1163 ../urpm.pm:1243
-#: ../urpm.pm:1301 ../urpm.pm:1516 ../urpm.pm:1639 ../urpm.pm:1746
-#: ../urpm.pm:1764 ../urpm.pm:1956
+#: ../urpm.pm:568 ../urpm.pm:583 ../urpm.pm:596 ../urpm.pm:1079
+#: ../urpm.pm:1090 ../urpm.pm:1165 ../urpm.pm:1171 ../urpm.pm:1251
+#: ../urpm.pm:1309 ../urpm.pm:1524 ../urpm.pm:1647 ../urpm.pm:1754
+#: ../urpm.pm:1772 ../urpm.pm:1965
#, c-format
msgid "examining hdlist file [%s]"
msgstr "正在检查 hdlist 文件 [%s]"
-#: ../urpm.pm:570 ../urpm.pm:1075
+#: ../urpm.pm:578 ../urpm.pm:1083
#, c-format
msgid "virtual medium \"%s\" is not local, medium ignored"
msgstr "虚拟介质“%s”不是本地的,介质被忽略"
-#: ../urpm.pm:600
+#: ../urpm.pm:608
#, c-format
msgid "Search start: %s end: %s"
msgstr "搜索开始:%s 结束:%s"
#. - this is almost a fatal error, ignore it by default?
-#: ../urpm.pm:605 ../urpm.pm:1089 ../urpm.pm:1176 ../urpm.pm:1247
-#: ../urpm.pm:1643
+#: ../urpm.pm:613 ../urpm.pm:1097 ../urpm.pm:1184 ../urpm.pm:1255
+#: ../urpm.pm:1651
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
-#: ../urpm.pm:612 ../urpm.pm:1899
+#: ../urpm.pm:620 ../urpm.pm:1907
msgid "performing second pass to compute dependencies\n"
msgstr "正在执行第二遍依赖关系的计算\n"
-#: ../urpm.pm:628
+#: ../urpm.pm:636
#, c-format
msgid "skipping package %s"
msgstr "跳过软件包 %s"
-#: ../urpm.pm:641
+#: ../urpm.pm:649
#, 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:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2566
-#: ../urpm.pm:2968 ../urpm.pm:3092
+#: ../urpm.pm:660 ../urpm.pm:2325 ../urpm.pm:2386 ../urpm.pm:2576
+#: ../urpm.pm:2978 ../urpm.pm:3102
msgid "unable to open rpmdb"
msgstr "无法打开 rpmdb"
-#: ../urpm.pm:692
+#: ../urpm.pm:700
#, c-format
msgid "medium \"%s\" already exists"
msgstr "介质“%s”已存在"
-#: ../urpm.pm:699
+#: ../urpm.pm:707
msgid "virtual medium needs to be local"
msgstr "虚拟介质必须是本地的"
-#: ../urpm.pm:724
+#: ../urpm.pm:732
#, c-format
msgid "added medium %s"
msgstr "已添加介质 %s"
-#: ../urpm.pm:769
+#: ../urpm.pm:777
msgid "unable to access first installation medium"
msgstr "无法访问介质的首次安装"
-#: ../urpm.pm:773
+#: ../urpm.pm:781
msgid "copying hdlists file..."
msgstr "正在复制 hdlists 文件..."
-#: ../urpm.pm:775 ../urpm.pm:1192 ../urpm.pm:1267
+#: ../urpm.pm:783 ../urpm.pm:1200 ../urpm.pm:1275
msgid "...copying done"
msgstr "...复制完成"
-#: ../urpm.pm:776 ../urpm.pm:1193 ../urpm.pm:1342 ../urpm.pm:1401
-#: ../urpm.pm:1581 ../urpm.pm:1588
+#: ../urpm.pm:784 ../urpm.pm:1201 ../urpm.pm:1350 ../urpm.pm:1409
+#: ../urpm.pm:1589 ../urpm.pm:1596
msgid "...copying failed"
msgstr "...复制失败"
-#: ../urpm.pm:779 ../urpm.pm:804 ../urpm.pm:843
+#: ../urpm.pm:787 ../urpm.pm:812 ../urpm.pm:851
msgid "unable to access first installation medium (no hdlists file found)"
msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
-#: ../urpm.pm:786
+#: ../urpm.pm:794
msgid "retrieving hdlists file..."
msgstr "正在获取 hdlists 文件..."
-#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2835
+#: ../urpm.pm:806 ../urpm.pm:1633 ../urpm.pm:2125 ../urpm.pm:2845
msgid "...retrieving done"
msgstr "...获取完成"
-#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2837
+#: ../urpm.pm:808 ../urpm.pm:1617 ../urpm.pm:2129 ../urpm.pm:2847
#, c-format
msgid "...retrieving failed: %s"
msgstr "...获取失败: %s"
-#: ../urpm.pm:824
+#: ../urpm.pm:832
#, c-format
msgid "invalid hdlist description \"%s\" in hdlists file"
msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
-#: ../urpm.pm:880
+#: ../urpm.pm:888
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "试图选择不存在的介质“%s”"
#. - several elements in found and/or foundi lists.
-#: ../urpm.pm:882
+#: ../urpm.pm:890
#, c-format
msgid "selecting multiple media: %s"
msgstr "选择多个介质: %s"
-#: ../urpm.pm:898
+#: ../urpm.pm:906
#, c-format
msgid "removing medium \"%s\""
msgstr "删除介质“%s”"
-#: ../urpm.pm:949
+#: ../urpm.pm:957
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "正在从介质“%s”重新配置 urpmi"
-#: ../urpm.pm:978
+#: ../urpm.pm:986
msgid "...reconfiguration failed"
msgstr "...重新配置失败"
-#: ../urpm.pm:985
+#: ../urpm.pm:993
msgid "reconfiguration done"
msgstr "重新配置完成"
-#: ../urpm.pm:1129
+#: ../urpm.pm:1137
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -605,225 +590,226 @@ msgstr ""
"无法访问介质“%s”,\n"
"这可能是因为您在创建介质时是手动装载的目录。"
-#: ../urpm.pm:1180
+#: ../urpm.pm:1188
#, c-format
msgid ""
"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
"ignored"
msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件,介质被忽略"
-#: ../urpm.pm:1190
+#: ../urpm.pm:1198
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "正在复制“%s”的描述文件..."
-#: ../urpm.pm:1214 ../urpm.pm:1488
+#: ../urpm.pm:1222 ../urpm.pm:1496
msgid "computing md5sum of existing source hdlist (or synthesis)"
msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
-#: ../urpm.pm:1263
+#: ../urpm.pm:1271
#, c-format
msgid "copying source hdlist (or synthesis) of \"%s\"..."
msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
-#: ../urpm.pm:1277
+#: ../urpm.pm:1285
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "复制 [%s] 失败(文件太小了)"
-#: ../urpm.pm:1282
+#: ../urpm.pm:1290
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
-#: ../urpm.pm:1284
+#: ../urpm.pm:1292
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "复制[%s]失败(md5sum 不匹配)"
-#: ../urpm.pm:1305 ../urpm.pm:1520 ../urpm.pm:1864
+#: ../urpm.pm:1313 ../urpm.pm:1528 ../urpm.pm:1872
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "读取介质“%s”的综合文件出现问题"
-#: ../urpm.pm:1359
+#: ../urpm.pm:1367
#, c-format
msgid "reading rpm files from [%s]"
msgstr "正在从[%s]读取 rpm 文件"
-#: ../urpm.pm:1374
+#: ../urpm.pm:1382
msgid "no rpms read"
msgstr "没有读到 rpm"
-#: ../urpm.pm:1384
+#: ../urpm.pm:1392
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "无法从[%s]读取 rpm 文件: %s"
-#: ../urpm.pm:1389
+#: ../urpm.pm:1397
#, 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:1538
+#: ../urpm.pm:1546
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
-#: ../urpm.pm:1566
+#: ../urpm.pm:1574
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "发现探测的 hdlist(或综合文件) 为 %s"
-#: ../urpm.pm:1616
+#: ../urpm.pm:1624
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
-#: ../urpm.pm:1618
+#: ../urpm.pm:1626
msgid "...retrieving failed: md5sum mismatch"
msgstr "...获取失败: md5sum 不匹配"
-#: ../urpm.pm:1716
+#: ../urpm.pm:1724
msgid "retrieval of source hdlist (or synthesis) failed"
msgstr "获取源 hdlist(或综合文件) 失败"
-#: ../urpm.pm:1723
+#: ../urpm.pm:1731
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "介质“%s”未发现 hdlist 文件"
-#: ../urpm.pm:1734 ../urpm.pm:1788
+#: ../urpm.pm:1742 ../urpm.pm:1796
#, c-format
msgid "file [%s] already used in the same medium \"%s\""
msgstr "文件[%s]已经在相同的介质“%s”中使用"
-#: ../urpm.pm:1774
+#: ../urpm.pm:1782
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "无法处理“%s”的 hdlist 文件"
-#: ../urpm.pm:1813
+#: ../urpm.pm:1821
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "无法写入“%s”的列表文件"
-#: ../urpm.pm:1821
+#: ../urpm.pm:1829
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "正在写入介质“%s”的列表文件"
-#: ../urpm.pm:1823
+#: ../urpm.pm:1831
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "“%s”的列表文件中没有写入内容"
-#: ../urpm.pm:1838
+#: ../urpm.pm:1846
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "正在检查“%s”的公共密钥文件..."
-#: ../urpm.pm:1845
+#: ../urpm.pm:1853
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
-#: ../urpm.pm:1848
+#: ../urpm.pm:1856
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "无法导入“%s”的公共密钥文件"
-#: ../urpm.pm:1913
+#: ../urpm.pm:1921
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "正在从介质“%s”读取头"
-#: ../urpm.pm:1918
+#: ../urpm.pm:1926
#, 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:1933 ../urpm.pm:1968
+#: ../urpm.pm:1941 ../urpm.pm:1977
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
-#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:323
+#: ../urpm.pm:1945 ../urpm.pm:1981 ../urpmi:329
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "创建介质“%s”的 hdlist 综合文件"
-#: ../urpm.pm:1994
+#: ../urpm.pm:2004
#, c-format
msgid "found %d headers in cache"
msgstr "缓存中找到了 %d 个头"
-#: ../urpm.pm:1998
+#: ../urpm.pm:2008
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "删除缓存中的 %d 个过时头"
-#: ../urpm.pm:2054
+#: ../urpm.pm:2064
#, c-format
msgid "mounting %s"
msgstr "正在装载 %s"
-#: ../urpm.pm:2076
+#: ../urpm.pm:2086
#, c-format
msgid "unmounting %s"
msgstr "正在拆卸 %s"
-#: ../urpm.pm:2100
+#: ../urpm.pm:2110
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "无效的 rpm 文件名[%s]"
-#: ../urpm.pm:2106
+#: ../urpm.pm:2116
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "正在获取 rpm 文件[%s]..."
-#: ../urpm.pm:2124
+#: ../urpm.pm:2134
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "无法访问 rpm 文件[%s]"
-#: ../urpm.pm:2129
+#: ../urpm.pm:2139
msgid "unable to register rpm file"
msgstr "无法访问注册 rpm 文件"
-#: ../urpm.pm:2132
+#: ../urpm.pm:2142
msgid "error registering local packages"
msgstr "注册本地软件包出错"
-#: ../urpm.pm:2156
+#: ../urpm.pm:2166
msgid "Search"
msgstr "搜索"
-#: ../urpm.pm:2243
+#: ../urpm.pm:2253
#, c-format
msgid "no package named %s"
msgstr "没有叫做 %s 的软件包"
-#: ../urpm.pm:2245 ../urpme:94
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpm.pm:2255 ../urpme:96
#, c-format
msgid "The following packages contain %s: %s"
msgstr "下列软件包里有 %s: %s"
-#: ../urpm.pm:2439 ../urpm.pm:2486 ../urpm.pm:2517
+#: ../urpm.pm:2449 ../urpm.pm:2496 ../urpm.pm:2527
#, c-format
msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr "有多个文件名都为“%s”的 rpm 软件包"
-#: ../urpm.pm:2500
+#: ../urpm.pm:2510
#, c-format
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "无法正确处理[%s]为值“%s”"
-#: ../urpm.pm:2533
+#: ../urpm.pm:2543
#, c-format
msgid ""
"medium \"%s\" uses an invalid list file:\n"
@@ -832,270 +818,288 @@ msgstr ""
"介质“%s”使用了无效的列表文件:\n"
" 介质可能不是最新,正在尝试使用其它方式"
-#: ../urpm.pm:2537
+#: ../urpm.pm:2547
#, c-format
msgid "medium \"%s\" does not define any location for rpm files"
msgstr "介质“%s”没有定义任何 rpm 文件的位置"
-#: ../urpm.pm:2549
+#: ../urpm.pm:2559
#, c-format
msgid "package %s is not found."
msgstr "未找到软件包 %s。"
-#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655
+#: ../urpm.pm:2617 ../urpm.pm:2631 ../urpm.pm:2651 ../urpm.pm:2665
msgid "urpmi database locked"
msgstr "urpmi 数据库已锁定"
-#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738
+#: ../urpm.pm:2717 ../urpm.pm:2722 ../urpm.pm:2748
#, c-format
msgid "medium \"%s\" is not selected"
msgstr "介质“%s”未选中"
#. - fallback to use other method for retrieving the file later.
-#: ../urpm.pm:2734
+#: ../urpm.pm:2744
#, 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:2742
+#: ../urpm.pm:2752
#, c-format
msgid "inconsistent medium \"%s\" marked removable but not really"
msgstr "非连贯介质“%s”标为可移动但实际不是"
-#: ../urpm.pm:2754
+#: ../urpm.pm:2764
#, c-format
msgid "unable to access medium \"%s\""
msgstr "无法访问介质“%s”"
-#: ../urpm.pm:2813
+#: ../urpm.pm:2823
#, c-format
msgid "malformed input: [%s]"
msgstr "输入格式错误: [%s]"
-#: ../urpm.pm:2820
+#: ../urpm.pm:2830
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "正在从介质“%s”上获取 rpm 文件..."
-#: ../urpm.pm:2941
+#: ../urpm.pm:2951
#, c-format
msgid "using process %d for executing transaction"
msgstr "使用进程 %d 执行交易"
-#: ../urpm.pm:2972
+#: ../urpm.pm:2982
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "已创建在 %s 上安装的交易(删除=%d,安装=%d,升级=%d)"
-#: ../urpm.pm:2975
+#: ../urpm.pm:2985
msgid "unable to create transaction"
msgstr "无法创建交易"
-#: ../urpm.pm:2983
+#: ../urpm.pm:2993
#, c-format
msgid "removing package %s"
msgstr "无法删除软件包 %s"
-#: ../urpm.pm:2985
+#: ../urpm.pm:2995
#, c-format
msgid "unable to remove package %s"
msgstr "无法删除软件包 %s"
-#: ../urpm.pm:2997
+#: ../urpm.pm:3007
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
-#: ../urpm.pm:3003
+#: ../urpm.pm:3013
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
-#: ../urpm.pm:3006
+#: ../urpm.pm:3016
#, c-format
msgid "unable to install package %s"
msgstr "无法安装软件包 %s"
-#: ../urpm.pm:3063
+#: ../urpm.pm:3073
#, c-format
msgid "More information on package %s"
msgstr "关于软件包 %s 的更多信息"
-#: ../urpm.pm:3234 ../urpm.pm:3267
+#: ../urpm.pm:3244 ../urpm.pm:3277
#, c-format
msgid "due to missing %s"
msgstr "原因是丢失 %s"
-#: ../urpm.pm:3235 ../urpm.pm:3265
+#: ../urpm.pm:3245 ../urpm.pm:3275
#, c-format
msgid "due to unsatisfied %s"
msgstr "原因是不满足 %s"
-#: ../urpm.pm:3236
+#: ../urpm.pm:3246
#, c-format
msgid "trying to promote %s"
msgstr "正在试图推广 %s"
-#: ../urpm.pm:3237
+#: ../urpm.pm:3247
#, c-format
msgid "in order to keep %s"
msgstr "为了保留 %s"
-#: ../urpm.pm:3260
+#: ../urpm.pm:3270
#, c-format
msgid "in order to install %s"
msgstr "为了安装 %s"
-#: ../urpm.pm:3271
+#: ../urpm.pm:3281
#, c-format
msgid "due to conflicts with %s"
msgstr "原因是与 %s 冲突"
-#: ../urpm.pm:3272
+#: ../urpm.pm:3282
msgid "unrequested"
msgstr "未请求"
-#: ../urpm.pm:3288
+#: ../urpm.pm:3298
#, c-format
msgid "Invalid signature (%s)"
msgstr "无效的签名(%s)"
-#: ../urpm.pm:3320
+#: ../urpm.pm:3330
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "无效的密钥 ID(%s)"
-#: ../urpm.pm:3322
+#: ../urpm.pm:3332
#, c-format
msgid "Missing signature (%s)"
msgstr "缺少签名(%s)"
-#: ../urpm.pm:3382
+#: ../urpm.pm:3392
msgid "examining MD5SUM file"
msgstr "正在检查 MD5SUM 文件"
-#: ../urpm.pm:3393
+#: ../urpm.pm:3403
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "警告:%s 的 md5 校验和未在 MD5SUM 文件中找到"
-#: ../urpm.pm:3415
+#: ../urpm.pm:3425
msgid "This operation is forbidden while running in restricted mode"
msgstr "运行于限制模式运行时,禁止执行此操作"
-#: ../urpm/args.pm:99 ../urpm/args.pm:108
+#: ../urpm/args.pm:104 ../urpm/args.pm:113
msgid "bad proxy declaration on command line\n"
msgstr "命令的代理声明无效\n"
-#: ../urpm/args.pm:218
+#: ../urpm/args.pm:223
msgid "You need to be root to use --use-distrib"
msgstr "你必须是 root 才能使用 --use-distrib 命令"
-#: ../urpm/args.pm:250
+#: ../urpm/args.pm:255
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-#: ../urpm/msg.pm:82
+#. Translator: Add here the keys which might be pressed in the "No"-case.
+#: ../urpm/msg.pm:46 ../urpme:33 ../urpmi:409 ../urpmi:427 ../urpmi:462
+#: ../urpmi:509 ../urpmi:593 ../urpmi:673
+msgid "Nn"
+msgstr "nN否"
+
+#. Translator: Add here the keys which might be pressed in the "Yes"-case.
+#: ../urpm/msg.pm:47 ../urpme:35 ../urpmi:410 ../urpmi:428 ../urpmi:463
+#: ../urpmi:510 ../urpmi:594 ../urpmi:674
+msgid "Yy"
+msgstr "yY是"
+
+#: ../urpm/msg.pm:85
msgid "Sorry, bad choice, try again\n"
msgstr "对不起,选择无效,请再试一次\n"
-#: ../urpm/parallel_ka_run.pm:9 ../urpm/parallel_ka_run.pm:103
-#: ../urpm/parallel_ka_run.pm:197
+#: ../urpm/parallel_ka_run.pm:27 ../urpm/parallel_ka_run.pm:121
+#: ../urpm/parallel_ka_run.pm:215
msgid "mput failed, maybe a node is unreacheable"
msgstr "mput 失败,可能节点无法连接"
-#: ../urpm/parallel_ka_run.pm:70 ../urpm/parallel_ka_run.pm:182
-#: ../urpm/parallel_ka_run.pm:211
+#: ../urpm/parallel_ka_run.pm:64
+#, c-format
+msgid "node %s has an old version of urpme, please upgrade"
+msgstr "节点 %s 的 urpme 版本太旧,请升级"
+
+#: ../urpm/parallel_ka_run.pm:88 ../urpm/parallel_ka_run.pm:200
+#: ../urpm/parallel_ka_run.pm:230
msgid "rshp failed, maybe a node is unreacheable"
msgstr "rshp 失败,可能节点无法连接"
-#: ../urpm/parallel_ka_run.pm:79 ../urpm/parallel_ssh.pm:96
+#: ../urpm/parallel_ka_run.pm:97 ../urpm/parallel_ssh.pm:102
#, c-format
msgid "on node %s"
msgstr "于节点 %s"
#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:101
+#: ../urpm/parallel_ka_run.pm:119
msgid "Propagating synthesis to nodes..."
msgstr "正在将综合文件传播到节点..."
#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:152
+#: ../urpm/parallel_ka_run.pm:170
msgid "Resolving dependencies on nodes..."
msgstr "正在解决节点上的依赖关系..."
-#: ../urpm/parallel_ka_run.pm:195
+#: ../urpm/parallel_ka_run.pm:213
msgid "Distributing files to nodes..."
msgstr "正在将文件分发到节点..."
-#: ../urpm/parallel_ka_run.pm:201
+#: ../urpm/parallel_ka_run.pm:220
msgid "Verifying if install is possible on nodes..."
msgstr "正在验证安装是否可以在节点上进行..."
-#: ../urpm/parallel_ka_run.pm:215 ../urpm/parallel_ssh.pm:243
+#: ../urpm/parallel_ka_run.pm:234 ../urpm/parallel_ssh.pm:249
#, c-format
msgid "Installation failed on node %s"
msgstr "节点 %s 安装失败"
-#: ../urpm/parallel_ka_run.pm:220 ../urpm/parallel_ssh.pm:248 ../urpmi:726
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:740
msgid "Installation is possible"
msgstr "可以安装"
#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:225
+#: ../urpm/parallel_ka_run.pm:244
msgid "Installing packages on nodes..."
msgstr "正在节点上安装软件包..."
-#: ../urpm/parallel_ssh.pm:22 ../urpm/parallel_ssh.pm:120
-#: ../urpm/parallel_ssh.pm:224
+#: ../urpm/parallel_ssh.pm:28 ../urpm/parallel_ssh.pm:126
+#: ../urpm/parallel_ssh.pm:230
#, c-format
msgid "scp failed on host %s (%d)"
msgstr "主机 %s scp 失败(%d)"
-#: ../urpm/parallel_ssh.pm:118
+#: ../urpm/parallel_ssh.pm:124
#, c-format
msgid "Propagating synthesis to %s..."
msgstr "正在将综合文件传播到 %s..."
-#: ../urpm/parallel_ssh.pm:171
+#: ../urpm/parallel_ssh.pm:177
#, c-format
msgid "Resolving dependencies on %s..."
msgstr "正在解决 %s 上的依赖关系..."
-#: ../urpm/parallel_ssh.pm:201
+#: ../urpm/parallel_ssh.pm:207
#, c-format
msgid "host %s does not have a good version of urpmi (%d)"
msgstr "主机 %s 上的 urpmi 版本不对(%d)"
-#: ../urpm/parallel_ssh.pm:217
+#: ../urpm/parallel_ssh.pm:223
#, c-format
msgid "Distributing files to %s..."
msgstr "正在将文件分发给 %s..."
-#: ../urpm/parallel_ssh.pm:231
+#: ../urpm/parallel_ssh.pm:237
#, c-format
msgid "Verifying if install is possible on %s..."
msgstr "正在验证安装是否可以在 %s 上进行..."
-#: ../urpm/parallel_ssh.pm:255
+#: ../urpm/parallel_ssh.pm:261
#, c-format
msgid "Performing install on %s..."
msgstr "正在 %s 上执行安装..."
-#: ../urpm/parallel_ssh.pm:268
+#: ../urpm/parallel_ssh.pm:274
#, c-format
msgid "Installing %s on %s..."
msgstr "正在 %2$s 上安装 %1$s..."
-#: ../urpm/parallel_ssh.pm:269
+#: ../urpm/parallel_ssh.pm:275
#, c-format
msgid "Preparing install on %s..."
msgstr "正在准备在 %s 上安装..."
-#: ../urpme:31 ../urpmi:500
+#: ../urpme:31
msgid "Is this OK?"
msgstr "这样好了吗?"
@@ -1115,12 +1119,12 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpme:43 ../urpmf:33 ../urpmi:78 ../urpmi.addmedia:43
-#: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
+#: ../urpme:43 ../urpmf:34 ../urpmi:79 ../urpmi.addmedia:44
+#: ../urpmi.removemedia:49 ../urpmi.update:31 ../urpmq:44
msgid " --help - print this help message.\n"
msgstr " --help - 打印帮助信息。\n"
-#: ../urpme:44 ../urpmi:85
+#: ../urpme:44 ../urpmi:86
msgid " --auto - automatically select a package in choices.\n"
msgstr " --auto - 自动选中软件包。\n"
@@ -1128,12 +1132,12 @@ msgstr " --auto - 自动选中软件包。\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - 验证删除是否可以正确进行。\n"
-#: ../urpme:46 ../urpmi:100 ../urpmq:64
+#: ../urpme:46 ../urpmi:101 ../urpmq:65
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - 强制执行, 即使某些软件包并不存在。\n"
-#: ../urpme:47 ../urpmi:105 ../urpmq:65
+#: ../urpme:47 ../urpmi:106 ../urpmq:66
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - 在多个机器上分布的运行 urpmi。\n"
@@ -1149,8 +1153,8 @@ msgstr ""
" --use-distrib - 从发行版树中实时配置 urpmi,特别用于在 --root 选项\n"
" 下安装/卸载 chroot。\n"
-#: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
-#: ../urpmi.update:48 ../urpmq:91
+#: ../urpme:51 ../urpmi:143 ../urpmi.addmedia:75 ../urpmi.removemedia:54
+#: ../urpmi.update:49 ../urpmq:92
msgid " -v - verbose mode.\n"
msgstr " -v - 详细的提示。\n"
@@ -1162,42 +1166,46 @@ msgstr " -a - 在命令行选择匹配表达式的所有包。\n"
msgid "Only superuser is allowed to remove packages"
msgstr "只允许超级用户删除软件包"
-#: ../urpme:89
+#: ../urpme:90
msgid "unknown package"
msgstr "未知的软件包"
-#: ../urpme:89
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:90
msgid "unknown packages"
msgstr "未知的软件包"
-#: ../urpme:99 ../urpmi:439
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:102 ../urpmi:445
#, c-format
msgid "removing package %s will break your system"
msgstr "如果删除软件包 %s 会破坏您的系统"
-#: ../urpme:102
+#: ../urpme:105
msgid "Nothing to remove"
msgstr "不需要删除任何东西。"
-#: ../urpme:106
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:110
msgid "Checking to remove the following packages"
msgstr "检查删除下列软件包"
-#: ../urpme:113
+#: ../urpme:117
#, c-format
msgid ""
"To satisfy dependencies, the following %d packages will be removed (%d MB)"
msgstr "为满足相关性要求,需要删除下列%d个软件包(%d MB)"
-#: ../urpme:115 ../urpmi:458 ../urpmi:588
+#: ../urpme:119 ../urpmi:464 ../urpmi:595
msgid " (y/N) "
msgstr "(是(y)/否(N))[否]"
-#: ../urpme:122
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:129
msgid "Removal failed"
msgstr "删除失败"
-#: ../urpmf:27
+#: ../urpmf:28
#, c-format
msgid ""
"urpmf version %s\n"
@@ -1213,210 +1221,209 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpmf:34
+#: ../urpmf:35
msgid " --version - print this tool's version number.\n"
msgstr " --version - 打印此工具的版本号。\n"
-#: ../urpmf:35 ../urpmi:120 ../urpmq:74
+#: ../urpmf:36 ../urpmi:124 ../urpmq:75
msgid " --env - use specific environment (typically a bug report).\n"
msgstr " --env - 使用指定的环境(特别是进行故障报告时)。\n"
-#: ../urpmf:36 ../urpmi:82 ../urpmq:47
+#: ../urpmf:37 ../urpmi:83 ../urpmq:48
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr " --excludemedia - 不使用给定介质,介质之间用逗号分隔。\n"
-#: ../urpmf:37
+#: ../urpmf:38
msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-" --literal, -l - 不匹配模式,参数为字面字符串。\n"
+msgstr " --literal, -l - 不匹配模式,参数为字面字符串。\n"
-#: ../urpmf:38 ../urpmi:80 ../urpmq:45
+#: ../urpmf:39 ../urpmi:81 ../urpmq:46
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - 只使用列出的介质,介质之间用逗号分隔。\n"
-#: ../urpmf:39 ../urpmi:83 ../urpmq:48
+#: ../urpmf:40 ../urpmi:84 ../urpmq:49
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr " --sortmedia - 根据用逗号分隔的子字符串排序介质。\n"
-#: ../urpmf:40 ../urpmi:84 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:50
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - 使用指定的综合文件而不是 urpmi db。\n"
-#: ../urpmf:41
+#: ../urpmf:42
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - 不打印相同行。\n"
-#: ../urpmf:42 ../urpmi:79 ../urpmq:44
+#: ../urpmf:43 ../urpmi:80 ../urpmq:45
msgid " --update - use only update media.\n"
msgstr " --update - 只使用升级介质。\n"
-#: ../urpmf:43
+#: ../urpmf:44
msgid " --verbose - verbose mode.\n"
msgstr " --verbose - 详细提示。\n"
-#: ../urpmf:44
+#: ../urpmf:45
msgid " -i - ignore case distinctions in patterns.\n"
msgstr " -i - 忽略各种情况下的冲突。\n"
-#: ../urpmf:45
+#: ../urpmf:46
msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr " -F<字符串> - 更改字段分隔符(默认为“:”)。\n"
-#: ../urpmf:46
+#: ../urpmf:47
msgid "Pattern expressions:\n"
msgstr "模式表达式:\n"
-#: ../urpmf:47
+#: ../urpmf:48
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr " 文本 - 任何文本都将被处理为正则表达式,除非使用了 -l。\n"
-#: ../urpmf:48
+#: ../urpmf:49
msgid " -e - include perl code directly as perl -e.\n"
msgstr " -e - 直接保留 perl 代码,就像 perl -e。\n"
-#: ../urpmf:49
+#: ../urpmf:50
msgid " -a - binary AND operator.\n"
msgstr " -a - 二元 AND 操作符。\n"
-#: ../urpmf:50
+#: ../urpmf:51
msgid " -o - binary OR operator.\n"
msgstr " -o - 二元 OR 操作符。\n"
-#: ../urpmf:51
+#: ../urpmf:52
msgid " ! - unary NOT.\n"
msgstr " ! - 一元 NOT。\n"
-#: ../urpmf:52
+#: ../urpmf:53
msgid " ( ) - left and right parentheses.\n"
msgstr " ( ) - 左右括号。\n"
-#: ../urpmf:53
+#: ../urpmf:54
msgid "List of tags:\n"
msgstr "标记清单:\n"
-#: ../urpmf:54
+#: ../urpmf:55
msgid " --qf - specify a printf-like output format\n"
msgstr " --qf - 指定类似 printf 的输出格式\n"
-#: ../urpmf:55
+#: ../urpmf:56
#, c-format
msgid " example: '%%name:%%files'\n"
msgstr " 例如:“%%name:%%files”\n"
-#: ../urpmf:56
+#: ../urpmf:57
msgid " --arch - architecture\n"
msgstr " --arch - 体系\n"
-#: ../urpmf:57
+#: ../urpmf:58
msgid " --buildhost - build host\n"
msgstr " --buildhost - 编译主机\n"
-#: ../urpmf:58
+#: ../urpmf:59
msgid " --buildtime - build time\n"
msgstr " --buildtime - 编译时间\n"
-#: ../urpmf:59
+#: ../urpmf:60
msgid " --conffiles - configuration files\n"
msgstr " --conffiles - 配置文件\n"
-#: ../urpmf:60
+#: ../urpmf:61
msgid " --conflicts - conflict tags\n"
msgstr " --conflicts - conflict 标签\n"
-#: ../urpmf:61
+#: ../urpmf:62
msgid " --description - package description\n"
msgstr " --description - 软件包描述\n"
-#: ../urpmf:62
+#: ../urpmf:63
msgid " --distribution - distribution\n"
msgstr " --distribution - 发行版\n"
-#: ../urpmf:63
+#: ../urpmf:64
msgid " --epoch - epoch\n"
msgstr " --epoch - 周期\n"
-#: ../urpmf:64
+#: ../urpmf:65
msgid " --filename - filename of the package\n"
msgstr " --fiename - 软件包文件名\n"
-#: ../urpmf:65
+#: ../urpmf:66
msgid " --files - list of files contained in the package\n"
msgstr " --files - 列出软件包中包含的文件\n"
-#: ../urpmf:66
+#: ../urpmf:67
msgid " --group - group\n"
msgstr " --group - 分组\n"
-#: ../urpmf:67
+#: ../urpmf:68
msgid " --name - package name\n"
msgstr " --name - 软件包名称\n"
-#: ../urpmf:68
+#: ../urpmf:69
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - obsolets 标签\n"
-#: ../urpmf:69
+#: ../urpmf:70
msgid " --packager - packager\n"
msgstr " --packager - 打包者\n"
-#: ../urpmf:70
+#: ../urpmf:71
msgid " --provides - provides tags\n"
msgstr " --provides - provides 标签\n"
-#: ../urpmf:71
+#: ../urpmf:72
msgid " --requires - requires tags\n"
msgstr " --requires - requires 标签\n"
-#: ../urpmf:72
+#: ../urpmf:73
msgid " --size - installed size\n"
msgstr " --size - 安装大小\n"
-#: ../urpmf:73
+#: ../urpmf:74
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - 源 rpm 名称\n"
-#: ../urpmf:74
+#: ../urpmf:75
msgid " --summary - summary\n"
msgstr " --summary - 摘要\n"
-#: ../urpmf:75
+#: ../urpmf:76
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:76
+#: ../urpmf:77
msgid " --vendor - vendor\n"
msgstr " --vendor - 提供者\n"
-#: ../urpmf:77
+#: ../urpmf:78
msgid " -m - the media in which the package was found\n"
msgstr " -m - 软件包所在介质\n"
-#: ../urpmf:78 ../urpmq:80
+#: ../urpmf:79 ../urpmq:81
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - 和名称一起打印版本、发行号和平台。\n"
-#: ../urpmf:130
+#: ../urpmf:131
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "格式不对:您只能使用一个多值标签"
-#: ../urpmf:172 ../urpmi:218 ../urpmq:116
+#: ../urpmf:173 ../urpmi:224 ../urpmq:117
#, c-format
msgid "using specific environment on %s\n"
msgstr "在 %s 使用指定环境\n"
-#: ../urpmf:218
+#: ../urpmf:219
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr "注意:由于没有介质使用 hdlists 搜索,urpmf 无法返回任何结果\n"
-#: ../urpmf:219
+#: ../urpmf:220
msgid "You may want to use --name to search for package names.\n"
msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
-#: ../urpmi:73
+#: ../urpmi:74
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1432,35 +1439,35 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpmi:81 ../urpmq:46
+#: ../urpmi:82 ../urpmq:47
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr " --searchmedia - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
-#: ../urpmi:86 ../urpmq:50
+#: ../urpmi:87 ../urpmq:51
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - 自动选择升级系统的软件包。\n"
-#: ../urpmi:87
+#: ../urpmi:88
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - 从不询问卸载软件包,直接中断安装。\n"
-#: ../urpmi:88
+#: ../urpmi:89
msgid " --no-install - don't install packages (only download)\n"
msgstr " --no-install - 不安装软件包(只下载)。\n"
-#: ../urpmi:89 ../urpmq:52
+#: ../urpmi:90 ../urpmq:53
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
" --keep - 如果有可能就保留已有软件包,拒绝导致删除的软件包。\n"
-#: ../urpmi:91
+#: ../urpmi:92
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1470,48 +1477,48 @@ msgstr ""
" --split-level - 如果将要安装或升级的软件包多于给定的软件包,就拆分为\n"
" 较小的交易。默认为 %d。\n"
-#: ../urpmi:94
+#: ../urpmi:95
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - 小交易长度,默认为 %d。\n"
-#: ../urpmi:95 ../urpmq:51
+#: ../urpmi:96 ../urpmq:52
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - 利用模糊查询(和 -y 一样)。\n"
-#: ../urpmi:96 ../urpmq:60
+#: ../urpmi:97 ../urpmq:61
msgid " --src - next package is a source package (same as -s).\n"
msgstr " --src - 下一个软件包是源程序包(和 -s 一样)。\n"
-#: ../urpmi:97
+#: ../urpmi:98
msgid " --install-src - install only source package (no binaries).\n"
msgstr " --install-src - 只安装源代码包(无二进制文件)。\n"
-#: ../urpmi:98
+#: ../urpmi:99
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - 首先删除缓存中的 rpm。\n"
-#: ../urpmi:99
+#: ../urpmi:100
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - 不从缓存中清除 rpm。\n"
-#: ../urpmi:101
+#: ../urpmi:102
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr " --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
-#: ../urpmi:103
+#: ../urpmi:104
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr " --allow-force - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
-#: ../urpmi:106
+#: ../urpmi:107
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - 使用另一个 root 安装 rpm。\n"
-#: ../urpmi:107
+#: ../urpmi:108
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
@@ -1519,19 +1526,31 @@ msgstr ""
" --use-distrib - 从发行版树中实时配置 urpmi,特别用于在 --root 选项\n"
" 下安装 chroot。\n"
-#: ../urpmi:109 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
+#: ../urpmi:110 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - 用 wget 取远程文件。\n"
-#: ../urpmi:110 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
+#: ../urpmi:111 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:70
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - 用 crul 取远程文件。\n"
-#: ../urpmi:111 ../urpmi.addmedia:46 ../urpmi.update:33
+#: ../urpmi:112
+msgid " --curl-options - additional options to pass to curl\n"
+msgstr " --curl-options - 给 curl 传递额外的选项\n"
+
+#: ../urpmi:113
+msgid " --rsync-options- additional options to pass to rsync\n"
+msgstr " --rsync-options- 给 rsync 传递额外的选项\n"
+
+#: ../urpmi:114
+msgid " --wget-options - additional options to pass to wget\n"
+msgstr " --wget-options - 给 wget 传递额外的选项\n"
+
+#: ../urpmi:115 ../urpmi.addmedia:47 ../urpmi.update:34
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - 降低下载速度。\n"
-#: ../urpmi:112
+#: ../urpmi:116
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
@@ -1539,7 +1558,7 @@ msgstr ""
" --resume - 续传未下载完成的文件\n"
" (--no-resume 禁用它,默认是禁用的)。\n"
-#: ../urpmi:114 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
+#: ../urpmi:118 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:71
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
" to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1547,7 +1566,7 @@ msgstr ""
" --proxy - 使用指定的 HTTP 代理,默认的端口号是\n"
" 1080(格式如 <proxyhost[:port]>)。\n"
-#: ../urpmi:116 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
+#: ../urpmi:120 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:73
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
@@ -1555,7 +1574,7 @@ msgstr ""
" --proxy-user - 指定用于代理认证的用户和\n"
" 密码(格式如 <用户: 密码>)。\n"
-#: ../urpmi:118
+#: ../urpmi:122
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
@@ -1563,7 +1582,7 @@ msgstr ""
" --bug - 输出故障报告\n"
" 下一个参数指定输出目录。\n"
-#: ../urpmi:121
+#: ../urpmi:125
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disable it, default is enabled).\n"
@@ -1571,96 +1590,96 @@ msgstr ""
" --verify-rpm - 安装之前验证 rpm 签署。\n"
" (--no-verify-rpm 禁止它,默认是激活的)。\n"
-#: ../urpmi:123
+#: ../urpmi:127
msgid ""
" --test - verify if the installation can be achieved correctly.\n"
msgstr " --test - 验证安装是否可以正确进行。\n"
-#: ../urpmi:124
+#: ../urpmi:128
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - 排除按逗号分隔的路径。\n"
-#: ../urpmi:125
+#: ../urpmi:129
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - 排除文档文件。\n"
-#: ../urpmi:126
+#: ../urpmi:130
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - 安装前不检查磁盘空间。\n"
-#: ../urpmi:127
+#: ../urpmi:131
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - 不执行软件包脚本。\n"
-#: ../urpmi:128
+#: ../urpmi:132
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - 安装要跳过的软件包。\n"
-#: ../urpmi:129
+#: ../urpmi:133
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
" --more-choices - 如果找到了多个软件包,则提供多个选择而不是默认选择。\n"
-#: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
+#: ../urpmi:135 ../urpmi.addmedia:69 ../urpmi.update:42
msgid " --norebuild - don't try to rebuild hdlist if not readable.\n"
msgstr " --norebuild - 如果 hdlist 不可读的话,不尝试重新创建。\n"
-#: ../urpmi:132
+#: ../urpmi:136
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 更新只限于相同体系的软件包。\n"
-#: ../urpmi:133 ../urpmq:77
+#: ../urpmi:137 ../urpmq:78
msgid " -a - select all matches on command line.\n"
msgstr " -a - 在命令行选择所有匹配。\n"
-#: ../urpmi:134
+#: ../urpmi:138
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - 允许在 provides 字段中查找软件包。\n"
-#: ../urpmi:135
+#: ../urpmi:139
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - 不在 provides 字段中查找软件包。\n"
-#: ../urpmi:136 ../urpmq:92
+#: ../urpmi:140 ../urpmq:93
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - 利用模糊查询(和 --fuzzy 一样)。\n"
-#: ../urpmi:137 ../urpmq:89
+#: ../urpmi:141 ../urpmq:90
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - 下一个软件包是源程序包(和 --src 一样)。\n"
-#: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
-#: ../urpmi.update:47
+#: ../urpmi:142 ../urpmi.addmedia:74 ../urpmi.removemedia:53
+#: ../urpmi.update:48
msgid " -q - quiet mode.\n"
msgstr " -q - 安静模式。\n"
-#: ../urpmi:140
+#: ../urpmi:144
msgid " names or rpm files given on command line will be installed.\n"
msgstr " 命令行给出的软件包名或 rpm 文件将会被安装。\n"
-#: ../urpmi:189
+#: ../urpmi:193
msgid "What can be done with binary rpm files when using --install-src"
msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
-#: ../urpmi:208
+#: ../urpmi:214
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "目录 [%s] 已存在,请使用另外一个目录进行错误报告或者删除该目录"
-#: ../urpmi:209
+#: ../urpmi:215
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "无法创建故障报告的目录 [%s]"
-#: ../urpmi:212 ../urpmi:333
+#: ../urpmi:218 ../urpmi:339
msgid "Copying failed"
msgstr "复制失败"
-#: ../urpmi:238
+#: ../urpmi:244
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -1669,12 +1688,12 @@ msgstr ""
"错误:%s 似乎是以只读方式挂载的。\n"
"请使用 --allow-force 强制操作。"
-#: ../urpmi:368
+#: ../urpmi:374
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "请输入您的选择:(1-%d)"
-#: ../urpmi:398
+#: ../urpmi:404
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -1684,17 +1703,19 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本:\n"
"%s"
-#: ../urpmi:406 ../urpmi:424
+#: ../urpmi:412 ../urpmi:430
msgid ""
"\n"
"Continue installation anyway?"
-msgstr "\n仍然继续安装吗?"
+msgstr ""
+"\n"
+"仍然继续安装吗?"
-#: ../urpmi:406 ../urpmi:424 ../urpmi:504
+#: ../urpmi:412 ../urpmi:430 ../urpmi:511
msgid " (Y/n) "
msgstr "(是(Y)/否(n))[是]"
-#: ../urpmi:417
+#: ../urpmi:423
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -1703,7 +1724,7 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:447
+#: ../urpmi:453
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -1713,7 +1734,7 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:452
+#: ../urpmi:458
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1722,21 +1743,22 @@ msgstr ""
"要升级其它软件包,需要先删除下列软件包:\n"
"%s"
-#: ../urpmi:487 ../urpmi:498
-#, c-format
+#: ../urpmi:493 ../urpmi:505
msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "为了满足依赖关系,将安装下列%d个软件包(%d MB)"
+"To satisfy dependencies, the following packages are going to be installed"
+msgstr ""
+"为了满足依赖性要求,将另外安装以下软件包"
+
+#: ../urpmi:494 ../urpmi:506
+msgid "To satisfy dependencies, the following package is going to be installed"
+msgstr "为了满足依赖关系,将安装下列软件包"
-#: ../urpmi:488 ../urpmi:499
+#: ../urpmi:495
#, c-format
-msgid ""
-"To satisfy dependencies, the following package is going to be installed (%d "
-"MB)"
-msgstr "为了满足依赖关系,将安装下列软件包(%d MB)"
+msgid "(%d packages, %d MB)"
+msgstr "(%d 个软件包,%d MB)"
-#: ../urpmi:494
+#: ../urpmi:501
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1745,61 +1767,66 @@ msgstr ""
"您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
"%s\n"
-#: ../urpmi:525
+#: ../urpmi:507
+#, c-format
+msgid "Proceed with the installation of the %d packages? (%d MB)"
+msgstr "继续安装 %d 个软件包吗?(%d MB)"
+
+#: ../urpmi:532
msgid "Press Enter when ready..."
msgstr "准备好后按 Enter 键..."
-#: ../urpmi:531
+#: ../urpmi:538
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:531
+#: ../urpmi:538
msgid "Ok"
msgstr "确定"
-#: ../urpmi:579
+#: ../urpmi:586
msgid "The following packages have bad signatures"
msgstr "下列软件包的签名有错误"
-#: ../urpmi:580
+#: ../urpmi:587
msgid "Do you want to continue installation ?"
msgstr "您想继续安装吗?"
-#: ../urpmi:622
+#: ../urpmi:631
#, c-format
msgid "distributing %s"
msgstr "正在分发 %s"
#. - there's a common prefix, simplify message
-#: ../urpmi:633
+#: ../urpmi:642
#, c-format
msgid "installing %s from %s"
msgstr "正在从 %2$s 安装 %1$s"
-#: ../urpmi:635
+#: ../urpmi:644
#, c-format
msgid "installing %s"
msgstr "正在安装 %s"
-#: ../urpmi:665
+#: ../urpmi:675
msgid "Try installation without checking dependencies? (y/N) "
msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
-#: ../urpmi:681
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
+#: ../urpmi:692
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
-#: ../urpmi:718
+#: ../urpmi:731
#, c-format
msgid "%d installation transactions failed"
msgstr "%d 安装交易失败"
-#: ../urpmi:733
+#: ../urpmi:747
#, c-format
msgid "The following package names were assumed: %s"
msgstr "假定下列软件包名称: %s"
-#: ../urpmi:750
+#: ../urpmi:764
msgid "restarting urpmi"
msgstr "重新启动 urpmi"
@@ -1807,7 +1834,7 @@ msgstr "重新启动 urpmi"
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
#. Translator: only what is between <brackets> can be translated.
-#: ../urpmi.addmedia:34
+#: ../urpmi.addmedia:35
msgid ""
"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
"where <url> is one of\n"
@@ -1830,38 +1857,38 @@ msgstr ""
"\n"
"而 [options] 可以来自\n"
-#: ../urpmi.addmedia:51
+#: ../urpmi.addmedia:52
msgid " --update - create an update medium.\n"
msgstr " --update - 创建一个更新介质。\n"
-#: ../urpmi.addmedia:52
+#: ../urpmi.addmedia:53
msgid " --probe-synthesis - try to find and use synthesis file.\n"
msgstr " --probe-synthesis - 试图查找并使用综合文件。\n"
-#: ../urpmi.addmedia:53
+#: ../urpmi.addmedia:54
msgid " --probe-hdlist - try to find and use hdlist file.\n"
msgstr " --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
-#: ../urpmi.addmedia:54
+#: ../urpmi.addmedia:55
msgid ""
" --no-probe - do not try to find any synthesis or\n"
" hdlist file.\n"
msgstr " --no-probe - 不试图查找任何综合文件或 hdlist 文件。\n"
-#: ../urpmi.addmedia:56
+#: ../urpmi.addmedia:57
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
msgstr " --distrib - 自动从安装介质创建全部介质。\n"
-#: ../urpmi.addmedia:58
+#: ../urpmi.addmedia:59
#, c-format
msgid ""
" --from - use specified url for list of mirrors, the default is\n"
" %s\n"
msgstr " --from - 使用指定的 URL 列出镜像,默认为 %s。\n"
-#: ../urpmi.addmedia:60
+#: ../urpmi.addmedia:61
msgid ""
" --version - use specified distribution version, the default is taken\n"
" from the version of the distribution told by the\n"
@@ -1870,7 +1897,7 @@ msgstr ""
" --version - 使用指定发行版本,默认值根据所安装的 mandriva-release\n"
" 软件包确定。\n"
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:64
msgid ""
" --arch - use specified architecture, the default is arch of\n"
" mandriva-release package installed.\n"
@@ -1878,69 +1905,69 @@ msgstr ""
" --arch - 使用指定的架构,默认值根据所安装的 mandriva-release\n"
" 软件包确定。\n"
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:66
msgid ""
" --virtual - create virtual media wich are always up-to-date,\n"
" only file:// protocol is allowed.\n"
msgstr " --virtual - 创建常为最新的虚拟介质,只允许 file:// 协议。\n"
-#: ../urpmi.addmedia:67 ../urpmi.update:39
+#: ../urpmi.addmedia:68 ../urpmi.update:40
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - 禁用 MD5SUM 文件检查。\n"
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
msgid " --nopubkey - don't import pubkey of added media\n"
msgstr " --nopubkey - 不导入所添加介质的密钥\n"
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - 在配置中添加介质,但不进行更新。\n"
-#: ../urpmi.addmedia:71 ../urpmi.removemedia:50 ../urpmi.update:45
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:51 ../urpmi.update:46
msgid " -c - clean headers cache directory.\n"
msgstr " -c - 直接清除软件包头缓存。\n"
-#: ../urpmi.addmedia:72 ../urpmi.update:46
+#: ../urpmi.addmedia:73 ../urpmi.update:47
msgid " -f - force generation of hdlist files.\n"
msgstr " -f - 强迫生成 hdlist 文件。\n"
-#: ../urpmi.addmedia:84
+#: ../urpmi.addmedia:85
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr "无法更新介质“%s”\n"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:118
msgid "Only superuser is allowed to add media"
msgstr "只允许超级用户添加介质"
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:121
#, c-format
msgid "Will create config file [%s]"
msgstr "将创建配置文件[%s]"
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
#, c-format
msgid "Can't create config file [%s]"
msgstr "无法创建配置文件[%s]"
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "使用 --distrib 不需要提供 <hdlist 的相对路径>"
-#: ../urpmi.addmedia:138
+#: ../urpmi.addmedia:139
msgid "<relative path of hdlist> missing\n"
msgstr "<hdlist 相对路径>找不到\n"
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
msgid "`with' missing for network media\n"
msgstr "“with”找不到网络介质\n"
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:158
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "无法创建介质“%s”\n"
-#: ../urpmi.removemedia:46
+#: ../urpmi.removemedia:47
msgid ""
"usage: urpmi.removemedia [-a] <name> ...\n"
"where <name> is a medium name to remove.\n"
@@ -1948,15 +1975,15 @@ msgstr ""
"用法: urpmi.removemedia [-a] <名称> ...\n"
"其中 <名称> 是要删除的介质名。\n"
-#: ../urpmi.removemedia:49
+#: ../urpmi.removemedia:50
msgid " -a - select all media.\n"
msgstr " -a - 选择所有介质。\n"
-#: ../urpmi.removemedia:51
+#: ../urpmi.removemedia:52
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - 介质名称使用模糊匹配。\n"
-#: ../urpmi.removemedia:54
+#: ../urpmi.removemedia:55
#, c-format
msgid ""
"\n"
@@ -1965,15 +1992,15 @@ msgstr ""
"\n"
"未知的选项“%s”\n"
-#: ../urpmi.removemedia:63
+#: ../urpmi.removemedia:64
msgid "Only superuser is allowed to remove media"
msgstr "只允许超级用户删除介质"
-#: ../urpmi.removemedia:73
+#: ../urpmi.removemedia:74
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
-#: ../urpmi.removemedia:75
+#: ../urpmi.removemedia:76
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -1982,7 +2009,7 @@ msgstr ""
"找不到要删除的项\n"
"(%s中的一个)\n"
-#: ../urpmi.update:28
+#: ../urpmi.update:29
msgid ""
"usage: urpmi.update [options] <name> ...\n"
"where <name> is a medium name to update.\n"
@@ -1990,35 +2017,35 @@ msgstr ""
"用法: urpmi.update [选项] <名称> ...\n"
"其中 <名称> 是要删除的介质名...\n"
-#: ../urpmi.update:38
+#: ../urpmi.update:39
msgid " --update - update only update media.\n"
msgstr " --update - 只使用更新介质。\n"
-#: ../urpmi.update:40
+#: ../urpmi.update:41
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - 强制更新 gpg 密钥。\n"
-#: ../urpmi.update:42
+#: ../urpmi.update:43
msgid " --ignore - don't update, mark the media as ignored.\n"
msgstr " --ignore - 不更新,将介质标为忽略。\n"
-#: ../urpmi.update:43
+#: ../urpmi.update:44
msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - 不更新,将介质标为启用。\n"
-#: ../urpmi.update:44
+#: ../urpmi.update:45
msgid " -a - select all non-removable media.\n"
msgstr " -a - 选择所有不可移动的介质。\n"
-#: ../urpmi.update:67
+#: ../urpmi.update:68
msgid "Only superuser is allowed to update media"
msgstr "只允许超级用户更新介质"
-#: ../urpmi.update:75
+#: ../urpmi.update:76
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
-#: ../urpmi.update:93
+#: ../urpmi.update:94
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2027,22 +2054,22 @@ msgstr ""
"找不到要升级的项\n"
"(%s 中之一)\n"
-#: ../urpmi.update:97
+#: ../urpmi.update:98
#, c-format
msgid "\"%s\""
msgstr "“%s”"
-#: ../urpmi.update:98
+#: ../urpmi.update:99
#, c-format
msgid "enabling media %s"
msgstr "启用介质 %s"
-#: ../urpmi.update:98
+#: ../urpmi.update:99
#, c-format
msgid "ignoring media %s"
msgstr "忽略介质 %s"
-#: ../urpmq:38
+#: ../urpmq:39
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2058,32 +2085,32 @@ msgstr ""
"\n"
"用法:\n"
-#: ../urpmq:54
+#: ../urpmq:55
msgid " --list - list available packages.\n"
msgstr " --list - 列出可用的软件包。\n"
-#: ../urpmq:55
+#: ../urpmq:56
msgid " --list-media - list available media.\n"
msgstr " --list-media - 列出可用的介质。\n"
-#: ../urpmq:56
+#: ../urpmq:57
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - 列出可用的介质及其 URL。\n"
-#: ../urpmq:57
+#: ../urpmq:58
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr " --list-nodes - 如果使用了 --parallel,列出所有可用的节点。\n"
-#: ../urpmq:58
+#: ../urpmq:59
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - 列出可用的并行处理别名。\n"
-#: ../urpmq:59
+#: ../urpmq:60
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - 以 urpmi.addmedia 参数的格式导出配置。\n"
-#: ../urpmq:61
+#: ../urpmq:62
msgid ""
" --headers - extract headers for package listed from urpmi db to\n"
" stdout (root only).\n"
@@ -2091,233 +2118,100 @@ msgstr ""
" --headers - 从 urpmi 数据库提取软件包的头信息\n"
" 用 stdout 输出(root 专用)。\n"
-#: ../urpmq:63
+#: ../urpmq:64
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr " --sources - 下载前给出所有的源文件包(root 专用)。\n"
-#: ../urpmq:66
+#: ../urpmq:67
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:75
+#: ../urpmq:76
msgid " --changelog - print changelog.\n"
msgstr " --changelog - 打印更新日志。\n"
-#: ../urpmq:76
+#: ../urpmq:77
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - 打印摘要。\n"
-#: ../urpmq:78
+#: ../urpmq:79
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - 要删除的软件包的完整输出。\n"
-#: ../urpmq:79
+#: ../urpmq:80
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - 扩展软件包依赖性查询。\n"
-#: ../urpmq:81
+#: ../urpmq:82
msgid " -g - print groups with name also.\n"
msgstr " -g - 打印组名。\n"
-#: ../urpmq:82
+#: ../urpmq:83
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - 以人类可读的格式打印有用信息。\n"
-#: ../urpmq:83
+#: ../urpmq:84
msgid " -l - list files in package.\n"
msgstr " -l - 列出软件包中的文件。\n"
-#: ../urpmq:84
+#: ../urpmq:85
msgid ""
" -P - do not search in provides to find package (default).\n"
msgstr " -P - 不搜索提供中的软件包(默认)。\n"
-#: ../urpmq:85
+#: ../urpmq:86
msgid " -p - search in provides to find package.\n"
msgstr " -p - 允许在提供的项目中寻找软件包。\n"
-#: ../urpmq:86
+#: ../urpmq:87
msgid " -r - print version and release with name also.\n"
msgstr " -r - 和名称一起打印版本和发行号。\n"
-#: ../urpmq:87
+#: ../urpmq:88
msgid " -R - reverse search to what requires package.\n"
msgstr " -R - 逆序搜索需要软件包的软件包。\n"
-#: ../urpmq:88
+#: ../urpmq:89
msgid ""
" -RR - extended reverse search (includes virtual packages).\n"
msgstr " -RR - 扩展逆序搜索(包括虚拟软件包)。\n"
-#: ../urpmq:90
+#: ../urpmq:91
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - 如果更新的版本已经安装,就删除软件包。\n"
-#: ../urpmq:93
+#: ../urpmq:94
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - 类似于 -y,但强制不区分大小写匹配。\n"
-#: ../urpmq:94
+#: ../urpmq:95
msgid " names or rpm files given on command line are queried.\n"
msgstr " 需要在命令行给出名称或 rpm 文件。\n"
-#: ../urpmq:157
+#: ../urpmq:158
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes 仅能和 --parallel 一起使用"
#. TODO rewrite rpm2header in perl
-#: ../urpmq:313
+#: ../urpmq:314
msgid "rpm2header utility not found, impossible to use the --header option"
msgstr "rpm2header 工具未找到,无法使用 --header 选项"
-#: ../urpmq:362
+#: ../urpmq:363
#, c-format
msgid "skipping media %s: no hdlist"
msgstr "跳过介质 %s:无 hdlist"
-#: ../urpmq:437
+#: ../urpmq:438
msgid "No filelist found\n"
msgstr "没有找到文件列表\n"
-#: ../urpmq:449
+#: ../urpmq:450
msgid "No changelog found\n"
msgstr "没有找到更新日志\n"
-#~ msgid "installing %s\n"
-#~ msgstr "正在安装 %s\n"
-
-#~ msgid ""
-#~ "Automatic installation of packages...\n"
-#~ "You requested installation of package %s\n"
-#~ msgstr ""
-#~ "自动安装软件包...\n"
-#~ "您要求安装软件包 %s\n"
-
-#~ msgid "%s: command not found\n"
-#~ msgstr "%s: 命令没找到\n"
-
-#~ msgid ""
-#~ "Some package requested cannot be installed:\n"
-#~ "%s\n"
-#~ "Continue?"
-#~ msgstr ""
-#~ "某些要求的软件包无法安装:\n"
-#~ "%s\n"
-#~ "继续吗?"
-
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "%s\n"
-#~ "Continue?"
-#~ msgstr ""
-#~ "要升级其它软件包,需要先删除下列软件包:\n"
-#~ "%s\n"
-#~ "继续吗?"
-
-#~ msgid "md5sum mismatch"
-#~ msgstr "md5sum 不匹配"
-
-#~ msgid ""
-#~ "urpmf version %s\n"
-#~ "Copyright (C) 2002-2004 Mandriva.\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
-#~ "\n"
-#~ "usage:\n"
-#~ msgstr ""
-#~ "urpmf 版本 %s\n"
-#~ "版权 (C) 2002-2004 Mandriva。\n"
-#~ "这是自由软件,可以依照 GNU GPL 重新发布。\n"
-#~ "\n"
-#~ "用法:\n"
-
-#~ msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-#~ msgstr " --synthesis - 使用指定的综合文件而不是 urpmi db。\n"
-
-#~ msgid ""
-#~ " --quiet - do not print tag name (default if no tag given on "
-#~ "command\n"
-#~ " line, incompatible with interactive mode).\n"
-#~ msgstr ""
-#~ " --quiet - 不打印标签名称(如果没有在命令行指定标签,默认设置\n"
-#~ " 就是不打印,与会话方式不相兼容)。\n"
-
-#~ msgid " --uniq - do not print identical lines.\n"
-#~ msgstr " --uniq - 不打印相同行。\n"
-
-#~ msgid " --all - print all tags.\n"
-#~ msgstr " --all - 打印全部标签。\n"
-
-#~ msgid " --summary - print tag summary: summary.\n"
-#~ msgstr " --summary - 打印标签 summary: 摘要。\n"
-
-#~ msgid " --description - print tag description: description.\n"
-#~ msgstr " --description - 打印标签 description: 描述。\n"
-
-#~ msgid " --buildhost - print tag buildhost: build host.\n"
-#~ msgstr " --buildhost - 打印标签 buildhost: 创建主机。\n"
-
-#~ msgid " --provides - print tag provides: all provides.\n"
-#~ msgstr " --provides - 打印标签 provides: 所有的提供。\n"
-
-#~ msgid " --requires - print tag requires: all requires.\n"
-#~ msgstr " --requires - 打印标签 requires: 所有需要。\n"
-
-#~ msgid " --files - print tag files: all files.\n"
-#~ msgstr " --files - 打印标签 files: 所有文件。\n"
-
-#~ msgid " --obsoletes - print tag obsoletes: all obsoletes.\n"
-#~ msgstr " --obsoletes - 打印标签 obsoletes: 所有的废除。\n"
-
-#~ msgid ""
-#~ " --env - use specific environment (typically a bug\n"
-#~ " report).\n"
-#~ msgstr " --env - 使用指定的环境(特别是进行故障报告时)。\n"
-
-#~ msgid " -i - ignore case distinctions in every pattern.\n"
-#~ msgstr " -i - 忽略各种情况下的冲突。\n"
-
-#~ msgid ""
-#~ " -a - binary AND operator, true if both expression are "
-#~ "true.\n"
-#~ msgstr " -a - 二元 AND 操作符,如果两个表达都为真,则为真。\n"
-
-#~ msgid ""
-#~ " -o - binary OR operator, true if one expression is true.\n"
-#~ msgstr ""
-#~ " -o - 二元 OR 操作符,如果两个表达中的一个为真,则为真。\n"
-
-#~ msgid " ! - unary NOT, true if expression is false.\n"
-#~ msgstr " ! - 一元 NOT,如果表达为假,则为真。\n"
-
-#~ msgid " ( - left parenthesis to open group expression.\n"
-#~ msgstr " ( - 左括号用来打开一组表达式。\n"
-
-#~ msgid " ) - right parenthesis to close group expression.\n"
-#~ msgstr " ) - 右括号用来关闭一组表达式。\n"
-
-#~ msgid ""
-#~ "callback is:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "召回是:\n"
-#~ "%s\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Continue?"
-#~ msgstr ""
-#~ "\n"
-#~ "继续吗?"
-
-#~ msgid ""
-#~ "Some package requested cannot be installed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "某些要求的软件包无法安装:\n"
-#~ "%s"