sync with code

1 files changed, 536 insertions, 589 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c24f3b62..834ca6bc 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: 2008-01-23 18:32+0100\n"
+"POT-Creation-Date: 2008-02-06 15:47+0100\n"
 "PO-Revision-Date: 2007-08-30 12:54+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../MandrivaUpdate:86 ../Rpmdrake/gui.pm:726
+#: ../MandrivaUpdate:86 ../Rpmdrake/gui.pm:754
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -31,7 +31,7 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../MandrivaUpdate:109 ../rpmdrake:80 ../rpmdrake:561 ../rpmdrake.pm:193
+#: ../MandrivaUpdate:109 ../rpmdrake:81 ../rpmdrake:566 ../rpmdrake.pm:192
 #, c-format
 msgid "Software Management"
 msgstr "软件管理器"
@@ -46,37 +46,37 @@ msgstr "在此列出了软件包更新"
 msgid "Name"
 msgstr "名称"
 
-#: ../MandrivaUpdate:133 ../rpmdrake:203
+#: ../MandrivaUpdate:133 ../rpmdrake:204
 #, c-format
 msgid "Version"
 msgstr "版本"
 
-#: ../MandrivaUpdate:134 ../rpmdrake:207
+#: ../MandrivaUpdate:134 ../rpmdrake:208
 #, c-format
 msgid "Release"
 msgstr "释放"
 
-#: ../MandrivaUpdate:135 ../rpmdrake:211
+#: ../MandrivaUpdate:135 ../rpmdrake:212
 #, c-format
 msgid "Arch"
 msgstr "架构"
 
-#: ../MandrivaUpdate:148 ../Rpmdrake/edit_urpm_sources.pm:1133
+#: ../MandrivaUpdate:148 ../Rpmdrake/edit_urpm_sources.pm:1134
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../MandrivaUpdate:152 ../rpmdrake:495 ../rpmdrake.pm:770
+#: ../MandrivaUpdate:152 ../rpmdrake:500 ../rpmdrake.pm:769
 #, c-format
 msgid "Select all"
 msgstr "全选"
 
-#: ../MandrivaUpdate:165 ../rpmdrake.pm:774
+#: ../MandrivaUpdate:165 ../rpmdrake.pm:773
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../MandrivaUpdate:173 ../rpmdrake:506
+#: ../MandrivaUpdate:173 ../rpmdrake:511
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -225,8 +225,8 @@ msgstr "浏览..."
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:198 ../Rpmdrake/edit_urpm_sources.pm:538
-#: ../rpmdrake.pm:134
+#: ../Rpmdrake/edit_urpm_sources.pm:198 ../Rpmdrake/edit_urpm_sources.pm:539
+#: ../rpmdrake.pm:133
 #, c-format
 msgid "Password:"
 msgstr "密码:"
@@ -280,24 +280,24 @@ msgstr "介质类型:"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:267 ../Rpmdrake/edit_urpm_sources.pm:343
 #: ../Rpmdrake/edit_urpm_sources.pm:447 ../Rpmdrake/edit_urpm_sources.pm:474
-#: ../Rpmdrake/edit_urpm_sources.pm:555 ../Rpmdrake/edit_urpm_sources.pm:642
-#: ../Rpmdrake/edit_urpm_sources.pm:683 ../Rpmdrake/edit_urpm_sources.pm:741
-#: ../Rpmdrake/edit_urpm_sources.pm:890 ../Rpmdrake/gui.pm:491
-#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:608 ../Rpmdrake/pkg.pm:650
-#: ../rpmdrake.pm:302 ../rpmdrake.pm:620 ../rpmdrake.pm:693 ../rpmdrake.pm:766
+#: ../Rpmdrake/edit_urpm_sources.pm:556 ../Rpmdrake/edit_urpm_sources.pm:643
+#: ../Rpmdrake/edit_urpm_sources.pm:684 ../Rpmdrake/edit_urpm_sources.pm:742
+#: ../Rpmdrake/edit_urpm_sources.pm:891 ../Rpmdrake/gui.pm:519
+#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:202 ../Rpmdrake/pkg.pm:697
+#: ../rpmdrake.pm:301 ../rpmdrake.pm:619 ../rpmdrake.pm:692 ../rpmdrake.pm:765
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:269 ../Rpmdrake/edit_urpm_sources.pm:345
-#: ../Rpmdrake/edit_urpm_sources.pm:474 ../Rpmdrake/edit_urpm_sources.pm:545
-#: ../Rpmdrake/edit_urpm_sources.pm:639 ../Rpmdrake/edit_urpm_sources.pm:682
-#: ../Rpmdrake/edit_urpm_sources.pm:734 ../Rpmdrake/edit_urpm_sources.pm:807
-#: ../Rpmdrake/edit_urpm_sources.pm:936 ../Rpmdrake/edit_urpm_sources.pm:1134
-#: ../Rpmdrake/gui.pm:491 ../Rpmdrake/gui.pm:507 ../Rpmdrake/gui.pm:512
-#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:444 ../Rpmdrake/pkg.pm:650
-#: ../Rpmdrake/rpmnew.pm:180 ../rpmdrake.pm:125 ../rpmdrake.pm:240
-#: ../rpmdrake.pm:305 ../rpmdrake.pm:620
+#: ../Rpmdrake/edit_urpm_sources.pm:474 ../Rpmdrake/edit_urpm_sources.pm:546
+#: ../Rpmdrake/edit_urpm_sources.pm:640 ../Rpmdrake/edit_urpm_sources.pm:683
+#: ../Rpmdrake/edit_urpm_sources.pm:735 ../Rpmdrake/edit_urpm_sources.pm:808
+#: ../Rpmdrake/edit_urpm_sources.pm:937 ../Rpmdrake/edit_urpm_sources.pm:1135
+#: ../Rpmdrake/gui.pm:519 ../Rpmdrake/gui.pm:535 ../Rpmdrake/gui.pm:540
+#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:517 ../Rpmdrake/pkg.pm:697
+#: ../Rpmdrake/rpmnew.pm:180 ../rpmdrake.pm:124 ../rpmdrake.pm:239
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:619
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -388,191 +388,191 @@ msgstr "要保存更改，您必须在驱动器中插入介质。"
 msgid "Configure proxies"
 msgstr "配置代理服务器"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:521
+#: ../Rpmdrake/edit_urpm_sources.pm:522
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "介质“%s”的代理服务器设置"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:522
+#: ../Rpmdrake/edit_urpm_sources.pm:523
 #, c-format
 msgid "Global proxy settings"
 msgstr "全局代理服务器设置"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:524
+#: ../Rpmdrake/edit_urpm_sources.pm:525
 #, 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:527
+#: ../Rpmdrake/edit_urpm_sources.pm:528
 #, c-format
 msgid "Proxy hostname:"
 msgstr "代理服务器主机名:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:530
+#: ../Rpmdrake/edit_urpm_sources.pm:531
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:533
+#: ../Rpmdrake/edit_urpm_sources.pm:534
 #, c-format
 msgid "User:"
 msgstr "用户名:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:608
+#: ../Rpmdrake/edit_urpm_sources.pm:609
 #, c-format
 msgid "Add a parallel group"
 msgstr "添加并行组"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:608
+#: ../Rpmdrake/edit_urpm_sources.pm:609
 #, c-format
 msgid "Edit a parallel group"
 msgstr "编辑并行组"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:620
+#: ../Rpmdrake/edit_urpm_sources.pm:621
 #, c-format
 msgid "Add a medium limit"
 msgstr "添加一个介质限制"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:633
+#: ../Rpmdrake/edit_urpm_sources.pm:634
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "在介质限制中选择介质进行添加:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:670
+#: ../Rpmdrake/edit_urpm_sources.pm:671
 #, c-format
 msgid "Add a host"
 msgstr "添加主机"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:677
+#: ../Rpmdrake/edit_urpm_sources.pm:678
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "输入要添加的主机名或 IP 地址:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:708
+#: ../Rpmdrake/edit_urpm_sources.pm:709
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "编辑并行组“%s”:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:712
+#: ../Rpmdrake/edit_urpm_sources.pm:713
 #, c-format
 msgid "Group name:"
 msgstr "组名称:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:713
+#: ../Rpmdrake/edit_urpm_sources.pm:714
 #, c-format
 msgid "Protocol:"
 msgstr "协议:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:715
+#: ../Rpmdrake/edit_urpm_sources.pm:716
 #, c-format
 msgid "Media limit:"
 msgstr "介质限制:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:720 ../Rpmdrake/edit_urpm_sources.pm:727
-#: ../Rpmdrake/edit_urpm_sources.pm:924 ../Rpmdrake/edit_urpm_sources.pm:1121
+#: ../Rpmdrake/edit_urpm_sources.pm:721 ../Rpmdrake/edit_urpm_sources.pm:728
+#: ../Rpmdrake/edit_urpm_sources.pm:925 ../Rpmdrake/edit_urpm_sources.pm:1122
 #, c-format
 msgid "Add"
 msgstr "添加"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:721 ../Rpmdrake/edit_urpm_sources.pm:728
-#: ../Rpmdrake/edit_urpm_sources.pm:787 ../Rpmdrake/edit_urpm_sources.pm:928
-#: ../Rpmdrake/edit_urpm_sources.pm:1111
+#: ../Rpmdrake/edit_urpm_sources.pm:722 ../Rpmdrake/edit_urpm_sources.pm:729
+#: ../Rpmdrake/edit_urpm_sources.pm:788 ../Rpmdrake/edit_urpm_sources.pm:929
+#: ../Rpmdrake/edit_urpm_sources.pm:1112
 #, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:722
+#: ../Rpmdrake/edit_urpm_sources.pm:723
 #, c-format
 msgid "Hosts:"
 msgstr "主机:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:756
+#: ../Rpmdrake/edit_urpm_sources.pm:757
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:760
+#: ../Rpmdrake/edit_urpm_sources.pm:761
 #, c-format
 msgid "Group"
 msgstr "组"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:760
+#: ../Rpmdrake/edit_urpm_sources.pm:761
 #, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:760
+#: ../Rpmdrake/edit_urpm_sources.pm:761
 #, c-format
 msgid "Media limit"
 msgstr "介质限制"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:761
+#: ../Rpmdrake/edit_urpm_sources.pm:762
 #, c-format
 msgid "Command"
 msgstr "命令"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:771 ../Rpmdrake/gui.pm:723
-#: ../Rpmdrake/pkg.pm:102 ../Rpmdrake/pkg.pm:132 ../Rpmdrake/pkg.pm:147
-#: ../Rpmdrake/rpmnew.pm:78
+#: ../Rpmdrake/edit_urpm_sources.pm:772 ../Rpmdrake/gui.pm:751
+#: ../Rpmdrake/pkg.pm:115 ../Rpmdrake/pkg.pm:161 ../Rpmdrake/pkg.pm:169
+#: ../Rpmdrake/pkg.pm:191 ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
 msgstr "(无)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:791
+#: ../Rpmdrake/edit_urpm_sources.pm:792
 #, c-format
 msgid "Edit..."
 msgstr "编辑"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:799
+#: ../Rpmdrake/edit_urpm_sources.pm:800
 #, c-format
 msgid "Add..."
 msgstr "添加..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:815
+#: ../Rpmdrake/edit_urpm_sources.pm:816
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理软件包数字签名的密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:821 ../Rpmdrake/edit_urpm_sources.pm:1035
+#: ../Rpmdrake/edit_urpm_sources.pm:822 ../Rpmdrake/edit_urpm_sources.pm:1036
 #, c-format
 msgid "Medium"
 msgstr "介质"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:828
+#: ../Rpmdrake/edit_urpm_sources.pm:829
 #, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:851
+#: ../Rpmdrake/edit_urpm_sources.pm:852
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:864
+#: ../Rpmdrake/edit_urpm_sources.pm:865
 #, c-format
 msgid "Add a key"
 msgstr "添加密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:877
+#: ../Rpmdrake/edit_urpm_sources.pm:878
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "选择要添加到介质 %s 中的密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:883
+#: ../Rpmdrake/edit_urpm_sources.pm:884
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:905
+#: ../Rpmdrake/edit_urpm_sources.pm:906
 #, c-format
 msgid "Remove a key"
 msgstr "删除密钥"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:906
+#: ../Rpmdrake/edit_urpm_sources.pm:907
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -581,162 +581,162 @@ msgstr ""
 "您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
 "(密钥名称: %3$s)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:945 ../Rpmdrake/edit_urpm_sources.pm:1104
+#: ../Rpmdrake/edit_urpm_sources.pm:946 ../Rpmdrake/edit_urpm_sources.pm:1105
 #, c-format
 msgid "Configure media"
 msgstr "配置介质"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:952 ../Rpmdrake/edit_urpm_sources.pm:953
-#: ../Rpmdrake/edit_urpm_sources.pm:954 ../rpmdrake:386 ../rpmdrake:389
-#: ../rpmdrake:394 ../rpmdrake:409 ../rpmdrake:410
+#: ../Rpmdrake/edit_urpm_sources.pm:953 ../Rpmdrake/edit_urpm_sources.pm:954
+#: ../Rpmdrake/edit_urpm_sources.pm:955 ../rpmdrake:391 ../rpmdrake:394
+#: ../rpmdrake:399 ../rpmdrake:414 ../rpmdrake:415
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:953 ../rpmdrake:410
+#: ../Rpmdrake/edit_urpm_sources.pm:954 ../rpmdrake:415
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:953 ../rpmdrake:410
+#: ../Rpmdrake/edit_urpm_sources.pm:954 ../rpmdrake:415
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:954
+#: ../Rpmdrake/edit_urpm_sources.pm:955
 #, c-format
 msgid "/_Update"
 msgstr "/更新(_U)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:954
+#: ../Rpmdrake/edit_urpm_sources.pm:955
 #, c-format
 msgid "<control>U"
 msgstr "<control>U"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:955 ../Rpmdrake/edit_urpm_sources.pm:956
-#: ../Rpmdrake/edit_urpm_sources.pm:957 ../Rpmdrake/edit_urpm_sources.pm:958
-#: ../Rpmdrake/edit_urpm_sources.pm:959 ../Rpmdrake/edit_urpm_sources.pm:960
-#: ../rpmdrake:383 ../rpmdrake:413 ../rpmdrake:417 ../rpmdrake:421
-#: ../rpmdrake:460
+#: ../Rpmdrake/edit_urpm_sources.pm:956 ../Rpmdrake/edit_urpm_sources.pm:957
+#: ../Rpmdrake/edit_urpm_sources.pm:958 ../Rpmdrake/edit_urpm_sources.pm:959
+#: ../Rpmdrake/edit_urpm_sources.pm:960 ../Rpmdrake/edit_urpm_sources.pm:961
+#: ../rpmdrake:388 ../rpmdrake:418 ../rpmdrake:422 ../rpmdrake:426
+#: ../rpmdrake:465
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:956
+#: ../Rpmdrake/edit_urpm_sources.pm:957
 #, c-format
 msgid "/_Global options"
 msgstr "/全局选项(_G)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:956
+#: ../Rpmdrake/edit_urpm_sources.pm:957
 #, c-format
 msgid "<control>G"
 msgstr "<control>G"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:957
+#: ../Rpmdrake/edit_urpm_sources.pm:958
 #, c-format
 msgid "/_Add a custom medium"
 msgstr "/添加自定义介质(_A)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:957
+#: ../Rpmdrake/edit_urpm_sources.pm:958
 #, c-format
 msgid "<control>A"
 msgstr "<control>A"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:958
+#: ../Rpmdrake/edit_urpm_sources.pm:959
 #, c-format
 msgid "/Manage _keys"
 msgstr "/管理密钥(_K)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:958
+#: ../Rpmdrake/edit_urpm_sources.pm:959
 #, c-format
 msgid "<control>K"
 msgstr "<control>K"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:959
+#: ../Rpmdrake/edit_urpm_sources.pm:960
 #, c-format
 msgid "/_Parallel"
 msgstr "/并行(_P)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:959
+#: ../Rpmdrake/edit_urpm_sources.pm:960
 #, c-format
 msgid "<control>P"
 msgstr "<control>P"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:960
+#: ../Rpmdrake/edit_urpm_sources.pm:961
 #, c-format
 msgid "/P_roxy"
 msgstr "/代理服务器(_R)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:960
+#: ../Rpmdrake/edit_urpm_sources.pm:961
 #, c-format
 msgid "<control>R"
 msgstr "<control>R"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:962 ../Rpmdrake/edit_urpm_sources.pm:963
-#: ../Rpmdrake/edit_urpm_sources.pm:964 ../Rpmdrake/edit_urpm_sources.pm:965
-#: ../rpmdrake:425 ../rpmdrake:426 ../rpmdrake:427 ../rpmdrake:428
+#: ../Rpmdrake/edit_urpm_sources.pm:963 ../Rpmdrake/edit_urpm_sources.pm:964
+#: ../Rpmdrake/edit_urpm_sources.pm:965 ../Rpmdrake/edit_urpm_sources.pm:966
+#: ../rpmdrake:430 ../rpmdrake:431 ../rpmdrake:432 ../rpmdrake:433
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:963 ../rpmdrake:426
+#: ../Rpmdrake/edit_urpm_sources.pm:964 ../rpmdrake:431
 #, c-format
 msgid "/_Report Bug"
 msgstr "/报告错误(_R)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:965 ../rpmdrake:428
+#: ../Rpmdrake/edit_urpm_sources.pm:966 ../rpmdrake:433
 #, c-format
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:968 ../rpmdrake:431
+#: ../Rpmdrake/edit_urpm_sources.pm:969 ../rpmdrake:436
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:970 ../rpmdrake:433
+#: ../Rpmdrake/edit_urpm_sources.pm:971 ../rpmdrake:438
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:972 ../rpmdrake:435
+#: ../Rpmdrake/edit_urpm_sources.pm:973 ../rpmdrake:440
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:974 ../rpmdrake:437
+#: ../Rpmdrake/edit_urpm_sources.pm:975 ../rpmdrake:442
 #, 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>")
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../Rpmdrake/edit_urpm_sources.pm:979 ../rpmdrake:442
+#: ../Rpmdrake/edit_urpm_sources.pm:980 ../rpmdrake:447
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1032 ../Rpmdrake/pkg.pm:203
+#: ../Rpmdrake/edit_urpm_sources.pm:1033 ../Rpmdrake/pkg.pm:272
 #, c-format
 msgid "Enabled"
 msgstr "启用"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1033
+#: ../Rpmdrake/edit_urpm_sources.pm:1034
 #, c-format
 msgid "Updates"
 msgstr "更新"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1034
+#: ../Rpmdrake/edit_urpm_sources.pm:1035
 #, c-format
 msgid "Type"
 msgstr "类型"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1050
+#: ../Rpmdrake/edit_urpm_sources.pm:1051
 #, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "此介质需要更新才能使用。现在更新吗？"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1081
+#: ../Rpmdrake/edit_urpm_sources.pm:1082
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -747,12 +747,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1115
+#: ../Rpmdrake/edit_urpm_sources.pm:1116
 #, c-format
 msgid "Edit"
 msgstr "编辑"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1149 ../Rpmdrake/init.pm:143
+#: ../Rpmdrake/edit_urpm_sources.pm:1150 ../Rpmdrake/init.pm:143
 #: ../gurpmi.addmedia:103
 #, c-format
 msgid ""
@@ -764,7 +764,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1152
+#: ../Rpmdrake/edit_urpm_sources.pm:1153
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -778,7 +778,7 @@ msgstr ""
 "本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
 "软件包或执行更新时使用。"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1168
+#: ../Rpmdrake/edit_urpm_sources.pm:1169
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -794,115 +794,124 @@ msgstr ""
 msgid "None"
 msgstr "无"
 
-#: ../Rpmdrake/gui.pm:98 ../Rpmdrake/gui.pm:172
+#: ../Rpmdrake/formatting.pm:103
+#, c-format
+msgid "%s of additional disk space will be used."
+msgstr "将会使用 %s 的额外磁盘空间。"
+
+#: ../Rpmdrake/formatting.pm:104
+#, c-format
+msgid "%s of disk space will be freed."
+msgstr "将会释放 %s 的磁盘空间。"
+
+#: ../Rpmdrake/gui.pm:94 ../Rpmdrake/gui.pm:173 ../Rpmdrake/gui.pm:175
+#: ../Rpmdrake/pkg.pm:183
+#, c-format
+msgid "(Not available)"
+msgstr "(不可用)"
+
+#: ../Rpmdrake/gui.pm:120 ../Rpmdrake/gui.pm:191
 #, c-format
 msgid "Importance: "
 msgstr "重要性:"
 
-#: ../Rpmdrake/gui.pm:99 ../Rpmdrake/gui.pm:180
+#: ../Rpmdrake/gui.pm:121 ../Rpmdrake/gui.pm:199
 #, c-format
 msgid "Reason for update: "
 msgstr "更新原因:"
 
-#: ../Rpmdrake/gui.pm:103
+#: ../Rpmdrake/gui.pm:125
 #, c-format
 msgid "Security advisory"
 msgstr "安全通报"
 
-#: ../Rpmdrake/gui.pm:111 ../Rpmdrake/gui.pm:182
+#: ../Rpmdrake/gui.pm:133 ../Rpmdrake/gui.pm:201
 #, c-format
 msgid "No description"
 msgstr "无描述"
 
-#: ../Rpmdrake/gui.pm:114
+#: ../Rpmdrake/gui.pm:136
 #, c-format
 msgid "Details:"
 msgstr "细节："
 
-#: ../Rpmdrake/gui.pm:117 ../Rpmdrake/gui.pm:167
+#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/gui.pm:186
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: ../Rpmdrake/gui.pm:120 ../Rpmdrake/gui.pm:162
+#: ../Rpmdrake/gui.pm:142 ../Rpmdrake/gui.pm:181
 #, c-format
 msgid "Currently installed version: "
 msgstr "当前安装的版本:"
 
-#: ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:168
+#: ../Rpmdrake/gui.pm:145 ../Rpmdrake/gui.pm:187
 #, c-format
 msgid "Architecture: "
 msgstr "架构: "
 
-#: ../Rpmdrake/gui.pm:124 ../Rpmdrake/gui.pm:169
+#: ../Rpmdrake/gui.pm:146 ../Rpmdrake/gui.pm:188
 #, c-format
 msgid "Size: "
 msgstr "大小: "
 
-#: ../Rpmdrake/gui.pm:124 ../Rpmdrake/gui.pm:169
+#: ../Rpmdrake/gui.pm:146 ../Rpmdrake/gui.pm:188
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:125 ../Rpmdrake/gui.pm:161 ../rpmdrake.pm:825
+#: ../Rpmdrake/gui.pm:147 ../Rpmdrake/gui.pm:180 ../rpmdrake.pm:824
 #, c-format
 msgid "Medium: "
 msgstr "介质:"
 
-#: ../Rpmdrake/gui.pm:131
+#: ../Rpmdrake/gui.pm:153
 #, c-format
 msgid "Files:"
 msgstr "文件:"
 
-#: ../Rpmdrake/gui.pm:135 ../Rpmdrake/gui.pm:140 ../Rpmdrake/gui.pm:154
-#: ../Rpmdrake/gui.pm:156 ../Rpmdrake/pkg.pm:138
-#, c-format
-msgid "(Not available)"
-msgstr "(不可用)"
-
-#: ../Rpmdrake/gui.pm:139
+#: ../Rpmdrake/gui.pm:161
 #, c-format
 msgid "Changelog:"
 msgstr "更新日志:"
 
-#: ../Rpmdrake/gui.pm:151
+#: ../Rpmdrake/gui.pm:170
 #, c-format
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../Rpmdrake/gui.pm:156
+#: ../Rpmdrake/gui.pm:175
 #, c-format
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../Rpmdrake/gui.pm:166
+#: ../Rpmdrake/gui.pm:185
 #, c-format
 msgid "Name: "
 msgstr "名称:"
 
-#: ../Rpmdrake/gui.pm:176
+#: ../Rpmdrake/gui.pm:195
 #, c-format
 msgid "Summary: "
 msgstr "摘要:"
 
-#: ../Rpmdrake/gui.pm:182
+#: ../Rpmdrake/gui.pm:201
 #, c-format
 msgid "Description: "
 msgstr "描述:"
 
-#: ../Rpmdrake/gui.pm:380 ../Rpmdrake/pkg.pm:660 ../rpmdrake.pm:749
-#: ../rpmdrake.pm:864
+#: ../Rpmdrake/gui.pm:400 ../Rpmdrake/gui.pm:406 ../Rpmdrake/pkg.pm:707
+#: ../rpmdrake.pm:748 ../rpmdrake.pm:863
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../Rpmdrake/gui.pm:385
+#: ../Rpmdrake/gui.pm:401
 #, c-format
 msgid "Removing package %s would break your system"
-msgstr ""
-"删除 %s 将可能毁坏您的系统"
+msgstr "删除 %s 将可能毁坏您的系统"
 
-#: ../Rpmdrake/gui.pm:390
+#: ../Rpmdrake/gui.pm:406
 #, c-format
 msgid ""
 "The \"%s\" package is in urpmi skip list.\n"
@@ -911,60 +920,60 @@ msgstr ""
 "“%s”包位于 urpmi 跳过列表中。\n"
 "您是否仍然要选择该软件包？"
 
-#: ../Rpmdrake/gui.pm:474 ../Rpmdrake/gui.pm:503 ../Rpmdrake/gui.pm:505
+#: ../Rpmdrake/gui.pm:501 ../Rpmdrake/gui.pm:531 ../Rpmdrake/gui.pm:533
 #, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../Rpmdrake/gui.pm:476
+#: ../Rpmdrake/gui.pm:503
 #, c-format
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../Rpmdrake/gui.pm:477
+#: ../Rpmdrake/gui.pm:504
 #, c-format
 msgid "The following package is needed:"
 msgstr "需要下列软件包:"
 
-#: ../Rpmdrake/gui.pm:477
+#: ../Rpmdrake/gui.pm:504
 #, 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:491 ../Rpmdrake/gui.pm:496
+#: ../Rpmdrake/gui.pm:519 ../Rpmdrake/gui.pm:524
 #, c-format
 msgid "More info"
 msgstr "更多信息"
 
-#: ../Rpmdrake/gui.pm:498
+#: ../Rpmdrake/gui.pm:526
 #, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../Rpmdrake/gui.pm:526
+#: ../Rpmdrake/gui.pm:554
 #, c-format
 msgid "Checking dependencies of package..."
 msgstr "正在检查包的依赖关系..."
 
-#: ../Rpmdrake/gui.pm:533
+#: ../Rpmdrake/gui.pm:561
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../Rpmdrake/gui.pm:534
+#: ../Rpmdrake/gui.pm:562
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "为了满足所有的依赖关系，需要删除下列软件包:"
 
-#: ../Rpmdrake/gui.pm:540 ../Rpmdrake/gui.pm:550
+#: ../Rpmdrake/gui.pm:568 ../Rpmdrake/gui.pm:578
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../Rpmdrake/gui.pm:541
+#: ../Rpmdrake/gui.pm:569
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -973,7 +982,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:551 ../Rpmdrake/gui.pm:620
+#: ../Rpmdrake/gui.pm:579 ../Rpmdrake/gui.pm:648
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -983,12 +992,12 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:581
+#: ../Rpmdrake/gui.pm:609
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../Rpmdrake/gui.pm:582
+#: ../Rpmdrake/gui.pm:610
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -998,22 +1007,22 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:596
+#: ../Rpmdrake/gui.pm:624
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (属于跳过列表)"
 
-#: ../Rpmdrake/gui.pm:600
+#: ../Rpmdrake/gui.pm:628
 #, c-format
 msgid "One package cannot be installed"
 msgstr "软件包无法安装"
 
-#: ../Rpmdrake/gui.pm:600
+#: ../Rpmdrake/gui.pm:628
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../Rpmdrake/gui.pm:602
+#: ../Rpmdrake/gui.pm:630
 #, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -1024,7 +1033,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:603
+#: ../Rpmdrake/gui.pm:631
 #, c-format
 msgid ""
 "Sorry, the following packages can't be selected:\n"
@@ -1035,27 +1044,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:619 ../Rpmdrake/pkg.pm:536
+#: ../Rpmdrake/gui.pm:647 ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../Rpmdrake/gui.pm:652
+#: ../Rpmdrake/gui.pm:680
 #, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "错误：%s 似乎是以只读方式挂载的。"
 
-#: ../Rpmdrake/gui.pm:656
+#: ../Rpmdrake/gui.pm:684
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
-#: ../Rpmdrake/gui.pm:661
+#: ../Rpmdrake/gui.pm:689
 #, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../Rpmdrake/gui.pm:662
+#: ../Rpmdrake/gui.pm:690
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1070,42 +1079,42 @@ msgstr ""
 "\n"
 "您真的想要安装所有选中的软件包吗?"
 
-#: ../Rpmdrake/gui.pm:688 ../Rpmdrake/open_db.pm:74
+#: ../Rpmdrake/gui.pm:716 ../Rpmdrake/open_db.pm:75
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../Rpmdrake/gui.pm:689 ../Rpmdrake/open_db.pm:75
+#: ../Rpmdrake/gui.pm:717 ../Rpmdrake/open_db.pm:76
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: ../Rpmdrake/gui.pm:707
+#: ../Rpmdrake/gui.pm:735
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../Rpmdrake/gui.pm:725
+#: ../Rpmdrake/gui.pm:753
 #, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../Rpmdrake/gui.pm:749 ../rpmdrake:267
+#: ../Rpmdrake/gui.pm:777 ../rpmdrake:269
 #, c-format
 msgid "All"
 msgstr "全部"
 
-#: ../Rpmdrake/gui.pm:758 ../rpmdrake:141
+#: ../Rpmdrake/gui.pm:786 ../rpmdrake:142
 #, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../Rpmdrake/gui.pm:758 ../rpmdrake:141
+#: ../Rpmdrake/gui.pm:786 ../rpmdrake:142
 #, c-format
 msgid "Addable"
 msgstr "可添加"
 
-#: ../Rpmdrake/gui.pm:778
+#: ../Rpmdrake/gui.pm:806
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "此软件包的描述不可用\n"
@@ -1886,23 +1895,54 @@ msgstr "软件安装工具可设置介质源。"
 msgid "Do you want to add media sources now?"
 msgstr "您想要现在就添加介质源吗?"
 
-#: ../Rpmdrake/pkg.pm:121
+#: ../Rpmdrake/pkg.pm:126
+#, c-format
+msgid "Getting information from XML meta-data from %s..."
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:130
+#, c-format
+msgid "Getting '%s' from XML meta-data..."
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:133 ../Rpmdrake/pkg.pm:305 ../Rpmdrake/pkg.pm:627
+#: ../Rpmdrake/pkg.pm:778 ../rpmdrake.pm:329
+#, c-format
+msgid "Please wait"
+msgstr "请稍候"
+
+#: ../Rpmdrake/pkg.pm:145
 #, c-format
 msgid "No xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:123
+#: ../Rpmdrake/pkg.pm:147
 #, c-format
 msgid ""
 "No xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:200 ../Rpmdrake/pkg.pm:554
+#: ../Rpmdrake/pkg.pm:201 ../Rpmdrake/pkg.pm:206
+#, c-format
+msgid "Downloading package `%s'..."
+msgstr "正在下载软件包“%s”..."
+
+#: ../Rpmdrake/pkg.pm:208
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
+
+#: ../Rpmdrake/pkg.pm:209
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% 已完成，速度为 %s"
+
+#: ../Rpmdrake/pkg.pm:252 ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
 
-#: ../Rpmdrake/pkg.pm:184
+#: ../Rpmdrake/pkg.pm:253
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1915,17 +1955,17 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/pkg.pm:257
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不要再询问"
 
-#: ../Rpmdrake/pkg.pm:197
+#: ../Rpmdrake/pkg.pm:266
 #, c-format
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../Rpmdrake/pkg.pm:198
+#: ../Rpmdrake/pkg.pm:267
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1941,15 +1981,14 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../Rpmdrake/pkg.pm:208
+#: ../Rpmdrake/pkg.pm:277
 #, c-format
 msgid ""
 "You have no configured update media. MandrivaUpdate cannot operate without "
 "any update media."
-msgstr ""
-"您尚未配置更新介质。没有更新介质的话，MandrivaUpdate 无法操作。"
+msgstr "您尚未配置更新介质。没有更新介质的话，MandrivaUpdate 无法操作。"
 
-#: ../Rpmdrake/pkg.pm:209 ../rpmdrake.pm:548
+#: ../Rpmdrake/pkg.pm:278 ../rpmdrake.pm:547
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -1962,12 +2001,12 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:216
+#: ../Rpmdrake/pkg.pm:285
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../Rpmdrake/pkg.pm:217
+#: ../Rpmdrake/pkg.pm:286
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1981,78 +2020,72 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../Rpmdrake/pkg.pm:236 ../Rpmdrake/pkg.pm:557 ../Rpmdrake/pkg.pm:731
-#: ../rpmdrake.pm:330
-#, c-format
-msgid "Please wait"
-msgstr "请稍候"
-
-#: ../Rpmdrake/pkg.pm:236 ../Rpmdrake/pkg.pm:557
+#: ../Rpmdrake/pkg.pm:305 ../Rpmdrake/pkg.pm:627
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../Rpmdrake/pkg.pm:236 ../Rpmdrake/pkg.pm:557 ../Rpmdrake/pkg.pm:731
+#: ../Rpmdrake/pkg.pm:305 ../Rpmdrake/pkg.pm:627 ../Rpmdrake/pkg.pm:778
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../Rpmdrake/pkg.pm:249
+#: ../Rpmdrake/pkg.pm:318
 #, c-format
 msgid "Reading updates description"
 msgstr "读取更新描述"
 
-#: ../Rpmdrake/pkg.pm:255 ../Rpmdrake/pkg.pm:331
+#: ../Rpmdrake/pkg.pm:324 ../Rpmdrake/pkg.pm:400
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:261
+#: ../Rpmdrake/pkg.pm:330
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "正在列出基本软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:298
+#: ../Rpmdrake/pkg.pm:367
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "正在寻找已安装的软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:424
+#: ../Rpmdrake/pkg.pm:497
 #, c-format
 msgid "Upgrade information"
 msgstr "升级信息"
 
-#: ../Rpmdrake/pkg.pm:426
+#: ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../Rpmdrake/pkg.pm:434
+#: ../Rpmdrake/pkg.pm:507
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "关于此软件包的升级信息"
 
-#: ../Rpmdrake/pkg.pm:437
+#: ../Rpmdrake/pkg.pm:510
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "关于软件包 %s 的升级信息"
 
-#: ../Rpmdrake/pkg.pm:453
+#: ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Could not create temporary directory '%s'"
 msgstr "无法创建临时目录“%s”"
 
-#: ../Rpmdrake/pkg.pm:461 ../Rpmdrake/pkg.pm:707
+#: ../Rpmdrake/pkg.pm:534 ../Rpmdrake/pkg.pm:754
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../Rpmdrake/pkg.pm:465 ../Rpmdrake/pkg.pm:681
+#: ../Rpmdrake/pkg.pm:538 ../Rpmdrake/pkg.pm:728
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:466 ../Rpmdrake/pkg.pm:486 ../Rpmdrake/pkg.pm:683
+#: ../Rpmdrake/pkg.pm:539 ../Rpmdrake/pkg.pm:559 ../Rpmdrake/pkg.pm:730
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2063,27 +2096,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:485 ../Rpmdrake/pkg.pm:671
+#: ../Rpmdrake/pkg.pm:558 ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../Rpmdrake/pkg.pm:505
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Checking validity of requested packages..."
 msgstr "正在检查所请求软件包的完整性..."
 
-#: ../Rpmdrake/pkg.pm:516
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../Rpmdrake/pkg.pm:517
+#: ../Rpmdrake/pkg.pm:590
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../Rpmdrake/pkg.pm:518 ../Rpmdrake/pkg.pm:674
+#: ../Rpmdrake/pkg.pm:591 ../Rpmdrake/pkg.pm:721
 #, c-format
 msgid ""
 "\n"
@@ -2096,100 +2129,75 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:533
+#: ../Rpmdrake/pkg.pm:606
 #, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "即将安装以下%d个软件包:"
 
-#: ../Rpmdrake/pkg.pm:539
+#: ../Rpmdrake/pkg.pm:612
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../Rpmdrake/pkg.pm:541
+#: ../Rpmdrake/pkg.pm:614
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:542
+#: ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:545
-#, c-format
-msgid "%s of additional disk space will be used."
-msgstr "将会使用 %s 的额外磁盘空间。"
-
-#: ../Rpmdrake/pkg.pm:546
-#, c-format
-msgid "%s of disk space will be freed."
-msgstr "将会释放 %s 的磁盘空间。"
-
-#: ../Rpmdrake/pkg.pm:548
+#: ../Rpmdrake/pkg.pm:618
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:570
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../Rpmdrake/pkg.pm:570
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Preparing package installation transaction..."
 msgstr "正在准备安装交易..."
 
-#: ../Rpmdrake/pkg.pm:573
+#: ../Rpmdrake/pkg.pm:642
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:574
+#: ../Rpmdrake/pkg.pm:643
 #, c-format
 msgid "Total: %s/%s"
 msgstr "总计: %s/%s"
 
-#: ../Rpmdrake/pkg.pm:602 ../Rpmdrake/pkg.pm:690 ../Rpmdrake/pkg.pm:713
-#: ../rpmdrake.pm:736 ../rpmdrake.pm:823 ../rpmdrake.pm:847
+#: ../Rpmdrake/pkg.pm:671 ../Rpmdrake/pkg.pm:737 ../Rpmdrake/pkg.pm:760
+#: ../rpmdrake.pm:735 ../rpmdrake.pm:822 ../rpmdrake.pm:846
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../Rpmdrake/pkg.pm:607 ../Rpmdrake/pkg.pm:612
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr "正在下载软件包“%s”..."
-
-#: ../Rpmdrake/pkg.pm:614
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
-
-#: ../Rpmdrake/pkg.pm:615
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% 已完成，速度为 %s"
-
-#: ../Rpmdrake/pkg.pm:648
+#: ../Rpmdrake/pkg.pm:695
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../Rpmdrake/pkg.pm:649
+#: ../Rpmdrake/pkg.pm:696
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../Rpmdrake/pkg.pm:653
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../Rpmdrake/pkg.pm:672
+#: ../Rpmdrake/pkg.pm:719
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -2202,22 +2210,22 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../Rpmdrake/pkg.pm:682
+#: ../Rpmdrake/pkg.pm:729
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: ../Rpmdrake/pkg.pm:691
+#: ../Rpmdrake/pkg.pm:738
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../Rpmdrake/pkg.pm:694
+#: ../Rpmdrake/pkg.pm:741
 #, c-format
 msgid "Inspecting configuration files..."
 msgstr "正在检查配置文件..."
 
-#: ../Rpmdrake/pkg.pm:702
+#: ../Rpmdrake/pkg.pm:749
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2230,22 +2238,22 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../Rpmdrake/pkg.pm:708
+#: ../Rpmdrake/pkg.pm:755
 #, c-format
 msgid "Looking for \"README\" files..."
 msgstr "正在查找“README”文件..."
 
-#: ../Rpmdrake/pkg.pm:731 ../Rpmdrake/pkg.pm:747
+#: ../Rpmdrake/pkg.pm:778 ../Rpmdrake/pkg.pm:794
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:807
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:761
+#: ../Rpmdrake/pkg.pm:808
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2256,7 +2264,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/rpmnew.pm:79
+#: ../Rpmdrake/rpmnew.pm:78
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
@@ -2300,7 +2308,7 @@ msgstr "安装完成"
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../Rpmdrake/rpmnew.pm:190 ../rpmdrake:85
+#: ../Rpmdrake/rpmnew.pm:190 ../rpmdrake:86
 #, c-format
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
@@ -2345,413 +2353,418 @@ msgstr "成功添加了介质 %s。"
 msgid "Successfully added medium `%s'."
 msgstr "成功添加了介质“%s”。"
 
-#: ../rpmdrake:57 ../rpmdrake:140
+#: ../rpmdrake:58 ../rpmdrake:141
 #, c-format
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../rpmdrake:90
+#: ../rpmdrake:91
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:144
 #, c-format
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:144
 #, c-format
 msgid "Not selected"
 msgstr "未选中"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:152
 #, c-format
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:173
 #, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "选中软件: %s / 剩余磁盘空间: %s"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:200
 #, c-format
 msgid "Package"
 msgstr "软件包"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:270
 #, c-format
 msgid "Installed"
 msgstr "已安装"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:271
 #, c-format
 msgid "Not installed"
 msgstr "未安装"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:272
 #, c-format
 msgid "%s choices"
 msgstr "%s 精选"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:272
 #, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux 精选"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:274
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按字母次序排列"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:275
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:274
+#: ../rpmdrake:276
 #, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:277
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:278
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "不分类，按安装日期排列"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:279
 #, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按组别排列"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:281
 #, c-format
 msgid "Backports"
 msgstr "移植"
 
-#: ../rpmdrake:280
+#: ../rpmdrake:282
+#, fuzzy, c-format
+msgid "Meta packages"
+msgstr "软件包"
+
+#: ../rpmdrake:283
 #, c-format
 msgid "All updates"
 msgstr "全部更新"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:284
 #, c-format
 msgid "Security updates"
 msgstr "安全更新"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:285
 #, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:286
 #, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake:338 ../rpmdrake:343
+#: ../rpmdrake:343 ../rpmdrake:348
 #, c-format
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:339
+#: ../rpmdrake:344
 #, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:340
+#: ../rpmdrake:345
 #, c-format
 msgid "in summaries"
 msgstr "在摘要中"
 
-#: ../rpmdrake:341
+#: ../rpmdrake:346
 #, c-format
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:383
+#: ../rpmdrake:388
 #, c-format
 msgid "/_Select dependencies without asking"
 msgstr "/直接选择依赖关系无需询问(_S)"
 
-#: ../rpmdrake:389
+#: ../rpmdrake:394
 #, c-format
 msgid "/_Update media"
 msgstr "/更新介质(_U)"
 
-#: ../rpmdrake:394
+#: ../rpmdrake:399
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/重置选中内容(_R)"
 
-#: ../rpmdrake:409
+#: ../rpmdrake:414
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新装入软件包清单(_P)"
 
-#: ../rpmdrake:417
+#: ../rpmdrake:422
 #, c-format
 msgid "/_Media Manager"
 msgstr "/介质管理器(_M)"
 
-#: ../rpmdrake:421 ../rpmdrake:460
+#: ../rpmdrake:426 ../rpmdrake:465
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/自动显示选中的软件包(_S)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:480
 #, c-format
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:489
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:491
 #, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../rpmdrake:502
+#: ../rpmdrake:507
 #, c-format
 msgid "Apply"
 msgstr "应用"
 
-#: ../rpmdrake:522
+#: ../rpmdrake:527
 #, c-format
 msgid "Quick Introduction"
 msgstr "简介"
 
-#: ../rpmdrake:523
+#: ../rpmdrake:528
 #, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "您可以使用左侧的类别树浏览软件包。"
 
-#: ../rpmdrake:524
+#: ../rpmdrake:529
 #, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr "单击右侧列表中的软件包可以查看其信息。"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:530
 #, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr "要安装、更新或删除软件包，只需单击相应的复选框。"
 
-#: ../rpmdrake.pm:106
+#: ../rpmdrake.pm:105
 #, c-format
 msgid "Software Update"
 msgstr "软件更新"
 
-#: ../rpmdrake.pm:106
+#: ../rpmdrake.pm:105
 #, c-format
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux 更新"
 
-#: ../rpmdrake.pm:133
+#: ../rpmdrake.pm:132
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入您访问代理服务器的细节\n"
 
-#: ../rpmdrake.pm:134
+#: ../rpmdrake.pm:133
 #, c-format
 msgid "User name:"
 msgstr "用户名："
 
-#: ../rpmdrake.pm:188
+#: ../rpmdrake.pm:187
 #, c-format
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake.pm:189 ../rpmdrake.pm:193
+#: ../rpmdrake.pm:188 ../rpmdrake.pm:192
 #, c-format
 msgid "Software Packages Update"
 msgstr "软件包更新"
 
-#: ../rpmdrake.pm:190
+#: ../rpmdrake.pm:189
 #, c-format
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake.pm:231
+#: ../rpmdrake.pm:230
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:235
+#: ../rpmdrake.pm:234
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:285
 #, c-format
 msgid "Info..."
 msgstr "信息..."
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:412
 #, c-format
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:415
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:416
 #, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "Germany"
 msgstr "德国"
 
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake.pm:422 ../rpmdrake.pm:426
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:425
 #, c-format
 msgid "Greece"
 msgstr "希腊"
 
-#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:424
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../rpmdrake.pm:425
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "France"
 msgstr "法国"
 
-#: ../rpmdrake.pm:427
+#: ../rpmdrake.pm:426
 #, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:428
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:429
+#: ../rpmdrake.pm:428
 #, c-format
 msgid "Italy"
 msgstr "意大利"
 
-#: ../rpmdrake.pm:430
+#: ../rpmdrake.pm:429
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:431
+#: ../rpmdrake.pm:430
 #, c-format
 msgid "Korea"
 msgstr "韩国"
 
-#: ../rpmdrake.pm:432
+#: ../rpmdrake.pm:431
 #, c-format
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:432
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:434
+#: ../rpmdrake.pm:433
 #, c-format
 msgid "Poland"
 msgstr "波兰"
 
-#: ../rpmdrake.pm:435
+#: ../rpmdrake.pm:434
 #, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:436
+#: ../rpmdrake.pm:435
 #, c-format
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:436
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:438
+#: ../rpmdrake.pm:437
 #, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../rpmdrake.pm:439
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:440
+#: ../rpmdrake.pm:439
 #, c-format
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../rpmdrake.pm:441
+#: ../rpmdrake.pm:440
 #, c-format
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../rpmdrake.pm:442
+#: ../rpmdrake.pm:441
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:443 ../rpmdrake.pm:444 ../rpmdrake.pm:445 ../rpmdrake.pm:446
+#: ../rpmdrake.pm:442 ../rpmdrake.pm:443 ../rpmdrake.pm:444 ../rpmdrake.pm:445
 #, c-format
 msgid "United States"
 msgstr "美国"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:543
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2764,27 +2777,27 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:554 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:553 ../rpmdrake.pm:591
 #, c-format
 msgid "Mirror choice"
 msgstr "镜像选择"
 
-#: ../rpmdrake.pm:557
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "请稍候，正在下载镜像地址。"
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:557
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "正在从 Mandriva 网站下载镜像站点的地址，请稍候。"
 
-#: ../rpmdrake.pm:565
+#: ../rpmdrake.pm:564
 #, c-format
 msgid "Error during download"
 msgstr "下载出错"
 
-#: ../rpmdrake.pm:567
+#: ../rpmdrake.pm:566
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2799,7 +2812,7 @@ msgstr ""
 "您的网络或网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:572
+#: ../rpmdrake.pm:571
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2814,17 +2827,17 @@ msgstr ""
 "您的网络或 Mandriva 网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:582
+#: ../rpmdrake.pm:581
 #, c-format
 msgid "No mirror"
 msgstr "无镜像"
 
-#: ../rpmdrake.pm:584
+#: ../rpmdrake.pm:583
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "找不到适合的任何镜像。"
 
-#: ../rpmdrake.pm:585
+#: ../rpmdrake.pm:584
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2837,68 +2850,68 @@ msgstr ""
 "此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandriva Linux\n"
 "官方更新所支持。"
 
-#: ../rpmdrake.pm:604
+#: ../rpmdrake.pm:603
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:644
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
-#: ../rpmdrake.pm:648
+#: ../rpmdrake.pm:647
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在检查介质“%s”的文件..."
 
-#: ../rpmdrake.pm:651
+#: ../rpmdrake.pm:650
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在检查介质“%s”的远程文件..."
 
-#: ../rpmdrake.pm:655
+#: ../rpmdrake.pm:654
 #, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:659
+#: ../rpmdrake.pm:658
 #, c-format
 msgid " failed!"
 msgstr " 失败!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:662
 #, c-format
 msgid "%s from medium %s"
 msgstr "介质 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:666
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在开始下载“%s”..."
 
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:670
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
-#: ../rpmdrake.pm:674
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:685
+#: ../rpmdrake.pm:684
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "正在更新介质，请稍候..."
 
-#: ../rpmdrake.pm:712
+#: ../rpmdrake.pm:711
 #, c-format
 msgid "Error retrieving packages"
 msgstr "获取软件包出错"
 
-#: ../rpmdrake.pm:713
+#: ../rpmdrake.pm:712
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2912,23 +2925,23 @@ msgstr ""
 "管理器中删除此介质，然后重新添加以进行重新配置。另外一种情况可能是，该介质目"
 "前不可用，您应该稍后再试。"
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:743
 #, c-format
 msgid "Update media"
 msgstr "更新介质"
 
-#: ../rpmdrake.pm:749
+#: ../rpmdrake.pm:748
 #, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "未找到活动的介质。您必须启用某些介质才能进行更新。"
 
-#: ../rpmdrake.pm:756
+#: ../rpmdrake.pm:755
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
-#: ../rpmdrake.pm:803
+#: ../rpmdrake.pm:802
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2941,7 +2954,7 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:824 ../rpmdrake.pm:835
+#: ../rpmdrake.pm:823 ../rpmdrake.pm:834
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2952,17 +2965,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:847
+#: ../rpmdrake.pm:846
 #, c-format
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:852
+#: ../rpmdrake.pm:851
 #, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:853
+#: ../rpmdrake.pm:852
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2973,7 +2986,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:866
+#: ../rpmdrake.pm:865
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2983,7 +2996,7 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 %s 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:868
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2993,302 +3006,236 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 Mandriva Linux 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:900
+#: ../rpmdrake.pm:899
 #, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../rpmdrake.pm:901
+#: ../rpmdrake.pm:900
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "已经启动帮助窗口，稍后桌面上将会出现。"
 
-#: ../grpmi/curl_download/curl_download.xs:86
-msgid "Download directory does not exist"
-msgstr "下载目录不存在"
+#: ../data/rpmdrake-browse-only.desktop.in.h:1
+msgid "A graphical front end for browsing installed & available packages"
+msgstr "浏览已安装和可安装软件的图形化工具"
 
-#: ../grpmi/curl_download/curl_download.xs:89
-#: ../grpmi/curl_download/curl_download.xs:213
-msgid "Out of memory\n"
-msgstr "内存溢出\n"
+#: ../data/rpmdrake-browse-only.desktop.in.h:2
+msgid "Browse Available Software"
+msgstr "浏览可用的软件"
 
-#: ../grpmi/curl_download/curl_download.xs:102
-msgid "Could not open output file in append mode"
-msgstr "不能在搜索路径中打开输出文件"
+#: ../data/rpmdrake.desktop.in.h:1
+msgid "A graphical front end for installing, removing and updating packages"
+msgstr "安装、删除和更新软件包的图形化工具"
 
-#: ../grpmi/curl_download/curl_download.xs:133
-msgid "Unsupported protocol\n"
-msgstr "不被支持的协议\n"
+#: ../data/rpmdrake.desktop.in.h:2
+msgid "Install & Remove Software"
+msgstr "安装/删除软件"
 
-#: ../grpmi/curl_download/curl_download.xs:136
-msgid "Failed init\n"
-msgstr "初始化失败\n"
+#: ../data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Media Manager"
+msgstr "软件介质管理器"
 
-#: ../grpmi/curl_download/curl_download.xs:139
-msgid "Bad URL format\n"
-msgstr "错误的 URL 类型\n"
+#: ../mime/gurpmi.addmedia.desktop.in.h:1
+msgid "Add urpmi media"
+msgstr "添加自定义介质"
 
-#: ../grpmi/curl_download/curl_download.xs:142
-msgid "Bad user format in URL\n"
-msgstr "在 URL 中有错误的用户\n"
+#: ../mime/x-urpmi-media.desktop.in.h:1
+msgid "Urpmi medium info"
+msgstr "Urpmi 介质信息"
 
-#: ../grpmi/curl_download/curl_download.xs:145
-msgid "Couldn't resolve proxy\n"
-msgstr "无法使用代理服务器\n"
+#~ msgid "Download directory does not exist"
+#~ msgstr "下载目录不存在"
 
-#: ../grpmi/curl_download/curl_download.xs:148
-msgid "Couldn't resolve host\n"
-msgstr "无法使用主机\n"
+#~ msgid "Out of memory\n"
+#~ msgstr "内存溢出\n"
 
-#: ../grpmi/curl_download/curl_download.xs:151
-msgid "Couldn't connect\n"
-msgstr "无法连接\n"
+#~ msgid "Could not open output file in append mode"
+#~ msgstr "不能在搜索路径中打开输出文件"
 
-#: ../grpmi/curl_download/curl_download.xs:154
-msgid "FTP unexpected server reply\n"
-msgstr "FTP 服务器出现异常回应\n"
+#~ msgid "Unsupported protocol\n"
+#~ msgstr "不被支持的协议\n"
 
-#: ../grpmi/curl_download/curl_download.xs:157
-msgid "FTP access denied\n"
-msgstr "FTP 连接被拒绝\n"
+#~ msgid "Failed init\n"
+#~ msgstr "初始化失败\n"
 
-#: ../grpmi/curl_download/curl_download.xs:160
-msgid "FTP user password incorrect\n"
-msgstr "FTP 用户名、密码错误\n"
+#~ msgid "Bad URL format\n"
+#~ msgstr "错误的 URL 类型\n"
 
-#: ../grpmi/curl_download/curl_download.xs:163
-msgid "FTP unexpected PASS reply\n"
-msgstr "FTP 的 PASS 回应异常\n"
+#~ msgid "Bad user format in URL\n"
+#~ msgstr "在 URL 中有错误的用户\n"
 
-#: ../grpmi/curl_download/curl_download.xs:166
-msgid "FTP unexpected USER reply\n"
-msgstr "FTP 的 USER 回应异常\n"
+#~ msgid "Couldn't resolve proxy\n"
+#~ msgstr "无法使用代理服务器\n"
 
-#: ../grpmi/curl_download/curl_download.xs:169
-msgid "FTP unexpected PASV reply\n"
-msgstr "FTP 的 PASV 回应异常\n"
+#~ msgid "Couldn't resolve host\n"
+#~ msgstr "无法使用主机\n"
 
-#: ../grpmi/curl_download/curl_download.xs:172
-msgid "FTP unexpected 227 format\n"
-msgstr "FTP 的 227 格式异常\n"
+#~ msgid "Couldn't connect\n"
+#~ msgstr "无法连接\n"
 
-#: ../grpmi/curl_download/curl_download.xs:175
-msgid "FTP can't get host\n"
-msgstr "FTP 无法连接到主机\n"
+#~ msgid "FTP unexpected server reply\n"
+#~ msgstr "FTP 服务器出现异常回应\n"
 
-#: ../grpmi/curl_download/curl_download.xs:178
-msgid "FTP can't reconnect\n"
-msgstr "FTP 无法重新连接\n"
+#~ msgid "FTP access denied\n"
+#~ msgstr "FTP 连接被拒绝\n"
 
-#: ../grpmi/curl_download/curl_download.xs:181
-msgid "FTP couldn't set binary\n"
-msgstr "FTP 无法设成二进制模式\n"
+#~ msgid "FTP user password incorrect\n"
+#~ msgstr "FTP 用户名、密码错误\n"
 
-#: ../grpmi/curl_download/curl_download.xs:184
-msgid "Partial file\n"
-msgstr "部分文件\n"
+#~ msgid "FTP unexpected PASS reply\n"
+#~ msgstr "FTP 的 PASS 回应异常\n"
 
-#: ../grpmi/curl_download/curl_download.xs:187
-msgid "FTP couldn't RETR file\n"
-msgstr "FTP 无法 RETR 文件\n"
+#~ msgid "FTP unexpected USER reply\n"
+#~ msgstr "FTP 的 USER 回应异常\n"
 
-#: ../grpmi/curl_download/curl_download.xs:190
-msgid "FTP write error\n"
-msgstr "FTP 写入错误\n"
+#~ msgid "FTP unexpected PASV reply\n"
+#~ msgstr "FTP 的 PASV 回应异常\n"
 
-#: ../grpmi/curl_download/curl_download.xs:195
-msgid "FTP quote error\n"
-msgstr "FTP 引用错误\n"
+#~ msgid "FTP unexpected 227 format\n"
+#~ msgstr "FTP 的 227 格式异常\n"
 
-#: ../grpmi/curl_download/curl_download.xs:198
-msgid "HTTP not found\n"
-msgstr "HTTP 无法找到\n"
+#~ msgid "FTP can't get host\n"
+#~ msgstr "FTP 无法连接到主机\n"
 
-#: ../grpmi/curl_download/curl_download.xs:201
-msgid "Write error\n"
-msgstr "写入错误\n"
+#~ msgid "FTP can't reconnect\n"
+#~ msgstr "FTP 无法重新连接\n"
 
-#: ../grpmi/curl_download/curl_download.xs:204
-msgid "User name illegally specified\n"
-msgstr "用户名列入非法清单\n"
+#~ msgid "FTP couldn't set binary\n"
+#~ msgstr "FTP 无法设成二进制模式\n"
 
-#: ../grpmi/curl_download/curl_download.xs:207
-msgid "FTP couldn't STOR file\n"
-msgstr "FTP 无法 STOR 文件\n"
+#~ msgid "Partial file\n"
+#~ msgstr "部分文件\n"
 
-#: ../grpmi/curl_download/curl_download.xs:210
-msgid "Read error\n"
-msgstr "读时出错\n"
+#~ msgid "FTP couldn't RETR file\n"
+#~ msgstr "FTP 无法 RETR 文件\n"
 
-#: ../grpmi/curl_download/curl_download.xs:216
-msgid "Time out\n"
-msgstr "超时\n"
+#~ msgid "FTP write error\n"
+#~ msgstr "FTP 写入错误\n"
 
-#: ../grpmi/curl_download/curl_download.xs:219
-msgid "FTP couldn't set ASCII\n"
-msgstr "FTP 无法设成 ASCII 模式\n"
+#~ msgid "FTP quote error\n"
+#~ msgstr "FTP 引用错误\n"
 
-#: ../grpmi/curl_download/curl_download.xs:222
-msgid "FTP PORT failed\n"
-msgstr "FTP PORT 失败\n"
+#~ msgid "HTTP not found\n"
+#~ msgstr "HTTP 无法找到\n"
 
-#: ../grpmi/curl_download/curl_download.xs:225
-msgid "FTP couldn't use REST\n"
-msgstr "FTP 无法使用 REST\n"
+#~ msgid "Write error\n"
+#~ msgstr "写入错误\n"
 
-#: ../grpmi/curl_download/curl_download.xs:228
-msgid "FTP couldn't get size\n"
-msgstr "FTP 无法获得大小\n"
+#~ msgid "User name illegally specified\n"
+#~ msgstr "用户名列入非法清单\n"
 
-#: ../grpmi/curl_download/curl_download.xs:231
-msgid "HTTP range error\n"
-msgstr "HTTP 范围出错\n"
+#~ msgid "FTP couldn't STOR file\n"
+#~ msgstr "FTP 无法 STOR 文件\n"
 
-#: ../grpmi/curl_download/curl_download.xs:234
-msgid "HTTP POST error\n"
-msgstr "HTTP POST 出错\n"
+#~ msgid "Read error\n"
+#~ msgstr "读时出错\n"
 
-#: ../grpmi/curl_download/curl_download.xs:237
-msgid "SSL connect error\n"
-msgstr "SSL 连接出错\n"
+#~ msgid "Time out\n"
+#~ msgstr "超时\n"
 
-#: ../grpmi/curl_download/curl_download.xs:240
-msgid "FTP bad download resume\n"
-msgstr "FTP 错误的下载续传\n"
+#~ msgid "FTP couldn't set ASCII\n"
+#~ msgstr "FTP 无法设成 ASCII 模式\n"
 
-#: ../grpmi/curl_download/curl_download.xs:243
-msgid "File couldn't read file\n"
-msgstr "文件无法读取文件\n"
+#~ msgid "FTP PORT failed\n"
+#~ msgstr "FTP PORT 失败\n"
 
-#: ../grpmi/curl_download/curl_download.xs:246
-msgid "LDAP cannot bind\n"
-msgstr "LDAP 无法绑定\n"
+#~ msgid "FTP couldn't use REST\n"
+#~ msgstr "FTP 无法使用 REST\n"
 
-#: ../grpmi/curl_download/curl_download.xs:249
-msgid "LDAP search failed\n"
-msgstr "LDAP 搜索失败\n"
+#~ msgid "FTP couldn't get size\n"
+#~ msgstr "FTP 无法获得大小\n"
 
-#: ../grpmi/curl_download/curl_download.xs:252
-msgid "Library not found\n"
-msgstr "无法找到库\n"
+#~ msgid "HTTP range error\n"
+#~ msgstr "HTTP 范围出错\n"
 
-#: ../grpmi/curl_download/curl_download.xs:255
-msgid "Function not found\n"
-msgstr "无法找到函数\n"
+#~ msgid "HTTP POST error\n"
+#~ msgstr "HTTP POST 出错\n"
 
-#: ../grpmi/curl_download/curl_download.xs:258
-msgid "Aborted by callback\n"
-msgstr "回调中止\n"
+#~ msgid "SSL connect error\n"
+#~ msgstr "SSL 连接出错\n"
 
-#: ../grpmi/curl_download/curl_download.xs:261
-msgid "Bad function argument\n"
-msgstr "错误的函数参数\n"
+#~ msgid "FTP bad download resume\n"
+#~ msgstr "FTP 错误的下载续传\n"
 
-#: ../grpmi/curl_download/curl_download.xs:264
-msgid "Bad calling order\n"
-msgstr "调用顺序错误\n"
+#~ msgid "File couldn't read file\n"
+#~ msgstr "文件无法读取文件\n"
 
-#: ../grpmi/curl_download/curl_download.xs:267
-msgid "HTTP Interface operation failed\n"
-msgstr "HTTP 界面操作失败\n"
+#~ msgid "LDAP cannot bind\n"
+#~ msgstr "LDAP 无法绑定\n"
 
-#: ../grpmi/curl_download/curl_download.xs:270
-msgid "my_getpass() returns fail\n"
-msgstr "my_getpass() 返回了失败消息\n"
+#~ msgid "LDAP search failed\n"
+#~ msgstr "LDAP 搜索失败\n"
 
-#: ../grpmi/curl_download/curl_download.xs:273
-msgid "catch endless re-direct loops\n"
-msgstr "得到了无休止的重定向循环\n"
+#~ msgid "Library not found\n"
+#~ msgstr "无法找到库\n"
 
-#: ../grpmi/curl_download/curl_download.xs:276
-msgid "User specified an unknown option\n"
-msgstr "用户指定了未知的选项\n"
+#~ msgid "Function not found\n"
+#~ msgstr "无法找到函数\n"
 
-#: ../grpmi/curl_download/curl_download.xs:279
-msgid "Malformed telnet option\n"
-msgstr "畸形的 Telnet 选项\n"
+#~ msgid "Aborted by callback\n"
+#~ msgstr "回调中止\n"
 
-#: ../grpmi/curl_download/curl_download.xs:282
-msgid "removed after 7.7.3\n"
-msgstr "删除 7.7.3 之后的\n"
+#~ msgid "Bad function argument\n"
+#~ msgstr "错误的函数参数\n"
 
-#: ../grpmi/curl_download/curl_download.xs:285
-msgid "peer's certificate wasn't ok\n"
-msgstr "对等认证未成功\n"
+#~ msgid "Bad calling order\n"
+#~ msgstr "调用顺序错误\n"
 
-#: ../grpmi/curl_download/curl_download.xs:288
-msgid "when this is a specific error\n"
-msgstr "当这儿有特殊的错误时\n"
+#~ msgid "HTTP Interface operation failed\n"
+#~ msgstr "HTTP 界面操作失败\n"
 
-#: ../grpmi/curl_download/curl_download.xs:291
-msgid "SSL crypto engine not found\n"
-msgstr "SSL 加密引擎没有找到\n"
+#~ msgid "my_getpass() returns fail\n"
+#~ msgstr "my_getpass() 返回了失败消息\n"
 
-#: ../grpmi/curl_download/curl_download.xs:294
-msgid "can not set SSL crypto engine as default\n"
-msgstr "无法把 SSL 加密引擎设为默认\n"
+#~ msgid "catch endless re-direct loops\n"
+#~ msgstr "得到了无休止的重定向循环\n"
 
-#: ../grpmi/curl_download/curl_download.xs:297
-msgid "failed sending network data\n"
-msgstr "发送网络数据时失败\n"
+#~ msgid "User specified an unknown option\n"
+#~ msgstr "用户指定了未知的选项\n"
 
-#: ../grpmi/curl_download/curl_download.xs:300
-msgid "failure in receiving network data\n"
-msgstr "接收网络数据时失败\n"
+#~ msgid "Malformed telnet option\n"
+#~ msgstr "畸形的 Telnet 选项\n"
 
-#: ../grpmi/curl_download/curl_download.xs:303
-msgid "share is in use\n"
-msgstr "共享已在使用中\n"
+#~ msgid "removed after 7.7.3\n"
+#~ msgstr "删除 7.7.3 之后的\n"
 
-#: ../grpmi/curl_download/curl_download.xs:306
-msgid "problem with the local certificate\n"
-msgstr "本地认证时出现问题\n"
+#~ msgid "peer's certificate wasn't ok\n"
+#~ msgstr "对等认证未成功\n"
 
-#: ../grpmi/curl_download/curl_download.xs:309
-msgid "couldn't use specified cipher\n"
-msgstr "无法使用特殊的密码\n"
+#~ msgid "when this is a specific error\n"
+#~ msgstr "当这儿有特殊的错误时\n"
 
-#: ../grpmi/curl_download/curl_download.xs:312
-msgid "problem with the CA cert (path?)\n"
-msgstr "CA 证书使用时出现问题(路径?)\n"
+#~ msgid "SSL crypto engine not found\n"
+#~ msgstr "SSL 加密引擎没有找到\n"
 
-#: ../grpmi/curl_download/curl_download.xs:315
-msgid "Unrecognized transfer encoding\n"
-msgstr "无法识别的传输代码\n"
+#~ msgid "can not set SSL crypto engine as default\n"
+#~ msgstr "无法把 SSL 加密引擎设为默认\n"
 
-#: ../grpmi/curl_download/curl_download.xs:320
-#, c-format
-msgid "Unknown error code %d\n"
-msgstr "未知的错误代码 %d\n"
+#~ msgid "failed sending network data\n"
+#~ msgstr "发送网络数据时失败\n"
 
-#: ../data/rpmdrake-browse-only.desktop.in.h:1
-msgid "A graphical front end for browsing installed & available packages"
-msgstr "浏览已安装和可安装软件的图形化工具"
+#~ msgid "failure in receiving network data\n"
+#~ msgstr "接收网络数据时失败\n"
 
-#: ../data/rpmdrake-browse-only.desktop.in.h:2
-msgid "Browse Available Software"
-msgstr "浏览可用的软件"
+#~ msgid "share is in use\n"
+#~ msgstr "共享已在使用中\n"
 
-#: ../data/rpmdrake.desktop.in.h:1
-msgid "A graphical front end for installing, removing and updating packages"
-msgstr "安装、删除和更新软件包的图形化工具"
+#~ msgid "problem with the local certificate\n"
+#~ msgstr "本地认证时出现问题\n"
 
-#: ../data/rpmdrake.desktop.in.h:2
-msgid "Install & Remove Software"
-msgstr "安装/删除软件"
+#~ msgid "couldn't use specified cipher\n"
+#~ msgstr "无法使用特殊的密码\n"
 
-#: ../data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Media Manager"
-msgstr "软件介质管理器"
+#~ msgid "problem with the CA cert (path?)\n"
+#~ msgstr "CA 证书使用时出现问题(路径?)\n"
 
-#: ../mime/gurpmi.addmedia.desktop.in.h:1
-msgid "Add urpmi media"
-msgstr "添加自定义介质"
+#~ msgid "Unrecognized transfer encoding\n"
+#~ msgstr "无法识别的传输代码\n"
 
-#: ../mime/x-urpmi-media.desktop.in.h:1
-msgid "Urpmi medium info"
-msgstr "Urpmi 介质信息"
+#~ msgid "Unknown error code %d\n"
+#~ msgstr "未知的错误代码 %d\n"
 
 #~ msgid ""
 #~ "This step enables you to add sources from a Mandriva Linux web or FTP "