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.po723
1 files changed, 347 insertions, 376 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 59791082..ec93c836 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 15:12+0100\n"
+"POT-Creation-Date: 2009-03-30 16:09+0200\n"
"PO-Revision-Date: 2008-03-30 14:22+0800\n"
"Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -33,7 +33,7 @@ msgstr "RPM 安装"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "错误: 找不到文件 %s,将取消操作"
-#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
+#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
#, c-format
msgid "_Ok"
msgstr "确定(_O)"
@@ -99,7 +99,7 @@ msgstr "安装(_I)"
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:101 ../gurpmi2:186
+#: ../gurpmi:101 ../gurpmi2:187
#, c-format
msgid "_Cancel"
msgstr "取消(_C)"
@@ -131,7 +131,7 @@ msgid "Options:"
msgstr "选项:"
#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - 打印帮助信息。\n"
@@ -243,37 +243,37 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:146 ../urpmi:612
+#: ../gurpmi2:146 ../urpmi:626
#, c-format
msgid "Ok"
msgstr "确定"
-#: ../gurpmi2:182
+#: ../gurpmi2:183
#, c-format
msgid " (to upgrade)"
msgstr "(升级)"
-#: ../gurpmi2:183
+#: ../gurpmi2:184
#, c-format
msgid " (to install)"
msgstr "(安装)"
-#: ../gurpmi2:186
+#: ../gurpmi2:187
#, c-format
msgid "Package choice"
msgstr "软件包选择"
-#: ../gurpmi2:187
+#: ../gurpmi2:188
#, c-format
msgid "One of the following packages is needed:"
msgstr "需要下列软件包之一:"
-#: ../gurpmi2:211
+#: ../gurpmi2:213
#, c-format
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:234
+#: ../gurpmi2:248
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -284,62 +284,62 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:253 ../urpmi:579
+#: ../gurpmi2:267 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:254 ../urpmi:580
+#: ../gurpmi2:268 ../urpmi:594
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:256
+#: ../gurpmi2:270
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 个软件包,%d MB)"
-#: ../gurpmi2:264 ../urpm/main_loop.pm:49
+#: ../gurpmi2:278 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "无法读取源软件包,中止"
-#: ../gurpmi2:296 ../urpm/install.pm:80
+#: ../gurpmi2:310 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "正在准备..."
-#: ../gurpmi2:302
+#: ../gurpmi2:316
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安装软件包“%s”(%s/%s)..."
-#: ../gurpmi2:319 ../urpmi:607
+#: ../gurpmi2:333 ../urpmi:621
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "请插入介质“%s”"
-#: ../gurpmi2:333
+#: ../gurpmi2:347
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
-#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
-#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
+#: ../gurpmi2:359 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
+#: ../urpm/media.pm:1422
#, c-format
msgid "...retrieving failed: %s"
msgstr "...获取失败: %s"
-#: ../gurpmi2:361
+#: ../gurpmi2:375
#, c-format
msgid "_Done"
msgstr "完成(_D)"
-#: ../gurpmi2:369 ../urpm/main_loop.pm:120
+#: ../gurpmi2:391
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -350,27 +350,27 @@ msgstr ""
"%s\n"
"您可能需要更新您的 urpmi 数据库"
-#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
+#: ../gurpmi2:397 ../urpm/main_loop.pm:250 ../urpm/main_loop.pm:290
#, c-format
msgid "Installation failed:"
msgstr "安装失败: "
-#: ../gurpmi2:380
+#: ../gurpmi2:402
#, c-format
msgid "The package(s) are already installed"
msgstr "软件包已经安装"
-#: ../gurpmi2:382
+#: ../gurpmi2:404
#, c-format
msgid "Installation finished"
msgstr "安装完成"
-#: ../gurpmi2:383 ../urpme:169
+#: ../gurpmi2:405 ../urpme:169
#, c-format
msgid "removing %s"
msgstr "正在删除 %s"
-#: ../gurpmi2:391 ../urpmi:674
+#: ../gurpmi2:413 ../urpmi:688
#, c-format
msgid "restarting urpmi"
msgstr "重新启动 urpmi"
@@ -459,7 +459,7 @@ msgstr "无效的 rpm 文件名[%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "正在获取 rpm 文件[%s]..."
-#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:234
#, c-format
msgid "...retrieving done"
msgstr "...获取完成"
@@ -489,7 +489,7 @@ msgstr "RPM 的架构不兼容[%s]"
msgid "error registering local packages"
msgstr "注册本地软件包出错"
-#: ../urpm.pm:438
+#: ../urpm.pm:439
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "运行于限制模式运行时,禁止执行此操作"
@@ -504,74 +504,74 @@ msgstr "命令行声明的代理服务器无效\n"
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:371
#, c-format
msgid "unexpected expression %s"
msgstr "意外表达式 %s"
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:372
#, c-format
msgid "missing expression before %s"
msgstr "%s 前缺少表达式"
-#: ../urpm/args.pm:390
+#: ../urpm/args.pm:378
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "意外表达式 %s(建议:使用 -a 或 -o?)"
-#: ../urpm/args.pm:394
+#: ../urpm/args.pm:382
#, c-format
msgid "no expression to close"
msgstr "没有要关闭的表达式"
-#: ../urpm/args.pm:403
+#: ../urpm/args.pm:391
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "默认情况下,urpmf 使用正则表达式。您应该使用选项“--literal”"
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:460
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 目录不存在"
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:483
#, c-format
msgid "Can't use %s without %s"
msgstr "没有 %2$s 无法使用 %1$s"
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
+#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "无法和 %2$s 一起使用 %1$s"
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:497
#, c-format
msgid "Too many arguments\n"
msgstr "参数太多\n"
-#: ../urpm/bug_report.pm:54 ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "复制失败"
-#: ../urpm/cdrom.pm:66
+#: ../urpm/cdrom.pm:67
#, c-format
msgid ""
"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
"automatically)"
msgstr "您必须自行挂载 CD-ROM(或者安装 perl-Hal-Cdroms 以便让其自动挂载)"
-#: ../urpm/cdrom.pm:68
+#: ../urpm/cdrom.pm:69
#, c-format
msgid "HAL daemon (hald) is not running or not ready"
msgstr "HAL 守护程序(hald)未运行或未就绪"
-#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:162 ../urpm/cdrom.pm:167
#, c-format
msgid "medium \"%s\" is not available"
msgstr "介质“%s”不可用"
-#: ../urpm/cdrom.pm:205
+#: ../urpm/cdrom.pm:206
#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
@@ -591,7 +591,7 @@ msgstr "无法读取配置文件[%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "介质“%s”定义了两次,正在退出"
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:477
#, c-format
msgid "unable to write config file [%s]"
msgstr "无法写入配置文件[%s]"
@@ -721,93 +721,93 @@ msgstr "未找到 webfetch,支持的 webfetch 是: %s\n"
msgid "unable to handle protocol: %s"
msgstr "无法处理协议: %s"
-#: ../urpm/get_pkgs.pm:15
+#: ../urpm/get_pkgs.pm:16
#, c-format
msgid "cleaning %s and %s"
msgstr "清除 %s 和 %s"
-#: ../urpm/get_pkgs.pm:127
+#: ../urpm/get_pkgs.pm:128
#, c-format
msgid "package %s is not found."
msgstr "未找到软件包 %s。"
-#: ../urpm/get_pkgs.pm:213
+#: ../urpm/get_pkgs.pm:227
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "正在从介质“%s”上获取 rpm 文件..."
-#: ../urpm/install.pm:86
+#: ../urpm/install.pm:87
#, c-format
msgid "[repackaging]"
msgstr "[重新打包]"
-#: ../urpm/install.pm:167
+#: ../urpm/install.pm:168
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "已创建在 %s 上安装的交易(删除=%d,安装=%d,升级=%d)"
-#: ../urpm/install.pm:170
+#: ../urpm/install.pm:171
#, c-format
msgid "unable to create transaction"
msgstr "无法创建交易"
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:196
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
-#: ../urpm/install.pm:206
+#: ../urpm/install.pm:209
#, c-format
msgid "unable to install package %s"
msgstr "无法安装软件包 %s"
-#: ../urpm/install.pm:209
+#: ../urpm/install.pm:212
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
-#: ../urpm/install.pm:210 ../urpm/install.pm:267
+#: ../urpm/install.pm:213 ../urpm/install.pm:277
#, c-format
msgid "removing %s failed: %s"
msgstr "删除 %s 失败: %s"
-#: ../urpm/install.pm:248
+#: ../urpm/install.pm:258
#, c-format
msgid "Removing package %s"
msgstr "删除软件包 %s"
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:259
#, c-format
msgid "removing package %s"
msgstr "删除软件包 %s"
-#: ../urpm/install.pm:265
+#: ../urpm/install.pm:275
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:283
#, c-format
msgid "More information on package %s"
msgstr "关于软件包 %s 的更多信息"
-#: ../urpm/ldap.pm:71
+#: ../urpm/ldap.pm:70
#, c-format
msgid "Cannot create ldap cache directory"
msgstr "无法创建 ldap 缓存目录"
-#: ../urpm/ldap.pm:73
+#: ../urpm/ldap.pm:72
#, c-format
msgid "Cannot write cache file for ldap\n"
msgstr "无法写入 ldap 的缓存文件\n"
-#: ../urpm/ldap.pm:162
+#: ../urpm/ldap.pm:161
#, c-format
msgid "No server defined, missing uri or host"
msgstr "未定义服务器,缺少 uri 或 主机"
-#: ../urpm/ldap.pm:163
+#: ../urpm/ldap.pm:162
#, c-format
msgid "No base defined"
msgstr "未定义基础"
@@ -817,17 +817,17 @@ msgstr "未定义基础"
msgid "Cannot connect to ldap uri:"
msgstr "无法连接到 ldap uri:"
-#: ../urpm/lock.pm:62
+#: ../urpm/lock.pm:63
#, c-format
msgid "%s database is locked. Waiting..."
msgstr "%s 数据库已锁定。等候中..."
-#: ../urpm/lock.pm:63
+#: ../urpm/lock.pm:64
#, c-format
msgid "aborting"
msgstr "中止"
-#: ../urpm/lock.pm:65
+#: ../urpm/lock.pm:66
#, c-format
msgid "%s database is locked (another program is already using it)"
msgstr "%s 数据库已锁定(其它程序正在使用它)"
@@ -837,18 +837,24 @@ msgstr "%s 数据库已锁定(其它程序正在使用它)"
msgid "Retry?"
msgstr ""
-#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
-#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
-#, c-format
-msgid "Installation failed"
-msgstr "安装失败"
+#: ../urpm/main_loop.pm:119
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s"
+msgstr ""
+"安装失败,rpm 有问题:\n"
+"%s"
-#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#: ../urpm/main_loop.pm:121
#, fuzzy, c-format
-msgid "Try to go on anyway?"
-msgstr "仍然继续吗? (y/N)"
+msgid "You may want to update your urpmi database."
+msgstr ""
+"安装失败,缺少下列文件:\n"
+"%s\n"
+"您可能需要更新您的 urpmi 数据库"
-#: ../urpm/main_loop.pm:130
+#: ../urpm/main_loop.pm:124
#, c-format
msgid ""
"Installation failed, bad rpms:\n"
@@ -857,107 +863,118 @@ msgstr ""
"安装失败,rpm 有问题:\n"
"%s"
-#: ../urpm/main_loop.pm:148
+#: ../urpm/main_loop.pm:132 ../urpm/main_loop.pm:171 ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:259
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
+msgstr "仍然继续吗? (y/N)"
+
+#: ../urpm/main_loop.pm:156
#, c-format
msgid "The following package has bad signature"
msgstr "下列软件包的签名有错误"
-#: ../urpm/main_loop.pm:149
+#: ../urpm/main_loop.pm:157
#, c-format
msgid "The following packages have bad signatures"
msgstr "下列软件包的签名有错误"
-#: ../urpm/main_loop.pm:150
+#: ../urpm/main_loop.pm:158
#, c-format
msgid "Do you want to continue installation ?"
msgstr "您想继续安装吗?"
-#: ../urpm/main_loop.pm:167
+#: ../urpm/main_loop.pm:175
#, c-format
msgid "removing installed rpms (%s)"
msgstr "删除已安装的 rpm(%s)"
-#: ../urpm/main_loop.pm:187
+#: ../urpm/main_loop.pm:195
#, c-format
msgid "distributing %s"
msgstr "正在分发 %s"
-#: ../urpm/main_loop.pm:202
+#: ../urpm/main_loop.pm:210
#, c-format
msgid "installing %s from %s"
msgstr "正在从 %2$s 安装 %1$s"
-#: ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:212
#, c-format
msgid "installing %s"
msgstr "正在安装 %s"
-#: ../urpm/main_loop.pm:242
+#: ../urpm/main_loop.pm:253
#, fuzzy, c-format
msgid "Try installation without checking dependencies?"
msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:260
#, fuzzy, c-format
msgid "Try harder to install (--force)?"
msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:300
#, c-format
msgid "Packages are up to date"
msgstr "软件包已为最新"
-#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:311 ../urpm/parallel.pm:299
#, c-format
msgid "Installation is possible"
msgstr "可以安装"
-#: ../urpm/md5sum.pm:26
+#: ../urpm/md5sum.pm:27
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "警告: %s 的 md5 校验和未在 MD5SUM 文件中找到"
-#: ../urpm/media.pm:204
+#: ../urpm/media.pm:194
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "虚拟介质“%s”应该有清楚的 URL,介质被忽略"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:196
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "无法访问“%s”的列表文件,介质被忽略"
-#: ../urpm/media.pm:213
+#: ../urpm/media.pm:199
#, c-format
msgid "unable to access synthesis file of \"%s\", medium ignored"
msgstr "无法访问“%s”的综合文件,介质被忽略"
-#: ../urpm/media.pm:240
+#: ../urpm/media.pm:225
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "试图覆盖已有介质“%s”,正跳过"
-#: ../urpm/media.pm:456
+#: ../urpm/media.pm:441
#, c-format
msgid "failed to migrate removable device, ignoring media"
msgstr "迁移可移动设备失败,忽略介质"
-#: ../urpm/media.pm:499 ../urpm/media.pm:505
+#: ../urpm/media.pm:479
#, c-format
msgid "wrote config file [%s]"
msgstr "写入配置文件[%s]"
-#: ../urpm/media.pm:548
+#: ../urpm/media.pm:521
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "无法与发行模式一起使用并行模式"
-#: ../urpm/media.pm:556
+#: ../urpm/media.pm:529
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "并行模式时使用关联介质: %s"
-#: ../urpm/media.pm:572
+#: ../urpm/media.pm:545
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -966,217 +983,212 @@ msgstr ""
"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
"distrib 或 --parallel 一起使用"
-#: ../urpm/media.pm:666
-#, c-format
-msgid "Search start: %s end: %s"
-msgstr "搜索开始: %s 结束: %s"
-
-#: ../urpm/media.pm:683
+#: ../urpm/media.pm:663
#, c-format
msgid "skipping package %s"
msgstr "跳过软件包 %s"
-#: ../urpm/media.pm:699
+#: ../urpm/media.pm:679
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "将安装而非升级软件包 %s"
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:704
#, c-format
msgid "medium \"%s\" already exists"
msgstr "介质“%s”已存在"
-#: ../urpm/media.pm:763
+#: ../urpm/media.pm:743
#, c-format
msgid "(ignored by default)"
msgstr "(默认忽略)"
-#: ../urpm/media.pm:769
+#: ../urpm/media.pm:749
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
-#: ../urpm/media.pm:775
+#: ../urpm/media.pm:755
#, c-format
msgid "adding medium \"%s\""
msgstr "添加介质“%s”"
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:784
#, c-format
msgid "directory %s does not exist"
msgstr "目录 %s 不存在"
-#: ../urpm/media.pm:812
+#: ../urpm/media.pm:792
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "此位置似乎不包含任何发行版"
-#: ../urpm/media.pm:828
+#: ../urpm/media.pm:808
#, c-format
msgid "unable to parse media.cfg"
msgstr "无法分析 media.cfg"
-#: ../urpm/media.pm:831
+#: ../urpm/media.pm:811
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:829
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr "跳过不兼容的介质“%s”(原因是 %s)"
-#: ../urpm/media.pm:900
+#: ../urpm/media.pm:880
#, c-format
msgid "retrieving media.cfg file..."
msgstr "正在获取 media.cfg 文件..."
-#: ../urpm/media.pm:941
+#: ../urpm/media.pm:921
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "试图选择不存在的介质“%s”"
-#: ../urpm/media.pm:944
+#: ../urpm/media.pm:924
#, c-format
msgid "selecting multiple media: %s"
msgstr "选择多个介质: %s"
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:944
#, c-format
msgid "removing medium \"%s\""
msgstr "删除介质“%s”"
-#: ../urpm/media.pm:1047
+#: ../urpm/media.pm:1027
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "正在从介质“%s”重新配置 urpmi"
-#: ../urpm/media.pm:1081
+#: ../urpm/media.pm:1061
#, c-format
msgid "...reconfiguration failed"
msgstr "...重新配置失败"
-#: ../urpm/media.pm:1087
+#: ../urpm/media.pm:1067
#, c-format
msgid "reconfiguration done"
msgstr "重新配置完成"
-#: ../urpm/media.pm:1103
+#: ../urpm/media.pm:1083
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "生成命名文件出错:依赖关系 %d 未找到"
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1104
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "介质“%s”已为最新"
-#: ../urpm/media.pm:1135
+#: ../urpm/media.pm:1115
#, c-format
msgid "examining synthesis file [%s]"
msgstr "正在检查综合文件 [%s]"
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1135
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "读取介质“%s”的综合文件出现问题"
-#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1148 ../urpm/media.pm:1243
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "正在复制介质“%2$s”的 [%1$s]..."
-#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
+#: ../urpm/media.pm:1150 ../urpm/media.pm:1220 ../urpm/media.pm:1473
#, c-format
msgid "...copying failed"
msgstr "...复制失败"
-#: ../urpm/media.pm:1236
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "正在复制“%s”的描述文件..."
-#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1247
#, c-format
msgid "...copying done"
msgstr "...复制完成"
-#: ../urpm/media.pm:1269
+#: ../urpm/media.pm:1249
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "复制 [%s] 失败(文件太小了)"
-#: ../urpm/media.pm:1317
+#: ../urpm/media.pm:1297
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "正在计算所获取的源综合文件的 md5sum"
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
+#: ../urpm/media.pm:1299 ../urpm/media.pm:1736
#, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "获取[%s]失败(md5sum 不匹配)"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1314
#, c-format
msgid "genhdlist2 failed on %s"
msgstr "在 %s 上 genhdlist2 失败"
-#: ../urpm/media.pm:1344
+#: ../urpm/media.pm:1324
#, c-format
msgid "comparing %s and %s"
msgstr "比较 %s 和 %s"
-#: ../urpm/media.pm:1374
+#: ../urpm/media.pm:1354
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
-#: ../urpm/media.pm:1400
+#: ../urpm/media.pm:1380
#, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "正在复制“%s”的 MD5SUM..."
-#: ../urpm/media.pm:1440
+#: ../urpm/media.pm:1420
#, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "无效的 MD5SUM 文件(从 %s 下载)"
-#: ../urpm/media.pm:1443
+#: ../urpm/media.pm:1423
#, c-format
msgid "no metadata found for medium \"%s\""
msgstr "介质“%s”未发现元数据"
-#: ../urpm/media.pm:1475
+#: ../urpm/media.pm:1455
#, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "正在获取“%s”的源综合文件..."
-#: ../urpm/media.pm:1541
+#: ../urpm/media.pm:1521
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "正在检查“%s”的公共密钥文件..."
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1533
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
-#: ../urpm/media.pm:1557
+#: ../urpm/media.pm:1537
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "无法导入“%s”的公共密钥文件"
-#: ../urpm/media.pm:1598
+#: ../urpm/media.pm:1578
#, c-format
msgid "no synthesis file found for medium \"%s\""
msgstr "介质“%s”未发现综合文件"
-#: ../urpm/media.pm:1631
+#: ../urpm/media.pm:1611
#, c-format
msgid "updated medium \"%s\""
msgstr "已更新介质“%s”"
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1730
#, c-format
msgid "retrieval of [%s] failed"
msgstr "获取[%s]失败"
@@ -1201,19 +1213,19 @@ msgstr "找到地理位置较近的 %s %.2f %.2f,从时区 %s"
msgid "getting mirror list from %s"
msgstr "从 %s 中获得镜像列表"
-#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
+#: ../urpm/msg.pm:76 ../urpmi:494 ../urpmi:509 ../urpmi:613
#, c-format
msgid "Nn"
msgstr "nN否"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
-#: ../urpmi.addmedia:141
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:545 ../urpmi:649 ../urpmi:655
+#: ../urpmi.addmedia:132
#, c-format
msgid "Yy"
msgstr "yY是"
-#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:135
#, c-format
msgid " (y/N) "
msgstr "(是(y)/否(N))[否]"
@@ -1283,42 +1295,47 @@ msgstr "GB"
msgid "TB"
msgstr "TB"
-#: ../urpm/orphans.pm:311
+#: ../urpm/orphans.pm:51
#, c-format
+msgid "Marking %s as manually installed, it won't be auto-orphaned"
+msgstr ""
+
+#: ../urpm/orphans.pm:362
+#, fuzzy, c-format
msgid ""
-"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
-"it."
+"The following package is now orphan, if you wish to remove it, you can use "
+"\"urpme --auto-orphans\"."
msgid_plural ""
-"The following packages are now orphans, use \"urpme --auto-orphans\" to "
-"remove them."
+"The following packages are now orphans, if you wish to remove them, you can "
+"use \"urpme --auto-orphans\"."
msgstr[0] "下列软件包现在是孤立的了,请使用“urpme --auto-orphans”删除它们。"
-#: ../urpm/parallel.pm:14
+#: ../urpm/parallel.pm:15
#, c-format
msgid "unable to parse \"%s\" in file [%s]"
msgstr "无法处理文件[%2$s]中的“%1$s”"
-#: ../urpm/parallel.pm:23
+#: ../urpm/parallel.pm:24
#, c-format
msgid "examining parallel handler in file [%s]"
msgstr "正在检查文件[%s]中的并行处理"
-#: ../urpm/parallel.pm:34
+#: ../urpm/parallel.pm:35
#, c-format
msgid "found parallel handler for nodes: %s"
msgstr "找到结点的并行处理: %s"
-#: ../urpm/parallel.pm:38
+#: ../urpm/parallel.pm:39
#, c-format
msgid "unable to use parallel option \"%s\""
msgstr "无法使用并行选项“%s”"
-#: ../urpm/parallel.pm:93
+#: ../urpm/parallel.pm:94
#, c-format
msgid "on node %s"
msgstr "于节点 %s"
-#: ../urpm/parallel.pm:293
+#: ../urpm/parallel.pm:294
#, c-format
msgid "Installation failed on node %s"
msgstr "节点 %s 安装失败"
@@ -1350,88 +1367,88 @@ msgid ""
"code: %d)"
msgstr "主机 %2$s %1$s 失败(可能 urpmi 版本不对?)(退出码: %3$d)"
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:33
#, c-format
msgid "unable to access medium \"%s\"."
msgstr "无法访问介质“%s”。"
-#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
#, c-format
msgid "mounting %s"
msgstr "正在装载 %s"
-#: ../urpm/removable.pm:103
+#: ../urpm/removable.pm:104
#, c-format
msgid "unmounting %s"
msgstr "正在拆卸 %s"
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:31
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr "urpmi 已经重新启动,而优先的软件包列表未更新"
-#: ../urpm/select.pm:32
+#: ../urpm/select.pm:33
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr "urpmi 已经重新启动,优先的软件包列表进行了如下更改:%s vs %s"
-#: ../urpm/select.pm:170
+#: ../urpm/select.pm:176
#, c-format
msgid "No package named %s"
msgstr "没有叫做 %s 的软件包"
-#: ../urpm/select.pm:172 ../urpme:117
+#: ../urpm/select.pm:178 ../urpme:117
#, c-format
msgid "The following packages contain %s: %s"
msgstr "下列软件包里有 %s: %s"
-#: ../urpm/select.pm:174
+#: ../urpm/select.pm:180
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "您应该使用“-a”来全部使用"
-#: ../urpm/select.pm:294
+#: ../urpm/select.pm:298
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "在 urpmi 数据库中找到软件包 %s,但全部都未安装"
-#: ../urpm/select.pm:537
+#: ../urpm/select.pm:545
#, c-format
msgid "Package %s is already installed"
msgstr "软件包 %s 已经安装"
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:546
#, c-format
msgid "Packages %s are already installed"
msgstr "软件包 %s 已经安装"
-#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#: ../urpm/select.pm:564 ../urpm/select.pm:648
#, c-format
msgid "due to missing %s"
msgstr "原因是丢失 %s"
-#: ../urpm/select.pm:557
+#: ../urpm/select.pm:565
#, c-format
msgid "due to already installed %s"
msgstr "原因是已经安装 %s"
-#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#: ../urpm/select.pm:566 ../urpm/select.pm:646
#, c-format
msgid "due to unsatisfied %s"
msgstr "原因是不满足 %s"
-#: ../urpm/select.pm:564
+#: ../urpm/select.pm:572
#, c-format
msgid "trying to promote %s"
msgstr "正在试图推广 %s"
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:573
#, c-format
msgid "in order to keep %s"
msgstr "为了保留 %s"
-#: ../urpm/select.pm:606
+#: ../urpm/select.pm:614
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1440,7 +1457,7 @@ msgstr ""
"要升级其它软件包,需要先删除下列软件包:\n"
"%s"
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:615
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1449,27 +1466,27 @@ msgstr ""
"要升级其它软件包,需要先删除下列软件包:\n"
"%s"
-#: ../urpm/select.pm:634
+#: ../urpm/select.pm:642
#, c-format
msgid "in order to install %s"
msgstr "为了安装 %s"
-#: ../urpm/select.pm:644
+#: ../urpm/select.pm:652
#, c-format
msgid "due to conflicts with %s"
msgstr "原因是与 %s 冲突"
-#: ../urpm/signature.pm:32
+#: ../urpm/signature.pm:33
#, c-format
msgid "Invalid signature (%s)"
msgstr "无效的签名(%s)"
-#: ../urpm/signature.pm:63
+#: ../urpm/signature.pm:64
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "无效的密钥 ID(%s)"
-#: ../urpm/signature.pm:65
+#: ../urpm/signature.pm:66
#, c-format
msgid "Missing signature (%s)"
msgstr "缺少签名(%s)"
@@ -1546,7 +1563,7 @@ msgid " --root - use another root for rpm removal.\n"
msgstr " --root - 使用另一个 root 删除 rpm。\n"
#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
@@ -2260,42 +2277,42 @@ msgstr ""
"请使用 --allow-force 强制操作。"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:423
+#: ../urpmi:428
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (即将升级)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:425
+#: ../urpmi:430
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (即将升级)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:429
+#: ../urpmi:434
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (即将安装)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:431
+#: ../urpmi:436
#, c-format
msgid "%s (to install)"
msgstr "%s (即将安装)"
-#: ../urpmi:437
+#: ../urpmi:442
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "为满足“%s”的依赖关系,需要安装下列软件包之一:"
-#: ../urpmi:440
+#: ../urpmi:445
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "请输入您的选择:(1-%d)"
-#: ../urpmi:482
+#: ../urpmi:487
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2305,7 +2322,7 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本: \n"
"%s"
-#: ../urpmi:484
+#: ../urpmi:489
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2315,7 +2332,7 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本: \n"
"%s"
-#: ../urpmi:490 ../urpmi:505
+#: ../urpmi:495 ../urpmi:510
#, c-format
msgid ""
"\n"
@@ -2324,12 +2341,12 @@ msgstr ""
"\n"
"仍然继续安装吗?"
-#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
+#: ../urpmi:496 ../urpmi:511 ../urpmi:614 ../urpmi.addmedia:135
#, c-format
msgid " (Y/n) "
msgstr "(是(Y)/否(n))[是]"
-#: ../urpmi:499
+#: ../urpmi:504
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2338,7 +2355,7 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:500
+#: ../urpmi:505
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2347,12 +2364,12 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:517
+#: ../urpmi:522
#, c-format
msgid "removing package %s will break your system"
msgstr "如果删除软件包 %s 会破坏您的系统"
-#: ../urpmi:525
+#: ../urpmi:530
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2362,7 +2379,7 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:527
+#: ../urpmi:532
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2372,12 +2389,12 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:535
+#: ../urpmi:540
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(只是测试,删除将不会实际发生)"
-#: ../urpmi:555
+#: ../urpmi:560
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2387,44 +2404,44 @@ msgstr ""
"您必须首先用 --buildrequires 调用 urpmi,以便安装下列依赖关系:\n"
"%s\n"
-#: ../urpmi:566
+#: ../urpmi:571
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "下列孤立软件包将被删除。"
-#: ../urpmi:582
+#: ../urpmi:596
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(只是测试,安装将不会实际发生)"
-#: ../urpmi:588
+#: ../urpmi:602
#, c-format
msgid "%s of additional disk space will be used."
msgstr "将会使用 %s 的额外磁盘空间。"
-#: ../urpmi:589
+#: ../urpmi:603
#, c-format
msgid "%s of disk space will be freed."
msgstr "将会释放 %s 的磁盘空间。"
-#: ../urpmi:590
+#: ../urpmi:604
#, c-format
msgid "%s of packages will be retrieved."
msgstr "将会获取 %s 的软件包。"
-#: ../urpmi:591
+#: ../urpmi:605
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "继续安装 %d 个软件包吗?"
-#: ../urpmi:612
+#: ../urpmi:626
#, c-format
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:620
+#: ../urpmi:634
#, c-format
msgid "Press Enter when mounted..."
msgstr "挂载后按 Enter..."
@@ -2546,77 +2563,70 @@ msgstr " --all-media - 对于 --distrib,添加列出的每个介质\n"
#: ../urpmi.addmedia:77
#, c-format
-msgid ""
-" --from - use specified url for list of mirrors, the default is\n"
-" %s\n"
-msgstr " --from - 使用指定的 URL 列出镜像,默认为 %s。\n"
-
-#: ../urpmi.addmedia:79
-#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
msgstr " --virtual - 创建常为最新的虚拟介质。\n"
-#: ../urpmi.addmedia:80 ../urpmi.update:44
+#: ../urpmi.addmedia:78 ../urpmi.update:44
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - 禁用 MD5SUM 文件检查。\n"
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:79
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
msgstr " --nopubkey - 不导入所添加介质的密钥\n"
-#: ../urpmi.addmedia:82
+#: ../urpmi.addmedia:80
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - 在配置中添加介质,但不进行更新。\n"
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:43 ../urpmi.update:53
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - 安静模式。\n"
-#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:44 ../urpmi.update:54
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - 详细的提示。\n"
-#: ../urpmi.addmedia:104
+#: ../urpmi.addmedia:95
#, c-format
msgid "known xml-info policies are %s"
msgstr "已知的 xml-info 策略是 %s"
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:106
#, c-format
msgid "no argument needed for --distrib --mirrorlist <url>"
msgstr "没有参数需要于 --distrib --mirrorlist <url>"
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:111
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr "无效的 <url> (如果是本地目录,必须是绝对路径)"
-#: ../urpmi.addmedia:124
+#: ../urpmi.addmedia:115
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "只允许超级用户添加介质"
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:118
#, c-format
msgid "creating config file [%s]"
msgstr "创建配置文件[%s]"
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:119
#, c-format
msgid "Can't create config file [%s]"
msgstr "无法创建配置文件[%s]"
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:127
#, c-format
msgid "no need to give <relative path of synthesis> with --distrib"
msgstr "使用 --distrib 不需要提供 <综合文件的相对路径>"
-#: ../urpmi.addmedia:144
+#: ../urpmi.addmedia:135
#, c-format
msgid ""
"\n"
@@ -2625,155 +2635,20 @@ msgstr ""
"\n"
"您是否想要添加介质“%s”?"
-#: ../urpmi.addmedia:170
-#, c-format
-msgid "<relative path of synthesis> missing\n"
-msgstr "<综合文件的相对路径>找不到\n"
-
-#: ../urpmi.addmedia:173
-#, c-format
-msgid "Can't use %s with remote medium"
-msgstr "远程介质无法使用 %s"
-
-#: ../urpmi.addmedia:185
+#: ../urpmi.addmedia:153 ../urpmi.addmedia:176
#, c-format
msgid "unable to add medium"
msgstr "无法添加介质"
-#: ../urpmi.recover:28
-#, c-format
-msgid ""
-"urpmi.recover version %s\n"
-"Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi.recover 版本 %s\n"
-"版权 (C) 2006 Mandriva。\n"
-"这是自由软件,可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmi.recover:34
+#: ../urpmi.addmedia:161
#, c-format
-msgid " --checkpoint - set repackaging start now\n"
-msgstr " --checkpoint - 设定重新打包立即开始\n"
-
-#: ../urpmi.recover:35
-#, c-format
-msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - 不在检查点上清除重新打包目录\n"
-
-#: ../urpmi.recover:37
-#, c-format
-msgid ""
-" --list - list transactions since provided date/duration argument\n"
-msgstr " --list - 列出自所提供日期/时长参数之后的交易\n"
-
-#: ../urpmi.recover:38
-#, c-format
-msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all - 列出 rpmdb 中的全部交易(较长)\n"
-
-#: ../urpmi.recover:39
-#, c-format
-msgid " --list-safe - list transactions since checkpoint\n"
-msgstr " --list-safe - 列出自检查点之后的交易\n"
-
-#: ../urpmi.recover:40
-#, c-format
-msgid ""
-" --rollback - rollback until specified date,\n"
-" or rollback the specified number of transactions\n"
-msgstr " --rollback - 回滚到指定的日期或回滚指定数量的交易\n"
-
-#: ../urpmi.recover:42
-#, c-format
-msgid " --disable - turn off repackaging\n"
-msgstr " --disable - 关闭软件包重新打包\n"
-
-#: ../urpmi.recover:57
-#, c-format
-msgid "Invalid date or duration [%s]\n"
-msgstr "无效的日期或时长 [%s]\n"
-
-#: ../urpmi.recover:65
-#, c-format
-msgid "Repackage directory not defined\n"
-msgstr "重新打包目录未定义\n"
-
-#: ../urpmi.recover:68
-#, c-format
-msgid "Can't write to repackage directory [%s]\n"
-msgstr "无法写入重新打包目录 [%s]\n"
-
-#: ../urpmi.recover:70
-#, c-format
-msgid "Cleaning up repackage directory [%s]...\n"
-msgstr "正在清理重新打包目录 [%s]...\n"
-
-#: ../urpmi.recover:72
-#, c-format
-msgid "%d file removed\n"
-msgid_plural "%d files removed\n"
-msgstr[0] "删除了 %d 个文件\n"
-
-#: ../urpmi.recover:82
-#, c-format
-msgid "Spurious command-line arguments [%s]\n"
-msgstr "冲突的命令行参数[%s]\n"
-
-#: ../urpmi.recover:84
-#, c-format
-msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "您不能同时指定 --checkpoint 和 --rollback\n"
-
-#: ../urpmi.recover:86
-#, c-format
-msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "您不能同时指定 --checkpoint 和 --list\n"
-
-#: ../urpmi.recover:88
-#, c-format
-msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "您不能同时指定 --rollback 和 --list\n"
-
-#: ../urpmi.recover:90
-#, c-format
-msgid "You can't specify --disable along with another option"
-msgstr "您不能将 --disable 与其它选项一起使用"
-
-#: ../urpmi.recover:115
-#, c-format
-msgid "No transaction found since %s\n"
-msgstr "自 %s 后无交易\n"
-
-#: ../urpmi.recover:130
-#, c-format
-msgid "You must be superuser to do this"
-msgstr "您必须是超级用户才能执行此操作"
-
-#: ../urpmi.recover:143 ../urpmi.recover:209
-#, c-format
-msgid "Writing rpm macros file [%s]...\n"
-msgstr "正在写入 rpm 宏文件[%s]...\n"
-
-#: ../urpmi.recover:185
-#, c-format
-msgid "No rollback date found\n"
-msgstr "未找到回滚日期\n"
-
-#: ../urpmi.recover:188
-#, c-format
-msgid "Rollback until %s...\n"
-msgstr "回滚至 %s...\n"
+msgid "<relative path of synthesis> missing\n"
+msgstr "<综合文件的相对路径>找不到\n"
-#: ../urpmi.recover:195
+#: ../urpmi.addmedia:164
#, c-format
-msgid "Disabling repackaging\n"
-msgstr "禁止重新打包\n"
+msgid "Can't use %s with remote medium"
+msgstr "远程介质无法使用 %s"
#: ../urpmi.removemedia:38
#, c-format
@@ -2867,12 +2742,12 @@ msgstr " -ff - 强迫更新综合文件。\n"
msgid "Only superuser is allowed to update media"
msgstr "只允许超级用户更新介质"
-#: ../urpmi.update:82
+#: ../urpmi.update:86
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
-#: ../urpmi.update:91
+#: ../urpmi.update:87
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2881,17 +2756,17 @@ msgstr ""
"找不到要升级的项\n"
"(%s 中之一)\n"
-#: ../urpmi.update:106
+#: ../urpmi.update:98
#, c-format
msgid "\"%s\""
msgstr "“%s”"
-#: ../urpmi.update:107
+#: ../urpmi.update:99
#, c-format
msgid "ignoring media %s"
msgstr "忽略介质 %s"
-#: ../urpmi.update:107
+#: ../urpmi.update:99
#, c-format
msgid "enabling media %s"
msgstr "启用介质 %s"
@@ -3149,11 +3024,107 @@ msgid ""
"no xml info for medium \"%s\", unable to return any result for packages %s"
msgstr "由于介质“%s”没有 xml 信息,软件包 %s 无法返回任何结果"
-#: ../urpmq:473
+#: ../urpmq:476
#, c-format
msgid "No changelog found\n"
msgstr "没有找到更新日志\n"
+#~ msgid "Search start: %s end: %s"
+#~ msgstr "搜索开始: %s 结束: %s"
+
+#~ msgid ""
+#~ " --from - use specified url for list of mirrors, the default is\n"
+#~ " %s\n"
+#~ msgstr " --from - 使用指定的 URL 列出镜像,默认为 %s。\n"
+
+#~ msgid ""
+#~ "urpmi.recover version %s\n"
+#~ "Copyright (C) 2006 Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmi.recover 版本 %s\n"
+#~ "版权 (C) 2006 Mandriva。\n"
+#~ "这是自由软件,可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
+
+#~ msgid " --checkpoint - set repackaging start now\n"
+#~ msgstr " --checkpoint - 设定重新打包立即开始\n"
+
+#~ msgid " --noclean - don't clean repackage directory on checkpoint\n"
+#~ msgstr " --noclean - 不在检查点上清除重新打包目录\n"
+
+#~ msgid ""
+#~ " --list - list transactions since provided date/duration "
+#~ "argument\n"
+#~ msgstr " --list - 列出自所提供日期/时长参数之后的交易\n"
+
+#~ msgid " --list-all - list all transactions in rpmdb (long)\n"
+#~ msgstr " --list-all - 列出 rpmdb 中的全部交易(较长)\n"
+
+#~ msgid " --list-safe - list transactions since checkpoint\n"
+#~ msgstr " --list-safe - 列出自检查点之后的交易\n"
+
+#~ msgid ""
+#~ " --rollback - rollback until specified date,\n"
+#~ " or rollback the specified number of transactions\n"
+#~ msgstr " --rollback - 回滚到指定的日期或回滚指定数量的交易\n"
+
+#~ msgid " --disable - turn off repackaging\n"
+#~ msgstr " --disable - 关闭软件包重新打包\n"
+
+#~ msgid "Invalid date or duration [%s]\n"
+#~ msgstr "无效的日期或时长 [%s]\n"
+
+#~ msgid "Repackage directory not defined\n"
+#~ msgstr "重新打包目录未定义\n"
+
+#~ msgid "Can't write to repackage directory [%s]\n"
+#~ msgstr "无法写入重新打包目录 [%s]\n"
+
+#~ msgid "Cleaning up repackage directory [%s]...\n"
+#~ msgstr "正在清理重新打包目录 [%s]...\n"
+
+#~ msgid "%d file removed\n"
+#~ msgid_plural "%d files removed\n"
+#~ msgstr[0] "删除了 %d 个文件\n"
+
+#~ msgid "Spurious command-line arguments [%s]\n"
+#~ msgstr "冲突的命令行参数[%s]\n"
+
+#~ msgid "You can't specify --checkpoint and --rollback at the same time\n"
+#~ msgstr "您不能同时指定 --checkpoint 和 --rollback\n"
+
+#~ msgid "You can't specify --checkpoint and --list at the same time\n"
+#~ msgstr "您不能同时指定 --checkpoint 和 --list\n"
+
+#~ msgid "You can't specify --rollback and --list at the same time\n"
+#~ msgstr "您不能同时指定 --rollback 和 --list\n"
+
+#~ msgid "You can't specify --disable along with another option"
+#~ msgstr "您不能将 --disable 与其它选项一起使用"
+
+#~ msgid "No transaction found since %s\n"
+#~ msgstr "自 %s 后无交易\n"
+
+#~ msgid "You must be superuser to do this"
+#~ msgstr "您必须是超级用户才能执行此操作"
+
+#~ msgid "Writing rpm macros file [%s]...\n"
+#~ msgstr "正在写入 rpm 宏文件[%s]...\n"
+
+#~ msgid "No rollback date found\n"
+#~ msgstr "未找到回滚日期\n"
+
+#~ msgid "Rollback until %s...\n"
+#~ msgstr "回滚至 %s...\n"
+
+#~ msgid "Disabling repackaging\n"
+#~ msgstr "禁止重新打包\n"
+
#~ msgid "Updating media...\n"
#~ msgstr "正在更新介质...\n"