1 files changed, 1062 insertions, 1028 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5e87a2f3..1afa02f4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-21 17:11+0100\n"
+"POT-Creation-Date: 2007-02-23 19:01+0100\n"
 "PO-Revision-Date: 2006-09-18 22:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../edit-urpm-sources.pl:85
+#: ../Rpmdrake/edit_urpm_sources.pm:67
 #, c-format
 msgid "Choose media type"
 msgstr "选择介质类型"
 
-#: ../edit-urpm-sources.pl:86
+#: ../Rpmdrake/edit_urpm_sources.pm:68
 #, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
@@ -47,17 +47,17 @@ msgstr ""
 "但\n"
 "您需要分两步完成。)"
 
-#: ../edit-urpm-sources.pl:94
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid "Distribution sources"
 msgstr "发行版介质源"
 
-#: ../edit-urpm-sources.pl:94
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid "Official updates"
 msgstr "官方更新"
 
-#: ../edit-urpm-sources.pl:97
+#: ../Rpmdrake/edit_urpm_sources.pm:79
 #, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -75,405 +75,408 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:111
+#: ../Rpmdrake/edit_urpm_sources.pm:93
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:144
+#: ../Rpmdrake/edit_urpm_sources.pm:126
 #, c-format
 msgid "Add a medium"
 msgstr "添加一个介质"
 
-#: ../edit-urpm-sources.pl:146
+#: ../Rpmdrake/edit_urpm_sources.pm:130
 #, c-format
 msgid "Local files"
 msgstr "本机文件"
 
-#: ../edit-urpm-sources.pl:146
+#: ../Rpmdrake/edit_urpm_sources.pm:130
 #, c-format
 msgid "Path:"
 msgstr "路径:"
 
-#: ../edit-urpm-sources.pl:147
+#: ../Rpmdrake/edit_urpm_sources.pm:131
 #, c-format
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#: ../Rpmdrake/edit_urpm_sources.pm:131 ../Rpmdrake/edit_urpm_sources.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:133 ../Rpmdrake/edit_urpm_sources.pm:402
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:148
+#: ../Rpmdrake/edit_urpm_sources.pm:132
 #, c-format
 msgid "RSYNC server"
 msgstr "RSYNC 服务器"
 
-#: ../edit-urpm-sources.pl:149
+#: ../Rpmdrake/edit_urpm_sources.pm:133
 #, c-format
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: ../edit-urpm-sources.pl:150
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl:150
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Path or mount point:"
 msgstr "路径或挂载点:"
 
-#: ../edit-urpm-sources.pl:169
+#: ../Rpmdrake/edit_urpm_sources.pm:152
 #, c-format
 msgid "Browse..."
 msgstr "浏览..."
 
-#: ../edit-urpm-sources.pl:196
+#: ../Rpmdrake/edit_urpm_sources.pm:179
 #, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:179 ../Rpmdrake/edit_urpm_sources.pm:488
+#: ../rpmdrake.pm:131
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#: ../Rpmdrake/edit_urpm_sources.pm:184 ../Rpmdrake/edit_urpm_sources.pm:403
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "综合文件/hdlist 的相对路径:"
 
-#: ../edit-urpm-sources.pl:203
+#: ../Rpmdrake/edit_urpm_sources.pm:186
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "如果留空, 将会自动探测综合文件/hdlist"
 
-#: ../edit-urpm-sources.pl:208
+#: ../Rpmdrake/edit_urpm_sources.pm:191
 #, c-format
 msgid "Name:"
 msgstr "名称:"
 
-#: ../edit-urpm-sources.pl:216
+#: ../Rpmdrake/edit_urpm_sources.pm:199
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr "创建整个发行版的介质"
 
-#: ../edit-urpm-sources.pl:227
+#: ../Rpmdrake/edit_urpm_sources.pm:210
 #, c-format
 msgid "Search this media for updates"
 msgstr "在此介质中搜索更新"
 
-#: ../edit-urpm-sources.pl:237
+#: ../Rpmdrake/edit_urpm_sources.pm:220
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少要填写头两项。"
 
-#: ../edit-urpm-sources.pl:241
+#: ../Rpmdrake/edit_urpm_sources.pm:224
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "已经有该名称的介质，您真的想要替换吗?"
 
-#: ../edit-urpm-sources.pl:252
+#: ../Rpmdrake/edit_urpm_sources.pm:236
 #, c-format
 msgid "Adding a medium:"
 msgstr "添加一个介质:"
 
-#: ../edit-urpm-sources.pl:254
+#: ../Rpmdrake/edit_urpm_sources.pm:238
 #, c-format
 msgid "Type of medium:"
 msgstr "介质类型:"
 
-#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
-#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
-#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
-#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
-#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
-#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#: ../Rpmdrake/edit_urpm_sources.pm:248 ../Rpmdrake/edit_urpm_sources.pm:324
+#: ../Rpmdrake/edit_urpm_sources.pm:412 ../Rpmdrake/edit_urpm_sources.pm:439
+#: ../Rpmdrake/edit_urpm_sources.pm:505 ../Rpmdrake/edit_urpm_sources.pm:589
+#: ../Rpmdrake/edit_urpm_sources.pm:630 ../Rpmdrake/edit_urpm_sources.pm:688
+#: ../Rpmdrake/edit_urpm_sources.pm:836 ../Rpmdrake/gui.pm:478
+#: ../Rpmdrake/init.pm:119 ../Rpmdrake/pkg.pm:511 ../Rpmdrake/pkg.pm:519
+#: ../rpmdrake.pm:289 ../rpmdrake.pm:602 ../rpmdrake.pm:687 ../rpmdrake.pm:760
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
-#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
-#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
-#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
-#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
-#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
-#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
-#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#: ../Rpmdrake/edit_urpm_sources.pm:250 ../Rpmdrake/edit_urpm_sources.pm:326
+#: ../Rpmdrake/edit_urpm_sources.pm:439 ../Rpmdrake/edit_urpm_sources.pm:495
+#: ../Rpmdrake/edit_urpm_sources.pm:586 ../Rpmdrake/edit_urpm_sources.pm:629
+#: ../Rpmdrake/edit_urpm_sources.pm:681 ../Rpmdrake/edit_urpm_sources.pm:754
+#: ../Rpmdrake/edit_urpm_sources.pm:882 ../Rpmdrake/edit_urpm_sources.pm:1032
+#: ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:494 ../Rpmdrake/gui.pm:499
+#: ../Rpmdrake/init.pm:119 ../Rpmdrake/pkg.pm:511 ../Rpmdrake/pkg.pm:658
+#: ../Rpmdrake/rpmnew.pm:159 ../rpmdrake.pm:122 ../rpmdrake.pm:229
+#: ../rpmdrake.pm:291 ../rpmdrake.pm:602
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../edit-urpm-sources.pl:321
+#: ../Rpmdrake/edit_urpm_sources.pm:307
 #, c-format
 msgid "Global options for package installation"
 msgstr "软件包安装的全局选项"
 
-#: ../edit-urpm-sources.pl:323
+#: ../Rpmdrake/edit_urpm_sources.pm:310
 #, c-format
 msgid "always"
 msgstr "总是"
 
-#: ../edit-urpm-sources.pl:324
+#: ../Rpmdrake/edit_urpm_sources.pm:311
 #, c-format
 msgid "never"
 msgstr "从不"
 
-#: ../edit-urpm-sources.pl:333
+#: ../Rpmdrake/edit_urpm_sources.pm:320
 #, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "校验要安装的 RPM:"
 
-#: ../edit-urpm-sources.pl:334
+#: ../Rpmdrake/edit_urpm_sources.pm:321
 #, c-format
 msgid "Download program to use:"
 msgstr "要使用的下载程序:"
 
-#: ../edit-urpm-sources.pl:364
+#: ../Rpmdrake/edit_urpm_sources.pm:351
 #, c-format
 msgid "Source Removal"
 msgstr "删除源"
 
-#: ../edit-urpm-sources.pl:365
+#: ../Rpmdrake/edit_urpm_sources.pm:352
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "您真的想要删除源“%s”吗?"
 
-#: ../edit-urpm-sources.pl:370
+#: ../Rpmdrake/edit_urpm_sources.pm:357
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "正在删除介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:405
+#: ../Rpmdrake/edit_urpm_sources.pm:392
 #, c-format
 msgid "Edit a medium"
 msgstr "编辑介质"
 
-#: ../edit-urpm-sources.pl:411
+#: ../Rpmdrake/edit_urpm_sources.pm:399
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "编辑介质“%s”:"
 
-#: ../edit-urpm-sources.pl:416
+#: ../Rpmdrake/edit_urpm_sources.pm:404
 #, c-format
 msgid "Downloader:"
 msgstr "下载器:"
 
-#: ../edit-urpm-sources.pl:428
+#: ../Rpmdrake/edit_urpm_sources.pm:416
 #, c-format
 msgid "Save changes"
 msgstr "保存修改"
 
-#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#: ../Rpmdrake/edit_urpm_sources.pm:425 ../Rpmdrake/edit_urpm_sources.pm:1019
 #, c-format
 msgid "Proxy..."
 msgstr "代理服务器..."
 
-#: ../edit-urpm-sources.pl:449
+#: ../Rpmdrake/edit_urpm_sources.pm:437
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "您必须插入介质才能继续"
 
-#: ../edit-urpm-sources.pl:450
+#: ../Rpmdrake/edit_urpm_sources.pm:438
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "要保存更改，您必须在驱动器中插入介质。"
 
-#: ../edit-urpm-sources.pl:471
+#: ../Rpmdrake/edit_urpm_sources.pm:459
 #, c-format
 msgid "Configure proxies"
 msgstr "配置代理服务器"
 
-#: ../edit-urpm-sources.pl:482
+#: ../Rpmdrake/edit_urpm_sources.pm:471
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "介质“%s”的代理服务器设置"
 
-#: ../edit-urpm-sources.pl:483
+#: ../Rpmdrake/edit_urpm_sources.pm:472
 #, c-format
 msgid "Global proxy settings"
 msgstr "全局代理服务器设置"
 
-#: ../edit-urpm-sources.pl:485
+#: ../Rpmdrake/edit_urpm_sources.pm:474
 #, 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:488
+#: ../Rpmdrake/edit_urpm_sources.pm:477
 #, c-format
 msgid "Proxy hostname:"
 msgstr "代理服务器主机名:"
 
-#: ../edit-urpm-sources.pl:491
+#: ../Rpmdrake/edit_urpm_sources.pm:480
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
-#: ../edit-urpm-sources.pl:494
+#: ../Rpmdrake/edit_urpm_sources.pm:483
 #, c-format
 msgid "User:"
 msgstr "用户名:"
 
-#: ../edit-urpm-sources.pl:566
+#: ../Rpmdrake/edit_urpm_sources.pm:555
 #, c-format
 msgid "Add a parallel group"
 msgstr "添加并行组"
 
-#: ../edit-urpm-sources.pl:566
+#: ../Rpmdrake/edit_urpm_sources.pm:555
 #, c-format
 msgid "Edit a parallel group"
 msgstr "编辑并行组"
 
-#: ../edit-urpm-sources.pl:577
+#: ../Rpmdrake/edit_urpm_sources.pm:567
 #, c-format
 msgid "Add a medium limit"
 msgstr "添加一个介质限制"
 
-#: ../edit-urpm-sources.pl:589
+#: ../Rpmdrake/edit_urpm_sources.pm:580
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "在介质限制中选择介质进行添加:"
 
-#: ../edit-urpm-sources.pl:626
+#: ../Rpmdrake/edit_urpm_sources.pm:617
 #, c-format
 msgid "Add a host"
 msgstr "添加主机"
 
-#: ../edit-urpm-sources.pl:632
+#: ../Rpmdrake/edit_urpm_sources.pm:624
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "输入要添加的主机名或 IP 地址:"
 
-#: ../edit-urpm-sources.pl:663
+#: ../Rpmdrake/edit_urpm_sources.pm:655
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "编辑并行组“%s”:"
 
-#: ../edit-urpm-sources.pl:667
+#: ../Rpmdrake/edit_urpm_sources.pm:659
 #, c-format
 msgid "Group name:"
 msgstr "组名称:"
 
-#: ../edit-urpm-sources.pl:668
+#: ../Rpmdrake/edit_urpm_sources.pm:660
 #, c-format
 msgid "Protocol:"
 msgstr "协议:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../Rpmdrake/edit_urpm_sources.pm:662
 #, c-format
 msgid "Media limit:"
 msgstr "介质限制:"
 
-#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#: ../Rpmdrake/edit_urpm_sources.pm:667 ../Rpmdrake/edit_urpm_sources.pm:674
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:675
+#: ../Rpmdrake/edit_urpm_sources.pm:734 ../Rpmdrake/edit_urpm_sources.pm:997
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: ../edit-urpm-sources.pl:677
+#: ../Rpmdrake/edit_urpm_sources.pm:669
 #, c-format
 msgid "Hosts:"
 msgstr "主机:"
 
-#: ../edit-urpm-sources.pl:711
+#: ../Rpmdrake/edit_urpm_sources.pm:703
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Group"
 msgstr "组"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Media limit"
 msgstr "介质限制"
 
-#: ../edit-urpm-sources.pl:715
+#: ../Rpmdrake/edit_urpm_sources.pm:708
 #, c-format
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:882 ../rpmdrake:1773
+#: ../Rpmdrake/edit_urpm_sources.pm:718 ../Rpmdrake/gui.pm:680
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:129 ../Rpmdrake/pkg.pm:168
+#: ../Rpmdrake/rpmnew.pm:80
 #, c-format
 msgid "(none)"
 msgstr "(无)"
 
-#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#: ../Rpmdrake/edit_urpm_sources.pm:738 ../Rpmdrake/edit_urpm_sources.pm:1001
 #, c-format
 msgid "Edit..."
 msgstr "编辑"
 
-#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#: ../Rpmdrake/edit_urpm_sources.pm:746 ../Rpmdrake/edit_urpm_sources.pm:1007
 #, c-format
 msgid "Add..."
 msgstr "添加..."
 
-#: ../edit-urpm-sources.pl:769
+#: ../Rpmdrake/edit_urpm_sources.pm:762
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理软件包数字签名的密钥"
 
-#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#: ../Rpmdrake/edit_urpm_sources.pm:768 ../Rpmdrake/edit_urpm_sources.pm:932
 #, c-format
 msgid "Medium"
 msgstr "介质"
 
-#: ../edit-urpm-sources.pl:780
+#: ../Rpmdrake/edit_urpm_sources.pm:774
 #, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "密钥"
 
-#: ../edit-urpm-sources.pl:803
+#: ../Rpmdrake/edit_urpm_sources.pm:797
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
 
-#: ../edit-urpm-sources.pl:816
+#: ../Rpmdrake/edit_urpm_sources.pm:810
 #, c-format
 msgid "Add a key"
 msgstr "添加密钥"
 
-#: ../edit-urpm-sources.pl:828
+#: ../Rpmdrake/edit_urpm_sources.pm:823
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "选择要添加到介质 %s 中的密钥"
 
-#: ../edit-urpm-sources.pl:834
+#: ../Rpmdrake/edit_urpm_sources.pm:829
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../edit-urpm-sources.pl:856
+#: ../Rpmdrake/edit_urpm_sources.pm:851
 #, c-format
 msgid "Remove a key"
 msgstr "删除密钥"
 
-#: ../edit-urpm-sources.pl:857
+#: ../Rpmdrake/edit_urpm_sources.pm:852
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -482,37 +485,37 @@ msgstr ""
 "您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
 "(密钥名称: %3$s)"
 
-#: ../edit-urpm-sources.pl:875
+#: ../Rpmdrake/edit_urpm_sources.pm:870
 #, c-format
 msgid "Add a key..."
 msgstr "添加密钥..."
 
-#: ../edit-urpm-sources.pl:879
+#: ../Rpmdrake/edit_urpm_sources.pm:874
 #, c-format
 msgid "Remove key"
 msgstr "删除密钥"
 
-#: ../edit-urpm-sources.pl:895
+#: ../Rpmdrake/edit_urpm_sources.pm:890
 #, c-format
 msgid "Configure media"
 msgstr "配置介质"
 
-#: ../edit-urpm-sources.pl:934
+#: ../Rpmdrake/edit_urpm_sources.pm:930
 #, c-format
-msgid "Enabled?"
-msgstr "启用?"
+msgid "Enabled"
+msgstr "启用"
 
-#: ../edit-urpm-sources.pl:935
+#: ../Rpmdrake/edit_urpm_sources.pm:931
 #, c-format
-msgid "Updates?"
-msgstr "更新?"
+msgid "Updates"
+msgstr "更新"
 
-#: ../edit-urpm-sources.pl:951
+#: ../Rpmdrake/edit_urpm_sources.pm:947
 #, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "此介质需要更新才能使用。现在更新吗？"
 
-#: ../edit-urpm-sources.pl:981
+#: ../Rpmdrake/edit_urpm_sources.pm:977
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -523,37 +526,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1015
+#: ../Rpmdrake/edit_urpm_sources.pm:1011
 #, c-format
 msgid "Add custom..."
 msgstr "添加自定义..."
 
-#: ../edit-urpm-sources.pl:1019
+#: ../Rpmdrake/edit_urpm_sources.pm:1015
 #, c-format
 msgid "Update..."
 msgstr "更新..."
 
-#: ../edit-urpm-sources.pl:1022
+#: ../Rpmdrake/edit_urpm_sources.pm:1018
 #, c-format
 msgid "Manage keys..."
 msgstr "管理密钥..."
 
-#: ../edit-urpm-sources.pl:1024
+#: ../Rpmdrake/edit_urpm_sources.pm:1020
 #, c-format
 msgid "Parallel..."
 msgstr "并行..."
 
-#: ../edit-urpm-sources.pl:1025
+#: ../Rpmdrake/edit_urpm_sources.pm:1021
 #, c-format
 msgid "Global options..."
 msgstr "全局选项..."
 
-#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#: ../Rpmdrake/edit_urpm_sources.pm:1031 ../rpmdrake:472
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#: ../Rpmdrake/edit_urpm_sources.pm:1044 ../Rpmdrake/init.pm:125
+#: ../gurpmi.addmedia:93
 #, c-format
 msgid ""
 "%s\n"
@@ -564,7 +568,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:1054
+#: ../Rpmdrake/edit_urpm_sources.pm:1047
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -578,7 +582,7 @@ msgstr ""
 "本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
 "软件包或执行更新时使用。"
 
-#: ../edit-urpm-sources.pl:1067
+#: ../Rpmdrake/edit_urpm_sources.pm:1063
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -589,1312 +593,1079 @@ msgstr ""
 "软件包数据库已锁定。请关闭其它使用软件包数据库的应用程序(您是否有其它介质管理"
 "器或其它桌面，或者您正在安装软件包？)。"
 
-#: ../gurpmi.addmedia:88
+#: ../Rpmdrake/gui.pm:59 ../Rpmdrake/gui.pm:116
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "无法添加介质，给出的参数有错或者不够"
+msgid "Importance: "
+msgstr "重要性:"
 
-#: ../gurpmi.addmedia:102
+#: ../Rpmdrake/gui.pm:60 ../Rpmdrake/gui.pm:124
 #, c-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"
-"这意味着您可以从新介质中向系统添加新的软件包。"
+msgid "Reason for update: "
+msgstr "更新原因:"
 
-#: ../gurpmi.addmedia:105
+#: ../Rpmdrake/gui.pm:64
 #, c-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"
-"to your system from that new medium."
-msgstr ""
-"您即将添加新的软件包介质“%s”。\n"
-"这意味着您可以从新介质中向系统添加新的软件包。"
+msgid "Security advisory"
+msgstr "安全通报"
 
-#: ../gurpmi.addmedia:130
+#: ../Rpmdrake/gui.pm:72 ../Rpmdrake/gui.pm:126
 #, c-format
-msgid "Successfully added media %s."
-msgstr "成功添加了介质 %s。"
+msgid "No description"
+msgstr "无描述"
 
-#: ../gurpmi.addmedia:131
+#: ../Rpmdrake/gui.pm:75
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "成功添加了介质“%s”。"
+msgid "Files:"
+msgstr "文件:"
 
-#: ../rpmdrake:39
+#: ../Rpmdrake/gui.pm:79 ../Rpmdrake/gui.pm:84 ../Rpmdrake/gui.pm:98
+#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/pkg.pm:135
 #, c-format
-msgid "Usage: %s [OPTION]..."
-msgstr "用法：%s [选项]..."
+msgid "(Not available)"
+msgstr "(不可用)"
+
+#: ../Rpmdrake/gui.pm:83
+#, c-format
+msgid "Changelog:"
+msgstr "更新日志:"
+
+#: ../Rpmdrake/gui.pm:95
+#, c-format
+msgid "Files:\n"
+msgstr "文件:\n"
+
+#: ../Rpmdrake/gui.pm:100
+#, c-format
+msgid "Changelog:\n"
+msgstr "更新日志:\n"
+
+#: ../Rpmdrake/gui.pm:105 ../rpmdrake.pm:813
+#, c-format
+msgid "Medium: "
+msgstr "介质:"
+
+#: ../Rpmdrake/gui.pm:106
+#, c-format
+msgid "Currently installed version: "
+msgstr "当前安装的版本:"
+
+#: ../Rpmdrake/gui.pm:110
+#, c-format
+msgid "Name: "
+msgstr "名称:"
+
+#: ../Rpmdrake/gui.pm:111
+#, c-format
+msgid "Version: "
+msgstr "版本: "
+
+#: ../Rpmdrake/gui.pm:112
+#, c-format
+msgid "Architecture: "
+msgstr "架构: "
+
+#: ../Rpmdrake/gui.pm:113
+#, c-format
+msgid "Size: "
+msgstr "大小: "
+
+#: ../Rpmdrake/gui.pm:113
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../Rpmdrake/gui.pm:120
+#, c-format
+msgid "Summary: "
+msgstr "摘要:"
+
+#: ../Rpmdrake/gui.pm:126
+#, c-format
+msgid "Description: "
+msgstr "描述:"
 
-#: ../rpmdrake:40
+#: ../Rpmdrake/gui.pm:453 ../Rpmdrake/gui.pm:490 ../Rpmdrake/gui.pm:492
+#, c-format
+msgid "More information on package..."
+msgstr "该软件包的更多信息..."
+
+#: ../Rpmdrake/gui.pm:455
+#, c-format
+msgid "Please choose"
+msgstr "请选择"
+
+#: ../Rpmdrake/gui.pm:456
+#, c-format
+msgid "The following package is needed:"
+msgstr "需要下列软件包:"
+
+#: ../Rpmdrake/gui.pm:456
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:483
+#, c-format
+msgid "More info"
+msgstr "更多信息"
+
+#: ../Rpmdrake/gui.pm:485
+#, c-format
+msgid "Information on packages"
+msgstr "该软件包的信息"
+
+#: ../Rpmdrake/gui.pm:508
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "另外一些软件包需要删除"
+
+#: ../Rpmdrake/gui.pm:509
 #, c-format
 msgid ""
-"  --changelog-first      display changelog before filelist in the "
-"description window"
-msgstr "  --changelog-first      描述窗口中更改日志排在文件列表之前"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:"
+msgstr "为了满足所有的依赖关系，需要删除下列软件包:"
 
-#: ../rpmdrake:41
+#: ../Rpmdrake/gui.pm:515 ../Rpmdrake/gui.pm:524
 #, c-format
-msgid "  --media=medium1,..     limit to given media"
-msgstr "  --media=介质1,..       限制使用指定的介质"
+msgid "Some packages can't be removed"
+msgstr "有些软件包无法删除"
 
-#: ../rpmdrake:42
+#: ../Rpmdrake/gui.pm:516
 #, c-format
 msgid ""
-"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
-msgstr "  --merge-all-rpmnew     合并找到的全部 .rpmnew/.rpmsave 文件"
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"对不起，删除这些软件包将可能毁坏您的系统:\n"
+"\n"
 
-#: ../rpmdrake:43
+#: ../Rpmdrake/gui.pm:525 ../Rpmdrake/gui.pm:592
 #, c-format
-msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr "  --mode=模式            设定模式(安装(默认)、删除、更新)"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
+"\n"
 
-#: ../rpmdrake:44
+#: ../Rpmdrake/gui.pm:554
+#, c-format
+msgid "Additional packages needed"
+msgstr "需要另外的软件包"
+
+#: ../Rpmdrake/gui.pm:555
 #, c-format
 msgid ""
-"  --no-confirmation      don't ask first confirmation question in update mode"
-msgstr "  --no-confirmation      更新模式中不询问第一个确认问题"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"为满足依赖关系，还需要安装下列软件包:\n"
+"\n"
 
-#: ../rpmdrake:45
+#: ../Rpmdrake/gui.pm:569
 #, c-format
-msgid "  --no-media-update      don't update media at startup"
-msgstr "  --no-media-update      启动时不更新介质"
+msgid "%s (belongs to the skip list)"
+msgstr "%s (属于跳过列表)"
 
-#: ../rpmdrake:46
+#: ../Rpmdrake/gui.pm:573
 #, c-format
-msgid "  --no-verify-rpm        don't verify packages signatures"
-msgstr "  --no-verify-rpm        不校验软件包签名"
+msgid "One package cannot be installed"
+msgstr "软件包无法安装"
 
-#: ../rpmdrake:47
+#: ../Rpmdrake/gui.pm:573
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "有些软件包无法安装"
+
+#: ../Rpmdrake/gui.pm:575
 #, c-format
 msgid ""
-"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
-"\" machine to show needed deps"
+"Sorry, the following package cannot be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"  --parallel=别名,主机   在并行模式中使用[别名]组和[主机]来显示所需的依赖关系"
+"对不起，不能选择下列软件包:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:48
+#: ../Rpmdrake/gui.pm:576
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"对不起，不能选择下列软件包:\n"
+"\n"
+"%s"
+
+#: ../Rpmdrake/gui.pm:591 ../Rpmdrake/pkg.pm:486
 #, c-format
-msgid "  --pkg-nosel=pkg1,..    show only these packages"
-msgstr "  --pkg-nosel=包1,..     只显示这些软件包"
+msgid "Some packages need to be removed"
+msgstr "需要删除一些软件包"
 
-#: ../rpmdrake:49
+#: ../Rpmdrake/gui.pm:622
 #, c-format
-msgid "  --pkg-sel=pkg1,..      preselect these packages"
-msgstr "  --pkg-sel=包1,..       预先选择这些软件包"
+msgid "Error: %s appears to be mounted read-only."
+msgstr "错误：%s 似乎是以只读方式挂载的。"
 
-#: ../rpmdrake:50
+#: ../Rpmdrake/gui.pm:626
 #, c-format
-msgid "  --root                 force to run as root"
-msgstr "  --root                 强制以 root 身份运行"
+msgid "You need to select some packages first."
+msgstr "您需要先选中一些软件包。"
 
-#: ../rpmdrake:51
+#: ../Rpmdrake/gui.pm:631
 #, c-format
-msgid "  --search=pkg           run search for \"pkg\""
-msgstr "  --search=包            搜索“包”"
+msgid "Too many packages are selected"
+msgstr "选中的包太多"
 
-#: ../rpmdrake:205
+#: ../Rpmdrake/gui.pm:632
 #, c-format
-msgid "Running in user mode"
-msgstr "以用户模式运行"
+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"
+"您真的想要安装所有选中的软件包吗?"
 
-#: ../rpmdrake:206
+#: ../Rpmdrake/gui.pm:664
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "正在列出软件包，请稍候..."
+
+#: ../Rpmdrake/gui.pm:682
+#, c-format
+msgid "No update"
+msgstr "没有更新"
+
+#: ../Rpmdrake/gui.pm:683
 #, 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."
+"The list of updates is empty. 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:214
+#: ../Rpmdrake/gui.pm:706 ../rpmdrake:256
+#, c-format
+msgid "All"
+msgstr "全部"
+
+#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#, c-format
+msgid "Upgradable"
+msgstr "可升级"
+
+#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#, c-format
+msgid "Addable"
+msgstr "可添加"
+
+#: ../Rpmdrake/gui.pm:735
+#, c-format
+msgid "Description not available for this package\n"
+msgstr "此软件包的描述不可用\n"
+
+#: ../Rpmdrake/gui.pm:741 ../Rpmdrake/pkg.pm:189
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "发生了一个致命错误: %s。"
+
+#: ../Rpmdrake/icon.pm:35
 #, c-format
 msgid "Accessibility"
 msgstr "辅助功能"
 
-#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
-#: ../rpmdrake:219
+#: ../Rpmdrake/icon.pm:36 ../Rpmdrake/icon.pm:37 ../Rpmdrake/icon.pm:38
+#: ../Rpmdrake/icon.pm:39 ../Rpmdrake/icon.pm:40
 #, c-format
 msgid "Archiving"
 msgstr "归档"
 
-#: ../rpmdrake:216
+#: ../Rpmdrake/icon.pm:37
 #, c-format
 msgid "Backup"
 msgstr "备份"
 
-#: ../rpmdrake:217
+#: ../Rpmdrake/icon.pm:38
 #, c-format
 msgid "Cd burning"
 msgstr "光盘刻录"
 
-#: ../rpmdrake:218
+#: ../Rpmdrake/icon.pm:39
 #, c-format
 msgid "Compression"
 msgstr "压缩"
 
-#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
-#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
-#: ../rpmdrake:426
+#: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:73 ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:112
+#: ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:135 ../Rpmdrake/pkg.pm:75
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#: ../rpmdrake:224 ../rpmdrake:225
+#: ../Rpmdrake/icon.pm:41 ../Rpmdrake/icon.pm:42 ../Rpmdrake/icon.pm:43
+#: ../Rpmdrake/icon.pm:44 ../Rpmdrake/icon.pm:45 ../Rpmdrake/icon.pm:46
 #, c-format
 msgid "Books"
 msgstr "书籍"
 
-#: ../rpmdrake:221
+#: ../Rpmdrake/icon.pm:42
 #, c-format
 msgid "Computer books"
 msgstr "计算机图书"
 
-#: ../rpmdrake:222
+#: ../Rpmdrake/icon.pm:43
 #, c-format
 msgid "Faqs"
 msgstr "常见问题解答"
 
-#: ../rpmdrake:223
+#: ../Rpmdrake/icon.pm:44
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:224
+#: ../Rpmdrake/icon.pm:45
 #, c-format
 msgid "Literature"
 msgstr "文献"
 
-#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#: ../Rpmdrake/icon.pm:47 ../Rpmdrake/icon.pm:48 ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Cluster"
 msgstr "簇"
 
-#: ../rpmdrake:227
+#: ../Rpmdrake/icon.pm:48
 #, c-format
 msgid "Message Passing"
 msgstr "信息传递"
 
-#: ../rpmdrake:228
+#: ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Queueing Services"
 msgstr "查询服务"
 
-#: ../rpmdrake:229
+#: ../Rpmdrake/icon.pm:50
 #, c-format
 msgid "Communications"
 msgstr "通讯"
 
-#: ../rpmdrake:230 ../rpmdrake:234
+#: ../Rpmdrake/icon.pm:51 ../Rpmdrake/icon.pm:55
 #, c-format
 msgid "Databases"
 msgstr "数据库"
 
-#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#: ../Rpmdrake/icon.pm:52 ../Rpmdrake/icon.pm:53 ../Rpmdrake/icon.pm:54
+#: ../Rpmdrake/icon.pm:55 ../Rpmdrake/icon.pm:56 ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:58 ../Rpmdrake/icon.pm:59 ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:62 ../Rpmdrake/icon.pm:63
+#: ../Rpmdrake/icon.pm:174 ../Rpmdrake/icon.pm:175 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Development"
 msgstr "开发"
 
-#: ../rpmdrake:232
+#: ../Rpmdrake/icon.pm:53
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:233
+#: ../Rpmdrake/icon.pm:54
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:235
+#: ../Rpmdrake/icon.pm:56
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME 和 GTK+"
 
-#: ../rpmdrake:236
+#: ../Rpmdrake/icon.pm:57
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:237
+#: ../Rpmdrake/icon.pm:58
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE 和 Qt"
 
-#: ../rpmdrake:238
+#: ../Rpmdrake/icon.pm:59
 #, c-format
 msgid "Kernel"
 msgstr "内核"
 
-#: ../rpmdrake:240
+#: ../Rpmdrake/icon.pm:61
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:241
+#: ../Rpmdrake/icon.pm:62
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:242
+#: ../Rpmdrake/icon.pm:63
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:243
+#: ../Rpmdrake/icon.pm:64
 #, c-format
 msgid "Editors"
 msgstr "编辑器"
 
-#: ../rpmdrake:244
+#: ../Rpmdrake/icon.pm:65
 #, c-format
 msgid "Education"
 msgstr "教育"
 
-#: ../rpmdrake:245
+#: ../Rpmdrake/icon.pm:66
 #, c-format
 msgid "Emulators"
 msgstr "模拟器"
 
-#: ../rpmdrake:246
+#: ../Rpmdrake/icon.pm:67
 #, c-format
 msgid "File tools"
 msgstr "文件工具"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:255
+#: ../Rpmdrake/icon.pm:68 ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:70
+#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:72 ../Rpmdrake/icon.pm:73
+#: ../Rpmdrake/icon.pm:74 ../Rpmdrake/icon.pm:75 ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Games"
 msgstr "游戏"
 
-#: ../rpmdrake:248
+#: ../Rpmdrake/icon.pm:69
 #, c-format
 msgid "Adventure"
 msgstr "探险"
 
-#: ../rpmdrake:249
+#: ../Rpmdrake/icon.pm:70
 #, c-format
 msgid "Arcade"
 msgstr "街机"
 
-#: ../rpmdrake:250
+#: ../Rpmdrake/icon.pm:71
 #, c-format
 msgid "Boards"
 msgstr "棋盘"
 
-#: ../rpmdrake:251
+#: ../Rpmdrake/icon.pm:72
 #, c-format
 msgid "Cards"
 msgstr "卡"
 
-#: ../rpmdrake:253
+#: ../Rpmdrake/icon.pm:74
 #, c-format
 msgid "Puzzles"
 msgstr "拼图"
 
-#: ../rpmdrake:254
+#: ../Rpmdrake/icon.pm:75
 #, c-format
 msgid "Sports"
 msgstr "运动"
 
-#: ../rpmdrake:255
+#: ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Strategy"
 msgstr "策略"
 
-#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
-#: ../rpmdrake:274 ../rpmdrake:277
+#: ../Rpmdrake/icon.pm:77 ../Rpmdrake/icon.pm:78 ../Rpmdrake/icon.pm:81
+#: ../Rpmdrake/icon.pm:82 ../Rpmdrake/icon.pm:85 ../Rpmdrake/icon.pm:88
+#: ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:92 ../Rpmdrake/icon.pm:95
+#: ../Rpmdrake/icon.pm:98
 #, c-format
 msgid "Graphical desktop"
 msgstr "图形桌面"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../Rpmdrake/icon.pm:80
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:260
+#: ../Rpmdrake/icon.pm:81
 #, c-format
 msgid "FVWM based"
 msgstr "基于 FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:263
+#: ../Rpmdrake/icon.pm:84
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:266
+#: ../Rpmdrake/icon.pm:87
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:269
+#: ../Rpmdrake/icon.pm:90
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:273
+#: ../Rpmdrake/icon.pm:94
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:276
+#: ../Rpmdrake/icon.pm:97
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:279
+#: ../Rpmdrake/icon.pm:100
 #, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:280
+#: ../Rpmdrake/icon.pm:101
 #, c-format
 msgid "Graphics"
 msgstr "图形"
 
-#: ../rpmdrake:281
+#: ../Rpmdrake/icon.pm:102
 #, c-format
 msgid "Monitoring"
 msgstr "监视"
 
-#: ../rpmdrake:282 ../rpmdrake:283
+#: ../Rpmdrake/icon.pm:103 ../Rpmdrake/icon.pm:104
 #, c-format
 msgid "Multimedia"
 msgstr "多媒体"
 
-#: ../rpmdrake:283 ../rpmdrake:334
+#: ../Rpmdrake/icon.pm:104 ../Rpmdrake/icon.pm:155
 #, c-format
 msgid "Video"
 msgstr "视频"
 
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
-#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#: ../Rpmdrake/icon.pm:105 ../Rpmdrake/icon.pm:106 ../Rpmdrake/icon.pm:107
+#: ../Rpmdrake/icon.pm:108 ../Rpmdrake/icon.pm:109 ../Rpmdrake/icon.pm:110
+#: ../Rpmdrake/icon.pm:111 ../Rpmdrake/icon.pm:112 ../Rpmdrake/icon.pm:113
+#: ../Rpmdrake/icon.pm:114 ../Rpmdrake/icon.pm:134
 #, c-format
 msgid "Networking"
 msgstr "网络"
 
-#: ../rpmdrake:285
+#: ../Rpmdrake/icon.pm:106
 #, c-format
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:286
+#: ../Rpmdrake/icon.pm:107
 #, c-format
 msgid "File transfer"
 msgstr "文件传送"
 
-#: ../rpmdrake:287
+#: ../Rpmdrake/icon.pm:108
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:288
+#: ../Rpmdrake/icon.pm:109
 #, c-format
 msgid "Instant messaging"
 msgstr "即时通讯"
 
-#: ../rpmdrake:289 ../rpmdrake:360
+#: ../Rpmdrake/icon.pm:110 ../Rpmdrake/icon.pm:181
 #, c-format
 msgid "Mail"
 msgstr "邮件"
 
-#: ../rpmdrake:290
+#: ../Rpmdrake/icon.pm:111
 #, c-format
 msgid "News"
 msgstr "新闻"
 
-#: ../rpmdrake:292
+#: ../Rpmdrake/icon.pm:113
 #, c-format
 msgid "Remote access"
 msgstr "远程访问"
 
-#: ../rpmdrake:293
+#: ../Rpmdrake/icon.pm:114
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:294
+#: ../Rpmdrake/icon.pm:115
 #, c-format
 msgid "Office"
 msgstr "办公"
 
-#: ../rpmdrake:295
+#: ../Rpmdrake/icon.pm:116
 #, c-format
 msgid "Public Keys"
 msgstr "公钥"
 
-#: ../rpmdrake:296
+#: ../Rpmdrake/icon.pm:117
 #, c-format
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
-#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
-#: ../rpmdrake:305
+#: ../Rpmdrake/icon.pm:118 ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:120
+#: ../Rpmdrake/icon.pm:121 ../Rpmdrake/icon.pm:122 ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:124 ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Sciences"
 msgstr "科学"
 
-#: ../rpmdrake:298
+#: ../Rpmdrake/icon.pm:119
 #, c-format
 msgid "Astronomy"
 msgstr "天文"
 
-#: ../rpmdrake:299
+#: ../Rpmdrake/icon.pm:120
 #, c-format
 msgid "Biology"
 msgstr "生物"
 
-#: ../rpmdrake:300
+#: ../Rpmdrake/icon.pm:121
 #, c-format
 msgid "Chemistry"
 msgstr "化学"
 
-#: ../rpmdrake:301
+#: ../Rpmdrake/icon.pm:122
 #, c-format
 msgid "Computer science"
 msgstr "计算机科学"
 
-#: ../rpmdrake:302
+#: ../Rpmdrake/icon.pm:123
 #, c-format
 msgid "Geosciences"
 msgstr "地球科学"
 
-#: ../rpmdrake:303
+#: ../Rpmdrake/icon.pm:124
 #, c-format
 msgid "Mathematics"
 msgstr "数学"
 
-#: ../rpmdrake:305
+#: ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:306
+#: ../Rpmdrake/icon.pm:127
 #, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:307
+#: ../Rpmdrake/icon.pm:128
 #, c-format
 msgid "Sound"
 msgstr "声音"
 
-#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
-#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
-#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
-#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
-#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
-#: ../rpmdrake:328
+#: ../Rpmdrake/icon.pm:129 ../Rpmdrake/icon.pm:130 ../Rpmdrake/icon.pm:131
+#: ../Rpmdrake/icon.pm:132 ../Rpmdrake/icon.pm:133 ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:137
+#: ../Rpmdrake/icon.pm:138 ../Rpmdrake/icon.pm:139 ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142 ../Rpmdrake/icon.pm:143
+#: ../Rpmdrake/icon.pm:144 ../Rpmdrake/icon.pm:145 ../Rpmdrake/icon.pm:146
+#: ../Rpmdrake/icon.pm:147 ../Rpmdrake/icon.pm:148 ../Rpmdrake/icon.pm:149
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: ../rpmdrake:309
+#: ../Rpmdrake/icon.pm:130
 #, c-format
 msgid "Base"
 msgstr "基本"
 
-#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
-#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#: ../Rpmdrake/icon.pm:131 ../Rpmdrake/icon.pm:132 ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:134 ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:159
 #, c-format
 msgid "Configuration"
 msgstr "配置"
 
-#: ../rpmdrake:311
+#: ../Rpmdrake/icon.pm:132
 #, c-format
 msgid "Boot and Init"
 msgstr "启动和初始化"
 
-#: ../rpmdrake:312
+#: ../Rpmdrake/icon.pm:133
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../rpmdrake:315
+#: ../Rpmdrake/icon.pm:136
 #, c-format
 msgid "Packaging"
 msgstr "打包"
 
-#: ../rpmdrake:316
+#: ../Rpmdrake/icon.pm:137
 #, c-format
 msgid "Printing"
 msgstr "打印"
 
-#: ../rpmdrake:317
+#: ../Rpmdrake/icon.pm:138
 #, c-format
 msgid "Deploiement"
 msgstr "部署"
 
-#: ../rpmdrake:318
+#: ../Rpmdrake/icon.pm:139
 #, c-format
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
-#: ../rpmdrake:323
+#: ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142
+#: ../Rpmdrake/icon.pm:143 ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: ../rpmdrake:320
+#: ../Rpmdrake/icon.pm:141
 #, c-format
 msgid "Console"
 msgstr "控制台"
 
-#: ../rpmdrake:321
+#: ../Rpmdrake/icon.pm:142
 #, c-format
 msgid "True type"
 msgstr "TrueType"
 
-#: ../rpmdrake:322
+#: ../Rpmdrake/icon.pm:143
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:323
+#: ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 位图"
 
-#: ../rpmdrake:324
+#: ../Rpmdrake/icon.pm:145
 #, c-format
 msgid "Internationalization"
 msgstr "国际化"
 
-#: ../rpmdrake:325
+#: ../Rpmdrake/icon.pm:146
 #, c-format
 msgid "Kernel and hardware"
 msgstr "内核和硬件"
 
-#: ../rpmdrake:326
+#: ../Rpmdrake/icon.pm:147
 #, c-format
 msgid "Libraries"
 msgstr "库"
 
-#: ../rpmdrake:327
+#: ../Rpmdrake/icon.pm:148
 #, c-format
 msgid "Servers"
 msgstr "服务器"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:330
+#: ../Rpmdrake/icon.pm:151
 #, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:331
+#: ../Rpmdrake/icon.pm:152
 #, c-format
 msgid "Terminals"
 msgstr "终端"
 
-#: ../rpmdrake:332
+#: ../Rpmdrake/icon.pm:153
 #, c-format
 msgid "Text tools"
 msgstr "文本工具"
 
-#: ../rpmdrake:333
+#: ../Rpmdrake/icon.pm:154
 #, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
-#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
-#: ../rpmdrake:345 ../rpmdrake:346
+#: ../Rpmdrake/icon.pm:158 ../Rpmdrake/icon.pm:159 ../Rpmdrake/icon.pm:160
+#: ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:162 ../Rpmdrake/icon.pm:163
+#: ../Rpmdrake/icon.pm:164 ../Rpmdrake/icon.pm:165 ../Rpmdrake/icon.pm:166
+#: ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "Workstation"
 msgstr "工作站"
 
-#: ../rpmdrake:339
+#: ../Rpmdrake/icon.pm:160
 #, c-format
 msgid "Console Tools"
 msgstr "控制台工具"
 
-#: ../rpmdrake:340 ../rpmdrake:355
+#: ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Documentation"
 msgstr "文档"
 
-#: ../rpmdrake:341
+#: ../Rpmdrake/icon.pm:162
 #, c-format
 msgid "Game station"
 msgstr "游戏机"
 
-#: ../rpmdrake:342
+#: ../Rpmdrake/icon.pm:163
 #, c-format
 msgid "Internet station"
 msgstr "Internet 工作站"
 
-#: ../rpmdrake:343
+#: ../Rpmdrake/icon.pm:164
 #, c-format
 msgid "Multimedia station"
 msgstr "多媒体工作站"
 
-#: ../rpmdrake:344
+#: ../Rpmdrake/icon.pm:165
 #, c-format
 msgid "Network Computer (client)"
 msgstr "网络计算机(客户端)"
 
-#: ../rpmdrake:345
+#: ../Rpmdrake/icon.pm:166
 #, c-format
 msgid "Office Workstation"
 msgstr "办公工作站"
 
-#: ../rpmdrake:346
+#: ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "Scientific Workstation"
 msgstr "科学工作站"
 
-#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
-#: ../rpmdrake:352
+#: ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:170 ../Rpmdrake/icon.pm:171
+#: ../Rpmdrake/icon.pm:172 ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Graphical Environment"
 msgstr "图形环境"
 
-#: ../rpmdrake:349
+#: ../Rpmdrake/icon.pm:170
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 工作站"
 
-#: ../rpmdrake:350
+#: ../Rpmdrake/icon.pm:171
 #, c-format
 msgid "IceWm Desktop"
 msgstr "IceWM 桌面"
 
-#: ../rpmdrake:351
+#: ../Rpmdrake/icon.pm:172
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE 工作站"
 
-#: ../rpmdrake:352
+#: ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "其它图形桌面"
 
-#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
-#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#: ../Rpmdrake/icon.pm:177 ../Rpmdrake/icon.pm:178 ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:180 ../Rpmdrake/icon.pm:181 ../Rpmdrake/icon.pm:182
+#: ../Rpmdrake/icon.pm:183 ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Server"
 msgstr "服务器"
 
-#: ../rpmdrake:357
+#: ../Rpmdrake/icon.pm:178
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: ../rpmdrake:358
+#: ../Rpmdrake/icon.pm:179
 #, c-format
 msgid "Database"
 msgstr "数据库"
 
-#: ../rpmdrake:359
+#: ../Rpmdrake/icon.pm:180
 #, c-format
 msgid "Firewall/Router"
 msgstr "防火墙/路由器"
 
-#: ../rpmdrake:361
+#: ../Rpmdrake/icon.pm:182
 #, c-format
 msgid "Mail/Groupware/News"
 msgstr "邮件/群件/新闻"
 
-#: ../rpmdrake:362
+#: ../Rpmdrake/icon.pm:183
 #, c-format
 msgid "Network Computer server"
 msgstr "网络计算机服务器"
 
-#: ../rpmdrake:363
+#: ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
-#: ../rpmdrake:724
-#, c-format
-msgid "(Not available)"
-msgstr "(不可用)"
-
-#: ../rpmdrake:534 ../rpmdrake:616
-#, c-format
-msgid "Search results"
-msgstr "搜索结果"
-
-#: ../rpmdrake:534
-#, c-format
-msgid "Search results (none)"
-msgstr "搜索结果(无)"
-
-#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
-#, c-format
-msgid "Please wait, searching..."
-msgstr "正在搜索，请稍候..."
-
-#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
-#, c-format
-msgid "Software Management"
-msgstr "软件管理器"
-
-#: ../rpmdrake:578
-#, c-format
-msgid "Stop"
-msgstr "停止"
-
-#: ../rpmdrake:617 ../rpmdrake:917
-#, c-format
-msgid "Upgradable"
-msgstr "可升级"
-
-#: ../rpmdrake:617 ../rpmdrake:917
-#, c-format
-msgid "Addable"
-msgstr "可添加"
-
-#: ../rpmdrake:619
-#, c-format
-msgid "Selected"
-msgstr "选中"
-
-#: ../rpmdrake:619
-#, c-format
-msgid "Not selected"
-msgstr "未选中"
-
-#: ../rpmdrake:683 ../rpmdrake:740
-#, c-format
-msgid "Importance: "
-msgstr "重要性:"
-
-#: ../rpmdrake:684 ../rpmdrake:748
-#, c-format
-msgid "Reason for update: "
-msgstr "更新原因:"
-
-#: ../rpmdrake:688
-#, c-format
-msgid "Security advisory"
-msgstr "安全通报"
-
-#: ../rpmdrake:696 ../rpmdrake:750
-#, c-format
-msgid "No description"
-msgstr "无描述"
-
-#: ../rpmdrake:699
-#, c-format
-msgid "Files:"
-msgstr "文件:"
-
-#: ../rpmdrake:707
-#, c-format
-msgid "Changelog:"
-msgstr "更新日志:"
-
-#: ../rpmdrake:719
-#, c-format
-msgid "Files:\n"
-msgstr "文件:\n"
-
-#: ../rpmdrake:724
-#, c-format
-msgid "Changelog:\n"
-msgstr "更新日志:\n"
-
-#: ../rpmdrake:729 ../rpmdrake.pm:809
-#, c-format
-msgid "Medium: "
-msgstr "介质:"
-
-#: ../rpmdrake:730
-#, c-format
-msgid "Currently installed version: "
-msgstr "当前安装的版本:"
-
-#: ../rpmdrake:734
-#, c-format
-msgid "Name: "
-msgstr "名称:"
-
-#: ../rpmdrake:735
-#, c-format
-msgid "Version: "
-msgstr "版本: "
-
-#: ../rpmdrake:736
+#: ../Rpmdrake/init.pm:40
 #, c-format
-msgid "Architecture: "
-msgstr "架构: "
-
-#: ../rpmdrake:737
-#, c-format
-msgid "Size: "
-msgstr "大小: "
-
-#: ../rpmdrake:737
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Usage: %s [OPTION]..."
+msgstr "用法：%s [选项]..."
 
-#: ../rpmdrake:744
+#: ../Rpmdrake/init.pm:41
 #, c-format
-msgid "Summary: "
-msgstr "摘要:"
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
+msgstr "  --changelog-first      描述窗口中更改日志排在文件列表之前"
 
-#: ../rpmdrake:750
+#: ../Rpmdrake/init.pm:42
 #, c-format
-msgid "Description: "
-msgstr "描述:"
+msgid "  --media=medium1,..     limit to given media"
+msgstr "  --media=介质1,..       限制使用指定的介质"
 
-#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#: ../Rpmdrake/init.pm:43
 #, c-format
-msgid "More information on package..."
-msgstr "该软件包的更多信息..."
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr "  --merge-all-rpmnew     合并找到的全部 .rpmnew/.rpmsave 文件"
 
-#: ../rpmdrake:825
+#: ../Rpmdrake/init.pm:44
 #, c-format
-msgid "Please choose"
-msgstr "请选择"
+msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgstr "  --mode=模式            设定模式(安装(默认)、删除、更新)"
 
-#: ../rpmdrake:825
+#: ../Rpmdrake/init.pm:45
 #, c-format
-msgid "The following package is needed:"
-msgid_plural "One of the following packages is needed:"
-msgstr[0] "需要下列软件包:"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr "  --no-confirmation      更新模式中不询问第一个确认问题"
 
-#: ../rpmdrake:866
+#: ../Rpmdrake/init.pm:46
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "正在列出软件包，请稍候..."
+msgid "  --no-media-update      don't update media at startup"
+msgstr "  --no-media-update      启动时不更新介质"
 
-#: ../rpmdrake:884
+#: ../Rpmdrake/init.pm:47
 #, c-format
-msgid "No update"
-msgstr "没有更新"
+msgid "  --no-verify-rpm        don't verify packages signatures"
+msgstr "  --no-verify-rpm        不校验软件包签名"
 
-#: ../rpmdrake:885
+#: ../Rpmdrake/init.pm:48
 #, c-format
 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"
-"or you already installed all of them."
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
 msgstr ""
-"更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
-"或者您已经安装了全部更新。"
-
-#: ../rpmdrake:908 ../rpmdrake:1171
-#, c-format
-msgid "All"
-msgstr "全部"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:956 ../rpmdrake:961
-#, c-format
-msgid "More info"
-msgstr "更多信息"
+"  --parallel=别名,主机   在并行模式中使用[别名]组和[主机]来显示所需的依赖关系"
 
-#: ../rpmdrake:964
+#: ../Rpmdrake/init.pm:49
 #, c-format
-msgid "Information on packages"
-msgstr "该软件包的信息"
+msgid "  --pkg-nosel=pkg1,..    show only these packages"
+msgstr "  --pkg-nosel=包1,..     只显示这些软件包"
 
-#: ../rpmdrake:987
+#: ../Rpmdrake/init.pm:50
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "另外一些软件包需要删除"
+msgid "  --pkg-sel=pkg1,..      preselect these packages"
+msgstr "  --pkg-sel=包1,..       预先选择这些软件包"
 
-#: ../rpmdrake:988
+#: ../Rpmdrake/init.pm:51
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:"
-msgstr "为了满足所有的依赖关系，需要删除下列软件包:"
+msgid "  --root                 force to run as root"
+msgstr "  --root                 强制以 root 身份运行"
 
-#: ../rpmdrake:994 ../rpmdrake:1003
+#: ../Rpmdrake/init.pm:52
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "有些软件包无法删除"
+msgid "  --search=pkg           run search for \"pkg\""
+msgstr "  --search=包            搜索“包”"
 
-#: ../rpmdrake:995
+#: ../Rpmdrake/init.pm:116
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"对不起，删除这些软件包将可能毁坏您的系统:\n"
-"\n"
+msgid "Running in user mode"
+msgstr "以用户模式运行"
 
-#: ../rpmdrake:1004 ../rpmdrake:1070
+#: ../Rpmdrake/init.pm:117
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+"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 ""
-"由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
-"\n"
+"您正在以普通用户调用此程序。\n"
+"您将无法执行对系统的修改，\n"
+"但您仍然可以浏览已有数据库。"
 
-#: ../rpmdrake:1033
+#: ../Rpmdrake/init.pm:124
 #, c-format
-msgid "Additional packages needed"
-msgstr "需要另外的软件包"
+msgid "Welcome"
+msgstr "欢迎"
 
-#: ../rpmdrake:1034
+#: ../Rpmdrake/init.pm:129
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\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:1049
-#, c-format
-msgid "%s (belongs to the skip list)"
-msgstr "%s (属于跳过列表)"
-
-#: ../rpmdrake:1053
-#, c-format
-msgid "One package cannot be installed"
-msgid_plural "Some packages can't be installed"
-msgstr[0] "软件包无法安装"
-
-#: ../rpmdrake:1054
+#: ../Rpmdrake/init.pm:134
 #, c-format
 msgid ""
-"Sorry, the following package cannot be selected:\n"
-"\n"
-"%s"
-msgid_plural ""
-"Sorry, the following packages can't be selected:\n"
+"Welcome to %s!\n"
 "\n"
-"%s"
-msgstr[0] ""
-"对不起，不能选择下列软件包:\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"欢迎使用 %s!\n"
 "\n"
-"%s"
-
-#: ../rpmdrake:1069 ../rpmdrake:1924
-#, c-format
-msgid "Some packages need to be removed"
-msgstr "需要删除一些软件包"
-
-#: ../rpmdrake:1098
-#, c-format
-msgid "Selected: %s / Free disk space: %s"
-msgstr "选中软件: %s / 剩余磁盘空间: %s"
-
-#: ../rpmdrake:1099
-#, c-format
-msgid "Selected size: %d MB"
-msgstr "选中大小: %d MB"
-
-#: ../rpmdrake:1104
-#, c-format
-msgid "Description not available for this package\n"
-msgstr "此软件包的描述不可用\n"
-
-#: ../rpmdrake:1110 ../rpmdrake:1506
-#, c-format
-msgid "A fatal error occurred: %s."
-msgstr "发生了一个致命错误: %s。"
-
-#: ../rpmdrake:1171
-#, c-format
-msgid "Installed"
-msgstr "已安装"
-
-#: ../rpmdrake:1171
-#, c-format
-msgid "Non installed"
-msgstr "未安装"
-
-#: ../rpmdrake:1172
-#, c-format
-msgid "%s choices"
-msgstr "%s 精选"
-
-#: ../rpmdrake:1172
-#, c-format
-msgid "Mandriva Linux choices"
-msgstr "Mandriva Linux 精选"
-
-#: ../rpmdrake:1174
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "全部软件包，按字母次序排列"
-
-#: ../rpmdrake:1175
-#, c-format
-msgid "All packages, by update availability"
-msgstr "全部软件包，按照是否可更新排列"
-
-#: ../rpmdrake:1176
-#, c-format
-msgid "All packages, by size"
-msgstr "全部软件包，按大小排列"
-
-#: ../rpmdrake:1177
-#, c-format
-msgid "All packages, by selection state"
-msgstr "全部软件包，按选中状态排列"
-
-#: ../rpmdrake:1178
-#, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "不分类，按安装日期排列"
-
-#: ../rpmdrake:1179
-#, c-format
-msgid "All packages, by group"
-msgstr "全部软件包，按组别排列"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "All updates"
-msgstr "全部更新"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Security updates"
-msgstr "安全更新"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Bugfixes updates"
-msgstr "缺陷修正更新"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Normal updates"
-msgstr "正常更新"
-
-#: ../rpmdrake:1244
-#, c-format
-msgid "in names"
-msgstr "在名称中"
-
-#: ../rpmdrake:1246
-#, c-format
-msgid "in descriptions"
-msgstr "在描述中"
-
-#: ../rpmdrake:1248
-#, c-format
-msgid "in file names"
-msgstr "在文件名中"
-
-#: ../rpmdrake:1275
-#, c-format
-msgid "Error: %s appears to be mounted read-only."
-msgstr "错误：%s 似乎是以只读方式挂载的。"
-
-#: ../rpmdrake:1279
-#, c-format
-msgid "You need to select some packages first."
-msgstr "您需要先选中一些软件包。"
+"本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1284
+#: ../Rpmdrake/init.pm:139
 #, c-format
-msgid "Too many packages are selected"
-msgstr "选中的包太多"
+msgid "Welcome to the software installation tool!"
+msgstr "欢迎使用软件安装工具!"
 
-#: ../rpmdrake:1285
+#: ../Rpmdrake/init.pm:140
 #, 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"
+"Welcome to the software installation tool!\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Your Mandriva 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"
+"欢迎使用软件包安装工具!\n"
 "\n"
-"您真的想要安装所有选中的软件包吗?"
-
-#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
-#: ../rpmdrake:1353
-#, c-format
-msgid "/_File"
-msgstr "/文件(_F)"
-
-#: ../rpmdrake:1320
-#, c-format
-msgid "/_Update media"
-msgstr "/更新介质(_U)"
-
-#: ../rpmdrake:1331
-#, c-format
-msgid "/_Reset the selection"
-msgstr "/重置选中内容(_R)"
-
-#: ../rpmdrake:1344
-#, c-format
-msgid "/Reload the _packages list"
-msgstr "/重新装入软件包清单(_P)"
-
-#: ../rpmdrake:1353
-#, c-format
-msgid "/_Quit"
-msgstr "/退出(_Q)"
-
-#: ../rpmdrake:1353
-#, c-format
-msgid "<control>Q"
-msgstr "<control>Q"
-
-#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
-#, c-format
-msgid "/_Options"
-msgstr "/选项(_O)"
-
-#: ../rpmdrake:1357
-#, c-format
-msgid "/_Media Manager"
-msgstr "/介质管理器(_M)"
-
-#: ../rpmdrake:1360 ../rpmdrake:1390
-#, c-format
-msgid "/_Show automatically selected packages"
-msgstr "/自动显示选中的软件包(_S)"
-
-#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
-#, c-format
-msgid "/_Help"
-msgstr "/帮助(_H)"
-
-#: ../rpmdrake:1365
-#, c-format
-msgid "/_Report Bug"
-msgstr "/报告错误(_R)"
-
-#: ../rpmdrake:1367
-#, c-format
-msgid "/_About..."
-msgstr "/关于(_A)..."
-
-#: ../rpmdrake:1370
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:1372
-#, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "版权 (C) %s Mandriva"
-
-#: ../rpmdrake:1374
-#, c-format
-msgid "Rpmdrake is Mandriva Linux package management tool."
-msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
-
-#: ../rpmdrake:1376
-#, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
-
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1381
-#, c-format
-msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "Funda Wang <fundawang@gmail.com>\n"
-
-#: ../rpmdrake:1405
-#, c-format
-msgid "Find:"
-msgstr "查找:"
-
-#: ../rpmdrake:1414
-#, c-format
-msgid "Search"
-msgstr "搜索"
-
-#: ../rpmdrake:1416
-#, c-format
-msgid "Clear"
-msgstr "清除"
-
-#: ../rpmdrake:1430 ../rpmdrake.pm:760
-#, c-format
-msgid "Select all"
-msgstr "全选"
-
-#: ../rpmdrake:1437
-#, c-format
-msgid "Apply"
-msgstr "应用"
-
-#: ../rpmdrake:1441
-#, c-format
-msgid "Quit"
-msgstr "退出"
-
-#: ../rpmdrake:1457
-#, c-format
-msgid "Quick Introduction"
-msgstr "简介"
-
-#: ../rpmdrake:1458
-#, c-format
-msgid "You can browse the packages through the categories tree on the left."
-msgstr "您可以使用左侧的类别树浏览软件包。"
-
-#: ../rpmdrake:1459
-#, c-format
-msgid ""
-"You can view information about a package by clicking on it on the right list."
-msgstr "单击右侧列表中的软件包可以查看其信息。"
-
-#: ../rpmdrake:1460
-#, c-format
-msgid "To install, update or remove a package, just click on its \"checkbox\"."
-msgstr "要安装、更新或删除软件包，只需单击相应的复选框。"
+"您的 Mandriva Linux 的安装光盘包含有数千个软件包。\n"
+"本工具将帮助您选择要为您的电脑安装的软件包。"
 
-#: ../rpmdrake:1505
+#: ../Rpmdrake/pkg.pm:188
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499 ../rpmdrake.pm:316
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../rpmdrake:1510 ../rpmdrake:1935
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../rpmdrake:1510 ../rpmdrake:1935
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../rpmdrake:1533 ../rpmdrake:1924
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:486
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
 
-#: ../rpmdrake:1534
+#: ../Rpmdrake/pkg.pm:216
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1907,12 +1678,12 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1543
+#: ../Rpmdrake/pkg.pm:225
 #, c-format
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../rpmdrake:1544
+#: ../Rpmdrake/pkg.pm:226
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1928,12 +1699,12 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1555
+#: ../Rpmdrake/pkg.pm:237
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../rpmdrake:1556
+#: ../Rpmdrake/pkg.pm:238
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1947,72 +1718,37 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1570
+#: ../Rpmdrake/pkg.pm:252
 #, c-format
 msgid "Reading updates description"
 msgstr "读取更新描述"
 
-#: ../rpmdrake:1596 ../rpmdrake:1673
+#: ../Rpmdrake/pkg.pm:278 ../Rpmdrake/pkg.pm:358
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1604
+#: ../Rpmdrake/pkg.pm:286
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "正在列出基本软件包，请稍候..."
 
-#: ../rpmdrake:1640
+#: ../Rpmdrake/pkg.pm:323
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "正在寻找已安装的软件包，请稍候..."
 
-#: ../rpmdrake:1774
-#, c-format
-msgid "Inspecting %s"
-msgstr "正在检查 %s"
-
-#: ../rpmdrake:1797
-#, c-format
-msgid "changes:"
-msgstr "更改:"
-
-#: ../rpmdrake:1805
-#, c-format
-msgid "Remove .%s"
-msgstr "删除 .%s"
-
-#: ../rpmdrake:1809
-#, c-format
-msgid "Use .%s as main file"
-msgstr "使用 .%s 作为主文件"
-
-#: ../rpmdrake:1813
-#, c-format
-msgid "Do nothing"
-msgstr "不做任何事"
-
-#: ../rpmdrake:1829
-#, c-format
-msgid "Installation finished"
-msgstr "安装完成"
-
-#: ../rpmdrake:1844
-#, c-format
-msgid "Inspect..."
-msgstr "检查..."
-
-#: ../rpmdrake:1877 ../rpmdrake:2070
+#: ../Rpmdrake/pkg.pm:440 ../Rpmdrake/pkg.pm:635
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake:1881 ../rpmdrake:2050
+#: ../Rpmdrake/pkg.pm:444 ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#: ../Rpmdrake/pkg.pm:445 ../Rpmdrake/pkg.pm:616 ../Rpmdrake/pkg.pm:674
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2023,17 +1759,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1901
+#: ../Rpmdrake/pkg.pm:464
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake:1902
+#: ../Rpmdrake/pkg.pm:465
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../rpmdrake:1903 ../rpmdrake:2001
+#: ../Rpmdrake/pkg.pm:466 ../Rpmdrake/pkg.pm:566
 #, c-format
 msgid ""
 "\n"
@@ -2046,66 +1782,62 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#. -PO: in singular form, we use %2\$
-#: ../rpmdrake:1921
-#, c-format
+#: ../Rpmdrake/pkg.pm:483
 msgid ""
-"To satisfy dependencies, the following package is going to be installed:\n"
-"%2$s\n"
+"To satisfy dependencies, the following package is going to be installed:"
 msgid_plural ""
-"To satisfy dependencies, the following %d packages are going to be "
-"installed:\n"
-"%s\n"
+"To satisfy dependencies, the following %d packages are going to be installed:"
 msgstr[0] ""
-"为了满足依赖性要求，将另外安装以下%d个软件包:\n"
-"%s\n"
+"为了满足依赖性要求，将另外安装以下%d个软件包:"
 
-#: ../rpmdrake:1926
+#: ../Rpmdrake/pkg.pm:488
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../rpmdrake:1927
+#: ../Rpmdrake/pkg.pm:490
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:"
-msgstr[0] ""
+msgstr "要升级其它软件包，必须删除下列软件包:"
+
+#: ../Rpmdrake/pkg.pm:491
+#, fuzzy, c-format
+msgid "The following packages have to be removed for others to be upgraded:"
+msgstr ""
 "要升级其它软件包，必须删除下列软件包:"
 
-#: ../rpmdrake:1927
+#: ../Rpmdrake/pkg.pm:491
 #, c-format
 msgid "Is it ok to continue?"
-msgstr ""
-"确定继续吗?"
+msgstr "确定继续吗?"
 
-#: ../rpmdrake:1944
+#: ../Rpmdrake/pkg.pm:509
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../rpmdrake:1945
+#: ../Rpmdrake/pkg.pm:510
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake:1952
+#: ../Rpmdrake/pkg.pm:517
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1972
+#: ../Rpmdrake/pkg.pm:537
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#: ../Rpmdrake/pkg.pm:550 ../rpmdrake.pm:743 ../rpmdrake.pm:852
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../rpmdrake:1986
+#: ../Rpmdrake/pkg.pm:551
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -2120,12 +1852,12 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../rpmdrake:1998 ../rpmdrake:2108
+#: ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake:1999
+#: ../Rpmdrake/pkg.pm:564
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -2138,27 +1870,27 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../rpmdrake:2013
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../rpmdrake:2013
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../rpmdrake:2016
+#: ../Rpmdrake/pkg.pm:581
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:2031
+#: ../Rpmdrake/pkg.pm:596
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件 [%s]"
 
-#: ../rpmdrake:2065
+#: ../Rpmdrake/pkg.pm:630
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2171,47 +1903,48 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../rpmdrake:2073
+#: ../Rpmdrake/pkg.pm:638
 #, c-format
 msgid "Upgrade information"
 msgstr "升级信息"
 
-#: ../rpmdrake:2075
+#: ../Rpmdrake/pkg.pm:640
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../rpmdrake:2083
+#: ../Rpmdrake/pkg.pm:648
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "关于此软件包的升级信息"
 
-#: ../rpmdrake:2086
+#: ../Rpmdrake/pkg.pm:651
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "关于软件包 %s 的升级信息"
 
-#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#: ../Rpmdrake/pkg.pm:663 ../rpmdrake.pm:730 ../rpmdrake.pm:811
+#: ../rpmdrake.pm:835
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../rpmdrake:2099
+#: ../Rpmdrake/pkg.pm:664
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../rpmdrake:2124
+#: ../Rpmdrake/pkg.pm:689
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake:2135
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../rpmdrake:2136
+#: ../Rpmdrake/pkg.pm:701
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2222,70 +1955,360 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2168
+#: ../Rpmdrake/rpmnew.pm:81
 #, c-format
-msgid "Welcome"
-msgstr "欢迎"
+msgid "Inspecting %s"
+msgstr "正在检查 %s"
+
+#: ../Rpmdrake/rpmnew.pm:104
+#, c-format
+msgid "Changes:"
+msgstr "更改:"
 
-#: ../rpmdrake:2173
+#: ../Rpmdrake/rpmnew.pm:112
+#, c-format
+msgid "Remove .%s"
+msgstr "删除 .%s"
+
+#: ../Rpmdrake/rpmnew.pm:116
+#, c-format
+msgid "Use .%s as main file"
+msgstr "使用 .%s 作为主文件"
+
+#: ../Rpmdrake/rpmnew.pm:120
+#, c-format
+msgid "Do nothing"
+msgstr "不做任何事"
+
+#: ../Rpmdrake/rpmnew.pm:136
+#, c-format
+msgid "Installation finished"
+msgstr "安装完成"
+
+#: ../Rpmdrake/rpmnew.pm:151
+#, c-format
+msgid "Inspect..."
+msgstr "检查..."
+
+#: ../Rpmdrake/rpmnew.pm:169 ../rpmdrake:70 ../rpmdrake:98
+#, c-format
+msgid "Please wait, searching..."
+msgstr "正在搜索，请稍候..."
+
+#: ../gurpmi.addmedia:83
+#, c-format
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "无法添加介质，给出的参数有错或者不够"
+
+#: ../gurpmi.addmedia:97
 #, c-format
 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."
+"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 ""
-"欢迎使用软件包删除工具!\n"
-"\n"
-"本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
+"您即将添加新的软件包介质 %s。\n"
+"这意味着您可以从新介质中向系统添加新的软件包。"
 
-#: ../rpmdrake:2178
+#: ../gurpmi.addmedia:100
 #, c-format
 msgid ""
-"Welcome to %s!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
 msgstr ""
-"欢迎使用 %s!\n"
-"\n"
-"本工具将帮助您为您的电脑中安装更新的软件包。"
+"您即将添加新的软件包介质“%s”。\n"
+"这意味着您可以从新介质中向系统添加新的软件包。"
 
-#: ../rpmdrake:2183
+#: ../gurpmi.addmedia:125
 #, c-format
-msgid "Welcome to the software installation tool!"
-msgstr "欢迎使用软件安装工具!"
+msgid "Successfully added media %s."
+msgstr "成功添加了介质 %s。"
+
+#: ../gurpmi.addmedia:126
+#, c-format
+msgid "Successfully added medium `%s'."
+msgstr "成功添加了介质“%s”。"
+
+#: ../rpmdrake:59 ../rpmdrake:141
+#, c-format
+msgid "Search results"
+msgstr "搜索结果"
+
+#: ../rpmdrake:59
+#, c-format
+msgid "Search results (none)"
+msgstr "搜索结果(无)"
+
+#: ../rpmdrake:93 ../rpmdrake:187 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "软件管理器"
+
+#: ../rpmdrake:103
+#, c-format
+msgid "Stop"
+msgstr "停止"
+
+#: ../rpmdrake:144
+#, c-format
+msgid "Selected"
+msgstr "选中"
+
+#: ../rpmdrake:144
+#, c-format
+msgid "Not selected"
+msgstr "未选中"
+
+#: ../rpmdrake:200
+#, c-format
+msgid "Selected: %s / Free disk space: %s"
+msgstr "选中软件: %s / 剩余磁盘空间: %s"
+
+#: ../rpmdrake:201
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "选中大小: %d MB"
+
+#: ../rpmdrake:256
+#, c-format
+msgid "Installed"
+msgstr "已安装"
+
+#: ../rpmdrake:256
+#, c-format
+msgid "Non installed"
+msgstr "未安装"
+
+#: ../rpmdrake:257
+#, c-format
+msgid "%s choices"
+msgstr "%s 精选"
+
+#: ../rpmdrake:257
+#, c-format
+msgid "Mandriva Linux choices"
+msgstr "Mandriva Linux 精选"
+
+#: ../rpmdrake:259
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "全部软件包，按字母次序排列"
+
+#: ../rpmdrake:260
+#, c-format
+msgid "All packages, by update availability"
+msgstr "全部软件包，按照是否可更新排列"
+
+#: ../rpmdrake:261
+#, c-format
+msgid "All packages, by size"
+msgstr "全部软件包，按大小排列"
+
+#: ../rpmdrake:262
+#, c-format
+msgid "All packages, by selection state"
+msgstr "全部软件包，按选中状态排列"
+
+#: ../rpmdrake:263
+#, c-format
+msgid "Leaves only, sorted by install date"
+msgstr "不分类，按安装日期排列"
+
+#: ../rpmdrake:264
+#, c-format
+msgid "All packages, by group"
+msgstr "全部软件包，按组别排列"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "All updates"
+msgstr "全部更新"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Security updates"
+msgstr "安全更新"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Bugfixes updates"
+msgstr "缺陷修正更新"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Normal updates"
+msgstr "正常更新"
+
+#: ../rpmdrake:327
+#, c-format
+msgid "in names"
+msgstr "在名称中"
+
+#: ../rpmdrake:329
+#, c-format
+msgid "in descriptions"
+msgstr "在描述中"
+
+#: ../rpmdrake:331
+#, c-format
+msgid "in file names"
+msgstr "在文件名中"
+
+#: ../rpmdrake:362 ../rpmdrake:365 ../rpmdrake:376 ../rpmdrake:389
+#: ../rpmdrake:398
+#, c-format
+msgid "/_File"
+msgstr "/文件(_F)"
+
+#: ../rpmdrake:365
+#, c-format
+msgid "/_Update media"
+msgstr "/更新介质(_U)"
+
+#: ../rpmdrake:376
+#, c-format
+msgid "/_Reset the selection"
+msgstr "/重置选中内容(_R)"
+
+#: ../rpmdrake:389
+#, c-format
+msgid "/Reload the _packages list"
+msgstr "/重新装入软件包清单(_P)"
+
+#: ../rpmdrake:398
+#, c-format
+msgid "/_Quit"
+msgstr "/退出(_Q)"
+
+#: ../rpmdrake:398
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../rpmdrake:401 ../rpmdrake:402 ../rpmdrake:407 ../rpmdrake:437
+#, c-format
+msgid "/_Options"
+msgstr "/选项(_O)"
+
+#: ../rpmdrake:402
+#, c-format
+msgid "/_Media Manager"
+msgstr "/介质管理器(_M)"
 
-#: ../rpmdrake:2184
+#: ../rpmdrake:407 ../rpmdrake:437
+#, c-format
+msgid "/_Show automatically selected packages"
+msgstr "/自动显示选中的软件包(_S)"
+
+#: ../rpmdrake:411 ../rpmdrake:412 ../rpmdrake:413 ../rpmdrake:414
+#, c-format
+msgid "/_Help"
+msgstr "/帮助(_H)"
+
+#: ../rpmdrake:412
+#, c-format
+msgid "/_Report Bug"
+msgstr "/报告错误(_R)"
+
+#: ../rpmdrake:414
+#, c-format
+msgid "/_About..."
+msgstr "/关于(_A)..."
+
+#: ../rpmdrake:417
+#, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
+
+#: ../rpmdrake:419
+#, c-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr "版权 (C) %s Mandriva"
+
+#: ../rpmdrake:421
+#, c-format
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
+
+#: ../rpmdrake:423
+#, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:428
+#, c-format
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr "Funda Wang <fundawang@gmail.com>\n"
+
+#: ../rpmdrake:452
+#, c-format
+msgid "Find:"
+msgstr "查找:"
+
+#: ../rpmdrake:461
+#, c-format
+msgid "Search"
+msgstr "搜索"
+
+#: ../rpmdrake:463
+#, c-format
+msgid "Clear"
+msgstr "清除"
+
+#: ../rpmdrake:477 ../rpmdrake.pm:764
+#, c-format
+msgid "Select all"
+msgstr "全选"
+
+#: ../rpmdrake:484
+#, c-format
+msgid "Apply"
+msgstr "应用"
+
+#: ../rpmdrake:488
+#, c-format
+msgid "Quit"
+msgstr "退出"
+
+#: ../rpmdrake:504
+#, c-format
+msgid "Quick Introduction"
+msgstr "简介"
+
+#: ../rpmdrake:505
+#, c-format
+msgid "You can browse the packages through the categories tree on the left."
+msgstr "您可以使用左侧的类别树浏览软件包。"
+
+#: ../rpmdrake:506
 #, c-format
 msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandriva 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"
-"您的 Mandriva Linux 的安装光盘包含有数千个软件包。\n"
-"本工具将帮助您选择要为您的电脑安装的软件包。"
+"You can view information about a package by clicking on it on the right list."
+msgstr "单击右侧列表中的软件包可以查看其信息。"
+
+#: ../rpmdrake:507
+#, c-format
+msgid "To install, update or remove a package, just click on its \"checkbox\"."
+msgstr "要安装、更新或删除软件包，只需单击相应的复选框。"
 
-#: ../rpmdrake.pm:104
+#: ../rpmdrake.pm:103
 #, c-format
 msgid "Software Update"
 msgstr "软件更新"
 
-#: ../rpmdrake.pm:104
+#: ../rpmdrake.pm:103
 #, c-format
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux 更新"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:130
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入您访问代理服务器的细节\n"
 
-#: ../rpmdrake.pm:132
+#: ../rpmdrake.pm:131
 #, c-format
 msgid "User name:"
 msgstr "用户名："
@@ -2295,7 +2318,7 @@ msgstr "用户名："
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:176 ../rpmdrake.pm:180
 #, c-format
 msgid "Software Packages Update"
 msgstr "软件包更新"
@@ -2305,177 +2328,177 @@ msgstr "软件包更新"
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake.pm:219
+#: ../rpmdrake.pm:220
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:224
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:273
+#: ../rpmdrake.pm:274
 #, c-format
 msgid "Info..."
 msgstr "信息..."
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:395
 #, c-format
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:396
 #, c-format
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:397
 #, c-format
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:398
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:399
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:400
 #, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:401
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:402
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:403
 #, c-format
 msgid "Germany"
 msgstr "德国"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:404
 #, c-format
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405 ../rpmdrake.pm:409
 #, c-format
 msgid "Greece"
 msgstr "希腊"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "France"
 msgstr "法国"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:412
 #, c-format
 msgid "Italy"
 msgstr "意大利"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Korea"
 msgstr "韩国"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:415
 #, c-format
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:416
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Poland"
 msgstr "波兰"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#: ../rpmdrake.pm:426 ../rpmdrake.pm:427 ../rpmdrake.pm:428 ../rpmdrake.pm:429
 #, c-format
 msgid "United States"
 msgstr "美国"
 
-#: ../rpmdrake.pm:521
+#: ../rpmdrake.pm:526
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2488,7 +2511,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:525
+#: ../rpmdrake.pm:530
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2501,27 +2524,27 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:536 ../rpmdrake.pm:574
 #, c-format
 msgid "Mirror choice"
 msgstr "镜像选择"
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:539
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "请稍候，正在下载镜像地址。"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:540
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "正在从 Mandriva 网站下载镜像站点的地址，请稍候。"
 
-#: ../rpmdrake.pm:542
+#: ../rpmdrake.pm:547
 #, c-format
 msgid "Error during download"
 msgstr "下载出错"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:549
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2536,7 +2559,7 @@ msgstr ""
 "您的网络或网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:549
+#: ../rpmdrake.pm:554
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2551,17 +2574,17 @@ msgstr ""
 "您的网络或 Mandriva 网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:559
+#: ../rpmdrake.pm:564
 #, c-format
 msgid "No mirror"
 msgstr "无镜像"
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:566
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "找不到适合的任何镜像。"
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:567
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2574,68 +2597,68 @@ msgstr ""
 "此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandriva Linux\n"
 "官方更新所支持。"
 
-#: ../rpmdrake.pm:581
+#: ../rpmdrake.pm:586
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm:634
+#: ../rpmdrake.pm:639
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
-#: ../rpmdrake.pm:637
+#: ../rpmdrake.pm:642
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在检查介质“%s”的文件..."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:645
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在检查介质“%s”的远程文件..."
 
-#: ../rpmdrake.pm:644
+#: ../rpmdrake.pm:649
 #, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:648
+#: ../rpmdrake.pm:653
 #, c-format
 msgid " failed!"
 msgstr " 失败!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:652
+#: ../rpmdrake.pm:657
 #, c-format
 msgid "%s from medium %s"
 msgstr "介质 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:656
+#: ../rpmdrake.pm:661
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在开始下载“%s”..."
 
-#: ../rpmdrake.pm:660
+#: ../rpmdrake.pm:665
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:674
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "正在更新介质，请稍候..."
 
-#: ../rpmdrake.pm:702
+#: ../rpmdrake.pm:706
 #, c-format
 msgid "Error retrieving packages"
 msgstr "获取软件包出错"
 
-#: ../rpmdrake.pm:703
+#: ../rpmdrake.pm:707
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2649,28 +2672,28 @@ msgstr ""
 "管理器中删除此介质，然后重新添加以进行重新配置。另外一种情况可能是，该介质目"
 "前不可用，您应该稍后再试。"
 
-#: ../rpmdrake.pm:734
+#: ../rpmdrake.pm:738
 #, c-format
 msgid "Update media"
 msgstr "更新介质"
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:743
 #, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "未找到活动的介质。您必须启用某些介质才能进行更新。"
 
-#: ../rpmdrake.pm:746
+#: ../rpmdrake.pm:750
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
-#: ../rpmdrake.pm:764
+#: ../rpmdrake.pm:768
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:785
+#: ../rpmdrake.pm:789
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2683,7 +2706,7 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2694,17 +2717,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:831
+#: ../rpmdrake.pm:835
 #, c-format
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:836
+#: ../rpmdrake.pm:840
 #, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:837
+#: ../rpmdrake.pm:841
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2715,7 +2738,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:850
+#: ../rpmdrake.pm:854
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2725,7 +2748,7 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 %s 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:853
+#: ../rpmdrake.pm:857
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2735,12 +2758,12 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 Mandriva Linux 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:870
+#: ../rpmdrake.pm:874
 #, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../rpmdrake.pm:871
+#: ../rpmdrake.pm:875
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3016,5 +3039,16 @@ msgstr "删除软件"
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
 
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed:\n"
+#~ "%2$s\n"
+#~ msgid_plural ""
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgstr[0] ""
+#~ "为了满足依赖性要求，将另外安装以下%d个软件包:\n"
+#~ "%s\n"
+
 #~ msgid "Please wait, reading packages database..."
 #~ msgstr "正在读取软件包数据库，请稍候..."