reuse an urpmi string

1 files changed, 413 insertions, 357 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 45bab7d3..f0c57f2e 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: 2007-02-23 19:01+0100\n"
+"POT-Creation-Date: 2007-03-06 16:07+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"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:67
+#: ../Rpmdrake/edit_urpm_sources.pm:75
 #, c-format
 msgid "Choose media type"
 msgstr "选择介质类型"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:68
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
@@ -47,17 +47,17 @@ msgstr ""
 "但\n"
 "您需要分两步完成。)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:76
+#: ../Rpmdrake/edit_urpm_sources.pm:84
 #, c-format
 msgid "Distribution sources"
 msgstr "发行版介质源"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:76
+#: ../Rpmdrake/edit_urpm_sources.pm:84
 #, c-format
 msgid "Official updates"
 msgstr "官方更新"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:79
+#: ../Rpmdrake/edit_urpm_sources.pm:87
 #, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -75,408 +75,413 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:93
+#: ../Rpmdrake/edit_urpm_sources.pm:101
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:126
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Add a medium"
 msgstr "添加一个介质"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:130
+#: ../Rpmdrake/edit_urpm_sources.pm:138
 #, c-format
 msgid "Local files"
 msgstr "本机文件"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:130
+#: ../Rpmdrake/edit_urpm_sources.pm:138
 #, c-format
 msgid "Path:"
 msgstr "路径:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:131
+#: ../Rpmdrake/edit_urpm_sources.pm:139
 #, c-format
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:131 ../Rpmdrake/edit_urpm_sources.pm:132
-#: ../Rpmdrake/edit_urpm_sources.pm:133 ../Rpmdrake/edit_urpm_sources.pm:402
+#: ../Rpmdrake/edit_urpm_sources.pm:139 ../Rpmdrake/edit_urpm_sources.pm:140
+#: ../Rpmdrake/edit_urpm_sources.pm:141 ../Rpmdrake/edit_urpm_sources.pm:418
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:140
 #, c-format
 msgid "RSYNC server"
 msgstr "RSYNC 服务器"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:133
+#: ../Rpmdrake/edit_urpm_sources.pm:141
 #, c-format
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:134
+#: ../Rpmdrake/edit_urpm_sources.pm:142
 #, c-format
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:134
+#: ../Rpmdrake/edit_urpm_sources.pm:142
 #, c-format
 msgid "Path or mount point:"
 msgstr "路径或挂载点:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:152
+#: ../Rpmdrake/edit_urpm_sources.pm:160
 #, c-format
 msgid "Browse..."
 msgstr "浏览..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:179
+#: ../Rpmdrake/edit_urpm_sources.pm:187
 #, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:179 ../Rpmdrake/edit_urpm_sources.pm:488
-#: ../rpmdrake.pm:131
+#: ../Rpmdrake/edit_urpm_sources.pm:187 ../Rpmdrake/edit_urpm_sources.pm:504
+#: ../rpmdrake.pm:135
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:184 ../Rpmdrake/edit_urpm_sources.pm:403
+#: ../Rpmdrake/edit_urpm_sources.pm:192 ../Rpmdrake/edit_urpm_sources.pm:419
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "综合文件/hdlist 的相对路径:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:186
+#: ../Rpmdrake/edit_urpm_sources.pm:194
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "如果留空, 将会自动探测综合文件/hdlist"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:191
+#: ../Rpmdrake/edit_urpm_sources.pm:199
 #, c-format
 msgid "Name:"
 msgstr "名称:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:199
+#: ../Rpmdrake/edit_urpm_sources.pm:207
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr "创建整个发行版的介质"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:210
+#: ../Rpmdrake/edit_urpm_sources.pm:218
 #, c-format
 msgid "Search this media for updates"
 msgstr "在此介质中搜索更新"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:220
+#: ../Rpmdrake/edit_urpm_sources.pm:228
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少要填写头两项。"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:224
+#: ../Rpmdrake/edit_urpm_sources.pm:232
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "已经有该名称的介质，您真的想要替换吗?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:236
+#: ../Rpmdrake/edit_urpm_sources.pm:244
 #, c-format
 msgid "Adding a medium:"
 msgstr "添加一个介质:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:238
+#: ../Rpmdrake/edit_urpm_sources.pm:246
 #, c-format
 msgid "Type of medium:"
 msgstr "介质类型:"
 
-#: ../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
+#: ../Rpmdrake/edit_urpm_sources.pm:256 ../Rpmdrake/edit_urpm_sources.pm:332
+#: ../Rpmdrake/edit_urpm_sources.pm:428 ../Rpmdrake/edit_urpm_sources.pm:455
+#: ../Rpmdrake/edit_urpm_sources.pm:521 ../Rpmdrake/edit_urpm_sources.pm:608
+#: ../Rpmdrake/edit_urpm_sources.pm:649 ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:856 ../Rpmdrake/gui.pm:473
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:527 ../Rpmdrake/pkg.pm:573
+#: ../rpmdrake.pm:296 ../rpmdrake.pm:609 ../rpmdrake.pm:694 ../rpmdrake.pm:767
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../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
+#: ../Rpmdrake/edit_urpm_sources.pm:258 ../Rpmdrake/edit_urpm_sources.pm:334
+#: ../Rpmdrake/edit_urpm_sources.pm:455 ../Rpmdrake/edit_urpm_sources.pm:511
+#: ../Rpmdrake/edit_urpm_sources.pm:605 ../Rpmdrake/edit_urpm_sources.pm:648
+#: ../Rpmdrake/edit_urpm_sources.pm:700 ../Rpmdrake/edit_urpm_sources.pm:773
+#: ../Rpmdrake/edit_urpm_sources.pm:902 ../Rpmdrake/edit_urpm_sources.pm:1062
+#: ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:489 ../Rpmdrake/gui.pm:494
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:527 ../Rpmdrake/pkg.pm:756
+#: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:126 ../rpmdrake.pm:236
+#: ../rpmdrake.pm:298 ../rpmdrake.pm:609
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:307
+#: ../Rpmdrake/edit_urpm_sources.pm:315
 #, c-format
 msgid "Global options for package installation"
 msgstr "软件包安装的全局选项"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:310
+#: ../Rpmdrake/edit_urpm_sources.pm:318
 #, c-format
 msgid "always"
 msgstr "总是"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:311
+#: ../Rpmdrake/edit_urpm_sources.pm:319
 #, c-format
 msgid "never"
 msgstr "从不"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:320
+#: ../Rpmdrake/edit_urpm_sources.pm:328
 #, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "校验要安装的 RPM:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:321
+#: ../Rpmdrake/edit_urpm_sources.pm:329
 #, c-format
 msgid "Download program to use:"
 msgstr "要使用的下载程序:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:351
+#: ../Rpmdrake/edit_urpm_sources.pm:360
 #, c-format
 msgid "Source Removal"
 msgstr "删除源"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:352
+#: ../Rpmdrake/edit_urpm_sources.pm:362
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "您真的想要删除源“%s”吗?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:357
+#: ../Rpmdrake/edit_urpm_sources.pm:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the following sources ?"
+msgstr "您真的想要删除源“%s”吗?"
+
+#: ../Rpmdrake/edit_urpm_sources.pm:369
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "正在删除介质，请稍候..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:392
+#: ../Rpmdrake/edit_urpm_sources.pm:408
 #, c-format
 msgid "Edit a medium"
 msgstr "编辑介质"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:399
+#: ../Rpmdrake/edit_urpm_sources.pm:415
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "编辑介质“%s”:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:404
+#: ../Rpmdrake/edit_urpm_sources.pm:420
 #, c-format
 msgid "Downloader:"
 msgstr "下载器:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:416
+#: ../Rpmdrake/edit_urpm_sources.pm:432
 #, c-format
 msgid "Save changes"
 msgstr "保存修改"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:425 ../Rpmdrake/edit_urpm_sources.pm:1019
+#: ../Rpmdrake/edit_urpm_sources.pm:441 ../Rpmdrake/edit_urpm_sources.pm:1049
 #, c-format
 msgid "Proxy..."
 msgstr "代理服务器..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:437
+#: ../Rpmdrake/edit_urpm_sources.pm:453
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "您必须插入介质才能继续"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:438
+#: ../Rpmdrake/edit_urpm_sources.pm:454
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "要保存更改，您必须在驱动器中插入介质。"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:459
+#: ../Rpmdrake/edit_urpm_sources.pm:475
 #, c-format
 msgid "Configure proxies"
 msgstr "配置代理服务器"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:471
+#: ../Rpmdrake/edit_urpm_sources.pm:487
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "介质“%s”的代理服务器设置"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:472
+#: ../Rpmdrake/edit_urpm_sources.pm:488
 #, c-format
 msgid "Global proxy settings"
 msgstr "全局代理服务器设置"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:474
+#: ../Rpmdrake/edit_urpm_sources.pm:490
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr "如果您需要用代理服务器，请输入主机名和端口(语法: <proxyhost[:port]>):"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:477
+#: ../Rpmdrake/edit_urpm_sources.pm:493
 #, c-format
 msgid "Proxy hostname:"
 msgstr "代理服务器主机名:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:480
+#: ../Rpmdrake/edit_urpm_sources.pm:496
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:483
+#: ../Rpmdrake/edit_urpm_sources.pm:499
 #, c-format
 msgid "User:"
 msgstr "用户名:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:555
+#: ../Rpmdrake/edit_urpm_sources.pm:574
 #, c-format
 msgid "Add a parallel group"
 msgstr "添加并行组"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:555
+#: ../Rpmdrake/edit_urpm_sources.pm:574
 #, c-format
 msgid "Edit a parallel group"
 msgstr "编辑并行组"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:567
+#: ../Rpmdrake/edit_urpm_sources.pm:586
 #, c-format
 msgid "Add a medium limit"
 msgstr "添加一个介质限制"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:580
+#: ../Rpmdrake/edit_urpm_sources.pm:599
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "在介质限制中选择介质进行添加:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:617
+#: ../Rpmdrake/edit_urpm_sources.pm:636
 #, c-format
 msgid "Add a host"
 msgstr "添加主机"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:624
+#: ../Rpmdrake/edit_urpm_sources.pm:643
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "输入要添加的主机名或 IP 地址:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:655
+#: ../Rpmdrake/edit_urpm_sources.pm:674
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "编辑并行组“%s”:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:659
+#: ../Rpmdrake/edit_urpm_sources.pm:678
 #, c-format
 msgid "Group name:"
 msgstr "组名称:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:660
+#: ../Rpmdrake/edit_urpm_sources.pm:679
 #, c-format
 msgid "Protocol:"
 msgstr "协议:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:662
+#: ../Rpmdrake/edit_urpm_sources.pm:681
 #, c-format
 msgid "Media limit:"
 msgstr "介质限制:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:667 ../Rpmdrake/edit_urpm_sources.pm:674
+#: ../Rpmdrake/edit_urpm_sources.pm:686 ../Rpmdrake/edit_urpm_sources.pm:693
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:675
-#: ../Rpmdrake/edit_urpm_sources.pm:734 ../Rpmdrake/edit_urpm_sources.pm:997
+#: ../Rpmdrake/edit_urpm_sources.pm:687 ../Rpmdrake/edit_urpm_sources.pm:694
+#: ../Rpmdrake/edit_urpm_sources.pm:753 ../Rpmdrake/edit_urpm_sources.pm:1027
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:669
+#: ../Rpmdrake/edit_urpm_sources.pm:688
 #, c-format
 msgid "Hosts:"
 msgstr "主机:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:703
+#: ../Rpmdrake/edit_urpm_sources.pm:722
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Group"
 msgstr "组"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Media limit"
 msgstr "介质限制"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:708
+#: ../Rpmdrake/edit_urpm_sources.pm:727
 #, c-format
 msgid "Command"
 msgstr "命令"
 
-#: ../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
+#: ../Rpmdrake/edit_urpm_sources.pm:737 ../Rpmdrake/gui.pm:675
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:128 ../Rpmdrake/pkg.pm:167
+#: ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
 msgstr "(无)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:738 ../Rpmdrake/edit_urpm_sources.pm:1001
+#: ../Rpmdrake/edit_urpm_sources.pm:757 ../Rpmdrake/edit_urpm_sources.pm:1031
 #, c-format
 msgid "Edit..."
 msgstr "编辑"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:746 ../Rpmdrake/edit_urpm_sources.pm:1007
+#: ../Rpmdrake/edit_urpm_sources.pm:765 ../Rpmdrake/edit_urpm_sources.pm:1037
 #, c-format
 msgid "Add..."
 msgstr "添加..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:762
+#: ../Rpmdrake/edit_urpm_sources.pm:781
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理软件包数字签名的密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:768 ../Rpmdrake/edit_urpm_sources.pm:932
+#: ../Rpmdrake/edit_urpm_sources.pm:787 ../Rpmdrake/edit_urpm_sources.pm:959
 #, c-format
 msgid "Medium"
 msgstr "介质"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:774
+#: ../Rpmdrake/edit_urpm_sources.pm:793
 #, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:797
+#: ../Rpmdrake/edit_urpm_sources.pm:817
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:810
+#: ../Rpmdrake/edit_urpm_sources.pm:830
 #, c-format
 msgid "Add a key"
 msgstr "添加密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:823
+#: ../Rpmdrake/edit_urpm_sources.pm:843
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "选择要添加到介质 %s 中的密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:829
+#: ../Rpmdrake/edit_urpm_sources.pm:849
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:851
+#: ../Rpmdrake/edit_urpm_sources.pm:871
 #, c-format
 msgid "Remove a key"
 msgstr "删除密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:852
+#: ../Rpmdrake/edit_urpm_sources.pm:872
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -485,37 +490,37 @@ msgstr ""
 "您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
 "(密钥名称: %3$s)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:870
+#: ../Rpmdrake/edit_urpm_sources.pm:890
 #, c-format
 msgid "Add a key..."
 msgstr "添加密钥..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:874
+#: ../Rpmdrake/edit_urpm_sources.pm:894
 #, c-format
 msgid "Remove key"
 msgstr "删除密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:890
+#: ../Rpmdrake/edit_urpm_sources.pm:911
 #, c-format
 msgid "Configure media"
 msgstr "配置介质"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:930
+#: ../Rpmdrake/edit_urpm_sources.pm:957
 #, c-format
 msgid "Enabled"
 msgstr "启用"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:931
+#: ../Rpmdrake/edit_urpm_sources.pm:958
 #, c-format
 msgid "Updates"
 msgstr "更新"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:947
+#: ../Rpmdrake/edit_urpm_sources.pm:974
 #, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "此介质需要更新才能使用。现在更新吗？"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:977
+#: ../Rpmdrake/edit_urpm_sources.pm:1006
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -526,37 +531,37 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1011
+#: ../Rpmdrake/edit_urpm_sources.pm:1041
 #, c-format
 msgid "Add custom..."
 msgstr "添加自定义..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1015
+#: ../Rpmdrake/edit_urpm_sources.pm:1045
 #, c-format
 msgid "Update..."
 msgstr "更新..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1018
+#: ../Rpmdrake/edit_urpm_sources.pm:1048
 #, c-format
 msgid "Manage keys..."
 msgstr "管理密钥..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1020
+#: ../Rpmdrake/edit_urpm_sources.pm:1050
 #, c-format
 msgid "Parallel..."
 msgstr "并行..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1021
+#: ../Rpmdrake/edit_urpm_sources.pm:1051
 #, c-format
 msgid "Global options..."
 msgstr "全局选项..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1031 ../rpmdrake:472
+#: ../Rpmdrake/edit_urpm_sources.pm:1061 ../rpmdrake:470
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1044 ../Rpmdrake/init.pm:125
+#: ../Rpmdrake/edit_urpm_sources.pm:1077 ../Rpmdrake/init.pm:132
 #: ../gurpmi.addmedia:93
 #, c-format
 msgid ""
@@ -568,7 +573,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1047
+#: ../Rpmdrake/edit_urpm_sources.pm:1080
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -582,7 +587,7 @@ msgstr ""
 "本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
 "软件包或执行更新时使用。"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1063
+#: ../Rpmdrake/edit_urpm_sources.pm:1096
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -619,7 +624,7 @@ msgid "Files:"
 msgstr "文件:"
 
 #: ../Rpmdrake/gui.pm:79 ../Rpmdrake/gui.pm:84 ../Rpmdrake/gui.pm:98
-#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/pkg.pm:135
+#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/pkg.pm:134
 #, c-format
 msgid "(Not available)"
 msgstr "(不可用)"
@@ -639,7 +644,7 @@ msgstr "文件:\n"
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../Rpmdrake/gui.pm:105 ../rpmdrake.pm:813
+#: ../Rpmdrake/gui.pm:105 ../rpmdrake.pm:820
 #, c-format
 msgid "Medium: "
 msgstr "介质:"
@@ -684,55 +689,55 @@ msgstr "摘要:"
 msgid "Description: "
 msgstr "描述:"
 
-#: ../Rpmdrake/gui.pm:453 ../Rpmdrake/gui.pm:490 ../Rpmdrake/gui.pm:492
+#: ../Rpmdrake/gui.pm:448 ../Rpmdrake/gui.pm:485 ../Rpmdrake/gui.pm:487
 #, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../Rpmdrake/gui.pm:455
+#: ../Rpmdrake/gui.pm:450
 #, c-format
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../Rpmdrake/gui.pm:456
+#: ../Rpmdrake/gui.pm:451
 #, c-format
 msgid "The following package is needed:"
 msgstr "需要下列软件包:"
 
-#: ../Rpmdrake/gui.pm:456
+#: ../Rpmdrake/gui.pm:451
 #, 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
+#: ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:478
 #, c-format
 msgid "More info"
 msgstr "更多信息"
 
-#: ../Rpmdrake/gui.pm:485
+#: ../Rpmdrake/gui.pm:480
 #, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../Rpmdrake/gui.pm:508
+#: ../Rpmdrake/gui.pm:503
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../Rpmdrake/gui.pm:509
+#: ../Rpmdrake/gui.pm:504
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "为了满足所有的依赖关系，需要删除下列软件包:"
 
-#: ../Rpmdrake/gui.pm:515 ../Rpmdrake/gui.pm:524
+#: ../Rpmdrake/gui.pm:510 ../Rpmdrake/gui.pm:519
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../Rpmdrake/gui.pm:516
+#: ../Rpmdrake/gui.pm:511
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -741,7 +746,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:525 ../Rpmdrake/gui.pm:592
+#: ../Rpmdrake/gui.pm:520 ../Rpmdrake/gui.pm:587
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -751,12 +756,12 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:554
+#: ../Rpmdrake/gui.pm:549
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../Rpmdrake/gui.pm:555
+#: ../Rpmdrake/gui.pm:550
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -766,22 +771,22 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:569
+#: ../Rpmdrake/gui.pm:564
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (属于跳过列表)"
 
-#: ../Rpmdrake/gui.pm:573
+#: ../Rpmdrake/gui.pm:568
 #, c-format
 msgid "One package cannot be installed"
 msgstr "软件包无法安装"
 
-#: ../Rpmdrake/gui.pm:573
+#: ../Rpmdrake/gui.pm:568
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../Rpmdrake/gui.pm:575
+#: ../Rpmdrake/gui.pm:570
 #, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -792,7 +797,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:576
+#: ../Rpmdrake/gui.pm:571
 #, c-format
 msgid ""
 "Sorry, the following packages can't be selected:\n"
@@ -803,27 +808,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:591 ../Rpmdrake/pkg.pm:486
+#: ../Rpmdrake/gui.pm:586 ../Rpmdrake/pkg.pm:497
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../Rpmdrake/gui.pm:622
+#: ../Rpmdrake/gui.pm:617
 #, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "错误：%s 似乎是以只读方式挂载的。"
 
-#: ../Rpmdrake/gui.pm:626
+#: ../Rpmdrake/gui.pm:621
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
-#: ../Rpmdrake/gui.pm:631
+#: ../Rpmdrake/gui.pm:626
 #, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../Rpmdrake/gui.pm:632
+#: ../Rpmdrake/gui.pm:627
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -838,17 +843,17 @@ msgstr ""
 "\n"
 "您真的想要安装所有选中的软件包吗?"
 
-#: ../Rpmdrake/gui.pm:664
+#: ../Rpmdrake/gui.pm:659
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../Rpmdrake/gui.pm:682
+#: ../Rpmdrake/gui.pm:677
 #, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../Rpmdrake/gui.pm:683
+#: ../Rpmdrake/gui.pm:678
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -858,27 +863,27 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../Rpmdrake/gui.pm:706 ../rpmdrake:256
+#: ../Rpmdrake/gui.pm:701 ../rpmdrake:255
 #, c-format
 msgid "All"
 msgstr "全部"
 
-#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#: ../Rpmdrake/gui.pm:710 ../rpmdrake:141
 #, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#: ../Rpmdrake/gui.pm:710 ../rpmdrake:141
 #, c-format
 msgid "Addable"
 msgstr "可添加"
 
-#: ../Rpmdrake/gui.pm:735
+#: ../Rpmdrake/gui.pm:730
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "此软件包的描述不可用\n"
 
-#: ../Rpmdrake/gui.pm:741 ../Rpmdrake/pkg.pm:189
+#: ../Rpmdrake/gui.pm:736 ../Rpmdrake/pkg.pm:188
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
@@ -1576,12 +1581,17 @@ msgstr "  --root                 强制以 root 身份运行"
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=包            搜索“包”"
 
-#: ../Rpmdrake/init.pm:116
+#: ../Rpmdrake/init.pm:53
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - 打印此工具的版本号。\n"
+
+#: ../Rpmdrake/init.pm:123
 #, c-format
 msgid "Running in user mode"
 msgstr "以用户模式运行"
 
-#: ../Rpmdrake/init.pm:117
+#: ../Rpmdrake/init.pm:124
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1592,12 +1602,12 @@ msgstr ""
 "您将无法执行对系统的修改，\n"
 "但您仍然可以浏览已有数据库。"
 
-#: ../Rpmdrake/init.pm:124
+#: ../Rpmdrake/init.pm:131 ../Rpmdrake/init.pm:156
 #, c-format
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../Rpmdrake/init.pm:129
+#: ../Rpmdrake/init.pm:136
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1609,7 +1619,7 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../Rpmdrake/init.pm:134
+#: ../Rpmdrake/init.pm:141
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1621,12 +1631,12 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../Rpmdrake/init.pm:139
+#: ../Rpmdrake/init.pm:146
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "欢迎使用软件安装工具!"
 
-#: ../Rpmdrake/init.pm:140
+#: ../Rpmdrake/init.pm:147
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1640,27 +1650,38 @@ msgstr ""
 "您的 Mandriva Linux 的安装光盘包含有数千个软件包。\n"
 "本工具将帮助您选择要为您的电脑安装的软件包。"
 
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/init.pm:158
+#, c-format
+msgid "The software installation tool can set up media sources."
+msgstr ""
+
+#: ../Rpmdrake/init.pm:159
+#, fuzzy, c-format
+msgid "Do you want to add media sources now?"
+msgstr "您真的想要删除源“%s”吗?"
+
+#: ../Rpmdrake/pkg.pm:187
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499 ../rpmdrake.pm:316
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512 ../Rpmdrake/pkg.pm:786
+#: ../rpmdrake.pm:323
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512 ../Rpmdrake/pkg.pm:786
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:486
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:497
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -1738,17 +1759,17 @@ msgstr "正在列出基本软件包，请稍候..."
 msgid "Please wait, finding installed packages..."
 msgstr "正在寻找已安装的软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:440 ../Rpmdrake/pkg.pm:635
+#: ../Rpmdrake/pkg.pm:445 ../Rpmdrake/pkg.pm:733
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../Rpmdrake/pkg.pm:444 ../Rpmdrake/pkg.pm:615
+#: ../Rpmdrake/pkg.pm:449 ../Rpmdrake/pkg.pm:712
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:445 ../Rpmdrake/pkg.pm:616 ../Rpmdrake/pkg.pm:674
+#: ../Rpmdrake/pkg.pm:450 ../Rpmdrake/pkg.pm:714 ../Rpmdrake/pkg.pm:772
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1759,17 +1780,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:464
+#: ../Rpmdrake/pkg.pm:475
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../Rpmdrake/pkg.pm:465
+#: ../Rpmdrake/pkg.pm:476
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../Rpmdrake/pkg.pm:466 ../Rpmdrake/pkg.pm:566
+#: ../Rpmdrake/pkg.pm:477 ../Rpmdrake/pkg.pm:702
 #, c-format
 msgid ""
 "\n"
@@ -1782,62 +1803,76 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:483
+#: ../Rpmdrake/pkg.pm:494
+#, c-format
 msgid ""
 "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:"
-msgstr[0] ""
-"为了满足依赖性要求，将另外安装以下%d个软件包:"
+msgstr[0] "为了满足依赖性要求，将另外安装以下%d个软件包:"
 
-#: ../Rpmdrake/pkg.pm:488
+#: ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../Rpmdrake/pkg.pm:490
+#: ../Rpmdrake/pkg.pm:501
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:491
+#: ../Rpmdrake/pkg.pm:502
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
-msgstr ""
-"要升级其它软件包，必须删除下列软件包:"
+msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:491
+#: ../Rpmdrake/pkg.pm:502
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:509
+#: ../Rpmdrake/pkg.pm:525
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../Rpmdrake/pkg.pm:510
+#: ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../Rpmdrake/pkg.pm:517
+#: ../Rpmdrake/pkg.pm:547
+#, c-format
+msgid "Preparing packages installation..."
+msgstr "准备安装软件包..."
+
+#: ../Rpmdrake/pkg.pm:547
+#, c-format
+msgid "Preparing..."
+msgstr "正在准备..."
+
+#: ../Rpmdrake/pkg.pm:550
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安装软件包“%s”(%s/%s)..."
+
+#: ../Rpmdrake/pkg.pm:571
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:537
+#: ../Rpmdrake/pkg.pm:591
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../Rpmdrake/pkg.pm:550 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../Rpmdrake/pkg.pm:604 ../rpmdrake.pm:750 ../rpmdrake.pm:859
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../Rpmdrake/pkg.pm:551
+#: ../Rpmdrake/pkg.pm:605
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1852,12 +1887,48 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:673
+#: ../Rpmdrake/pkg.pm:618
+#, c-format
+msgid "installing %s from %s"
+msgstr "正在从 %2$s 安装 %1$s"
+
+#: ../Rpmdrake/pkg.pm:620
+#, c-format
+msgid "installing %s"
+msgstr "正在安装 %s"
+
+#: ../Rpmdrake/pkg.pm:624
+#, c-format
+msgid "removing %s"
+msgstr "正在删除 %s"
+
+#: ../Rpmdrake/pkg.pm:650 ../Rpmdrake/pkg.pm:668 ../Rpmdrake/pkg.pm:761
+#: ../rpmdrake.pm:737 ../rpmdrake.pm:818 ../rpmdrake.pm:842
+#, c-format
+msgid "Error"
+msgstr "错误"
+
+#: ../Rpmdrake/pkg.pm:651 ../Rpmdrake/pkg.pm:669
+#, c-format
+msgid "Installation failed:"
+msgstr "安装失败: "
+
+#: ../Rpmdrake/pkg.pm:652
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
+
+#: ../Rpmdrake/pkg.pm:670
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
+
+#: ../Rpmdrake/pkg.pm:682 ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:771
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../Rpmdrake/pkg.pm:564
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1870,27 +1941,12 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../Rpmdrake/pkg.pm:578
-#, c-format
-msgid "Preparing packages installation..."
-msgstr "准备安装软件包..."
-
-#: ../Rpmdrake/pkg.pm:578
-#, c-format
-msgid "Preparing..."
-msgstr "正在准备..."
-
-#: ../Rpmdrake/pkg.pm:581
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安装软件包“%s”(%s/%s)..."
-
-#: ../Rpmdrake/pkg.pm:596
-#, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "无法访问 rpm 文件 [%s]"
+#: ../Rpmdrake/pkg.pm:713
+#, fuzzy, c-format
+msgid "%d installation transactions failed"
+msgstr "安装失败"
 
-#: ../Rpmdrake/pkg.pm:630
+#: ../Rpmdrake/pkg.pm:728
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -1903,48 +1959,42 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../Rpmdrake/pkg.pm:638
+#: ../Rpmdrake/pkg.pm:736
 #, c-format
 msgid "Upgrade information"
 msgstr "升级信息"
 
-#: ../Rpmdrake/pkg.pm:640
+#: ../Rpmdrake/pkg.pm:738
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../Rpmdrake/pkg.pm:648
+#: ../Rpmdrake/pkg.pm:746
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "关于此软件包的升级信息"
 
-#: ../Rpmdrake/pkg.pm:651
+#: ../Rpmdrake/pkg.pm:749
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "关于软件包 %s 的升级信息"
 
-#: ../Rpmdrake/pkg.pm:663 ../rpmdrake.pm:730 ../rpmdrake.pm:811
-#: ../rpmdrake.pm:835
-#, c-format
-msgid "Error"
-msgstr "错误"
-
-#: ../Rpmdrake/pkg.pm:664
+#: ../Rpmdrake/pkg.pm:762
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../Rpmdrake/pkg.pm:689
+#: ../Rpmdrake/pkg.pm:786 ../Rpmdrake/pkg.pm:791
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:700
+#: ../Rpmdrake/pkg.pm:802
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:701
+#: ../Rpmdrake/pkg.pm:803
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1955,42 +2005,42 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/rpmnew.pm:81
+#: ../Rpmdrake/rpmnew.pm:78
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../Rpmdrake/rpmnew.pm:104
+#: ../Rpmdrake/rpmnew.pm:102
 #, c-format
 msgid "Changes:"
 msgstr "更改:"
 
-#: ../Rpmdrake/rpmnew.pm:112
+#: ../Rpmdrake/rpmnew.pm:110
 #, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../Rpmdrake/rpmnew.pm:116
+#: ../Rpmdrake/rpmnew.pm:114
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../Rpmdrake/rpmnew.pm:120
+#: ../Rpmdrake/rpmnew.pm:118
 #, c-format
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../Rpmdrake/rpmnew.pm:136
+#: ../Rpmdrake/rpmnew.pm:149
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../Rpmdrake/rpmnew.pm:151
+#: ../Rpmdrake/rpmnew.pm:164
 #, c-format
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../Rpmdrake/rpmnew.pm:169 ../rpmdrake:70 ../rpmdrake:98
+#: ../Rpmdrake/rpmnew.pm:182 ../rpmdrake:70 ../rpmdrake:97
 #, c-format
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
@@ -2030,7 +2080,7 @@ msgstr "成功添加了介质 %s。"
 msgid "Successfully added medium `%s'."
 msgstr "成功添加了介质“%s”。"
 
-#: ../rpmdrake:59 ../rpmdrake:141
+#: ../rpmdrake:59 ../rpmdrake:140
 #, c-format
 msgid "Search results"
 msgstr "搜索结果"
@@ -2040,465 +2090,465 @@ msgstr "搜索结果"
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake:93 ../rpmdrake:187 ../rpmdrake.pm:180
+#: ../rpmdrake:92 ../rpmdrake:186 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Management"
 msgstr "软件管理器"
 
-#: ../rpmdrake:103
+#: ../rpmdrake:102
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:143
 #, c-format
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:143
 #, c-format
 msgid "Not selected"
 msgstr "未选中"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:199
 #, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "选中软件: %s / 剩余磁盘空间: %s"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:200
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中大小: %d MB"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:255
 #, c-format
 msgid "Installed"
 msgstr "已安装"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:255
 #, c-format
 msgid "Non installed"
 msgstr "未安装"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:256
 #, c-format
 msgid "%s choices"
 msgstr "%s 精选"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:256
 #, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux 精选"
 
-#: ../rpmdrake:259
+#: ../rpmdrake:258
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按字母次序排列"
 
-#: ../rpmdrake:260
+#: ../rpmdrake:259
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:261
+#: ../rpmdrake:260
 #, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:262
+#: ../rpmdrake:261
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:262
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "不分类，按安装日期排列"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:263
 #, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按组别排列"
 
-#: ../rpmdrake:266
+#: ../rpmdrake:265
 #, c-format
 msgid "All updates"
 msgstr "全部更新"
 
-#: ../rpmdrake:266
+#: ../rpmdrake:265
 #, c-format
 msgid "Security updates"
 msgstr "安全更新"
 
-#: ../rpmdrake:266
+#: ../rpmdrake:265
 #, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:266
+#: ../rpmdrake:265
 #, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake:327
+#: ../rpmdrake:326
 #, c-format
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:329
+#: ../rpmdrake:328
 #, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:331
+#: ../rpmdrake:330
 #, c-format
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:362 ../rpmdrake:365 ../rpmdrake:376 ../rpmdrake:389
-#: ../rpmdrake:398
+#: ../rpmdrake:361 ../rpmdrake:364 ../rpmdrake:375 ../rpmdrake:388
+#: ../rpmdrake:397
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../rpmdrake:365
+#: ../rpmdrake:364
 #, c-format
 msgid "/_Update media"
 msgstr "/更新介质(_U)"
 
-#: ../rpmdrake:376
+#: ../rpmdrake:375
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/重置选中内容(_R)"
 
-#: ../rpmdrake:389
+#: ../rpmdrake:388
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新装入软件包清单(_P)"
 
-#: ../rpmdrake:398
+#: ../rpmdrake:397
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../rpmdrake:398
+#: ../rpmdrake:397
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:401 ../rpmdrake:402 ../rpmdrake:407 ../rpmdrake:437
+#: ../rpmdrake:400 ../rpmdrake:401 ../rpmdrake:405 ../rpmdrake:435
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../rpmdrake:402
+#: ../rpmdrake:401
 #, c-format
 msgid "/_Media Manager"
 msgstr "/介质管理器(_M)"
 
-#: ../rpmdrake:407 ../rpmdrake:437
+#: ../rpmdrake:405 ../rpmdrake:435
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/自动显示选中的软件包(_S)"
 
-#: ../rpmdrake:411 ../rpmdrake:412 ../rpmdrake:413 ../rpmdrake:414
+#: ../rpmdrake:409 ../rpmdrake:410 ../rpmdrake:411 ../rpmdrake:412
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../rpmdrake:412
+#: ../rpmdrake:410
 #, c-format
 msgid "/_Report Bug"
 msgstr "/报告错误(_R)"
 
-#: ../rpmdrake:414
+#: ../rpmdrake:412
 #, c-format
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: ../rpmdrake:417
+#: ../rpmdrake:415
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:419
+#: ../rpmdrake:417
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../rpmdrake:421
+#: ../rpmdrake:419
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
 
-#: ../rpmdrake:423
+#: ../rpmdrake:421
 #, 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
+#: ../rpmdrake:426
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: ../rpmdrake:452
+#: ../rpmdrake:450
 #, c-format
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:461
+#: ../rpmdrake:459
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake:463
+#: ../rpmdrake:461
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../rpmdrake:477 ../rpmdrake.pm:764
+#: ../rpmdrake:475 ../rpmdrake.pm:771
 #, c-format
 msgid "Select all"
 msgstr "全选"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:482
 #, c-format
 msgid "Apply"
 msgstr "应用"
 
-#: ../rpmdrake:488
+#: ../rpmdrake:486
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../rpmdrake:504
+#: ../rpmdrake:502
 #, c-format
 msgid "Quick Introduction"
 msgstr "简介"
 
-#: ../rpmdrake:505
+#: ../rpmdrake:503
 #, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "您可以使用左侧的类别树浏览软件包。"
 
-#: ../rpmdrake:506
+#: ../rpmdrake:504
 #, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr "单击右侧列表中的软件包可以查看其信息。"
 
-#: ../rpmdrake:507
+#: ../rpmdrake:505
 #, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr "要安装、更新或删除软件包，只需单击相应的复选框。"
 
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:107
 #, c-format
 msgid "Software Update"
 msgstr "软件更新"
 
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:107
 #, c-format
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux 更新"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:134
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入您访问代理服务器的细节\n"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:135
 #, c-format
 msgid "User name:"
 msgstr "用户名："
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake.pm:176 ../rpmdrake.pm:180
+#: ../rpmdrake.pm:183 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Packages Update"
 msgstr "软件包更新"
 
-#: ../rpmdrake.pm:177
+#: ../rpmdrake.pm:184
 #, c-format
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake.pm:220
+#: ../rpmdrake.pm:227
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:224
+#: ../rpmdrake.pm:231
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:274
+#: ../rpmdrake.pm:281
 #, c-format
 msgid "Info..."
 msgstr "信息..."
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:402
 #, c-format
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:403
 #, c-format
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:404
 #, c-format
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:405
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:409
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Germany"
 msgstr "德国"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake.pm:405 ../rpmdrake.pm:409
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:416
 #, c-format
 msgid "Greece"
 msgstr "希腊"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:415
 #, c-format
 msgid "France"
 msgstr "法国"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "Italy"
 msgstr "意大利"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Korea"
 msgstr "韩国"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "Poland"
 msgstr "波兰"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:426
 #, c-format
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:428
 #, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../rpmdrake.pm:422
+#: ../rpmdrake.pm:429
 #, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:430
 #, c-format
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../rpmdrake.pm:424
+#: ../rpmdrake.pm:431
 #, c-format
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../rpmdrake.pm:425
+#: ../rpmdrake.pm:432
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:426 ../rpmdrake.pm:427 ../rpmdrake.pm:428 ../rpmdrake.pm:429
+#: ../rpmdrake.pm:433 ../rpmdrake.pm:434 ../rpmdrake.pm:435 ../rpmdrake.pm:436
 #, c-format
 msgid "United States"
 msgstr "美国"
 
-#: ../rpmdrake.pm:526
+#: ../rpmdrake.pm:533
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2511,7 +2561,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:530
+#: ../rpmdrake.pm:537
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2524,27 +2574,27 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:536 ../rpmdrake.pm:574
+#: ../rpmdrake.pm:543 ../rpmdrake.pm:581
 #, c-format
 msgid "Mirror choice"
 msgstr "镜像选择"
 
-#: ../rpmdrake.pm:539
+#: ../rpmdrake.pm:546
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "请稍候，正在下载镜像地址。"
 
-#: ../rpmdrake.pm:540
+#: ../rpmdrake.pm:547
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "正在从 Mandriva 网站下载镜像站点的地址，请稍候。"
 
-#: ../rpmdrake.pm:547
+#: ../rpmdrake.pm:554
 #, c-format
 msgid "Error during download"
 msgstr "下载出错"
 
-#: ../rpmdrake.pm:549
+#: ../rpmdrake.pm:556
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2559,7 +2609,7 @@ msgstr ""
 "您的网络或网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:561
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2574,17 +2624,17 @@ msgstr ""
 "您的网络或 Mandriva 网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:564
+#: ../rpmdrake.pm:571
 #, c-format
 msgid "No mirror"
 msgstr "无镜像"
 
-#: ../rpmdrake.pm:566
+#: ../rpmdrake.pm:573
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "找不到适合的任何镜像。"
 
-#: ../rpmdrake.pm:567
+#: ../rpmdrake.pm:574
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2597,68 +2647,68 @@ msgstr ""
 "此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandriva Linux\n"
 "官方更新所支持。"
 
-#: ../rpmdrake.pm:586
+#: ../rpmdrake.pm:593
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm:639
+#: ../rpmdrake.pm:646
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
-#: ../rpmdrake.pm:642
+#: ../rpmdrake.pm:649
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在检查介质“%s”的文件..."
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:652
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在检查介质“%s”的远程文件..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:656
 #, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:660
 #, c-format
 msgid " failed!"
 msgstr " 失败!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
+#: ../rpmdrake.pm:664
 #, c-format
 msgid "%s from medium %s"
 msgstr "介质 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:661
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在开始下载“%s”..."
 
-#: ../rpmdrake.pm:665
+#: ../rpmdrake.pm:672
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
-#: ../rpmdrake.pm:668
+#: ../rpmdrake.pm:675
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:686
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "正在更新介质，请稍候..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:713
 #, c-format
 msgid "Error retrieving packages"
 msgstr "获取软件包出错"
 
-#: ../rpmdrake.pm:707
+#: ../rpmdrake.pm:714
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2672,28 +2722,28 @@ msgstr ""
 "管理器中删除此介质，然后重新添加以进行重新配置。另外一种情况可能是，该介质目"
 "前不可用，您应该稍后再试。"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:745
 #, c-format
 msgid "Update media"
 msgstr "更新介质"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:750
 #, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "未找到活动的介质。您必须启用某些介质才能进行更新。"
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:757
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
-#: ../rpmdrake.pm:768
+#: ../rpmdrake.pm:775
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:789
+#: ../rpmdrake.pm:796
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2706,7 +2756,7 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
+#: ../rpmdrake.pm:819 ../rpmdrake.pm:830
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2717,17 +2767,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:842
 #, c-format
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:847
 #, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:841
+#: ../rpmdrake.pm:848
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2738,7 +2788,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
+#: ../rpmdrake.pm:861
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2748,7 +2798,7 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 %s 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:857
+#: ../rpmdrake.pm:864
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2758,12 +2808,12 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 Mandriva Linux 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:881
 #, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:882
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3039,3 +3089,9 @@ msgstr "删除软件"
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
 
+#, fuzzy
+#~ msgid "  --version              output version information and exit"
+#~ msgstr "  --root                 强制以 root 身份运行"
+
+#~ msgid "unable to access rpm file [%s]"
+#~ msgstr "无法访问 rpm 文件 [%s]"