merge

1 files changed, 197 insertions, 187 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c79c8432..989a02ed 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2004-07-28 09:17+0200\n"
+"POT-Creation-Date: 2004-07-29 13:49+0200\n"
 "PO-Revision-Date: 2004-02-21 14:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -60,7 +60,7 @@ msgstr "可移动设备"
 msgid "Path or mount point:"
 msgstr "路径或挂载点:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:750
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:752
 #, c-format
 msgid "Security updates"
 msgstr "安全更新"
@@ -127,8 +127,8 @@ msgstr "介质类型:"
 #: ../edit-urpm-sources.pl:406 ../edit-urpm-sources.pl:447
 #: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:568
 #: ../edit-urpm-sources.pl:605 ../edit-urpm-sources.pl:716 ../rpmdrake:93
-#: ../rpmdrake:524 ../rpmdrake:540 ../rpmdrake:545 ../rpmdrake:1221
-#: ../rpmdrake:1282 ../rpmdrake:1416 ../rpmdrake.pm:182 ../rpmdrake.pm:231
+#: ../rpmdrake:526 ../rpmdrake:542 ../rpmdrake:547 ../rpmdrake:1223
+#: ../rpmdrake:1284 ../rpmdrake:1418 ../rpmdrake.pm:182 ../rpmdrake.pm:231
 #: ../rpmdrake.pm:436
 #, c-format
 msgid "Ok"
@@ -138,7 +138,7 @@ msgstr "确定"
 #: ../edit-urpm-sources.pl:233 ../edit-urpm-sources.pl:293
 #: ../edit-urpm-sources.pl:373 ../edit-urpm-sources.pl:407
 #: ../edit-urpm-sources.pl:454 ../edit-urpm-sources.pl:573 ../rpmdrake:93
-#: ../rpmdrake:524 ../rpmdrake:1282 ../rpmdrake:1288 ../rpmdrake.pm:436
+#: ../rpmdrake:526 ../rpmdrake:1284 ../rpmdrake:1290 ../rpmdrake.pm:436
 #: ../rpmdrake.pm:571
 #, c-format
 msgid "Cancel"
@@ -273,7 +273,7 @@ msgid "Add"
 msgstr "添加"
 
 #: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:444
-#: ../edit-urpm-sources.pl:493 ../edit-urpm-sources.pl:694 ../rpmdrake:1021
+#: ../edit-urpm-sources.pl:493 ../edit-urpm-sources.pl:694 ../rpmdrake:1023
 #, c-format
 msgid "Remove"
 msgstr "卸载"
@@ -308,8 +308,8 @@ msgstr "介质限制"
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:482 ../rpmdrake:262 ../rpmdrake:279 ../rpmdrake:389
-#: ../rpmdrake:461
+#: ../edit-urpm-sources.pl:482 ../rpmdrake:264 ../rpmdrake:281 ../rpmdrake:391
+#: ../rpmdrake:463
 #, c-format
 msgid "(none)"
 msgstr "(无)"
@@ -423,23 +423,23 @@ msgstr "管理密钥..."
 msgid "Parallel..."
 msgstr "并行..."
 
-#: ../edit-urpm-sources.pl:711 ../rpmdrake:1010
+#: ../edit-urpm-sources.pl:711 ../rpmdrake:1012
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:1013
+#: ../edit-urpm-sources.pl:713 ../rpmdrake:1015
 #, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../edit-urpm-sources.pl:714 ../rpmdrake:1014
+#: ../edit-urpm-sources.pl:714 ../rpmdrake:1016
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "已经启动帮助窗口，稍后桌面上将会出现。"
 
-#: ../edit-urpm-sources.pl:725 ../gurpmi.addmedia:75 ../rpmdrake:1526
+#: ../edit-urpm-sources.pl:725 ../gurpmi.addmedia:75 ../rpmdrake:1528
 #, c-format
 msgid ""
 "%s\n"
@@ -537,8 +537,8 @@ msgid "Compression"
 msgstr "压缩"
 
 #: ../rpmdrake:102 ../rpmdrake:107 ../rpmdrake:119 ../rpmdrake:130
-#: ../rpmdrake:139 ../rpmdrake:150 ../rpmdrake:161 ../rpmdrake:169
-#: ../rpmdrake:240
+#: ../rpmdrake:139 ../rpmdrake:151 ../rpmdrake:163 ../rpmdrake:171
+#: ../rpmdrake:242
 #, c-format
 msgid "Other"
 msgstr "其它"
@@ -753,311 +753,321 @@ msgstr "图形"
 msgid "Monitoring"
 msgstr "监视"
 
-#: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
-#: ../rpmdrake:152 ../rpmdrake:168
+#: ../rpmdrake:144
+#, c-format
+msgid "Multimedia"
+msgstr ""
+
+#: ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147 ../rpmdrake:148
+#: ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151 ../rpmdrake:152
+#: ../rpmdrake:153 ../rpmdrake:170
 #, c-format
 msgid "Networking"
 msgstr "网络"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:145
 #, c-format
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:146
 #, c-format
 msgid "File transfer"
 msgstr "文件传送"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:147
 #, c-format
 msgid "Instant messaging"
 msgstr "即时通讯"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:148
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:149
 #, c-format
 msgid "Mail"
 msgstr "邮件"
 
-#: ../rpmdrake:149
+#: ../rpmdrake:150
 #, c-format
 msgid "News"
 msgstr "新闻"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:152
 #, c-format
 msgid "Remote access"
 msgstr "远程访问"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:153
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:154
 #, c-format
 msgid "Office"
 msgstr "办公"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:155
+#, c-format
+msgid "Public Keys"
+msgstr ""
+
+#: ../rpmdrake:156
 #, c-format
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
+#: ../rpmdrake:157 ../rpmdrake:158 ../rpmdrake:159 ../rpmdrake:160
+#: ../rpmdrake:161 ../rpmdrake:162 ../rpmdrake:163 ../rpmdrake:164
 #, c-format
 msgid "Sciences"
 msgstr "科学"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:157
 #, c-format
 msgid "Astronomy"
 msgstr "天文"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:158
 #, c-format
 msgid "Biology"
 msgstr "生物"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:159
 #, c-format
 msgid "Chemistry"
 msgstr "化学"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:160
 #, c-format
 msgid "Computer science"
 msgstr "计算机科学"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:161
 #, c-format
 msgid "Geosciences"
 msgstr "地球科学"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:162
 #, c-format
 msgid "Mathematics"
 msgstr "数学"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:164
 #, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:165
 #, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:166
 #, c-format
 msgid "Sound"
 msgstr "声音"
 
-#: ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167 ../rpmdrake:168
-#: ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171 ../rpmdrake:172
-#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
-#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
-#: ../rpmdrake:181
+#: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
+#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
+#: ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177 ../rpmdrake:178
+#: ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181 ../rpmdrake:182
+#: ../rpmdrake:183
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:167
 #, c-format
 msgid "Base"
 msgstr "基本"
 
-#: ../rpmdrake:166 ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169
-#: ../rpmdrake:170 ../rpmdrake:171
+#: ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171
+#: ../rpmdrake:172 ../rpmdrake:173
 #, c-format
 msgid "Configuration"
 msgstr "配置"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:168
 #, c-format
 msgid "Boot and Init"
 msgstr "启动和初始化"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:169
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:172
 #, c-format
 msgid "Packaging"
 msgstr "打包"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:173
 #, c-format
 msgid "Printing"
 msgstr "打印"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:174
 #, fuzzy, c-format
 msgid "Deploiement"
 msgstr "开发"
 
-#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
+#: ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177 ../rpmdrake:178
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: ../rpmdrake:173
+#: ../rpmdrake:175
 #, c-format
 msgid "Console"
 msgstr "控制台"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:176
 #, c-format
 msgid "True type"
 msgstr "TrueType"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:177
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:178
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 位图"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:179
 #, c-format
 msgid "Internationalization"
 msgstr "国际化"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:180
 #, c-format
 msgid "Kernel and hardware"
 msgstr "内核和硬件"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:181
 #, c-format
 msgid "Libraries"
 msgstr "库"
 
-#: ../rpmdrake:180
+#: ../rpmdrake:182
 #, c-format
 msgid "Servers"
 msgstr "服务器"
 
-#: ../rpmdrake:181
+#: ../rpmdrake:183
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:184
 #, c-format
 msgid "Terminals"
 msgstr "终端"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:185
 #, c-format
 msgid "Text tools"
 msgstr "文本工具"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:186
 #, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:187
 #, c-format
 msgid "Video"
 msgstr "视频"
 
-#: ../rpmdrake:285 ../rpmdrake:665 ../rpmdrake:666
+#: ../rpmdrake:287 ../rpmdrake:667 ../rpmdrake:668
 #, c-format
 msgid "(Not available)"
 msgstr "(不可用)"
 
-#: ../rpmdrake:313 ../rpmdrake:370
+#: ../rpmdrake:315 ../rpmdrake:372
 #, c-format
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../rpmdrake:313
+#: ../rpmdrake:315
 #, c-format
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake:323 ../rpmdrake:334
+#: ../rpmdrake:325 ../rpmdrake:336
 #, c-format
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
 
-#: ../rpmdrake:332 ../rpmdrake:1067 ../rpmdrake:1313 ../rpmdrake:1525
+#: ../rpmdrake:334 ../rpmdrake:1069 ../rpmdrake:1315 ../rpmdrake:1527
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:337
+#: ../rpmdrake:339
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:371 ../rpmdrake:490
+#: ../rpmdrake:373 ../rpmdrake:492
 #, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../rpmdrake:371 ../rpmdrake:490
+#: ../rpmdrake:373 ../rpmdrake:492
 #, c-format
 msgid "Addable"
 msgstr "可添加"
 
-#: ../rpmdrake:373
+#: ../rpmdrake:375
 #, c-format
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake:373
+#: ../rpmdrake:375
 #, c-format
 msgid "Not selected"
 msgstr "未选中"
 
-#: ../rpmdrake:407
+#: ../rpmdrake:409
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:425 ../rpmdrake:535 ../rpmdrake:537 ../rpmdrake:1406
-#: ../rpmdrake:1409
+#: ../rpmdrake:427 ../rpmdrake:537 ../rpmdrake:539 ../rpmdrake:1408
+#: ../rpmdrake:1411
 #, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../rpmdrake:426
+#: ../rpmdrake:428
 #, c-format
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../rpmdrake:426
+#: ../rpmdrake:428
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:448
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake:463
+#: ../rpmdrake:465
 #, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake:464
+#: ../rpmdrake:466
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1067,28 +1077,28 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:486
 #, c-format
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:524 ../rpmdrake:527
+#: ../rpmdrake:526 ../rpmdrake:529
 #, c-format
 msgid "More info"
 msgstr "更多信息"
 
-#: ../rpmdrake:530 ../rpmdrake:1396
+#: ../rpmdrake:532 ../rpmdrake:1398
 #, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../rpmdrake:553
+#: ../rpmdrake:555
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake:554
+#: ../rpmdrake:556
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1098,12 +1108,12 @@ msgstr ""
 "为了满足所有的依赖关系，需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:560 ../rpmdrake:569
+#: ../rpmdrake:562 ../rpmdrake:571
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake:561
+#: ../rpmdrake:563
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1112,7 +1122,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../rpmdrake:570 ../rpmdrake:631
+#: ../rpmdrake:572 ../rpmdrake:633
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1122,12 +1132,12 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:599
+#: ../rpmdrake:601
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake:600
+#: ../rpmdrake:602
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1137,17 +1147,17 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:614
+#: ../rpmdrake:616
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:616
+#: ../rpmdrake:618
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake:617
+#: ../rpmdrake:619
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1158,187 +1168,187 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:630 ../rpmdrake:947
+#: ../rpmdrake:632 ../rpmdrake:949
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake:649
+#: ../rpmdrake:651
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中软件: %d MB / 剩余磁盘空间: %d MB"
 
-#: ../rpmdrake:651
+#: ../rpmdrake:653
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中大小: %d MB"
 
-#: ../rpmdrake:657
+#: ../rpmdrake:659
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:663
+#: ../rpmdrake:665
 #, c-format
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../rpmdrake:666
+#: ../rpmdrake:668
 #, c-format
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../rpmdrake:668
+#: ../rpmdrake:670
 #, c-format
 msgid "Medium: "
 msgstr "介质:"
 
-#: ../rpmdrake:670
+#: ../rpmdrake:672
 #, c-format
 msgid "Currently installed version: "
 msgstr "当前安装的版本:"
 
-#: ../rpmdrake:675
+#: ../rpmdrake:677
 #, c-format
 msgid "Name: "
 msgstr "名称:"
 
-#: ../rpmdrake:676
+#: ../rpmdrake:678
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: ../rpmdrake:677
+#: ../rpmdrake:679
 #, c-format
 msgid "Size: "
 msgstr "大小:"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:679
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:681
 #, c-format
 msgid "Importance: "
 msgstr "重要性:"
 
-#: ../rpmdrake:681
+#: ../rpmdrake:683
 #, c-format
 msgid "Summary: "
 msgstr "摘要:"
 
-#: ../rpmdrake:683
+#: ../rpmdrake:685
 #, c-format
 msgid "Reason for update: "
 msgstr "更新原因:"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:687
 #, c-format
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake:750
+#: ../rpmdrake:752
 #, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:750
+#: ../rpmdrake:752
 #, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake:768
+#: ../rpmdrake:770
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux 精选"
 
-#: ../rpmdrake:769
+#: ../rpmdrake:771
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按照字母次序排列"
 
-#: ../rpmdrake:777
+#: ../rpmdrake:779
 #, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按照组别排列"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:780
 #, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:779
+#: ../rpmdrake:781
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:783
+#: ../rpmdrake:785
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全部软件包，按照介质库排列"
 
-#: ../rpmdrake:784
+#: ../rpmdrake:786
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:788
+#: ../rpmdrake:790
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "只剩下，按安装日期排序"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:861
 #, c-format
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:861
+#: ../rpmdrake:863
 #, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:863
+#: ../rpmdrake:865
 #, c-format
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:874
+#: ../rpmdrake:876
 #, c-format
 msgid "Reset the selection"
 msgstr "重置选中内容"
 
-#: ../rpmdrake:875
+#: ../rpmdrake:877
 #, c-format
 msgid "Reload the packages list"
 msgstr "重新装入软件包清单"
 
-#: ../rpmdrake:878 ../rpmdrake.pm:551
+#: ../rpmdrake:880 ../rpmdrake.pm:551
 #, c-format
 msgid "Update media"
 msgstr "更新介质"
 
-#: ../rpmdrake:909
+#: ../rpmdrake:911
 #, c-format
 msgid "Normal information"
 msgstr "正常信息"
 
-#: ../rpmdrake:909
+#: ../rpmdrake:911
 #, c-format
 msgid "Maximum information"
 msgstr "最多信息"
 
-#: ../rpmdrake:929
+#: ../rpmdrake:931
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
-#: ../rpmdrake:934
+#: ../rpmdrake:936
 #, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../rpmdrake:935
+#: ../rpmdrake:937
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1353,7 +1363,7 @@ msgstr ""
 "\n"
 "您真的想要安装所有选中的软件包吗?"
 
-#: ../rpmdrake:948
+#: ../rpmdrake:950
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1368,52 +1378,52 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:984
+#: ../rpmdrake:986
 #, c-format
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake:985
+#: ../rpmdrake:987
 #, c-format
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
-#: ../rpmdrake:986
+#: ../rpmdrake:988
 #, c-format
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:1001
 #, c-format
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:1004
+#: ../rpmdrake:1006
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake:1021
+#: ../rpmdrake:1023
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake:1025
+#: ../rpmdrake:1027
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../rpmdrake:1059
+#: ../rpmdrake:1061
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1062
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: ../rpmdrake:1068
+#: ../rpmdrake:1070
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1426,12 +1436,12 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1077
+#: ../rpmdrake:1079
 #, c-format
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../rpmdrake:1078
+#: ../rpmdrake:1080
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1447,12 +1457,12 @@ msgstr ""
 "\n"
 "然后，重新启动 MandrakeUpdate。"
 
-#: ../rpmdrake:1088
+#: ../rpmdrake:1090
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../rpmdrake:1089
+#: ../rpmdrake:1091
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1466,62 +1476,62 @@ msgstr ""
 "\n"
 "然后，重新启动 MandrakeUpdate。"
 
-#: ../rpmdrake:1118
+#: ../rpmdrake:1120
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1166
+#: ../rpmdrake:1168
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake:1185
+#: ../rpmdrake:1187
 #, c-format
 msgid "changes:"
 msgstr "更改:"
 
-#: ../rpmdrake:1189
+#: ../rpmdrake:1191
 #, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1193
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake:1193
+#: ../rpmdrake:1195
 #, c-format
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake:1205
+#: ../rpmdrake:1207
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake:1215
+#: ../rpmdrake:1217
 #, c-format
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake:1241 ../rpmdrake:1392
+#: ../rpmdrake:1243 ../rpmdrake:1394
 #, c-format
 msgid "Everything installed successfully"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake:1242 ../rpmdrake:1393
+#: ../rpmdrake:1244 ../rpmdrake:1395
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake:1244 ../rpmdrake:1377
+#: ../rpmdrake:1246 ../rpmdrake:1379
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake:1245 ../rpmdrake:1378 ../rpmdrake:1432
+#: ../rpmdrake:1247 ../rpmdrake:1380 ../rpmdrake:1434
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1532,17 +1542,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1266
+#: ../rpmdrake:1268
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake:1267
+#: ../rpmdrake:1269
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../rpmdrake:1268 ../rpmdrake:1324
+#: ../rpmdrake:1270 ../rpmdrake:1326
 #, c-format
 msgid ""
 "\n"
@@ -1555,37 +1565,37 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../rpmdrake:1275
+#: ../rpmdrake:1277
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../rpmdrake:1275
+#: ../rpmdrake:1277
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1282
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../rpmdrake:1281
+#: ../rpmdrake:1283
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake:1286
+#: ../rpmdrake:1288
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1305
+#: ../rpmdrake:1307
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../rpmdrake:1314
+#: ../rpmdrake:1316
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1600,12 +1610,12 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../rpmdrake:1321 ../rpmdrake:1431
+#: ../rpmdrake:1323 ../rpmdrake:1433
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake:1322
+#: ../rpmdrake:1324
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1618,22 +1628,22 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../rpmdrake:1336
+#: ../rpmdrake:1338
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../rpmdrake:1339
+#: ../rpmdrake:1341
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1355
+#: ../rpmdrake:1357
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1390
+#: ../rpmdrake:1392
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1646,42 +1656,42 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../rpmdrake:1390
+#: ../rpmdrake:1392
 #, c-format
 msgid "everything was installed correctly"
 msgstr "所有软件包都已正确安装"
 
-#: ../rpmdrake:1398
+#: ../rpmdrake:1400
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1422
+#: ../rpmdrake:1424
 #, c-format
 msgid "No package found for installation."
 msgstr "没有可供安装的软件包。"
 
-#: ../rpmdrake:1423
+#: ../rpmdrake:1425
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../rpmdrake:1445
+#: ../rpmdrake:1447
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "正在读取软件包数据库，请稍候..."
 
-#: ../rpmdrake:1492
+#: ../rpmdrake:1494
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake:1497
+#: ../rpmdrake:1499
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../rpmdrake:1498
+#: ../rpmdrake:1500
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1692,7 +1702,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1530
+#: ../rpmdrake:1532
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1704,7 +1714,7 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../rpmdrake:1535
+#: ../rpmdrake:1537
 #, c-format
 msgid ""
 "Welcome to MandrakeUpdate!\n"
@@ -1716,7 +1726,7 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1540
+#: ../rpmdrake:1542
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"