diff options
author | Daniel Hartwig <mandyke@gmail.com> | 2012-02-07 01:30:43 +0800 |
---|---|---|
committer | Daniel Hartwig <mandyke@gmail.com> | 2012-02-07 01:30:43 +0800 |
commit | b4874477fcf63fc73085ee7af3b962a5d2db619c (patch) | |
tree | f23bb2a6e881a6a0daad556aad66bd0f616f270a /po/zh_CN.po | |
parent | fd6f32c9ca9e3d2a1e61436d3bbb6cf93a273806 (diff) | |
download | aptitude-b4874477fcf63fc73085ee7af3b962a5d2db619c.tar.gz |
Pofile changes from "make dist" (i.e., msgmerge).
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r-- | po/zh_CN.po | 552 |
1 files changed, 302 insertions, 250 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 1c779274..e3ac4373 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aptitude\n" "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n" -"POT-Creation-Date: 2011-05-14 21:10-0700\n" +"POT-Creation-Date: 2012-02-01 01:10+0800\n" "PO-Revision-Date: 2010-08-27 01:49+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -23,42 +23,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/apt_config_treeitems.cc:99 -msgid "" -"%BOption:%b %s\n" -"%BDefault:%b %s\n" -"%BValue:%b %s\n" -msgstr "" -"%B选项:%b %s\n" -"%B默认:%b %s\n" -"%B值:%b %s\n" +#: src/apt_config_treeitems.cc:99 src/apt_config_treeitems.cc:210 +#: src/apt_config_treeitems.cc:394 +msgid "%BOption:%b " +msgstr "%B选项:%b " + +#: src/apt_config_treeitems.cc:101 src/apt_config_treeitems.cc:212 +#: src/apt_config_treeitems.cc:396 +msgid "%BDefault:%b " +msgstr "%B默认:%b " -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "True" msgstr "True" -#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:104 +#: src/apt_config_treeitems.cc:102 src/apt_config_treeitems.cc:104 msgid "False" msgstr "False" -#: src/apt_config_treeitems.cc:209 src/apt_config_treeitems.cc:393 -msgid "%BOption:%b " -msgstr "%B选项:%b " - -#: src/apt_config_treeitems.cc:211 src/apt_config_treeitems.cc:395 -msgid "%BDefault:%b " -msgstr "%B默认:%b " - -#: src/apt_config_treeitems.cc:213 src/apt_config_treeitems.cc:397 +#: src/apt_config_treeitems.cc:103 src/apt_config_treeitems.cc:214 +#: src/apt_config_treeitems.cc:398 msgid "%BValue:%b " msgstr "%B值:%b " -#: src/apt_config_treeitems.cc:279 -#, c-format -msgid "Editing \"%ls\"" +#: src/apt_config_treeitems.cc:280 +#, fuzzy, c-format +#| msgid "Editing \"%ls\"" +msgid "Editing \"%ls\": " msgstr "正在编辑“%ls”" -#: src/apt_config_treeitems.cc:401 +#: src/apt_config_treeitems.cc:402 msgid "%BChoice:%b " msgstr "%B选择:%b " @@ -590,8 +584,8 @@ msgstr "解决器发生致命错误" msgid "[%d(%d)/...] Resolving dependencies" msgstr "[%d(%d)/...] 正在解决依赖关系" -#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1291 -#: src/gtk/resolver.cc:1459 src/solution_dialog.cc:140 +#: src/broken_indicator.cc:313 src/gtk/resolver.cc:1294 +#: src/gtk/resolver.cc:1462 src/solution_dialog.cc:140 #: src/solution_screen.cc:569 msgid "Internal error: unexpected null solution." msgstr "内部错误:意料之外的空解决方案。" @@ -867,7 +861,7 @@ msgid "" msgstr "无法安全解决依赖关系,请尝试使用 --full-resolver 来运行。\n" #: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60 -#: src/main.cc:1233 +#: src/main.cc:1217 #, c-format msgid "Abort.\n" msgstr "放弃。\n" @@ -1222,7 +1216,7 @@ msgstr "解包后将释放 %sB。\n" msgid "No packages to show -- enter the package names on the line after 'i'.\n" msgstr "无可显示的软件包 -- 请在“i”之后的那一行输入软件包名称。\n" -#: src/cmdline/cmdline_prompt.cc:780 +#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795 msgid "Press Return to continue." msgstr "按回车继续。" @@ -1231,10 +1225,6 @@ msgstr "按回车继续。" msgid "No packages found -- enter the package names on the line after 'c'.\n" msgstr "未发现软件包 -- 请在“c”之后的那一行输入软件包名称。\n" -#: src/cmdline/cmdline_prompt.cc:795 -msgid "Press Return to continue" -msgstr "按回车继续" - #: src/cmdline/cmdline_prompt.cc:806 #, c-format msgid "" @@ -1530,9 +1520,12 @@ msgid "Resolver state successfully written!" msgstr "成功写入依赖关系解决状态!" #: src/cmdline/cmdline_resolver.cc:222 -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +#| "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgid "" -"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " +"y: %Fn: %Fq: %F.: %F,: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " "ver) ...: %F%n<ID>: %F%n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F" msgstr "" "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr (ID|pkg ver) ...: %F%na (ID|pkg " @@ -1787,7 +1780,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created." msgstr "我想解决依赖关系,但没有创建依赖关系解决器" #: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180 -#: src/gtk/resolver.cc:2055 src/solution_dialog.cc:127 +#: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127 #: src/solution_screen.cc:546 msgid "Resolving dependencies..." msgstr "依赖关系分析中..." @@ -1823,7 +1816,9 @@ msgid "Invalid response; please enter one of the following commands:" msgstr "无效响应;请输入下列命令之一:" #: src/cmdline/cmdline_resolver.cc:1051 -msgid "No solution found within the allotted time. Try harder? [Y/n]" +#, fuzzy +#| msgid "No solution found within the allotted time. Try harder? [Y/n]" +msgid "No solution found within the allotted time. Try harder? [Y/n] " msgstr "在限定的时间内没能找到解决方案。加把劲再试试?[Y/n]" #: src/cmdline/cmdline_resolver.cc:1080 @@ -2025,7 +2020,7 @@ msgstr "软件包:" msgid "State" msgstr "状态" -#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:466 +#: src/cmdline/cmdline_show.cc:379 src/cmdline/cmdline_show.cc:468 msgid "Provided by" msgstr "提供者:" @@ -2133,27 +2128,31 @@ msgstr "代替" msgid "Obsoletes" msgstr "过期" -#: src/cmdline/cmdline_show.cc:465 src/cmdline/cmdline_why.cc:281 +#: src/cmdline/cmdline_show.cc:465 +msgid "Enhances" +msgstr "" + +#: src/cmdline/cmdline_show.cc:467 src/cmdline/cmdline_why.cc:281 #: src/cmdline/cmdline_why.cc:1683 src/gtk/dependency_chains_tab.cc:205 msgid "Provides" msgstr "提供" -#: src/cmdline/cmdline_show.cc:469 src/gtk/entitysummary.cc:367 +#: src/cmdline/cmdline_show.cc:471 src/gtk/entitysummary.cc:367 #: src/gtk/info.cc:716 src/gtk/previewtab.cc:238 src/pkg_info_screen.cc:102 msgid "Description: " msgstr "描述:" -#: src/cmdline/cmdline_show.cc:475 src/pkg_info_screen.cc:107 +#: src/cmdline/cmdline_show.cc:477 src/pkg_info_screen.cc:107 #: src/pkg_view.cc:259 msgid "Homepage: " msgstr "主页:" -#: src/cmdline/cmdline_show.cc:576 +#: src/cmdline/cmdline_show.cc:578 #, c-format msgid "Unable to locate package %s" msgstr "无法定位软件包 %s" -#: src/cmdline/cmdline_show.cc:597 +#: src/cmdline/cmdline_show.cc:599 #, c-format msgid "Unable to parse pattern %s" msgstr "无法分析模式 %s" @@ -2458,6 +2457,12 @@ msgstr "%s:这个命令要求至少一个参数(要查询的软件包)。\n" msgid "Unknown version selection, something is very wrong." msgstr "未知的版本选择,有一些严重错误。" +#: src/cmdline_parse.cc:22 +#, fuzzy, c-format +#| msgid "Invalid operation %s" +msgid "Invalid command-line option '%s'" +msgstr "无效的操作 %s" + #: src/cmdline/terminal.cc:46 msgid "Unexpected end-of-file on standard input" msgstr "标准输入中遇到意料之外的文件结束标志" @@ -2474,7 +2479,7 @@ msgstr "[ 错误] %s" msgid "UNSATISFIED" msgstr "未满足" -#: src/dep_item.cc:148 src/reason_fragment.cc:256 +#: src/dep_item.cc:148 src/reason_fragment.cc:257 msgid "UNAVAILABLE" msgstr "不可用" @@ -2482,7 +2487,7 @@ msgstr "不可用" msgid "Tags" msgstr "标签" -#: src/desc_render.cc:154 +#: src/desc_render.cc:149 msgid "User Tags" msgstr "用户标签" @@ -2869,16 +2874,21 @@ msgstr "无法创建截断的缓存 %s" msgid "Unable to open %s to log actions" msgstr "无法打开 %s 来记录动作" -#: src/generic/apt/log.cc:67 +#. ForTranslators: This is a date and time format. See strftime(3). +#: src/generic/apt/log.cc:66 +msgid "%a, %b %e %Y %T %z" +msgstr "" + +#: src/generic/apt/log.cc:68 #, c-format msgid "Error generating local time (%s)" msgstr "生成本地时间(%s)时错误" -#: src/generic/apt/log.cc:71 +#: src/generic/apt/log.cc:72 msgid "log report" msgstr "日志报告" -#: src/generic/apt/log.cc:72 +#: src/generic/apt/log.cc:73 #, c-format msgid "" "IMPORTANT: this log only lists intended actions; actions which fail due to\n" @@ -2888,81 +2898,81 @@ msgstr "" "重要:该日志只记录预期动作;由于 dpkg 问题而出错的动作可能尚未完成。\n" "\n" -#: src/generic/apt/log.cc:73 +#: src/generic/apt/log.cc:74 #, c-format msgid "Will install %li packages, and remove %li packages.\n" msgstr "将要安装 %li 个软件包,卸载 %li 个软件包。\n" -#: src/generic/apt/log.cc:77 +#: src/generic/apt/log.cc:78 #, c-format msgid "%sB of disk space will be used\n" msgstr "将要占用 %sB 的磁盘空间\n" -#: src/generic/apt/log.cc:80 +#: src/generic/apt/log.cc:81 #, c-format msgid "%sB of disk space will be freed\n" msgstr "将要释放 %sB 的磁盘空间\n" -#: src/generic/apt/log.cc:90 +#: src/generic/apt/log.cc:91 #, c-format msgid "[UPGRADE] %s %s -> %s\n" msgstr "[升级] %s %s -> %s\n" -#: src/generic/apt/log.cc:94 +#: src/generic/apt/log.cc:95 #, c-format msgid "[DOWNGRADE] %s %s -> %s\n" msgstr "[降级] %s %s -> %s\n" -#: src/generic/apt/log.cc:104 +#: src/generic/apt/log.cc:105 msgid "REMOVE" msgstr "卸载" -#: src/generic/apt/log.cc:110 +#: src/generic/apt/log.cc:111 msgid "INSTALL" msgstr "安装" -#: src/generic/apt/log.cc:113 +#: src/generic/apt/log.cc:114 msgid "REINSTALL" msgstr "重新安装" -#: src/generic/apt/log.cc:116 +#: src/generic/apt/log.cc:117 msgid "HOLD" msgstr "保持" -#: src/generic/apt/log.cc:119 +#: src/generic/apt/log.cc:120 msgid "BROKEN" msgstr "破坏" -#: src/generic/apt/log.cc:122 +#: src/generic/apt/log.cc:123 msgid "REMOVE, NOT USED" msgstr "卸载,未用" -#: src/generic/apt/log.cc:125 +#: src/generic/apt/log.cc:126 msgid "REMOVE, DEPENDENCIES" msgstr "卸载,依赖关系" -#: src/generic/apt/log.cc:128 +#: src/generic/apt/log.cc:129 msgid "INSTALL, DEPENDENCIES" msgstr "安装,依赖关系" -#: src/generic/apt/log.cc:131 +#: src/generic/apt/log.cc:132 msgid "HOLD, DEPENDENCIES" msgstr "保持,依赖关系" -#: src/generic/apt/log.cc:134 +#: src/generic/apt/log.cc:135 msgid "UNCONFIGURED" msgstr "未配置的" -#: src/generic/apt/log.cc:137 +#: src/generic/apt/log.cc:138 msgid "????????" msgstr "????????" -#: src/generic/apt/log.cc:141 +#: src/generic/apt/log.cc:142 #, c-format msgid "[%s] %s\n" msgstr "[%s] %s\n" -#: src/generic/apt/log.cc:144 +#: src/generic/apt/log.cc:145 #, c-format msgid "" "===============================================================================\n" @@ -2983,46 +2993,46 @@ msgstr "正在访问索引" msgid "Filtering packages" msgstr "分类软件包" -#: src/generic/apt/matching/parse.cc:307 +#: src/generic/apt/matching/parse.cc:311 #, c-format msgid "Unknown action type: %s" msgstr "未知的操作类型:%s" -#: src/generic/apt/matching/parse.cc:348 +#: src/generic/apt/matching/parse.cc:352 #, c-format msgid "Unterminated literal string after %s" msgstr "%s 之后有未结束的文字字符串" -#: src/generic/apt/matching/parse.cc:445 +#: src/generic/apt/matching/parse.cc:449 #, c-format msgid "Unknown priority %s" msgstr "未知的优先级:%s" -#: src/generic/apt/matching/parse.cc:464 +#: src/generic/apt/matching/parse.cc:468 #, c-format msgid "Match pattern ends unexpectedly (expected '%c')." msgstr "匹配模式异常结束(预期为'%c')。" -#: src/generic/apt/matching/parse.cc:467 +#: src/generic/apt/matching/parse.cc:471 #, c-format msgid "Expected '%c', got '%c'." msgstr "预期得到“%c”,却得到“%c”。" -#: src/generic/apt/matching/parse.cc:807 -#: src/generic/apt/matching/parse.cc:1255 -#: src/generic/apt/matching/parse.cc:1295 +#: src/generic/apt/matching/parse.cc:811 +#: src/generic/apt/matching/parse.cc:1259 +#: src/generic/apt/matching/parse.cc:1299 #, c-format msgid "Unknown dependency type: %s" msgstr "未知依赖类型:%s" -#: src/generic/apt/matching/parse.cc:860 +#: src/generic/apt/matching/parse.cc:864 #, c-format msgid "Unknown term type: \"%s\"." msgstr "未知的项目类型:“%s”。" #. ForTranslators: Question marks ("?") are used as prefix for function names. #. Leave the question marks attached to the string placeholders. -#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883 +#: src/generic/apt/matching/parse.cc:878 src/generic/apt/matching/parse.cc:887 #, c-format msgid "" "The ?%s term must be used in a \"wide\" context (a top-level context, or a " @@ -3030,33 +3040,33 @@ msgid "" msgstr "" "?%s 匹配器必须在“宽”上下文中使用(顶层上下文,或者被 ?%s 包含的上下文)。" -#: src/generic/apt/matching/parse.cc:1113 +#: src/generic/apt/matching/parse.cc:1117 msgid "Unmatched '('" msgstr "不匹配的“(”" -#: src/generic/apt/matching/parse.cc:1261 +#: src/generic/apt/matching/parse.cc:1265 msgid "Provides: cannot be broken" msgstr "“提供”类型不可能损坏" -#: src/generic/apt/matching/parse.cc:1317 +#: src/generic/apt/matching/parse.cc:1321 #, c-format msgid "Unknown pattern type: %c" msgstr "未知的模式类型:%c" -#: src/generic/apt/matching/parse.cc:1331 +#: src/generic/apt/matching/parse.cc:1335 msgid "Can't search for \"\"" msgstr "无法搜索“”" -#: src/generic/apt/matching/parse.cc:1359 +#: src/generic/apt/matching/parse.cc:1363 msgid "Unexpected empty expression" msgstr "意外的空表达式" -#: src/generic/apt/matching/parse.cc:1388 +#: src/generic/apt/matching/parse.cc:1392 #, c-format msgid "Badly formed expression: expected '|', got '%c'" msgstr "错误格式的表达式:期望 '|',得到了 '%c'" -#: src/generic/apt/matching/parse.cc:1435 +#: src/generic/apt/matching/parse.cc:1439 msgid "Unexpected ')'" msgstr "意外的“)”" @@ -3875,22 +3885,22 @@ msgstr "内部错误:临时套接字名 \"%s\" 太长!" msgid "%s: Unable to accept a connection: %s" msgstr "%s:无法接受连接:%s" -#: src/gtk/dpkg_terminal.cc:533 +#: src/gtk/dpkg_terminal.cc:532 #, c-format msgid "[%s] dpkg process starting...\n" msgstr "[%s] dpkg 处理正在启动...\n" -#: src/gtk/dpkg_terminal.cc:566 +#: src/gtk/dpkg_terminal.cc:565 #, c-format msgid "[%s] dpkg process complete.\n" msgstr "[%s] dpkg 处理完成。\n" -#: src/gtk/dpkg_terminal.cc:569 +#: src/gtk/dpkg_terminal.cc:568 #, c-format msgid "[%s] dpkg process failed.\n" msgstr "[%s] dpkg 处理失败。\n" -#: src/gtk/dpkg_terminal.cc:572 +#: src/gtk/dpkg_terminal.cc:571 #, c-format msgid "[%s] dpkg process complete; there are more packages left to process.\n" msgstr "[%s] dpkg 处理完成;有更多剩余的包要处理。\n" @@ -4510,7 +4520,7 @@ msgstr "" msgid "Virtual package" msgstr "虚报" -#: src/gtk/resolver.cc:246 src/solution_fragment.cc:452 +#: src/gtk/resolver.cc:246 src/solution_fragment.cc:455 msgid "Not Installed" msgstr "未安装的" @@ -4668,197 +4678,203 @@ msgstr "%s 替代 %s" msgid "%s obsoletes %s" msgstr "%s 过期 %s" -#: src/gtk/resolver.cc:1373 src/gtk/resolver.cc:1838 +#: src/gtk/resolver.cc:1264 src/solution_fragment.cc:154 +#, fuzzy, c-format +#| msgid "%s replaces %s" +msgid "%s enhances %s" +msgstr "%s 替代 %s" + +#: src/gtk/resolver.cc:1376 src/gtk/resolver.cc:1841 #: src/solution_screen.cc:272 msgid "Remove the following packages:" msgstr "删除下列软件包:" -#: src/gtk/resolver.cc:1387 src/gtk/resolver.cc:1850 +#: src/gtk/resolver.cc:1390 src/gtk/resolver.cc:1853 #: src/solution_screen.cc:296 msgid "Install the following packages:" msgstr "安装下列软件包:" -#: src/gtk/resolver.cc:1400 src/gtk/resolver.cc:1862 +#: src/gtk/resolver.cc:1403 src/gtk/resolver.cc:1865 msgid "Keep the following packages:" msgstr "保持下列软件包:" -#: src/gtk/resolver.cc:1413 src/gtk/resolver.cc:1874 +#: src/gtk/resolver.cc:1416 src/gtk/resolver.cc:1877 #: src/solution_screen.cc:308 msgid "Upgrade the following packages:" msgstr "升级下列软件包:" -#: src/gtk/resolver.cc:1426 src/gtk/resolver.cc:1887 +#: src/gtk/resolver.cc:1429 src/gtk/resolver.cc:1890 #: src/solution_screen.cc:320 msgid "Downgrade the following packages:" msgstr "降级下列软件包:" -#: src/gtk/resolver.cc:1439 src/gtk/resolver.cc:1900 +#: src/gtk/resolver.cc:1442 src/gtk/resolver.cc:1903 msgid "Leave the following dependencies unresolved:" msgstr "保留下列未解决的依赖关系:" -#: src/gtk/resolver.cc:1516 +#: src/gtk/resolver.cc:1519 #, c-format msgid "Remove %s [<big>%s</big> (%s)]" msgstr "删除 %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1523 +#: src/gtk/resolver.cc:1526 #, c-format msgid "Install %s [<big>%s</big> (%s)]" msgstr "安装 %s [<big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1531 +#: src/gtk/resolver.cc:1534 #, c-format msgid "Cancel the installation of %s" msgstr "取消 %s 的安装" -#: src/gtk/resolver.cc:1534 +#: src/gtk/resolver.cc:1537 #, c-format msgid "Cancel the removal of %s" msgstr "取消删除 %s" -#: src/gtk/resolver.cc:1537 +#: src/gtk/resolver.cc:1540 #, c-format msgid "Keep %s at version <big>%s</big> (%s)" msgstr "保持 %s 在版本 <big>%s</big> (%s)" -#: src/gtk/resolver.cc:1544 +#: src/gtk/resolver.cc:1547 #, c-format msgid "Upgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "升级 %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1553 +#: src/gtk/resolver.cc:1556 #, c-format msgid "Downgrade %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" msgstr "降级 %s [<big>%s</big> (%s) -> <big>%s</big> (%s)]" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>Remove</b> %s" msgstr "<b>移除</b> %s" -#: src/gtk/resolver.cc:1612 +#: src/gtk/resolver.cc:1615 #, c-format msgid "<b>remove</b> %s" msgstr "<b>移除</b> %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>Keep</b> %s at version %s" msgstr "<b>保持</b> %s 在版本 %s" -#: src/gtk/resolver.cc:1621 +#: src/gtk/resolver.cc:1624 #, c-format msgid "<b>keep</b> %s at version %s" msgstr "<b>保持</b> %s 在版本 %s" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>Cancel</b> the installation of %s" msgstr "<b>取消</b> %s 的安装。" -#: src/gtk/resolver.cc:1629 +#: src/gtk/resolver.cc:1632 #, c-format msgid "<b>cancel</b> the installation of %s" msgstr "<b>取消</b> %s 的安装。" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>Install</b> %s %s" msgstr "<b>安装</b> %s %s" -#: src/gtk/resolver.cc:1636 +#: src/gtk/resolver.cc:1639 #, c-format msgid "<b>install</b> %s %s" msgstr "<b>安装</b> %s %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>Downgrade</b> %s to version %s" msgstr "<b>降级</b> %s 到版本 %s" -#: src/gtk/resolver.cc:1645 +#: src/gtk/resolver.cc:1648 #, c-format msgid "<b>downgrade</b> %s to version %s" msgstr "<b>降级</b> %s 到版本 %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>Upgrade</b> %s to version %s" msgstr "<b>升级</b> %s 到版本 %s" -#: src/gtk/resolver.cc:1654 +#: src/gtk/resolver.cc:1657 #, c-format msgid "<b>upgrade</b> %s to version %s" msgstr "<b>升级</b> %s 到版本 %s" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "Leave %s unresolved" msgstr "遗留 %s 为未解决的" -#: src/gtk/resolver.cc:1667 +#: src/gtk/resolver.cc:1670 #, c-format msgid "leave %s unresolved" msgstr "遗留 %s 为未解决的" -#: src/gtk/resolver.cc:1735 +#: src/gtk/resolver.cc:1738 #, c-format msgid "%s install" msgid_plural "%s installs" msgstr[0] "%s 安装" -#: src/gtk/resolver.cc:1740 +#: src/gtk/resolver.cc:1743 #, c-format msgid "%s remove" msgid_plural "%s removes" msgstr[0] "%s 删除" -#: src/gtk/resolver.cc:1746 +#: src/gtk/resolver.cc:1749 #, c-format msgid "%s keep" msgid_plural "%s keeps" msgstr[0] "%s 保持" -#: src/gtk/resolver.cc:1752 +#: src/gtk/resolver.cc:1755 #, c-format msgid "%s upgrade" msgid_plural "%s upgrades" msgstr[0] "%s 升级" -#: src/gtk/resolver.cc:1758 +#: src/gtk/resolver.cc:1761 #, c-format msgid "%s downgrade" msgid_plural "%s downgrades" msgstr[0] "%s 降级" -#: src/gtk/resolver.cc:1764 +#: src/gtk/resolver.cc:1767 #, c-format msgid "%s unresolved recommendation" msgid_plural "%s unresolved recommendations" msgstr[0] "%s 未解决的推荐" -#: src/gtk/resolver.cc:2056 +#: src/gtk/resolver.cc:2059 msgid "No solutions yet." msgstr "还解决方案。" -#: src/gtk/resolver.cc:2063 +#: src/gtk/resolver.cc:2066 msgid "No dependency solution was found." msgstr "没有发现依赖关系解决方案。" -#: src/gtk/resolver.cc:2064 +#: src/gtk/resolver.cc:2067 msgid "No solutions." msgstr "没有解决方案" -#: src/gtk/resolver.cc:2075 +#: src/gtk/resolver.cc:2078 msgid "To view a solution, select it from the list to the right." msgstr "要查看解决方案,从列表中选择其到右侧。" -#: src/gtk/resolver.cc:2076 +#: src/gtk/resolver.cc:2079 #, c-format msgid "%u solutions." msgstr "%u 解决方案。" -#: src/gtk/resolver.cc:2106 +#: src/gtk/resolver.cc:2109 #, c-format msgid "Solution %s of %s." msgstr "解决方案 %s (共 %s 个)。" @@ -5154,12 +5170,12 @@ msgstr " Gtk+ 支持已禁用\n" #: src/main.cc:179 #, fuzzy, c-format #| msgid "%s %s compiled at %s %s\n" -msgid " Compiled with Qt 4.6.2 %s\n" +msgid " Compiled with Qt %s\n" msgstr "%s %s 编译于 %s %s\n" #: src/main.cc:180 #, c-format -msgid " Running on Qt 4.6.2 %s\n" +msgid " Running on Qt %s\n" msgstr "" #: src/main.cc:182 @@ -5290,43 +5306,53 @@ msgid " show - Display detailed information about a package.\n" msgstr " show - 显示一个软件包的详细信息。\n" #: src/main.cc:213 +#, fuzzy, c-format +#| msgid " show - Display detailed information about a package.\n" +msgid " versions - Displays the versions of specified packages.\n" +msgstr " show - 显示一个软件包的详细信息。\n" + +#: src/main.cc:214 #, c-format msgid " clean - Erase downloaded package files.\n" msgstr " clean - 删除已下载的软件包文件。\n" -#: src/main.cc:214 +#: src/main.cc:215 #, c-format msgid " autoclean - Erase old downloaded package files.\n" msgstr " autoclean - 删除旧的已下载软件包文件。\n" -#: src/main.cc:215 +#: src/main.cc:216 #, c-format msgid " changelog - View a package's changelog.\n" msgstr " changelog - 查看一个软件包的变更日志。\n" -#: src/main.cc:216 +#: src/main.cc:217 #, c-format msgid " download - Download the .deb file for a package.\n" msgstr " download - 下载软件包的 .deb 文件。\n" -#: src/main.cc:217 +#: src/main.cc:218 #, c-format msgid "" " reinstall - Download and (possibly) reinstall a currently installed " "package.\n" msgstr " reinstall - 下载并(可能)重新安装一个现在已经安装了的软件包。\n" -#: src/main.cc:218 -#, c-format +#: src/main.cc:219 +#, fuzzy, c-format +#| msgid "" +#| " why - Show the manually installed packages that require a " +#| "package, or\n" +#| " why one or more packages would require the given package\n" msgid "" " why - Show the manually installed packages that require a package, " "or\n" -" why one or more packages would require the given package\n" +" why one or more packages would require the given package.\n" msgstr "" " why - 显示需要另一软件包的手动安装的软件包,或者\n" " 为什么一个或多个软件包需要给定的软件包。\n" -#: src/main.cc:220 +#: src/main.cc:221 #, c-format msgid "" " why-not - Show the manually installed packages that lead to a " @@ -5337,34 +5363,34 @@ msgstr "" " why-not - 显示导致与给定软件包包冲突的手动安装的包,或者为什么\n" " 如果安装一个或多个软件包会导致与给定软件包冲突。\n" -#: src/main.cc:224 +#: src/main.cc:225 #, c-format msgid " Options:\n" msgstr " 选项:\n" -#: src/main.cc:225 +#: src/main.cc:226 #, c-format msgid " -h This help text.\n" msgstr " -h 此帮助文本。\n" -#: src/main.cc:227 +#: src/main.cc:228 #, c-format msgid "" " --gui Use the GTK GUI even if disabled in the configuration.\n" msgstr " --gui 即使配置中禁用了,也要使用 GTK 图形用户界面。\n" -#: src/main.cc:229 +#: src/main.cc:230 #, c-format msgid " --no-gui Do not use the GTK GUI even if available.\n" msgstr " --no-gui 即使可用,也不使用 GTK 图形用户界面。\n" -#: src/main.cc:231 +#: src/main.cc:232 #, fuzzy, c-format #| msgid " -h This help text.\n" msgid " --qt Use the Qt GUI.\n" msgstr " -h 此帮助文本。\n" -#: src/main.cc:232 +#: src/main.cc:233 #, fuzzy, c-format #| msgid "" #| " --gui Use the GTK GUI even if disabled in the configuration.\n" @@ -5372,171 +5398,179 @@ msgid "" " --no-qt Do not use the Qt GUI even if enabled in the configuration.\n" msgstr " --gui 即使配置中禁用了,也要使用 GTK 图形用户界面。\n" -#: src/main.cc:234 +#: src/main.cc:235 #, c-format msgid " -s Simulate actions, but do not actually perform them.\n" msgstr " -s 模拟动作,但是并不真正执行。\n" -#: src/main.cc:235 +#: src/main.cc:236 #, c-format msgid "" " -d Only download packages, do not install or remove anything.\n" msgstr " -d 仅仅下载软件包,不安装或者卸载任何东西。\n" -#: src/main.cc:236 -#, c-format -msgid " -P Always prompt for confirmation or actions.\n" +#: src/main.cc:237 +#, fuzzy, c-format +#| msgid " -P Always prompt for confirmation or actions.\n" +msgid " -P Always prompt for confirmation of actions.\n" msgstr " -P 总是提示确认执行动作。\n" -#: src/main.cc:237 +#: src/main.cc:238 #, c-format msgid "" " -y Assume that the answer to simple yes/no questions is 'yes'.\n" msgstr " -y 假设对简单的 yes/no 问题回答“yes”。\n" -#: src/main.cc:238 +#: src/main.cc:239 #, c-format msgid "" " -F format Specify a format for displaying search results; see the " "manual.\n" msgstr " -F 格式 指定显示搜索结果的格式;参见手册。\n" -#: src/main.cc:239 +#: src/main.cc:240 #, c-format msgid "" " -O order Specify how search results should be sorted; see the " "manual.\n" msgstr " -O 次序 指定如何排列显示搜索结果;参见手册。\n" -#: src/main.cc:240 +#: src/main.cc:241 #, c-format msgid "" " -w width Specify the display width for formatting search results.\n" msgstr " -w 宽度 指定显示搜索结果的格式宽度。\n" -#: src/main.cc:241 +#: src/main.cc:242 #, c-format msgid " -f Aggressively try to fix broken packages.\n" msgstr " -f 积极地尝试修复损坏的软件包。\n" -#: src/main.cc:242 +#: src/main.cc:243 #, c-format msgid " -V Show which versions of packages are to be installed.\n" msgstr " -V 显示就要安装的软件包版本。\n" -#: src/main.cc:243 +#: src/main.cc:244 #, c-format msgid "" " -D Show the dependencies of automatically changed packages.\n" msgstr " -D 显示自动改变的软件包的依赖关系\n" -#: src/main.cc:244 +#: src/main.cc:245 #, c-format msgid " -Z Show the change in installed size of each package.\n" msgstr " -Z\t\t 显示每个软件包的安装尺寸的变化。\n" -#: src/main.cc:245 +#: src/main.cc:246 #, c-format msgid "" " -v Display extra information. (may be supplied multiple " "times).\n" msgstr " -v 显示附加信息。(可能会提供多次)。\n" -#: src/main.cc:246 +#: src/main.cc:247 #, c-format msgid "" " -t [release] Set the release from which packages should be installed.\n" msgstr " -t [release] 设置将要从中安装软件包的发布版本。\n" -#: src/main.cc:247 -#, c-format +#: src/main.cc:248 +#, fuzzy, c-format +#| msgid "" +#| " -q In command-line mode, suppress the incremental progress.\n" +#| " indicators.\n" msgid "" -" -q In command-line mode, suppress the incremental progress.\n" +" -q In command-line mode, suppress the incremental progress\n" " indicators.\n" msgstr " -q 在命令行状态下,不显示增量进度指示器。\n" -#: src/main.cc:249 +#: src/main.cc:250 #, c-format msgid " -o key=val Directly set the configuration option named 'key'.\n" msgstr " -o key=val 直接设置名为“key”的配置选项。\n" -#: src/main.cc:250 -#, c-format +#: src/main.cc:251 +#, fuzzy, c-format +#| msgid "" +#| " --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +#| " strong dependencies.\n" msgid "" -" --with(out)-recommends\tSpecify whether or not to treat recommends as.\n" +" --with(out)-recommends\tSpecify whether or not to treat recommends as\n" " strong dependencies.\n" msgstr " --with(out)-recommends\t指定是否将推荐处理为强依赖关系。\n" -#: src/main.cc:252 +#: src/main.cc:253 #, c-format msgid " -S fname Read the aptitude extended status info from fname.\n" msgstr " -S fname 从文件名中读取 aptitude 的扩展状态信息。\n" -#: src/main.cc:253 +#: src/main.cc:254 #, c-format msgid " -u Download new package lists on startup.\n" msgstr " -u 开始运行时下载新的软件包列表。\n" -#: src/main.cc:254 src/main.cc:256 -#, c-format -msgid " (terminal interface only)" +#: src/main.cc:255 src/main.cc:257 +#, fuzzy, c-format +#| msgid " (terminal interface only)" +msgid " (terminal interface only)\n" msgstr " (只有终端界面)" -#: src/main.cc:255 +#: src/main.cc:256 #, c-format msgid " -i Perform an install run on startup.\n" msgstr " -i 开始运行时执行安装。\n" -#: src/main.cc:258 +#: src/main.cc:259 #, c-format msgid " This aptitude does not have Super Cow Powers.\n" msgstr " 这个 aptitude 没有超级牛力。\n" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:392 +#: src/main.cc:393 msgid "trace" msgstr "跟踪" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:395 +#: src/main.cc:396 msgid "debug" msgstr "调试" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:398 +#: src/main.cc:399 msgid "info" msgstr "信息" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:401 +#: src/main.cc:402 msgid "warn" msgstr "警告" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:404 +#: src/main.cc:405 msgid "error" msgstr "错误" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:407 +#: src/main.cc:408 msgid "fatal" msgstr "致命错误" #. ForTranslators: This is a log level that the user can pass on #. the command-line or set in the configuration file. -#: src/main.cc:410 +#: src/main.cc:411 msgid "off" msgstr "关闭" #. ForTranslators: both the translated and the untranslated #. log level names are accepted here. -#: src/main.cc:478 +#: src/main.cc:479 #, c-format msgid "" "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", " @@ -5545,77 +5579,77 @@ msgstr "" "未知的日志级别名“%s” (可用的值有 \"trace\", \"debug\", \"info\", \"warn\", " "\"error\", \"fatal\", or \"off\")。" -#: src/main.cc:487 +#: src/main.cc:488 #, c-format msgid "Invalid logger name \"%s\"." msgstr "无效日志记录名 %s。" -#: src/main.cc:769 +#: src/main.cc:761 #, c-format msgid "Expected a number after -q=\n" msgstr "在 -q= 之后需要一个数字\n" -#: src/main.cc:778 +#: src/main.cc:770 #, c-format msgid "Expected a number after -q=, got %s\n" msgstr "在 -q= 之后需要一个数字,但却得到 %s\n" -#: src/main.cc:802 +#: src/main.cc:794 #, c-format msgid "-o requires an argument of the form key=value, got %s\n" msgstr "-o 要求参数格式为 key=val,却接受到 %s\n" -#: src/main.cc:900 +#: src/main.cc:884 #, c-format msgid "No comma following tag name \"%s\".\n" msgstr "标签名“%s”后没有逗号。\n" -#: src/main.cc:992 src/main.cc:1002 +#: src/main.cc:976 src/main.cc:986 msgid "WEIRDNESS: unknown option code received\n" msgstr "“诡异”:收到未知的选项代码\n" -#: src/main.cc:1020 +#: src/main.cc:1004 msgid "--show-package-names|never" msgstr "--show-package-names|never" -#: src/main.cc:1023 +#: src/main.cc:1007 msgid "--show-package-names|auto" msgstr "--show-package-names|auto" -#: src/main.cc:1026 +#: src/main.cc:1010 msgid "--show-package-names|always" msgstr "--show-package-names|always" -#: src/main.cc:1031 +#: src/main.cc:1015 #, c-format msgid "" "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or " "\"always\")." msgstr "无效的软件包名称显示模式 %s (应为 never、auto 或 always 之一)。" -#: src/main.cc:1037 +#: src/main.cc:1021 msgid "no-summary" msgstr "无摘要" -#: src/main.cc:1039 +#: src/main.cc:1023 msgid "first-package" msgstr "首个软件包" -#: src/main.cc:1041 +#: src/main.cc:1025 msgid "first-package-and-type" msgstr "首个软件包及类型" -#: src/main.cc:1043 +#: src/main.cc:1027 msgid "all-packages" msgstr "全部包" -#: src/main.cc:1045 +#: src/main.cc:1029 msgid "all-packages-with-dep-versions" msgstr "全部软件包及依赖版本" #. ForTranslators: "why" here is the aptitude command name and #. should not be translated. -#: src/main.cc:1051 +#: src/main.cc:1035 #, c-format msgid "" "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package" @@ -5626,14 +5660,14 @@ msgstr "" "\",\"first-package-and-type\",\"all-packages\" 或 \"all-packages-with-dep-" "versions\"。" -#: src/main.cc:1089 +#: src/main.cc:1073 msgid "" "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be " "specified\n" msgstr "" "选项 --auto-clean-on-startup,--clean-on-startup,-i 和 -u 只能指定一个\n" -#: src/main.cc:1098 +#: src/main.cc:1082 msgid "" "-u, -i, and --clean-on-startup may not be specified in command-line mode " "(eg, with 'install')" @@ -5641,21 +5675,21 @@ msgstr "" "选项 -u,-i 和 --clean-on-startup 不能在命令行模式中指定 (例如,和“install”一" "起)" -#: src/main.cc:1115 +#: src/main.cc:1099 msgid "-u, -i, and --clean-on-startup may not be specified with a command" msgstr "选项 -u,-i 和 --clean-on-startup 不能在和一个命令一起指定 " -#: src/main.cc:1226 +#: src/main.cc:1210 #, c-format msgid "Unknown command \"%s\"\n" msgstr "未知的命令“%s”\n" -#: src/main.cc:1238 src/main.cc:1323 +#: src/main.cc:1222 src/main.cc:1307 #, c-format msgid "Uncaught exception: %s\n" msgstr "未知的例外:%s\n" -#: src/main.cc:1242 src/main.cc:1327 +#: src/main.cc:1226 src/main.cc:1311 #, c-format msgid "" "Backtrace:\n" @@ -5664,7 +5698,8 @@ msgstr "" "回溯:\n" "%s\n" -#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/view_changelog.cc:168 +#: src/menu_text_layout.cc:43 src/menu_tree.cc:227 src/ui.cc:259 +#: src/view_changelog.cc:168 msgid "Search for: " msgstr "搜索:" @@ -6540,112 +6575,116 @@ msgstr "替代" msgid "obsoletes" msgstr "过期" -#: src/reason_fragment.cc:177 +#: src/reason_fragment.cc:45 +msgid "enhances" +msgstr "" + +#: src/reason_fragment.cc:178 #, c-format msgid " (provided by %F)" msgstr "(由 %F 提供)" -#: src/reason_fragment.cc:287 +#: src/reason_fragment.cc:288 #, c-format msgid "%F%s %F %F" msgstr "%F%s %F %F" -#: src/reason_fragment.cc:336 +#: src/reason_fragment.cc:337 msgid "" "If you select a package, an explanation of its current state will appear in " "this space." msgstr "如果您选择了一个软件包,其当前状态的描述将会出现在这片空间。" -#: src/reason_fragment.cc:370 +#: src/reason_fragment.cc:371 msgid "" "%B%s%b was installed automatically; it is being removed because all of the " "packages which depend upon it are being removed:" msgstr "" "%B%s%b 被自动安装;现在它将被删除,因为所有依赖于它的软件包都将被删除:" -#: src/reason_fragment.cc:374 +#: src/reason_fragment.cc:375 msgid "%B%s%b will be automatically removed because of dependency errors:" msgstr "由于依赖关系出错,%B%s%b 将被自动删除:" -#: src/reason_fragment.cc:378 +#: src/reason_fragment.cc:379 msgid "" "%B%s%b will be automatically installed to satisfy the following dependencies:" msgstr "%B%s%b 将被自动安装以满足下列依赖关系:" -#: src/reason_fragment.cc:384 src/reason_fragment.cc:396 +#: src/reason_fragment.cc:385 src/reason_fragment.cc:397 msgid "" "%B%s%b cannot be upgraded now, but if it could be, it would still be held at " "version %B%s%b." msgstr "%B%s%b 现在无法升级,但是如果可以升级的话,它仍将被保持在版本 %B%s%b。" -#: src/reason_fragment.cc:387 +#: src/reason_fragment.cc:388 msgid "" "%B%s%b will not be upgraded to version %B%s%b, to avoid breaking the " "following dependencies:" msgstr "%B%s%b 将不会被升级到版本 %B%s%b,以避免破坏下列依赖关系:" -#: src/reason_fragment.cc:399 +#: src/reason_fragment.cc:400 msgid "%B%s%b is currently installed." msgstr "%B%s%b 目前已安装。" -#: src/reason_fragment.cc:405 +#: src/reason_fragment.cc:406 msgid "%B%s%b is not currently installed." msgstr "%B%s%b 目前未被安装。" -#: src/reason_fragment.cc:413 +#: src/reason_fragment.cc:414 msgid "Some dependencies of %B%s%b are not satisfied:" msgstr "%B%s%b 的某些依赖关系未被满足:" -#: src/reason_fragment.cc:417 +#: src/reason_fragment.cc:418 msgid "%B%s%b will be downgraded." msgstr "%B%s%b 将被降级。" -#: src/reason_fragment.cc:424 +#: src/reason_fragment.cc:425 msgid "%B%s%b will not be upgraded to the forbidden version %B%s%b." msgstr "%B%s%b 将从不会升级到禁止的版本 %B%s%b。" -#: src/reason_fragment.cc:428 +#: src/reason_fragment.cc:429 msgid "" "%B%s%b could be upgraded to version %B%s%b, but it is being held at version " "%B%s%b." msgstr "%B%s%b 可以升级到版本 %B%s%b,但是它将被保持在版本%B%s%b。" -#: src/reason_fragment.cc:435 +#: src/reason_fragment.cc:436 msgid "%B%s%b will be re-installed." msgstr "%B%s%b 将被重新安装。" -#: src/reason_fragment.cc:439 +#: src/reason_fragment.cc:440 msgid "%B%s%b will be installed." msgstr "%B%s%b 将被安装。" -#: src/reason_fragment.cc:443 +#: src/reason_fragment.cc:444 msgid "%B%s%b will be removed." msgstr "%B%s%b 将被删除。" -#: src/reason_fragment.cc:448 +#: src/reason_fragment.cc:449 msgid "%B%s%b will be upgraded from version %B%s%b to version %B%s%b." msgstr "%B%s%b 将从版本 %B%s%b升级到版本%B%s%b。" -#: src/reason_fragment.cc:455 +#: src/reason_fragment.cc:456 msgid "%B%s%b is only partly installed; its installation will be completed." msgstr "%B%s%b 仅被部分安装;它的安装将会完成。" -#: src/reason_fragment.cc:487 +#: src/reason_fragment.cc:488 msgid "" "The following packages depend on %B%s%b and will be broken by its removal:" msgstr "下列软件包依赖于 %B%s%b,删除该软件包将使它们破损:" -#: src/reason_fragment.cc:490 +#: src/reason_fragment.cc:491 msgid "The following packages depend on %B%s%b and are broken:" msgstr "下列软件包依赖于 %B%s%b,它们目前是破损的:" -#: src/reason_fragment.cc:497 +#: src/reason_fragment.cc:498 msgid "" "The following packages conflict with %B%s%b and will be broken by its " "installation:" msgstr "下列软件包与 %B%s%b 相冲突,安装该软件包将使它们破损:" -#: src/reason_fragment.cc:530 +#: src/reason_fragment.cc:531 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b, or conflict with the currently " @@ -6654,37 +6693,37 @@ msgstr "" "下列软件包依赖于某一版本的 %B%s%b,该版本当前安装的版本 %B%s%b 不同,或者它们" "与当前安装的版本冲突:" -#: src/reason_fragment.cc:534 +#: src/reason_fragment.cc:535 msgid "" "The following packages conflict with %B%s%b, or depend on a version of it " "which is not going to be installed." msgstr "下列软件包与 %B%s%b 冲突,或者依赖于它的某一版本,该版本将不被安装。" -#: src/reason_fragment.cc:538 +#: src/reason_fragment.cc:539 msgid "The following packages conflict with %B%s%b:" msgstr "下列软件包与 %B%s%b 相冲突:" -#: src/reason_fragment.cc:543 +#: src/reason_fragment.cc:544 msgid "" "The following packages depend on a version of %B%s%b other than the " "currently installed version of %B%s%b:" msgstr "下列软件包依赖于某一版本的 %B%s%b,该版本当前安装的版本 %B%s%b 不同:" -#: src/reason_fragment.cc:547 +#: src/reason_fragment.cc:548 msgid "" "The following packages depend on a version of %B%s%b which is not going to " "be installed." msgstr "下列软件包依赖于 %B%s%b 的某一版本,该版本将不被安装。" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "upgraded" msgstr "已升级" -#: src/reason_fragment.cc:553 +#: src/reason_fragment.cc:554 msgid "downgraded" msgstr "已下载" -#: src/reason_fragment.cc:559 +#: src/reason_fragment.cc:560 msgid "" "The following packages depend on the currently installed version of %B%s%b " "(%B%s%b), or conflict with the version it will be %s to (%B%s%b), and will " @@ -6693,13 +6732,13 @@ msgstr "" "下列软件包依赖于当前安装版本的 %B%s%b ( %B%s%b ),或者与它将被 %s 至的版本 " "(%B%s%b)冲突,并且将会破损如果它是 %s。" -#: src/reason_fragment.cc:566 +#: src/reason_fragment.cc:567 msgid "" "The following packages conflict with version %B%s%b of %B%s%b, and will be " "broken if it is %s." msgstr "下列软件包与版本 %B%s%b 的 %B%s%b 冲突,并且将会破损如果它是 %s。" -#: src/reason_fragment.cc:571 +#: src/reason_fragment.cc:572 msgid "" "The following packages depend on version %B%s%b of %B%s%b, and will be " "broken if it is %s." @@ -6733,47 +6772,47 @@ msgstr "应用" msgid "Close" msgstr "关闭" -#: src/solution_fragment.cc:164 +#: src/solution_fragment.cc:167 #, c-format msgid "%s conflicts with %s [provided by %s %s]" msgstr "%s 和 %s 冲突 [由 %s %s 提供]" -#: src/solution_fragment.cc:177 +#: src/solution_fragment.cc:180 #, c-format msgid "Removing %s" msgstr "%s 删除中" -#: src/solution_fragment.cc:179 +#: src/solution_fragment.cc:182 #, c-format msgid "Installing %s %s (%s)" msgstr "正在安装 %s %s (%s)" -#: src/solution_fragment.cc:184 +#: src/solution_fragment.cc:187 #, c-format msgid "Leave %ls unresolved." msgstr "遗留 %ls 未解决。" -#: src/solution_fragment.cc:410 +#: src/solution_fragment.cc:413 msgid "%BRemove%b the following packages:%n" msgstr "%B删除%b 下列软件包:%n" -#: src/solution_fragment.cc:425 +#: src/solution_fragment.cc:428 msgid "%BInstall%b the following packages:%n" msgstr "%B安装%b 下列软件包:%n" -#: src/solution_fragment.cc:443 +#: src/solution_fragment.cc:446 msgid "%BKeep%b the following packages at their current version:%n" msgstr "%B保持%b 下列软件包于其当前版本:%n" -#: src/solution_fragment.cc:467 +#: src/solution_fragment.cc:470 msgid "%BUpgrade%b the following packages:%n" msgstr "%B升级%b 下列软件包:%n" -#: src/solution_fragment.cc:487 +#: src/solution_fragment.cc:490 msgid "%BDowngrade%b the following packages:%n" msgstr "%B降级%b 下列软件包:%n" -#: src/solution_fragment.cc:508 +#: src/solution_fragment.cc:511 #, c-format msgid "Leave the following dependencies unresolved:%n" msgstr "保留下列未解决的依赖关系:%n" @@ -6871,10 +6910,6 @@ msgstr "E:" msgid "W:" msgstr "W:" -#: src/ui.cc:259 -msgid "Search for:" -msgstr "搜索:" - #: src/ui.cc:341 msgid "" "WARNING: the package cache is opened in read-only mode! This change and all " @@ -7222,7 +7257,9 @@ msgid "Error while dumping resolver state" msgstr "存储依赖关系解决状态时出错" #: src/ui.cc:2235 -msgid "File to which the resolver state should be dumped:" +#, fuzzy +#| msgid "File to which the resolver state should be dumped:" +msgid "File to which the resolver state should be dumped: " msgstr "存储依赖关系解决状态的文件:" #: src/ui.cc:2265 @@ -7719,6 +7756,21 @@ msgid "You can only view changelogs of official Debian packages." msgstr "您只能查看官方 Debian 软件包的变更日志。" #~ msgid "" +#~ "%BOption:%b %s\n" +#~ "%BDefault:%b %s\n" +#~ "%BValue:%b %s\n" +#~ msgstr "" +#~ "%B选项:%b %s\n" +#~ "%B默认:%b %s\n" +#~ "%B值:%b %s\n" + +#~ msgid "Press Return to continue" +#~ msgstr "按回车继续" + +#~ msgid "Search for:" +#~ msgstr "搜索:" + +#~ msgid "" #~ "Unable to resolve dependencies for the upgrade (the resolver timed out)." #~ msgstr "未能为此升级解决依赖关系(解决器超时)。" |