From 2180be46fa9948b9597cf5906c1ff7bb5c199c35 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 19 Jul 2004 01:01:01 +0000
Subject: merge

---
 po/zh_CN.po | 734 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 380 insertions(+), 354 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d76512a1..01b957f2 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-12 12:14+0200\n"
+"POT-Creation-Date: 2004-07-19 10:03+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:734
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:739
 #, 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:519 ../rpmdrake:535 ../rpmdrake:540 ../rpmdrake:1205
-#: ../rpmdrake:1266 ../rpmdrake:1400 ../rpmdrake.pm:182 ../rpmdrake.pm:231
+#: ../rpmdrake:524 ../rpmdrake:540 ../rpmdrake:545 ../rpmdrake:1210
+#: ../rpmdrake:1271 ../rpmdrake:1405 ../rpmdrake.pm:182 ../rpmdrake.pm:231
 #: ../rpmdrake.pm:428
 #, 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:519 ../rpmdrake:1266 ../rpmdrake:1272 ../rpmdrake.pm:428
+#: ../rpmdrake:524 ../rpmdrake:1271 ../rpmdrake:1277 ../rpmdrake.pm:428
 #: ../rpmdrake.pm:563
 #, 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:1005
+#: ../edit-urpm-sources.pl:493 ../edit-urpm-sources.pl:694 ../rpmdrake:1010
 #, c-format
 msgid "Remove"
 msgstr "卸载"
@@ -308,8 +308,8 @@ msgstr "介质限制"
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:482 ../rpmdrake:257 ../rpmdrake:274 ../rpmdrake:385
-#: ../rpmdrake:457
+#: ../edit-urpm-sources.pl:482 ../rpmdrake:262 ../rpmdrake:279 ../rpmdrake:390
+#: ../rpmdrake:462
 #, c-format
 msgid "(none)"
 msgstr "(无)"
@@ -423,23 +423,23 @@ msgstr "管理密钥..."
 msgid "Parallel..."
 msgstr "并行..."
 
-#: ../edit-urpm-sources.pl:711 ../rpmdrake:994
+#: ../edit-urpm-sources.pl:711 ../rpmdrake:999
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:997
+#: ../edit-urpm-sources.pl:713 ../rpmdrake:1002
 #, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../edit-urpm-sources.pl:714 ../rpmdrake:998
+#: ../edit-urpm-sources.pl:714 ../rpmdrake:1003
 #, 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:1510
+#: ../edit-urpm-sources.pl:725 ../gurpmi.addmedia:75 ../rpmdrake:1515
 #, c-format
 msgid ""
 "%s\n"
@@ -517,521 +517,547 @@ msgid "Accessibility"
 msgstr "辅助功能"
 
 #: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
-#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
-#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109 ../rpmdrake:110
-#: ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113 ../rpmdrake:114
 #, c-format
-msgid "System"
-msgstr "系统"
+msgid "Archiving"
+msgstr "归档"
 
 #: ../rpmdrake:99
 #, c-format
-msgid "Servers"
-msgstr "服务器"
+msgid "Backup"
+msgstr "备份"
 
 #: ../rpmdrake:100
 #, c-format
-msgid "Kernel and hardware"
-msgstr "内核和硬件"
+msgid "Cd burning"
+msgstr "光盘刻录"
 
 #: ../rpmdrake:101
 #, c-format
-msgid "Libraries"
-msgstr "库"
+msgid "Compression"
+msgstr "压缩"
 
-#: ../rpmdrake:102
+#: ../rpmdrake:102 ../rpmdrake:107 ../rpmdrake:119 ../rpmdrake:130
+#: ../rpmdrake:139 ../rpmdrake:150 ../rpmdrake:161 ../rpmdrake:169
+#: ../rpmdrake:240
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "Other"
+msgstr "其它"
 
 #: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107
 #, c-format
-msgid "Fonts"
-msgstr "字体"
+msgid "Books"
+msgstr "书籍"
 
 #: ../rpmdrake:103
 #, c-format
-msgid "Console"
-msgstr "控制台"
+msgid "Computer books"
+msgstr "计算机图书"
 
 #: ../rpmdrake:104
 #, c-format
-msgid "True type"
-msgstr "TrueType"
+msgid "Faqs"
+msgstr "常见问题解答"
 
 #: ../rpmdrake:105
 #, c-format
-msgid "Type1"
-msgstr "Type1"
+msgid "Howtos"
+msgstr "Howtos"
 
 #: ../rpmdrake:106
 #, c-format
-msgid "X11 bitmap"
-msgstr "X11 位图"
-
-#: ../rpmdrake:107
-#, c-format
-msgid "Base"
-msgstr "基本"
+msgid "Literature"
+msgstr "文献"
 
-#: ../rpmdrake:108 ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111
-#: ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Configuration"
-msgstr "配置"
+msgid "Cluster"
+msgstr ""
 
 #: ../rpmdrake:108
 #, c-format
-msgid "Hardware"
-msgstr "硬件"
+msgid "Message Passing"
+msgstr ""
 
 #: ../rpmdrake:109
 #, c-format
-msgid "Packaging"
-msgstr "打包"
-
-#: ../rpmdrake:110 ../rpmdrake:154 ../rpmdrake:155 ../rpmdrake:156
-#: ../rpmdrake:157 ../rpmdrake:158 ../rpmdrake:159 ../rpmdrake:160
-#: ../rpmdrake:161 ../rpmdrake:162
-#, c-format
-msgid "Networking"
-msgstr "网络"
+msgid "Queueing Services"
+msgstr ""
 
-#: ../rpmdrake:111
+#: ../rpmdrake:110
 #, c-format
-msgid "Printing"
-msgstr "打印"
+msgid "Communications"
+msgstr "通讯"
 
-#: ../rpmdrake:112
+#: ../rpmdrake:111 ../rpmdrake:114
 #, c-format
-msgid "Boot and Init"
-msgstr "启动和初始化"
+msgid "Databases"
+msgstr "数据库"
 
-#: ../rpmdrake:113 ../rpmdrake:124 ../rpmdrake:132 ../rpmdrake:144
-#: ../rpmdrake:149 ../rpmdrake:162 ../rpmdrake:176 ../rpmdrake:181
-#: ../rpmdrake:235
+#: ../rpmdrake:112 ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115
+#: ../rpmdrake:116 ../rpmdrake:117 ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:120 ../rpmdrake:121
 #, c-format
-msgid "Other"
-msgstr "其它"
+msgid "Development"
+msgstr "开发"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:112
 #, c-format
-msgid "Internationalization"
-msgstr "国际化"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117 ../rpmdrake:118
-#: ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122
-#: ../rpmdrake:123 ../rpmdrake:124
+#: ../rpmdrake:113
 #, c-format
-msgid "Development"
-msgstr "开发"
+msgid "C++"
+msgstr "C++"
 
 #: ../rpmdrake:115
 #, c-format
-msgid "Kernel"
-msgstr "内核"
+msgid "GNOME and GTK+"
+msgstr "GNOME 和 GTK+"
 
-#: ../rpmdrake:116 ../rpmdrake:134
+#: ../rpmdrake:116
 #, c-format
-msgid "Databases"
-msgstr "数据库"
+msgid "Java"
+msgstr "Java"
 
 #: ../rpmdrake:117
 #, c-format
-msgid "Perl"
-msgstr "Perl"
+msgid "KDE and Qt"
+msgstr "KDE 和 Qt"
 
 #: ../rpmdrake:118
 #, c-format
-msgid "Python"
-msgstr "Python"
-
-#: ../rpmdrake:119
-#, c-format
-msgid "C"
-msgstr "C"
+msgid "Kernel"
+msgstr "内核"
 
 #: ../rpmdrake:120
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Perl"
+msgstr "Perl"
 
 #: ../rpmdrake:121
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "Python"
+msgstr "Python"
 
 #: ../rpmdrake:122
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME 和 GTK+"
+msgid "Editors"
+msgstr "编辑器"
 
 #: ../rpmdrake:123
-#, c-format
-msgid "KDE and Qt"
-msgstr "KDE 和 Qt"
+#, fuzzy, c-format
+msgid "Education"
+msgstr "通讯"
 
-#: ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128
-#: ../rpmdrake:129 ../rpmdrake:130 ../rpmdrake:131 ../rpmdrake:132
+#: ../rpmdrake:124
 #, c-format
-msgid "Sciences"
-msgstr "科学"
+msgid "Emulators"
+msgstr "模拟器"
 
 #: ../rpmdrake:125
 #, c-format
-msgid "Astronomy"
-msgstr "天文"
+msgid "File tools"
+msgstr "文件工具"
+
+#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
+#: ../rpmdrake:130 ../rpmdrake:131 ../rpmdrake:132 ../rpmdrake:133
+#, c-format
+msgid "Games"
+msgstr "游戏"
 
 #: ../rpmdrake:126
 #, c-format
-msgid "Biology"
-msgstr "生物"
+msgid "Adventure"
+msgstr "探险"
 
 #: ../rpmdrake:127
 #, c-format
-msgid "Chemistry"
-msgstr "化学"
+msgid "Arcade"
+msgstr "街机"
 
 #: ../rpmdrake:128
 #, c-format
-msgid "Computer science"
-msgstr "计算机科学"
+msgid "Boards"
+msgstr "棋盘"
 
 #: ../rpmdrake:129
 #, c-format
-msgid "Geosciences"
-msgstr "地球科学"
+msgid "Cards"
+msgstr "卡"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:131
 #, c-format
-msgid "Mathematics"
-msgstr "数学"
+msgid "Puzzles"
+msgstr "拼图"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:132
 #, c-format
-msgid "Physics"
-msgstr "物理"
+msgid "Sports"
+msgstr "运动"
 
 #: ../rpmdrake:133
 #, c-format
-msgid "Communications"
-msgstr "通讯"
+msgid "Strategy"
+msgstr "策略"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:134 ../rpmdrake:135 ../rpmdrake:136 ../rpmdrake:137
+#: ../rpmdrake:138 ../rpmdrake:139 ../rpmdrake:140 ../rpmdrake:141
 #, c-format
-msgid "Editors"
-msgstr "编辑器"
+msgid "Graphical desktop"
+msgstr "图形桌面"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:134
 #, c-format
-msgid "Emulators"
-msgstr "模拟器"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139 ../rpmdrake:140
-#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
+#: ../rpmdrake:135
 #, c-format
-msgid "Games"
-msgstr "游戏"
+msgid "FVWM based"
+msgstr "基于 FVWM"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:136
 #, c-format
-msgid "Adventure"
-msgstr "探险"
+msgid "GNOME"
+msgstr "GNOME"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:137
 #, c-format
-msgid "Arcade"
-msgstr "街机"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:138
 #, c-format
-msgid "Boards"
-msgstr "棋盘"
+msgid "KDE"
+msgstr "KDE"
 
 #: ../rpmdrake:140
 #, c-format
-msgid "Cards"
-msgstr "卡"
+msgid "Sawfish"
+msgstr "Sawfish"
 
 #: ../rpmdrake:141
 #, c-format
-msgid "Puzzles"
-msgstr "拼图"
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
 #: ../rpmdrake:142
 #, c-format
-msgid "Sports"
-msgstr "运动"
+msgid "Graphics"
+msgstr "图形"
 
 #: ../rpmdrake:143
 #, c-format
-msgid "Strategy"
-msgstr "策略"
+msgid "Monitoring"
+msgstr "监视"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
+#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:168
 #, c-format
-msgid "Toys"
-msgstr "玩具"
+msgid "Networking"
+msgstr "网络"
 
-#: ../rpmdrake:146 ../rpmdrake:147 ../rpmdrake:148 ../rpmdrake:149
+#: ../rpmdrake:144
 #, c-format
-msgid "Archiving"
-msgstr "归档"
+msgid "Chat"
+msgstr "聊天"
+
+#: ../rpmdrake:145
+#, c-format
+msgid "File transfer"
+msgstr "文件传送"
 
 #: ../rpmdrake:146
 #, c-format
-msgid "Compression"
-msgstr "压缩"
+msgid "Instant messaging"
+msgstr "即时通讯"
 
 #: ../rpmdrake:147
 #, c-format
-msgid "Cd burning"
-msgstr "光盘刻录"
+msgid "IRC"
+msgstr "IRC"
 
 #: ../rpmdrake:148
 #, c-format
-msgid "Backup"
-msgstr "备份"
+msgid "Mail"
+msgstr "邮件"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:149
 #, c-format
-msgid "Monitoring"
-msgstr "监视"
+msgid "News"
+msgstr "新闻"
 
 #: ../rpmdrake:151
 #, c-format
-msgid "Sound"
-msgstr "声音"
+msgid "Remote access"
+msgstr "远程访问"
 
 #: ../rpmdrake:152
 #, c-format
-msgid "Graphics"
-msgstr "图形"
+msgid "WWW"
+msgstr "WWW"
 
 #: ../rpmdrake:153
 #, c-format
-msgid "Video"
-msgstr "视频"
+msgid "Office"
+msgstr "办公"
 
 #: ../rpmdrake:154
 #, c-format
-msgid "File transfer"
-msgstr "文件传送"
+msgid "Publishing"
+msgstr "出版"
+
+#: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
+#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
+#, c-format
+msgid "Sciences"
+msgstr "科学"
 
 #: ../rpmdrake:155
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Astronomy"
+msgstr "天文"
 
 #: ../rpmdrake:156
 #, c-format
-msgid "Instant messaging"
-msgstr "即时通讯"
+msgid "Biology"
+msgstr "生物"
 
 #: ../rpmdrake:157
 #, c-format
-msgid "Chat"
-msgstr "聊天"
+msgid "Chemistry"
+msgstr "化学"
 
 #: ../rpmdrake:158
 #, c-format
-msgid "News"
-msgstr "新闻"
+msgid "Computer science"
+msgstr "计算机科学"
 
 #: ../rpmdrake:159
 #, c-format
-msgid "Mail"
-msgstr "邮件"
+msgid "Geosciences"
+msgstr "地球科学"
 
 #: ../rpmdrake:160
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Mathematics"
+msgstr "数学"
 
-#: ../rpmdrake:161
+#: ../rpmdrake:162
 #, c-format
-msgid "Remote access"
-msgstr "远程访问"
+msgid "Physics"
+msgstr "物理"
 
 #: ../rpmdrake:163
 #, c-format
-msgid "Office"
-msgstr "办公"
+msgid "Shells"
+msgstr "Shell"
 
 #: ../rpmdrake:164
 #, c-format
-msgid "Publishing"
-msgstr "出版"
-
-#: ../rpmdrake:165
-#, c-format
-msgid "Terminals"
-msgstr "终端"
+msgid "Sound"
+msgstr "声音"
 
-#: ../rpmdrake:166
+#: ../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
 #, c-format
-msgid "Shells"
-msgstr "Shell"
+msgid "System"
+msgstr "系统"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:165
 #, c-format
-msgid "File tools"
-msgstr "文件工具"
+msgid "Base"
+msgstr "基本"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:166 ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169
+#: ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Text tools"
-msgstr "文本工具"
+msgid "Configuration"
+msgstr "配置"
 
-#: ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171 ../rpmdrake:172
-#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
+#: ../rpmdrake:166
 #, c-format
-msgid "Graphical desktop"
-msgstr "图形桌面"
+msgid "Boot and Init"
+msgstr "启动和初始化"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:167
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Hardware"
+msgstr "硬件"
 
 #: ../rpmdrake:170
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Packaging"
+msgstr "打包"
 
 #: ../rpmdrake:171
 #, c-format
-msgid "FVWM based"
-msgstr "基于 FVWM"
+msgid "Printing"
+msgstr "打印"
 
 #: ../rpmdrake:172
+#, fuzzy, c-format
+msgid "Deploiement"
+msgstr "开发"
+
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Fonts"
+msgstr "字体"
 
 #: ../rpmdrake:173
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Console"
+msgstr "控制台"
 
 #: ../rpmdrake:174
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "True type"
+msgstr "TrueType"
 
 #: ../rpmdrake:175
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Type1"
+msgstr "Type1"
 
-#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
-#: ../rpmdrake:181
+#: ../rpmdrake:176
 #, c-format
-msgid "Books"
-msgstr "书籍"
+msgid "X11 bitmap"
+msgstr "X11 位图"
 
 #: ../rpmdrake:177
 #, c-format
-msgid "Howtos"
-msgstr "Howtos"
+msgid "Internationalization"
+msgstr "国际化"
 
 #: ../rpmdrake:178
 #, c-format
-msgid "Faqs"
-msgstr "常见问题解答"
+msgid "Kernel and hardware"
+msgstr "内核和硬件"
 
 #: ../rpmdrake:179
 #, c-format
-msgid "Computer books"
-msgstr "计算机图书"
+msgid "Libraries"
+msgstr "库"
 
 #: ../rpmdrake:180
 #, c-format
-msgid "Literature"
-msgstr "文献"
+msgid "Servers"
+msgstr "服务器"
+
+#: ../rpmdrake:181
+#, c-format
+msgid "XFree86"
+msgstr "XFree86"
+
+#: ../rpmdrake:182
+#, c-format
+msgid "Terminals"
+msgstr "终端"
 
-#: ../rpmdrake:280 ../rpmdrake:650 ../rpmdrake:651
+#: ../rpmdrake:183
+#, c-format
+msgid "Text tools"
+msgstr "文本工具"
+
+#: ../rpmdrake:184
+#, c-format
+msgid "Toys"
+msgstr "玩具"
+
+#: ../rpmdrake:185
+#, c-format
+msgid "Video"
+msgstr "视频"
+
+#: ../rpmdrake:285 ../rpmdrake:655 ../rpmdrake:656
 #, c-format
 msgid "(Not available)"
 msgstr "(不可用)"
 
-#: ../rpmdrake:308 ../rpmdrake:366
+#: ../rpmdrake:313 ../rpmdrake:371
 #, c-format
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:313
 #, c-format
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake:318 ../rpmdrake:329
+#: ../rpmdrake:323 ../rpmdrake:334
 #, c-format
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
 
-#: ../rpmdrake:327 ../rpmdrake:1051 ../rpmdrake:1297 ../rpmdrake:1509
+#: ../rpmdrake:332 ../rpmdrake:1056 ../rpmdrake:1302 ../rpmdrake:1514
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:332
+#: ../rpmdrake:337
 #, c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:367 ../rpmdrake:486
+#: ../rpmdrake:372 ../rpmdrake:491
 #, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../rpmdrake:367 ../rpmdrake:486
+#: ../rpmdrake:372 ../rpmdrake:491
 #, c-format
 msgid "Addable"
 msgstr "可添加"
 
-#: ../rpmdrake:369
+#: ../rpmdrake:374
 #, c-format
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake:369
+#: ../rpmdrake:374
 #, c-format
 msgid "Not selected"
 msgstr "未选中"
 
-#: ../rpmdrake:403
+#: ../rpmdrake:408
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:421 ../rpmdrake:530 ../rpmdrake:532 ../rpmdrake:1390
-#: ../rpmdrake:1393
+#: ../rpmdrake:426 ../rpmdrake:535 ../rpmdrake:537 ../rpmdrake:1395
+#: ../rpmdrake:1398
 #, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../rpmdrake:422
+#: ../rpmdrake:427
 #, c-format
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../rpmdrake:422
+#: ../rpmdrake:427
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../rpmdrake:442
+#: ../rpmdrake:447
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake:459
+#: ../rpmdrake:464
 #, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake:460
+#: ../rpmdrake:465
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1041,28 +1067,28 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../rpmdrake:480
+#: ../rpmdrake:485
 #, c-format
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:519 ../rpmdrake:522
+#: ../rpmdrake:524 ../rpmdrake:527
 #, c-format
 msgid "More info"
 msgstr "更多信息"
 
-#: ../rpmdrake:525 ../rpmdrake:1380
+#: ../rpmdrake:530 ../rpmdrake:1385
 #, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../rpmdrake:548
+#: ../rpmdrake:553
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake:549
+#: ../rpmdrake:554
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1072,12 +1098,12 @@ msgstr ""
 "为了满足所有的依赖关系，需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:555 ../rpmdrake:564
+#: ../rpmdrake:560 ../rpmdrake:569
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake:556
+#: ../rpmdrake:561
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1086,7 +1112,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../rpmdrake:565 ../rpmdrake:620
+#: ../rpmdrake:570 ../rpmdrake:625
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1096,12 +1122,12 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:588
+#: ../rpmdrake:593
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake:589
+#: ../rpmdrake:594
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1111,12 +1137,12 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:605
+#: ../rpmdrake:610
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake:606
+#: ../rpmdrake:611
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1127,182 +1153,182 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:619 ../rpmdrake:931
+#: ../rpmdrake:624 ../rpmdrake:936
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake:638
+#: ../rpmdrake:643
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中软件: %d MB / 剩余磁盘空间: %d MB"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:645
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中大小: %d MB"
 
-#: ../rpmdrake:648
+#: ../rpmdrake:653
 #, c-format
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../rpmdrake:651
+#: ../rpmdrake:656
 #, c-format
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../rpmdrake:653
+#: ../rpmdrake:658
 #, c-format
 msgid "Medium: "
 msgstr "介质:"
 
-#: ../rpmdrake:655
+#: ../rpmdrake:660
 #, c-format
 msgid "Currently installed version: "
 msgstr "当前安装的版本:"
 
-#: ../rpmdrake:659
+#: ../rpmdrake:664
 #, c-format
 msgid "Name: "
 msgstr "名称:"
 
-#: ../rpmdrake:660
+#: ../rpmdrake:665
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:666
 #, c-format
 msgid "Size: "
 msgstr "大小:"
 
-#: ../rpmdrake:661
+#: ../rpmdrake:666
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:663
+#: ../rpmdrake:668
 #, c-format
 msgid "Importance: "
 msgstr "重要性:"
 
-#: ../rpmdrake:665
+#: ../rpmdrake:670
 #, c-format
 msgid "Summary: "
 msgstr "摘要:"
 
-#: ../rpmdrake:667
+#: ../rpmdrake:672
 #, c-format
 msgid "Reason for update: "
 msgstr "更新原因:"
 
-#: ../rpmdrake:669
+#: ../rpmdrake:674
 #, c-format
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake:734
+#: ../rpmdrake:739
 #, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:734
+#: ../rpmdrake:739
 #, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake:752
+#: ../rpmdrake:757
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux 精选"
 
-#: ../rpmdrake:753
+#: ../rpmdrake:758
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按照字母次序排列"
 
-#: ../rpmdrake:761
+#: ../rpmdrake:766
 #, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按照组别排列"
 
-#: ../rpmdrake:762
+#: ../rpmdrake:767
 #, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:763
+#: ../rpmdrake:768
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:767
+#: ../rpmdrake:772
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全部软件包，按照介质库排列"
 
-#: ../rpmdrake:768
+#: ../rpmdrake:773
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:772
+#: ../rpmdrake:777
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "只剩下，按安装日期排序"
 
-#: ../rpmdrake:843
+#: ../rpmdrake:848
 #, c-format
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:845
+#: ../rpmdrake:850
 #, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:847
+#: ../rpmdrake:852
 #, c-format
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:858
+#: ../rpmdrake:863
 #, c-format
 msgid "Reset the selection"
 msgstr "重置选中内容"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:864
 #, c-format
 msgid "Reload the packages list"
 msgstr "重新装入软件包清单"
 
-#: ../rpmdrake:862 ../rpmdrake.pm:543
+#: ../rpmdrake:867 ../rpmdrake.pm:543
 #, c-format
 msgid "Update media"
 msgstr "更新介质"
 
-#: ../rpmdrake:893
+#: ../rpmdrake:898
 #, c-format
 msgid "Normal information"
 msgstr "正常信息"
 
-#: ../rpmdrake:893
+#: ../rpmdrake:898
 #, c-format
 msgid "Maximum information"
 msgstr "最多信息"
 
-#: ../rpmdrake:913
+#: ../rpmdrake:918
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
-#: ../rpmdrake:918
+#: ../rpmdrake:923
 #, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../rpmdrake:919
+#: ../rpmdrake:924
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1317,7 +1343,7 @@ msgstr ""
 "\n"
 "您真的想要安装所有选中的软件包吗?"
 
-#: ../rpmdrake:932
+#: ../rpmdrake:937
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1332,52 +1358,52 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:973
 #, c-format
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake:969
+#: ../rpmdrake:974
 #, c-format
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
-#: ../rpmdrake:970
+#: ../rpmdrake:975
 #, c-format
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake:983
+#: ../rpmdrake:988
 #, c-format
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:988
+#: ../rpmdrake:993
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake:1005
+#: ../rpmdrake:1010
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake:1009
+#: ../rpmdrake:1014
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../rpmdrake:1043
+#: ../rpmdrake:1048
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../rpmdrake:1044
+#: ../rpmdrake:1049
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: ../rpmdrake:1052
+#: ../rpmdrake:1057
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1390,12 +1416,12 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1066
 #, c-format
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1067
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1411,12 +1437,12 @@ msgstr ""
 "\n"
 "然后，重新启动 MandrakeUpdate。"
 
-#: ../rpmdrake:1072
+#: ../rpmdrake:1077
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../rpmdrake:1073
+#: ../rpmdrake:1078
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1430,62 +1456,62 @@ msgstr ""
 "\n"
 "然后，重新启动 MandrakeUpdate。"
 
-#: ../rpmdrake:1102
+#: ../rpmdrake:1107
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1150
+#: ../rpmdrake:1155
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake:1169
+#: ../rpmdrake:1174
 #, c-format
 msgid "changes:"
 msgstr "更改:"
 
-#: ../rpmdrake:1173
+#: ../rpmdrake:1178
 #, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1180
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake:1177
+#: ../rpmdrake:1182
 #, c-format
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake:1189
+#: ../rpmdrake:1194
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake:1199
+#: ../rpmdrake:1204
 #, c-format
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake:1225 ../rpmdrake:1376
+#: ../rpmdrake:1230 ../rpmdrake:1381
 #, c-format
 msgid "Everything installed successfully"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake:1226 ../rpmdrake:1377
+#: ../rpmdrake:1231 ../rpmdrake:1382
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake:1228 ../rpmdrake:1361
+#: ../rpmdrake:1233 ../rpmdrake:1366
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake:1229 ../rpmdrake:1362 ../rpmdrake:1416
+#: ../rpmdrake:1234 ../rpmdrake:1367 ../rpmdrake:1421
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1496,17 +1522,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1250
+#: ../rpmdrake:1255
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1256
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../rpmdrake:1252 ../rpmdrake:1308
+#: ../rpmdrake:1257 ../rpmdrake:1313
 #, c-format
 msgid ""
 "\n"
@@ -1519,37 +1545,37 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../rpmdrake:1259
+#: ../rpmdrake:1264
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../rpmdrake:1259
+#: ../rpmdrake:1264
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../rpmdrake:1264
+#: ../rpmdrake:1269
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../rpmdrake:1265
+#: ../rpmdrake:1270
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake:1270
+#: ../rpmdrake:1275
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1289
+#: ../rpmdrake:1294
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../rpmdrake:1298
+#: ../rpmdrake:1303
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1564,12 +1590,12 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../rpmdrake:1305 ../rpmdrake:1415
+#: ../rpmdrake:1310 ../rpmdrake:1420
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake:1306
+#: ../rpmdrake:1311
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1582,22 +1608,22 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../rpmdrake:1320
+#: ../rpmdrake:1325
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1328
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1339
+#: ../rpmdrake:1344
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1379
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1610,42 +1636,42 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1379
 #, c-format
 msgid "everything was installed correctly"
 msgstr "所有软件包都已正确安装"
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1387
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1406
+#: ../rpmdrake:1411
 #, c-format
 msgid "No package found for installation."
 msgstr "没有可供安装的软件包。"
 
-#: ../rpmdrake:1407
+#: ../rpmdrake:1412
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../rpmdrake:1429
+#: ../rpmdrake:1434
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "正在读取软件包数据库，请稍候..."
 
-#: ../rpmdrake:1476
+#: ../rpmdrake:1481
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake:1481
+#: ../rpmdrake:1486
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../rpmdrake:1482
+#: ../rpmdrake:1487
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1656,7 +1682,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1514
+#: ../rpmdrake:1519
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1668,7 +1694,7 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../rpmdrake:1519
+#: ../rpmdrake:1524
 #, c-format
 msgid ""
 "Welcome to MandrakeUpdate!\n"
@@ -1680,7 +1706,7 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1524
+#: ../rpmdrake:1529
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
-- 
cgit v1.2.1