Make merge

1 files changed, 392 insertions, 364 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8835e52c..e5b13a2c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2005-01-14 18:50+0100\n"
+"POT-Creation-Date: 2005-01-18 13:29+0100\n"
 "PO-Revision-Date: 2005-01-14 19:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -19,7 +19,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:65
+#: ../edit-urpm-sources.pl:66
+#, c-format
+msgid "Choose media type"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:67
+#, c-format
+msgid ""
+"This step enables you to add sources from a Mandrakelinux web or FTP "
+"mirror.\n"
+"\n"
+"There are two kinds of official mirrors. You can choose to add sources that\n"
+"contain the complete set of packages of your distribution (usually a "
+"superset\n"
+"of what comes on the standard installation CDs), or sources that provide "
+"the\n"
+"official updates for your distribution. (You can add both, but you'll have\n"
+"to do this in two steps.)"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, c-format
+msgid "Distribution sources"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, fuzzy, c-format
+msgid "Official updates"
+msgstr "正常更新"
+
+#: ../edit-urpm-sources.pl:78
 #, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -37,393 +67,383 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:73
+#: ../edit-urpm-sources.pl:87
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:93
+#: ../edit-urpm-sources.pl:120
 #, c-format
 msgid "Add a medium"
 msgstr "添加一个介质"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Local files"
 msgstr "本机文件"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Path:"
 msgstr "路径:"
 
-#: ../edit-urpm-sources.pl:95
+#: ../edit-urpm-sources.pl:123
 #, c-format
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../edit-urpm-sources.pl:95 ../edit-urpm-sources.pl:96
-#: ../edit-urpm-sources.pl:98 ../edit-urpm-sources.pl:373
+#: ../edit-urpm-sources.pl:123 ../edit-urpm-sources.pl:124
+#: ../edit-urpm-sources.pl:382
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:96
+#: ../edit-urpm-sources.pl:124
 #, c-format
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Path or mount point:"
 msgstr "路径或挂载点:"
 
-#: ../edit-urpm-sources.pl:98 ../rpmdrake:859
-#, c-format
-msgid "Security updates"
-msgstr "安全更新"
-
-#: ../edit-urpm-sources.pl:114
+#: ../edit-urpm-sources.pl:141
 #, c-format
 msgid "Browse..."
 msgstr "浏览..."
 
-#: ../edit-urpm-sources.pl:121
-#, c-format
-msgid "Choose a mirror..."
-msgstr "选择镜像..."
-
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:171
 #, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:450
+#: ../edit-urpm-sources.pl:171 ../edit-urpm-sources.pl:459
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../edit-urpm-sources.pl:164 ../edit-urpm-sources.pl:374
+#: ../edit-urpm-sources.pl:176 ../edit-urpm-sources.pl:383
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "综合文件/hdlist 的相对路径:"
 
-#: ../edit-urpm-sources.pl:166
+#: ../edit-urpm-sources.pl:178
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "如果留空, 将会自动探测综合文件/hdlist"
 
-#: ../edit-urpm-sources.pl:171
+#: ../edit-urpm-sources.pl:183
 #, c-format
 msgid "Name:"
 msgstr "名称:"
 
-#: ../edit-urpm-sources.pl:184
+#: ../edit-urpm-sources.pl:194
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr "创建整个发行版的介质"
 
-#: ../edit-urpm-sources.pl:203
+#: ../edit-urpm-sources.pl:212
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少要填写头两项。"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "已经有该名称的介质，您真的想要替换吗?"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
 #, c-format
 msgid "Adding a medium:"
 msgstr "添加一个介质:"
 
-#: ../edit-urpm-sources.pl:219
+#: ../edit-urpm-sources.pl:228
 #, c-format
 msgid "Type of medium:"
 msgstr "介质类型:"
 
-#: ../edit-urpm-sources.pl:224 ../edit-urpm-sources.pl:294
-#: ../edit-urpm-sources.pl:380 ../edit-urpm-sources.pl:405
-#: ../edit-urpm-sources.pl:467 ../edit-urpm-sources.pl:548
-#: ../edit-urpm-sources.pl:588 ../edit-urpm-sources.pl:646
-#: ../edit-urpm-sources.pl:786 ../rpmdrake:159 ../rpmdrake:626
-#: ../rpmdrake:1393 ../rpmdrake:1401 ../rpmdrake.pm:505 ../rpmdrake.pm:595
-#: ../rpmdrake.pm:664
+#: ../edit-urpm-sources.pl:233 ../edit-urpm-sources.pl:303
+#: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
+#: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
+#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:159 ../rpmdrake:676
+#: ../rpmdrake:1418 ../rpmdrake:1426 ../rpmdrake.pm:502 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:661
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:226 ../edit-urpm-sources.pl:296
-#: ../edit-urpm-sources.pl:405 ../edit-urpm-sources.pl:457
-#: ../edit-urpm-sources.pl:545 ../edit-urpm-sources.pl:587
-#: ../edit-urpm-sources.pl:639 ../edit-urpm-sources.pl:711
-#: ../edit-urpm-sources.pl:779 ../edit-urpm-sources.pl:832
-#: ../edit-urpm-sources.pl:982 ../rpmdrake:159 ../rpmdrake:626 ../rpmdrake:646
-#: ../rpmdrake:651 ../rpmdrake:1335 ../rpmdrake:1393 ../rpmdrake:1537
-#: ../rpmdrake.pm:196 ../rpmdrake.pm:253 ../rpmdrake.pm:505
+#: ../edit-urpm-sources.pl:235 ../edit-urpm-sources.pl:305
+#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:466
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
+#: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
+#: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:159 ../rpmdrake:676 ../rpmdrake:693
+#: ../rpmdrake:698 ../rpmdrake:1360 ../rpmdrake:1418 ../rpmdrake:1561
+#: ../rpmdrake.pm:191 ../rpmdrake.pm:248 ../rpmdrake.pm:502
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../edit-urpm-sources.pl:278
+#: ../edit-urpm-sources.pl:287
 #, c-format
 msgid "Global options for package installation"
 msgstr "软件包安装的全局选项"
 
-#: ../edit-urpm-sources.pl:280
+#: ../edit-urpm-sources.pl:289
 #, c-format
 msgid "always"
 msgstr "总是"
 
-#: ../edit-urpm-sources.pl:281
+#: ../edit-urpm-sources.pl:290
 #, c-format
 msgid "never"
 msgstr "从不"
 
-#: ../edit-urpm-sources.pl:290
+#: ../edit-urpm-sources.pl:299
 #, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "校验要安装的 RPM:"
 
-#: ../edit-urpm-sources.pl:291
+#: ../edit-urpm-sources.pl:300
 #, c-format
 msgid "Download program to use:"
 msgstr "要使用的下载程序:"
 
-#: ../edit-urpm-sources.pl:321
+#: ../edit-urpm-sources.pl:330
 #, c-format
 msgid "Source Removal"
 msgstr "删除源"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:331
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "您真的想要删除源“%s”吗?"
 
-#: ../edit-urpm-sources.pl:327
+#: ../edit-urpm-sources.pl:336
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "正在删除介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:364
+#: ../edit-urpm-sources.pl:373
 #, c-format
 msgid "Edit a medium"
 msgstr "编辑介质"
 
-#: ../edit-urpm-sources.pl:370
+#: ../edit-urpm-sources.pl:379
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "编辑介质“%s”:"
 
-#: ../edit-urpm-sources.pl:384
+#: ../edit-urpm-sources.pl:393
 #, c-format
 msgid "Save changes"
 msgstr "保存修改"
 
-#: ../edit-urpm-sources.pl:392 ../edit-urpm-sources.pl:969
+#: ../edit-urpm-sources.pl:401 ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Proxy..."
 msgstr "代理服务器..."
 
-#: ../edit-urpm-sources.pl:403
+#: ../edit-urpm-sources.pl:412
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "您必须插入介质才能继续"
 
-#: ../edit-urpm-sources.pl:404
+#: ../edit-urpm-sources.pl:413
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "要保存更改，您必须在驱动器中插入介质。"
 
-#: ../edit-urpm-sources.pl:426
+#: ../edit-urpm-sources.pl:435
 #, c-format
 msgid "Configure proxies"
 msgstr "配置代理服务器"
 
-#: ../edit-urpm-sources.pl:436
+#: ../edit-urpm-sources.pl:445
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "介质“%s”的代理服务器设置"
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:446
 #, c-format
 msgid "Global proxy settings"
 msgstr "全局代理服务器设置"
 
-#: ../edit-urpm-sources.pl:439
+#: ../edit-urpm-sources.pl:448
 #, 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:442
+#: ../edit-urpm-sources.pl:451
 #, c-format
 msgid "Proxy hostname:"
 msgstr "代理服务器主机名:"
 
-#: ../edit-urpm-sources.pl:445
+#: ../edit-urpm-sources.pl:454
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
-#: ../edit-urpm-sources.pl:448
+#: ../edit-urpm-sources.pl:457
 #, c-format
 msgid "User:"
 msgstr "用户名:"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Add a parallel group"
 msgstr "添加并行组"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Edit a parallel group"
 msgstr "编辑并行组"
 
-#: ../edit-urpm-sources.pl:527
+#: ../edit-urpm-sources.pl:536
 #, c-format
 msgid "Add a medium limit"
 msgstr "添加一个介质限制"
 
-#: ../edit-urpm-sources.pl:539
+#: ../edit-urpm-sources.pl:548
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "在介质限制中选择介质进行添加:"
 
-#: ../edit-urpm-sources.pl:576
+#: ../edit-urpm-sources.pl:585
 #, c-format
 msgid "Add a host"
 msgstr "添加主机"
 
-#: ../edit-urpm-sources.pl:582
+#: ../edit-urpm-sources.pl:591
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "输入要添加的主机名或 IP 地址:"
 
-#: ../edit-urpm-sources.pl:613
+#: ../edit-urpm-sources.pl:622
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "编辑并行组“%s”:"
 
-#: ../edit-urpm-sources.pl:617
+#: ../edit-urpm-sources.pl:626
 #, c-format
 msgid "Group name:"
 msgstr "组名称:"
 
-#: ../edit-urpm-sources.pl:618
+#: ../edit-urpm-sources.pl:627
 #, c-format
 msgid "Protocol:"
 msgstr "协议:"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:629
 #, c-format
 msgid "Media limit:"
 msgstr "介质限制:"
 
-#: ../edit-urpm-sources.pl:625 ../edit-urpm-sources.pl:632
+#: ../edit-urpm-sources.pl:634 ../edit-urpm-sources.pl:641
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:633
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:947 ../rpmdrake:1131
+#: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1154
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: ../edit-urpm-sources.pl:627
+#: ../edit-urpm-sources.pl:636
 #, c-format
 msgid "Hosts:"
 msgstr "主机:"
 
-#: ../edit-urpm-sources.pl:661
+#: ../edit-urpm-sources.pl:670
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Group"
 msgstr "组"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Media limit"
 msgstr "介质限制"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:674
 #, c-format
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:675 ../rpmdrake:349 ../rpmdrake:366 ../rpmdrake:488
-#: ../rpmdrake:560
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:353 ../rpmdrake:370 ../rpmdrake:492
+#: ../rpmdrake:608
 #, c-format
 msgid "(none)"
 msgstr "(无)"
 
-#: ../edit-urpm-sources.pl:695 ../edit-urpm-sources.pl:951
+#: ../edit-urpm-sources.pl:704 ../edit-urpm-sources.pl:959
 #, c-format
 msgid "Edit"
 msgstr "编辑"
 
-#: ../edit-urpm-sources.pl:703 ../edit-urpm-sources.pl:957
+#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:965
 #, c-format
 msgid "Add..."
 msgstr "添加..."
 
-#: ../edit-urpm-sources.pl:719
+#: ../edit-urpm-sources.pl:728
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理软件包数字签名的密钥"
 
-#: ../edit-urpm-sources.pl:723 ../edit-urpm-sources.pl:866
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:874
 #, c-format
 msgid "Medium"
 msgstr "介质"
 
-#: ../edit-urpm-sources.pl:728
+#: ../edit-urpm-sources.pl:737
 #, c-format
 msgid "Keys"
 msgstr "密钥"
 
-#: ../edit-urpm-sources.pl:747
+#: ../edit-urpm-sources.pl:756
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
 
-#: ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:769
 #, c-format
 msgid "Add a key"
 msgstr "添加密钥"
 
-#: ../edit-urpm-sources.pl:773
+#: ../edit-urpm-sources.pl:781
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "选择要添加到介质 %s 中的密钥"
 
-#: ../edit-urpm-sources.pl:801
+#: ../edit-urpm-sources.pl:809
 #, c-format
 msgid "Remove a key"
 msgstr "删除密钥"
 
-#: ../edit-urpm-sources.pl:802
+#: ../edit-urpm-sources.pl:810
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -432,77 +452,77 @@ msgstr ""
 "您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
 "(密钥名称: %3$s)"
 
-#: ../edit-urpm-sources.pl:820
+#: ../edit-urpm-sources.pl:828
 #, c-format
 msgid "Add a key..."
 msgstr "添加密钥..."
 
-#: ../edit-urpm-sources.pl:824
+#: ../edit-urpm-sources.pl:832
 #, c-format
 msgid "Remove key"
 msgstr "删除密钥"
 
-#: ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:848
 #, c-format
 msgid "Configure media"
 msgstr "配置介质"
 
-#: ../edit-urpm-sources.pl:865
+#: ../edit-urpm-sources.pl:873
 #, c-format
 msgid "Enabled?"
 msgstr "启用?"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Update medium"
 msgstr "更新介质"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Regenerate hdlist"
 msgstr "重新生成 hdlist"
 
-#: ../edit-urpm-sources.pl:890 ../rpmdrake.pm:588
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:585
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "正在更新介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:894
+#: ../edit-urpm-sources.pl:902
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "正在生成 hdlist，请稍候..."
 
-#: ../edit-urpm-sources.pl:961
+#: ../edit-urpm-sources.pl:969
 #, c-format
 msgid "Add custom..."
 msgstr "添加自定义..."
 
-#: ../edit-urpm-sources.pl:965
+#: ../edit-urpm-sources.pl:973
 #, c-format
 msgid "Update..."
 msgstr "更新..."
 
-#: ../edit-urpm-sources.pl:968
+#: ../edit-urpm-sources.pl:976
 #, c-format
 msgid "Manage keys..."
 msgstr "管理密钥..."
 
-#: ../edit-urpm-sources.pl:970
+#: ../edit-urpm-sources.pl:978
 #, c-format
 msgid "Parallel..."
 msgstr "并行..."
 
-#: ../edit-urpm-sources.pl:971
+#: ../edit-urpm-sources.pl:979
 #, c-format
 msgid "Global options..."
 msgstr "全局选项..."
 
-#: ../edit-urpm-sources.pl:981
+#: ../edit-urpm-sources.pl:989
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../edit-urpm-sources.pl:993 ../gurpmi.addmedia:75 ../rpmdrake:1648
+#: ../edit-urpm-sources.pl:1001 ../gurpmi.addmedia:75 ../rpmdrake:1672
 #, c-format
 msgid ""
 "%s\n"
@@ -513,7 +533,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:996
+#: ../edit-urpm-sources.pl:1004
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -527,7 +547,7 @@ msgstr ""
 "本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
 "软件包或执行更新时使用。"
 
-#: ../edit-urpm-sources.pl:1008
+#: ../edit-urpm-sources.pl:1016
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -601,7 +621,7 @@ msgstr "压缩"
 
 #: ../rpmdrake:169 ../rpmdrake:174 ../rpmdrake:186 ../rpmdrake:197
 #: ../rpmdrake:206 ../rpmdrake:218 ../rpmdrake:230 ../rpmdrake:238
-#: ../rpmdrake:318
+#: ../rpmdrake:322
 #, c-format
 msgid "Other"
 msgstr "其它"
@@ -1054,87 +1074,147 @@ msgstr "玩具"
 msgid "Video"
 msgstr "视频"
 
-#: ../rpmdrake:372 ../rpmdrake:774 ../rpmdrake:775
+#: ../rpmdrake:376 ../rpmdrake:509 ../rpmdrake:511
 #, c-format
 msgid "(Not available)"
 msgstr "(不可用)"
 
-#: ../rpmdrake:401 ../rpmdrake:469
+#: ../rpmdrake:405 ../rpmdrake:473
 #, c-format
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../rpmdrake:401
+#: ../rpmdrake:405
 #, c-format
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake:412 ../rpmdrake:433
+#: ../rpmdrake:416 ../rpmdrake:437
 #, c-format
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
 
-#: ../rpmdrake:431 ../rpmdrake:1171 ../rpmdrake:1433 ../rpmdrake:1647
+#: ../rpmdrake:435 ../rpmdrake:1194 ../rpmdrake:1458 ../rpmdrake:1671
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:436
+#: ../rpmdrake:440
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Addable"
 msgstr "可添加"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Not selected"
 msgstr "未选中"
 
 #: ../rpmdrake:506
 #, c-format
+msgid "Files:\n"
+msgstr "文件:\n"
+
+#: ../rpmdrake:511
+#, c-format
+msgid "Changelog:\n"
+msgstr "更新日志:\n"
+
+#: ../rpmdrake:516
+#, c-format
+msgid "Medium: "
+msgstr "介质:"
+
+#: ../rpmdrake:518
+#, c-format
+msgid "Currently installed version: "
+msgstr "当前安装的版本:"
+
+#: ../rpmdrake:526
+#, c-format
+msgid "Name: "
+msgstr "名称:"
+
+#: ../rpmdrake:527
+#, c-format
+msgid "Version: "
+msgstr "版本: "
+
+#: ../rpmdrake:528
+#, c-format
+msgid "Size: "
+msgstr "大小: "
+
+#: ../rpmdrake:528
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:531
+#, c-format
+msgid "Importance: "
+msgstr "重要性:"
+
+#: ../rpmdrake:534
+#, c-format
+msgid "Summary: "
+msgstr "摘要:"
+
+#: ../rpmdrake:537
+#, c-format
+msgid "Reason for update: "
+msgstr "更新原因:"
+
+#: ../rpmdrake:539
+#, c-format
+msgid "Description: "
+msgstr "描述:"
+
+#: ../rpmdrake:554
+#, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:524 ../rpmdrake:639 ../rpmdrake:642 ../rpmdrake:1527
+#: ../rpmdrake:571 ../rpmdrake:689 ../rpmdrake:691 ../rpmdrake:1551
 #, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../rpmdrake:545
+#: ../rpmdrake:593
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake:562
+#: ../rpmdrake:610
 #, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake:563
+#: ../rpmdrake:611
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1144,28 +1224,28 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../rpmdrake:583
+#: ../rpmdrake:632
 #, c-format
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:626 ../rpmdrake:631
+#: ../rpmdrake:676 ../rpmdrake:681
 #, c-format
 msgid "More info"
 msgstr "更多信息"
 
-#: ../rpmdrake:634 ../rpmdrake:1516
+#: ../rpmdrake:684 ../rpmdrake:1540
 #, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../rpmdrake:659
+#: ../rpmdrake:706
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake:660
+#: ../rpmdrake:707
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1175,12 +1255,12 @@ msgstr ""
 "为了满足所有的依赖关系，需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:666 ../rpmdrake:675
+#: ../rpmdrake:713 ../rpmdrake:722
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake:667
+#: ../rpmdrake:714
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1189,7 +1269,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../rpmdrake:676 ../rpmdrake:737
+#: ../rpmdrake:723 ../rpmdrake:785
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1199,12 +1279,12 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:752
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake:706
+#: ../rpmdrake:753
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1214,17 +1294,17 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:720
+#: ../rpmdrake:768
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (属于跳过列表)"
 
-#: ../rpmdrake:722
+#: ../rpmdrake:770
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:771
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1235,177 +1315,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:736 ../rpmdrake:1025
+#: ../rpmdrake:784 ../rpmdrake:1048
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake:758
+#: ../rpmdrake:807
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中软件: %d MB / 剩余磁盘空间: %d MB"
 
-#: ../rpmdrake:760
+#: ../rpmdrake:809
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中大小: %d MB"
 
-#: ../rpmdrake:766
+#: ../rpmdrake:814
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "此软件包的描述不可用\n"
 
-#: ../rpmdrake:772
-#, c-format
-msgid "Files:\n"
-msgstr "文件:\n"
-
-#: ../rpmdrake:775
-#, c-format
-msgid "Changelog:\n"
-msgstr "更新日志:\n"
-
-#: ../rpmdrake:777
-#, c-format
-msgid "Medium: "
-msgstr "介质:"
-
-#: ../rpmdrake:779
-#, c-format
-msgid "Currently installed version: "
-msgstr "当前安装的版本:"
-
-#: ../rpmdrake:784
-#, c-format
-msgid "Name: "
-msgstr "名称:"
-
-#: ../rpmdrake:785
-#, c-format
-msgid "Version: "
-msgstr "版本: "
-
-#: ../rpmdrake:786
-#, c-format
-msgid "Size: "
-msgstr "大小: "
-
-#: ../rpmdrake:786
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:788
-#, c-format
-msgid "Importance: "
-msgstr "重要性:"
-
-#: ../rpmdrake:790
-#, c-format
-msgid "Summary: "
-msgstr "摘要:"
-
-#: ../rpmdrake:792
-#, c-format
-msgid "Reason for update: "
-msgstr "更新原因:"
-
-#: ../rpmdrake:794
+#: ../rpmdrake:881
 #, c-format
-msgid "Description: "
-msgstr "描述:"
+msgid "Security updates"
+msgstr "安全更新"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "%s choices"
 msgstr "%s 精选"
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux 精选"
 
-#: ../rpmdrake:881
+#: ../rpmdrake:904
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按照字母次序排列"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:912
 #, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按照组别排列"
 
-#: ../rpmdrake:890
+#: ../rpmdrake:913
 #, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:891
+#: ../rpmdrake:914
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:895
+#: ../rpmdrake:918
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全部软件包，按照介质库排列"
 
-#: ../rpmdrake:896
+#: ../rpmdrake:919
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:900
+#: ../rpmdrake:923
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "只剩下，按安装日期排序"
 
-#: ../rpmdrake:974
+#: ../rpmdrake:997
 #, c-format
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:976
+#: ../rpmdrake:999
 #, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:978
+#: ../rpmdrake:1001
 #, c-format
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Normal information"
 msgstr "正常信息"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Maximum information"
 msgstr "最多信息"
 
-#: ../rpmdrake:1007
+#: ../rpmdrake:1030
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
-#: ../rpmdrake:1012
+#: ../rpmdrake:1035
 #, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../rpmdrake:1013
+#: ../rpmdrake:1036
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1420,7 +1445,7 @@ msgstr ""
 "\n"
 "您真的想要安装所有选中的软件包吗?"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1049
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1435,93 +1460,93 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1059
+#: ../rpmdrake:1082
 #, c-format
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1083
 #, c-format
 msgid "Software Packages Update"
 msgstr "软件包更新"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1084
 #, c-format
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake:1067 ../rpmdrake:1070 ../rpmdrake:1079 ../rpmdrake:1090
-#: ../rpmdrake:1095
+#: ../rpmdrake:1090 ../rpmdrake:1093 ../rpmdrake:1102 ../rpmdrake:1113
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../rpmdrake:1070
+#: ../rpmdrake:1093
 #, c-format
 msgid "/_Update media"
 msgstr "/更新介质(_U)"
 
-#: ../rpmdrake:1079
+#: ../rpmdrake:1102
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/重置选中内容(_R)"
 
-#: ../rpmdrake:1090
+#: ../rpmdrake:1113
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新装入软件包清单(_P)"
 
-#: ../rpmdrake:1095
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../rpmdrake:1096
+#: ../rpmdrake:1119
 #, c-format
 msgid "/_View"
 msgstr "查看(_V)"
 
-#: ../rpmdrake:1098 ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1121 ../rpmdrake:1122 ../rpmdrake:1129
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1122 ../rpmdrake:1129
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/自动显示选中的软件包(_S)"
 
-#: ../rpmdrake:1103 ../rpmdrake:1104
+#: ../rpmdrake:1126 ../rpmdrake:1127
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../rpmdrake:1120
+#: ../rpmdrake:1143
 #, c-format
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1148
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake:1131
+#: ../rpmdrake:1154
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake:1163
+#: ../rpmdrake:1186
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../rpmdrake:1164
+#: ../rpmdrake:1187
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: ../rpmdrake:1172
+#: ../rpmdrake:1195
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1534,12 +1559,12 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1204
 #, c-format
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1205
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1555,12 +1580,12 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1192
+#: ../rpmdrake:1215
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../rpmdrake:1193
+#: ../rpmdrake:1216
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1574,62 +1599,62 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1224
+#: ../rpmdrake:1249
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1272
+#: ../rpmdrake:1297
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake:1291
+#: ../rpmdrake:1316
 #, c-format
 msgid "changes:"
 msgstr "更改:"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1320
 #, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake:1297
+#: ../rpmdrake:1322
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1324
 #, c-format
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake:1312
+#: ../rpmdrake:1337
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake:1327
+#: ../rpmdrake:1352
 #, c-format
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake:1356 ../rpmdrake:1512
+#: ../rpmdrake:1381 ../rpmdrake:1536
 #, c-format
 msgid "Everything installed successfully"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake:1357 ../rpmdrake:1513
+#: ../rpmdrake:1382 ../rpmdrake:1537
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake:1359 ../rpmdrake:1497
+#: ../rpmdrake:1384 ../rpmdrake:1521
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake:1360 ../rpmdrake:1498 ../rpmdrake:1553
+#: ../rpmdrake:1385 ../rpmdrake:1522 ../rpmdrake:1577
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1640,17 +1665,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1373
+#: ../rpmdrake:1398
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1399
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../rpmdrake:1375 ../rpmdrake:1444
+#: ../rpmdrake:1400 ../rpmdrake:1469
 #, c-format
 msgid ""
 "\n"
@@ -1663,37 +1688,37 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../rpmdrake:1391
+#: ../rpmdrake:1416
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../rpmdrake:1392
+#: ../rpmdrake:1417
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake:1399
+#: ../rpmdrake:1424
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1422
+#: ../rpmdrake:1447
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../rpmdrake:1434
+#: ../rpmdrake:1459
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1708,12 +1733,12 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../rpmdrake:1441 ../rpmdrake:1552
+#: ../rpmdrake:1466 ../rpmdrake:1576
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake:1442
+#: ../rpmdrake:1467
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1726,22 +1751,22 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../rpmdrake:1456
+#: ../rpmdrake:1480
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../rpmdrake:1459
+#: ../rpmdrake:1483
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1475
+#: ../rpmdrake:1499
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件 [%s]"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1754,47 +1779,47 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid "everything was installed correctly"
 msgstr "所有软件包都已正确安装"
 
-#: ../rpmdrake:1518
+#: ../rpmdrake:1542
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../rpmdrake:1530
+#: ../rpmdrake:1554
 #, c-format
 msgid "More information on package... [%s]"
 msgstr "该软件包的更多信息...[%s]"
 
-#: ../rpmdrake:1543
+#: ../rpmdrake:1567
 #, c-format
 msgid "No package found for installation."
 msgstr "没有可供安装的软件包。"
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1568
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1590
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "正在读取软件包数据库，请稍候..."
 
-#: ../rpmdrake:1613
+#: ../rpmdrake:1637
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake:1618
+#: ../rpmdrake:1642
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../rpmdrake:1619
+#: ../rpmdrake:1643
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1805,7 +1830,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1652
+#: ../rpmdrake:1676
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1817,7 +1842,7 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../rpmdrake:1657
+#: ../rpmdrake:1681
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1829,12 +1854,12 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1662
+#: ../rpmdrake:1686
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "欢迎使用软件安装工具!"
 
-#: ../rpmdrake:1663
+#: ../rpmdrake:1687
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1848,183 +1873,183 @@ msgstr ""
 "您的 Mandrakelinux 的安装光盘包含有数千个软件包。\n"
 "本工具将帮助您选择要为您的电脑安装的软件包。"
 
-#: ../rpmdrake.pm:95
+#: ../rpmdrake.pm:93
 #, c-format
 msgid "Software Update"
 msgstr "软件更新"
 
-#: ../rpmdrake.pm:95
+#: ../rpmdrake.pm:93
 #, c-format
 msgid "Mandrakelinux Update"
 msgstr "Mandrakelinux Update"
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:191
+#: ../rpmdrake.pm:186
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:239
+#: ../rpmdrake.pm:234
 #, c-format
 msgid "Info..."
 msgstr "信息..."
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:321
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Germany"
 msgstr "德国"
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake.pm:325 ../rpmdrake.pm:329
+#: ../rpmdrake.pm:320 ../rpmdrake.pm:324
 #, c-format
 msgid "Greece"
 msgstr "希腊"
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:322
 #, c-format
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:323
 #, c-format
 msgid "France"
 msgstr "法国"
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:325
 #, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:326
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:327
 #, c-format
 msgid "Italy"
 msgstr "意大利"
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:328
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:329
 #, c-format
 msgid "Korea"
 msgstr "韩国"
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:330
 #, c-format
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:331
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:332
 #, c-format
 msgid "Poland"
 msgstr "波兰"
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:333
 #, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:334
 #, c-format
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:335
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:341
+#: ../rpmdrake.pm:336
 #, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:342
+#: ../rpmdrake.pm:337
 #, c-format
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../rpmdrake.pm:343
+#: ../rpmdrake.pm:338
 #, c-format
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../rpmdrake.pm:344
+#: ../rpmdrake.pm:339
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:345 ../rpmdrake.pm:346 ../rpmdrake.pm:347 ../rpmdrake.pm:348
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:340 ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "United States"
 msgstr "美国"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:431
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2037,7 +2062,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:435
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -2050,23 +2075,23 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:441
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "请稍候，正在下载镜像地址。"
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:442
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "正在从 Mandrakesoft 网站下载镜像站点的地址，请稍候。"
 
-#: ../rpmdrake.pm:451
+#: ../rpmdrake.pm:448
 #, c-format
 msgid "Error during download"
 msgstr "下载出错"
 
-#: ../rpmdrake.pm:453
+#: ../rpmdrake.pm:450
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2081,7 +2106,7 @@ msgstr ""
 "您的网络或网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:458
+#: ../rpmdrake.pm:455
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2096,17 +2121,17 @@ msgstr ""
 "您的网络或 Mandrakesoft 网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:467
+#: ../rpmdrake.pm:464
 #, c-format
 msgid "No mirror"
 msgstr "无镜像"
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:466
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "找不到适合的任何镜像。"
 
-#: ../rpmdrake.pm:470
+#: ../rpmdrake.pm:467
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2119,63 +2144,63 @@ msgstr ""
 "此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandrakelinux\n"
 "官方更新所支持。"
 
-#: ../rpmdrake.pm:489
+#: ../rpmdrake.pm:486
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm:548
+#: ../rpmdrake.pm:545
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
-#: ../rpmdrake.pm:551
+#: ../rpmdrake.pm:548
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在检查介质“%s”的文件..."
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:551
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在检查介质“%s”的远程文件..."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:555
 #, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:559
 #, c-format
 msgid " failed!"
 msgstr " 失败!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:566
+#: ../rpmdrake.pm:563
 #, c-format
 msgid "%s from medium %s"
 msgstr "介质 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:570
+#: ../rpmdrake.pm:567
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在开始下载“%s”..."
 
-#: ../rpmdrake.pm:574
+#: ../rpmdrake.pm:571
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
-#: ../rpmdrake.pm:577
+#: ../rpmdrake.pm:574
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Error retrieving packages"
 msgstr "获取软件包出错"
 
-#: ../rpmdrake.pm:615
+#: ../rpmdrake.pm:612
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2189,27 +2214,27 @@ msgstr ""
 "管理器中删除此介质，然后重新添加以进行重新配置。另外一种情况可能是，该介质目"
 "前不可用，您应该稍后再试。"
 
-#: ../rpmdrake.pm:646
+#: ../rpmdrake.pm:643
 #, c-format
 msgid "Update media"
 msgstr "更新介质"
 
-#: ../rpmdrake.pm:654
+#: ../rpmdrake.pm:651
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
-#: ../rpmdrake.pm:668
+#: ../rpmdrake.pm:665
 #, c-format
 msgid "Select all"
 msgstr "全选"
 
-#: ../rpmdrake.pm:672
+#: ../rpmdrake.pm:669
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:694
+#: ../rpmdrake.pm:691
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2222,7 +2247,7 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:718 ../rpmdrake.pm:727
+#: ../rpmdrake.pm:715 ../rpmdrake.pm:724
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2233,17 +2258,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:736
 #, c-format
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:741
 #, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:745
+#: ../rpmdrake.pm:742
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2254,7 +2279,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:758
+#: ../rpmdrake.pm:755
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2264,7 +2289,7 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 %s 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:761
+#: ../rpmdrake.pm:758
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2274,12 +2299,12 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 Mandrakelinux 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:774
 #, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../rpmdrake.pm:778
+#: ../rpmdrake.pm:775
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -2554,3 +2579,6 @@ msgstr "删除软件"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
+
+#~ msgid "Choose a mirror..."
+#~ msgstr "选择镜像..."