Updated POT file.

1 files changed, 579 insertions, 896 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd247ca6..b956ba7d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,21 +11,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
-"PO-Revision-Date: 2005-12-17 19:57+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
+"PO-Revision-Date: 2006-07-22 16:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "选择介质类型"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -45,18 +44,16 @@ msgstr ""
 "但\n"
 "您需要分两步完成。)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "发行版介质源"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "官方更新"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -73,116 +70,94 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "添加一个介质"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "本机文件"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "路径:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "RSYNC 服务器"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "可移动设备"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "路径或挂载点:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "可移动设备"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "浏览..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "密码:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "综合文件/hdlist 的相对路径:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "如果留空, 将会自动探测综合文件/hdlist"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "名称:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "创建整个发行版的介质"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "在此介质中搜索更新"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少要填写头两项。"
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "已经有该名称的介质，您真的想要替换吗?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "添加一个介质:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "介质类型:"
 
@@ -190,10 +165,9 @@ msgstr "介质类型:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "取消"
 
@@ -202,267 +176,223 @@ msgstr "取消"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "确定"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "软件包安装的全局选项"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "总是"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "从不"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "校验要安装的 RPM:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "要使用的下载程序:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "删除源"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "您真的想要删除源“%s”吗?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "正在删除介质，请稍候..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "编辑介质"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "编辑介质“%s”:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "保存修改"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "代理服务器..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "您必须插入介质才能继续"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "要保存更改，您必须在驱动器中插入介质。"
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "配置代理服务器"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "介质“%s”的代理服务器设置"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "全局代理服务器设置"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr "如果您需要用代理服务器，请输入主机名和端口(语法: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "代理服务器主机名:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "用户名:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "添加并行组"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "编辑并行组"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "添加一个介质限制"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "在介质限制中选择介质进行添加:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "添加主机"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "输入要添加的主机名或 IP 地址:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "编辑并行组“%s”:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "组名称:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "协议:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "介质限制:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "添加"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "删除"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "主机:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "组"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "协议"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "介质限制"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "协议"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(无)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "编辑"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "添加..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理软件包数字签名的密钥"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "介质"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "密钥"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "添加密钥"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "选择要添加到介质 %s 中的密钥"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "删除密钥"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -471,37 +401,31 @@ msgstr ""
 "(密钥名称: %3$s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "添加密钥..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "删除密钥"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "配置介质"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "启用?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "更新?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "此介质需要更新才能使用。现在更新吗？"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -511,38 +435,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "添加自定义..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "更新..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "管理密钥..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "并行..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "全局选项..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "帮助"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -552,8 +470,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -566,8 +483,7 @@ msgstr ""
 "本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
 "软件包或执行更新时使用。"
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -577,13 +493,22 @@ msgstr ""
 "软件包数据库已锁定。请关闭其它使用软件包数据库的应用程序(您是否有其它介质管理"
 "器或其它桌面，或者您正在安装软件包？)。"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "无法添加介质，给出的参数有错或者不够"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"您即将添加新的软件包介质 %s。\n"
+"这意味着您可以从新介质中向系统添加新的软件包。"
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -592,90 +517,81 @@ msgstr ""
 "您即将添加新的软件包介质“%s”。\n"
 "这意味着您可以从新介质中向系统添加新的软件包。"
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, perl-format
+msgid "Successfully added media %s."
+msgstr "成功添加了介质 %s。"
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "成功添加了介质“%s”。"
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "用法：%s [选项]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr "  --changelog-first      描述窗口中更改日志排在文件列表之前"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=介质1,..       限制使用指定的介质"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     合并找到的全部 .rpmnew/.rpmsave 文件"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=模式            设定模式(安装(默认)、删除、更新)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      更新模式中不询问第一个确认问题"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      启动时不更新介质"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        不校验软件包签名"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 "  --parallel=别名,主机   在并行模式中使用[别名]组和[主机]来显示所需的依赖关系"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=包1,..     只显示这些软件包"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=包1,..       预先选择这些软件包"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 强制以 root 身份运行"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=包            搜索“包”"
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "以用户模式运行"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -685,634 +601,517 @@ msgstr ""
 "您将无法执行对系统的修改，\n"
 "但您仍然可以浏览已有数据库。"
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "辅助功能"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "归档"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "备份"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "光盘刻录"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "压缩"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "其它"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "书籍"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "计算机图书"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "常见问题解答"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "文献"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "簇"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "信息传递"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "查询服务"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "通讯"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "数据库"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "开发"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "开发"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME 和 GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE 和 Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "内核"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr "PHP"
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "编辑器"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "教育"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "模拟器"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "文件工具"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "游戏"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "探险"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "游戏"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "街机"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "棋盘"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "卡"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "拼图"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "运动"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "策略"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "图形桌面"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "图形桌面"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "基于 FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "图形"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "监视"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "多媒体"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "网络"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "网络"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "文件传送"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "即时通讯"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "邮件"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "新闻"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "远程访问"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "办公"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "公钥"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "科学"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "天文"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "科学"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "生物"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "化学"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "计算机科学"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "地球科学"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "数学"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "声音"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "系统"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "基本"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "配置"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "系统"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "启动和初始化"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "配置"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "打包"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "打印"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "部署"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "字体"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "控制台"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "字体"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "TrueType"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 位图"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "国际化"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "内核和硬件"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "库"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "服务器"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "终端"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "文本工具"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "玩具"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "视频"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(不可用)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "停止"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "可添加"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "可添加"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "未选中"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "未选中"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "重要性:"
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "更新原因:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "无描述"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "介质:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "当前安装的版本:"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "名称:"
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "版本: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "架构: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "大小: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "重要性:"
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "大小: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "摘要:"
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "更新原因:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "无描述"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "请选择"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "请选择"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1321,29 +1120,24 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "更多信息"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1352,13 +1146,11 @@ msgstr ""
 "为了满足所有的依赖关系，需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1366,8 +1158,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1376,13 +1167,11 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1391,18 +1180,17 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (属于跳过列表)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1412,123 +1200,105 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中软件: %d MB / 剩余磁盘空间: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "选中大小: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "此软件包的描述不可用\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "安全更新"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "缺陷修正更新"
+#: ../rpmdrake:1003
+msgid "Installed"
+msgstr "已安装"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "正常更新"
+#: ../rpmdrake:1003
+msgid "Non installed"
+msgstr "未安装"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s 精选"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux 精选"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按字母次序排列"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "全部软件包，按组别排列"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "全部软件包，按介质仓库排列"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "全部软件包，按照是否可更新排列"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "不分类，按安装日期排列"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "全部软件包，按组别排列"
+
+#: ../rpmdrake:1013
+msgid "All updates"
+msgstr "全部更新"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "缺陷修正更新"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "正常更新"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "安全更新"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "正常信息"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "最多信息"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1543,7 +1313,7 @@ msgstr ""
 "您真的想要安装所有选中的软件包吗?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1557,89 +1327,99 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/更新介质(_U)"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/重置选中内容(_R)"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/重新装入软件包清单(_P)"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/自动显示选中的软件包(_S)"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr "/报告错误(_R)"
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr "/关于(_A)..."
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr "版权 (C) %s Mandriva"
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
+
+#: ../rpmdrake:1199
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr "Funda Wang <fundawang@gmail.com>"
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "清除"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "安装"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr "应用"
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "退出"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1651,13 +1431,12 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1672,13 +1451,12 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1691,58 +1469,56 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "正在读取软件包数据库，请稍候..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "更改:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1752,18 +1528,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1775,38 +1550,34 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "软件包安装..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "软件包安装..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1820,13 +1591,12 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1838,23 +1608,21 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件 [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1866,43 +1634,33 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "该软件包的更多信息...[%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "没有可供安装的软件包。"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "正在读取软件包数据库，请稍候..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1912,8 +1670,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1924,8 +1681,8 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1936,13 +1693,11 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "欢迎使用软件安装工具!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1955,214 +1710,172 @@ msgstr ""
 "您的 Mandriva Linux 的安装光盘包含有数千个软件包。\n"
 "本工具将帮助您选择要为您的电脑安装的软件包。"
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "软件更新"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux 更新"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "软件更新"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入您访问代理服务器的细节\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "用户名："
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "软件包更新"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "信息..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "德国"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "希腊"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "法国"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "意大利"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "韩国"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "波兰"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "美国"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2174,8 +1887,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2187,23 +1899,25 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr "镜像选择"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "请稍候，正在下载镜像地址。"
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "正在从 Mandriva 网站下载镜像站点的地址，请稍候。"
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "下载出错"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2217,8 +1931,8 @@ msgstr ""
 "您的网络或网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2232,18 +1946,15 @@ msgstr ""
 "您的网络或 Mandriva 网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "无镜像"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "找不到适合的任何镜像。"
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2255,69 +1966,64 @@ msgstr ""
 "此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandriva Linux\n"
 "官方更新所支持。"
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在检查介质“%s”的文件..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在检查介质“%s”的远程文件..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " 失败!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "介质 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "正在开始下载“%s”..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "正在更新介质，请稍候..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "获取软件包出错"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2330,34 +2036,29 @@ msgstr ""
 "管理器中删除此介质，然后重新添加以进行重新配置。另外一种情况可能是，该介质目"
 "前不可用，您应该稍后再试。"
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "更新介质"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "未找到活动的介质。您必须启用某些介质才能进行更新。"
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "全选"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2369,8 +2070,8 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2380,18 +2081,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2401,8 +2100,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2411,8 +2110,8 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 %s 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2421,13 +2120,11 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 Mandriva Linux 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "已经启动帮助窗口，稍后桌面上将会出现。"
@@ -2702,17 +2399,3 @@ msgstr "删除软件"
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
 
-#~ msgid "everything was installed correctly"
-#~ msgstr "所有软件包都已正确安装"
-
-#~ msgid "Update medium"
-#~ msgstr "更新介质"
-
-#~ msgid "Regenerate hdlist"
-#~ msgstr "重新生成 hdlist"
-
-#~ msgid "Please wait, generating hdlist..."
-#~ msgstr "正在生成 hdlist，请稍候..."
-
-#~ msgid "Everything installed successfully"
-#~ msgstr "所有软件包都已成功安装"