updated po files

1 files changed, 237 insertions, 310 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d52f2888..76f3dbb5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,14 +6,14 @@
 # Danny Zeng <danny@zeng.com.cn>
 # Jesse Kuang <kjx@mandrakesoft.com>
 # Shiyu Tang <ShiyuTang@netscape.net>, 2003
-# Funda Wang <fundawang@en2china.com>, 2003
+# Funda Wang <fundawang@linux.net.cn>, 2003
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-06-27 14:18+0200\n"
-"PO-Revision-Date: 2003-05-24 11:13+0800\n"
-"Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
+"POT-Creation-Date: 2003-06-27 19:16+0200\n"
+"PO-Revision-Date: 2003-07-25 18:39+0800\n"
+"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +22,22 @@ msgstr ""
 #: ../rpmdrake:1
 #, c-format
 msgid "Enlightenment"
-msgstr ""
+msgstr "Enlightenment"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Remote access"
-msgstr "删除 .%s"
+msgstr "远程访问"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
-msgstr "正在更新来源，请稍候..."
+msgstr "正在更新介质，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "FVWM based"
-msgstr ""
+msgstr "基于 FVWM"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -47,7 +47,7 @@ msgstr "加拿大"
 #: ../rpmdrake:1
 #, c-format
 msgid "Python"
-msgstr ""
+msgstr "Python"
 
 #: ../rpmdrake:1
 #, c-format
@@ -67,12 +67,12 @@ msgstr "校验软件包的签名..."
 #: ../rpmdrake:1
 #, c-format
 msgid "File transfer"
-msgstr ""
+msgstr "文件传送"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "KDE and Qt"
-msgstr ""
+msgstr "KDE 和 Qt"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -80,12 +80,12 @@ msgid "You need to fill up at least the two first entries."
 msgstr "您至少要填写头两项。"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Type of medium:"
-msgstr "来源类型："
+msgstr "介质类型:"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
@@ -115,7 +115,7 @@ msgstr "搜索结果"
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop"
-msgstr ""
+msgstr "图形桌面"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -133,12 +133,12 @@ msgstr ""
 "安装完成；%s。\n"
 "\n"
 "一些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
-"在执行操作以前，您需要检查一下："
+"在执行操作以前，您需要检查一下:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a parallel group"
-msgstr ""
+msgstr "编辑并行组"
 
 #: ../rpmdrake:1
 #, c-format
@@ -148,7 +148,7 @@ msgstr "如何手工选择您的镜像"
 #: ../rpmdrake:1
 #, c-format
 msgid "Publishing"
-msgstr ""
+msgstr "出版"
 
 #: ../rpmdrake:1
 #, c-format
@@ -158,12 +158,12 @@ msgstr "软件包安装..."
 #: ../rpmdrake:1
 #, c-format
 msgid "GNOME and GTK+"
-msgstr ""
+msgstr "GNOME 和 GTK+"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Select the media you wish to update:"
-msgstr "选择要更新的来源："
+msgstr "选择您想要更新的介质:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -173,27 +173,27 @@ msgstr "软件包删除"
 #: ../rpmdrake:1
 #, c-format
 msgid "Shells"
-msgstr ""
+msgstr "Shell"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Chemistry"
-msgstr ""
+msgstr "化学"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "True type"
-msgstr ""
+msgstr "True type"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Base"
-msgstr ""
+msgstr "基本"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
-msgstr ""
+msgstr "图形"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -207,11 +207,14 @@ msgid ""
 "You will not be able to perform modifications on the system,\n"
 "but you may still browse the existing database."
 msgstr ""
+"您正在以普通用户调用此程序。\n"
+"您将无法执行对系统的修改，\n"
+"但您仍然可以浏览已有数据库。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一："
+msgstr "需要下列软件包之一:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -231,7 +234,7 @@ msgstr "代理服务器..."
 #: ../rpmdrake:1
 #, c-format
 msgid "Litterature"
-msgstr ""
+msgstr "文献"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -244,7 +247,7 @@ msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
-"如果您需要用代理服务器，请输入主机名和端口（语法：<proxyhost[:port]>）："
+"如果您需要用代理服务器，请输入主机名和端口（语法：<proxyhost[:port]>）:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -259,17 +262,17 @@ msgstr ""
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
-msgstr ""
+msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Sound"
-msgstr ""
+msgstr "声音"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Changelog:\n"
-msgstr "更新日志：\n"
+msgstr "更新日志:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -290,9 +293,9 @@ msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Command"
-msgstr "加拿大"
+msgstr "命令"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -323,12 +326,12 @@ msgstr ""
 #: ../rpmdrake:1
 #, c-format
 msgid "Emulators"
-msgstr ""
+msgstr "模拟器"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Password:"
-msgstr "密码："
+msgstr "密码:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -351,19 +354,19 @@ msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "All packages, by update availability"
-msgstr "按照是否可用排列"
+msgstr "全部软件包，按照是否可更新排列"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Packaging"
-msgstr ""
+msgstr "打包"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Configure media"
-msgstr "设置来源"
+msgstr "配置介质"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -378,12 +381,12 @@ msgstr "希腊"
 #: ../rpmdrake:1
 #, c-format
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Monitoring"
-msgstr "不做任何事"
+msgstr "监视"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -399,7 +402,7 @@ msgstr "有些软件包无法安装"
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
-msgstr ""
+msgstr "无法启动帮助窗口，稍后桌面上将会出现。"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -419,7 +422,7 @@ msgstr "重新装入软件包清单"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path or mount point:"
-msgstr "路径或装载点："
+msgstr "路径或装载点:"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -449,7 +452,7 @@ msgstr ""
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
-msgstr "选中大小：%d MB"
+msgstr "选中大小: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
@@ -457,14 +460,14 @@ msgid "Please wait, reading packages database..."
 msgstr "正在读取软件包数据库，请稍候..."
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Add a medium"
-msgstr "添加一个来源"
+msgstr "添加一个介质"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Update medium"
-msgstr "更新来源"
+msgstr "更新介质"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -473,9 +476,9 @@ msgid ""
 msgstr "要保存改变，您必须在驱动器中插入介质。"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "All packages, by size"
-msgstr "全部软件包，"
+msgstr "全部软件包，按大小"
 
 #: ../rpmdrake:1
 #, c-format
@@ -489,19 +492,19 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Examining file of medium `%s'..."
-msgstr "正在检查源“%s”的文件..."
+msgstr "正在检查介质“%s”的文件..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path:"
-msgstr "路径："
+msgstr "路径:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "IRC"
-msgstr ""
+msgstr "IRC"
 
 #: ../rpmdrake:1
 #, c-format
@@ -511,12 +514,12 @@ msgstr "正在下载软件包“%s”（%s/%s）..."
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Protocol:"
-msgstr ""
+msgstr "协议:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: ../rpmdrake:1
 #, c-format
@@ -531,7 +534,7 @@ msgstr "瑞典"
 #: ../rpmdrake:1
 #, c-format
 msgid "Boards"
-msgstr ""
+msgstr "棋盘"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -541,7 +544,7 @@ msgstr "奥地利"
 #: ../rpmdrake:1
 #, c-format
 msgid "Faqs"
-msgstr ""
+msgstr "常见问题解答"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -561,17 +564,17 @@ msgstr "日本"
 #: ../rpmdrake:1
 #, c-format
 msgid "Summary: "
-msgstr "摘要："
+msgstr "摘要:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Backup"
-msgstr ""
+msgstr "备份"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Boot and Init"
-msgstr ""
+msgstr "启动和初始化"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -586,20 +589,20 @@ msgstr "删除 .%s"
 #: ../rpmdrake:1
 #, c-format
 msgid "Importance: "
-msgstr "重要性："
+msgstr "重要性:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "WWW"
-msgstr ""
+msgstr "WWW"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
-msgstr "无法创建来源。"
+msgstr "无法创建介质。"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -614,7 +617,7 @@ msgstr ""
 "确定继续吗？"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -622,25 +625,25 @@ msgid ""
 "your computer. They will then be available to install new software package\n"
 "or to perform updates."
 msgstr ""
-"欢迎使用“软件源管理器”！\n"
+"欢迎使用软件介质管理器！\n"
 "\n"
-"本工具将帮助您配置要在您的电脑上使用的软件包来源。这些来源将在安装新\n"
+"本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
 "软件包或执行更新时使用。"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Medium"
-msgstr "来源"
+msgstr "介质"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Size: "
-msgstr "大小："
+msgstr "大小:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Office"
-msgstr ""
+msgstr "办公"
 
 #: ../rpmdrake:1
 #, c-format
@@ -650,12 +653,12 @@ msgstr "所有软件包都已成功安装"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a parallel group"
-msgstr ""
+msgstr "添加并行组"
 
 #: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Update media"
-msgstr "更新来源"
+msgstr "更新介质"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -670,7 +673,7 @@ msgstr "正在安装软件包“%s”（%s/%s）..."
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Parallel..."
-msgstr ""
+msgstr "并行..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -690,12 +693,12 @@ msgstr "在安装过程中发生问题"
 #: ../rpmdrake:1
 #, c-format
 msgid "Terminals"
-msgstr ""
+msgstr "终端"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Kernel and hardware"
-msgstr ""
+msgstr "内核和硬件"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -705,7 +708,7 @@ msgstr "编辑"
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "选中软件：%d MB / 剩余磁盘空间：%d MB"
+msgstr "选中软件: %d MB / 剩余磁盘空间: %d MB"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -723,9 +726,9 @@ msgid "Korea"
 msgstr "韩国"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Examining remote file of medium `%s'..."
-msgstr "正在检查源“%s”的文件..."
+msgstr "正在检查介质“%s”的远程文件..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -733,24 +736,24 @@ msgid "in files"
 msgstr "在文件中"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "All packages, by group"
-msgstr "全部软件包，"
+msgstr "全部软件包，按照组别"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Kernel"
-msgstr ""
+msgstr "内核"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Console"
-msgstr ""
+msgstr "控制台"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "C++"
-msgstr ""
+msgstr "C++"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -760,17 +763,17 @@ msgstr "荷兰"
 #: ../rpmdrake:1
 #, c-format
 msgid "Search results (none)"
-msgstr "搜索结果（无）"
+msgstr "搜索结果(无)"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Adventure"
-msgstr ""
+msgstr "探险"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Cd burning"
-msgstr ""
+msgstr "光盘刻录"
 
 #: ../rpmdrake:1
 #, c-format
@@ -794,34 +797,34 @@ msgstr "停止"
 #: ../rpmdrake:1
 #, c-format
 msgid "Biology"
-msgstr ""
+msgstr "生物"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Please wait, generating hdlist..."
-msgstr "正在更新来源，请稍候..."
+msgstr "正在重新生成 hdlist，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Mathematics"
-msgstr ""
+msgstr "数学"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Internationalization"
-msgstr ""
+msgstr "国际化"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Edit a medium"
-msgstr "编辑来源"
+msgstr "编辑介质"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
-msgstr "已经有该名称的来源，您真的想要替换吗？"
+msgstr "已经有该名称的介质，您真的想要替换吗？"
 
 #: ../rpmdrake:1
 #, c-format
@@ -849,7 +852,7 @@ msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -857,10 +860,6 @@ msgid ""
 msgstr ""
 "对不起，不能选择下列软件包：\n"
 "\n"
-"%s\n"
-"\n"
-"原因如下：\n"
-"\n"
 "%s"
 
 #: ../rpmdrake.pm:1
@@ -871,12 +870,12 @@ msgstr "芬兰"
 #: ../rpmdrake:1
 #, c-format
 msgid "X11 bitmap"
-msgstr ""
+msgstr "X11 位图"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Media limit:"
-msgstr "来源："
+msgstr "介质限制:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -891,12 +890,12 @@ msgstr "保存修改"
 #: ../rpmdrake:1
 #, c-format
 msgid "Instant messaging"
-msgstr ""
+msgstr "即时通讯"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "News"
-msgstr ""
+msgstr "新闻"
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -907,7 +906,7 @@ msgstr "更多信息"
 #: ../rpmdrake:1
 #, c-format
 msgid "Computer books"
-msgstr ""
+msgstr "计算机图书"
 
 #: ../rpmdrake:1
 #, c-format
@@ -933,14 +932,14 @@ msgid "Spain"
 msgstr "西班牙"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Already existing update media"
-msgstr "升级来源已经存在"
+msgstr "更新介质已经存在"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Files:\n"
-msgstr "文件：\n"
+msgstr "文件:\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -950,12 +949,12 @@ msgstr "源软件包未找到。"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
-msgstr "在登录代理服务器时，您可能要指定用户名和密码："
+msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Chat"
-msgstr "中国"
+msgstr "聊天"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -970,10 +969,10 @@ msgstr "需要另外的软件包"
 #: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
-msgstr ""
+msgstr "以用户模式运行"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -981,15 +980,15 @@ msgid ""
 "\n"
 "Then, restart MandrakeUpdate."
 msgstr ""
-"您还可以手动选择您希望使用的镜像：方法是，使用软件源管理器，\n"
-"然后添加“安全更新”源。\n"
+"您还可以手动选择您希望使用的镜像：方法是，使用软件介质管理器，\n"
+"然后添加“安全更新”介质。\n"
 "\n"
-"然后重新启动 MandrakeUpdate。"
+"然后，重新启动 MandrakeUpdate。"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Adding a medium:"
-msgstr "添加一个来源："
+msgstr "添加一个介质:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1002,7 +1001,7 @@ msgstr ""
 "\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1011,11 +1010,11 @@ msgid ""
 "\n"
 "Then, restart MandrakeUpdate."
 msgstr ""
-"你已经至少配置了一个升级来源，但是它们现在全部都\n"
-"不可用。你需要运行“软件源管理器”来启用其中的至\n"
-"少一项（检查它是否在“启用”那一栏中）。\n"
+"你已经至少配置了一个升级介质，但是它们现在全部都不\n"
+"可用。你需要运行“软件介质管理器”来启用其中的至少\n"
+"一项(在“启用?”栏中选中)。\n"
 "\n"
-"然后，重新启动“Mandrake 自动升级”。"
+"然后，重新启动 MandrakeUpdate。"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1025,12 +1024,12 @@ msgstr "正在列出软件包，请稍候..."
 #: ../rpmdrake:1
 #, c-format
 msgid "Find:"
-msgstr "查找："
+msgstr "查找:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "XFree86"
-msgstr ""
+msgstr "XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1045,7 +1044,7 @@ msgstr "可移动设备"
 #: ../rpmdrake:1
 #, c-format
 msgid "Preparing packages installation..."
-msgstr "准备安装软件包"
+msgstr "准备安装软件包..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -1055,12 +1054,12 @@ msgstr "正在删除软件包，请稍候..."
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, adding medium..."
-msgstr "正在添加来源，请稍候..."
+msgstr "正在添加介质，请稍候..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
-msgstr "登录名："
+msgstr "登录名:"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1070,7 +1069,7 @@ msgstr "比利时"
 #: ../rpmdrake:1
 #, c-format
 msgid "File tools"
-msgstr ""
+msgstr "文件工具"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1080,7 +1079,7 @@ msgstr "配置代理服务器"
 #: ../rpmdrake:1
 #, c-format
 msgid "Printing"
-msgstr ""
+msgstr "打印"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1100,7 +1099,7 @@ msgstr "致命错误"
 #: ../rpmdrake:1
 #, c-format
 msgid "Leaves only, sorted by install date"
-msgstr ""
+msgstr "只剩下，按安装日期排序"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1110,7 +1109,7 @@ msgid ""
 "Errors:\n"
 "%s"
 msgstr ""
-"无法更新来源；该来源将被自动停用。\n"
+"无法更新介质；该介质将被自动禁用。\n"
 "\n"
 "错误如下：\n"
 "%s"
@@ -1118,7 +1117,7 @@ msgstr ""
 #: ../rpmdrake:1
 #, c-format
 msgid "Geosciences"
-msgstr ""
+msgstr "地球科学"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1128,22 +1127,22 @@ msgstr "请选择喜欢的镜像站点。"
 #: ../rpmdrake:1
 #, c-format
 msgid "Communications"
-msgstr ""
+msgstr "通讯"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Editing parallel group \"%s\":"
-msgstr "编辑来源“%s”："
+msgstr "编辑并行组“%s”:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Configuration"
-msgstr "设置来源"
+msgstr "配置"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Reason for update: "
-msgstr "更新原因："
+msgstr "更新原因:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1173,12 +1172,12 @@ msgstr "在删除过程中发生问题"
 #: ../rpmdrake:1
 #, c-format
 msgid "WindowMaker"
-msgstr ""
+msgstr "WindowMaker"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Help launched in background"
-msgstr ""
+msgstr "正在后台调用帮助"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1199,27 +1198,27 @@ msgstr "没有可供安装的软件包。"
 #: ../rpmdrake:1
 #, c-format
 msgid "Type1"
-msgstr ""
+msgstr "Type1"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Medium: "
-msgstr "来源："
+msgstr "介质:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Strategy"
-msgstr ""
+msgstr "策略"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Description: "
-msgstr "描述："
+msgstr "描述:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Archiving"
-msgstr ""
+msgstr "归档"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1229,7 +1228,7 @@ msgstr "%s KB"
 #: ../rpmdrake:1
 #, c-format
 msgid "System"
-msgstr ""
+msgstr "系统"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1239,12 +1238,12 @@ msgstr "所有要求的软件包都已成功安装。"
 #: ../rpmdrake:1
 #, c-format
 msgid "Servers"
-msgstr ""
+msgstr "服务器"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Puzzles"
-msgstr ""
+msgstr "拼图"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1254,7 +1253,7 @@ msgstr "本机文件"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
-msgstr ""
+msgstr "在介质限制中选择介质进行添加:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1269,17 +1268,17 @@ msgstr "请选择"
 #: ../rpmdrake:1
 #, c-format
 msgid "Databases"
-msgstr ""
+msgstr "数据库"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Name: "
-msgstr "名称："
+msgstr "名称:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Proxy hostname:"
-msgstr "代理服务器主机名："
+msgstr "代理服务器主机名:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1309,17 +1308,17 @@ msgstr "下载“%s”，速度：%s"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Hosts:"
-msgstr ""
+msgstr "主机:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Video"
-msgstr ""
+msgstr "视频"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Perl"
-msgstr ""
+msgstr "Perl"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1334,7 +1333,7 @@ msgstr "选中"
 #: ../rpmdrake:1
 #, c-format
 msgid "Computer science"
-msgstr ""
+msgstr "计算机科学"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1344,12 +1343,12 @@ msgstr "最多信息"
 #: ../rpmdrake:1
 #, c-format
 msgid "Fonts"
-msgstr ""
+msgstr "字体"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Hardware"
-msgstr ""
+msgstr "硬件"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1359,7 +1358,7 @@ msgstr "退出"
 #: ../rpmdrake:1
 #, c-format
 msgid "Version: "
-msgstr "版本："
+msgstr "版本:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1396,7 +1395,7 @@ msgstr ""
 #: ../rpmdrake:1
 #, c-format
 msgid "(Not available)"
-msgstr "（不可用）"
+msgstr "(不可用)"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1404,9 +1403,9 @@ msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Java"
-msgstr "日本"
+msgstr "Java"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1426,17 +1425,17 @@ msgstr "取消"
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences"
-msgstr ""
+msgstr "科学"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
-msgstr "已启用？"
+msgstr "启用?"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All packages, alphabetical"
-msgstr "全部软件包，按字母次序排列"
+msgstr "全部软件包，按照字母次序排列"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1446,7 +1445,7 @@ msgstr "Mandrake 精选"
 #: ../rpmdrake:1
 #, c-format
 msgid "Toys"
-msgstr ""
+msgstr "玩具"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1471,7 +1470,7 @@ msgstr "选中的包太多"
 #: ../rpmdrake:1
 #, c-format
 msgid "Physics"
-msgstr ""
+msgstr "物理"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1489,9 +1488,9 @@ msgid "Error during download"
 msgstr "下载出错"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Mail"
-msgstr "巴西"
+msgstr "邮件"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1506,7 +1505,7 @@ msgstr "对不起，无法得到源软件包。%s"
 #: ../rpmdrake:1
 #, c-format
 msgid "Sports"
-msgstr ""
+msgstr "运动"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1516,12 +1515,12 @@ msgstr "中国台湾"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Protocol"
-msgstr ""
+msgstr "协议"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid "(none)"
-msgstr "（无）"
+msgstr "(无)"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1529,29 +1528,29 @@ msgid "Germany"
 msgstr "德国"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "All packages, by medium repository"
-msgstr "按照来源库排列"
+msgstr "全部软件包，按照介质库排序"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Compression"
-msgstr ""
+msgstr "压缩"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "下载“%s”，剩余时间：%s，速度：%s"
+msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a host"
-msgstr ""
+msgstr "添加主机"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Development"
-msgstr ""
+msgstr "开发"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1561,7 +1560,7 @@ msgstr "否"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit"
-msgstr ""
+msgstr "介质限制"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1576,7 +1575,7 @@ msgstr "添加..."
 #: ../rpmdrake:1
 #, c-format
 msgid "Change medium"
-msgstr "更换来源"
+msgstr "更改介质"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1586,12 +1585,12 @@ msgstr "重置选中"
 #: ../rpmdrake:1
 #, c-format
 msgid "Mandrake Update"
-msgstr "Mandrake 自动升级"
+msgstr "Mandrake Update"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Books"
-msgstr "其他"
+msgstr "书签"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1611,28 +1610,30 @@ msgstr ""
 #: ../rpmdrake:1
 #, c-format
 msgid "Howtos"
-msgstr ""
+msgstr "Howtos"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Icewm"
-msgstr ""
+msgstr "Icewm"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
 "\n"
 "You may want to update your media database."
 msgstr ""
-"安装失败，缺少某些文件。\n"
-"您可能需要更新您的软件源数据库。"
+"安装失败，缺少某些文件:\n"
+"%s\n"
+"\n"
+"您可能需要更新您的介质数据库。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Libraries"
-msgstr ""
+msgstr "库"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1640,7 +1641,7 @@ msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"对不起，删除这些软件包将可能毁坏您的系统：\n"
+"对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
 #: ../rpmdrake.pm:1
@@ -1669,42 +1670,42 @@ msgstr ""
 #: ../rpmdrake:1
 #, c-format
 msgid "Currently installed version: "
-msgstr "当前安装的版本："
+msgstr "当前安装的版本:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Games"
-msgstr "其他"
+msgstr "游戏"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Astronomy"
-msgstr ""
+msgstr "天文"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请把标记为“%s”的介质放进设备 [%s]"
+msgstr "请把名为“%s”的介质放进设备 [%s]"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "You need to select some packages first."
-msgstr "源软件包未找到。"
+msgstr "您需要先选中一些软件包。"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "All packages, by selection state"
-msgstr "按照选择状态排列"
+msgstr "全部软件包，按选中状态排列"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Name:"
-msgstr "名称："
+msgstr "名称:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "KDE"
-msgstr ""
+msgstr "KDE"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1712,9 +1713,9 @@ msgid "No update"
 msgstr "没有更新"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Networking"
-msgstr "不做任何事"
+msgstr "网络"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
@@ -1724,52 +1725,52 @@ msgstr "确定"
 #: ../rpmdrake:1
 #, c-format
 msgid "Text tools"
-msgstr ""
+msgstr "文本工具"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Cards"
-msgstr ""
+msgstr "卡"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Sawfish"
-msgstr ""
+msgstr "Sawfish"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Group name:"
-msgstr "代理服务器主机名："
+msgstr "组名称:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
-msgstr ""
+msgstr "输入要添加的主机名或 IP 地址:"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Arcade"
-msgstr ""
+msgstr "街机"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
-msgstr "Drake RPM 管理器"
+msgstr "rpmdrake"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Editing medium \"%s\":"
-msgstr "编辑来源“%s”："
+msgstr "编辑介质“%s”:"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Add a medium limit"
-msgstr "添加一个来源"
+msgstr "添加一个介质限制"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Group"
-msgstr "按照组别排列"
+msgstr "组"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1779,27 +1780,27 @@ msgstr "正在删除临时文件，请稍候..."
 #: ../rpmdrake:1
 #, c-format
 msgid "Accessibility"
-msgstr ""
+msgstr "辅助功能"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "changes:"
-msgstr "更改："
+msgstr "更改:"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Add"
-msgstr "添加..."
+msgstr "添加"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Regenerate hdlist"
-msgstr ""
+msgstr "重新生成 hdlist"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Editors"
-msgstr "编辑"
+msgstr "编辑器"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1809,7 +1810,7 @@ msgstr "英国"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
-msgstr "相对 synthesis/hdlist 的路径："
+msgstr "相对 synthesis/hdlist 的路径:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1819,14 +1820,14 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"欢迎使用“Mandrake 自动升级”！\n"
+"欢迎使用“MandrakeUpdate”！\n"
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
-msgstr "用户名："
+msgstr "用户名:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -2102,77 +2103,3 @@ msgstr "删除软件"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "软件源管理器"
-
-#, fuzzy
-#~ msgid "Server"
-#~ msgstr "FTP 服务器"
-
-#~ msgid "%s conflicts with %s"
-#~ msgstr "%s 与 %s 相冲突"
-
-#~ msgid "unknown package "
-#~ msgstr "未知软件包"
-
-#, fuzzy
-#~ msgid "Update source"
-#~ msgstr "更新来源"
-
-#~ msgid "Examining distant file of media `%s'..."
-#~ msgstr "正在检查来源“%s”的距离文件..."
-
-#~ msgid "Save and quit"
-#~ msgstr "保存并退出"
-
-#~ msgid "by size"
-#~ msgstr "按照大小排列"
-
-#~ msgid "Source: "
-#~ msgstr "来源："
-
-#~ msgid "Source"
-#~ msgstr "来源"
-
-#~ msgid ""
-#~ "some packages failed to install\n"
-#~ "correctly"
-#~ msgstr "有些软件包无法正确安装"
-
-#~ msgid "Please wait, removing packages to allow others to be upgraded..."
-#~ msgstr "为了升级软件包，正在删除旧的软件包，请稍候..."
-
-#~ msgid "A required program is missing (grpmi). Check your installation."
-#~ msgstr "缺少一个需要的程序(grpmi)。请检查您的安装。"
-
-#~ msgid "Program missing"
-#~ msgstr "缺少程序"
-
-#~ msgid ""
-#~ "There was an error while adding the update medium via urpmi.\n"
-#~ "\n"
-#~ "This may be due to a broken or temporary unavailable mirror, or when "
-#~ "your\n"
-#~ "Mandrake Linux version (%s) is not yet / no more supported by Mandrake "
-#~ "Linux\n"
-#~ "Official Updates.\n"
-#~ "\n"
-#~ "Do you want to try another mirror?"
-#~ msgstr ""
-#~ "通过 urpmi 添加更新介质时发生错误。\n"
-#~ "\n"
-#~ "这可能是由于介质已损坏或者临时不可用，不然就是您的 Mandrake Linux 版本\n"
-#~ "(%s)不为 Mandrake Linux 官方升级所支持。\n"
-#~ "\n"
-#~ "您是否想要尝试另外的镜像？"
-
-#~ msgid "Please wait, contacting mirror to initialize updates packages."
-#~ msgstr "正在连接镜像以便初始化更新软件包，请稍候。"
-
-#~ msgid ""
-#~ "There was an unrecoverable error while updating packages information."
-#~ msgstr "更新软件包信息时发生不可恢复的错误。"
-
-#~ msgid "Error updating medium"
-#~ msgstr "更新介质出错"
-
-#~ msgid "Please wait, contacting mirror to update packages information."
-#~ msgstr "正在连接镜像服务器以得到更新的软件包信息，请稍候。"