merge and translate french

1 files changed, 1067 insertions, 620 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fbf978a4..a2422b44 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2003-05-28 16:30+0200\n"
+"POT-Creation-Date: 2003-05-28 20:14+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"
@@ -17,54 +17,174 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by size"
-msgstr "全部软件包，"
+#, c-format
+msgid "Archiving/Other"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "正在更新来源，请稍候..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "加拿大"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Physics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "可升级"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "所有软件包都已正确安装"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Verifying packages signatures..."
+msgstr "校验软件包的签名..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
-msgstr "已启用？"
+msgid "Configure medias"
+msgstr "设置来源"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "路径或装载点："
+msgid "You need to fill up at least the two first entries."
+msgstr "您至少要填写头两项。"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Configuration/Other"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Configuration/Networking"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/XFree86"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Portugal"
-msgstr "葡萄牙"
+msgid "France"
+msgstr "法国"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the software installation tool!\n"
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+"Is it ok to continue?"
 msgstr ""
-"欢迎使用软件包安装工具！\n"
+"我需要连接镜像才能获得最新的更新软件包。\n"
+"请检查您的网络是否运转正常。\n"
 "\n"
-"您的 Mandrake Linux 的安装光盘包含有数千个软件包。\n"
-"本工具将帮助您选择要为您的电脑安装的软件包。"
+"确定继续吗？"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "名称："
+msgid "Search results"
+msgstr "搜索结果"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Italy"
-msgstr "意大利"
+msgid "Yes"
+msgstr "是"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"安装完成；%s。\n"
+"\n"
+"一些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
+"在执行操作以前，您需要检查一下："
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Configuration/Hardware"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Publishing"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Package installation..."
+msgstr "软件包安装..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "软件包删除"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Shells"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "意大利"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Kernel and hardware"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+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:"
@@ -72,23 +192,31 @@ msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "需要删除一些软件包"
+msgid "Information on packages"
+msgstr "该软件包的信息"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by selection state"
-msgstr "按照选择状态排列"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "代理服务器..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "该软件包的更多信息..."
+msgid "System/Configuration/Boot and Init"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "是"
+msgid "Russia"
+msgstr "俄罗斯"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"如果您需要用代理服务器，请输入主机名和端口（语法：<proxyhost[:port]>）："
 
 #: ../rpmdrake:1
 #, c-format
@@ -102,200 +230,274 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "所有软件包都已正确安装"
+msgid "Sound"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Changelog:\n"
+msgstr "更新日志：\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Medias Manager, and then add a `Security\n"
-"updates' media.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"Is it ok to continue?"
 msgstr ""
-"您还可以手动选择您希望使用的镜像：方法是，使用软件源管理器，\n"
-"然后添加“安全更新”源。\n"
+"需要连接 MandrakeSoft 网站才能获得镜像列表。\n"
+"请检查您的网络是否运转正常。\n"
 "\n"
-"然后重新启动 MandrakeUpdate。"
+"确定继续吗？"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Please wait, searching..."
+msgstr "正在搜索，请稍候..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"%s\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Is it ok to continue?"
 msgstr ""
-"欢迎使用软件包删除工具！\n"
+"%s\n"
 "\n"
-"本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
+"确定继续吗？"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "正在初始化..."
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "要保存改变，您必须在驱动器中插入介质。"
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
+"或者您已经安装了全部更新。"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Emulators"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
-msgstr "保存并退出"
+msgid "Password:"
+msgstr "密码："
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "System/Servers"
 msgstr ""
-"删除包过程中发生一个问题：\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "大小："
+msgid "Software Packages Installation"
+msgstr "软件包安装"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/KDE"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "在描述中"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " 失败！"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "另外一些软件包需要删除"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "按照是否可用排列"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "安全更新"
+msgid "United States"
+msgstr "美国"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update medias"
-msgstr "升级来源已经存在"
+msgid "Greece"
+msgstr "希腊"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Monitoring"
+msgstr "不做任何事"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Maximum information"
-msgstr "最多信息"
+msgid "Costa Rica"
+msgstr "哥斯达黎加"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy..."
-msgstr "代理服务器..."
+msgid "Some packages can't be installed"
+msgstr "有些软件包无法安装"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your medias database."
+"The help window has been started, it should appear shortly on your desktop."
 msgstr ""
-"安装失败，缺少某些文件。\n"
-"您可能需要更新您的软件源数据库。"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "英国"
+msgid "No mirror"
+msgstr "没有镜像"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "in names"
-msgstr "在名称中"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "添加一个来源"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"找不到任何适合的镜像。\n"
-"此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandrake\n"
-"Linux 官方更新所支持。"
+msgid "Poland"
+msgstr "波兰"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "删除 .%s"
+msgid "Reload the packages list"
+msgstr "重新装入软件包清单"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "路径或装载点："
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "芬兰"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址，请稍候。"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "选择镜像..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
-"Do you want to continue installation?"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"下列软件包的签名出现以下问题：\n"
-"\n"
-"%s\n"
+"警告：您试图添加的软件包太多，有可能在安装的过程中导致剩余磁\n"
+"盘空间告罄；这是很危险的，您应当小心操作。\n"
 "\n"
-"确定继续吗？"
+"您真的想要安装所有选中的软件包吗？"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of media `%s'..."
-msgstr "正在检查来源“%s”的距离文件..."
+msgid "Selected size: %d MB"
+msgstr "选中大小：%d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "校验软件包的签名..."
+msgid "Please wait, reading packages database..."
+msgstr "正在读取软件包数据库，请稍候..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "法国"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"欢迎使用“软件源管理器”！\n"
+"\n"
+"本工具将帮助您配置要在您的电脑上使用的软件包来源。这些来源将在安装新\n"
+"软件包或执行更新时使用。"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More info"
-msgstr "更多信息"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "要保存改变，您必须在驱动器中插入介质。"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by size"
+msgstr "全部软件包，"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"%s\n"
+"删除包过程中发生一个问题：\n"
 "\n"
-"确定继续吗？"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "重新装入软件包清单"
+msgid "Path:"
+msgstr "路径："
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "选择镜像..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "正在下载软件包“%s”（%s/%s）..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "有些软件包无法安装"
+msgid "Other"
+msgstr "其他"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "瑞典"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "选择要更新的来源："
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "奥地利"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "信息..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "不可恢复的错误：对不起，没有发现可安装的软件包。"
+msgid "Networking/File transfer"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -304,95 +506,129 @@ msgstr "来源类型："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "在文件中"
+msgid "Development/Other"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "所有要求的软件包都已成功安装。"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy hostname:"
-msgstr "代理服务器主机名："
+msgid "Inspect..."
+msgstr "检查..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "本机文件"
+msgid "Games/Cards"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "正在检查 %s"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"你已经至少配置了一个升级来源，但是它们现在全部都\n"
+"不可用。你需要运行“软件源管理器”来启用其中的至\n"
+"少一项（检查它是否在“启用”那一栏中）。\n"
+"\n"
+"然后，重新启动“Mandrake 自动升级”。"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "以色列"
+msgid "Japan"
+msgstr "日本"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "帮助"
+msgid "Networking/Remote access"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP 服务器"
+msgid "Summary: "
+msgstr "摘要："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "安装失败"
+msgid "%s conflicts with %s"
+msgstr "%s 与 %s 相冲突"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "使用 .%s 作为主文件"
+msgid "System/Fonts/Type1"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "搜索结果"
+msgid "Development/C"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " failed!"
-msgstr " 失败！"
+msgid "FTP server"
+msgstr "FTP 服务器"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "删除 .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "重要性："
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by media repository"
+msgstr "按照来源库排列"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "巴西"
+msgid "Unable to create medium."
+msgstr "无法创建来源。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr "已经有该名称的来源，您真的想要替换吗？"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"要升级其它软件包，必须删除下列软件包：\n"
+"\n"
+"%s\n"
+"\n"
+"确定继续吗？"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "查找："
+msgid "System/Internationalization"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of media `%s'..."
+msgstr "正在检查源“%s”的文件..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "全部软件包，按字母次序排列"
+msgid "Size: "
+msgstr "大小："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "正在搜索，请稍候..."
+msgid "Office"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "正在读取软件包数据库，请稍候..."
+msgid "Everything installed successfully"
+msgstr "所有软件包都已成功安装"
 
 #: ../rpmdrake:1
 #, c-format
@@ -401,648 +637,836 @@ msgstr "未知软件包"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请把标记为“%s”的介质放进设备 [%s]"
+msgid "Development/Databases"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "正在更新介质，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "重置选中"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安装软件包“%s”（%s/%s）..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"如果您需要用代理服务器，请输入主机名和端口（语法：<proxyhost[:port]>）："
+msgid "Not selected"
+msgstr "未选中"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"为了满足所有的依赖关系，需要删除下列软件包：\n"
-"\n"
+msgid "in names"
+msgstr "在名称中"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "哥斯达黎加"
+msgid "Problem during installation"
+msgstr "在安装过程中发生问题"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "Terminals"
 msgstr ""
-"安装过程中发生了问题：\n"
-"\n"
-"%s"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "正在删除临时文件，请稍候..."
+msgid "Edit"
+msgstr "编辑"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-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 "Taiwan"
-msgstr "中国台湾"
+msgid "Australia"
+msgstr "澳大利亚"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "用户名："
+msgid "Security updates"
+msgstr "安全更新"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "正在更新介质，请稍候..."
+msgid "Korea"
+msgstr "韩国"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "正在列出软件包，请稍候..."
+msgid "Games/Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "在文件中"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "All packages, by media repository"
-msgstr "按照来源库排列"
+msgid "All packages, by group"
+msgstr "全部软件包，"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Information on packages"
-msgstr "该软件包的信息"
+msgid "Graphical desktop/FVWM based"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid "Media: "
+msgstr "来源："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "所有软件包都已成功安装"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Select the media(s) you wish to update:"
-msgstr "选择要更新的来源："
+msgid "Games/Sports"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "正在更新来源，请稍候..."
+msgid "Netherlands"
+msgstr "荷兰"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "发生了一个致命错误：%s。"
+msgid "Search results (none)"
+msgstr "搜索结果（无）"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Welcome to the software installation tool!\n"
 "\n"
-"Is it ok to continue?"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
-"要升级其它软件包，必须删除下列软件包：\n"
-"\n"
-"%s\n"
+"欢迎使用软件包安装工具！\n"
 "\n"
-"确定继续吗？"
+"您的 Mandrake Linux 的安装光盘包含有数千个软件包。\n"
+"本工具将帮助您选择要为您的电脑安装的软件包。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "在描述中"
+msgid "Stop"
+msgstr "停止"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "配置代理服务器"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "已经有该名称的来源，您真的想要替换吗？"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"需要连接 MandrakeSoft 网站才能获得镜像列表。\n"
-"请检查您的网络是否运转正常。\n"
+"为满足依赖关系，还需要安装下列软件包：\n"
 "\n"
-"确定继续吗？"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP 服务器"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "请选择"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "不可恢复的错误：对不起，没有发现可安装的软件包。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "选中大小：%d MB"
+msgid "Some packages can't be removed"
+msgstr "有些软件包无法删除"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "芬兰"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "正在初始化..."
+msgid "More information on package..."
+msgstr "该软件包的更多信息..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Save changes"
 msgstr "保存修改"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "下载出错"
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"您还可以手动选择您希望使用的镜像：方法是，使用软件源管理器，\n"
+"然后添加“安全更新”源。\n"
+"\n"
+"然后重新启动 MandrakeUpdate。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Package installation..."
-msgstr "软件包安装..."
+msgid "Networking/News"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "重要性："
+msgid "Books/Faqs"
+msgstr ""
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
+msgid "More info"
+msgstr "更多信息"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "搜索"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"I can't find any suitable mirror.\n"
 "\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"为满足依赖关系，还需要安装下列软件包：\n"
-"\n"
+"找不到任何适合的镜像。\n"
+"此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandrake\n"
+"Linux 官方更新所支持。"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "西班牙"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Astronomy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Development/Kernel"
+msgstr ""
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update media(s)"
+msgstr "更新来源"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "文件：\n"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Games/Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "源软件包未找到。"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add..."
-msgstr "添加..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "在登录代理服务器时，您可能要指定用户名和密码："
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "无法创建来源。"
+msgid "Update"
+msgstr "更新"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "需要另外的软件包"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking/Chat"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Running in user mode"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"安装完成；%s。\n"
+"为了满足所有的依赖关系，需要删除下列软件包：\n"
 "\n"
-"一些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
-"在执行操作以前，您需要检查一下："
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Browse..."
-msgstr "浏览..."
+msgid "Editing media \"%s\":"
+msgstr "编辑来源“%s”："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "有些软件包无法删除"
+msgid "Please wait, listing packages..."
+msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "信息..."
+msgid "Find:"
+msgstr "查找："
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "您必须插入介质才能继续"
+msgid "Development/Perl"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "正常信息"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Copying file for media `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "卸载"
+msgid "Removable device"
+msgstr "可移动设备"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
-msgstr "没有镜像"
+msgid "Please wait, removing packages..."
+msgstr "正在删除软件包，请稍候..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "正在添加来源，请稍候..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Games/Other"
+msgstr "其他"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "您至少要填写头两项。"
+msgid "Login:"
+msgstr "登录名："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "安装"
+msgid "Networking/Other"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "日本"
+msgid "Belgium"
+msgstr "比利时"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "不做任何事"
+msgid "File tools"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "没有更新"
+msgid "Archiving/Cd burning"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "描述："
+msgid "Sciences/Biology"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"警告：您试图添加的软件包太多，有可能在安装的过程中导致剩余磁\n"
-"盘空间告罄；这是很危险的，您应当小心操作。\n"
-"\n"
-"您真的想要安装所有选中的软件包吗？"
+msgid "Configure proxies"
+msgstr "配置代理服务器"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Starting download of `%s'..."
+msgstr "开始下载“%s”..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "名称："
+msgid "System/Libraries"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "检查..."
+msgid "Leaves only, sorted by install date"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing media \"%s\":"
-msgstr "编辑来源“%s”："
+msgid "Fatal error"
+msgstr "致命错误"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "没有可供安装的软件包。"
+msgid "A fatal error occurred: %s."
+msgstr "发生了一个致命错误：%s。"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "澳大利亚"
+msgid "Games/Strategy"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "安装完成"
+msgid "Development/Java"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "波兰"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"无法更新来源；该来源将被自动停用。\n"
+"\n"
+"错误如下：\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "版本："
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "在登录代理服务器时，您可能要指定用户名和密码："
+msgid "Archiving/Compression"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "可升级"
+msgid "Books/Litterature"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " 完成。"
+msgid "Please choose the desired mirror."
+msgstr "请选择喜欢的镜像站点。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "软件包安装"
+msgid "Communications"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "需要另外的软件包"
+msgid "Graphical desktop/Sawfish"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "缺陷修正更新"
+msgid "Reason for update: "
+msgstr "更新原因："
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "下载“%s”，剩余时间：%s，速度：%s"
+msgid "Sciences/Mathematics"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "德国"
+msgid "Remove"
+msgstr "卸载"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Russia"
-msgstr "俄罗斯"
+msgid "Portugal"
+msgstr "葡萄牙"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "挪威"
+msgid "Czech Republic"
+msgstr "捷克共和国"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "在安装过程中发生问题"
+msgid "Some packages need to be removed"
+msgstr "需要删除一些软件包"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "搜索"
+msgid "Problem during removal"
+msgstr "在删除过程中发生问题"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a media"
-msgstr "编辑来源"
+msgid "Graphical desktop/Enlightenment"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "捷克共和国"
+msgid "Help launched in background"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You already have at least one update media configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Medias Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"安装失败，缺少某些文件。\n"
+"您可能需要更新您的软件源数据库。"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s"
 msgstr ""
-"你已经至少配置了一个升级来源，但是它们现在全部都\n"
-"不可用。你需要运行“软件源管理器”来启用其中的至\n"
-"少一项（检查它是否在“启用”那一栏中）。\n"
+"安装过程中发生了问题：\n"
 "\n"
-"然后，重新启动“Mandrake 自动升级”。"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "停止"
+msgid "No package found for installation."
+msgstr "没有可供安装的软件包。"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "更新"
+msgid "Description: "
+msgstr "描述："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "正在删除软件包，请稍候..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "正常信息"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"对不起，不能选择下列软件包：\n"
+"\n"
+"%s\n"
+"\n"
+"原因如下：\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Media: "
-msgstr "来源："
+msgid "Sciences/Chemistry"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "正在下载软件包“%s”（%s/%s）..."
+msgid "All requested packages were installed successfully."
+msgstr "所有要求的软件包都已成功安装。"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "本机文件"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "选中软件：%d MB / 剩余磁盘空间：%d MB"
+msgid "Addable"
+msgstr "可添加"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "请选择"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Databases"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking/IRC"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media"
 msgstr "来源"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "名称："
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "代理服务器主机名："
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"下列软件包的签名出现以下问题：\n"
+"\n"
+"%s\n"
+"\n"
+"确定继续吗？"
+
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Spain"
-msgstr "西班牙"
+msgid "Download of `%s', speed:%s"
+msgstr "下载“%s”，速度：%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "正在检查 %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Video"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Development/GNOME and GTK+"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址，请稍候。"
+msgid "Selected"
+msgstr "选中"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "登录名："
+msgid "Maximum information"
+msgstr "最多信息"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a media:"
-msgstr "添加一个来源："
+msgid "Examining distant file of media `%s'..."
+msgstr "正在检查来源“%s”的距离文件..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "奥地利"
+msgid "Archiving/Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Fatal error"
-msgstr "致命错误"
+msgid "Quit"
+msgstr "退出"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "更新..."
+msgid "Version: "
+msgstr "版本："
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "开始下载“%s”..."
+msgid "Norway"
+msgstr "挪威"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "（无）"
+msgid "Use .%s as main file"
+msgstr "使用 .%s 作为主文件"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "以色列"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "中国"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Welcome to the software removal tool!\n"
 "\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"对不起，删除这些软件包将可能毁坏您的系统：\n"
+"欢迎使用软件包删除工具！\n"
 "\n"
+"本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安装软件包“%s”（%s/%s）..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Currently installed version: "
-msgstr "当前安装的版本："
+msgid "(Not available)"
+msgstr "（不可用）"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "其他"
+msgid "Bugfixes updates"
+msgstr "缺陷修正更新"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "更新原因："
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "请选择喜欢的镜像站点。"
+msgid "Networking/WWW"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "编辑"
+msgid "Update..."
+msgstr "更新..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "取消"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "相对 synthesis/hdlist 的路径："
+msgid "Enabled?"
+msgstr "已启用？"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "搜索结果（无）"
+msgid "Sciences/Geosciences"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "丹麦"
+msgid "System/Fonts/Console"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "中国"
+msgid "All packages, alphabetical"
+msgstr "全部软件包，按字母次序排列"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "美国"
+msgid "Mandrake choices"
+msgstr "Mandrake 精选"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "更改："
+msgid "Toys"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "另外一些软件包需要删除"
+msgid "Installation finished"
+msgstr "安装完成"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " 完成。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "Drake RPM 管理器"
+msgid "Development/KDE and Qt"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No"
-msgstr "否"
+msgid "Books/Howtos"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure medias"
-msgstr "设置来源"
+msgid "You need to insert the medium to continue"
+msgstr "您必须插入介质才能继续"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Add a media"
-msgstr "添加一个来源"
+#: ../rpmdrake:1
+#, c-format
+msgid "Games/Boards"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "摘要："
+msgid "Too many packages are selected"
+msgstr "选中的包太多"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "加拿大"
+msgid "Danmark"
+msgstr "丹麦"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "希腊"
+msgid "Do nothing"
+msgstr "不做任何事"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "Networking/Mail"
 msgstr ""
-"下载镜像列表时发生错误：\n"
-"\n"
-"%s\n"
-"您的网络或 MandrakeSoft 网站可能不可用。\n"
-"请稍后再试。"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "下载出错"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Help"
+msgstr "帮助"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1051,72 +1475,117 @@ msgstr "对不起，无法得到源软件包。%s"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "路径："
+msgid "Edit a media"
+msgstr "编辑来源"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "全部软件包，"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "中国台湾"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "在删除过程中发生问题"
+msgid "(none)"
+msgstr "（无）"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "德国"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "选中"
+msgid "System/Fonts/X11 bitmap"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "荷兰"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "下载“%s”，剩余时间：%s，速度：%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "否"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "可添加"
+msgid "Install"
+msgstr "安装"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "添加..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
-msgstr "（不可用）"
+msgid "Change medium"
+msgstr "更换来源"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/GNOME"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a media:"
+msgstr "添加一个来源："
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "重置选中"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake 自动升级"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
 "%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"对不起，不能选择下列软件包：\n"
+"下载镜像列表时发生错误：\n"
 "\n"
 "%s\n"
-"\n"
-"原因如下：\n"
-"\n"
-"%s"
+"您的网络或 MandrakeSoft 网站可能不可用。\n"
+"请稍后再试。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "未选中"
+msgid "Books/Computer books"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "软件包删除"
+msgid "System/Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"对不起，删除这些软件包将可能毁坏您的系统：\n"
+"\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "瑞典"
+msgid "Brazil"
+msgstr "巴西"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1133,166 +1602,141 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The list of updates is void. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
-msgstr ""
-"更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
-"或者您已经安装了全部更新。"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of media `%s'..."
-msgstr "正在检查源“%s”的文件..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "下载“%s”，速度：%s"
+msgid "Already existing update medias"
+msgstr "升级来源已经存在"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一："
+msgid "Currently installed version: "
+msgstr "当前安装的版本："
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "退出"
+msgid "Development/C++"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "System/Configuration/Printing"
 msgstr ""
-"我需要连接镜像才能获得最新的更新软件包。\n"
-"请检查您的网络是否运转正常。\n"
-"\n"
-"确定继续吗？"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update media(s)"
-msgstr "更新来源"
+msgid "Games/Puzzles"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Ok"
-msgstr "确定"
+msgid "System/Configuration/Packaging"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "正在添加来源，请稍候..."
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请把标记为“%s”的介质放进设备 [%s]"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
+#, fuzzy, c-format
+msgid "You need to select some packages first."
 msgstr "源软件包未找到。"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr "选中的包太多"
+#, fuzzy, c-format
+msgid "All packages, by selection state"
+msgstr "按照选择状态排列"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the Software Medias Manager!\n"
-"\n"
-"This tool will help you configure the packages medias you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"欢迎使用“软件源管理器”！\n"
-"\n"
-"本工具将帮助您配置要在您的电脑上使用的软件包来源。这些来源将在安装新\n"
-"软件包或执行更新时使用。"
+msgid "Name:"
+msgstr "名称："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s 与 %s 相冲突"
+msgid "Graphical desktop/Other"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"欢迎使用“Mandrake 自动升级”！\n"
-"\n"
-"本工具将帮助您为您的电脑中安装更新的软件包。"
+msgid "No update"
+msgstr "没有更新"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "确定"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake 精选"
+msgid "Text tools"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "更新日志：\n"
+msgid "rpmdrake"
+msgstr "Drake RPM 管理器"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Korea"
-msgstr "韩国"
+msgid "Networking/Instant messaging"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "可移动设备"
+msgid "Please wait, removing medium..."
+msgstr "正在删除临时文件，请稍候..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Belgium"
-msgstr "比利时"
+msgid "Accessibility"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "更换来源"
+msgid "changes:"
+msgstr "更改："
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Editors"
+msgstr "编辑"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake 自动升级"
+msgid "United Kingdom"
+msgstr "英国"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP 服务器"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "相对 synthesis/hdlist 的路径："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "文件：\n"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
-"Errors:\n"
-"%s"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"无法更新来源；该来源将被自动停用。\n"
+"欢迎使用“Mandrake 自动升级”！\n"
 "\n"
-"错误如下：\n"
-"%s"
+"本工具将帮助您为您的电脑中安装更新的软件包。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Leaves only, sorted by install date"
+msgid "System/Fonts/True type"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "用户名："
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "浏览..."
+
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
 msgstr "下载目录不存在"
@@ -1563,6 +2007,9 @@ msgstr "删除软件"
 msgid "Software Sources Manager"
 msgstr "软件源管理器"
 
+#~ msgid "Save and quit"
+#~ msgstr "保存并退出"
+
 #~ msgid "by group"
 #~ msgstr "按照组别排列"