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.po541
1 files changed, 259 insertions, 282 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9179306f..0db4b766 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-02-14 14:40+0100\n"
-"PO-Revision-Date: 2005-12-17 20:30+0800\n"
+"POT-Creation-Date: 2006-03-05 18:43+0800\n"
+"PO-Revision-Date: 2006-03-05 18:54+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
"org>\n"
@@ -31,11 +31,11 @@ msgstr "RPM 安装"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "错误:找不到文件 %s,将取消操作"
-#: ../gurpmi:44 ../gurpmi2:123 ../gurpmi2:146
+#: ../gurpmi:44 ../gurpmi2:127 ../gurpmi2:150
msgid "_Ok"
msgstr "确定(_O)"
-#: ../gurpmi:58
+#: ../gurpmi:64
#, c-format
msgid ""
"You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
"\n"
"您想要执行什么操作?"
-#: ../gurpmi:66 ../gurpmi:77
+#: ../gurpmi:72 ../gurpmi:83
#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
@@ -71,7 +71,7 @@ msgstr ""
"\n"
"继续吗?"
-#: ../gurpmi:72
+#: ../gurpmi:78
#, c-format
msgid ""
"You are about to install the following software package on your computer:\n"
@@ -87,28 +87,28 @@ msgstr ""
"您也可以选择只是保存相应的软件包。您要进行什么操作?"
#. - buttons
-#: ../gurpmi:87
+#: ../gurpmi:96
msgid "_Install"
msgstr "安装(_I)"
-#: ../gurpmi:88
+#: ../gurpmi:97
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:89 ../gurpmi2:123
+#: ../gurpmi:98 ../gurpmi2:127
msgid "_Cancel"
msgstr "取消(_C)"
-#: ../gurpmi:99
+#: ../gurpmi:106
msgid "Choose location to save file"
msgstr "选择保存文件的位置"
-#: ../gurpmi.pm:66
+#: ../gurpmi.pm:75
#, c-format
msgid "Unknown option %s"
msgstr "未知的选项 %s"
-#: ../gurpmi.pm:74
+#: ../gurpmi.pm:83
msgid "No packages specified"
msgstr "未指定软件包"
@@ -120,7 +120,7 @@ msgstr "请稍候..."
msgid "Must be root"
msgstr "必须是 root"
-#: ../gurpmi2:79
+#: ../gurpmi2:80
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -131,27 +131,27 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:119
+#: ../gurpmi2:123
msgid " (to upgrade)"
msgstr "(升级)"
-#: ../gurpmi2:120
+#: ../gurpmi2:124
msgid " (to install)"
msgstr "(安装)"
-#: ../gurpmi2:123
+#: ../gurpmi2:127
msgid "Package choice"
msgstr "软件包选择"
-#: ../gurpmi2:124 ../urpmi:414
+#: ../gurpmi2:128 ../urpmi:414
msgid "One of the following packages is needed:"
msgstr "需要下列软件包之一:"
-#: ../gurpmi2:147
+#: ../gurpmi2:151
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:167
+#: ../gurpmi2:171
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -162,7 +162,7 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:181
+#: ../gurpmi2:185
#, c-format
msgid ""
"To satisfy dependencies, the following %d packages are going to be "
@@ -172,25 +172,25 @@ msgstr ""
"为了满足依赖性要求,将另外安装以下%d个软件包:\n"
"%s\n"
-#: ../gurpmi2:188
+#: ../gurpmi2:192
msgid "Package installation..."
msgstr "软件包安装..."
-#: ../gurpmi2:190 ../urpmi:569
+#: ../gurpmi2:194 ../urpmi:569
msgid "unable to get source packages, aborting"
msgstr "无法读取源软件包,中止"
-#: ../gurpmi2:203 ../urpmi:579
+#: ../gurpmi2:207 ../urpmi:579
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "请将标签为“%s”的介质插入到设备 [%s]"
-#: ../gurpmi2:231
+#: ../gurpmi2:235
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
-#: ../gurpmi2:246
+#: ../gurpmi2:250
#, 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:253 ../gurpmi2:309 ../urpmi:651 ../urpmi:782
+#: ../gurpmi2:257 ../gurpmi2:313 ../urpmi:651 ../urpmi:782
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -217,34 +217,34 @@ msgstr ""
"您可能需要更新您的 urpmi 数据库"
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:260 ../urpme:129 ../urpmi:698
+#: ../gurpmi2:264 ../urpme:129 ../urpmi:698
#, c-format
msgid "removing %s"
msgstr "正在删除 %s"
-#: ../gurpmi2:268 ../urpm.pm:2905
+#: ../gurpmi2:272 ../urpm.pm:2907
msgid "Preparing..."
msgstr "正在准备..."
-#: ../gurpmi2:270
+#: ../gurpmi2:274
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安装软件包“%s”(%s/%s)..."
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:295 ../urpmi:663 ../urpmi:721 ../urpmi:741 ../urpmi:759
+#: ../gurpmi2:299 ../urpmi:663 ../urpmi:721 ../urpmi:741 ../urpmi:759
msgid "Installation failed"
msgstr "安装失败"
-#: ../gurpmi2:304
+#: ../gurpmi2:308
msgid "_Done"
msgstr "完成(_D)"
-#: ../gurpmi2:312 ../urpmi:799
+#: ../gurpmi2:316 ../urpmi:799
msgid "The package(s) are already installed"
msgstr "软件包已经安装"
-#: ../gurpmi2:314
+#: ../gurpmi2:318
msgid "Installation finished"
msgstr "安装完成"
@@ -298,136 +298,136 @@ msgstr "未找到 webfetch,支持的 webfetch 是: %s\n"
msgid "unable to handle protocol: %s"
msgstr "无法处理协议: %s"
-#: ../urpm.pm:221
+#: ../urpm.pm:222
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "介质“%s”试图使用已经用过的 hdlist,介质被忽略"
-#: ../urpm.pm:222
+#: ../urpm.pm:223
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "介质“%s”试图打开已经用过的列表,介质被忽略"
-#: ../urpm.pm:235 ../urpm.pm:1310 ../urpm.pm:1320
+#: ../urpm.pm:236 ../urpm.pm:1311 ../urpm.pm:1321
#, 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:238 ../urpm.pm:2516
+#: ../urpm.pm:239 ../urpm.pm:2517
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "无法访问“%s”的列表文件,介质被忽略"
-#: ../urpm.pm:266
+#: ../urpm.pm:267
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "试图覆盖已有介质“%s”,正跳过"
-#: ../urpm.pm:277
+#: ../urpm.pm:278
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义,介质被忽略"
-#: ../urpm.pm:282
+#: ../urpm.pm:283
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "虚拟介质“%s”应该有清楚的 URL,介质被忽略"
-#: ../urpm.pm:291
+#: ../urpm.pm:292
#, c-format
msgid "unable to find hdlist file for \"%s\", medium ignored"
msgstr "找不到“%s”的 hdlist 文件,介质被忽略"
-#: ../urpm.pm:298
+#: ../urpm.pm:299
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "找不到“%s”的列表文件,介质被忽略"
-#: ../urpm.pm:322
+#: ../urpm.pm:323
#, c-format
msgid "inconsistent list file for \"%s\", medium ignored"
msgstr "“%s”的列表文件不连贯,介质被忽略"
-#: ../urpm.pm:332
+#: ../urpm.pm:333
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "无法检查“%s”的列表文件,介质被忽略"
#. - return value is suitable for an hash.
-#: ../urpm.pm:372
+#: ../urpm.pm:373
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "可移动介质“%s”的挂载点太多"
-#: ../urpm.pm:373
+#: ../urpm.pm:374
#, c-format
msgid "taking removable device as \"%s\""
msgstr "将可移动设备认作“%s”"
-#: ../urpm.pm:376
+#: ../urpm.pm:377
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "介质“%s”是一个 ISO 映像,将会被实时挂载"
-#: ../urpm.pm:379
+#: ../urpm.pm:380
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
-#: ../urpm.pm:384 ../urpm.pm:387
+#: ../urpm.pm:385 ../urpm.pm:388
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "无法获取可移动介质“%s”的路径名称"
-#: ../urpm.pm:413
+#: ../urpm.pm:414
#, c-format
msgid "unable to write config file [%s]"
msgstr "无法写入配置文件[%s]"
-#: ../urpm.pm:423
+#: ../urpm.pm:424
#, c-format
msgid "wrote config file [%s]"
msgstr "写入配置文件[%s]"
-#: ../urpm.pm:451
+#: ../urpm.pm:452
msgid "Can't use parallel mode with use-distrib mode"
msgstr "无法与发行模式一起使用并行模式"
-#: ../urpm.pm:461
+#: ../urpm.pm:462
#, c-format
msgid "unable to parse \"%s\" in file [%s]"
msgstr "无法处理文件[%2$s]中的“%1$s”"
-#: ../urpm.pm:473
+#: ../urpm.pm:474
#, c-format
msgid "examining parallel handler in file [%s]"
msgstr "正在检查文件[%s]中的并行处理"
-#: ../urpm.pm:484
+#: ../urpm.pm:485
#, c-format
msgid "found parallel handler for nodes: %s"
msgstr "找到结点的并行处理: %s"
-#: ../urpm.pm:488
+#: ../urpm.pm:489
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "并行模式时使用关联介质: %s"
-#: ../urpm.pm:492
+#: ../urpm.pm:493
#, c-format
msgid "unable to use parallel option \"%s\""
msgstr "无法使用并行选项“%s”"
-#: ../urpm.pm:500
+#: ../urpm.pm:501
#, c-format
msgid "there doesn't seem to be devices in the chroot in \"%s\""
msgstr "“%s”的 chroot 中似乎没有设备"
-#: ../urpm.pm:506
+#: ../urpm.pm:507
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update or --parallel"
@@ -444,143 +444,143 @@ msgstr ""
#. - (However links need to be managed. see bug #12391.)
#. - as previously done, just read synthesis file here, this is enough.
#. - read default synthesis (we have to make sure nothing get out of depslist).
-#: ../urpm.pm:570 ../urpm.pm:596 ../urpm.pm:1082 ../urpm.pm:1093
-#: ../urpm.pm:1165 ../urpm.pm:1182 ../urpm.pm:1237 ../urpm.pm:1293
-#: ../urpm.pm:1503 ../urpm.pm:1623 ../urpm.pm:1740 ../urpm.pm:1746
-#: ../urpm.pm:1849 ../urpm.pm:1935 ../urpm.pm:1939
+#: ../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
#, c-format
msgid "examining synthesis file [%s]"
msgstr "正在检查综合文件 [%s]"
-#: ../urpm.pm:574 ../urpm.pm:589 ../urpm.pm:602 ../urpm.pm:1085
-#: ../urpm.pm:1096 ../urpm.pm:1171 ../urpm.pm:1177 ../urpm.pm:1242
-#: ../urpm.pm:1297 ../urpm.pm:1507 ../urpm.pm:1627 ../urpm.pm:1734
-#: ../urpm.pm:1752 ../urpm.pm:1945
+#: ../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
#, c-format
msgid "examining hdlist file [%s]"
msgstr "正在检查 hdlist 文件 [%s]"
-#: ../urpm.pm:584 ../urpm.pm:1089
+#: ../urpm.pm:585 ../urpm.pm:1090
#, c-format
msgid "virtual medium \"%s\" is not local, medium ignored"
msgstr "虚拟介质“%s”不是本地的,介质被忽略"
-#: ../urpm.pm:614
+#: ../urpm.pm:615
#, c-format
msgid "Search start: %s end: %s"
msgstr "搜索开始:%s 结束:%s"
#. - this is almost a fatal error, ignore it by default?
-#: ../urpm.pm:619 ../urpm.pm:1103 ../urpm.pm:1190 ../urpm.pm:1246
-#: ../urpm.pm:1631
+#: ../urpm.pm:620 ../urpm.pm:1104 ../urpm.pm:1191 ../urpm.pm:1247
+#: ../urpm.pm:1632
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
-#: ../urpm.pm:626 ../urpm.pm:1887
+#: ../urpm.pm:627 ../urpm.pm:1888
msgid "performing second pass to compute dependencies\n"
msgstr "正在执行第二遍依赖关系的计算\n"
-#: ../urpm.pm:642
+#: ../urpm.pm:643
#, c-format
msgid "skipping package %s"
msgstr "跳过软件包 %s"
-#: ../urpm.pm:655
+#: ../urpm.pm:656
#, 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:666 ../urpm.pm:2324 ../urpm.pm:2385 ../urpm.pm:2573
-#: ../urpm.pm:2970 ../urpm.pm:3087
+#: ../urpm.pm:667 ../urpm.pm:2325 ../urpm.pm:2386 ../urpm.pm:2574
+#: ../urpm.pm:2972 ../urpm.pm:3090
msgid "unable to open rpmdb"
msgstr "无法打开 rpmdb"
-#: ../urpm.pm:706
+#: ../urpm.pm:707
#, c-format
msgid "medium \"%s\" already exists"
msgstr "介质“%s”已存在"
-#: ../urpm.pm:713
+#: ../urpm.pm:714
msgid "virtual medium needs to be local"
msgstr "虚拟介质必须是本地的"
-#: ../urpm.pm:738
+#: ../urpm.pm:739
#, c-format
msgid "added medium %s"
msgstr "已添加介质 %s"
-#: ../urpm.pm:783
+#: ../urpm.pm:784
msgid "unable to access first installation medium"
msgstr "无法访问介质的首次安装"
-#: ../urpm.pm:787
+#: ../urpm.pm:788
msgid "copying hdlists file..."
msgstr "正在复制 hdlists 文件..."
-#: ../urpm.pm:789 ../urpm.pm:1206 ../urpm.pm:1263
+#: ../urpm.pm:790 ../urpm.pm:1207 ../urpm.pm:1264
msgid "...copying done"
msgstr "...复制完成"
-#: ../urpm.pm:790 ../urpm.pm:1207 ../urpm.pm:1338 ../urpm.pm:1401
-#: ../urpm.pm:1569 ../urpm.pm:1576
+#: ../urpm.pm:791 ../urpm.pm:1208 ../urpm.pm:1339 ../urpm.pm:1402
+#: ../urpm.pm:1570 ../urpm.pm:1577
msgid "...copying failed"
msgstr "...复制失败"
-#: ../urpm.pm:793 ../urpm.pm:818 ../urpm.pm:857
+#: ../urpm.pm:794 ../urpm.pm:819 ../urpm.pm:858
msgid "unable to access first installation medium (no hdlists file found)"
msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
-#: ../urpm.pm:800
+#: ../urpm.pm:801
msgid "retrieving hdlists file..."
msgstr "正在获取 hdlists 文件..."
-#: ../urpm.pm:812 ../urpm.pm:1613 ../urpm.pm:2114 ../urpm.pm:2831
+#: ../urpm.pm:813 ../urpm.pm:1614 ../urpm.pm:2115 ../urpm.pm:2832
msgid "...retrieving done"
msgstr "...获取完成"
-#: ../urpm.pm:814 ../urpm.pm:1597 ../urpm.pm:2118 ../urpm.pm:2833
+#: ../urpm.pm:815 ../urpm.pm:1598 ../urpm.pm:2119 ../urpm.pm:2834
#, c-format
msgid "...retrieving failed: %s"
msgstr "...获取失败: %s"
-#: ../urpm.pm:838
+#: ../urpm.pm:839
#, c-format
msgid "invalid hdlist description \"%s\" in hdlists file"
msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
-#: ../urpm.pm:894
+#: ../urpm.pm:895
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "试图选择不存在的介质“%s”"
#. - several elements in found and/or foundi lists.
-#: ../urpm.pm:896
+#: ../urpm.pm:897
#, c-format
msgid "selecting multiple media: %s"
msgstr "选择多个介质: %s"
-#: ../urpm.pm:912
+#: ../urpm.pm:913
#, c-format
msgid "removing medium \"%s\""
msgstr "删除介质“%s”"
-#: ../urpm.pm:963
+#: ../urpm.pm:964
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "正在从介质“%s”重新配置 urpmi"
-#: ../urpm.pm:992
+#: ../urpm.pm:993
msgid "...reconfiguration failed"
msgstr "...重新配置失败"
-#: ../urpm.pm:999
+#: ../urpm.pm:1000
msgid "reconfiguration done"
msgstr "重新配置完成"
-#: ../urpm.pm:1143
+#: ../urpm.pm:1144
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -590,233 +590,233 @@ msgstr ""
"无法访问介质“%s”,\n"
"这可能是因为您在创建介质时是手动装载的目录。"
-#: ../urpm.pm:1194
+#: ../urpm.pm:1195
#, c-format
msgid ""
"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
"ignored"
msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件,介质被忽略"
-#: ../urpm.pm:1204
+#: ../urpm.pm:1205
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "正在复制“%s”的描述文件..."
-#: ../urpm.pm:1259
+#: ../urpm.pm:1260
#, c-format
msgid "copying source hdlist (or synthesis) of \"%s\"..."
msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
-#: ../urpm.pm:1273
+#: ../urpm.pm:1274
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "复制 [%s] 失败(文件太小了)"
-#: ../urpm.pm:1278
+#: ../urpm.pm:1279
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
-#: ../urpm.pm:1280
+#: ../urpm.pm:1281
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "复制[%s]失败(md5sum 不匹配)"
-#: ../urpm.pm:1301 ../urpm.pm:1511 ../urpm.pm:1852
+#: ../urpm.pm:1302 ../urpm.pm:1512 ../urpm.pm:1853
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "读取介质“%s”的综合文件出现问题"
-#: ../urpm.pm:1359
+#: ../urpm.pm:1360
#, c-format
msgid "reading rpm files from [%s]"
msgstr "正在从[%s]读取 rpm 文件"
-#: ../urpm.pm:1374
+#: ../urpm.pm:1375
msgid "no rpms read"
msgstr "没有读到 rpm"
-#: ../urpm.pm:1384
+#: ../urpm.pm:1385
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "无法从[%s]读取 rpm 文件: %s"
-#: ../urpm.pm:1389
+#: ../urpm.pm:1390
#, 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:1526
+#: ../urpm.pm:1527
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
-#: ../urpm.pm:1554
+#: ../urpm.pm:1555
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "发现探测的 hdlist(或综合文件) 为 %s"
-#: ../urpm.pm:1604
+#: ../urpm.pm:1605
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
-#: ../urpm.pm:1606
+#: ../urpm.pm:1607
msgid "...retrieving failed: md5sum mismatch"
msgstr "...获取失败: md5sum 不匹配"
-#: ../urpm.pm:1704
+#: ../urpm.pm:1705
msgid "retrieval of source hdlist (or synthesis) failed"
msgstr "获取源 hdlist(或综合文件) 失败"
-#: ../urpm.pm:1711
+#: ../urpm.pm:1712
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "介质“%s”未发现 hdlist 文件"
-#: ../urpm.pm:1722 ../urpm.pm:1776
+#: ../urpm.pm:1723 ../urpm.pm:1777
#, c-format
msgid "file [%s] already used in the same medium \"%s\""
msgstr "文件[%s]已经在相同的介质“%s”中使用"
-#: ../urpm.pm:1762
+#: ../urpm.pm:1763
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "无法处理“%s”的 hdlist 文件"
-#: ../urpm.pm:1801
+#: ../urpm.pm:1802
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "无法写入“%s”的列表文件"
-#: ../urpm.pm:1809
+#: ../urpm.pm:1810
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "正在写入介质“%s”的列表文件"
-#: ../urpm.pm:1811
+#: ../urpm.pm:1812
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "“%s”的列表文件中没有写入内容"
-#: ../urpm.pm:1826
+#: ../urpm.pm:1827
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "正在检查“%s”的公共密钥文件..."
-#: ../urpm.pm:1833
+#: ../urpm.pm:1834
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
-#: ../urpm.pm:1836
+#: ../urpm.pm:1837
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "无法导入“%s”的公共密钥文件"
-#: ../urpm.pm:1901
+#: ../urpm.pm:1902
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "正在从介质“%s”读取头"
-#: ../urpm.pm:1906
+#: ../urpm.pm:1907
#, 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:1921 ../urpm.pm:1957
+#: ../urpm.pm:1922 ../urpm.pm:1958
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
-#: ../urpm.pm:1925 ../urpm.pm:1961 ../urpmi:370
+#: ../urpm.pm:1926 ../urpm.pm:1962 ../urpmi:370
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "创建介质“%s”的 hdlist 综合文件"
-#: ../urpm.pm:1984
+#: ../urpm.pm:1985
#, c-format
msgid "found %d headers in cache"
msgstr "缓存中找到了 %d 个头"
-#: ../urpm.pm:1988
+#: ../urpm.pm:1989
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "删除缓存中的 %d 个过时头"
-#: ../urpm.pm:2009
+#: ../urpm.pm:2010
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "声称名称文件出错:依赖关系 %d 未找到"
-#: ../urpm.pm:2014
+#: ../urpm.pm:2015
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "声称名称文件失败:无法写入文件(%s)"
-#: ../urpm.pm:2050
+#: ../urpm.pm:2051
#, c-format
msgid "mounting %s"
msgstr "正在装载 %s"
-#: ../urpm.pm:2074
+#: ../urpm.pm:2075
#, c-format
msgid "unmounting %s"
msgstr "正在拆卸 %s"
-#: ../urpm.pm:2099
+#: ../urpm.pm:2100
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "无效的 rpm 文件名[%s]"
-#: ../urpm.pm:2105
+#: ../urpm.pm:2106
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "正在获取 rpm 文件[%s]..."
-#: ../urpm.pm:2123
+#: ../urpm.pm:2124
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "无法访问 rpm 文件[%s]"
-#: ../urpm.pm:2128
-#, fuzzy, c-format
+#: ../urpm.pm:2129
+#, c-format
msgid "unable to parse spec file %s [%s]"
-msgstr "无法处理文件[%2$s]中的“%1$s”"
+msgstr "无法处理 spec 文件 %s [%s]"
-#: ../urpm.pm:2138
+#: ../urpm.pm:2139
msgid "unable to register rpm file"
msgstr "无法访问注册 rpm 文件"
-#: ../urpm.pm:2142
+#: ../urpm.pm:2143
msgid "error registering local packages"
msgstr "注册本地软件包出错"
-#: ../urpm.pm:2252
+#: ../urpm.pm:2253
#, c-format
msgid "no package named %s"
msgstr "没有叫做 %s 的软件包"
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm.pm:2254 ../urpme:102
+#: ../urpm.pm:2255 ../urpme:102
#, c-format
msgid "The following packages contain %s: %s"
msgstr "下列软件包里有 %s: %s"
-#: ../urpm.pm:2447 ../urpm.pm:2493 ../urpm.pm:2524
+#: ../urpm.pm:2448 ../urpm.pm:2494 ../urpm.pm:2525
#, c-format
msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr "有多个文件名都为“%s”的 rpm 软件包"
-#: ../urpm.pm:2507
+#: ../urpm.pm:2508
#, c-format
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "无法正确处理[%s]为值“%s”"
-#: ../urpm.pm:2540
+#: ../urpm.pm:2541
#, c-format
msgid ""
"medium \"%s\" uses an invalid list file:\n"
@@ -825,160 +825,160 @@ msgstr ""
"介质“%s”使用了无效的列表文件:\n"
" 介质可能不是最新,正在尝试使用其它方式"
-#: ../urpm.pm:2544
+#: ../urpm.pm:2545
#, c-format
msgid "medium \"%s\" does not define any location for rpm files"
msgstr "介质“%s”没有定义任何 rpm 文件的位置"
-#: ../urpm.pm:2556
+#: ../urpm.pm:2557
#, c-format
msgid "package %s is not found."
msgstr "未找到软件包 %s。"
-#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655
+#: ../urpm.pm:2608 ../urpm.pm:2622 ../urpm.pm:2642 ../urpm.pm:2656
msgid "urpmi database locked"
msgstr "urpmi 数据库已锁定"
-#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738
+#: ../urpm.pm:2708 ../urpm.pm:2713 ../urpm.pm:2739
#, 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:2735
#, 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:2743
#, c-format
msgid "inconsistent medium \"%s\" marked removable but not really"
msgstr "非连贯介质“%s”标为可移动但实际不是"
-#: ../urpm.pm:2754
+#: ../urpm.pm:2755
#, c-format
msgid "unable to access medium \"%s\""
msgstr "无法访问介质“%s”"
-#: ../urpm.pm:2809
-#, fuzzy, c-format
+#: ../urpm.pm:2810
+#, c-format
msgid "malformed URL: [%s]"
-msgstr "输入格式错误: [%s]"
+msgstr "URL 格式错误: [%s]"
-#: ../urpm.pm:2816
+#: ../urpm.pm:2817
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "正在从介质“%s”上获取 rpm 文件..."
-#: ../urpm.pm:2943
+#: ../urpm.pm:2945
#, c-format
msgid "using process %d for executing transaction"
msgstr "使用进程 %d 执行交易"
-#: ../urpm.pm:2975
+#: ../urpm.pm:2977
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "已创建在 %s 上安装的交易(删除=%d,安装=%d,升级=%d)"
-#: ../urpm.pm:2978
+#: ../urpm.pm:2980
msgid "unable to create transaction"
msgstr "无法创建交易"
-#: ../urpm.pm:2986
+#: ../urpm.pm:2988
#, c-format
msgid "removing package %s"
msgstr "无法删除软件包 %s"
-#: ../urpm.pm:2988
+#: ../urpm.pm:2990
#, c-format
msgid "unable to remove package %s"
msgstr "无法删除软件包 %s"
-#: ../urpm.pm:3000
+#: ../urpm.pm:3002
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
-#: ../urpm.pm:3006
+#: ../urpm.pm:3008
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
-#: ../urpm.pm:3009
+#: ../urpm.pm:3011
#, c-format
msgid "unable to install package %s"
msgstr "无法安装软件包 %s"
-#: ../urpm.pm:3058
+#: ../urpm.pm:3061
#, c-format
msgid "More information on package %s"
msgstr "关于软件包 %s 的更多信息"
-#: ../urpm.pm:3230 ../urpm.pm:3268
+#: ../urpm.pm:3233 ../urpm.pm:3271
#, c-format
msgid "due to missing %s"
msgstr "原因是丢失 %s"
-#: ../urpm.pm:3231 ../urpm.pm:3266
+#: ../urpm.pm:3234 ../urpm.pm:3269
#, c-format
msgid "due to unsatisfied %s"
msgstr "原因是不满足 %s"
-#: ../urpm.pm:3237
+#: ../urpm.pm:3240
#, c-format
msgid "trying to promote %s"
msgstr "正在试图推广 %s"
-#: ../urpm.pm:3238
+#: ../urpm.pm:3241
#, c-format
msgid "in order to keep %s"
msgstr "为了保留 %s"
-#: ../urpm.pm:3261
+#: ../urpm.pm:3264
#, c-format
msgid "in order to install %s"
msgstr "为了安装 %s"
-#: ../urpm.pm:3272
+#: ../urpm.pm:3275
#, c-format
msgid "due to conflicts with %s"
msgstr "原因是与 %s 冲突"
-#: ../urpm.pm:3273
+#: ../urpm.pm:3276
msgid "unrequested"
msgstr "未请求"
-#: ../urpm.pm:3291
+#: ../urpm.pm:3295
#, c-format
msgid "Invalid signature (%s)"
msgstr "无效的签名(%s)"
-#: ../urpm.pm:3324
+#: ../urpm.pm:3328
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "无效的密钥 ID(%s)"
-#: ../urpm.pm:3326
+#: ../urpm.pm:3330
#, c-format
msgid "Missing signature (%s)"
msgstr "缺少签名(%s)"
-#: ../urpm.pm:3385
+#: ../urpm.pm:3389
msgid "examining MD5SUM file"
msgstr "正在检查 MD5SUM 文件"
-#: ../urpm.pm:3395
+#: ../urpm.pm:3399
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "警告:%s 的 md5 校验和未在 MD5SUM 文件中找到"
-#: ../urpm.pm:3406
+#: ../urpm.pm:3410
msgid "computing md5sum of existing source hdlist (or synthesis)"
msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
-#: ../urpm.pm:3436
+#: ../urpm.pm:3440
msgid "This operation is forbidden while running in restricted mode"
msgstr "运行于限制模式运行时,禁止执行此操作"
@@ -1111,7 +1111,7 @@ msgid "Preparing install on %s..."
msgstr "正在准备在 %s 上安装..."
#: ../urpme:37
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1121,13 +1121,13 @@ msgid ""
"usage:\n"
msgstr ""
"urpmf 版本 %s\n"
-"版权 (C) 1999-2005 Mandriva。\n"
+"版权 (C) 1999-2006 Mandriva。\n"
"这是自由软件,可以依照 GNU GPL 重新发布。\n"
"\n"
"用法:\n"
#: ../urpme:42 ../urpmf:34 ../urpmi:80 ../urpmi.addmedia:44
-#: ../urpmi.recover:31 ../urpmi.removemedia:54 ../urpmi.update:31 ../urpmq:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:31 ../urpmq:44
msgid " --help - print this help message.\n"
msgstr " --help - 打印帮助信息。\n"
@@ -1149,26 +1149,23 @@ msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - 在多个机器上分布的运行 urpmi。\n"
#: ../urpme:47 ../urpmi:134
-#, fuzzy
msgid " --repackage - Re-package the files before erasing\n"
-msgstr " --packager - 打包者\n"
+msgstr " --repackage - 在删除之前重新对文件打包\n"
#: ../urpme:48
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - 使用另一个 root 删除 rpm。\n"
#: ../urpme:49
-#, fuzzy
msgid " --noscripts - do not execute package scriptlet(s).\n"
msgstr " --noscripts - 不执行软件包脚本。\n"
#: ../urpme:50
-#, fuzzy
msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - 从发行版树中实时配置 urpmi,特别用于在 --root 选项\n"
+" --use-distrib - 从发行版树中实时配置 urpme,特别用于在 --root 选项\n"
" 下安装/卸载 chroot。\n"
#: ../urpme:52 ../urpmi:145 ../urpmi.addmedia:70 ../urpmi.removemedia:59
@@ -1219,9 +1216,9 @@ msgid " (y/N) "
msgstr "(是(y)/否(N))[否]"
#: ../urpme:125
-#, fuzzy, c-format
+#, c-format
msgid "Remove %d packages?"
-msgstr "无法删除软件包 %s"
+msgstr "删除 %d 个软件包吗?"
#. - Warning : the following message is parsed in urpm::parallel_*
#: ../urpme:149
@@ -1229,7 +1226,7 @@ msgid "Removal failed"
msgstr "删除失败"
#: ../urpmf:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
@@ -1239,7 +1236,7 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf 版本 %s\n"
-"版权 (C) 2002-2005 Mandriva。\n"
+"版权 (C) 2002-2006 Mandriva。\n"
"这是自由软件,可以依照 GNU GPL 重新发布。\n"
"\n"
"用法:\n"
@@ -1447,7 +1444,7 @@ msgid "You may want to use --name to search for package names.\n"
msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
#: ../urpmi:75
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1457,16 +1454,15 @@ msgid ""
"usage:\n"
msgstr ""
"urpmi 版本 %s\n"
-"版权 (C) 1999-2005 Mandriva。\n"
+"版权 (C) 1999-2006 Mandriva。\n"
"这是自由软件,可以依照 GNU GPL 重新发布。\n"
"\n"
"用法:\n"
#: ../urpmi:84
-#, fuzzy
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
+msgstr " --searchmedia - 只使用给定介质来搜索所请求的软件包。\n"
#: ../urpmi:87
msgid ""
@@ -1512,14 +1508,12 @@ msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - 小交易长度,默认为 %d。\n"
#: ../urpmi:97
-#, fuzzy
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " --fuzzy - 利用模糊查询(和 -y 一样)。\n"
+msgstr " --fuzzy, -y - 利用模糊查询。\n"
#: ../urpmi:98
-#, fuzzy
msgid " --src, -s - next package is a source package.\n"
-msgstr " --src - 下一个软件包是源程序包(和 -s 一样)。\n"
+msgstr " --src, -s - 下一个软件包是源程序包。\n"
#: ../urpmi:99
msgid " --install-src - install only source package (no binaries).\n"
@@ -1614,16 +1608,14 @@ msgstr ""
" 下一个参数指定输出目录。\n"
#: ../urpmi:126
-#, fuzzy
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-" --verify-rpm - 安装之前验证 rpm 签署。\n"
+" --verify-rpm - 安装之前验证 rpm 签署\n"
" (--no-verify-rpm 禁止它,默认是激活的)。\n"
#: ../urpmi:128
-#, fuzzy
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
@@ -1642,9 +1634,8 @@ msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - 安装前不检查磁盘空间。\n"
#: ../urpmi:132
-#, fuzzy
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --arch - 体系\n"
+msgstr " --ignorearch - 允许安装体系不匹配的 RPM。\n"
#: ../urpmi:133
msgid " --noscripts - do not execute package scriptlet(s)\n"
@@ -1666,9 +1657,8 @@ msgid " --norebuild - don't try to rebuild hdlist if not readable.\n"
msgstr " --norebuild - 如果 hdlist 不可读的话,不尝试重新创建。\n"
#: ../urpmi:139
-#, fuzzy
msgid " --nolock - don't lock rpm db.\n"
-msgstr " --noclean - 不从缓存中清除 rpm。\n"
+msgstr " --nolock - 不锁定 rpm 数据库。\n"
#: ../urpmi:140
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
@@ -1696,9 +1686,8 @@ msgid " names or rpm files given on command line will be installed.\n"
msgstr " 命令行给出的软件包名或 rpm 文件将会被安装。\n"
#: ../urpmi:197
-#, fuzzy
msgid "You can't install binary rpm files when using --install-src"
-msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
+msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
#: ../urpmi:220
#, c-format
@@ -1732,8 +1721,8 @@ msgstr ""
#. - For translators : there are several media here
#: ../urpmi:332
-msgid "Updating media..."
-msgstr "正在更新介质..."
+msgid "Updating media...\n"
+msgstr "正在更新介质...\n"
#: ../urpmi:417
#, c-format
@@ -2004,8 +1993,8 @@ msgstr "“with”找不到网络介质\n"
msgid "unable to create medium \"%s\"\n"
msgstr "无法创建介质“%s”\n"
-#: ../urpmi.recover:26
-#, fuzzy, c-format
+#: ../urpmi.recover:28
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2014,103 +2003,112 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 1999-2005 Mandriva。\n"
+"urpmi.recover 版本 %s\n"
+"版权 (C) 2006 Mandriva。\n"
"这是自由软件,可以依照 GNU GPL 重新发布。\n"
"\n"
"用法:\n"
-#: ../urpmi.recover:32
+#: ../urpmi.recover:34
msgid " --checkpoint - set repackaging start now\n"
-msgstr ""
+msgstr " --checkpoint - 设定重新打包立即开始\n"
-#: ../urpmi.recover:33
-#, fuzzy
+#: ../urpmi.recover:35
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - 不从缓存中清除 rpm。\n"
+msgstr " --noclean - 不在检查点上清除重新打包目录\n"
-#: ../urpmi.recover:34
+#: ../urpmi.recover:36
msgid ""
" --list - list transactions since provided date/duration argument\n"
-msgstr ""
+msgstr " --list - 列出自所提供日期/时长参数之后的交易\n"
-#: ../urpmi.recover:35
-#, fuzzy
+#: ../urpmi.recover:37
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-url - 列出可用的介质及其 URL。\n"
+msgstr " --list-all - 列出 rpmdb 中的全部交易(较长)\n"
-#: ../urpmi.recover:36
+#: ../urpmi.recover:38
msgid ""
" --rollback - rollback until specified date,\n"
" or rollback the specified number of transactions\n"
msgstr ""
+" --rollback - 回滚到指定的日期或回滚指定数量的交易\n"
-#: ../urpmi.recover:52
+#: ../urpmi.recover:40
+msgid " --disable - turn off repackaging\n"
+msgstr " --disable - 关闭软件包重新打包\n"
+
+#: ../urpmi.recover:55
#, c-format
msgid "Invalid date or duration [%s]\n"
-msgstr ""
+msgstr "无效的日期或时长 [%s]\n"
+
+#: ../urpmi.recover:63
+msgid "Repackage directory not defined\n"
+msgstr "重新打包目录未定义\n"
+
+#: ../urpmi.recover:66
+#, c-format
+msgid "Can't write to repackage directory [%s]\n"
+msgstr "无法写入重新打包目录 [%s]\n"
-#: ../urpmi.recover:62
+#: ../urpmi.recover:68
+#, c-format
+msgid "Cleaning up repackage directory [%s]...\n"
+msgstr "正在清理重新打包目录 [%s]...\n"
+
+#: ../urpmi.recover:70
+#, c-format
+msgid "%d files removed\n"
+msgstr "删除了 %d 个文件\n"
+
+#: ../urpmi.recover:80
#, c-format
msgid "Spurious command-line arguments [%s]\n"
msgstr ""
-#: ../urpmi.recover:64
+#: ../urpmi.recover:82
msgid "You can't specify --checkpoint and --rollback at the same time\n"
msgstr ""
-#: ../urpmi.recover:66
+#: ../urpmi.recover:84
msgid "You can't specify --checkpoint and --list at the same time\n"
msgstr ""
-#: ../urpmi.recover:68
+#: ../urpmi.recover:86
msgid "You can't specify --rollback and --list at the same time\n"
msgstr ""
-#: ../urpmi.recover:90
+#: ../urpmi.recover:88
+msgid "You can't specify --disable along with another option"
+msgstr ""
+
+#: ../urpmi.recover:110
#, c-format
msgid "No transaction found since %s\n"
msgstr ""
#. - check we're running as root
-#: ../urpmi.recover:105
+#: ../urpmi.recover:125
msgid "You must be superuser to do this"
msgstr ""
-#: ../urpmi.recover:114
-#, fuzzy
-msgid "Repackage directory not defined\n"
-msgstr "未找到软件包 %s。"
-
-#: ../urpmi.recover:117
-#, c-format
-msgid "Can't write to repackage directory [%s]\n"
-msgstr ""
-
-#: ../urpmi.recover:122
-#, c-format
-msgid "Cleaning up repackage directory [%s]...\n"
-msgstr ""
-
-#: ../urpmi.recover:124
-#, c-format
-msgid "%d files removed\n"
-msgstr ""
-
#. - write rpm config file
-#: ../urpmi.recover:128
-#, fuzzy, c-format
+#: ../urpmi.recover:138 ../urpmi.recover:204
+#, c-format
msgid "Writing rpm macros file [%s]...\n"
-msgstr "正在获取 rpm 文件[%s]..."
+msgstr "正在写入 rpm 宏文件[%s]...\n"
-#: ../urpmi.recover:170
-#, fuzzy
+#: ../urpmi.recover:180
msgid "No rollback date found\n"
-msgstr "没有找到文件列表\n"
+msgstr "未找到回滚日期\n"
-#: ../urpmi.recover:173
+#: ../urpmi.recover:183
#, c-format
msgid "Rollback until %s...\n"
+msgstr "回滚至 %s...\n"
+
+#: ../urpmi.recover:190
+msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:52
@@ -2216,7 +2214,7 @@ msgid "ignoring media %s"
msgstr "忽略介质 %s"
#: ../urpmq:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2226,7 +2224,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmq 版本 %s\n"
-"版权 (C) 2000-2005 Mandriva。\n"
+"版权 (C) 2000-2006 Mandriva。\n"
"这是自由软件,可以依照 GNU GPL 重新发布。\n"
"\n"
"用法:\n"
@@ -2375,24 +2373,3 @@ msgstr "没有找到文件列表\n"
msgid "No changelog found\n"
msgstr "没有找到更新日志\n"
-#~ msgid "Search"
-#~ msgstr "搜索"
-
-#~ msgid "Is this OK?"
-#~ msgstr "这样好了吗?"
-
-#~ msgid ""
-#~ " --version - use specified distribution version, the default is "
-#~ "taken\n"
-#~ " from the version of the distribution told by the\n"
-#~ " installed mandriva-release package.\n"
-#~ msgstr ""
-#~ " --version - 使用指定发行版本,默认值根据所安装的 mandriva-release\n"
-#~ " 软件包确定。\n"
-
-#~ msgid ""
-#~ " --arch - use specified architecture, the default is arch of\n"
-#~ " mandriva-release package installed.\n"
-#~ msgstr ""
-#~ " --arch - 使用指定的架构,默认值根据所安装的 mandriva-release\n"
-#~ " 软件包确定。\n"