Merge message, new French translations

1 files changed, 203 insertions, 159 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed534577..09c15946 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: 2004-11-26 13:51+0100\n"
+"POT-Creation-Date: 2004-12-02 11:22+0100\n"
 "PO-Revision-Date: 2004-08-15 05:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -40,7 +40,7 @@ msgid "FTP server"
 msgstr "FTP 服务器"
 
 #: ../edit-urpm-sources.pl:65 ../edit-urpm-sources.pl:66
-#: ../edit-urpm-sources.pl:68 ../edit-urpm-sources.pl:220
+#: ../edit-urpm-sources.pl:68 ../edit-urpm-sources.pl:320
 #, c-format
 msgid "URL:"
 msgstr "URL:"
@@ -65,311 +65,341 @@ msgstr "路径或挂载点:"
 msgid "Security updates"
 msgstr "安全更新"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:84
 #, c-format
 msgid "Browse..."
 msgstr "浏览..."
 
-#: ../edit-urpm-sources.pl:82
+#: ../edit-urpm-sources.pl:91
 #, c-format
 msgid "Choose a mirror..."
 msgstr "选择镜像..."
 
-#: ../edit-urpm-sources.pl:109
+#: ../edit-urpm-sources.pl:129
 #, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../edit-urpm-sources.pl:109 ../edit-urpm-sources.pl:297
+#: ../edit-urpm-sources.pl:129 ../edit-urpm-sources.pl:397
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../edit-urpm-sources.pl:114
-#, c-format
-msgid "Name:"
-msgstr "名称:"
-
-#: ../edit-urpm-sources.pl:118 ../edit-urpm-sources.pl:221
+#: ../edit-urpm-sources.pl:134 ../edit-urpm-sources.pl:321
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "综合文件/hdlist 的相对路径:"
 
-#: ../edit-urpm-sources.pl:119
+#: ../edit-urpm-sources.pl:136
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "如果留空, 将会自动探测综合文件/hdlist"
 
-#: ../edit-urpm-sources.pl:127
+#: ../edit-urpm-sources.pl:141
+#, c-format
+msgid "Name:"
+msgstr "名称:"
+
+#: ../edit-urpm-sources.pl:154
+#, c-format
+msgid "Create media for a whole distribution"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:173
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少要填写头两项。"
 
-#: ../edit-urpm-sources.pl:131
+#: ../edit-urpm-sources.pl:177
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "已经有该名称的介质，您真的想要替换吗?"
 
-#: ../edit-urpm-sources.pl:142
+#: ../edit-urpm-sources.pl:188
 #, c-format
 msgid "Adding a medium:"
 msgstr "添加一个介质:"
 
-#: ../edit-urpm-sources.pl:143
+#: ../edit-urpm-sources.pl:189
 #, c-format
 msgid "Type of medium:"
 msgstr "介质类型:"
 
-#: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:227
-#: ../edit-urpm-sources.pl:252 ../edit-urpm-sources.pl:314
-#: ../edit-urpm-sources.pl:394 ../edit-urpm-sources.pl:428
-#: ../edit-urpm-sources.pl:475 ../edit-urpm-sources.pl:594 ../rpmdrake:99
-#: ../rpmdrake:544 ../rpmdrake:1338 ../rpmdrake:1346 ../rpmdrake.pm:479
-#: ../rpmdrake.pm:616
+#: ../edit-urpm-sources.pl:194 ../edit-urpm-sources.pl:264
+#: ../edit-urpm-sources.pl:327 ../edit-urpm-sources.pl:352
+#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:495
+#: ../edit-urpm-sources.pl:535 ../edit-urpm-sources.pl:593
+#: ../edit-urpm-sources.pl:733 ../rpmdrake:99 ../rpmdrake:544 ../rpmdrake:1341
+#: ../rpmdrake:1349 ../rpmdrake.pm:479 ../rpmdrake.pm:561 ../rpmdrake.pm:632
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:150 ../edit-urpm-sources.pl:252
-#: ../edit-urpm-sources.pl:304 ../edit-urpm-sources.pl:389
-#: ../edit-urpm-sources.pl:427 ../edit-urpm-sources.pl:468
-#: ../edit-urpm-sources.pl:525 ../edit-urpm-sources.pl:589
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:762 ../rpmdrake:99
-#: ../rpmdrake:544 ../rpmdrake:562 ../rpmdrake:567 ../rpmdrake:1273
-#: ../rpmdrake:1338 ../rpmdrake:1479 ../rpmdrake.pm:189 ../rpmdrake.pm:238
-#: ../rpmdrake.pm:479
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:266
+#: ../edit-urpm-sources.pl:352 ../edit-urpm-sources.pl:404
+#: ../edit-urpm-sources.pl:492 ../edit-urpm-sources.pl:534
+#: ../edit-urpm-sources.pl:586 ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:726 ../edit-urpm-sources.pl:779
+#: ../edit-urpm-sources.pl:929 ../rpmdrake:99 ../rpmdrake:544 ../rpmdrake:562
+#: ../rpmdrake:567 ../rpmdrake:1276 ../rpmdrake:1341 ../rpmdrake:1482
+#: ../rpmdrake.pm:189 ../rpmdrake.pm:238 ../rpmdrake.pm:479
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../edit-urpm-sources.pl:192
+#: ../edit-urpm-sources.pl:248
+#, fuzzy, c-format
+msgid "Global options for package installation"
+msgstr "准备安装软件包..."
+
+#: ../edit-urpm-sources.pl:250
+#, c-format
+msgid "always"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:251
+#, fuzzy, c-format
+msgid "never"
+msgstr "服务器"
+
+#: ../edit-urpm-sources.pl:260
+#, fuzzy, c-format
+msgid "Verify RPMs to be installed:"
+msgstr "有些软件包无法安装"
+
+#: ../edit-urpm-sources.pl:261
+#, fuzzy, c-format
+msgid "Download program to use:"
+msgstr "下载“%s”，速度: %s"
+
+#: ../edit-urpm-sources.pl:291
 #, c-format
 msgid "Source Removal"
 msgstr "删除源"
 
-#: ../edit-urpm-sources.pl:193
+#: ../edit-urpm-sources.pl:292
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "您真的想要删除源“%s”吗?"
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:297
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "正在删除介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:211
+#: ../edit-urpm-sources.pl:311
 #, c-format
 msgid "Edit a medium"
 msgstr "编辑介质"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:317
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "编辑介质“%s”:"
 
-#: ../edit-urpm-sources.pl:231
+#: ../edit-urpm-sources.pl:331
 #, c-format
 msgid "Save changes"
 msgstr "保存修改"
 
-#: ../edit-urpm-sources.pl:239 ../edit-urpm-sources.pl:747
+#: ../edit-urpm-sources.pl:339 ../edit-urpm-sources.pl:913
 #, c-format
 msgid "Proxy..."
 msgstr "代理服务器..."
 
-#: ../edit-urpm-sources.pl:250
+#: ../edit-urpm-sources.pl:350
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "您必须插入介质才能继续"
 
-#: ../edit-urpm-sources.pl:251
+#: ../edit-urpm-sources.pl:351
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "要保存更改，您必须在驱动器中插入介质。"
 
-#: ../edit-urpm-sources.pl:273
+#: ../edit-urpm-sources.pl:373
 #, c-format
 msgid "Configure proxies"
 msgstr "配置代理服务器"
 
-#: ../edit-urpm-sources.pl:283
+#: ../edit-urpm-sources.pl:383
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "介质“%s”的代理服务器设置"
 
-#: ../edit-urpm-sources.pl:284
+#: ../edit-urpm-sources.pl:384
 #, c-format
 msgid "Global proxy settings"
 msgstr "全局代理服务器设置"
 
-#: ../edit-urpm-sources.pl:286
+#: ../edit-urpm-sources.pl:386
 #, 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:289
+#: ../edit-urpm-sources.pl:389
 #, c-format
 msgid "Proxy hostname:"
 msgstr "代理服务器主机名:"
 
-#: ../edit-urpm-sources.pl:292
+#: ../edit-urpm-sources.pl:392
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
-#: ../edit-urpm-sources.pl:295
+#: ../edit-urpm-sources.pl:395
 #, c-format
 msgid "User:"
 msgstr "用户名:"
 
-#: ../edit-urpm-sources.pl:364
+#: ../edit-urpm-sources.pl:463
 #, c-format
 msgid "Add a parallel group"
 msgstr "添加并行组"
 
-#: ../edit-urpm-sources.pl:364
+#: ../edit-urpm-sources.pl:463
 #, c-format
 msgid "Edit a parallel group"
 msgstr "编辑并行组"
 
-#: ../edit-urpm-sources.pl:375
+#: ../edit-urpm-sources.pl:474
 #, c-format
 msgid "Add a medium limit"
 msgstr "添加一个介质限制"
 
-#: ../edit-urpm-sources.pl:385
+#: ../edit-urpm-sources.pl:486
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "在介质限制中选择介质进行添加:"
 
-#: ../edit-urpm-sources.pl:419
+#: ../edit-urpm-sources.pl:523
 #, c-format
 msgid "Add a host"
 msgstr "添加主机"
 
-#: ../edit-urpm-sources.pl:423
+#: ../edit-urpm-sources.pl:529
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "输入要添加的主机名或 IP 地址:"
 
-#: ../edit-urpm-sources.pl:447
+#: ../edit-urpm-sources.pl:560
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "编辑并行组“%s”:"
 
-#: ../edit-urpm-sources.pl:449
+#: ../edit-urpm-sources.pl:564
 #, c-format
 msgid "Group name:"
 msgstr "组名称:"
 
-#: ../edit-urpm-sources.pl:450
+#: ../edit-urpm-sources.pl:565
 #, c-format
 msgid "Protocol:"
 msgstr "协议:"
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:567
 #, c-format
 msgid "Media limit:"
 msgstr "介质限制:"
 
-#: ../edit-urpm-sources.pl:457 ../edit-urpm-sources.pl:464
+#: ../edit-urpm-sources.pl:572 ../edit-urpm-sources.pl:579
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: ../edit-urpm-sources.pl:458 ../edit-urpm-sources.pl:465
-#: ../edit-urpm-sources.pl:514 ../edit-urpm-sources.pl:729 ../rpmdrake:1057
+#: ../edit-urpm-sources.pl:573 ../edit-urpm-sources.pl:580
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:895 ../rpmdrake:1060
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:574
 #, c-format
 msgid "Hosts:"
 msgstr "主机:"
 
-#: ../edit-urpm-sources.pl:489
+#: ../edit-urpm-sources.pl:608
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
-#: ../edit-urpm-sources.pl:492
+#: ../edit-urpm-sources.pl:611
 #, c-format
 msgid "Group"
 msgstr "组"
 
-#: ../edit-urpm-sources.pl:492
+#: ../edit-urpm-sources.pl:611
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: ../edit-urpm-sources.pl:492
+#: ../edit-urpm-sources.pl:611
 #, c-format
 msgid "Media limit"
 msgstr "介质限制"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:612
 #, c-format
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:503 ../rpmdrake:280 ../rpmdrake:296 ../rpmdrake:406
+#: ../edit-urpm-sources.pl:622 ../rpmdrake:280 ../rpmdrake:296 ../rpmdrake:406
 #: ../rpmdrake:478
 #, c-format
 msgid "(none)"
 msgstr "(无)"
 
-#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:733
+#: ../edit-urpm-sources.pl:642 ../edit-urpm-sources.pl:899
 #, c-format
 msgid "Edit"
 msgstr "编辑"
 
-#: ../edit-urpm-sources.pl:521 ../edit-urpm-sources.pl:739
+#: ../edit-urpm-sources.pl:650 ../edit-urpm-sources.pl:905
 #, c-format
 msgid "Add..."
 msgstr "添加..."
 
-#: ../edit-urpm-sources.pl:533
+#: ../edit-urpm-sources.pl:666
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理软件包数字签名的密钥"
 
-#: ../edit-urpm-sources.pl:537 ../edit-urpm-sources.pl:657
+#: ../edit-urpm-sources.pl:670 ../edit-urpm-sources.pl:814
 #, c-format
 msgid "Medium"
 msgstr "介质"
 
-#: ../edit-urpm-sources.pl:542
+#: ../edit-urpm-sources.pl:675
 #, c-format
 msgid "Keys"
 msgstr "密钥"
 
-#: ../edit-urpm-sources.pl:561
+#: ../edit-urpm-sources.pl:694
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
 
-#: ../edit-urpm-sources.pl:575
+#: ../edit-urpm-sources.pl:708
 #, c-format
 msgid "Add a key"
 msgstr "添加密钥"
 
-#: ../edit-urpm-sources.pl:585
+#: ../edit-urpm-sources.pl:720
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "选择要添加到介质 %s 中的密钥"
 
-#: ../edit-urpm-sources.pl:606
+#: ../edit-urpm-sources.pl:748
 #, c-format
 msgid "Remove a key"
 msgstr "删除密钥"
 
-#: ../edit-urpm-sources.pl:607
+#: ../edit-urpm-sources.pl:749
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -378,78 +408,83 @@ msgstr ""
 "您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
 "(密钥名称: %3$s)"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:767
 #, c-format
 msgid "Add a key..."
 msgstr "添加密钥..."
 
-#: ../edit-urpm-sources.pl:622
+#: ../edit-urpm-sources.pl:771
 #, c-format
 msgid "Remove key"
 msgstr "删除密钥"
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:788
 #, c-format
 msgid "Configure media"
 msgstr "配置介质"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:813
 #, c-format
 msgid "Enabled?"
 msgstr "启用?"
 
-#: ../edit-urpm-sources.pl:667
+#: ../edit-urpm-sources.pl:826
 #, c-format
 msgid "Update medium"
 msgstr "更新介质"
 
-#: ../edit-urpm-sources.pl:667
+#: ../edit-urpm-sources.pl:826
 #, c-format
 msgid "Regenerate hdlist"
 msgstr "重新生成 hdlist"
 
-#: ../edit-urpm-sources.pl:679 ../rpmdrake.pm:553
+#: ../edit-urpm-sources.pl:838 ../rpmdrake.pm:554
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "正在更新介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:842
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "正在生成 hdlist，请稍候..."
 
-#: ../edit-urpm-sources.pl:743
+#: ../edit-urpm-sources.pl:909
 #, c-format
 msgid "Update..."
 msgstr "更新..."
 
-#: ../edit-urpm-sources.pl:746
+#: ../edit-urpm-sources.pl:912
 #, c-format
 msgid "Manage keys..."
 msgstr "管理密钥..."
 
-#: ../edit-urpm-sources.pl:748
+#: ../edit-urpm-sources.pl:914
 #, c-format
 msgid "Parallel..."
 msgstr "并行..."
 
-#: ../edit-urpm-sources.pl:754 ../rpmdrake:1049
+#: ../edit-urpm-sources.pl:915
+#, fuzzy, c-format
+msgid "Global options..."
+msgstr "全局代理服务器设置"
+
+#: ../edit-urpm-sources.pl:921 ../rpmdrake:1051
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../edit-urpm-sources.pl:757 ../rpmdrake:1052
+#: ../edit-urpm-sources.pl:924 ../rpmdrake:1054
 #, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../edit-urpm-sources.pl:758 ../rpmdrake:1053
+#: ../edit-urpm-sources.pl:925 ../rpmdrake:1055
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "已经启动帮助窗口，稍后桌面上将会出现。"
 
-#: ../edit-urpm-sources.pl:774 ../gurpmi.addmedia:75 ../rpmdrake:1590
+#: ../edit-urpm-sources.pl:941 ../gurpmi.addmedia:75 ../rpmdrake:1593
 #, c-format
 msgid ""
 "%s\n"
@@ -460,7 +495,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:777
+#: ../edit-urpm-sources.pl:944
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -474,7 +509,7 @@ msgstr ""
 "本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
 "软件包或执行更新时使用。"
 
-#: ../edit-urpm-sources.pl:789
+#: ../edit-urpm-sources.pl:956
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -1021,7 +1056,7 @@ msgstr "搜索结果(无)"
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
 
-#: ../rpmdrake:349 ../rpmdrake:1119 ../rpmdrake:1375 ../rpmdrake:1589
+#: ../rpmdrake:349 ../rpmdrake:1122 ../rpmdrake:1378 ../rpmdrake:1592
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
@@ -1056,8 +1091,7 @@ msgstr "未选中"
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:442 ../rpmdrake:557 ../rpmdrake:559 ../rpmdrake:1469
-#: ../rpmdrake:1472
+#: ../rpmdrake:442 ../rpmdrake:557 ../rpmdrake:559 ../rpmdrake:1472
 #, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
@@ -1103,7 +1137,7 @@ msgstr "全部"
 msgid "More info"
 msgstr "更多信息"
 
-#: ../rpmdrake:552 ../rpmdrake:1458
+#: ../rpmdrake:552 ../rpmdrake:1461
 #, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
@@ -1343,7 +1377,7 @@ msgstr "重置选中内容"
 msgid "Reload the packages list"
 msgstr "重新装入软件包清单"
 
-#: ../rpmdrake:909 ../rpmdrake:1061 ../rpmdrake.pm:596
+#: ../rpmdrake:909 ../rpmdrake:1064 ../rpmdrake.pm:612
 #, c-format
 msgid "Update media"
 msgstr "更新介质"
@@ -1428,27 +1462,27 @@ msgstr "搜索"
 msgid "Show automatically selected packages"
 msgstr "自动显示选中的软件包"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1060
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake:1073
+#: ../rpmdrake:1076
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../rpmdrake:1111
+#: ../rpmdrake:1114
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../rpmdrake:1112
+#: ../rpmdrake:1115
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: ../rpmdrake:1120
+#: ../rpmdrake:1123
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1461,12 +1495,12 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1129
+#: ../rpmdrake:1132
 #, c-format
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../rpmdrake:1130
+#: ../rpmdrake:1133
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1482,12 +1516,12 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1140
+#: ../rpmdrake:1143
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../rpmdrake:1141
+#: ../rpmdrake:1144
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1501,62 +1535,62 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1170
+#: ../rpmdrake:1173
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1218
+#: ../rpmdrake:1221
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake:1237
+#: ../rpmdrake:1240
 #, c-format
 msgid "changes:"
 msgstr "更改:"
 
-#: ../rpmdrake:1241
+#: ../rpmdrake:1244
 #, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake:1243
+#: ../rpmdrake:1246
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake:1245
+#: ../rpmdrake:1248
 #, c-format
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake:1257
+#: ../rpmdrake:1260
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake:1267
+#: ../rpmdrake:1270
 #, c-format
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake:1293 ../rpmdrake:1454
+#: ../rpmdrake:1296 ../rpmdrake:1457
 #, c-format
 msgid "Everything installed successfully"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake:1294 ../rpmdrake:1455
+#: ../rpmdrake:1297 ../rpmdrake:1458
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake:1296 ../rpmdrake:1439
+#: ../rpmdrake:1299 ../rpmdrake:1442
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake:1297 ../rpmdrake:1440 ../rpmdrake:1495
+#: ../rpmdrake:1300 ../rpmdrake:1443 ../rpmdrake:1498
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1567,17 +1601,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1321
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake:1319
+#: ../rpmdrake:1322
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../rpmdrake:1320 ../rpmdrake:1386
+#: ../rpmdrake:1323 ../rpmdrake:1389
 #, c-format
 msgid ""
 "\n"
@@ -1590,37 +1624,37 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../rpmdrake:1327
+#: ../rpmdrake:1330
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../rpmdrake:1327
+#: ../rpmdrake:1330
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../rpmdrake:1336
+#: ../rpmdrake:1339
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../rpmdrake:1337
+#: ../rpmdrake:1340
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake:1344
+#: ../rpmdrake:1347
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1367
+#: ../rpmdrake:1370
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../rpmdrake:1376
+#: ../rpmdrake:1379
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1635,12 +1669,12 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../rpmdrake:1383 ../rpmdrake:1494
+#: ../rpmdrake:1386 ../rpmdrake:1497
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake:1384
+#: ../rpmdrake:1387
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1653,22 +1687,22 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../rpmdrake:1398
+#: ../rpmdrake:1401
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../rpmdrake:1401
+#: ../rpmdrake:1404
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1420
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件 [%s]"
 
-#: ../rpmdrake:1452
+#: ../rpmdrake:1455
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1681,42 +1715,47 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../rpmdrake:1452
+#: ../rpmdrake:1455
 #, c-format
 msgid "everything was installed correctly"
 msgstr "所有软件包都已正确安装"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1463
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../rpmdrake:1485
+#: ../rpmdrake:1475
+#, fuzzy, c-format
+msgid "More information on package... [%s]"
+msgstr "该软件包的更多信息..."
+
+#: ../rpmdrake:1488
 #, c-format
 msgid "No package found for installation."
 msgstr "没有可供安装的软件包。"
 
-#: ../rpmdrake:1486
+#: ../rpmdrake:1489
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../rpmdrake:1508
+#: ../rpmdrake:1511
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "正在读取软件包数据库，请稍候..."
 
-#: ../rpmdrake:1555
+#: ../rpmdrake:1558
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake:1560
+#: ../rpmdrake:1563
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../rpmdrake:1561
+#: ../rpmdrake:1564
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1727,7 +1766,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1594
+#: ../rpmdrake:1597
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1739,7 +1778,7 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../rpmdrake:1599
+#: ../rpmdrake:1602
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1751,12 +1790,12 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1604
+#: ../rpmdrake:1607
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1605
+#: ../rpmdrake:1608
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -2092,12 +2131,12 @@ msgstr "下载“%s”，剩余时间: %s，速度: %s"
 msgid "Download of `%s', speed:%s"
 msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:565
+#: ../rpmdrake.pm:580
 #, c-format
 msgid "Error retrieving packages"
 msgstr "获取软件包出错"
 
-#: ../rpmdrake.pm:566
+#: ../rpmdrake.pm:581
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2111,17 +2150,22 @@ msgstr ""
 "管理器中删除此介质，然后重新添加以进行重新配置。另外一种情况可能是，该介质目"
 "前不可用，您应该稍后再试。"
 
-#: ../rpmdrake.pm:604
+#: ../rpmdrake.pm:620
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
-#: ../rpmdrake.pm:620
+#: ../rpmdrake.pm:636
+#, fuzzy, c-format
+msgid "Select all"
+msgstr "选中"
+
+#: ../rpmdrake.pm:640
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:642
+#: ../rpmdrake.pm:662
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2134,7 +2178,7 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:661 ../rpmdrake.pm:668
+#: ../rpmdrake.pm:686 ../rpmdrake.pm:695
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2145,17 +2189,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:680
+#: ../rpmdrake.pm:707
 #, c-format
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:685
+#: ../rpmdrake.pm:712
 #, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:686
+#: ../rpmdrake.pm:713
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2166,7 +2210,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:699
+#: ../rpmdrake.pm:726
 #, fuzzy, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2176,7 +2220,7 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 Mandrakelinux 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:702
+#: ../rpmdrake.pm:729
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "