1 files changed, 296 insertions, 232 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b8079a83..18785a5d 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-09-21 12:56+0200\n"
+"POT-Creation-Date: 2004-10-26 11:24+0200\n"
 "PO-Revision-Date: 2004-08-15 05:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -60,7 +60,7 @@ msgstr "可移动设备"
 msgid "Path or mount point:"
 msgstr "路径或挂载点:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:778
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:774
 #, c-format
 msgid "Security updates"
 msgstr "安全更新"
@@ -125,9 +125,9 @@ msgstr "介质类型:"
 #: ../edit-urpm-sources.pl:148 ../edit-urpm-sources.pl:224
 #: ../edit-urpm-sources.pl:249 ../edit-urpm-sources.pl:309
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:423
-#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:437
-#: ../rpmdrake.pm:574
+#: ../edit-urpm-sources.pl:470 ../edit-urpm-sources.pl:589 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:1334 ../rpmdrake:1340 ../rpmdrake.pm:470
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -136,10 +136,10 @@ msgstr "取消"
 #: ../edit-urpm-sources.pl:299 ../edit-urpm-sources.pl:384
 #: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:463
 #: ../edit-urpm-sources.pl:520 ../edit-urpm-sources.pl:584
-#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:102
-#: ../rpmdrake:547 ../rpmdrake:565 ../rpmdrake:570 ../rpmdrake:1273
-#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:183 ../rpmdrake.pm:232
-#: ../rpmdrake.pm:437
+#: ../edit-urpm-sources.pl:621 ../edit-urpm-sources.pl:732 ../rpmdrake:98
+#: ../rpmdrake:543 ../rpmdrake:561 ../rpmdrake:566 ../rpmdrake:1273
+#: ../rpmdrake:1334 ../rpmdrake:1469 ../rpmdrake.pm:188 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:470
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -318,8 +318,8 @@ msgstr "介质限制"
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:498 ../rpmdrake:283 ../rpmdrake:299 ../rpmdrake:409
-#: ../rpmdrake:481
+#: ../edit-urpm-sources.pl:498 ../rpmdrake:279 ../rpmdrake:295 ../rpmdrake:405
+#: ../rpmdrake:477
 #, c-format
 msgid "(none)"
 msgstr "(无)"
@@ -408,7 +408,7 @@ msgstr "更新介质"
 msgid "Regenerate hdlist"
 msgstr "重新生成 hdlist"
 
-#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:511
+#: ../edit-urpm-sources.pl:674 ../rpmdrake.pm:544
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "正在更新介质，请稍候..."
@@ -505,12 +505,12 @@ msgstr ""
 msgid "Successfully added medium `%s'."
 msgstr "成功添加了介质“%s”。"
 
-#: ../rpmdrake:99
+#: ../rpmdrake:95
 #, c-format
 msgid "Running in user mode"
 msgstr "以用户模式运行"
 
-#: ../rpmdrake:100
+#: ../rpmdrake:96
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -521,568 +521,568 @@ msgstr ""
 "您将无法执行对系统的修改，\n"
 "但您仍然可以浏览已有数据库。"
 
-#: ../rpmdrake:108
+#: ../rpmdrake:104
 #, c-format
 msgid "Accessibility"
 msgstr "辅助功能"
 
-#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:105 ../rpmdrake:106 ../rpmdrake:107 ../rpmdrake:108
 #, c-format
 msgid "Archiving"
 msgstr "归档"
 
-#: ../rpmdrake:109
+#: ../rpmdrake:105
 #, c-format
 msgid "Backup"
 msgstr "备份"
 
-#: ../rpmdrake:110
+#: ../rpmdrake:106
 #, c-format
 msgid "Cd burning"
 msgstr "光盘刻录"
 
-#: ../rpmdrake:111
+#: ../rpmdrake:107
 #, c-format
 msgid "Compression"
 msgstr "压缩"
 
-#: ../rpmdrake:112 ../rpmdrake:117 ../rpmdrake:129 ../rpmdrake:140
-#: ../rpmdrake:149 ../rpmdrake:161 ../rpmdrake:173 ../rpmdrake:181
-#: ../rpmdrake:253
+#: ../rpmdrake:108 ../rpmdrake:113 ../rpmdrake:125 ../rpmdrake:136
+#: ../rpmdrake:145 ../rpmdrake:157 ../rpmdrake:169 ../rpmdrake:177
+#: ../rpmdrake:249
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116
-#: ../rpmdrake:117
+#: ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112
+#: ../rpmdrake:113
 #, c-format
 msgid "Books"
 msgstr "书籍"
 
-#: ../rpmdrake:113
+#: ../rpmdrake:109
 #, c-format
 msgid "Computer books"
 msgstr "计算机图书"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:110
 #, c-format
 msgid "Faqs"
 msgstr "常见问题解答"
 
-#: ../rpmdrake:115
+#: ../rpmdrake:111
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:116
+#: ../rpmdrake:112
 #, c-format
 msgid "Literature"
 msgstr "文献"
 
-#: ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:114 ../rpmdrake:115
 #, c-format
 msgid "Cluster"
 msgstr "簇"
 
-#: ../rpmdrake:118
+#: ../rpmdrake:114
 #, c-format
 msgid "Message Passing"
 msgstr "信息传递"
 
-#: ../rpmdrake:119
+#: ../rpmdrake:115
 #, c-format
 msgid "Queueing Services"
 msgstr "查询服务"
 
-#: ../rpmdrake:120
+#: ../rpmdrake:116
 #, c-format
 msgid "Communications"
 msgstr "通讯"
 
-#: ../rpmdrake:121 ../rpmdrake:124
+#: ../rpmdrake:117 ../rpmdrake:120
 #, c-format
 msgid "Databases"
 msgstr "数据库"
 
+#: ../rpmdrake:118 ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121
 #: ../rpmdrake:122 ../rpmdrake:123 ../rpmdrake:124 ../rpmdrake:125
-#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
-#: ../rpmdrake:130 ../rpmdrake:131
+#: ../rpmdrake:126 ../rpmdrake:127
 #, c-format
 msgid "Development"
 msgstr "开发"
 
-#: ../rpmdrake:122
+#: ../rpmdrake:118
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:123
+#: ../rpmdrake:119
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:125
+#: ../rpmdrake:121
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME 和 GTK+"
 
-#: ../rpmdrake:126
+#: ../rpmdrake:122
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:127
+#: ../rpmdrake:123
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE 和 Qt"
 
-#: ../rpmdrake:128
+#: ../rpmdrake:124
 #, c-format
 msgid "Kernel"
 msgstr "内核"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:126
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:127
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:132
+#: ../rpmdrake:128
 #, c-format
 msgid "Editors"
 msgstr "编辑器"
 
-#: ../rpmdrake:133
+#: ../rpmdrake:129
 #, c-format
 msgid "Education"
 msgstr "教育"
 
-#: ../rpmdrake:134
+#: ../rpmdrake:130
 #, c-format
 msgid "Emulators"
 msgstr "模拟器"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:131
 #, c-format
 msgid "File tools"
 msgstr "文件工具"
 
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
 #: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
-#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #, c-format
 msgid "Games"
 msgstr "游戏"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:132
 #, c-format
 msgid "Adventure"
 msgstr "探险"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:133
 #, c-format
 msgid "Arcade"
 msgstr "街机"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:134
 #, c-format
 msgid "Boards"
 msgstr "棋盘"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:135
 #, c-format
 msgid "Cards"
 msgstr "卡"
 
-#: ../rpmdrake:141
+#: ../rpmdrake:137
 #, c-format
 msgid "Puzzles"
 msgstr "拼图"
 
-#: ../rpmdrake:142
+#: ../rpmdrake:138
 #, c-format
 msgid "Sports"
 msgstr "运动"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:139
 #, c-format
 msgid "Strategy"
 msgstr "策略"
 
+#: ../rpmdrake:140 ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143
 #: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
-#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
 #, c-format
 msgid "Graphical desktop"
 msgstr "图形桌面"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:140
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:141
 #, c-format
 msgid "FVWM based"
 msgstr "基于 FVWM"
 
-#: ../rpmdrake:146
+#: ../rpmdrake:142
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:147
+#: ../rpmdrake:143
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:148
+#: ../rpmdrake:144
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:146
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:147
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:152
+#: ../rpmdrake:148
 #, c-format
 msgid "Graphics"
 msgstr "图形"
 
-#: ../rpmdrake:153
+#: ../rpmdrake:149
 #, c-format
 msgid "Monitoring"
 msgstr "监视"
 
-#: ../rpmdrake:154
+#: ../rpmdrake:150
 #, c-format
 msgid "Multimedia"
 msgstr "多媒体"
 
+#: ../rpmdrake:151 ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154
 #: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
-#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
-#: ../rpmdrake:163 ../rpmdrake:180
+#: ../rpmdrake:159 ../rpmdrake:176
 #, c-format
 msgid "Networking"
 msgstr "网络"
 
-#: ../rpmdrake:155
+#: ../rpmdrake:151
 #, c-format
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:156
+#: ../rpmdrake:152
 #, c-format
 msgid "File transfer"
 msgstr "文件传送"
 
-#: ../rpmdrake:157
+#: ../rpmdrake:153
 #, c-format
 msgid "Instant messaging"
 msgstr "即时通讯"
 
-#: ../rpmdrake:158
+#: ../rpmdrake:154
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:159
+#: ../rpmdrake:155
 #, c-format
 msgid "Mail"
 msgstr "邮件"
 
-#: ../rpmdrake:160
+#: ../rpmdrake:156
 #, c-format
 msgid "News"
 msgstr "新闻"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:158
 #, c-format
 msgid "Remote access"
 msgstr "远程访问"
 
-#: ../rpmdrake:163
+#: ../rpmdrake:159
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:164
+#: ../rpmdrake:160
 #, c-format
 msgid "Office"
 msgstr "办公"
 
-#: ../rpmdrake:165
+#: ../rpmdrake:161
 #, c-format
 msgid "Public Keys"
 msgstr "公钥"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:162
 #, c-format
 msgid "Publishing"
 msgstr "出版"
 
+#: ../rpmdrake:163 ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166
 #: ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170
-#: ../rpmdrake:171 ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174
 #, c-format
 msgid "Sciences"
 msgstr "科学"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:163
 #, c-format
 msgid "Astronomy"
 msgstr "天文"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:164
 #, c-format
 msgid "Biology"
 msgstr "生物"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:165
 #, c-format
 msgid "Chemistry"
 msgstr "化学"
 
-#: ../rpmdrake:170
+#: ../rpmdrake:166
 #, c-format
 msgid "Computer science"
 msgstr "计算机科学"
 
-#: ../rpmdrake:171
+#: ../rpmdrake:167
 #, c-format
 msgid "Geosciences"
 msgstr "地球科学"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:168
 #, c-format
 msgid "Mathematics"
 msgstr "数学"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:170
 #, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:175
+#: ../rpmdrake:171
 #, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:172
 #, c-format
 msgid "Sound"
 msgstr "声音"
 
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
 #: ../rpmdrake:181 ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184
 #: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:189 ../rpmdrake:190
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:173
 #, c-format
 msgid "Base"
 msgstr "基本"
 
-#: ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177
+#: ../rpmdrake:178 ../rpmdrake:179
 #, c-format
 msgid "Configuration"
 msgstr "配置"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:174
 #, c-format
 msgid "Boot and Init"
 msgstr "启动和初始化"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:175
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:178
 #, c-format
 msgid "Packaging"
 msgstr "打包"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:179
 #, c-format
 msgid "Printing"
 msgstr "打印"
 
-#: ../rpmdrake:184
+#: ../rpmdrake:180
 #, c-format
 msgid "Deploiement"
 msgstr "部署"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:181
 #, c-format
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:182 ../rpmdrake:183 ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:182
 #, c-format
 msgid "Console"
 msgstr "控制台"
 
-#: ../rpmdrake:187
+#: ../rpmdrake:183
 #, c-format
 msgid "True type"
 msgstr "TrueType"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:184
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:185
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 位图"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:186
 #, c-format
 msgid "Internationalization"
 msgstr "国际化"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:187
 #, c-format
 msgid "Kernel and hardware"
 msgstr "内核和硬件"
 
-#: ../rpmdrake:192
+#: ../rpmdrake:188
 #, c-format
 msgid "Libraries"
 msgstr "库"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:189
 #, c-format
 msgid "Servers"
 msgstr "服务器"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:190
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:191
 #, c-format
 msgid "Terminals"
 msgstr "终端"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:192
 #, c-format
 msgid "Text tools"
 msgstr "文本工具"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:193
 #, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:194
 #, c-format
 msgid "Video"
 msgstr "视频"
 
-#: ../rpmdrake:305 ../rpmdrake:693 ../rpmdrake:694
+#: ../rpmdrake:301 ../rpmdrake:689 ../rpmdrake:690
 #, c-format
 msgid "(Not available)"
 msgstr "(不可用)"
 
-#: ../rpmdrake:333 ../rpmdrake:390
+#: ../rpmdrake:329 ../rpmdrake:386
 #, c-format
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../rpmdrake:333
+#: ../rpmdrake:329
 #, c-format
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake:343 ../rpmdrake:354
+#: ../rpmdrake:339 ../rpmdrake:350
 #, c-format
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
 
-#: ../rpmdrake:352 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
+#: ../rpmdrake:348 ../rpmdrake:1119 ../rpmdrake:1365 ../rpmdrake:1578
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:357
+#: ../rpmdrake:353
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../rpmdrake:391 ../rpmdrake:510
+#: ../rpmdrake:387 ../rpmdrake:506
 #, c-format
 msgid "Addable"
 msgstr "可添加"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:389
 #, c-format
 msgid "Not selected"
 msgstr "未选中"
 
-#: ../rpmdrake:427
+#: ../rpmdrake:423
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:445 ../rpmdrake:560 ../rpmdrake:562 ../rpmdrake:1459
+#: ../rpmdrake:441 ../rpmdrake:556 ../rpmdrake:558 ../rpmdrake:1459
 #: ../rpmdrake:1462
 #, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../rpmdrake:446
+#: ../rpmdrake:442
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../rpmdrake:466
+#: ../rpmdrake:462
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake:483
+#: ../rpmdrake:479
 #, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:480
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1092,28 +1092,28 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../rpmdrake:504
+#: ../rpmdrake:500
 #, c-format
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:547 ../rpmdrake:552
+#: ../rpmdrake:543 ../rpmdrake:548
 #, c-format
 msgid "More info"
 msgstr "更多信息"
 
-#: ../rpmdrake:555 ../rpmdrake:1448
+#: ../rpmdrake:551 ../rpmdrake:1448
 #, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../rpmdrake:578
+#: ../rpmdrake:574
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake:579
+#: ../rpmdrake:575
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1123,12 +1123,12 @@ msgstr ""
 "为了满足所有的依赖关系，需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:585 ../rpmdrake:594
+#: ../rpmdrake:581 ../rpmdrake:590
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake:586
+#: ../rpmdrake:582
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1137,7 +1137,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../rpmdrake:595 ../rpmdrake:656
+#: ../rpmdrake:591 ../rpmdrake:652
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1147,12 +1147,12 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:624
+#: ../rpmdrake:620
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake:625
+#: ../rpmdrake:621
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1162,17 +1162,17 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:639
+#: ../rpmdrake:635
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (属于跳过列表)"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:637
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake:642
+#: ../rpmdrake:638
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1183,132 +1183,137 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:655 ../rpmdrake:975
+#: ../rpmdrake:651 ../rpmdrake:975
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake:677
+#: ../rpmdrake:673
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中软件: %d MB / 剩余磁盘空间: %d MB"
 
-#: ../rpmdrake:679
+#: ../rpmdrake:675
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中大小: %d MB"
 
-#: ../rpmdrake:685
+#: ../rpmdrake:681
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "此软件包的描述不可用\n"
 
-#: ../rpmdrake:691
+#: ../rpmdrake:687
 #, c-format
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:690
 #, c-format
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:692
 #, c-format
 msgid "Medium: "
 msgstr "介质:"
 
-#: ../rpmdrake:698
+#: ../rpmdrake:694
 #, c-format
 msgid "Currently installed version: "
 msgstr "当前安装的版本:"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
 #, c-format
 msgid "Name: "
 msgstr "名称:"
 
-#: ../rpmdrake:704
+#: ../rpmdrake:700
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "Size: "
 msgstr "大小:"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:701
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:707
+#: ../rpmdrake:703
 #, c-format
 msgid "Importance: "
 msgstr "重要性:"
 
-#: ../rpmdrake:709
+#: ../rpmdrake:705
 #, c-format
 msgid "Summary: "
 msgstr "摘要:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
 #, c-format
 msgid "Reason for update: "
 msgstr "更新原因:"
 
-#: ../rpmdrake:713
+#: ../rpmdrake:709
 #, c-format
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:774
 #, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake:796
+#: ../rpmdrake:793
+#, c-format
+msgid "%s choices"
+msgstr ""
+
+#: ../rpmdrake:793
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux 精选"
 
-#: ../rpmdrake:797
+#: ../rpmdrake:796
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按照字母次序排列"
 
-#: ../rpmdrake:805
+#: ../rpmdrake:804
 #, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按照组别排列"
 
-#: ../rpmdrake:806
+#: ../rpmdrake:805
 #, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:807
+#: ../rpmdrake:806
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:811
+#: ../rpmdrake:810
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全部软件包，按照介质库排列"
 
-#: ../rpmdrake:812
+#: ../rpmdrake:811
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:816
+#: ../rpmdrake:815
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "只剩下，按安装日期排序"
@@ -1338,7 +1343,7 @@ msgstr "重置选中内容"
 msgid "Reload the packages list"
 msgstr "重新装入软件包清单"
 
-#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:554
+#: ../rpmdrake:906 ../rpmdrake:1061 ../rpmdrake.pm:587
 #, c-format
 msgid "Update media"
 msgstr "更新介质"
@@ -1748,6 +1753,11 @@ msgstr ""
 
 #: ../rpmdrake:1593
 #, c-format
+msgid "Welcome to the software installation tool!"
+msgstr ""
+
+#: ../rpmdrake:1594
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1760,158 +1770,181 @@ msgstr ""
 "您的 Mandrakelinux 的安装光盘包含有数千个软件包。\n"
 "本工具将帮助您选择要为您的电脑安装的软件包。"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:92
+#, fuzzy, c-format
+msgid "Software Update"
+msgstr "软件包更新"
+
+#: ../rpmdrake.pm:92
+#, c-format
+msgid "Mandrakelinux Update"
+msgstr "Mandrakelinux Update"
+
+#: ../rpmdrake.pm:179
 #, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:178
+#: ../rpmdrake.pm:183
 #, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "Info..."
 msgstr "信息..."
 
-#: ../rpmdrake.pm:282
+#: ../rpmdrake.pm:295
 #, c-format
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../rpmdrake.pm:283
+#: ../rpmdrake.pm:296
 #, c-format
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../rpmdrake.pm:284
+#: ../rpmdrake.pm:297
 #, c-format
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:298
 #, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:299
 #, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:287
+#: ../rpmdrake.pm:300
 #, c-format
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm:288
+#: ../rpmdrake.pm:301
 #, c-format
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../rpmdrake.pm:289
+#: ../rpmdrake.pm:302
 #, c-format
 msgid "Germany"
 msgstr "德国"
 
-#: ../rpmdrake.pm:290
+#: ../rpmdrake.pm:303
 #, c-format
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:295
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:308
 #, c-format
 msgid "Greece"
 msgstr "希腊"
 
-#: ../rpmdrake.pm:292
+#: ../rpmdrake.pm:305
 #, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:293
+#: ../rpmdrake.pm:306
 #, c-format
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../rpmdrake.pm:294
+#: ../rpmdrake.pm:307
 #, c-format
 msgid "France"
 msgstr "法国"
 
-#: ../rpmdrake.pm:296
+#: ../rpmdrake.pm:309
 #, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:297
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Italy"
 msgstr "意大利"
 
-#: ../rpmdrake.pm:298
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:299
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Korea"
 msgstr "韩国"
 
-#: ../rpmdrake.pm:300
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../rpmdrake.pm:301
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:302
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Poland"
 msgstr "波兰"
 
-#: ../rpmdrake.pm:303
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:304
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../rpmdrake.pm:305
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../rpmdrake.pm:307
+#: ../rpmdrake.pm:320
 #, c-format
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../rpmdrake.pm:308
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:310 ../rpmdrake.pm:311 ../rpmdrake.pm:312
-#: ../rpmdrake.pm:379
+#: ../rpmdrake.pm:322 ../rpmdrake.pm:323 ../rpmdrake.pm:324 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:393
 #, c-format
 msgid "United States"
 msgstr "美国"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:404
+#, fuzzy, c-format
+msgid ""
+"I need to access internet to get the mirror list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"需要连接 Mandrakesoft 网站才能获得镜像列表。\n"
+"请检查您的网络是否运转正常。\n"
+"\n"
+"确定继续吗?"
+
+#: ../rpmdrake.pm:408
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -1924,18 +1957,38 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:414
+#, fuzzy, c-format
+msgid "Please wait, downloading mirror addresses."
+msgstr "正在从 Mandrakesoft 网站下载镜像站点的地址，请稍候。"
+
+#: ../rpmdrake.pm:415
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "正在从 Mandrakesoft 网站下载镜像站点的地址，请稍候。"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Error during download"
 msgstr "下载出错"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:424
+#, fuzzy, c-format
+msgid ""
+"There was an error downloading the mirror list:\n"
+"\n"
+"%s\n"
+"The network, or the website, may be unavailable.\n"
+"Please try again later."
+msgstr ""
+"下载镜像列表时发生错误:\n"
+"\n"
+"%s\n"
+"您的网络或 Mandrakesoft 网站可能不可用。\n"
+"请稍后再试。"
+
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -1950,12 +2003,17 @@ msgstr ""
 "您的网络或 Mandrakesoft 网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "No mirror"
 msgstr "无镜像"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:440
+#, c-format
+msgid "I can't find any suitable mirror."
+msgstr ""
+
+#: ../rpmdrake.pm:441
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -1968,63 +2026,63 @@ msgstr ""
 "此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandrakelinux\n"
 "官方更新所支持。"
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:459
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm:472
+#: ../rpmdrake.pm:505
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
-#: ../rpmdrake.pm:475
+#: ../rpmdrake.pm:508
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在检查介质“%s”的文件..."
 
-#: ../rpmdrake.pm:478
+#: ../rpmdrake.pm:511
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在检查介质“%s”的远程文件..."
 
-#: ../rpmdrake.pm:482
+#: ../rpmdrake.pm:515
 #, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:486
+#: ../rpmdrake.pm:519
 #, c-format
 msgid " failed!"
 msgstr " 失败!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:490
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "%s from medium %s"
 msgstr "介质 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:494
+#: ../rpmdrake.pm:527
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在开始下载“%s”..."
 
-#: ../rpmdrake.pm:498
+#: ../rpmdrake.pm:531
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
-#: ../rpmdrake.pm:501
+#: ../rpmdrake.pm:534
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Error retrieving packages"
 msgstr "获取软件包出错"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:557
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2038,17 +2096,17 @@ msgstr ""
 "管理器中删除此介质，然后重新添加以进行重新配置。另外一种情况可能是，该介质目"
 "前不可用，您应该稍后再试。"
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:595
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:633
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2061,7 +2119,7 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:619 ../rpmdrake.pm:624
+#: ../rpmdrake.pm:652 ../rpmdrake.pm:657
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2072,17 +2130,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:635
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:674
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2093,7 +2151,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
+#, fuzzy, c-format
+msgid ""
+"Your medium `%s', used for updates, does not match the version of %s you're "
+"running (%s).\n"
+"It will be disabled."
+msgstr ""
+"您用于更新的介质“%s”与您正在运行的 Mandrakelinux 版本(%s)不匹配。\n"
+"该介质将被禁用。"
+
+#: ../rpmdrake.pm:690
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2361,10 +2429,6 @@ msgstr "无法识别的传输代码\n"
 msgid "Unknown error code %d\n"
 msgstr "未知的错误代码 %d\n"
 
-#: data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Update"
-
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "安装软件"