deal with latest rpm group updates

1 files changed, 274 insertions, 283 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 27bb1a2a..def10ffd 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: 2012-11-09 17:13+0800\n"
+"POT-Creation-Date: 2013-01-22 16:46+0800\n"
 "PO-Revision-Date: 2009-04-19 10:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrakelinux.org>\n"
@@ -287,7 +287,7 @@ msgstr "介质类型:"
 #: ../Rpmdrake/edit_urpm_sources.pm:492 ../Rpmdrake/edit_urpm_sources.pm:519
 #: ../Rpmdrake/edit_urpm_sources.pm:600 ../Rpmdrake/edit_urpm_sources.pm:664
 #: ../Rpmdrake/edit_urpm_sources.pm:766 ../Rpmdrake/gui.pm:720
-#: ../Rpmdrake/init.pm:159 ../Rpmdrake/pkg.pm:205 ../Rpmdrake/pkg.pm:829
+#: ../Rpmdrake/init.pm:159 ../Rpmdrake/pkg.pm:202 ../Rpmdrake/pkg.pm:826
 #: ../rpmdrake.pm:357 ../rpmdrake.pm:698 ../rpmdrake.pm:771 ../rpmdrake.pm:848
 #, c-format
 msgid "Cancel"
@@ -299,7 +299,7 @@ msgstr "取消"
 #: ../Rpmdrake/edit_urpm_sources.pm:832 ../Rpmdrake/edit_urpm_sources.pm:946
 #: ../Rpmdrake/edit_urpm_sources.pm:1169 ../Rpmdrake/gui.pm:720
 #: ../Rpmdrake/gui.pm:736 ../Rpmdrake/gui.pm:741 ../Rpmdrake/init.pm:159
-#: ../Rpmdrake/pkg.pm:614 ../Rpmdrake/pkg.pm:829 ../Rpmdrake/rpmnew.pm:181
+#: ../Rpmdrake/pkg.pm:611 ../Rpmdrake/pkg.pm:826 ../Rpmdrake/rpmnew.pm:181
 #: ../rpmdrake.pm:140 ../rpmdrake.pm:293 ../rpmdrake.pm:360 ../rpmdrake.pm:698
 #, c-format
 msgid "Ok"
@@ -576,8 +576,8 @@ msgid "Command"
 msgstr "命令"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:796 ../Rpmdrake/formatting.pm:129
-#: ../Rpmdrake/gui.pm:991 ../Rpmdrake/pkg.pm:114 ../Rpmdrake/pkg.pm:162
-#: ../Rpmdrake/pkg.pm:175 ../Rpmdrake/pkg.pm:196 ../Rpmdrake/rpmnew.pm:81
+#: ../Rpmdrake/gui.pm:991 ../Rpmdrake/pkg.pm:114 ../Rpmdrake/pkg.pm:160
+#: ../Rpmdrake/pkg.pm:173 ../Rpmdrake/pkg.pm:193 ../Rpmdrake/rpmnew.pm:81
 #, c-format
 msgid "(none)"
 msgstr "(无)"
@@ -784,7 +784,7 @@ msgstr "Mageia"
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1045 ../Rpmdrake/pkg.pm:270
+#: ../Rpmdrake/edit_urpm_sources.pm:1045 ../Rpmdrake/pkg.pm:267
 #, c-format
 msgid "Enabled"
 msgstr "启用"
@@ -867,7 +867,7 @@ msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
 #: ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:322 ../Rpmdrake/gui.pm:324
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/pkg.pm:185
 #, c-format
 msgid "(Not available)"
 msgstr "(不可用)"
@@ -1028,8 +1028,8 @@ msgid "Description: "
 msgstr "描述:"
 
 #: ../Rpmdrake/gui.pm:361 ../Rpmdrake/gui.pm:562 ../Rpmdrake/gui.pm:568
-#: ../Rpmdrake/gui.pm:574 ../Rpmdrake/pkg.pm:839 ../Rpmdrake/pkg.pm:849
-#: ../Rpmdrake/pkg.pm:863 ../rpmdrake:793 ../rpmdrake.pm:828
+#: ../Rpmdrake/gui.pm:574 ../Rpmdrake/pkg.pm:836 ../Rpmdrake/pkg.pm:846
+#: ../Rpmdrake/pkg.pm:860 ../rpmdrake:793 ../rpmdrake.pm:828
 #: ../rpmdrake.pm:942
 #, c-format
 msgid "Warning"
@@ -1076,7 +1076,7 @@ msgstr ""
 "“%s”包位于 urpmi 跳过列表中。\n"
 "您是否仍然要选择该软件包？"
 
-#: ../Rpmdrake/gui.pm:574 ../Rpmdrake/pkg.pm:714
+#: ../Rpmdrake/gui.pm:574 ../Rpmdrake/pkg.pm:711
 #, c-format
 msgid ""
 "Rpmdrake or one of its priority dependencies needs to be updated first. "
@@ -1213,7 +1213,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:862 ../Rpmdrake/pkg.pm:718
+#: ../Rpmdrake/gui.pm:862 ../Rpmdrake/pkg.pm:715
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
@@ -1263,7 +1263,7 @@ msgstr ""
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../Rpmdrake/gui.pm:944 ../Rpmdrake/open_db.pm:85 ../Rpmdrake/pkg.pm:469
+#: ../Rpmdrake/gui.pm:944 ../Rpmdrake/open_db.pm:85 ../Rpmdrake/pkg.pm:466
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
@@ -1331,90 +1331,95 @@ msgid "Compression"
 msgstr "压缩"
 
 #: ../Rpmdrake/icon.pm:41 ../Rpmdrake/icon.pm:64 ../Rpmdrake/icon.pm:80
-#: ../Rpmdrake/icon.pm:100 ../Rpmdrake/icon.pm:113 ../Rpmdrake/icon.pm:127
-#: ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:149 ../Rpmdrake/icon.pm:166
+#: ../Rpmdrake/icon.pm:100 ../Rpmdrake/icon.pm:121 ../Rpmdrake/icon.pm:141
 #, c-format
 msgid "Other"
 msgstr "其它"
 
 #: ../Rpmdrake/icon.pm:42 ../Rpmdrake/icon.pm:43 ../Rpmdrake/icon.pm:44
 #: ../Rpmdrake/icon.pm:45 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:47
-#: ../Rpmdrake/icon.pm:48 ../Rpmdrake/icon.pm:49 ../Rpmdrake/icon.pm:50
+#: ../Rpmdrake/icon.pm:48 ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Communications"
 msgstr "通讯"
 
-#: ../Rpmdrake/icon.pm:43 ../Rpmdrake/icon.pm:44
+#: ../Rpmdrake/icon.pm:43
 #, c-format
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../Rpmdrake/icon.pm:45
+#: ../Rpmdrake/icon.pm:44
 #, c-format
 msgid "Dial-Up"
 msgstr "拨号"
 
-#: ../Rpmdrake/icon.pm:46
+#: ../Rpmdrake/icon.pm:45
 #, c-format
 msgid "Fax"
 msgstr "传真"
 
-#: ../Rpmdrake/icon.pm:47
+#: ../Rpmdrake/icon.pm:46
 #, c-format
 msgid "Mobile"
 msgstr "手机"
 
-#: ../Rpmdrake/icon.pm:48
+#: ../Rpmdrake/icon.pm:47
 #, c-format
 msgid "Radio"
 msgstr "传真"
 
-#: ../Rpmdrake/icon.pm:49
+#: ../Rpmdrake/icon.pm:48
 #, c-format
 msgid "Serial"
 msgstr "串行"
 
-#: ../Rpmdrake/icon.pm:50
+#: ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Telephony"
 msgstr "电话"
 
-#: ../Rpmdrake/icon.pm:51 ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:50 ../Rpmdrake/icon.pm:56
 #, c-format
 msgid "Databases"
 msgstr "数据库"
 
-#: ../Rpmdrake/icon.pm:52 ../Rpmdrake/icon.pm:53 ../Rpmdrake/icon.pm:54
-#: ../Rpmdrake/icon.pm:55 ../Rpmdrake/icon.pm:56 ../Rpmdrake/icon.pm:57
-#: ../Rpmdrake/icon.pm:58 ../Rpmdrake/icon.pm:59 ../Rpmdrake/icon.pm:60
-#: ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:62 ../Rpmdrake/icon.pm:63
-#: ../Rpmdrake/icon.pm:64 ../Rpmdrake/icon.pm:65 ../Rpmdrake/icon.pm:66
-#: ../Rpmdrake/icon.pm:67 ../Rpmdrake/icon.pm:68 ../Rpmdrake/icon.pm:69
-#: ../Rpmdrake/icon.pm:207 ../Rpmdrake/icon.pm:208 ../Rpmdrake/icon.pm:209
+#: ../Rpmdrake/icon.pm:51 ../Rpmdrake/icon.pm:52 ../Rpmdrake/icon.pm:53
+#: ../Rpmdrake/icon.pm:54 ../Rpmdrake/icon.pm:55 ../Rpmdrake/icon.pm:56
+#: ../Rpmdrake/icon.pm:57 ../Rpmdrake/icon.pm:58 ../Rpmdrake/icon.pm:59
+#: ../Rpmdrake/icon.pm:60 ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:62
+#: ../Rpmdrake/icon.pm:63 ../Rpmdrake/icon.pm:64 ../Rpmdrake/icon.pm:65
+#: ../Rpmdrake/icon.pm:66 ../Rpmdrake/icon.pm:67 ../Rpmdrake/icon.pm:68
+#: ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:196 ../Rpmdrake/icon.pm:197
+#: ../Rpmdrake/icon.pm:198
 #, c-format
 msgid "Development"
 msgstr "开发"
 
-#: ../Rpmdrake/icon.pm:53
+#: ../Rpmdrake/icon.pm:52
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: ../Rpmdrake/icon.pm:54
+#: ../Rpmdrake/icon.pm:53
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../Rpmdrake/icon.pm:55
+#: ../Rpmdrake/icon.pm:54
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../Rpmdrake/icon.pm:56
+#: ../Rpmdrake/icon.pm:55
 #, c-format
 msgid "C#"
 msgstr "C#"
 
+#: ../Rpmdrake/icon.pm:57
+#, c-format
+msgid "Debug"
+msgstr "调试"
+
 #: ../Rpmdrake/icon.pm:58
 #, c-format
 msgid "Erlang"
@@ -1466,17 +1471,17 @@ msgid "Tools"
 msgstr "工具"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:181
+#: ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:169
 #, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../Rpmdrake/icon.pm:70 ../Rpmdrake/icon.pm:194 ../Rpmdrake/icon.pm:209
+#: ../Rpmdrake/icon.pm:70 ../Rpmdrake/icon.pm:183 ../Rpmdrake/icon.pm:198
 #, c-format
 msgid "Documentation"
 msgstr "文档"
 
-#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:112
+#: ../Rpmdrake/icon.pm:71
 #, c-format
 msgid "Editors"
 msgstr "编辑器"
@@ -1499,7 +1504,7 @@ msgstr "文件工具"
 #: ../Rpmdrake/icon.pm:75 ../Rpmdrake/icon.pm:76 ../Rpmdrake/icon.pm:77
 #: ../Rpmdrake/icon.pm:78 ../Rpmdrake/icon.pm:79 ../Rpmdrake/icon.pm:80
 #: ../Rpmdrake/icon.pm:81 ../Rpmdrake/icon.pm:82 ../Rpmdrake/icon.pm:83
-#: ../Rpmdrake/icon.pm:84
+#: ../Rpmdrake/icon.pm:84 ../Rpmdrake/icon.pm:85
 #, c-format
 msgid "Games"
 msgstr "游戏"
@@ -1536,38 +1541,37 @@ msgstr "射击"
 
 #: ../Rpmdrake/icon.pm:83
 #, c-format
+msgid "Simulation"
+msgstr "模拟"
+
+#: ../Rpmdrake/icon.pm:84
+#, c-format
 msgid "Sports"
 msgstr "运动"
 
-#: ../Rpmdrake/icon.pm:84
+#: ../Rpmdrake/icon.pm:85
 #, c-format
 msgid "Strategy"
 msgstr "策略"
 
-#: ../Rpmdrake/icon.pm:85
+#: ../Rpmdrake/icon.pm:86
 #, c-format
 msgid "Geography"
 msgstr "地理"
 
-#: ../Rpmdrake/icon.pm:86 ../Rpmdrake/icon.pm:87 ../Rpmdrake/icon.pm:90
-#: ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:94 ../Rpmdrake/icon.pm:97
-#: ../Rpmdrake/icon.pm:100 ../Rpmdrake/icon.pm:101 ../Rpmdrake/icon.pm:104
-#: ../Rpmdrake/icon.pm:107
+#: ../Rpmdrake/icon.pm:87 ../Rpmdrake/icon.pm:88 ../Rpmdrake/icon.pm:91
+#: ../Rpmdrake/icon.pm:94 ../Rpmdrake/icon.pm:97 ../Rpmdrake/icon.pm:100
+#: ../Rpmdrake/icon.pm:101 ../Rpmdrake/icon.pm:104
 #, c-format
 msgid "Graphical desktop"
 msgstr "图形桌面"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:89
+#: ../Rpmdrake/icon.pm:90
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../Rpmdrake/icon.pm:90
-#, c-format
-msgid "FVWM based"
-msgstr "基于 FVWM"
-
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../Rpmdrake/icon.pm:93
 #, c-format
@@ -1589,464 +1593,430 @@ msgstr "KDE"
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../Rpmdrake/icon.pm:103
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
-
-#. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:106
-#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:109
+#: ../Rpmdrake/icon.pm:106
 #, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
+#: ../Rpmdrake/icon.pm:107 ../Rpmdrake/icon.pm:108 ../Rpmdrake/icon.pm:109
 #: ../Rpmdrake/icon.pm:110 ../Rpmdrake/icon.pm:111 ../Rpmdrake/icon.pm:112
-#: ../Rpmdrake/icon.pm:113 ../Rpmdrake/icon.pm:114 ../Rpmdrake/icon.pm:115
-#: ../Rpmdrake/icon.pm:116
+#: ../Rpmdrake/icon.pm:113
 #, c-format
 msgid "Graphics"
 msgstr "图形"
 
-#: ../Rpmdrake/icon.pm:111
+#: ../Rpmdrake/icon.pm:108
 #, c-format
 msgid "3D"
 msgstr "3D"
 
-#: ../Rpmdrake/icon.pm:114
+#: ../Rpmdrake/icon.pm:109 ../Rpmdrake/icon.pm:146 ../Rpmdrake/icon.pm:174
+#, c-format
+msgid "Editors and Converters"
+msgstr "编辑器和转换器"
+
+#: ../Rpmdrake/icon.pm:110 ../Rpmdrake/icon.pm:129 ../Rpmdrake/icon.pm:150
+#: ../Rpmdrake/icon.pm:177
+#, c-format
+msgid "Utilities"
+msgstr "工具"
+
+#: ../Rpmdrake/icon.pm:111
 #, c-format
 msgid "Photography"
 msgstr "照片"
 
-#: ../Rpmdrake/icon.pm:115
+#: ../Rpmdrake/icon.pm:112
 #, c-format
 msgid "Scanning"
 msgstr "扫描"
 
-#: ../Rpmdrake/icon.pm:116
+#: ../Rpmdrake/icon.pm:113
 #, c-format
 msgid "Viewers"
 msgstr "查看器"
 
-#: ../Rpmdrake/icon.pm:117
+#: ../Rpmdrake/icon.pm:114
 #, c-format
 msgid "Monitoring"
 msgstr "监视"
 
-#: ../Rpmdrake/icon.pm:118 ../Rpmdrake/icon.pm:119
-#, c-format
-msgid "Multimedia"
-msgstr "多媒体"
-
-#: ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:185 ../Rpmdrake/icon.pm:186
-#: ../Rpmdrake/icon.pm:187 ../Rpmdrake/icon.pm:188
-#, c-format
-msgid "Video"
-msgstr "视频"
-
-#: ../Rpmdrake/icon.pm:120 ../Rpmdrake/icon.pm:121 ../Rpmdrake/icon.pm:122
-#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:124 ../Rpmdrake/icon.pm:125
-#: ../Rpmdrake/icon.pm:126 ../Rpmdrake/icon.pm:127 ../Rpmdrake/icon.pm:128
-#: ../Rpmdrake/icon.pm:129 ../Rpmdrake/icon.pm:165
+#: ../Rpmdrake/icon.pm:115 ../Rpmdrake/icon.pm:116 ../Rpmdrake/icon.pm:117
+#: ../Rpmdrake/icon.pm:118 ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:120
+#: ../Rpmdrake/icon.pm:121 ../Rpmdrake/icon.pm:122 ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:163
 #, c-format
 msgid "Networking"
 msgstr "网络"
 
-#: ../Rpmdrake/icon.pm:121
-#, c-format
-msgid "Chat"
-msgstr "聊天"
-
-#: ../Rpmdrake/icon.pm:122
+#: ../Rpmdrake/icon.pm:116
 #, c-format
 msgid "File transfer"
 msgstr "文件传送"
 
-#: ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:117
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../Rpmdrake/icon.pm:124
+#: ../Rpmdrake/icon.pm:118
 #, c-format
 msgid "Instant messaging"
 msgstr "即时通讯"
 
-#: ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:214
+#: ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:203
 #, c-format
 msgid "Mail"
 msgstr "邮件"
 
-#: ../Rpmdrake/icon.pm:126
+#: ../Rpmdrake/icon.pm:120
 #, c-format
 msgid "News"
 msgstr "新闻"
 
-#: ../Rpmdrake/icon.pm:128
+#: ../Rpmdrake/icon.pm:122
 #, c-format
 msgid "Remote access"
 msgstr "远程访问"
 
-#: ../Rpmdrake/icon.pm:129
+#: ../Rpmdrake/icon.pm:123
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
+#: ../Rpmdrake/icon.pm:124 ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:126
+#: ../Rpmdrake/icon.pm:127 ../Rpmdrake/icon.pm:128 ../Rpmdrake/icon.pm:129
 #: ../Rpmdrake/icon.pm:130 ../Rpmdrake/icon.pm:131 ../Rpmdrake/icon.pm:132
-#: ../Rpmdrake/icon.pm:133 ../Rpmdrake/icon.pm:134 ../Rpmdrake/icon.pm:135
-#: ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:138
 #, c-format
 msgid "Office"
 msgstr "办公"
 
-#: ../Rpmdrake/icon.pm:131
+#: ../Rpmdrake/icon.pm:125
 #, c-format
 msgid "Dictionary"
 msgstr "字典"
 
-#: ../Rpmdrake/icon.pm:132
+#: ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Finance"
 msgstr "财务"
 
-#: ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:127
 #, c-format
 msgid "Management"
 msgstr "管理"
 
-#: ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/icon.pm:128
 #, c-format
 msgid "Organizer"
 msgstr "日程"
 
-#: ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:130
 #, c-format
 msgid "Spreadsheet"
 msgstr "电子表格"
 
-#: ../Rpmdrake/icon.pm:137
+#: ../Rpmdrake/icon.pm:131
 #, c-format
 msgid "Suite"
 msgstr "套件"
 
-#: ../Rpmdrake/icon.pm:138
+#: ../Rpmdrake/icon.pm:132
 #, c-format
 msgid "Word processor"
 msgstr "字处理"
 
-#: ../Rpmdrake/icon.pm:139
-#, c-format
-msgid "Public Keys"
-msgstr "公钥"
-
-#: ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:133
 #, c-format
 msgid "Publishing"
 msgstr "出版"
 
-#: ../Rpmdrake/icon.pm:141
-#, c-format
-msgid "Security"
-msgstr "安全"
-
-#: ../Rpmdrake/icon.pm:142 ../Rpmdrake/icon.pm:143 ../Rpmdrake/icon.pm:144
-#: ../Rpmdrake/icon.pm:145 ../Rpmdrake/icon.pm:146 ../Rpmdrake/icon.pm:147
-#: ../Rpmdrake/icon.pm:148 ../Rpmdrake/icon.pm:149 ../Rpmdrake/icon.pm:150
+#: ../Rpmdrake/icon.pm:134 ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:138 ../Rpmdrake/icon.pm:139
+#: ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142
 #, c-format
 msgid "Sciences"
 msgstr "科学"
 
-#: ../Rpmdrake/icon.pm:143
+#: ../Rpmdrake/icon.pm:135
 #, c-format
 msgid "Astronomy"
 msgstr "天文"
 
-#: ../Rpmdrake/icon.pm:144
+#: ../Rpmdrake/icon.pm:136
 #, c-format
 msgid "Biology"
 msgstr "生物"
 
-#: ../Rpmdrake/icon.pm:145
+#: ../Rpmdrake/icon.pm:137
 #, c-format
 msgid "Chemistry"
 msgstr "化学"
 
-#: ../Rpmdrake/icon.pm:146
+#: ../Rpmdrake/icon.pm:138
 #, c-format
 msgid "Computer science"
 msgstr "计算机科学"
 
-#: ../Rpmdrake/icon.pm:147
+#: ../Rpmdrake/icon.pm:139
 #, c-format
 msgid "Geosciences"
 msgstr "地球科学"
 
-#: ../Rpmdrake/icon.pm:148
+#: ../Rpmdrake/icon.pm:140
 #, c-format
 msgid "Mathematics"
 msgstr "数学"
 
-#: ../Rpmdrake/icon.pm:150
+#: ../Rpmdrake/icon.pm:142
 #, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../Rpmdrake/icon.pm:151
+#: ../Rpmdrake/icon.pm:143
+#, c-format
+msgid "Security"
+msgstr "安全"
+
+#: ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../Rpmdrake/icon.pm:152 ../Rpmdrake/icon.pm:153 ../Rpmdrake/icon.pm:154
-#: ../Rpmdrake/icon.pm:155 ../Rpmdrake/icon.pm:156 ../Rpmdrake/icon.pm:157
-#: ../Rpmdrake/icon.pm:158
+#: ../Rpmdrake/icon.pm:145 ../Rpmdrake/icon.pm:146 ../Rpmdrake/icon.pm:147
+#: ../Rpmdrake/icon.pm:148 ../Rpmdrake/icon.pm:149 ../Rpmdrake/icon.pm:150
 #, c-format
 msgid "Sound"
 msgstr "声音"
 
-#: ../Rpmdrake/icon.pm:153 ../Rpmdrake/icon.pm:186
-#, c-format
-msgid "Editors and Converters"
-msgstr "编辑器和转换器"
-
-#: ../Rpmdrake/icon.pm:154
+#: ../Rpmdrake/icon.pm:147
 #, c-format
 msgid "Midi"
 msgstr "MIDI"
 
-#: ../Rpmdrake/icon.pm:155
+#: ../Rpmdrake/icon.pm:148
 #, c-format
 msgid "Mixers"
 msgstr "混音"
 
-#: ../Rpmdrake/icon.pm:156 ../Rpmdrake/icon.pm:187
+#: ../Rpmdrake/icon.pm:149 ../Rpmdrake/icon.pm:175
 #, c-format
 msgid "Players"
 msgstr "播放器"
 
-#: ../Rpmdrake/icon.pm:157 ../Rpmdrake/icon.pm:188
-#, c-format
-msgid "Utilities"
-msgstr "工具"
-
-#: ../Rpmdrake/icon.pm:158
-#, c-format
-msgid "Visualization"
-msgstr "可视化"
-
-#: ../Rpmdrake/icon.pm:159 ../Rpmdrake/icon.pm:160 ../Rpmdrake/icon.pm:161
-#: ../Rpmdrake/icon.pm:162 ../Rpmdrake/icon.pm:163 ../Rpmdrake/icon.pm:164
-#: ../Rpmdrake/icon.pm:165 ../Rpmdrake/icon.pm:166 ../Rpmdrake/icon.pm:167
-#: ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:169 ../Rpmdrake/icon.pm:170
-#: ../Rpmdrake/icon.pm:171 ../Rpmdrake/icon.pm:172 ../Rpmdrake/icon.pm:173
-#: ../Rpmdrake/icon.pm:174 ../Rpmdrake/icon.pm:175 ../Rpmdrake/icon.pm:176
-#: ../Rpmdrake/icon.pm:177 ../Rpmdrake/icon.pm:178 ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:151 ../Rpmdrake/icon.pm:152 ../Rpmdrake/icon.pm:153
+#: ../Rpmdrake/icon.pm:154 ../Rpmdrake/icon.pm:155 ../Rpmdrake/icon.pm:156
+#: ../Rpmdrake/icon.pm:157 ../Rpmdrake/icon.pm:158 ../Rpmdrake/icon.pm:159
+#: ../Rpmdrake/icon.pm:160 ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:162
+#: ../Rpmdrake/icon.pm:163 ../Rpmdrake/icon.pm:164 ../Rpmdrake/icon.pm:165
+#: ../Rpmdrake/icon.pm:166 ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: ../Rpmdrake/icon.pm:160
+#: ../Rpmdrake/icon.pm:152
 #, c-format
 msgid "Base"
 msgstr "基本"
 
-#: ../Rpmdrake/icon.pm:161
-#, c-format
-msgid "Cluster"
-msgstr "集群"
-
-#: ../Rpmdrake/icon.pm:162 ../Rpmdrake/icon.pm:163 ../Rpmdrake/icon.pm:164
-#: ../Rpmdrake/icon.pm:165 ../Rpmdrake/icon.pm:166 ../Rpmdrake/icon.pm:167
-#: ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:192
-#, c-format
-msgid "Configuration"
-msgstr "配置"
-
-#: ../Rpmdrake/icon.pm:163
+#: ../Rpmdrake/icon.pm:153
 #, c-format
 msgid "Boot and Init"
 msgstr "启动和初始化"
 
-#: ../Rpmdrake/icon.pm:164
-#, c-format
-msgid "Hardware"
-msgstr "硬件"
-
-#: ../Rpmdrake/icon.pm:167
+#: ../Rpmdrake/icon.pm:154
 #, c-format
-msgid "Packaging"
-msgstr "打包"
+msgid "Cluster"
+msgstr "集群"
 
-#: ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:177
+#: ../Rpmdrake/icon.pm:155 ../Rpmdrake/icon.pm:181
 #, c-format
-msgid "Printing"
-msgstr "打印"
+msgid "Configuration"
+msgstr "配置"
 
-#: ../Rpmdrake/icon.pm:169 ../Rpmdrake/icon.pm:170 ../Rpmdrake/icon.pm:171
-#: ../Rpmdrake/icon.pm:172 ../Rpmdrake/icon.pm:173
+#: ../Rpmdrake/icon.pm:156 ../Rpmdrake/icon.pm:157 ../Rpmdrake/icon.pm:158
+#: ../Rpmdrake/icon.pm:159
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: ../Rpmdrake/icon.pm:170
-#, c-format
-msgid "Console"
-msgstr "控制台"
-
-#: ../Rpmdrake/icon.pm:171
+#: ../Rpmdrake/icon.pm:157
 #, c-format
 msgid "True type"
 msgstr "TrueType"
 
-#: ../Rpmdrake/icon.pm:172
+#: ../Rpmdrake/icon.pm:158
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../Rpmdrake/icon.pm:173
+#: ../Rpmdrake/icon.pm:159
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 位图"
 
-#: ../Rpmdrake/icon.pm:174
+#: ../Rpmdrake/icon.pm:160
 #, c-format
 msgid "Internationalization"
 msgstr "国际化"
 
-#: ../Rpmdrake/icon.pm:175
+#: ../Rpmdrake/icon.pm:161
 #, c-format
 msgid "Kernel and hardware"
 msgstr "内核和硬件"
 
-#: ../Rpmdrake/icon.pm:176
+#: ../Rpmdrake/icon.pm:162
 #, c-format
 msgid "Libraries"
 msgstr "库"
 
-#: ../Rpmdrake/icon.pm:178
+#: ../Rpmdrake/icon.pm:164
+#, c-format
+msgid "Packaging"
+msgstr "打包"
+
+#: ../Rpmdrake/icon.pm:165
+#, c-format
+msgid "Printing"
+msgstr "打印"
+
+#: ../Rpmdrake/icon.pm:166
 #, c-format
 msgid "Servers"
 msgstr "服务器"
 
-#: ../Rpmdrake/icon.pm:182
+#: ../Rpmdrake/icon.pm:170
 #, c-format
 msgid "Terminals"
 msgstr "终端"
 
-#: ../Rpmdrake/icon.pm:183
+#: ../Rpmdrake/icon.pm:171
 #, c-format
 msgid "Text tools"
 msgstr "文本工具"
 
-#: ../Rpmdrake/icon.pm:184
+#: ../Rpmdrake/icon.pm:172
 #, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#: ../Rpmdrake/icon.pm:191 ../Rpmdrake/icon.pm:192 ../Rpmdrake/icon.pm:193
-#: ../Rpmdrake/icon.pm:194 ../Rpmdrake/icon.pm:195 ../Rpmdrake/icon.pm:196
-#: ../Rpmdrake/icon.pm:197 ../Rpmdrake/icon.pm:198 ../Rpmdrake/icon.pm:199
-#: ../Rpmdrake/icon.pm:200
+#: ../Rpmdrake/icon.pm:173 ../Rpmdrake/icon.pm:174 ../Rpmdrake/icon.pm:175
+#: ../Rpmdrake/icon.pm:176 ../Rpmdrake/icon.pm:177
+#, c-format
+msgid "Video"
+msgstr "视频"
+
+#: ../Rpmdrake/icon.pm:176
+#, c-format
+msgid "Television"
+msgstr "电视"
+
+#: ../Rpmdrake/icon.pm:180 ../Rpmdrake/icon.pm:181 ../Rpmdrake/icon.pm:182
+#: ../Rpmdrake/icon.pm:183 ../Rpmdrake/icon.pm:184 ../Rpmdrake/icon.pm:185
+#: ../Rpmdrake/icon.pm:186 ../Rpmdrake/icon.pm:187 ../Rpmdrake/icon.pm:188
+#: ../Rpmdrake/icon.pm:189
 #, c-format
 msgid "Workstation"
 msgstr "工作站"
 
-#: ../Rpmdrake/icon.pm:193
+#: ../Rpmdrake/icon.pm:182
 #, c-format
 msgid "Console Tools"
 msgstr "控制台工具"
 
-#: ../Rpmdrake/icon.pm:195
+#: ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Game station"
 msgstr "游戏机"
 
-#: ../Rpmdrake/icon.pm:196
+#: ../Rpmdrake/icon.pm:185
 #, c-format
 msgid "Internet station"
 msgstr "Internet 工作站"
 
-#: ../Rpmdrake/icon.pm:197
+#: ../Rpmdrake/icon.pm:186
 #, c-format
 msgid "Multimedia station"
 msgstr "多媒体工作站"
 
-#: ../Rpmdrake/icon.pm:198
+#: ../Rpmdrake/icon.pm:187
 #, c-format
 msgid "Network Computer (client)"
 msgstr "网络计算机(客户端)"
 
-#: ../Rpmdrake/icon.pm:199
+#: ../Rpmdrake/icon.pm:188
 #, c-format
 msgid "Office Workstation"
 msgstr "办公工作站"
 
-#: ../Rpmdrake/icon.pm:200
+#: ../Rpmdrake/icon.pm:189
 #, c-format
 msgid "Scientific Workstation"
 msgstr "科学工作站"
 
-#: ../Rpmdrake/icon.pm:201 ../Rpmdrake/icon.pm:203 ../Rpmdrake/icon.pm:204
-#: ../Rpmdrake/icon.pm:205 ../Rpmdrake/icon.pm:206
+#: ../Rpmdrake/icon.pm:190 ../Rpmdrake/icon.pm:192 ../Rpmdrake/icon.pm:193
+#: ../Rpmdrake/icon.pm:194 ../Rpmdrake/icon.pm:195
 #, c-format
 msgid "Graphical Environment"
 msgstr "图形环境"
 
-#: ../Rpmdrake/icon.pm:203
+#: ../Rpmdrake/icon.pm:192
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 工作站"
 
-#: ../Rpmdrake/icon.pm:204
+#: ../Rpmdrake/icon.pm:193
 #, c-format
 msgid "IceWm Desktop"
 msgstr "IceWM 桌面"
 
-#: ../Rpmdrake/icon.pm:205
+#: ../Rpmdrake/icon.pm:194
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE 工作站"
 
-#: ../Rpmdrake/icon.pm:206
+#: ../Rpmdrake/icon.pm:195
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "其它图形桌面"
 
-#: ../Rpmdrake/icon.pm:210 ../Rpmdrake/icon.pm:211 ../Rpmdrake/icon.pm:212
-#: ../Rpmdrake/icon.pm:213 ../Rpmdrake/icon.pm:214 ../Rpmdrake/icon.pm:215
-#: ../Rpmdrake/icon.pm:216 ../Rpmdrake/icon.pm:217
+#: ../Rpmdrake/icon.pm:199 ../Rpmdrake/icon.pm:200 ../Rpmdrake/icon.pm:201
+#: ../Rpmdrake/icon.pm:202 ../Rpmdrake/icon.pm:203 ../Rpmdrake/icon.pm:204
+#: ../Rpmdrake/icon.pm:205 ../Rpmdrake/icon.pm:206
 #, c-format
 msgid "Server"
 msgstr "服务器"
 
-#: ../Rpmdrake/icon.pm:211
+#: ../Rpmdrake/icon.pm:200
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: ../Rpmdrake/icon.pm:212
+#: ../Rpmdrake/icon.pm:201
 #, c-format
 msgid "Database"
 msgstr "数据库"
 
-#: ../Rpmdrake/icon.pm:213
+#: ../Rpmdrake/icon.pm:202
 #, c-format
 msgid "Firewall/Router"
 msgstr "防火墙/路由器"
 
-#: ../Rpmdrake/icon.pm:215
+#: ../Rpmdrake/icon.pm:204
 #, c-format
 msgid "Mail/Groupware/News"
 msgstr "邮件/群件/新闻"
 
-#: ../Rpmdrake/icon.pm:216
+#: ../Rpmdrake/icon.pm:205
 #, c-format
 msgid "Network Computer server"
 msgstr "网络计算机服务器"
 
-#: ../Rpmdrake/icon.pm:217
+#: ../Rpmdrake/icon.pm:206
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
@@ -2164,55 +2134,55 @@ msgstr ""
 "您将无法执行对系统的修改，\n"
 "但您仍然可以浏览已有数据库。"
 
-#: ../Rpmdrake/pkg.pm:126
+#: ../Rpmdrake/pkg.pm:125
 #, c-format
-msgid "Getting information from XML meta-data from %s..."
-msgstr "正在从 %s 获取 XML 元数据..."
+msgid "Getting information from %s..."
+msgstr "正在从 %s 获取信息..."
 
-#: ../Rpmdrake/pkg.pm:130
+#: ../Rpmdrake/pkg.pm:129
 #, c-format
 msgid "Getting '%s' from XML meta-data..."
 msgstr "正在从 XML 元数据获取“%s”..."
 
-#: ../Rpmdrake/pkg.pm:133 ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:737
-#: ../Rpmdrake/pkg.pm:944 ../rpmdrake:134 ../rpmdrake.pm:385
+#: ../Rpmdrake/pkg.pm:132 ../Rpmdrake/pkg.pm:434 ../Rpmdrake/pkg.pm:734
+#: ../Rpmdrake/pkg.pm:941 ../rpmdrake:134 ../rpmdrake.pm:385
 #: ../rpmdrake.pm:594
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../Rpmdrake/pkg.pm:147
+#: ../Rpmdrake/pkg.pm:146
 #, c-format
 msgid "No xml info for medium \"%s\", only partial result for package %s"
 msgstr "未找到介质“%s”的 XML 信息，只返回软件包 %s 的部分结果"
 
-#: ../Rpmdrake/pkg.pm:149
+#: ../Rpmdrake/pkg.pm:148
 #, c-format
 msgid ""
 "No xml info for medium \"%s\", unable to return any result for package %s"
 msgstr "未找到介质“%s”的 XML 信息，无法返回软件包 %s 的任何结果"
 
-#: ../Rpmdrake/pkg.pm:204 ../Rpmdrake/pkg.pm:209
+#: ../Rpmdrake/pkg.pm:201 ../Rpmdrake/pkg.pm:206
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../Rpmdrake/pkg.pm:211
+#: ../Rpmdrake/pkg.pm:208
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../Rpmdrake/pkg.pm:212
+#: ../Rpmdrake/pkg.pm:209
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:718
+#: ../Rpmdrake/pkg.pm:247 ../Rpmdrake/pkg.pm:715
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
 
-#: ../Rpmdrake/pkg.pm:251
+#: ../Rpmdrake/pkg.pm:248
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -2225,17 +2195,17 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:255
+#: ../Rpmdrake/pkg.pm:252
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不要再询问"
 
-#: ../Rpmdrake/pkg.pm:264
+#: ../Rpmdrake/pkg.pm:261
 #, c-format
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../Rpmdrake/pkg.pm:265
+#: ../Rpmdrake/pkg.pm:262
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -2251,14 +2221,14 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../Rpmdrake/pkg.pm:275
+#: ../Rpmdrake/pkg.pm:272
 #, c-format
 msgid ""
 "You have no configured update media. MageiaUpdate cannot operate without any "
 "update media."
 msgstr "您尚未配置更新介质。没有更新介质的话，MageiaUpdate 无法操作。"
 
-#: ../Rpmdrake/pkg.pm:276 ../rpmdrake.pm:627
+#: ../Rpmdrake/pkg.pm:273 ../rpmdrake.pm:627
 #, c-format
 msgid ""
 "I need to contact the Mageia website to get the mirror list.\n"
@@ -2271,12 +2241,12 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:283
+#: ../Rpmdrake/pkg.pm:280
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../Rpmdrake/pkg.pm:284
+#: ../Rpmdrake/pkg.pm:281
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -2290,73 +2260,73 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:737
+#: ../Rpmdrake/pkg.pm:434 ../Rpmdrake/pkg.pm:734
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:737 ../Rpmdrake/pkg.pm:944
+#: ../Rpmdrake/pkg.pm:434 ../Rpmdrake/pkg.pm:734 ../Rpmdrake/pkg.pm:941
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../Rpmdrake/pkg.pm:452
+#: ../Rpmdrake/pkg.pm:449
 #, c-format
 msgid "Reading updates description"
 msgstr "读取更新描述"
 
-#: ../Rpmdrake/pkg.pm:458 ../Rpmdrake/pkg.pm:493
+#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:490
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:464
+#: ../Rpmdrake/pkg.pm:461
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "正在列出基本软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:469 ../Rpmdrake/pkg.pm:868 ../Rpmdrake/pkg.pm:893
+#: ../Rpmdrake/pkg.pm:466 ../Rpmdrake/pkg.pm:865 ../Rpmdrake/pkg.pm:890
 #: ../rpmdrake.pm:815 ../rpmdrake.pm:901 ../rpmdrake.pm:925
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../Rpmdrake/pkg.pm:477
+#: ../Rpmdrake/pkg.pm:474
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "正在寻找已安装的软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:594
+#: ../Rpmdrake/pkg.pm:591
 #, c-format
 msgid "Upgrade information"
 msgstr "升级信息"
 
-#: ../Rpmdrake/pkg.pm:596
+#: ../Rpmdrake/pkg.pm:593
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../Rpmdrake/pkg.pm:604
+#: ../Rpmdrake/pkg.pm:601
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "关于此软件包的升级信息"
 
-#: ../Rpmdrake/pkg.pm:607
+#: ../Rpmdrake/pkg.pm:604
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "关于软件包 %s 的升级信息"
 
-#: ../Rpmdrake/pkg.pm:629 ../Rpmdrake/pkg.pm:885
+#: ../Rpmdrake/pkg.pm:626 ../Rpmdrake/pkg.pm:882
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../Rpmdrake/pkg.pm:633 ../Rpmdrake/pkg.pm:854
+#: ../Rpmdrake/pkg.pm:630 ../Rpmdrake/pkg.pm:851
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:634 ../Rpmdrake/pkg.pm:654 ../Rpmdrake/pkg.pm:856
+#: ../Rpmdrake/pkg.pm:631 ../Rpmdrake/pkg.pm:651 ../Rpmdrake/pkg.pm:853
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2367,27 +2337,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:653
+#: ../Rpmdrake/pkg.pm:650
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../Rpmdrake/pkg.pm:676
+#: ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Checking validity of requested packages..."
 msgstr "正在检查所请求软件包的完整性..."
 
-#: ../Rpmdrake/pkg.pm:695
+#: ../Rpmdrake/pkg.pm:692
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../Rpmdrake/pkg.pm:696
+#: ../Rpmdrake/pkg.pm:693
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../Rpmdrake/pkg.pm:697
+#: ../Rpmdrake/pkg.pm:694
 #, c-format
 msgid ""
 "\n"
@@ -2400,95 +2370,95 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:715
+#: ../Rpmdrake/pkg.pm:712
 #, 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:721
+#: ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../Rpmdrake/pkg.pm:723
+#: ../Rpmdrake/pkg.pm:720
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:724
+#: ../Rpmdrake/pkg.pm:721
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:728
+#: ../Rpmdrake/pkg.pm:725
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:744 ../Rpmdrake/pkg.pm:928
+#: ../Rpmdrake/pkg.pm:741 ../Rpmdrake/pkg.pm:925
 #, c-format
 msgid "Orphan packages"
 msgstr "孤立软件包"
 
-#: ../Rpmdrake/pkg.pm:744
+#: ../Rpmdrake/pkg.pm:741
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包即将删除。"
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:757
 #, c-format
 msgid "Preparing package installation..."
 msgstr "准备安装软件包..."
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:757
 #, c-format
 msgid "Preparing package installation transaction..."
 msgstr "正在准备安装交易..."
 
-#: ../Rpmdrake/pkg.pm:763
+#: ../Rpmdrake/pkg.pm:760
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:761
 #, c-format
 msgid "Total: %s/%s"
 msgstr "总计: %s/%s"
 
-#: ../Rpmdrake/pkg.pm:827
+#: ../Rpmdrake/pkg.pm:824
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../Rpmdrake/pkg.pm:828
+#: ../Rpmdrake/pkg.pm:825
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入名为“%s”的介质"
 
-#: ../Rpmdrake/pkg.pm:832
+#: ../Rpmdrake/pkg.pm:829
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../Rpmdrake/pkg.pm:855
+#: ../Rpmdrake/pkg.pm:852
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: ../Rpmdrake/pkg.pm:869
+#: ../Rpmdrake/pkg.pm:866
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../Rpmdrake/pkg.pm:872
+#: ../Rpmdrake/pkg.pm:869
 #, c-format
 msgid "Inspecting configuration files..."
 msgstr "正在检查配置文件..."
 
-#: ../Rpmdrake/pkg.pm:880
+#: ../Rpmdrake/pkg.pm:877
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2501,37 +2471,37 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../Rpmdrake/pkg.pm:886
+#: ../Rpmdrake/pkg.pm:883
 #, c-format
 msgid "Looking for \"README\" files..."
 msgstr "正在查找“README”文件..."
 
-#: ../Rpmdrake/pkg.pm:919
+#: ../Rpmdrake/pkg.pm:916
 #, c-format
 msgid "RPM transaction %d/%d"
 msgstr "RPM 交易 %d/%d"
 
-#: ../Rpmdrake/pkg.pm:920
+#: ../Rpmdrake/pkg.pm:917
 #, c-format
 msgid "Unselect all"
 msgstr "全不选"
 
-#: ../Rpmdrake/pkg.pm:921
+#: ../Rpmdrake/pkg.pm:918
 #, c-format
 msgid "Details"
 msgstr "细节"
 
-#: ../Rpmdrake/pkg.pm:944 ../Rpmdrake/pkg.pm:964
+#: ../Rpmdrake/pkg.pm:941 ../Rpmdrake/pkg.pm:961
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:977
+#: ../Rpmdrake/pkg.pm:974
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:978
+#: ../Rpmdrake/pkg.pm:975
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2542,7 +2512,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:985
+#: ../Rpmdrake/pkg.pm:982
 #, c-format
 msgid "Information"
 msgstr "信息"
@@ -3434,5 +3404,26 @@ msgstr "添加自定义介质"
 msgid "Urpmi medium info"
 msgstr "Urpmi 介质信息"
 
+#~ msgid "FVWM based"
+#~ msgstr "基于 FVWM"
+
+#~ msgid "Sawfish"
+#~ msgstr "Sawfish"
+
+#~ msgid "Multimedia"
+#~ msgstr "多媒体"
+
+#~ msgid "Chat"
+#~ msgstr "聊天"
+
+#~ msgid "Public Keys"
+#~ msgstr "公钥"
+
+#~ msgid "Hardware"
+#~ msgstr "硬件"
+
+#~ msgid "Console"
+#~ msgstr "控制台"
+
 #~ msgid "Editors and Convertors"
 #~ msgstr "编辑器和转换器"