updated po file

1 files changed, 207 insertions, 484 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 33bc2e1b..da55e9ad 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,10 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-09-11 15:17+0200\n"
+"POT-Creation-Date: 2002-09-12 18:30+0200\n"
 "PO-Revision-Date: 2002-09-02 11:20+0800\n"
-"Last-Translator: Shiyu Tang <ShiyuTang@netscape.net>\n"
-"Language-Team: Simplified Chinese <future-cjk@mandrakesoft.com>\n"
+"Last-Translator: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
+"Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +21,7 @@ msgstr "无法创建介质。"
 
 #: ../edit-urpm-sources.pl_.c:42
 msgid "Unable to update medium; it will be automatically disabled."
-msgstr "无法更新介质；将被自动停用。"
+msgstr "无法更新介质; 将被自动停用。"
 
 #: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:163
 msgid "Edit a source"
@@ -33,7 +33,7 @@ msgstr "本机文件"
 
 #: ../edit-urpm-sources.pl_.c:54
 msgid "Path:"
-msgstr "路径："
+msgstr "路径:"
 
 #: ../edit-urpm-sources.pl_.c:55
 msgid "FTP server"
@@ -42,7 +42,7 @@ msgstr "FTP 服务器"
 #: ../edit-urpm-sources.pl_.c:55 ../edit-urpm-sources.pl_.c:56
 #: ../edit-urpm-sources.pl_.c:58 ../edit-urpm-sources.pl_.c:169
 msgid "URL:"
-msgstr "URL："
+msgstr "URL:"
 
 #: ../edit-urpm-sources.pl_.c:56
 msgid "HTTP server"
@@ -50,13 +50,13 @@ msgstr "HTTP 服务器"
 
 #: ../edit-urpm-sources.pl_.c:57
 msgid "Path or mount point:"
-msgstr "路径或装载点："
+msgstr "路径或装载点:"
 
 #: ../edit-urpm-sources.pl_.c:57
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:487
+#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:486
 msgid "Security updates"
 msgstr "安全更新"
 
@@ -70,19 +70,19 @@ msgstr "选择镜像..."
 
 #: ../edit-urpm-sources.pl_.c:91
 msgid "Login:"
-msgstr "登录名："
+msgstr "登录名:"
 
 #: ../edit-urpm-sources.pl_.c:91 ../edit-urpm-sources.pl_.c:210
 msgid "Password:"
-msgstr "口令："
+msgstr "口令:"
 
 #: ../edit-urpm-sources.pl_.c:96
 msgid "Name:"
-msgstr "名称："
+msgstr "名称:"
 
 #: ../edit-urpm-sources.pl_.c:98 ../edit-urpm-sources.pl_.c:170
 msgid "Relative path to synthesis/hdlist:"
-msgstr "相对 synthesis/hdlist 的路径："
+msgstr "相对 synthesis/hdlist 的路径:"
 
 #: ../edit-urpm-sources.pl_.c:106
 msgid "You need to fill up at least the two first entries."
@@ -93,43 +93,43 @@ msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
-"已经有一个介质使用这个名字，\n"
-"您确实要替换它吗？"
+"已经有一个介质使用这个名字, \n"
+"您确实要替换它吗?"
 
 #: ../edit-urpm-sources.pl_.c:118
 msgid "Adding a source:"
-msgstr "添加一个来源："
+msgstr "添加一个来源:"
 
 #: ../edit-urpm-sources.pl_.c:119
 msgid "Type of source:"
-msgstr "介质类型："
+msgstr "介质类型:"
 
 #: ../edit-urpm-sources.pl_.c:123 ../edit-urpm-sources.pl_.c:182
 #: ../edit-urpm-sources.pl_.c:214 ../rpmdrake.pm_.c:85 ../rpmdrake.pm_.c:105
-#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:868
-#: ../rpmdrake_.c:899
+#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:339 ../rpmdrake_.c:869
+#: ../rpmdrake_.c:900
 msgid "Ok"
 msgstr "确定"
 
 #: ../edit-urpm-sources.pl_.c:126 ../edit-urpm-sources.pl_.c:174
 #: ../edit-urpm-sources.pl_.c:182 ../edit-urpm-sources.pl_.c:215
-#: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:340
-#: ../rpmdrake_.c:899
+#: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:339
+#: ../rpmdrake_.c:900
 msgid "Cancel"
 msgstr "取消"
 
 #: ../edit-urpm-sources.pl_.c:143
 msgid "Please wait, adding medium..."
-msgstr "添加介质，请稍候..."
+msgstr "添加介质, 请稍候..."
 
 #: ../edit-urpm-sources.pl_.c:152
 msgid "Please wait, removing medium..."
-msgstr "删除介质，请稍候..."
+msgstr "删除介质, 请稍候..."
 
 #: ../edit-urpm-sources.pl_.c:167
 #, c-format
 msgid "Editing source \"%s\":"
-msgstr "编辑来源 \"%s\"："
+msgstr "编辑来源 “%s”:"
 
 #: ../edit-urpm-sources.pl_.c:173
 msgid "Save changes"
@@ -142,11 +142,11 @@ msgstr "你必须插入介质才能继续"
 #: ../edit-urpm-sources.pl_.c:181
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
-msgstr "要保存改变，你必须往驱动器插介质。"
+msgstr "要保存改变, 你必须往驱动器插介质。"
 
 #: ../edit-urpm-sources.pl_.c:186
 msgid "Please wait, updating medium..."
-msgstr "更新介质，请稍候..."
+msgstr "更新介质, 请稍候..."
 
 #: ../edit-urpm-sources.pl_.c:197
 msgid "Configure proxies"
@@ -156,20 +156,19 @@ msgstr "配置代理服务器"
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
-msgstr ""
-"如果你需要用代理服务器，请输入主机名和端口（句法：<proxyhost[:port]>）："
+msgstr "如果你需要用代理服务器, 请输入主机名和端口(语法:<proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl_.c:204
 msgid "Proxy hostname:"
-msgstr "代理服务器主机名："
+msgstr "代理服务器主机名:"
 
 #: ../edit-urpm-sources.pl_.c:206
 msgid "You may specify a user/password for the proxy authentication:"
-msgstr "在登陆代理服务器时，你可能要指定用户名和密码："
+msgstr "在登陆代理服务器时, 你可能要指定用户名和密码:"
 
 #: ../edit-urpm-sources.pl_.c:208
 msgid "User:"
-msgstr "用户名："
+msgstr "用户名:"
 
 #: ../edit-urpm-sources.pl_.c:232
 msgid "Configure sources"
@@ -177,13 +176,13 @@ msgstr "配置来源"
 
 #: ../edit-urpm-sources.pl_.c:233
 msgid "Enabled?"
-msgstr "激活?"
+msgstr "启用?"
 
 #: ../edit-urpm-sources.pl_.c:233
 msgid "Source"
 msgstr "来源"
 
-#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:663
+#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:662
 msgid "Remove"
 msgstr "可卸装"
 
@@ -207,11 +206,11 @@ msgstr "代理服务器..."
 msgid "Save and quit"
 msgstr "保存并退出"
 
-#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:666
+#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:665
 msgid "Quit"
 msgstr "离开"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014
+#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1015
 #, c-format
 msgid ""
 "%s\n"
@@ -220,7 +219,7 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"要继续吗？"
+"要继续吗?"
 
 #: ../edit-urpm-sources.pl_.c:285
 msgid ""
@@ -230,10 +229,10 @@ msgid ""
 "your computer. They will then be available to install new software package\n"
 "or to perform updates."
 msgstr ""
-"欢迎使用软件包来源编辑器！\n"
+"欢迎使用软件包来源编辑器!\n"
 "\n"
 "这个工具帮助您配置您的电脑将使用的软件包来源。\n"
-"以后安装新的软件包或者进行更新时，\n"
+"以后安装新的软件包或者进行更新时, \n"
 "可以使用这里定义的软件包来源。"
 
 #: ../rpmdrake.pm_.c:81
@@ -367,11 +366,11 @@ msgstr ""
 "我需要连接 MandrakeSoft 网站下载镜像站点的清单。\n"
 "请确认您的网络正在工作。\n"
 "\n"
-"可以继续吗？"
+"可以继续吗?"
 
 #: ../rpmdrake.pm_.c:239
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址，请稍候。"
+msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址, 请稍候。"
 
 #: ../rpmdrake.pm_.c:245
 msgid "Error during download"
@@ -386,10 +385,10 @@ msgid ""
 "The network, or MandrakeSoft website, are maybe unavailable.\n"
 "Please try again later."
 msgstr ""
-"下载镜像站点的清单时出错：\n"
+"下载镜像站点的清单时出错:\n"
 "\n"
 "%s\n"
-"您的网络连接，或者 MandrakeSoft 网站，现在有些问题。\n"
+"您的网络连接, 或者 MandrakeSoft 网站, 现在有些问题。\n"
 "请过一会儿再试。"
 
 #: ../rpmdrake.pm_.c:254
@@ -404,7 +403,7 @@ msgid ""
 "the case when the architecture of your processor is not supported\n"
 "by Mandrake Linux Official Updates."
 msgstr ""
-"没有找到合适的镜像站点。这个问题的出现可能有很多原因；最经常出现的原因就是\n"
+"没有找到合适的镜像站点。这个问题的出现可能有很多原因; 最经常出现的原因就是\n"
 "您的处理器的架构不被 Mandrake Linux 官方升级所\n"
 "支持。"
 
@@ -412,13 +411,13 @@ msgstr ""
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:566
+#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:565
 msgid "Update source(s)"
 msgstr "更新介质"
 
 #: ../rpmdrake.pm_.c:296
 msgid "Select the source(s) you wish to update:"
-msgstr "选择要更新的源介质："
+msgstr "选择要更新的源介质:"
 
 #: ../rpmdrake.pm_.c:300
 msgid "Update"
@@ -426,15 +425,19 @@ msgstr "更新"
 
 #: ../rpmdrake.pm_.c:308
 msgid "Please wait, updating media..."
-msgstr "更新介质，请稍候..."
+msgstr "更新介质, 请稍候..."
 
 #: ../rpmdrake_.c:96
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake_.c:133 ../rpmdrake_.c:441 ../rpmdrake_.c:442
+#: ../rpmdrake_.c:114 ../rpmdrake_.c:127 ../rpmdrake_.c:216 ../rpmdrake_.c:285
+msgid "(none)"
+msgstr "(无)"
+
+#: ../rpmdrake_.c:133 ../rpmdrake_.c:440 ../rpmdrake_.c:441
 msgid "(Not available)"
-msgstr "（不可用）"
+msgstr "(不可用)"
 
 #: ../rpmdrake_.c:143 ../rpmdrake_.c:200
 msgid "Search results"
@@ -442,21 +445,21 @@ msgstr "搜寻结果"
 
 #: ../rpmdrake_.c:143
 msgid "Search results (none)"
-msgstr "搜寻结果（无）"
+msgstr "搜寻结果(无)"
 
 #: ../rpmdrake_.c:153 ../rpmdrake_.c:164
 msgid "Please wait, searching..."
-msgstr "正在搜寻，请稍候..."
+msgstr "正在搜寻, 请稍候..."
 
 #: ../rpmdrake_.c:167
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake_.c:201 ../rpmdrake_.c:307
+#: ../rpmdrake_.c:201 ../rpmdrake_.c:306
 msgid "Addable"
 msgstr "可添加的"
 
-#: ../rpmdrake_.c:201 ../rpmdrake_.c:307
+#: ../rpmdrake_.c:201 ../rpmdrake_.c:306
 msgid "Upgradable"
 msgstr "可升级的"
 
@@ -468,17 +471,13 @@ msgstr "没有选择"
 msgid "Selected"
 msgstr "选择"
 
-#: ../rpmdrake_.c:216 ../rpmdrake_.c:286
-msgid "(none)"
-msgstr "（无）"
-
 #: ../rpmdrake_.c:244
 msgid "More information on package..."
 msgstr "更多有关该软件包的信息..."
 
 #: ../rpmdrake_.c:246
 msgid "One of the following packages is needed:"
-msgstr "需要下列软件之一："
+msgstr "需要下列软件之一:"
 
 #: ../rpmdrake_.c:246
 msgid "Please choose"
@@ -490,219 +489,216 @@ msgstr "未知软件包"
 
 #: ../rpmdrake_.c:272
 msgid "Please wait, listing packages..."
-msgstr "正在列出软件包，请稍候..."
+msgstr "正在列出软件包, 请稍候..."
 
-#: ../rpmdrake_.c:288
+#: ../rpmdrake_.c:287
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake_.c:289
+#: ../rpmdrake_.c:288
 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"
-"安装的这些软件包没有更新，\n"
+"安装的这些软件包没有更新, \n"
 "或者您已经安装过所有的更新。"
 
-#: ../rpmdrake_.c:346
+#: ../rpmdrake_.c:345
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake_.c:347
+#: ../rpmdrake_.c:346
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
 "\n"
 msgstr ""
-"为了满足所有依赖关系，\n"
-"需要删除下列软件包：\n"
+"为了满足所有依赖关系, \n"
+"需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:353
+#: ../rpmdrake_.c:352
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake_.c:354 ../rpmdrake_.c:412
+#: ../rpmdrake_.c:353 ../rpmdrake_.c:411
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
-"由于软件包之间的依赖关系，您不可以选择\n"
-"下列软件包：\n"
+"由于软件包之间的依赖关系, 您不可以选择\n"
+"下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:382
+#: ../rpmdrake_.c:381
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake_.c:383
+#: ../rpmdrake_.c:382
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
-"为满足依赖关系，还需要安装\n"
-"下列软件包：\n"
+"为满足依赖关系, 还需要安装\n"
+"下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:396
+#: ../rpmdrake_.c:395
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake_.c:397
+#: ../rpmdrake_.c:396
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"对不起，不能选择下列软件包：\n"
+"对不起, 不能选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:411 ../rpmdrake_.c:624
+#: ../rpmdrake_.c:410 ../rpmdrake_.c:623
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:432
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "选中：%d MB / 空闲磁盘空间：%d MB"
+msgstr "选中:%d MB / 空闲磁盘空间:%d MB"
 
-#: ../rpmdrake_.c:435
+#: ../rpmdrake_.c:434
 #, c-format
 msgid "Selected size: %d MB"
-msgstr "选中：%d MB"
+msgstr "选中:%d MB"
 
-#: ../rpmdrake_.c:441
+#: ../rpmdrake_.c:440
 msgid "Files:\n"
-msgstr "文件：\n"
+msgstr "文件:\n"
 
-#: ../rpmdrake_.c:442
+#: ../rpmdrake_.c:441
 msgid "Changelog:\n"
-msgstr "更新记录：\n"
+msgstr "更新记录:\n"
 
-#: ../rpmdrake_.c:445
+#: ../rpmdrake_.c:444
 msgid "Source: "
 msgstr "来源: "
 
-#: ../rpmdrake_.c:446
+#: ../rpmdrake_.c:445
 msgid "Currently installed version: "
-msgstr ""
+msgstr "当前安装的版本:"
 
-#: ../rpmdrake_.c:450
+#: ../rpmdrake_.c:449
 msgid "Reason for update: "
-msgstr ""
+msgstr "更新原因:"
 
-#: ../rpmdrake_.c:452
+#: ../rpmdrake_.c:451
 msgid "Name: "
-msgstr "名称： "
+msgstr "名称: "
 
-#: ../rpmdrake_.c:453
+#: ../rpmdrake_.c:452
 msgid "Version: "
-msgstr "版本： "
+msgstr "版本: "
 
-#: ../rpmdrake_.c:454
+#: ../rpmdrake_.c:453
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake_.c:454
+#: ../rpmdrake_.c:453
 msgid "Size: "
-msgstr "大小： "
+msgstr "大小: "
 
-#: ../rpmdrake_.c:455
+#: ../rpmdrake_.c:454
 msgid "Importance: "
-msgstr "重要性： "
+msgstr "重要性: "
 
-#: ../rpmdrake_.c:456
+#: ../rpmdrake_.c:455
 msgid "Summary: "
-msgstr "摘要： "
+msgstr "摘要: "
 
-#: ../rpmdrake_.c:457
-#, fuzzy
+#: ../rpmdrake_.c:456
 msgid "Description: "
-msgstr "在描述中"
+msgstr "描述:"
 
-#: ../rpmdrake_.c:466
+#: ../rpmdrake_.c:465
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:487
+#: ../rpmdrake_.c:486
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake_.c:487
+#: ../rpmdrake_.c:486
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake_.c:506
+#: ../rpmdrake_.c:505
 msgid "Mandrake choices"
 msgstr "Mandrake 精选"
 
-#: ../rpmdrake_.c:507
+#: ../rpmdrake_.c:506
 msgid "All packages, alphabetical"
 msgstr "全部软件包, 字母次序"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:507
 msgid "All packages,"
 msgstr "全部软件包,"
 
-#: ../rpmdrake_.c:531
+#: ../rpmdrake_.c:530
 msgid "by group"
 msgstr "按照分组"
 
-#: ../rpmdrake_.c:531
+#: ../rpmdrake_.c:530
 msgid "by size"
 msgstr "按照大小"
 
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:531
 msgid "by selection state"
 msgstr "按照选择状态"
 
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:532
 msgid "by source repository"
 msgstr "按照来源"
 
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:532
 msgid "by update availability"
 msgstr "按照是否可更新"
 
-#: ../rpmdrake_.c:554
+#: ../rpmdrake_.c:553
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake_.c:554
+#: ../rpmdrake_.c:553
 msgid "in files"
 msgstr "在文件中"
 
-#: ../rpmdrake_.c:554
+#: ../rpmdrake_.c:553
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake_.c:565
-#, fuzzy
+#: ../rpmdrake_.c:564
 msgid "Reload the packages list"
-msgstr "软件包%s未经签署"
+msgstr "重载包清单"
 
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:564
 msgid "Reset the selection"
-msgstr ""
+msgstr "重置选中"
 
-#: ../rpmdrake_.c:592
+#: ../rpmdrake_.c:591
 msgid "Maximum information"
 msgstr "最多信息"
 
-#: ../rpmdrake_.c:592
+#: ../rpmdrake_.c:591
 msgid "Normal information"
 msgstr "正常信息"
 
-#: ../rpmdrake_.c:614
-#, fuzzy
+#: ../rpmdrake_.c:613
 msgid "Too many packages are selected"
-msgstr "有些软件包无法安装"
+msgstr "选中的包太多"
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:614
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -711,8 +707,12 @@ msgid ""
 "\n"
 "Do you really want to install all the selected packages?"
 msgstr ""
+"警告: 你好像试图添加可能在包安装时或安装后超过文件系统剩余\n"
+"空间的包; 这种情况非常危险, 应该小心考虑。\n"
+"\n"
+"你真的想要安装选中包吗?"
 
-#: ../rpmdrake_.c:625
+#: ../rpmdrake_.c:624
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -721,41 +721,41 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"要安装其它软件包，必须删除下列软件包：\n"
+"要安装其它软件包, 必须删除下列软件包:\n"
 "\n"
 "%s\n"
 "\n"
-"可以继续吗？"
+"可以继续吗?"
 
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:646
 msgid "Find:"
-msgstr "找到："
+msgstr "找到:"
 
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:651
 msgid "Search"
 msgstr "搜寻"
 
-#: ../rpmdrake_.c:664
+#: ../rpmdrake_.c:663
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake_.c:691
+#: ../rpmdrake_.c:690
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:692 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:691 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Mandrake 更新"
 
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:691
 msgid "Software Packages Removal"
 msgstr " 软件包删除"
 
-#: ../rpmdrake_.c:693
+#: ../rpmdrake_.c:692
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake_.c:726
+#: ../rpmdrake_.c:725
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -765,25 +765,25 @@ msgstr ""
 "我需要连接镜像服务器以得到最新的更新软件包。\n"
 "请检查您的网络是否已经接通。\n"
 "\n"
-"可以继续吗？"
+"可以继续吗?"
 
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:729
 msgid "Please wait, contacting mirror to update packages information."
-msgstr "正在连接镜像服务器以得到最新的更新软件包，请稍候。"
+msgstr "正在连接镜像服务器以得到最新的更新软件包, 请稍候。"
 
-#: ../rpmdrake_.c:732
+#: ../rpmdrake_.c:731
 msgid "Error updating medium"
 msgstr "更新介质出错"
 
-#: ../rpmdrake_.c:733
+#: ../rpmdrake_.c:732
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "更新软件包信息时发生不可恢复的错误。"
 
-#: ../rpmdrake_.c:739
+#: ../rpmdrake_.c:738
 msgid "How to choose manually your mirror"
 msgstr "如何手工挑选您的镜像"
 
-#: ../rpmdrake_.c:740
+#: ../rpmdrake_.c:739
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -791,21 +791,21 @@ msgid ""
 "\n"
 "Then, restart MandrakeUpdate."
 msgstr ""
-"也可以手工挑选您的镜像：要这样做，\n"
-"启动软件来源管理员，并添加一个“安全更新”\n"
+"也可以手工挑选您的镜像:要这样做, \n"
+"启动软件来源管理员, 并添加一个“安全更新”\n"
 "来源。\n"
 "\n"
-"然后，重新启动 MandrakeUpdate。"
+"然后, 重新启动 MandrakeUpdate。"
 
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:745
 msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "正在联系服务器来初始化更新软件包，请稍候。"
+msgstr "正在联系服务器来初始化更新软件包, 请稍候。"
 
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:749
 msgid "Error adding update medium"
 msgstr "添加更新介质出错"
 
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:750
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -819,89 +819,89 @@ msgid ""
 msgstr ""
 "通过 urpmi 添加更新介质时出错。\n"
 "\n"
-"可能是由于镜像服务器出错或暂时不能连接，或者您的\n"
+"可能是由于镜像服务器出错或暂时不能连接, 或者您的\n"
 "Mandrake Linux 版本(%s)没有被 Mandrake Linux \n"
 "官方升级所支持。\n"
 "\n"
-"要尝试另外的镜像服务器吗？"
+"要尝试另外的镜像服务器吗?"
 
-#: ../rpmdrake_.c:780
+#: ../rpmdrake_.c:781
 msgid "Please wait, finding available packages..."
-msgstr "正在寻找可安装的软件包，请稍候..."
+msgstr "正在寻找可安装的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:809
+#: ../rpmdrake_.c:810
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:813
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake_.c:828
+#: ../rpmdrake_.c:829
 #, c-format
 msgid "Remove .%s"
 msgstr "卸装 .%s"
 
-#: ../rpmdrake_.c:830
+#: ../rpmdrake_.c:831
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake_.c:832
+#: ../rpmdrake_.c:833
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake_.c:835
+#: ../rpmdrake_.c:836
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 
-#: ../rpmdrake_.c:852
+#: ../rpmdrake_.c:853
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake_.c:889
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake_.c:890
+#: ../rpmdrake_.c:891
 msgid "Unable to get source packages, sorry."
-msgstr "对不起，无法得到源软件包。"
+msgstr "对不起, 无法得到源软件包。"
 
-#: ../rpmdrake_.c:897
+#: ../rpmdrake_.c:898
 msgid "Change medium"
 msgstr "更换介质"
 
-#: ../rpmdrake_.c:898
+#: ../rpmdrake_.c:899
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请把标记为 \"%s\" 的介质放进设备 [%s]"
+msgstr "请把标记为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake_.c:906
+#: ../rpmdrake_.c:907
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake_.c:907
+#: ../rpmdrake_.c:908
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
 msgstr ""
-"安装失败，缺少某些文件。\n"
+"安装失败, 缺少某些文件。\n"
 "您可能需要更新您的来源数据库。"
 
-#: ../rpmdrake_.c:910
+#: ../rpmdrake_.c:911
 msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "为了升级软件包，正在删除旧的软件包，请稍候..."
+msgstr "为了升级软件包, 正在删除旧的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:921
+#: ../rpmdrake_.c:922
 msgid "Program missing"
 msgstr "缺少程序"
 
-#: ../rpmdrake_.c:922
+#: ../rpmdrake_.c:923
 msgid "A required program is missing (grpmi). Check your installation."
-msgstr "缺少一个需要的程序（grpmi）。请检查您的安装。"
+msgstr "缺少一个需要的程序(grpmi)。请检查您的安装。"
 
-#: ../rpmdrake_.c:932
+#: ../rpmdrake_.c:933
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -909,12 +909,12 @@ msgid ""
 "Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
 "you may now inspect some in order to take actions:"
 msgstr ""
-"安装完成；%s.\n"
+"安装完成; %s.\n"
 "\n"
-"一些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
-"在执行动作以前，你需要检查一下："
+"一些配置文件被保存为“.rpmnew”或“.rpmsave”, \n"
+"在执行动作以前, 你需要检查一下:"
 
-#: ../rpmdrake_.c:932
+#: ../rpmdrake_.c:933
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -922,72 +922,74 @@ msgstr ""
 "有些软件包出现安装\n"
 "失败"
 
-#: ../rpmdrake_.c:933
+#: ../rpmdrake_.c:934
 msgid "everything was installed correctly"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake_.c:935
+#: ../rpmdrake_.c:936
 msgid "Everything installed successfully"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake_.c:936
+#: ../rpmdrake_.c:937
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake_.c:938
+#: ../rpmdrake_.c:939
 msgid "Everything already installed."
 msgstr "所有软件包已经安装了。"
 
-#: ../rpmdrake_.c:939
+#: ../rpmdrake_.c:940
 msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "所有软件包已经安装了（这是您希望的吗？）。"
+msgstr "所有软件包已经安装了(这是您希望的吗?)。"
 
-#: ../rpmdrake_.c:942
-#, fuzzy
+#: ../rpmdrake_.c:943
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake_.c:943
-#, fuzzy, c-format
+#: ../rpmdrake_.c:944
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
-msgstr "安装过程中有一个问题。"
+msgstr ""
+"安装过程中有一个问题:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake_.c:953
+#: ../rpmdrake_.c:954
 msgid "Please wait, reading packages database..."
-msgstr "读取软件包数据库，请稍候..."
+msgstr "读取软件包数据库, 请稍候..."
 
-#: ../rpmdrake_.c:991
+#: ../rpmdrake_.c:992
 msgid "Please wait, removing packages..."
-msgstr "正在删除软件包，请稍候..."
+msgstr "正在删除软件包, 请稍候..."
 
-#: ../rpmdrake_.c:1018
+#: ../rpmdrake_.c:1019
 msgid ""
 "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"
 "这个工具帮助您选择想要从您的电脑中删除\n"
 "的软件包。"
 
-#: ../rpmdrake_.c:1023
+#: ../rpmdrake_.c:1024
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"欢迎使用 MandrakeUpdate 自动更新工具！\n"
+"欢迎使用 MandrakeUpdate 自动更新工具!\n"
 "\n"
 "这个工具帮助您为您的电脑中安装\n"
 "更新的软件包。"
 
-#: ../rpmdrake_.c:1028
+#: ../rpmdrake_.c:1029
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -995,7 +997,7 @@ msgid ""
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
-"欢迎使用软件包安装工具！\n"
+"欢迎使用软件包安装工具!\n"
 "\n"
 "您的 Mandrake Linux 的安装光盘包含有数千个软件包。\n"
 "这个工具帮助您选择要为您的电脑安装的软件包。"
@@ -1011,282 +1013,3 @@ msgstr "软件来源管理员"
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "安装软件"
-
-#, fuzzy
-#~ msgid "Update sources"
-#~ msgstr "更新介质"
-
-#~ msgid "Software Management"
-#~ msgstr " 软件包管理"
-
-#~ msgid ""
-#~ "%sFiles:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Changelog:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s文件：\n"
-#~ "%s\n"
-#~ "\n"
-#~ "更新记录：\n"
-#~ "%s"
-
-#~ msgid "Source: %s\n"
-#~ msgstr "来源：%s\n"
-
-#~ msgid ""
-#~ "Name: %s\n"
-#~ "Version: %s\n"
-#~ "Size: %s KB\n"
-#~ "Importance: %s\n"
-#~ "\n"
-#~ "Summary: %s\n"
-#~ "\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "名称：%s\n"
-#~ "版本：%s\n"
-#~ "大小：%s KB\n"
-#~ "重要性：%s\n"
-#~ "\n"
-#~ "摘要：%s\n"
-#~ "\n"
-#~ "%s\n"
-
-#~ msgid ""
-#~ "Name: %s\n"
-#~ "Version: %s\n"
-#~ "Size: %s KB\n"
-#~ "\n"
-#~ "Summary: %s\n"
-#~ "\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "名称：%s\n"
-#~ "版本：%s\n"
-#~ "大小：%s KB\n"
-#~ "\n"
-#~ "摘要：%s\n"
-#~ "\n"
-#~ "%s\n"
-
-#~ msgid "Remove .rpmnew"
-#~ msgstr "删除.rpmnew"
-
-#~ msgid "This would break your system"
-#~ msgstr "这会破坏您的系统"
-
-#~ msgid ""
-#~ "Sorry, removing these packages would break your system:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "对不起，删除这些软件包会破坏您的系统：\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Could not find /var/lib/urpmi/compssUsers.flat,\n"
-#~ "the installer should have generated it for me :-(.\n"
-#~ "\n"
-#~ "Disabling \"Mandrake choices\" classification."
-#~ msgstr ""
-#~ "没有找到 /var/lib/urpmi/compssUsers.flat，\n"
-#~ "安装程序应该生成那个文件才对 :-(。\n"
-#~ "\n"
-#~ "禁止 \"Mandrake 精选\" 分类。"
-
-#~ msgid "Installing/Upgrading Progress"
-#~ msgstr "安装/升级进展"
-
-#~ msgid "Fetching:"
-#~ msgstr "正在抓取："
-
-#~ msgid "Installing:"
-#~ msgstr "正在安装："
-
-#~ msgid " is needed by %s-%s-%s"
-#~ msgstr " 是 %s-%s-%s 需要的"
-
-#~ msgid " conflicts with %s-%s-%s"
-#~ msgstr " 与 %s-%s-%s 冲突"
-
-#~ msgid "Unsupported protocol\n"
-#~ msgstr "Unsupported protocol - 未支持的协议\n"
-
-#~ msgid "Failed init\n"
-#~ msgstr "Failed init - 初始化失败\n"
-
-#~ msgid "Bad URL format\n"
-#~ msgstr "Bad URL format - 错误的 URL 格式\n"
-
-#~ msgid "Bad user format in URL\n"
-#~ msgstr "Bad user format in URL - URL 中错误的用户格式\n"
-
-#~ msgid "Couldn't resolve proxy\n"
-#~ msgstr "Couldn't resolve proxy - 无法解析代理\n"
-
-#~ msgid "Couldn't resolve host\n"
-#~ msgstr "Couldn't resolve host - 无法解析主机\n"
-
-#~ msgid "Couldn't connect\n"
-#~ msgstr "Couldn't connect - 无法连接\n"
-
-#~ msgid "Ftp weird server reply\n"
-#~ msgstr "Ftp weird server reply - FTP 服务器回答怪异\n"
-
-#~ msgid "Ftp access denied\n"
-#~ msgstr "Ftp access denied - FTP 访问被拒绝\n"
-
-#~ msgid "Ftp user password incorrect\n"
-#~ msgstr "Ftp user password incorrect - FTP 用户口令不对\n"
-
-#~ msgid "Ftp weird PASS reply\n"
-#~ msgstr "Ftp weird PASS reply - FTP 怪异的 PASS 回应\n"
-
-#~ msgid "Ftp weird USER reply\n"
-#~ msgstr "Ftp weird USER reply - FTP 怪异的 USER 回应\n"
-
-#~ msgid "ftp weird PASV reply\n"
-#~ msgstr "ftp weird PASV reply - FTP 怪异的 PASV 回应\n"
-
-#~ msgid "Ftp weird 227 format\n"
-#~ msgstr "Ftp weird 227 format - FTP 怪异的 227 格式\n"
-
-#~ msgid "Ftp can't get host\n"
-#~ msgstr "Ftp can't get host - FTP 无法达到主机\n"
-
-#~ msgid "Ftp can't reconnect\n"
-#~ msgstr "Ftp can't reconnect - FTP 无法重新连接\n"
-
-#~ msgid "Ftp couldn't set binary\n"
-#~ msgstr "Ftp couldn't set binary - FTP 无法设置二进制模式\n"
-
-#~ msgid "Partial file\n"
-#~ msgstr "Partial file - 部分文件\n"
-
-#~ msgid "Ftp couldn't RETR file\n"
-#~ msgstr "Ftp couldn't RETR file - FTP 无法 RETR 文件\n"
-
-#~ msgid "Ftp write error\n"
-#~ msgstr "Ftp write error - FTP 写错误\n"
-
-#~ msgid "Ftp quote error\n"
-#~ msgstr "Ftp quote error -  FTP 引用错误\n"
-
-#~ msgid "http not found\n"
-#~ msgstr "找不到http\n"
-
-#~ msgid "Write error\n"
-#~ msgstr "写错误\n"
-
-#~ msgid "User name illegally specified\n"
-#~ msgstr "指定的用户名无效\n"
-
-#~ msgid "ftp couldn't STOR file\n"
-#~ msgstr "ftp couldn't STOR file -- FTP 上传失败\n"
-
-#~ msgid "Read error\n"
-#~ msgstr "读错误\n"
-
-#~ msgid "Out of memory\n"
-#~ msgstr "内存用完\n"
-
-#~ msgid "Time out\n"
-#~ msgstr "超时\n"
-
-#~ msgid "Ftp couldn't set ASCII\n"
-#~ msgstr "Ftp couldn't set ASCII - 无法设置文本模式\n"
-
-#~ msgid "Ftp PORT failed\n"
-#~ msgstr "Ftp PORT failed - PORT 操作失败\n"
-
-#~ msgid "Ftp couldn't use REST\n"
-#~ msgstr "Ftp couldn't use REST\n"
-
-#~ msgid "Ftp couldn't get size\n"
-#~ msgstr "Ftp couldn't get size - SIZE 命令失败\n"
-
-#~ msgid "Http range error\n"
-#~ msgstr "Http range error - RANGE 命令失败\n"
-
-#~ msgid "Http POST error\n"
-#~ msgstr "Http POST error - POST 命令出错\n"
-
-#~ msgid "Ssl connect error\n"
-#~ msgstr "Ssl connect error - SSL 连接出错\n"
-
-#~ msgid "Ftp bad download resume\n"
-#~ msgstr "Ftp bad download resume - 无法恢复下载\n"
-
-#~ msgid "File couldn't read file\n"
-#~ msgstr "无法读取文件\n"
-
-#~ msgid "LDAP cannot bind\n"
-#~ msgstr "LDAP cannot bind - 无法连接\n"
-
-#~ msgid "LDAP search failed\n"
-#~ msgstr "LDAP search failed - 查询出错\n"
-
-#~ msgid "Library not found\n"
-#~ msgstr "找不到库\n"
-
-#~ msgid "Function not found\n"
-#~ msgstr "找不到函数\n"
-
-#~ msgid "Aborted by callback\n"
-#~ msgstr "回呼被中止 \n"
-
-#~ msgid "Bad function argument\n"
-#~ msgstr "错误的函数参数\n"
-
-#~ msgid "Bad calling order\n"
-#~ msgstr "错误的调用次序\n"
-
-#~ msgid "Unknown error code %d\n"
-#~ msgstr "未知错误码 %d\n"
-
-#~ msgid "An error occured while fetching file"
-#~ msgstr "抓取文件时出现错误"
-
-#~ msgid "Skip"
-#~ msgstr "跳过"
-
-#~ msgid "Preparing for install"
-#~ msgstr "正在准备安装"
-
-#~ msgid "Can't check the GPG signature"
-#~ msgstr "无法验证 GPG 签名"
-
-#~ msgid ""
-#~ "The package %s has a wrong signature or\n"
-#~ "GnuPG isn't correctly installed"
-#~ msgstr ""
-#~ "软件包 %s 的签名错误\n"
-#~ "或者 GnuPG 没有正确安装"
-
-#~ msgid "Don't install"
-#~ msgstr "不安装"
-
-#~ msgid "Signature problem"
-#~ msgstr "签名问题"
-
-#~ msgid "Can't open package"
-#~ msgstr "不能打开软件包"
-
-#~ msgid "Package is corrupted"
-#~ msgstr "软件包坏了"
-
-#~ msgid "Package can't be installed"
-#~ msgstr "无法安装软件包"
-
-#~ msgid "Error while checking dependencies :("
-#~ msgstr "检查依赖关系时发生错误 :("
-
-#~ msgid "Force"
-#~ msgstr "强迫"
-
-#~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
-#~ msgstr "用法: grpmi <[-noupgrade] rpms>\n"
-
-#~ msgid "grpmi error: you must be superuser!\n"
-#~ msgstr "grpmi 错误信息：您必须作为超级用户！\n"