merge

1 files changed, 252 insertions, 248 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 09121f1d..d52f2888 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\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"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -21,14 +21,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "删除 .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "正在更新来源，请稍候..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -36,12 +46,7 @@ msgstr "加拿大"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -59,25 +64,20 @@ msgstr "所有软件包都已正确安装"
 msgid "Verifying packages signatures..."
 msgstr "校验软件包的签名..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "您至少要填写头两项。"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Networking"
+msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "您至少要填写头两项。"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "搜索结果"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -137,11 +142,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "软件包安装..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -172,19 +177,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "意大利"
+msgid "True type"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphics"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "意大利"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -198,11 +213,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一："
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,7 +230,7 @@ msgstr "代理服务器..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -322,21 +332,11 @@ msgstr "密码："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
@@ -355,6 +355,11 @@ msgstr "另外一些软件包需要删除"
 msgid "All packages, by update availability"
 msgstr "按照是否可用排列"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -371,6 +376,11 @@ msgid "Greece"
 msgstr "希腊"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "不做任何事"
@@ -423,11 +433,6 @@ msgstr "选择镜像..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -495,6 +500,11 @@ msgstr "路径："
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”（%s/%s）..."
 
@@ -505,6 +515,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "其他"
 
@@ -513,36 +528,31 @@ msgstr "其他"
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "奥地利"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "信息..."
+msgid "Austria"
+msgstr "奥地利"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr ""
+msgid "Info..."
+msgstr "信息..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -550,22 +560,17 @@ msgstr "日本"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "摘要："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
+msgid "Boot and Init"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -583,6 +588,11 @@ msgstr "删除 .%s"
 msgid "Importance: "
 msgstr "重要性："
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -624,11 +634,6 @@ msgstr "来源"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "大小："
 
@@ -652,11 +657,6 @@ msgstr ""
 msgid "Update media"
 msgstr "更新来源"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -692,6 +692,11 @@ msgstr "在安装过程中发生问题"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -702,16 +707,6 @@ msgstr "编辑"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中软件：%d MB / 剩余磁盘空间：%d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "其他"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -734,11 +729,6 @@ msgstr "正在检查源“%s”的文件..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "在文件中"
 
@@ -749,12 +739,17 @@ msgstr "全部软件包，"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -769,6 +764,16 @@ msgstr "搜索结果（无）"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -786,11 +791,26 @@ msgstr ""
 msgid "Stop"
 msgstr "停止"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "正在更新来源，请稍候..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -848,6 +868,11 @@ msgstr ""
 msgid "Finland"
 msgstr "芬兰"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Media limit:"
@@ -865,12 +890,12 @@ msgstr "保存修改"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
+msgid "Instant messaging"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -881,6 +906,11 @@ msgstr "更多信息"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "搜索"
 
@@ -903,16 +933,6 @@ msgid "Spain"
 msgstr "西班牙"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "升级来源已经存在"
@@ -924,11 +944,6 @@ msgstr "文件：\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
@@ -937,6 +952,11 @@ msgstr "源软件包未找到。"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登录代理服务器时，您可能要指定用户名和密码："
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "中国"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -949,11 +969,6 @@ msgstr "需要另外的软件包"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1014,7 +1029,7 @@ msgstr "查找："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1029,11 +1044,6 @@ msgstr "可移动设备"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包"
 
@@ -1047,21 +1057,11 @@ msgstr "正在删除软件包，请稍候..."
 msgid "Please wait, adding medium..."
 msgstr "正在添加来源，请稍候..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "其他"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "登录名："
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1072,21 +1072,16 @@ msgstr "比利时"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "配置代理服务器"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "配置代理服务器"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1094,11 +1089,6 @@ msgstr "开始下载“%s”..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误：%s。"
 
@@ -1112,16 +1102,6 @@ msgstr "致命错误"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1137,12 +1117,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1155,25 +1130,20 @@ msgstr "请选择喜欢的镜像站点。"
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "编辑来源“%s”："
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "更新原因："
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "设置来源"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "更新原因："
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1202,7 +1172,7 @@ msgstr "在删除过程中发生问题"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1227,23 +1197,38 @@ msgid "No package found for installation."
 msgstr "没有可供安装的软件包。"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Medium: "
 msgstr "来源："
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "描述："
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1251,6 +1236,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1278,11 +1273,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "名称："
 
@@ -1328,7 +1318,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1343,12 +1333,22 @@ msgstr "选中"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "最多信息"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1404,9 +1404,9 @@ msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "日本"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1423,20 +1423,15 @@ msgstr "正在寻找可用的软件包，请稍候..."
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "已启用？"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "已启用？"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1463,16 +1458,6 @@ msgstr "安装完成"
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1480,13 +1465,13 @@ msgstr "您必须插入介质才能继续"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "选中的包太多"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "选中的包太多"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1498,17 +1483,17 @@ msgstr "不做任何事"
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "下载出错"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "巴西"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -1518,6 +1503,11 @@ msgstr "帮助"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1545,7 +1535,7 @@ msgstr "按照来源库排列"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1558,6 +1548,11 @@ msgstr "下载“%s”，剩余时间：%s，速度：%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1585,11 +1580,6 @@ msgstr "更换来源"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "重置选中"
 
@@ -1598,6 +1588,11 @@ msgstr "重置选中"
 msgid "Mandrake Update"
 msgstr "Mandrake 自动升级"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "其他"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1615,12 +1610,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1636,6 +1631,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1672,23 +1672,13 @@ msgid "Currently installed version: "
 msgstr "当前安装的版本："
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "其他"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1713,7 +1703,7 @@ msgstr "名称："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1721,6 +1711,11 @@ msgstr ""
 msgid "No update"
 msgstr "没有更新"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "不做任何事"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1731,6 +1726,16 @@ msgstr "确定"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1743,6 +1748,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "Drake RPM 管理器"
 
@@ -1751,11 +1761,6 @@ msgstr "Drake RPM 管理器"
 msgid "Editing medium \"%s\":"
 msgstr "编辑来源“%s”："
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1818,11 +1823,6 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2103,6 +2103,10 @@ msgstr "删除软件"
 msgid "Software Sources Manager"
 msgstr "软件源管理器"
 
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP 服务器"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s 与 %s 相冲突"