summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-07 17:05:50 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-07 17:05:50 +0000
commitc301536cb638e227b5033c83668b694154ef6bc2 (patch)
tree1059cd24194a30cc91121857dfb1ff238a1e39cc /po/zh_CN.po
parent74115097fd19a940f41785f28f40c7620d957804 (diff)
downloadurpmi-c301536cb638e227b5033c83668b694154ef6bc2.tar
urpmi-c301536cb638e227b5033c83668b694154ef6bc2.tar.gz
urpmi-c301536cb638e227b5033c83668b694154ef6bc2.tar.bz2
urpmi-c301536cb638e227b5033c83668b694154ef6bc2.tar.xz
urpmi-c301536cb638e227b5033c83668b694154ef6bc2.zip
sync with code
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po798
1 files changed, 407 insertions, 391 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cfa1bc0a..8f390e0e 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-09-23 18:55+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "确定(_O)"
@@ -99,7 +99,7 @@ msgstr "安装(_I)"
msgid "_Save"
msgstr "保存(_S)"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "取消(_C)"
@@ -169,12 +169,12 @@ msgstr ""
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - 只使用列出的介质,介质之间用逗号分隔。\n"
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - 允许在 provides 字段中查找软件包。\n"
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - 不在 provides 字段中查找软件包。\n"
@@ -212,7 +212,22 @@ msgstr "请稍候..."
msgid "Must be root"
msgstr "必须是 root"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "正在分发 %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "软件包安装..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "软件包安装..."
+
+#: ../gurpmi2:111
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -228,37 +243,37 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:134 ../urpmi:624
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "确定"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, c-format
msgid " (to upgrade)"
msgstr "(升级)"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, c-format
msgid " (to install)"
msgstr "(安装)"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr "软件包选择"
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "需要下列软件包之一:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "中止(_A)"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -269,60 +284,55 @@ msgstr ""
"%s\n"
"仍然继续安装吗?"
-#: ../gurpmi2:241 ../urpmi:591
+#: ../gurpmi2:240 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:242 ../urpmi:592
+#: ../gurpmi2:241 ../urpmi:593
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "为了满足依赖关系,将安装下列软件包:"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d 个软件包,%d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "软件包安装..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, c-format
msgid "unable to get source packages, aborting"
msgstr "无法读取源软件包,中止"
-#: ../gurpmi2:266 ../urpm/install.pm:81
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "正在准备..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安装软件包“%s”(%s/%s)..."
-#: ../gurpmi2:287 ../urpmi:619
+#: ../gurpmi2:286 ../urpmi:620
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "请插入介质“%s”"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "完成(_D)"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:114
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -333,28 +343,28 @@ msgstr ""
"%s\n"
"您可能需要更新您的 urpmi 数据库"
-#: ../gurpmi2:338 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, c-format
msgid "Installation failed:"
msgstr "安装失败: "
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "软件包已经安装"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "安装完成"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "正在删除 %s"
-#: ../gurpmi2:354 ../urpmi:686
+#: ../gurpmi2:353 ../urpmi:687
#, c-format
msgid "restarting urpmi"
msgstr "重新启动 urpmi"
@@ -393,7 +403,7 @@ msgstr " 默认为 %s。\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - 输出 rpm 的完整名称(NVRA)。\n"
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "只允许超级用户安装软件包"
@@ -489,57 +499,57 @@ msgstr "运行于限制模式运行时,禁止执行此操作"
msgid "bad proxy declaration on command line\n"
msgstr "命令行声明的代理服务器无效\n"
-#: ../urpm/args.pm:305
+#: ../urpm/args.pm:306
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr "意外表达式 %s"
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:384
#, c-format
msgid "missing expression before %s"
msgstr "%s 前缺少表达式"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "意外表达式 %s(建议:使用 -a 或 -o?)"
-#: ../urpm/args.pm:393
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr "没有要关闭的表达式"
-#: ../urpm/args.pm:402
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr "默认情况下,urpmf 使用正则表达式。您应该使用选项“--literal”"
-#: ../urpm/args.pm:470
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr "chroot 目录不存在"
-#: ../urpm/args.pm:493
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr "没有 %2$s 无法使用 %1$s"
-#: ../urpm/args.pm:496 ../urpm/args.pm:499 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr "无法和 %2$s 一起使用 %1$s"
-#: ../urpm/args.pm:507
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr "参数太多\n"
-#: ../urpm/bug_report.pm:54 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "复制失败"
@@ -726,53 +736,53 @@ msgstr "正在从介质“%s”上获取 rpm 文件..."
msgid "[repackaging]"
msgstr "[重新打包]"
-#: ../urpm/install.pm:168
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr "已创建在 %s 上安装的交易(删除=%d,安装=%d,升级=%d)"
-#: ../urpm/install.pm:171
+#: ../urpm/install.pm:172
#, c-format
msgid "unable to create transaction"
msgstr "无法创建交易"
-#: ../urpm/install.pm:194
+#: ../urpm/install.pm:195
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
-#: ../urpm/install.pm:207
+#: ../urpm/install.pm:208
#, c-format
msgid "unable to install package %s"
msgstr "无法安装软件包 %s"
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:211
#, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
-#: ../urpm/install.pm:211 ../urpm/install.pm:268
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, c-format
msgid "removing %s failed: %s"
msgstr "删除 %s 失败: %s"
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:250
#, c-format
msgid "Removing package %s"
msgstr "删除软件包 %s"
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:251
#, c-format
msgid "removing package %s"
msgstr "删除软件包 %s"
-#: ../urpm/install.pm:266
+#: ../urpm/install.pm:267
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
-#: ../urpm/install.pm:274
+#: ../urpm/install.pm:275
#, c-format
msgid "More information on package %s"
msgstr "关于软件包 %s 的更多信息"
@@ -1181,13 +1191,13 @@ msgstr "找到地理位置较近的 %s %.2f %.2f,从时区 %s"
msgid "getting mirror list from %s"
msgstr "从 %s 中获得镜像列表"
-#: ../urpm/msg.pm:63 ../urpmi:501 ../urpmi:516 ../urpmi:611
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "nN否"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:552 ../urpmi:647 ../urpmi:653
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1340,6 +1350,291 @@ msgstr "正在装载 %s"
msgid "unmounting %s"
msgstr "正在拆卸 %s"
+#: ../urpm/search.pm:29 ../urpmf:29
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage: urpmf [options] pattern-expression\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 2002-2006 Mandriva。\n"
+"这是自由软件,可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid " --version - print this tool's version number.\n"
+msgstr " --version - 打印此工具的版本号。\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid " --env - use specific environment (typically a bug report).\n"
+msgstr " --env - 使用指定的环境(特别是进行故障报告时)。\n"
+
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid " --excludemedia - do not use the given media, separated by comma.\n"
+msgstr " --excludemedia - 不使用给定介质,介质之间用逗号分隔。\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr " --literal, -l - 不匹配模式,参数为字面字符串。\n"
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../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"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr " --sortmedia - 根据用逗号分隔的子字符串排序介质。\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid " --use-distrib - use the given path to access media\n"
+msgstr " --use-distrib - 使用给定的路径访问介质\n"
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
+msgstr " --synthesis - 使用指定的综合文件而不是 urpmi db。\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid " --uniq - do not print identical lines twice.\n"
+msgstr " --uniq - 不打印相同行。\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid " --update - use only update media.\n"
+msgstr " --update - 只使用升级介质。\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid " --verbose - verbose mode.\n"
+msgstr " --verbose - 详细提示。\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid " -i - ignore case distinctions in patterns.\n"
+msgstr " -i - 忽略各种情况下的冲突。\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid " -I - honor case distinctions in patterns (default).\n"
+msgstr " -I - 在模式中遵从大小写(默认值)。\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid " -F<str> - change field separator (defaults to ':').\n"
+msgstr " -F<字符串> - 更改字段分隔符(默认为“:”)。\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "模式表达式: \n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid " text - any text is parsed as a regexp, unless -l is used.\n"
+msgstr " 文本 - 任何文本都将被处理为正则表达式,除非使用了 -l。\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -e - 直接保留 perl 代码,就像 perl -e。\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid " -a - binary AND operator.\n"
+msgstr " -a - 二元 AND 操作符。\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid " -o - binary OR operator.\n"
+msgstr " -o - 二元 OR 操作符。\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid " ! - unary NOT.\n"
+msgstr " ! - 一元 NOT。\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid " ( ) - left and right parentheses.\n"
+msgstr " ( ) - 左右括号。\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "标记清单:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid " --qf - specify a printf-like output format\n"
+msgstr " --qf - 指定类似 printf 的输出格式\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid " example: '%%name:%%files'\n"
+msgstr " 例如:“%%name:%%files”\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid " --arch - architecture\n"
+msgstr " --arch - 体系\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid " --buildhost - build host\n"
+msgstr " --buildhost - 编译主机\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid " --buildtime - build time\n"
+msgstr " --buildtime - 编译时间\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid " --conffiles - configuration files\n"
+msgstr " --conffiles - 配置文件\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid " --conflicts - conflict tags\n"
+msgstr " --conflicts - conflict 标签\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid " --description - package description\n"
+msgstr " --description - 软件包描述\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid " --distribution - distribution\n"
+msgstr " --distribution - 发行版\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid " --epoch - epoch\n"
+msgstr " --epoch - 周期\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid " --filename - filename of the package\n"
+msgstr " --fiename - 软件包文件名\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid " --files - list of files contained in the package\n"
+msgstr " --files - 列出软件包中包含的文件\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid " --group - group\n"
+msgstr " --group - 分组\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid " --license - license\n"
+msgstr " --license - 许可协议\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid " --name - package name\n"
+msgstr " --name - 软件包名称\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid " --obsoletes - obsoletes tags\n"
+msgstr " --obsoletes - obsolets 标签\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid " --packager - packager\n"
+msgstr " --packager - 打包者\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid " --provides - provides tags\n"
+msgstr " --provides - provides 标签\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid " --requires - requires tags\n"
+msgstr " --requires - requires 标签\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid " --size - installed size\n"
+msgstr " --size - 安装大小\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid " --sourcerpm - source rpm name\n"
+msgstr " --sourcerpm - 源 rpm 名称\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid " --suggests - suggests tags\n"
+msgstr " --suggests - suggests 标签\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid " --summary - summary\n"
+msgstr " --summary - 摘要\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid " --url - url\n"
+msgstr " --url - url\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr " --vendor - 提供者\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid " -m - the media in which the package was found\n"
+msgstr " -m - 软件包所在介质\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - 和名称一起打印版本、发行号和平台。\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "格式不对: 您只能使用一个多值标签"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "介质“%s”的 hdlist 不可用"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "介质“%s”的综合文件不可用"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "介质“%s”没有可用的 xml-info"
+
#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1434,17 +1729,17 @@ msgstr "为了安装 %s"
msgid "due to conflicts with %s"
msgstr "原因是与 %s 冲突"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, c-format
msgid "Invalid signature (%s)"
msgstr "无效的签名(%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "无效的密钥 ID(%s)"
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, c-format
msgid "Missing signature (%s)"
msgstr "缺少签名(%s)"
@@ -1510,7 +1805,7 @@ msgstr " --test - 验证删除是否可以正确进行。\n"
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - 在多个机器上分布的运行 urpmi。\n"
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - 在删除之前重新对文件打包\n"
@@ -1520,12 +1815,6 @@ msgstr " --repackage - 在删除之前重新对文件打包\n"
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
-#, c-format
-msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
-
#: ../urpme:55 ../urpmi:101
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
@@ -1545,7 +1834,7 @@ msgstr ""
" --use-distrib - 从发行版树中实时配置 urpme,特别用于在 --root 选项\n"
" 下安装/卸载 chroot。\n"
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - 详细提示。\n"
@@ -1605,7 +1894,7 @@ msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "删除 %d 个软件包吗?"
-#: ../urpme:161 ../urpmi:553 ../urpmi:648 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, c-format
msgid " (y/N) "
msgstr "(是(y)/否(N))[否]"
@@ -1625,289 +1914,11 @@ msgstr "删除失败"
msgid "Removal is possible"
msgstr "可以删除"
-#: ../urpmf:29
-#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
-msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 2002-2006 Mandriva。\n"
-"这是自由软件,可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmf:36
-#, c-format
-msgid " --version - print this tool's version number.\n"
-msgstr " --version - 打印此工具的版本号。\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env - 使用指定的环境(特别是进行故障报告时)。\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid " --excludemedia - do not use the given media, separated by comma.\n"
-msgstr " --excludemedia - 不使用给定介质,介质之间用逗号分隔。\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-" --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l - 不匹配模式,参数为字面字符串。\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-" --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - 根据用逗号分隔的子字符串排序介质。\n"
-
-#: ../urpmf:43
-#, c-format
-msgid " --use-distrib - use the given path to access media\n"
-msgstr " --use-distrib - 使用给定的路径访问介质\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - 使用指定的综合文件而不是 urpmi db。\n"
-
-#: ../urpmf:45
-#, c-format
-msgid " --uniq - do not print identical lines twice.\n"
-msgstr " --uniq - 不打印相同行。\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid " --update - use only update media.\n"
-msgstr " --update - 只使用升级介质。\n"
-
-#: ../urpmf:47
-#, c-format
-msgid " --verbose - verbose mode.\n"
-msgstr " --verbose - 详细提示。\n"
-
-#: ../urpmf:48
-#, c-format
-msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -i - 忽略各种情况下的冲突。\n"
-
-#: ../urpmf:49
-#, c-format
-msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - 在模式中遵从大小写(默认值)。\n"
-
-#: ../urpmf:50
-#, c-format
-msgid " -F<str> - change field separator (defaults to ':').\n"
-msgstr " -F<字符串> - 更改字段分隔符(默认为“:”)。\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "模式表达式: \n"
-
-#: ../urpmf:52
-#, c-format
-msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr " 文本 - 任何文本都将被处理为正则表达式,除非使用了 -l。\n"
-
-#: ../urpmf:53
-#, c-format
-msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -e - 直接保留 perl 代码,就像 perl -e。\n"
-
-#: ../urpmf:54
-#, c-format
-msgid " -a - binary AND operator.\n"
-msgstr " -a - 二元 AND 操作符。\n"
-
-#: ../urpmf:55
-#, c-format
-msgid " -o - binary OR operator.\n"
-msgstr " -o - 二元 OR 操作符。\n"
-
-#: ../urpmf:56
-#, c-format
-msgid " ! - unary NOT.\n"
-msgstr " ! - 一元 NOT。\n"
-
-#: ../urpmf:57
-#, c-format
-msgid " ( ) - left and right parentheses.\n"
-msgstr " ( ) - 左右括号。\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "标记清单:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid " --qf - specify a printf-like output format\n"
-msgstr " --qf - 指定类似 printf 的输出格式\n"
-
-#: ../urpmf:60
-#, c-format
-msgid " example: '%%name:%%files'\n"
-msgstr " 例如:“%%name:%%files”\n"
-
-#: ../urpmf:61
-#, c-format
-msgid " --arch - architecture\n"
-msgstr " --arch - 体系\n"
-
-#: ../urpmf:62
-#, c-format
-msgid " --buildhost - build host\n"
-msgstr " --buildhost - 编译主机\n"
-
-#: ../urpmf:63
-#, c-format
-msgid " --buildtime - build time\n"
-msgstr " --buildtime - 编译时间\n"
-
-#: ../urpmf:64
-#, c-format
-msgid " --conffiles - configuration files\n"
-msgstr " --conffiles - 配置文件\n"
-
-#: ../urpmf:65
-#, c-format
-msgid " --conflicts - conflict tags\n"
-msgstr " --conflicts - conflict 标签\n"
-
-#: ../urpmf:66
-#, c-format
-msgid " --description - package description\n"
-msgstr " --description - 软件包描述\n"
-
-#: ../urpmf:67
-#, c-format
-msgid " --distribution - distribution\n"
-msgstr " --distribution - 发行版\n"
-
-#: ../urpmf:68
-#, c-format
-msgid " --epoch - epoch\n"
-msgstr " --epoch - 周期\n"
-
-#: ../urpmf:69
-#, c-format
-msgid " --filename - filename of the package\n"
-msgstr " --fiename - 软件包文件名\n"
-
-#: ../urpmf:70
-#, c-format
-msgid " --files - list of files contained in the package\n"
-msgstr " --files - 列出软件包中包含的文件\n"
-
-#: ../urpmf:71
-#, c-format
-msgid " --group - group\n"
-msgstr " --group - 分组\n"
-
-#: ../urpmf:72
-#, c-format
-msgid " --license - license\n"
-msgstr " --license - 许可协议\n"
-
-#: ../urpmf:73
-#, c-format
-msgid " --name - package name\n"
-msgstr " --name - 软件包名称\n"
-
-#: ../urpmf:74
-#, c-format
-msgid " --obsoletes - obsoletes tags\n"
-msgstr " --obsoletes - obsolets 标签\n"
-
-#: ../urpmf:75
-#, c-format
-msgid " --packager - packager\n"
-msgstr " --packager - 打包者\n"
-
-#: ../urpmf:76
-#, c-format
-msgid " --provides - provides tags\n"
-msgstr " --provides - provides 标签\n"
-
-#: ../urpmf:77
-#, c-format
-msgid " --requires - requires tags\n"
-msgstr " --requires - requires 标签\n"
-
-#: ../urpmf:78
-#, c-format
-msgid " --size - installed size\n"
-msgstr " --size - 安装大小\n"
-
-#: ../urpmf:79
-#, c-format
-msgid " --sourcerpm - source rpm name\n"
-msgstr " --sourcerpm - 源 rpm 名称\n"
-
-#: ../urpmf:80
-#, c-format
-msgid " --suggests - suggests tags\n"
-msgstr " --suggests - suggests 标签\n"
-
-#: ../urpmf:81
-#, c-format
-msgid " --summary - summary\n"
-msgstr " --summary - 摘要\n"
-
-#: ../urpmf:82
-#, c-format
-msgid " --url - url\n"
-msgstr " --url - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid " --vendor - vendor\n"
-msgstr " --vendor - 提供者\n"
-
-#: ../urpmf:84
-#, c-format
-msgid " -m - the media in which the package was found\n"
-msgstr " -m - 软件包所在介质\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - 和名称一起打印版本、发行号和平台。\n"
-
#: ../urpmf:153
#, c-format
msgid "unterminated expression (%s)"
msgstr "未终止的表达式(%s)"
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "格式不对: 您只能使用一个多值标签"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "介质“%s”的 hdlist 不可用"
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "介质“%s”的综合文件不可用"
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "介质“%s”没有可用的 xml-info"
-
#: ../urpmi:81
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -2132,17 +2143,22 @@ msgstr " --ignorearch - 允许安装体系不匹配的 RPM。\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - 不执行软件包脚本。\n"
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " --conflicts - 打印 conflict 标签。\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - 安装要跳过的软件包。\n"
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - 首选的软件包\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2150,82 +2166,82 @@ msgid ""
msgstr ""
" --more-choices - 如果找到了多个软件包,则提供多个选择而不是默认选择。\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - 不锁定 rpm 数据库。\n"
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - 更新只限于相同体系的软件包。\n"
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - 在命令行选择所有匹配。\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - 安静模式。\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --debug - 非常详细模式。\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr " 命令行给出的软件包名或 rpm 文件将会被安装。\n"
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr "错误: 要生成错误报告,请在指定命令行参数时多加 --bug。\n"
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "您不能安装 spec 文件"
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "正在设置默认为 --buildrequires"
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr "请使用 --buildrequires 或 --install-src,默认为 --buildrequires"
-#: ../urpmi:252
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "目录 [%s] 已存在,请使用另外一个目录进行错误报告或者删除该目录"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "无法创建故障报告的目录 [%s]"
-#: ../urpmi:274
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2234,48 +2250,48 @@ msgstr ""
"错误: %s 似乎是以只读方式挂载的。\n"
"请使用 --allow-force 强制操作。"
-#: ../urpmi:348
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr "正在更新介质...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:435
+#: ../urpmi:436
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (即将升级)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:437
+#: ../urpmi:438
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (即将升级)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:441
+#: ../urpmi:442
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (即将安装)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:444
#, c-format
msgid "%s (to install)"
msgstr "%s (即将安装)"
-#: ../urpmi:449
+#: ../urpmi:450
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "为满足“%s”的依赖关系,需要安装下列软件包之一:"
-#: ../urpmi:452
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "请输入您的选择:(1-%d)"
-#: ../urpmi:494
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2285,7 +2301,7 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本: \n"
"%s"
-#: ../urpmi:496
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2295,7 +2311,7 @@ msgstr ""
"下列软件包无法安装,因为它们所依赖的软件包版本低于目前所安装的版本: \n"
"%s"
-#: ../urpmi:502 ../urpmi:517
+#: ../urpmi:503 ../urpmi:518
#, c-format
msgid ""
"\n"
@@ -2304,12 +2320,12 @@ msgstr ""
"\n"
"仍然继续安装吗?"
-#: ../urpmi:503 ../urpmi:518 ../urpmi:612 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr "(是(Y)/否(n))[是]"
-#: ../urpmi:511
+#: ../urpmi:512
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2318,7 +2334,7 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:512
+#: ../urpmi:513
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2327,12 +2343,12 @@ msgstr ""
"某些要求的软件包无法安装:\n"
"%s"
-#: ../urpmi:529
+#: ../urpmi:530
#, c-format
msgid "removing package %s will break your system"
msgstr "如果删除软件包 %s 会破坏您的系统"
-#: ../urpmi:537
+#: ../urpmi:538
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2342,7 +2358,7 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:539
+#: ../urpmi:540
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2352,12 +2368,12 @@ msgstr ""
"安装无法继续,原因是要升级其它软件包,需要先删除下列软件包:\n"
"%s\n"
-#: ../urpmi:547
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(只是测试,删除将不会实际发生)"
-#: ../urpmi:567
+#: ../urpmi:568
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2367,44 +2383,44 @@ msgstr ""
"您必须首先用 --buildrequires 调用 urpmi,以便安装下列依赖关系:\n"
"%s\n"
-#: ../urpmi:578
+#: ../urpmi:579
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "下列孤立软件包将被删除。"
-#: ../urpmi:594
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(只是测试,安装将不会实际发生)"
-#: ../urpmi:600
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr "将会使用 %s 的额外磁盘空间。"
-#: ../urpmi:601
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr "将会释放 %s 的磁盘空间。"
-#: ../urpmi:602
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr "将会获取 %s 的软件包。"
-#: ../urpmi:603
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "继续安装 %d 个软件包吗?"
-#: ../urpmi:624
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:632
+#: ../urpmi:633
#, c-format
msgid "Press Enter when mounted..."
msgstr "挂载后按 Enter..."