sync with code

1 files changed, 176 insertions, 166 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 60e72526..7164f4de 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-11-24 13:43+0100\n"
+"POT-Creation-Date: 2009-02-14 00:30+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:103 ../Rpmdrake/gui.pm:855
+#: ../MandrivaUpdate:103 ../Rpmdrake/gui.pm:860
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -31,7 +31,7 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../MandrivaUpdate:126 ../rpmdrake:90 ../rpmdrake:725 ../rpmdrake.pm:212
+#: ../MandrivaUpdate:126 ../rpmdrake:90 ../rpmdrake:733 ../rpmdrake.pm:212
 #, c-format
 msgid "Software Management"
 msgstr "软件管理器"
@@ -46,12 +46,12 @@ msgstr "在此列出了软件包更新"
 msgid "Name"
 msgstr "名称"
 
-#: ../MandrivaUpdate:159 ../rpmdrake:275
+#: ../MandrivaUpdate:159 ../rpmdrake:278
 #, c-format
 msgid "Version"
 msgstr "版本"
 
-#: ../MandrivaUpdate:160 ../rpmdrake:279
+#: ../MandrivaUpdate:160 ../rpmdrake:282
 #, c-format
 msgid "Release"
 msgstr "释放"
@@ -61,12 +61,12 @@ msgstr "释放"
 msgid "Arch"
 msgstr "架构"
 
-#: ../MandrivaUpdate:175 ../Rpmdrake/edit_urpm_sources.pm:1145
+#: ../MandrivaUpdate:175 ../Rpmdrake/edit_urpm_sources.pm:1141
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../MandrivaUpdate:179 ../rpmdrake:652 ../rpmdrake.pm:820
+#: ../MandrivaUpdate:179 ../rpmdrake:660 ../rpmdrake.pm:820
 #, c-format
 msgid "Select all"
 msgstr "全选"
@@ -76,7 +76,7 @@ msgstr "全选"
 msgid "Update"
 msgstr "更新"
 
-#: ../MandrivaUpdate:200 ../rpmdrake:663
+#: ../MandrivaUpdate:200 ../rpmdrake:671
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -121,7 +121,7 @@ msgstr "可移动"
 msgid "rsync"
 msgstr "rsync"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:73
+#: ../Rpmdrake/edit_urpm_sources.pm:72
 #, c-format
 msgid "Mirror list"
 msgstr "镜像选择"
@@ -287,7 +287,7 @@ msgstr "介质类型:"
 #: ../Rpmdrake/edit_urpm_sources.pm:490 ../Rpmdrake/edit_urpm_sources.pm:517
 #: ../Rpmdrake/edit_urpm_sources.pm:598 ../Rpmdrake/edit_urpm_sources.pm:662
 #: ../Rpmdrake/edit_urpm_sources.pm:764 ../Rpmdrake/gui.pm:600
-#: ../Rpmdrake/init.pm:159 ../Rpmdrake/pkg.pm:179 ../Rpmdrake/pkg.pm:774
+#: ../Rpmdrake/init.pm:159 ../Rpmdrake/pkg.pm:179 ../Rpmdrake/pkg.pm:778
 #: ../rpmdrake.pm:326 ../rpmdrake.pm:667 ../rpmdrake.pm:739 ../rpmdrake.pm:816
 #, c-format
 msgid "Cancel"
@@ -297,9 +297,9 @@ msgstr "取消"
 #: ../Rpmdrake/edit_urpm_sources.pm:517 ../Rpmdrake/edit_urpm_sources.pm:588
 #: ../Rpmdrake/edit_urpm_sources.pm:661 ../Rpmdrake/edit_urpm_sources.pm:757
 #: ../Rpmdrake/edit_urpm_sources.pm:830 ../Rpmdrake/edit_urpm_sources.pm:944
-#: ../Rpmdrake/edit_urpm_sources.pm:1146 ../Rpmdrake/gui.pm:600
+#: ../Rpmdrake/edit_urpm_sources.pm:1142 ../Rpmdrake/gui.pm:600
 #: ../Rpmdrake/gui.pm:616 ../Rpmdrake/gui.pm:621 ../Rpmdrake/init.pm:159
-#: ../Rpmdrake/pkg.pm:574 ../Rpmdrake/pkg.pm:774 ../Rpmdrake/rpmnew.pm:180
+#: ../Rpmdrake/pkg.pm:575 ../Rpmdrake/pkg.pm:778 ../Rpmdrake/rpmnew.pm:180
 #: ../rpmdrake.pm:135 ../rpmdrake.pm:262 ../rpmdrake.pm:329 ../rpmdrake.pm:667
 #, c-format
 msgid "Ok"
@@ -533,14 +533,14 @@ msgid "Media limit:"
 msgstr "介质限制:"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:739 ../Rpmdrake/edit_urpm_sources.pm:748
-#: ../Rpmdrake/edit_urpm_sources.pm:932 ../Rpmdrake/edit_urpm_sources.pm:1133
+#: ../Rpmdrake/edit_urpm_sources.pm:932 ../Rpmdrake/edit_urpm_sources.pm:1129
 #, c-format
 msgid "Add"
 msgstr "添加"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:740 ../Rpmdrake/edit_urpm_sources.pm:749
 #: ../Rpmdrake/edit_urpm_sources.pm:810 ../Rpmdrake/edit_urpm_sources.pm:936
-#: ../Rpmdrake/edit_urpm_sources.pm:1123
+#: ../Rpmdrake/edit_urpm_sources.pm:1119
 #, c-format
 msgid "Remove"
 msgstr "删除"
@@ -576,7 +576,7 @@ msgid "Command"
 msgstr "命令"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:794 ../Rpmdrake/formatting.pm:129
-#: ../Rpmdrake/gui.pm:852 ../Rpmdrake/pkg.pm:93 ../Rpmdrake/pkg.pm:138
+#: ../Rpmdrake/gui.pm:857 ../Rpmdrake/pkg.pm:93 ../Rpmdrake/pkg.pm:138
 #: ../Rpmdrake/pkg.pm:149 ../Rpmdrake/pkg.pm:170 ../Rpmdrake/rpmnew.pm:76
 #, c-format
 msgid "(none)"
@@ -638,15 +638,15 @@ msgstr ""
 "您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
 "(密钥名称: %3$s)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:953 ../Rpmdrake/edit_urpm_sources.pm:1116
+#: ../Rpmdrake/edit_urpm_sources.pm:953 ../Rpmdrake/edit_urpm_sources.pm:1112
 #, c-format
 msgid "Configure media"
 msgstr "配置介质"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:960 ../Rpmdrake/edit_urpm_sources.pm:961
 #: ../Rpmdrake/edit_urpm_sources.pm:962 ../Rpmdrake/edit_urpm_sources.pm:963
-#: ../Rpmdrake/edit_urpm_sources.pm:964 ../rpmdrake:521 ../rpmdrake:524
-#: ../rpmdrake:529 ../rpmdrake:544 ../rpmdrake:545
+#: ../Rpmdrake/edit_urpm_sources.pm:964 ../rpmdrake:524 ../rpmdrake:527
+#: ../rpmdrake:532 ../rpmdrake:547 ../rpmdrake:548
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -666,16 +666,21 @@ msgstr "<control>U"
 msgid "/Add a specific _media mirror"
 msgstr ""
 
-#: ../Rpmdrake/edit_urpm_sources.pm:962 ../Rpmdrake/edit_urpm_sources.pm:963
-#, c-format
-msgid "<control>A"
-msgstr "<control>A"
+#: ../Rpmdrake/edit_urpm_sources.pm:962
+#, fuzzy, c-format
+msgid "<control>M"
+msgstr "<control>U"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:963
 #, c-format
 msgid "/_Add a custom medium"
 msgstr "/添加自定义介质(_A)"
 
+#: ../Rpmdrake/edit_urpm_sources.pm:963
+#, c-format
+msgid "<control>A"
+msgstr "<control>A"
+
 #: ../Rpmdrake/edit_urpm_sources.pm:964
 #, c-format
 msgid "/Close"
@@ -688,8 +693,8 @@ msgstr "<control>W"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:965 ../Rpmdrake/edit_urpm_sources.pm:966
 #: ../Rpmdrake/edit_urpm_sources.pm:967 ../Rpmdrake/edit_urpm_sources.pm:968
-#: ../Rpmdrake/edit_urpm_sources.pm:969 ../rpmdrake:517 ../rpmdrake:518
-#: ../rpmdrake:548 ../rpmdrake:555 ../rpmdrake:559 ../rpmdrake:615
+#: ../Rpmdrake/edit_urpm_sources.pm:969 ../rpmdrake:520 ../rpmdrake:521
+#: ../rpmdrake:551 ../rpmdrake:558 ../rpmdrake:562 ../rpmdrake:618
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
@@ -736,44 +741,44 @@ msgstr "<control>R"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:971 ../Rpmdrake/edit_urpm_sources.pm:972
 #: ../Rpmdrake/edit_urpm_sources.pm:973 ../Rpmdrake/edit_urpm_sources.pm:974
-#: ../rpmdrake:573 ../rpmdrake:574 ../rpmdrake:575 ../rpmdrake:576
+#: ../rpmdrake:576 ../rpmdrake:577 ../rpmdrake:578 ../rpmdrake:579
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:972 ../rpmdrake:574
+#: ../Rpmdrake/edit_urpm_sources.pm:972 ../rpmdrake:577
 #, c-format
 msgid "/_Report Bug"
 msgstr "/报告错误(_R)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:974 ../rpmdrake:576
+#: ../Rpmdrake/edit_urpm_sources.pm:974 ../rpmdrake:579
 #, c-format
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:977 ../rpmdrake:579
+#: ../Rpmdrake/edit_urpm_sources.pm:977 ../rpmdrake:582
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:979 ../rpmdrake:581
+#: ../Rpmdrake/edit_urpm_sources.pm:979 ../rpmdrake:584
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:981 ../rpmdrake:583
+#: ../Rpmdrake/edit_urpm_sources.pm:981 ../rpmdrake:586
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:983 ../rpmdrake:585
+#: ../Rpmdrake/edit_urpm_sources.pm:983 ../rpmdrake:588
 #, 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:988 ../rpmdrake:590
+#: ../Rpmdrake/edit_urpm_sources.pm:988 ../rpmdrake:593
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
@@ -798,7 +803,7 @@ msgstr "类型"
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "此介质需要更新才能使用。现在更新吗？"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1091
+#: ../Rpmdrake/edit_urpm_sources.pm:1087
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -809,12 +814,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1127
+#: ../Rpmdrake/edit_urpm_sources.pm:1123
 #, c-format
 msgid "Edit"
 msgstr "编辑"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1166
+#: ../Rpmdrake/edit_urpm_sources.pm:1162
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -896,7 +901,7 @@ msgstr "大小: "
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:174 ../Rpmdrake/gui.pm:223 ../rpmdrake.pm:875
+#: ../Rpmdrake/gui.pm:174 ../Rpmdrake/gui.pm:223 ../rpmdrake.pm:871
 #, c-format
 msgid "Medium: "
 msgstr "介质:"
@@ -947,8 +952,8 @@ msgid "Description: "
 msgstr "描述:"
 
 #: ../Rpmdrake/gui.pm:259 ../Rpmdrake/gui.pm:453 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/gui.pm:465 ../Rpmdrake/pkg.pm:784 ../Rpmdrake/pkg.pm:794
-#: ../rpmdrake.pm:796 ../rpmdrake.pm:914
+#: ../Rpmdrake/gui.pm:465 ../Rpmdrake/pkg.pm:788 ../Rpmdrake/pkg.pm:798
+#: ../Rpmdrake/pkg.pm:812 ../rpmdrake.pm:796 ../rpmdrake.pm:910
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -994,7 +999,7 @@ msgstr ""
 "“%s”包位于 urpmi 跳过列表中。\n"
 "您是否仍然要选择该软件包？"
 
-#: ../Rpmdrake/gui.pm:465 ../Rpmdrake/pkg.pm:668
+#: ../Rpmdrake/gui.pm:465 ../Rpmdrake/pkg.pm:669
 #, c-format
 msgid ""
 "Rpmdrake or one of its priority dependencies needs to be updated first. "
@@ -1038,24 +1043,24 @@ msgstr "该软件包的信息"
 msgid "Checking dependencies of package..."
 msgstr "正在检查包的依赖关系..."
 
-#: ../Rpmdrake/gui.pm:642
+#: ../Rpmdrake/gui.pm:640
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../Rpmdrake/gui.pm:643
+#: ../Rpmdrake/gui.pm:651
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "为了满足所有的依赖关系，需要删除下列软件包:"
 
-#: ../Rpmdrake/gui.pm:649 ../Rpmdrake/gui.pm:659
+#: ../Rpmdrake/gui.pm:656
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../Rpmdrake/gui.pm:650
+#: ../Rpmdrake/gui.pm:657
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1064,7 +1069,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:660 ../Rpmdrake/gui.pm:737
+#: ../Rpmdrake/gui.pm:666 ../Rpmdrake/gui.pm:742
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1074,12 +1079,12 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:690
+#: ../Rpmdrake/gui.pm:695
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../Rpmdrake/gui.pm:691
+#: ../Rpmdrake/gui.pm:696
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1089,22 +1094,27 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:713
+#: ../Rpmdrake/gui.pm:704
+#, fuzzy, c-format
+msgid "Conflicting Packages"
+msgstr "匹配软件包："
+
+#: ../Rpmdrake/gui.pm:718
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (属于跳过列表)"
 
-#: ../Rpmdrake/gui.pm:717
+#: ../Rpmdrake/gui.pm:722
 #, c-format
 msgid "One package cannot be installed"
 msgstr "软件包无法安装"
 
-#: ../Rpmdrake/gui.pm:717
+#: ../Rpmdrake/gui.pm:722
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../Rpmdrake/gui.pm:719
+#: ../Rpmdrake/gui.pm:724
 #, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -1115,7 +1125,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:720
+#: ../Rpmdrake/gui.pm:725
 #, c-format
 msgid ""
 "Sorry, the following packages can't be selected:\n"
@@ -1126,27 +1136,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:736 ../Rpmdrake/pkg.pm:672
+#: ../Rpmdrake/gui.pm:741 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../Rpmdrake/gui.pm:769
+#: ../Rpmdrake/gui.pm:774
 #, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "错误：%s 似乎是以只读方式挂载的。"
 
-#: ../Rpmdrake/gui.pm:773
+#: ../Rpmdrake/gui.pm:778
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
-#: ../Rpmdrake/gui.pm:778
+#: ../Rpmdrake/gui.pm:783
 #, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../Rpmdrake/gui.pm:779
+#: ../Rpmdrake/gui.pm:784
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1161,48 +1171,48 @@ msgstr ""
 "\n"
 "您真的想要安装所有选中的软件包吗?"
 
-#: ../Rpmdrake/gui.pm:805 ../Rpmdrake/open_db.pm:89
+#: ../Rpmdrake/gui.pm:810 ../Rpmdrake/open_db.pm:92
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../Rpmdrake/gui.pm:806 ../Rpmdrake/open_db.pm:90 ../Rpmdrake/pkg.pm:391
+#: ../Rpmdrake/gui.pm:811 ../Rpmdrake/open_db.pm:93 ../Rpmdrake/pkg.pm:392
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: ../Rpmdrake/gui.pm:841
+#: ../Rpmdrake/gui.pm:846
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../Rpmdrake/gui.pm:854
+#: ../Rpmdrake/gui.pm:859
 #, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../Rpmdrake/gui.pm:881 ../Rpmdrake/icon.pm:35 ../rpmdrake:354
-#: ../rpmdrake:381
+#: ../Rpmdrake/gui.pm:886 ../Rpmdrake/icon.pm:35 ../rpmdrake:357
+#: ../rpmdrake:384
 #, c-format
 msgid "All"
 msgstr "全部"
 
-#: ../Rpmdrake/gui.pm:891 ../rpmdrake:193
+#: ../Rpmdrake/gui.pm:896 ../rpmdrake:193
 #, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../Rpmdrake/gui.pm:891 ../rpmdrake:355
+#: ../Rpmdrake/gui.pm:896 ../rpmdrake:358
 #, c-format
 msgid "Installed"
 msgstr "已安装"
 
-#: ../Rpmdrake/gui.pm:892 ../rpmdrake:193
+#: ../Rpmdrake/gui.pm:897 ../rpmdrake:193
 #, c-format
 msgid "Addable"
 msgstr "可添加"
 
-#: ../Rpmdrake/gui.pm:904
+#: ../Rpmdrake/gui.pm:909
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "此软件包的描述不可用\n"
@@ -1948,8 +1958,8 @@ msgstr "正在从 %s 获取 XML 元数据..."
 msgid "Getting '%s' from XML meta-data..."
 msgstr "正在从 XML 元数据获取“%s”..."
 
-#: ../Rpmdrake/pkg.pm:111 ../Rpmdrake/pkg.pm:359 ../Rpmdrake/pkg.pm:692
-#: ../Rpmdrake/pkg.pm:882 ../rpmdrake:127 ../rpmdrake.pm:354
+#: ../Rpmdrake/pkg.pm:111 ../Rpmdrake/pkg.pm:360 ../Rpmdrake/pkg.pm:693
+#: ../Rpmdrake/pkg.pm:893 ../rpmdrake:127 ../rpmdrake.pm:354
 #: ../rpmdrake.pm:563
 #, c-format
 msgid "Please wait"
@@ -1981,7 +1991,7 @@ msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../Rpmdrake/pkg.pm:229 ../Rpmdrake/pkg.pm:672
+#: ../Rpmdrake/pkg.pm:229 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -2064,73 +2074,73 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../Rpmdrake/pkg.pm:359 ../Rpmdrake/pkg.pm:692
+#: ../Rpmdrake/pkg.pm:360 ../Rpmdrake/pkg.pm:693
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../Rpmdrake/pkg.pm:359 ../Rpmdrake/pkg.pm:692 ../Rpmdrake/pkg.pm:882
+#: ../Rpmdrake/pkg.pm:360 ../Rpmdrake/pkg.pm:693 ../Rpmdrake/pkg.pm:893
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../Rpmdrake/pkg.pm:374
+#: ../Rpmdrake/pkg.pm:375
 #, c-format
 msgid "Reading updates description"
 msgstr "读取更新描述"
 
-#: ../Rpmdrake/pkg.pm:380 ../Rpmdrake/pkg.pm:416
+#: ../Rpmdrake/pkg.pm:381 ../Rpmdrake/pkg.pm:417
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:386
+#: ../Rpmdrake/pkg.pm:387
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "正在列出基本软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:391 ../Rpmdrake/pkg.pm:808 ../Rpmdrake/pkg.pm:831
-#: ../rpmdrake.pm:783 ../rpmdrake.pm:873 ../rpmdrake.pm:897
+#: ../Rpmdrake/pkg.pm:392 ../Rpmdrake/pkg.pm:817 ../Rpmdrake/pkg.pm:842
+#: ../rpmdrake.pm:783 ../rpmdrake.pm:869 ../rpmdrake.pm:893
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../Rpmdrake/pkg.pm:399
+#: ../Rpmdrake/pkg.pm:400
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "正在寻找已安装的软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:554
+#: ../Rpmdrake/pkg.pm:555
 #, c-format
 msgid "Upgrade information"
 msgstr "升级信息"
 
-#: ../Rpmdrake/pkg.pm:556
+#: ../Rpmdrake/pkg.pm:557
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../Rpmdrake/pkg.pm:564
+#: ../Rpmdrake/pkg.pm:565
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "关于此软件包的升级信息"
 
-#: ../Rpmdrake/pkg.pm:567
+#: ../Rpmdrake/pkg.pm:568
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "关于软件包 %s 的升级信息"
 
-#: ../Rpmdrake/pkg.pm:589 ../Rpmdrake/pkg.pm:825
+#: ../Rpmdrake/pkg.pm:590 ../Rpmdrake/pkg.pm:834
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../Rpmdrake/pkg.pm:593 ../Rpmdrake/pkg.pm:799
+#: ../Rpmdrake/pkg.pm:594 ../Rpmdrake/pkg.pm:803
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:594 ../Rpmdrake/pkg.pm:614 ../Rpmdrake/pkg.pm:801
+#: ../Rpmdrake/pkg.pm:595 ../Rpmdrake/pkg.pm:615 ../Rpmdrake/pkg.pm:805
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2141,27 +2151,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:613
+#: ../Rpmdrake/pkg.pm:614
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../Rpmdrake/pkg.pm:633
+#: ../Rpmdrake/pkg.pm:634
 #, c-format
 msgid "Checking validity of requested packages..."
 msgstr "正在检查所请求软件包的完整性..."
 
-#: ../Rpmdrake/pkg.pm:649
+#: ../Rpmdrake/pkg.pm:650
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../Rpmdrake/pkg.pm:650
+#: ../Rpmdrake/pkg.pm:651
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../Rpmdrake/pkg.pm:651
+#: ../Rpmdrake/pkg.pm:652
 #, c-format
 msgid ""
 "\n"
@@ -2174,100 +2184,100 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/pkg.pm:670
 #, 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:675
+#: ../Rpmdrake/pkg.pm:676
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../Rpmdrake/pkg.pm:677
+#: ../Rpmdrake/pkg.pm:678
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:678
+#: ../Rpmdrake/pkg.pm:679
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:681
+#: ../Rpmdrake/pkg.pm:682
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../Rpmdrake/pkg.pm:683
+#: ../Rpmdrake/pkg.pm:684
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:866
+#: ../Rpmdrake/pkg.pm:700 ../Rpmdrake/pkg.pm:877
 #, c-format
 msgid "Orphan packages"
 msgstr "孤立软件包"
 
-#: ../Rpmdrake/pkg.pm:699
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包即将删除。"
 
-#: ../Rpmdrake/pkg.pm:713
+#: ../Rpmdrake/pkg.pm:714
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../Rpmdrake/pkg.pm:713
+#: ../Rpmdrake/pkg.pm:714
 #, c-format
 msgid "Preparing package installation transaction..."
 msgstr "正在准备安装交易..."
 
-#: ../Rpmdrake/pkg.pm:716
+#: ../Rpmdrake/pkg.pm:717
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:717
+#: ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Total: %s/%s"
 msgstr "总计: %s/%s"
 
-#: ../Rpmdrake/pkg.pm:772
+#: ../Rpmdrake/pkg.pm:776
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../Rpmdrake/pkg.pm:773
+#: ../Rpmdrake/pkg.pm:777
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入名为“%s”的介质"
 
-#: ../Rpmdrake/pkg.pm:777
+#: ../Rpmdrake/pkg.pm:781
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../Rpmdrake/pkg.pm:800
+#: ../Rpmdrake/pkg.pm:804
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: ../Rpmdrake/pkg.pm:809
+#: ../Rpmdrake/pkg.pm:818
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../Rpmdrake/pkg.pm:812
+#: ../Rpmdrake/pkg.pm:821
 #, c-format
 msgid "Inspecting configuration files..."
 msgstr "正在检查配置文件..."
 
-#: ../Rpmdrake/pkg.pm:820
+#: ../Rpmdrake/pkg.pm:829
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2280,37 +2290,37 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../Rpmdrake/pkg.pm:826
+#: ../Rpmdrake/pkg.pm:835
 #, c-format
 msgid "Looking for \"README\" files..."
 msgstr "正在查找“README”文件..."
 
-#: ../Rpmdrake/pkg.pm:857
+#: ../Rpmdrake/pkg.pm:868
 #, c-format
 msgid "RPM transaction %d/%d"
 msgstr "RPM 交易 %d/%d"
 
-#: ../Rpmdrake/pkg.pm:858
+#: ../Rpmdrake/pkg.pm:869
 #, c-format
 msgid "Unselect all"
 msgstr "全不选"
 
-#: ../Rpmdrake/pkg.pm:859
+#: ../Rpmdrake/pkg.pm:870
 #, c-format
 msgid "Details"
 msgstr "细节"
 
-#: ../Rpmdrake/pkg.pm:882 ../Rpmdrake/pkg.pm:898
+#: ../Rpmdrake/pkg.pm:893 ../Rpmdrake/pkg.pm:909
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:911
+#: ../Rpmdrake/pkg.pm:922
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:912
+#: ../Rpmdrake/pkg.pm:923
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2451,217 +2461,217 @@ msgstr "选中"
 msgid "Not selected"
 msgstr "未选中"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:234
 #, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "选中软件: %s / 剩余磁盘空间: %s"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:274
 #, c-format
 msgid "Package"
 msgstr "软件包"
 
 #. -PO: "Architecture" but to be kept *small* !!!
-#: ../rpmdrake:285
+#: ../rpmdrake:288
 #, c-format
 msgid "Arch."
 msgstr "架构"
 
 #. -PO: "Status" should be kept *small* !!!
-#: ../rpmdrake:313
+#: ../rpmdrake:316
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../rpmdrake:356
+#: ../rpmdrake:359
 #, c-format
 msgid "Not installed"
 msgstr "未安装"
 
-#: ../rpmdrake:371
+#: ../rpmdrake:374
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按字母次序排列"
 
-#: ../rpmdrake:372
+#: ../rpmdrake:375
 #, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按组别排列"
 
-#: ../rpmdrake:373
+#: ../rpmdrake:376
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "不分类，按安装日期排列"
 
-#: ../rpmdrake:374
+#: ../rpmdrake:377
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:375
+#: ../rpmdrake:378
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:376
+#: ../rpmdrake:379
 #, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:377
+#: ../rpmdrake:380
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全部软件包，按介质仓库排列"
 
 #. -PO: Backports media are newer but less-tested versions of some packages in main
 #. -PO: See http://wiki.mandriva.com/en/Policies/SoftwareMedia#.2Fmain.2Fbackports
-#: ../rpmdrake:385
+#: ../rpmdrake:388
 #, c-format
 msgid "Backports"
 msgstr "移植"
 
-#: ../rpmdrake:386
+#: ../rpmdrake:389
 #, c-format
 msgid "Meta packages"
 msgstr "元软件包"
 
-#: ../rpmdrake:387
+#: ../rpmdrake:390
 #, c-format
 msgid "Packages with GUI"
 msgstr "有图形界面的软件包"
 
-#: ../rpmdrake:388
+#: ../rpmdrake:391
 #, c-format
 msgid "All updates"
 msgstr "全部更新"
 
-#: ../rpmdrake:389
+#: ../rpmdrake:392
 #, c-format
 msgid "Security updates"
 msgstr "安全更新"
 
-#: ../rpmdrake:390
+#: ../rpmdrake:393
 #, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:391
+#: ../rpmdrake:394
 #, c-format
 msgid "General updates"
 msgstr "常规更新"
 
-#: ../rpmdrake:414
+#: ../rpmdrake:417
 #, c-format
 msgid "View"
 msgstr "查看"
 
-#: ../rpmdrake:442
+#: ../rpmdrake:445
 #, c-format
 msgid "Filter"
 msgstr "过滤"
 
-#: ../rpmdrake:478
+#: ../rpmdrake:481
 #, c-format
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:478
+#: ../rpmdrake:481
 #, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:478
+#: ../rpmdrake:481
 #, c-format
 msgid "in summaries"
 msgstr "在摘要中"
 
-#: ../rpmdrake:478
+#: ../rpmdrake:481
 #, c-format
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:517
+#: ../rpmdrake:520
 #, c-format
 msgid "/_Select dependencies without asking"
 msgstr "/直接选择依赖关系无需询问(_S)"
 
-#: ../rpmdrake:518
+#: ../rpmdrake:521
 #, c-format
 msgid "Clear download cache after successfull install"
 msgstr ""
 
-#: ../rpmdrake:524
+#: ../rpmdrake:527
 #, c-format
 msgid "/_Update media"
 msgstr "/更新介质(_U)"
 
-#: ../rpmdrake:529
+#: ../rpmdrake:532
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/重置选中内容(_R)"
 
-#: ../rpmdrake:544
+#: ../rpmdrake:547
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新装入软件包清单(_P)"
 
-#: ../rpmdrake:545
+#: ../rpmdrake:548
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../rpmdrake:545
+#: ../rpmdrake:548
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:555
+#: ../rpmdrake:558
 #, c-format
 msgid "/_Media Manager"
 msgstr "/介质管理器(_M)"
 
-#: ../rpmdrake:559 ../rpmdrake:615
+#: ../rpmdrake:562 ../rpmdrake:618
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/自动显示选中的软件包(_S)"
 
-#: ../rpmdrake:563 ../rpmdrake:566 ../rpmdrake:571 ../rpmdrake:603
+#: ../rpmdrake:566 ../rpmdrake:569 ../rpmdrake:574 ../rpmdrake:606
 #, c-format
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: ../rpmdrake:631
+#: ../rpmdrake:639
 #, c-format
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:634
+#: ../rpmdrake:642
 #, c-format
 msgid "Find"
 msgstr "查找"
 
-#: ../rpmdrake:659
+#: ../rpmdrake:667
 #, c-format
 msgid "Apply"
 msgstr "应用"
 
-#: ../rpmdrake:678
+#: ../rpmdrake:686
 #, c-format
 msgid "Quick Introduction"
 msgstr "简介"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:687
 #, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "您可以使用左侧的类别树浏览软件包。"
 
-#: ../rpmdrake:680
+#: ../rpmdrake:688
 #, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr "单击右侧列表中的软件包可以查看其信息。"
 
-#: ../rpmdrake:681
+#: ../rpmdrake:689
 #, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr "要安装、更新或删除软件包，只需单击相应的复选框。"
@@ -3062,7 +3072,7 @@ msgstr "未找到活动的介质。您必须启用某些介质才能进行更新
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
-#: ../rpmdrake.pm:853
+#: ../rpmdrake.pm:849
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -3075,7 +3085,7 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:874 ../rpmdrake.pm:885
+#: ../rpmdrake.pm:870 ../rpmdrake.pm:881
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -3086,17 +3096,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:897
+#: ../rpmdrake.pm:893
 #, c-format
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:902
+#: ../rpmdrake.pm:898
 #, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:903
+#: ../rpmdrake.pm:899
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -3107,7 +3117,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:916
+#: ../rpmdrake.pm:912
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -3117,7 +3127,7 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 %s 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:919
+#: ../rpmdrake.pm:915
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -3127,12 +3137,12 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 Mandriva Linux 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:960
+#: ../rpmdrake.pm:956
 #, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../rpmdrake.pm:961
+#: ../rpmdrake.pm:957
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."