[Aptitude-svn-commit] r3408 - in branches/aptitude-0.3/aptitude: . po
Christian Perrier
bubulle@costa.debian.org
Thu, 16 Jun 2005 08:28:05 +0000
Author: bubulle
Date: Thu Jun 16 08:28:01 2005
New Revision: 3408
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/po/zh_CN.po
Log:
Update Simplified Chinese translation
Closes: #314330
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Thu Jun 16 08:28:01 2005
@@ -1,3 +1,8 @@
+2005-06-15 Yongtao Yang <yongtao.yang@telia.com>
+
+ * Updated Simplified Chinese translation
+ Closes: #314330
+
2005-06-15 Daniel Burrows <dburrows@debian.org>
* src/broken_indicator.cc:
Modified: branches/aptitude-0.3/aptitude/po/zh_CN.po
==============================================================================
--- branches/aptitude-0.3/aptitude/po/zh_CN.po (original)
+++ branches/aptitude-0.3/aptitude/po/zh_CN.po Thu Jun 16 08:28:01 2005
@@ -7,7 +7,7 @@
"Project-Id-Version: aptitude 0.2.13\n"
"Report-Msgid-Bugs-To: submit@bugs.debian.org\n"
"POT-Creation-Date: 2005-06-12 22:42+0200\n"
-"PO-Revision-Date: 2005-04-28 20:41+1200\n"
+"PO-Revision-Date: 2005-06-15 20:48+0200\n"
"Last-Translator: Yongtao Yang <yongtao.yang@telia.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -45,17 +45,16 @@
msgstr "下载文件后暂停"
#: src/apt_options.cc:123
-#, fuzzy
msgid "Never"
-msgstr "服务器"
+msgstr "从不"
#: src/apt_options.cc:124
msgid "When an error occurs"
-msgstr ""
+msgstr "当错误发生时"
#: src/apt_options.cc:125
msgid "Always"
-msgstr ""
+msgstr "总是"
#: src/apt_options.cc:127
msgid "Use a 'status-line' download indicator for all downloads"
@@ -160,90 +159,85 @@
#: src/broken_indicator.cc:106 src/solution_dialog.cc:97
msgid "Internal error: unexpected null solution."
-msgstr ""
+msgstr "内部错误：意料之外的空解决方案。"
#: src/broken_indicator.cc:158
-#, fuzzy
msgid "Suggest "
-msgstr "建议"
+msgstr "建议 "
#: src/broken_indicator.cc:164
-#, fuzzy, c-format
+#, c-format
msgid "%d installs"
-msgstr "安装"
+msgstr "安装 %d 个包"
#: src/broken_indicator.cc:169
-#, fuzzy
msgid "1 install"
-msgstr "安装"
+msgstr "安装 1 个包"
#: src/broken_indicator.cc:173
#, c-format
msgid "%d removals"
-msgstr ""
+msgstr "删除 %d 个包"
#: src/broken_indicator.cc:178
msgid "1 removal"
-msgstr ""
+msgstr "删除 1 个包"
#: src/broken_indicator.cc:182
#, c-format
msgid "%d keeps"
-msgstr ""
+msgstr "保持 %d 个包"
#: src/broken_indicator.cc:187
msgid "1 keep"
-msgstr ""
+msgstr "保持 1 个包"
#: src/broken_indicator.cc:191
-#, fuzzy, c-format
+#, c-format
msgid "%d upgrades"
-msgstr "升级"
+msgstr "升级 %d 个包"
#: src/broken_indicator.cc:196
-#, fuzzy
msgid "1 upgrade"
-msgstr "升级"
+msgstr "升级 1 个包"
#: src/broken_indicator.cc:200
-#, fuzzy, c-format
+#, c-format
msgid "%d downgrades"
-msgstr "已下载"
+msgstr "下载 %d 个包"
#: src/broken_indicator.cc:205
-#, fuzzy
msgid "1 downgrade"
-msgstr "已下载"
+msgstr "下载 1 个包"
#: src/broken_indicator.cc:214
#, c-format
msgid "%s: Examine"
-msgstr ""
+msgstr "%s：检测"
#: src/broken_indicator.cc:216
#, c-format
msgid "%s: Apply"
-msgstr ""
+msgstr "%s：应用"
#: src/broken_indicator.cc:218
-#, fuzzy, c-format
+#, c-format
msgid "%s: Next"
-msgstr "下一个(^N)"
+msgstr "%s：下一个"
#: src/broken_indicator.cc:220
#, c-format
msgid "%s: Previous"
-msgstr ""
+msgstr "%s：上一个"
#: src/broken_indicator.cc:232
#, c-format
msgid "Solution search failed. %s: try harder"
-msgstr ""
+msgstr "未找到解决方案。%s：加把劲儿再试试"
#: src/broken_indicator.cc:237
-#, fuzzy
msgid "Unable to resolve dependencies."
-msgstr "无法打开 %s 以写入"
+msgstr "无法解决依赖关系。"
#: src/cmdline/cmdline_action.cc:36
#, c-format
@@ -397,17 +391,17 @@
#: src/cmdline/cmdline_clean.cc:80
#, c-format
msgid "Del %s %s [%sB]\n"
-msgstr ""
+msgstr "删除 %s %s [%sB]\n"
#: src/cmdline/cmdline_clean.cc:136
-#, fuzzy, c-format
+#, c-format
msgid "Would free %sB of disk space\n"
-msgstr "将释放 %sB 磁盘空间"
+msgstr "将释放 %sB 磁盘空间\n"
#: src/cmdline/cmdline_clean.cc:139
-#, fuzzy, c-format
+#, c-format
msgid "Freed %sB of disk space\n"
-msgstr "将释放 %sB 磁盘空间"
+msgstr "已释放 %sB 磁盘空间\n"
#: src/cmdline/cmdline_do_action.cc:71
#, c-format
@@ -704,105 +698,98 @@
msgstr "未发现软件包 -- 请在 ‘c’ 之后的那一行输入软件包名称。\n"
#: src/cmdline/cmdline_prompt.cc:610
-#, fuzzy
msgid "Press Return to continue"
-msgstr "按回车继续。"
+msgstr "按回车继续"
#: src/cmdline/cmdline_prompt.cc:621
#, c-format
msgid "y: %Fn: %Fi: %Fc: %Fd: %Fs: %Fv: %Fe: %F%n%F%n%F%F%F%F%F%F%F%F"
-msgstr ""
+msgstr "y: %Fn: %Fi: %Fc: %Fd: %Fs: %Fv: %Fe: %F%n%F%n%F%F%F%F%F%F%F%F"
#: src/cmdline/cmdline_prompt.cc:641
msgid "continue with the installation"
-msgstr ""
+msgstr "继续安装"
#: src/cmdline/cmdline_prompt.cc:643
msgid "abort and quit"
-msgstr ""
+msgstr "放弃并退出"
#: src/cmdline/cmdline_prompt.cc:645
msgid ""
"show information about one or more packages; the package names should follow "
"the 'i'"
-msgstr ""
+msgstr "显示一个或者多个软件包的信息；软件包的名字将在字符 'i' 之后。"
#: src/cmdline/cmdline_prompt.cc:647
msgid ""
"show the Debian changelogs of one or more packages; the package names should "
"follow the 'c'"
-msgstr ""
+msgstr "显示一个或者多个软件包的变更记录；软件包的名字将在字符 'c'之后。"
#: src/cmdline/cmdline_prompt.cc:649
msgid "toggle the display of dependency information"
-msgstr ""
+msgstr "切换是否显示依赖关系信息"
#: src/cmdline/cmdline_prompt.cc:651
-#, fuzzy
msgid "toggle the display of changes in package sizes"
-msgstr "查看软件包的显示格式"
+msgstr "切换是否显示软件包的大小"
#: src/cmdline/cmdline_prompt.cc:653
msgid "toggle the display of version numbers"
-msgstr ""
+msgstr "切换是否显示版本号"
#: src/cmdline/cmdline_prompt.cc:655
msgid "enter the full visual interface"
-msgstr ""
+msgstr "进入全可视化界面"
#: src/cmdline/cmdline_prompt.cc:656
msgid ""
-"You may also specify modifaction to the actions which will be taken. To do "
+"You may also specify modification to the actions which will be taken. To do "
"so, type an action character followed by one or more package names (or "
"patterns). The action will be applied to all the packages that you list. "
"The following actions are available:"
msgstr ""
+"您也可以对将要实施的动作进行修改。方法是，输入一个动作字符后输入一个或者多个"
+"软件包的名称(或者模式)。该动作将被实施到您所选择的全部软件包。下列动作可供选"
+"择："
#: src/cmdline/cmdline_prompt.cc:661 src/cmdline/cmdline_resolver.cc:120
-#, fuzzy
msgid "'+' to install packages"
-msgstr "安装/卸载软件包(^I)"
+msgstr "按'+'键来安装软件包"
#: src/cmdline/cmdline_prompt.cc:663 src/cmdline/cmdline_resolver.cc:122
-#, fuzzy
msgid ""
"'+M' to install packages and immediately flag them as automatically installed"
-msgstr "下列软件包将被自动安装："
+msgstr "按'+M'安装软件包并且立即将它们标记为已安装状态"
#: src/cmdline/cmdline_prompt.cc:665 src/cmdline/cmdline_resolver.cc:124
-#, fuzzy
msgid "'-' to remove packages"
-msgstr "安装/卸载软件包(^I)"
+msgstr "按'-'卸载软件包"
#: src/cmdline/cmdline_prompt.cc:667 src/cmdline/cmdline_resolver.cc:126
-#, fuzzy
msgid "'_' to purge packages"
-msgstr "忘记新软件包(^F)"
+msgstr "按'_'清除软件包"
#: src/cmdline/cmdline_prompt.cc:669 src/cmdline/cmdline_resolver.cc:128
-#, fuzzy
msgid "'=' to place packages on hold"
-msgstr " hold - 将软件包置于保持状态\n"
+msgstr "按'='将软件包置于保持状态"
#: src/cmdline/cmdline_prompt.cc:671 src/cmdline/cmdline_resolver.cc:130
msgid ""
"':' to keep packages in their current state without placing them on hold"
-msgstr ""
+msgstr "按':'将维持软件包当前状态但是并不将其置于保持状态"
#: src/cmdline/cmdline_prompt.cc:673 src/cmdline/cmdline_resolver.cc:132
-#, fuzzy
msgid "'&M' to mark packages as automatically installed"
-msgstr " markauto - 将软件包标记为自动安装\n"
+msgstr "按'&M'将软件包标记为自动安装"
#: src/cmdline/cmdline_prompt.cc:675 src/cmdline/cmdline_resolver.cc:134
-#, fuzzy
msgid "'&m' to mark packages as manually installed"
-msgstr " unmarkauto - 将软件包标记为手动安装\n"
+msgstr "按'm'将软件包标记为手动安装"
#: src/cmdline/cmdline_prompt.cc:677
-#, fuzzy
msgid "Commands:"
-msgstr "推荐"
+msgstr "命令："
#: src/cmdline/cmdline_prompt.cc:732
msgid "Do you want to continue? [Y/n/?] "
@@ -882,60 +869,57 @@
#: src/cmdline/cmdline_resolver.cc:93
#, c-format
msgid "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
-msgstr ""
+msgstr "y: %Fn: %Fq: %F,: %F.: %F<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
#: src/cmdline/cmdline_resolver.cc:108
msgid "accept the proposed changes"
-msgstr ""
+msgstr "接受所建议的变动"
#: src/cmdline/cmdline_resolver.cc:110
msgid "reject the proposed changes and search for another solution"
-msgstr ""
+msgstr "拒绝所建议的变动并寻找另一个解决方案"
#: src/cmdline/cmdline_resolver.cc:112
-#, fuzzy
msgid "give up and quit the program"
-msgstr "退出此程序"
+msgstr "放弃并退出此程序"
#: src/cmdline/cmdline_resolver.cc:114
msgid "move to the next solution"
-msgstr ""
+msgstr "到下一个解决方案"
#: src/cmdline/cmdline_resolver.cc:116
msgid "move to the previous solution"
-msgstr ""
+msgstr "到上一个解决方案"
#: src/cmdline/cmdline_resolver.cc:118
msgid "adjust the state of the listed packages, where ACTION is one of:"
-msgstr ""
+msgstr "修改所列软件包的状态，这里“状态”为下列项之一："
#: src/cmdline/cmdline_resolver.cc:136
msgid ""
"Adjustments will cause the current solution to be discarded and recalculated "
"as necessary."
-msgstr ""
+msgstr "修改将导致当前解决方案被放弃或者必须重新计算。"
#: src/cmdline/cmdline_resolver.cc:169
-#, fuzzy
msgid "The following actions will resolve these dependencies:"
-msgstr "下列软件包存在未满足的依赖关系：\n"
+msgstr "下列动作将解决这些依赖关系："
#: src/cmdline/cmdline_resolver.cc:184
msgid "Accept this solution? [Y/n/q/?] "
-msgstr ""
+msgstr "是否接受该解决方案？[Y/n/q/?] "
#: src/cmdline/cmdline_resolver.cc:212 src/cmdline/cmdline_resolver.cc:285
msgid "Abandoning all efforts to resolve these dependencies."
-msgstr ""
+msgstr "放弃解决这些依赖关系的全部努力。"
#: src/cmdline/cmdline_resolver.cc:222
-#, fuzzy
msgid "The following commands are available:"
-msgstr "下列软件包是“破损”的："
+msgstr "下列命令可选："
#: src/cmdline/cmdline_resolver.cc:237
msgid "File to write resolver state to: "
-msgstr ""
+msgstr "将依赖关系解决状态写入文件："
#: src/cmdline/cmdline_resolver.cc:240 src/generic/apt.cc:142
#, c-format
@@ -943,31 +927,29 @@
msgstr "无法打开 %s 以写入"
#: src/cmdline/cmdline_resolver.cc:245
-#, fuzzy, c-format
+#, c-format
msgid "Error writing resolver state to %s"
-msgstr "写入状态文件时发生错误"
+msgstr "将依赖关系解决状态写入文件 %s 时发生错误"
#: src/cmdline/cmdline_resolver.cc:250
-#, fuzzy
msgid "Invalid response; please enter one of the following commands:"
-msgstr "非法响应。请输入一个合法命令或者‘?’请求帮助。\n"
+msgstr "非法响应；请输入下列命令之一："
#: src/cmdline/cmdline_resolver.cc:260
msgid "No solution found within the allotted time. Try harder? [Y/n]"
-msgstr ""
+msgstr "在分配的时间内未找到解决方案。加把劲再试试？[Y/n]"
#: src/cmdline/cmdline_resolver.cc:288
-#, fuzzy
msgid "Invalid response; please enter 'y' or 'n'."
-msgstr "非法响应。请输入一个合法命令或者‘?’请求帮助。\n"
+msgstr "非法响应；请输入 'y' 或者 'n'。"
#: src/cmdline/cmdline_resolver.cc:297
msgid "Unable to resolve dependencies! Giving up..."
-msgstr ""
+msgstr "未能解决依赖关系！放弃..."
#: src/cmdline/cmdline_resolver.cc:302
msgid "No more solutions."
-msgstr ""
+msgstr "没有更多的解决方案了。"
#: src/cmdline/cmdline_search.cc:76
#, c-format
@@ -982,7 +964,7 @@
#: src/cmdline/cmdline_show.cc:119 src/cmdline/cmdline_show.cc:305
#: src/solution_fragment.cc:65
msgid "<NULL>"
-msgstr ""
+msgstr "<NULL>"
#: src/cmdline/cmdline_show.cc:138
msgid "not installed"
@@ -1031,7 +1013,7 @@
#: src/cmdline/cmdline_show.cc:189 src/cmdline/cmdline_show.cc:204
#, c-format
msgid "%s; will be purged"
-msgstr "%s；将被删除"
+msgstr "%s；将被清除"
#: src/cmdline/cmdline_show.cc:202
#, c-format
@@ -1263,7 +1245,7 @@
#: src/download.cc:113
msgid "List Update"
-msgstr ""
+msgstr "列表更新"
#: src/download.cc:160
msgid "Couldn't clean out list directories"
@@ -1387,9 +1369,8 @@
msgstr "查看软件包下载的进程"
#: src/download.cc:332
-#, fuzzy
msgid "Package Download"
-msgstr "软件包："
+msgstr "软件包下载"
#: src/download.cc:354
msgid "Internal error: couldn't generate list of packages to download"
@@ -1435,7 +1416,7 @@
#: src/download_list.cc:57
#, c-format
msgid "%n%nSome files were not downloaded successfully."
-msgstr ""
+msgstr "%n%n某些文件无法下载。"
#: src/download_list.cc:66
msgid "Continue"
@@ -1667,29 +1648,29 @@
msgstr "正在读取任务描述"
#: src/load_config.cc:42
-#, fuzzy, c-format
+#, c-format
msgid "Unrecognized color name \"%s\""
-msgstr "无法识别的任务"
+msgstr "无法识别的颜色名 “%s”"
#: src/load_config.cc:69
-#, fuzzy, c-format
+#, c-format
msgid "Unrecognized attribute name \"%s\""
-msgstr "无法识别的任务"
+msgstr "无法识别的属性名“%s”"
#: src/load_config.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "Invalid entry in style definition group: \"%s\""
msgstr "颜色定义组中的无效条目：“%s”"
#: src/load_config.cc:108
-#, fuzzy, c-format
+#, c-format
msgid "Invalid tagless entry in style definition group: \"%s\""
-msgstr "颜色定义组中无效的无标签条目：“%s”"
+msgstr "风格定义组中无效的无标签条目：“%s”"
#: src/load_config.cc:130
-#, fuzzy, c-format
+#, c-format
msgid "Unknown style attribute %s"
-msgstr "未知的操作类型：%s"
+msgstr "未知的风格属性 %s"
#: src/load_config.cc:153 src/load_config.cc:155
#, c-format
@@ -2118,16 +2099,16 @@
#: src/main.cc:402 src/main.cc:450
msgid "Internal error: uncaught 'out of solutions' exception.\n"
-msgstr ""
+msgstr "内部错误：未被捕获的意外“缺少解决方案”。\n"
#: src/main.cc:407 src/main.cc:455
msgid "Internal error: uncaught 'out of time' exception.\n"
-msgstr ""
+msgstr "内部错误：未被捕获的意外“用时已尽”。\n"
#: src/main.cc:414
#, c-format
msgid "Warning: the visual interface will ignore -s/Cmdline::Simulate\n"
-msgstr ""
+msgstr "警告：可视化界面将忽略 -s/Cmdline::Simulate\n"
#: src/mine/cmine.cc:93
#, c-format
@@ -2584,7 +2565,6 @@
" “基本”部分的软件包是初始系统安装的一部分。"
#: src/pkg_grouppolicy.cc:158
-#, fuzzy
msgid ""
"Programs for faxmodems and other communications devices\n"
" Packages in the 'comm' section are used to control modems and other "
@@ -2595,8 +2575,8 @@
msgstr ""
"用于传真调制解调器和其它通讯设备的程序\n"
" “通讯”部分的软件包用于控制调制解调器和其它硬件通讯设备。包括控制传真调制解调"
-"器的软件(例如，用于拨号网络连接的 PPP)以及原本为该用途所编写的程序(zmodem/"
-"kermit)，还有用于控制蜂窝式移动电话，与 FidoNet 接口，以及运行 BBS 的软件"
+"器的软件(例如，用于拨号网络连接的 PPP 以及最初为该用途所编写的程序如 zmodem/"
+"kermit，还有用于控制蜂窝式移动电话，与 FidoNet 的接口，以及运行 BBS 的软件"
#: src/pkg_grouppolicy.cc:159
msgid ""
@@ -2999,7 +2979,6 @@
"在“主要”部分中。"
#: src/pkg_grouppolicy.cc:193
-#, fuzzy
msgid ""
"Programs which are not free software\n"
" Packages in the 'non-free' section are not part of Debian.\n"
@@ -3018,7 +2997,7 @@
" 这些软件包不满足 Debian 自由软件标准(见下)的一项或者多项要求。您应该阅读该部"
"分程序的许可证以确认您能够以您自己希望的方式使用这些程序。\n"
" .\n"
-" 关于 Debian 认为什么样的软件是自由软件的更多信息，请参见http://www.debian."
+" 要得到 Debian 认为什么样的软件是自由软件的更多信息，请参见http://www.debian."
"org/social_contract#guidelines"
#: src/pkg_grouppolicy.cc:195
@@ -3067,7 +3046,6 @@
" 这些软件包有新版本可用。"
#: src/pkg_grouppolicy.cc:320
-#, fuzzy
msgid ""
"New Packages\n"
" These packages have been added to Debian since the last time you cleared "
@@ -3318,15 +3296,12 @@
msgstr "是的，我知道这是一个非常糟糕的主意"
#: src/pkg_item.cc:80
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s is an essential package!%n%nAre you sure you want to remove it?%nType '%"
"s' if you are."
msgstr ""
-"%s 是一个核心软件包！\n"
-"\n"
-"您确定您要卸载它吗？\n"
-"如果您确定的话输入“%s”。"
+"%s 是一个核心软件包！%n%n 您确定您要卸载它吗？%n 如果您确定的话输入“%s”。"
#: src/pkg_item.cc:220 src/pkg_ver_item.cc:626
#, c-format
@@ -3336,17 +3311,17 @@
#: src/pkg_item.cc:222 src/pkg_ver_item.cc:628
#, c-format
msgid "%s info"
-msgstr ""
+msgstr "%s 信息"
#: src/pkg_item.cc:308
-#, fuzzy, c-format
+#, c-format
msgid "Available versions of %s"
-msgstr "可用的版本 "
+msgstr "%s 的可用版本"
#: src/pkg_item.cc:311
-#, fuzzy, c-format
+#, c-format
msgid "%s versions"
-msgstr "版本号"
+msgstr "%s 版本号"
#: src/pkg_item.cc:323 src/pkg_ver_item.cc:656
#, c-format
@@ -3356,7 +3331,7 @@
#: src/pkg_item.cc:325 src/pkg_ver_item.cc:658
#, c-format
msgid "%s deps"
-msgstr ""
+msgstr "%s 依赖"
#: src/pkg_item.cc:336 src/pkg_ver_item.cc:668
#, c-format
@@ -3366,7 +3341,7 @@
#: src/pkg_item.cc:338 src/pkg_ver_item.cc:670
#, c-format
msgid "%s reverse deps"
-msgstr ""
+msgstr "%s 反向依赖"
#: src/pkg_item.cc:390 src/pkg_ver_item.cc:708
#, c-format
@@ -3374,16 +3349,13 @@
msgstr "报告 %s 中的错误\n"
#: src/pkg_item.cc:412
-#, fuzzy
msgid ""
"You are not root and I cannot find any way to become root. To reconfigure "
"this package, install the menu package, the login package, or run aptitude "
"as root."
msgstr ""
-"您不是 root，而且我没有发现任何方法\n"
-"来变成 root。要重新配置这个软件包，\n"
-"请安装 menu 软件包，login 软件包，\n"
-"或者以 root 身份运行 aptitude 。"
+"您不是 root，而且我没有发现任何方法来变成 root。要重新配置这个软件包，请安装 "
+"menu 软件包，login 软件包，或者以 root 身份运行 aptitude 。"
#: src/pkg_item.cc:420
#, c-format
@@ -3395,7 +3367,6 @@
msgstr "层次编辑器"
#: src/pkg_item.cc:445
-#, fuzzy
msgid "Hierarchy Editor"
msgstr "层次编辑器"
@@ -3636,16 +3607,15 @@
#: src/solution_dialog.cc:74
msgid "The package cache is not available."
-msgstr ""
+msgstr "软件包 cache 不可用。"
#: src/solution_dialog.cc:82
-#, fuzzy
msgid "No packages are broken."
-msgstr "某些包已破损。试图修补它们吗？"
+msgstr "没有破损的软件包。"
#: src/solution_dialog.cc:103
msgid "No resolution found."
-msgstr ""
+msgstr "未发现任何解决方案。"
#: src/solution_dialog.cc:107
#, c-format
@@ -3653,59 +3623,53 @@
"Time exhausted while searching for a solution (you can select \"Next Solution"
"\" or press %s to try harder)."
msgstr ""
+"寻找解决方案时用时已尽 (您可以选择 “下一个方案”或者按 %s 以更努力地再试一"
+"次)。"
#: src/solution_dialog.cc:146
-#, fuzzy
msgid "Previous"
-msgstr "提供"
+msgstr "上一个"
#: src/solution_dialog.cc:147
-#, fuzzy
msgid "Next"
-msgstr "下一个(^N)"
+msgstr "下一个"
#: src/solution_dialog.cc:148
msgid "Apply"
-msgstr ""
+msgstr "应用"
#: src/solution_dialog.cc:149
-#, fuzzy
msgid "Close"
-msgstr "关闭(^C)"
+msgstr "关闭"
#: src/solution_fragment.cc:134
-#, fuzzy
msgid "%BRemove%b the following packages:%n"
-msgstr "下列软件包是“破损”的："
+msgstr "%B删除%b 下列软件包：%n"
#: src/solution_fragment.cc:144
-#, fuzzy
msgid "%BInstall%b the following packages:%n"
-msgstr "下列软件包是“破损”的："
+msgstr "%B安装%b 下列软件包：%n"
#: src/solution_fragment.cc:157
msgid "%BKeep%b the following packages at their current version:%n"
-msgstr ""
+msgstr "%B保持%b 下列软件包于其当前版本：%n"
#: src/solution_fragment.cc:164
-#, fuzzy
msgid "Not Installed"
-msgstr "未安装"
+msgstr "未安装的"
#: src/solution_fragment.cc:177
-#, fuzzy
msgid "%BUpgrade%b the following packages:%n"
-msgstr "下列软件包是“破损”的："
+msgstr "%B升级%b 下列软件包：%n"
#: src/solution_fragment.cc:192
-#, fuzzy
msgid "%BDowngrade%b the following packages:%n"
-msgstr "正在下载软件包"
+msgstr "%B将级%b 下列软件包：%n"
#: src/solution_fragment.cc:206
#, c-format
msgid "Score is %d"
-msgstr ""
+msgstr "分数是 %d"
#: src/trust.cc:17 src/trust.cc:19
msgid "WARNING"
@@ -3726,11 +3690,11 @@
#: src/ui.cc:171
msgid "E:"
-msgstr ""
+msgstr "E:"
#: src/ui.cc:173
msgid "W:"
-msgstr ""
+msgstr "W:"
#: src/ui.cc:193
msgid "Search for:"
@@ -3766,19 +3730,15 @@
msgstr "查看可选软件包以及选择要执行的动作"
#: src/ui.cc:663
-#, fuzzy
msgid ""
"Aptitude %s%n%nCopyright 2000-2005 Daniel Burrows.%n%naptitude comes with %"
"BABSOLUTELY NO WARRANTY%b; for details see 'license' in the Help menu. This "
"is free software, and you are welcome to redistribute it under certain "
"conditions; see 'license' for details."
msgstr ""
-"Aptitude %s\n"
-"\n"
-"版权所有 2000 Daniel Burrows.\n"
-"\n"
-"使用 Aptitude 软件无任何担保；细节请查阅帮助菜单的 'license' 项。\n"
-"该软件是自由软件，欢迎您遵照某些条款分发该软件；细节请查阅 'license' 文件"
+"Aptitude %s%n%n版权所有 2000 Daniel Burrows. %n%n 使用 Aptitude 软件%B无任何"
+"担保%b；细节请查阅帮助菜单的“license”项。该软件是自由软件，欢迎您遵照某些条款"
+"分发该软件；细节请查阅“license”文件"
#: src/ui.cc:684
msgid "help.txt"
@@ -3800,9 +3760,8 @@
"作。%n%n"
#: src/ui.cc:788
-#, fuzzy
msgid " %S*%N %s [version %s]%n"
-msgstr "版本号"
+msgstr " %S*%n %s [版本号 %s]%n"
#: src/ui.cc:795
msgid "Really Continue"
@@ -3821,34 +3780,30 @@
msgstr "查看以及/或者调整将要被执行的动作"
#: src/ui.cc:860
-#, fuzzy
msgid "Preview"
-msgstr "上一个(^P)"
+msgstr "预览"
#: src/ui.cc:896
-#, fuzzy
msgid "Some packages were broken and have been fixed:"
-msgstr "某些破损的包已经被修补！"
+msgstr "某些破损的包已经被修补:"
#: src/ui.cc:902
msgid "No solution to these dependency problems exists!"
-msgstr ""
+msgstr "这些依赖关系没有解决方案！"
#: src/ui.cc:908
-#, fuzzy, c-format
+#, c-format
msgid ""
"Ran out of time while trying to resolve dependencies (press \"%s\" to try "
"harder)"
-msgstr "通过找地雷来消磨时间"
+msgstr "试图搜寻解决方案时用时已尽 (按“%s”加把劲儿再试试)"
#: src/ui.cc:954
-#, fuzzy
msgid ""
"Installing/removing packages requires administrative privileges, which you "
"currently do not have. Would you like to change to the root account?"
msgstr ""
-"安装/删除软件包需要管理员权限，而您现在\n"
-"没有这种权限。您想要进入 root 帐号吗？\n"
+"安装/删除软件包需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？"
#: src/ui.cc:957 src/ui.cc:1072
msgid "Become root"
@@ -3867,25 +3822,20 @@
msgstr "没有任何软件包被设定为安装，删除或者升级。"
#: src/ui.cc:997
-#, fuzzy
msgid ""
"No packages will be installed, removed or upgraded. Some packages could be "
"upgraded, but you have not chosen to upgrade them. Type \"U\" to prepare an "
"upgrade."
msgstr ""
-"没有任何软件包将被安装，删除或者升级。\n"
-"\n"
-"某些软件包可以被升级，但是您并未选择升级它们。\n"
-"输入 “U”来准备升级。"
+"没有任何软件包将被安装，删除或者升级。某些软件包可以升级，但是您没有选择将它"
+"们升级。输入“U”以准备升级。"
#: src/ui.cc:1069
-#, fuzzy
msgid ""
"Updating the package lists requires administrative privileges, which you "
"currently do not have. Would you like to change to the root account?"
msgstr ""
-"更新软件包列表需要管理员权限，而您现在\n"
-"没有这种权限。您想要进入 root 帐号吗？\n"
+"更新软件包列表需要管理员权限，而您现在没有这种权限。您想要进入 root 帐号吗？"
#: src/ui.cc:1084 src/ui.cc:1371
msgid "Waste time trying to find mines"
@@ -3904,37 +3854,36 @@
msgstr "下载的文件已经被删除"
#: src/ui.cc:1169
-#, fuzzy, c-format
+#, c-format
msgid ""
"Obsolete downloaded package files have been deleted, freeing %sB of disk "
"space."
-msgstr "过期的下载文件已经被删除"
+msgstr "过期的下载文件已经被删除，正在释放 %sB 的磁盘空间。"
#: src/ui.cc:1241
msgid "All solutions exhausted."
-msgstr ""
+msgstr "所有的解决方案都试过了。"
#: src/ui.cc:1246 src/ui.cc:1277
-#, fuzzy
msgid "Ran out of time while trying to find a solution."
-msgstr "通过找地雷来消磨时间"
+msgstr "寻找解决方案时用时已尽。"
#: src/ui.cc:1271
msgid "Unable to find a solution to apply."
-msgstr ""
+msgstr "未能找到一个可以应用的解决方案。"
#: src/ui.cc:1301
-#, fuzzy, c-format
+#, c-format
msgid "Unable to open %s"
-msgstr "无法打开 %s 以写入"
+msgstr "无法打开 %s"
#: src/ui.cc:1307
msgid "Error while dumping resolver state"
-msgstr ""
+msgstr "存储依赖关系解决状态时出错"
#: src/ui.cc:1317
msgid "File to which the resolver state should be dumped:"
-msgstr ""
+msgstr "存储依赖关系解决状态的文件："
#: src/ui.cc:1347
msgid "^Install/remove packages"
@@ -3993,13 +3942,10 @@
msgstr "变成 root(^B)"
#: src/ui.cc:1374
-#, fuzzy
msgid ""
"Run 'su' to become root; this will restart the program, but your settings "
"will be preserved"
-msgstr ""
-"运行“su”成为 root。这将重新启动程序，但是您的\n"
-"设置将会被保存下来。"
+msgstr "运行“su”成为 root。这将重新启动程序，但是您的设置将会被保存下来。"
#: src/ui.cc:1377
msgid "^Reload package cache"
@@ -4073,39 +4019,32 @@
msgstr "标记为自动安装(^A)"
#: src/ui.cc:1420
-#, fuzzy
msgid ""
"Mark the selected package as having been automatically installed; it will "
"automatically be removed if no other packages depend on it"
msgstr ""
-"将所选定的软件包标记为自动安装；\n"
-"如果没有其它软件包依赖于它，它将会被自动删除"
+"将所选定的软件包标记为自动安装；如果没有其它软件包依赖于它，它将会被自动删除"
#: src/ui.cc:1423
msgid "Mark ^Manual"
msgstr "标记为手动安装(^M)"
#: src/ui.cc:1424
-#, fuzzy
msgid ""
"Mark the selected package as having been manually installed; it will not be "
"removed unless you manually remove it"
msgstr ""
-"将所选定的软件包标记为手动安装；\n"
-"除非您手动删除该软件包，否则它将不会被删除"
+"将所选定的软件包标记为手动安装；除非您手动删除该软件包，否则它将不会被删除"
#: src/ui.cc:1427
msgid "^Forbid Version"
msgstr "禁止版本(^F)"
#: src/ui.cc:1428
-#, fuzzy
msgid ""
"Forbid the candidate version of the selected package from being installed; "
"newer versions of the package will be installed as usual"
-msgstr ""
-"禁止安装选定软件包的候选版本；\n"
-"该软件包的新版本将可以正常安装"
+msgstr "禁止安装选定软件包的候选版本；该软件包的新版本将可以正常安装"
#: src/ui.cc:1432
msgid "I^nformation"
@@ -4269,10 +4208,9 @@
#: src/ui.cc:1539
msgid "^NEWS"
-msgstr ""
+msgstr "新闻(^N)"
#: src/ui.cc:1540
-#, fuzzy
msgid "View the important changes made in each version of "
msgstr "查看该程序每一版本中所做的重大修改"
@@ -4327,14 +4265,13 @@
msgstr "正在下载 "
#: src/view_changelog.cc:69
-#, fuzzy
msgid "Download Changelog"
-msgstr "正在下载 "
+msgstr "下载变更日志 "
#: src/view_changelog.cc:78
#, c-format
msgid "%s changes"
-msgstr ""
+msgstr "%s 个包已改变"
#: src/vscreen/vscreen.cc:119
#, c-format