sync po with code

1 files changed, 449 insertions, 310 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e279fb85..253fabc1 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-09-18 17:03+0200\n"
+"POT-Creation-Date: 2012-10-16 15:23+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"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../MageiaUpdate:102 ../Rpmdrake/gui.pm:995
+#: ../MageiaUpdate:102 ../Rpmdrake/gui.pm:994
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -286,8 +286,8 @@ msgstr "介质类型:"
 #: ../Rpmdrake/edit_urpm_sources.pm:280 ../Rpmdrake/edit_urpm_sources.pm:394
 #: ../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:721
-#: ../Rpmdrake/init.pm:159 ../Rpmdrake/pkg.pm:205 ../Rpmdrake/pkg.pm:831
+#: ../Rpmdrake/edit_urpm_sources.pm:766 ../Rpmdrake/gui.pm:720
+#: ../Rpmdrake/init.pm:159 ../Rpmdrake/pkg.pm:205 ../Rpmdrake/pkg.pm:829
 #: ../rpmdrake.pm:357 ../rpmdrake.pm:698 ../rpmdrake.pm:771 ../rpmdrake.pm:848
 #, c-format
 msgid "Cancel"
@@ -297,9 +297,9 @@ msgstr "取消"
 #: ../Rpmdrake/edit_urpm_sources.pm:519 ../Rpmdrake/edit_urpm_sources.pm:590
 #: ../Rpmdrake/edit_urpm_sources.pm:663 ../Rpmdrake/edit_urpm_sources.pm:759
 #: ../Rpmdrake/edit_urpm_sources.pm:832 ../Rpmdrake/edit_urpm_sources.pm:946
-#: ../Rpmdrake/edit_urpm_sources.pm:1169 ../Rpmdrake/gui.pm:721
-#: ../Rpmdrake/gui.pm:737 ../Rpmdrake/gui.pm:742 ../Rpmdrake/init.pm:159
-#: ../Rpmdrake/pkg.pm:614 ../Rpmdrake/pkg.pm:831 ../Rpmdrake/rpmnew.pm:181
+#: ../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.pm:140 ../rpmdrake.pm:293 ../rpmdrake.pm:360 ../rpmdrake.pm:698
 #, c-format
 msgid "Ok"
@@ -575,8 +575,8 @@ msgstr "介质限制"
 msgid "Command"
 msgstr "命令"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:796 ../Rpmdrake/formatting.pm:135
-#: ../Rpmdrake/gui.pm:992 ../Rpmdrake/pkg.pm:114 ../Rpmdrake/pkg.pm:162
+#: ../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
 #, c-format
 msgid "(none)"
@@ -831,27 +831,27 @@ msgstr ""
 "软件包数据库已锁定。请关闭其它使用软件包数据库的应用程序(您是否有其它介质管理"
 "器或其它桌面，或者您正在安装软件包？)。"
 
-#: ../Rpmdrake/formatting.pm:108
+#: ../Rpmdrake/formatting.pm:102
 #, c-format
 msgid "None (installed)"
 msgstr "无(已安装)"
 
-#: ../Rpmdrake/formatting.pm:109
+#: ../Rpmdrake/formatting.pm:103
 #, c-format
 msgid "Unknown"
 msgstr "未知"
 
-#: ../Rpmdrake/formatting.pm:172
+#: ../Rpmdrake/formatting.pm:166
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../Rpmdrake/formatting.pm:173
+#: ../Rpmdrake/formatting.pm:167
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../Rpmdrake/formatting.pm:178
+#: ../Rpmdrake/formatting.pm:172
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
@@ -866,208 +866,208 @@ msgstr "搜索结果"
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../Rpmdrake/gui.pm:124 ../Rpmdrake/gui.pm:323 ../Rpmdrake/gui.pm:325
+#: ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:322 ../Rpmdrake/gui.pm:324
 #: ../Rpmdrake/pkg.pm:188
 #, c-format
 msgid "(Not available)"
 msgstr "(不可用)"
 
-#: ../Rpmdrake/gui.pm:136
+#: ../Rpmdrake/gui.pm:135
 #, c-format
 msgid "Security advisory"
 msgstr "安全通报"
 
-#: ../Rpmdrake/gui.pm:148 ../Rpmdrake/gui.pm:351
+#: ../Rpmdrake/gui.pm:147 ../Rpmdrake/gui.pm:350
 #, c-format
 msgid "No description"
 msgstr "无描述"
 
-#: ../Rpmdrake/gui.pm:160
+#: ../Rpmdrake/gui.pm:159
 #, c-format
 msgid "It is <b>not supported</b> by Mageia."
-msgstr ""
+msgstr "此软件包<b>不被</b> Mageia 支持。"
 
-#: ../Rpmdrake/gui.pm:161
+#: ../Rpmdrake/gui.pm:160
 #, c-format
 msgid "It may <b>break</b> your system."
-msgstr ""
+msgstr "可能<b>损坏</b>您的系统。"
 
-#: ../Rpmdrake/gui.pm:163
-#, fuzzy, c-format
+#: ../Rpmdrake/gui.pm:162
+#, c-format
 msgid "This package is not free software"
-msgstr "即将安装以下%d个软件包:"
+msgstr "此软件包是非自由软件"
 
-#: ../Rpmdrake/gui.pm:166
+#: ../Rpmdrake/gui.pm:165
 #, c-format
 msgid "This package contains a new version that was backported."
-msgstr ""
+msgstr "此软件包可能包含移植的新版本。"
 
-#: ../Rpmdrake/gui.pm:170
+#: ../Rpmdrake/gui.pm:169
 #, c-format
 msgid "This package is a potential candidate for an update."
-msgstr ""
+msgstr "此软件包是潜在的更新候选。"
 
-#: ../Rpmdrake/gui.pm:175
+#: ../Rpmdrake/gui.pm:174
 #, c-format
 msgid "This is an official update which is supported by Mageia."
-msgstr ""
+msgstr "这是 Mageia 支持的官方更新。"
 
-#: ../Rpmdrake/gui.pm:176
+#: ../Rpmdrake/gui.pm:175
 #, c-format
 msgid "This is an unofficial update."
-msgstr ""
+msgstr "这不是官方更新。"
 
-#: ../Rpmdrake/gui.pm:180
+#: ../Rpmdrake/gui.pm:179
 #, c-format
 msgid "This is an official package supported by Mageia"
-msgstr ""
+msgstr "这是 Mageia 支持的官方软件包"
 
-#: ../Rpmdrake/gui.pm:197
-#, fuzzy, c-format
+#: ../Rpmdrake/gui.pm:196
+#, c-format
 msgid "Notice: "
-msgstr "重要性:"
+msgstr "注意:"
 
-#: ../Rpmdrake/gui.pm:199 ../Rpmdrake/gui.pm:341
+#: ../Rpmdrake/gui.pm:198 ../Rpmdrake/gui.pm:340
 #, c-format
 msgid "Importance: "
 msgstr "重要性:"
 
-#: ../Rpmdrake/gui.pm:200 ../Rpmdrake/gui.pm:349
+#: ../Rpmdrake/gui.pm:199 ../Rpmdrake/gui.pm:348
 #, c-format
 msgid "Reason for update: "
 msgstr "更新原因:"
 
-#: ../Rpmdrake/gui.pm:210 ../Rpmdrake/gui.pm:336
+#: ../Rpmdrake/gui.pm:209 ../Rpmdrake/gui.pm:335
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: ../Rpmdrake/gui.pm:212 ../Rpmdrake/gui.pm:331
+#: ../Rpmdrake/gui.pm:211 ../Rpmdrake/gui.pm:330
 #, c-format
 msgid "Currently installed version: "
 msgstr "当前安装的版本:"
 
-#: ../Rpmdrake/gui.pm:214
+#: ../Rpmdrake/gui.pm:213
 #, c-format
 msgid "Group: "
 msgstr "组: "
 
-#: ../Rpmdrake/gui.pm:215 ../Rpmdrake/gui.pm:337
+#: ../Rpmdrake/gui.pm:214 ../Rpmdrake/gui.pm:336
 #, c-format
 msgid "Architecture: "
 msgstr "架构: "
 
-#: ../Rpmdrake/gui.pm:216 ../Rpmdrake/gui.pm:338
+#: ../Rpmdrake/gui.pm:215 ../Rpmdrake/gui.pm:337
 #, c-format
 msgid "Size: "
 msgstr "大小: "
 
-#: ../Rpmdrake/gui.pm:216 ../Rpmdrake/gui.pm:338
+#: ../Rpmdrake/gui.pm:215 ../Rpmdrake/gui.pm:337
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:217 ../Rpmdrake/gui.pm:330 ../rpmdrake.pm:903
+#: ../Rpmdrake/gui.pm:216 ../Rpmdrake/gui.pm:329 ../rpmdrake.pm:903
 #, c-format
 msgid "Medium: "
 msgstr "介质:"
 
-#: ../Rpmdrake/gui.pm:230
-#, fuzzy, c-format
+#: ../Rpmdrake/gui.pm:229
+#, c-format
 msgid "New dependencies:"
-msgstr "依赖关系:"
+msgstr "新依赖关系:"
 
-#: ../Rpmdrake/gui.pm:243
+#: ../Rpmdrake/gui.pm:242
 #, c-format
 msgid "All dependencies installed."
-msgstr ""
+msgstr "所有依赖关系都已经安装。"
 
-#: ../Rpmdrake/gui.pm:266
+#: ../Rpmdrake/gui.pm:265
 #, c-format
 msgid "URL: "
 msgstr "URL: "
 
-#: ../Rpmdrake/gui.pm:299
+#: ../Rpmdrake/gui.pm:298
 #, c-format
 msgid "Details:"
 msgstr "细节："
 
-#: ../Rpmdrake/gui.pm:303
+#: ../Rpmdrake/gui.pm:302
 #, c-format
 msgid "Files:"
 msgstr "文件:"
 
-#: ../Rpmdrake/gui.pm:305
+#: ../Rpmdrake/gui.pm:304
 #, c-format
 msgid "Changelog:"
 msgstr "更新日志:"
 
-#: ../Rpmdrake/gui.pm:320
+#: ../Rpmdrake/gui.pm:319
 #, c-format
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../Rpmdrake/gui.pm:325
+#: ../Rpmdrake/gui.pm:324
 #, c-format
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../Rpmdrake/gui.pm:335
+#: ../Rpmdrake/gui.pm:334
 #, c-format
 msgid "Name: "
 msgstr "名称:"
 
-#: ../Rpmdrake/gui.pm:345
+#: ../Rpmdrake/gui.pm:344
 #, c-format
 msgid "Summary: "
 msgstr "摘要:"
 
-#: ../Rpmdrake/gui.pm:351
+#: ../Rpmdrake/gui.pm:350
 #, c-format
 msgid "Description: "
 msgstr "描述:"
 
-#: ../Rpmdrake/gui.pm:362 ../Rpmdrake/gui.pm:563 ../Rpmdrake/gui.pm:569
-#: ../Rpmdrake/gui.pm:575 ../Rpmdrake/pkg.pm:841 ../Rpmdrake/pkg.pm:851
-#: ../Rpmdrake/pkg.pm:865 ../rpmdrake:793 ../rpmdrake.pm:828
+#: ../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.pm:942
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../Rpmdrake/gui.pm:364
+#: ../Rpmdrake/gui.pm:363
 #, c-format
 msgid "The package \"%s\" was found."
 msgstr "找到了软件包“%s”。"
 
-#: ../Rpmdrake/gui.pm:365
+#: ../Rpmdrake/gui.pm:364
 #, c-format
 msgid "However this package is not in the package list."
 msgstr "但此软件包不在软件包列表中。"
 
-#: ../Rpmdrake/gui.pm:366
+#: ../Rpmdrake/gui.pm:365
 #, c-format
 msgid "You may want to update your urpmi database."
 msgstr "您可能需要更新您的 urpmi 数据库。"
 
-#: ../Rpmdrake/gui.pm:368
+#: ../Rpmdrake/gui.pm:367
 #, c-format
 msgid "Matching packages:"
 msgstr "匹配软件包："
 
 #. -PO: this is list fomatting: "- <package_name> (medium: <medium_name>)"
 #. -PO: eg: "- rpmdrake (medium: "Main Release"
-#: ../Rpmdrake/gui.pm:373
+#: ../Rpmdrake/gui.pm:372
 #, c-format
 msgid "- %s (medium: %s)"
 msgstr "- %s (介质：%s)"
 
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:563
 #, c-format
 msgid "Removing package %s would break your system"
 msgstr "删除 %s 将可能毁坏您的系统"
 
-#: ../Rpmdrake/gui.pm:569
+#: ../Rpmdrake/gui.pm:568
 #, c-format
 msgid ""
 "The \"%s\" package is in urpmi skip list.\n"
@@ -1076,7 +1076,7 @@ msgstr ""
 "“%s”包位于 urpmi 跳过列表中。\n"
 "您是否仍然要选择该软件包？"
 
-#: ../Rpmdrake/gui.pm:575 ../Rpmdrake/pkg.pm:716
+#: ../Rpmdrake/gui.pm:574 ../Rpmdrake/pkg.pm:714
 #, c-format
 msgid ""
 "Rpmdrake or one of its priority dependencies needs to be updated first. "
@@ -1084,60 +1084,60 @@ msgid ""
 msgstr ""
 "Rpmdrake 或其优先依赖关系之一需要先进行更新。Rpmdrake 将会稍候自行重新启动。"
 
-#: ../Rpmdrake/gui.pm:703 ../Rpmdrake/gui.pm:733 ../Rpmdrake/gui.pm:735
+#: ../Rpmdrake/gui.pm:702 ../Rpmdrake/gui.pm:732 ../Rpmdrake/gui.pm:734
 #, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../Rpmdrake/gui.pm:705
+#: ../Rpmdrake/gui.pm:704
 #, c-format
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../Rpmdrake/gui.pm:706
+#: ../Rpmdrake/gui.pm:705
 #, c-format
 msgid "The following package is needed:"
 msgstr "需要下列软件包:"
 
-#: ../Rpmdrake/gui.pm:706
+#: ../Rpmdrake/gui.pm:705
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../Rpmdrake/gui.pm:721 ../Rpmdrake/gui.pm:726
+#: ../Rpmdrake/gui.pm:720 ../Rpmdrake/gui.pm:725
 #, c-format
 msgid "More info"
 msgstr "更多信息"
 
-#: ../Rpmdrake/gui.pm:728
+#: ../Rpmdrake/gui.pm:727
 #, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../Rpmdrake/gui.pm:756
+#: ../Rpmdrake/gui.pm:755
 #, c-format
 msgid "Checking dependencies of package..."
 msgstr "正在检查包的依赖关系..."
 
-#: ../Rpmdrake/gui.pm:761
+#: ../Rpmdrake/gui.pm:760
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../Rpmdrake/gui.pm:772
+#: ../Rpmdrake/gui.pm:771
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be "
 "removed:"
 msgstr "为了满足所有的依赖关系，需要删除下列软件包:"
 
-#: ../Rpmdrake/gui.pm:777
+#: ../Rpmdrake/gui.pm:776
 #, c-format
 msgid "Some packages cannot be removed"
 msgstr "有些软件包无法删除"
 
-#: ../Rpmdrake/gui.pm:778
+#: ../Rpmdrake/gui.pm:777
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1146,7 +1146,7 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:787 ../Rpmdrake/gui.pm:864
+#: ../Rpmdrake/gui.pm:786 ../Rpmdrake/gui.pm:863
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be unselected "
@@ -1156,12 +1156,12 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:816
+#: ../Rpmdrake/gui.pm:815
 #, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../Rpmdrake/gui.pm:817
+#: ../Rpmdrake/gui.pm:816
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need to be "
@@ -1171,27 +1171,27 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:825
+#: ../Rpmdrake/gui.pm:824
 #, c-format
 msgid "Conflicting Packages"
 msgstr "冲突软件包"
 
-#: ../Rpmdrake/gui.pm:839
+#: ../Rpmdrake/gui.pm:838
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (属于跳过列表)"
 
-#: ../Rpmdrake/gui.pm:843
+#: ../Rpmdrake/gui.pm:842
 #, c-format
 msgid "One package cannot be installed"
 msgstr "软件包无法安装"
 
-#: ../Rpmdrake/gui.pm:843
+#: ../Rpmdrake/gui.pm:842
 #, c-format
 msgid "Some packages cannot be installed"
 msgstr "有些软件包无法安装"
 
-#: ../Rpmdrake/gui.pm:845
+#: ../Rpmdrake/gui.pm:844
 #, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -1202,7 +1202,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:846
+#: ../Rpmdrake/gui.pm:845
 #, c-format
 msgid ""
 "Sorry, the following packages cannot be selected:\n"
@@ -1213,37 +1213,37 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:863 ../Rpmdrake/pkg.pm:720
+#: ../Rpmdrake/gui.pm:862 ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../Rpmdrake/gui.pm:898
+#: ../Rpmdrake/gui.pm:897
 #, c-format
 msgid "Some packages are selected."
 msgstr "选中了某些软件包。"
 
-#: ../Rpmdrake/gui.pm:898
+#: ../Rpmdrake/gui.pm:897
 #, c-format
 msgid "Do you really want to quit?"
 msgstr "您真的想要退出吗?"
 
-#: ../Rpmdrake/gui.pm:907
+#: ../Rpmdrake/gui.pm:906
 #, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "错误：%s 似乎是以只读方式挂载的。"
 
-#: ../Rpmdrake/gui.pm:911
+#: ../Rpmdrake/gui.pm:910
 #, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
-#: ../Rpmdrake/gui.pm:916
+#: ../Rpmdrake/gui.pm:915
 #, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../Rpmdrake/gui.pm:917
+#: ../Rpmdrake/gui.pm:916
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so many\n"
@@ -1258,48 +1258,48 @@ msgstr ""
 "\n"
 "您真的想要安装所有选中的软件包吗?"
 
-#: ../Rpmdrake/gui.pm:944 ../Rpmdrake/open_db.pm:84
+#: ../Rpmdrake/gui.pm:943 ../Rpmdrake/open_db.pm:84
 #, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../Rpmdrake/gui.pm:945 ../Rpmdrake/open_db.pm:85 ../Rpmdrake/pkg.pm:469
+#: ../Rpmdrake/gui.pm:944 ../Rpmdrake/open_db.pm:85 ../Rpmdrake/pkg.pm:469
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: ../Rpmdrake/gui.pm:981
+#: ../Rpmdrake/gui.pm:980
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../Rpmdrake/gui.pm:994
+#: ../Rpmdrake/gui.pm:993
 #, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../Rpmdrake/gui.pm:1022 ../Rpmdrake/icon.pm:35 ../rpmdrake:213
+#: ../Rpmdrake/gui.pm:1021 ../Rpmdrake/icon.pm:35 ../rpmdrake:213
 #: ../rpmdrake:369 ../rpmdrake:396
 #, c-format
 msgid "All"
 msgstr "全部"
 
-#: ../Rpmdrake/gui.pm:1032 ../rpmdrake:202
+#: ../Rpmdrake/gui.pm:1031 ../rpmdrake:202
 #, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../Rpmdrake/gui.pm:1032 ../rpmdrake:370
+#: ../Rpmdrake/gui.pm:1031 ../rpmdrake:370
 #, c-format
 msgid "Installed"
 msgstr "已安装"
 
-#: ../Rpmdrake/gui.pm:1033 ../rpmdrake:202
+#: ../Rpmdrake/gui.pm:1032 ../rpmdrake:202
 #, c-format
 msgid "Addable"
 msgstr "可添加"
 
-#: ../Rpmdrake/gui.pm:1045
+#: ../Rpmdrake/gui.pm:1044
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "此软件包的描述不可用\n"
@@ -1330,578 +1330,723 @@ msgstr "光盘刻录"
 msgid "Compression"
 msgstr "压缩"
 
-#: ../Rpmdrake/icon.pm:41 ../Rpmdrake/icon.pm:47 ../Rpmdrake/icon.pm:58
-#: ../Rpmdrake/icon.pm:72 ../Rpmdrake/icon.pm:90 ../Rpmdrake/icon.pm:111
-#: ../Rpmdrake/icon.pm:124 ../Rpmdrake/icon.pm:135
+#: ../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:148 ../Rpmdrake/icon.pm:165
 #, 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
 #, c-format
-msgid "Books"
-msgstr "书籍"
-
-#: ../Rpmdrake/icon.pm:43
-#, c-format
-msgid "Computer books"
-msgstr "计算机图书"
+msgid "Communications"
+msgstr "通讯"
 
-#: ../Rpmdrake/icon.pm:44
+#: ../Rpmdrake/icon.pm:43 ../Rpmdrake/icon.pm:44
 #, c-format
-msgid "Faqs"
-msgstr "常见问题解答"
+msgid "Bluetooth"
+msgstr "蓝牙"
 
 #: ../Rpmdrake/icon.pm:45
 #, c-format
-msgid "Howtos"
-msgstr "Howtos"
+msgid "Dial-Up"
+msgstr "拨号"
 
 #: ../Rpmdrake/icon.pm:46
 #, c-format
-msgid "Literature"
-msgstr "文献"
+msgid "Fax"
+msgstr "传真"
+
+#: ../Rpmdrake/icon.pm:47
+#, c-format
+msgid "Mobile"
+msgstr "手机"
 
 #: ../Rpmdrake/icon.pm:48
 #, c-format
-msgid "Communications"
-msgstr "通讯"
+msgid "Radio"
+msgstr "传真"
 
-#: ../Rpmdrake/icon.pm:49 ../Rpmdrake/icon.pm:53
+#: ../Rpmdrake/icon.pm:49
+#, c-format
+msgid "Serial"
+msgstr "串行"
+
+#: ../Rpmdrake/icon.pm:50
+#, c-format
+msgid "Telephony"
+msgstr "电话"
+
+#: ../Rpmdrake/icon.pm:51 ../Rpmdrake/icon.pm:57
 #, c-format
 msgid "Databases"
 msgstr "数据库"
 
-#: ../Rpmdrake/icon.pm:50 ../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:173 ../Rpmdrake/icon.pm:174
-#: ../Rpmdrake/icon.pm:175
+#: ../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:206 ../Rpmdrake/icon.pm:207 ../Rpmdrake/icon.pm:208
 #, c-format
 msgid "Development"
 msgstr "开发"
 
-#: ../Rpmdrake/icon.pm:51
+#: ../Rpmdrake/icon.pm:53
+#, c-format
+msgid "Basic"
+msgstr "Basic"
+
+#: ../Rpmdrake/icon.pm:54
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../Rpmdrake/icon.pm:52
+#: ../Rpmdrake/icon.pm:55
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../Rpmdrake/icon.pm:54
+#: ../Rpmdrake/icon.pm:56
+#, c-format
+msgid "C#"
+msgstr "C#"
+
+#: ../Rpmdrake/icon.pm:58
+#, c-format
+msgid "Erlang"
+msgstr "Erlang"
+
+#: ../Rpmdrake/icon.pm:59
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME 和 GTK+"
 
-#: ../Rpmdrake/icon.pm:55
+#: ../Rpmdrake/icon.pm:60
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../Rpmdrake/icon.pm:56
+#: ../Rpmdrake/icon.pm:61
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE 和 Qt"
 
-#: ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:62
 #, c-format
 msgid "Kernel"
 msgstr "内核"
 
-#: ../Rpmdrake/icon.pm:59
+#: ../Rpmdrake/icon.pm:63
+#, c-format
+msgid "OCaml"
+msgstr "OCaml"
+
+#: ../Rpmdrake/icon.pm:65
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:66
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../Rpmdrake/icon.pm:61
+#: ../Rpmdrake/icon.pm:67
 #, c-format
 msgid "Python"
 msgstr "Python"
 
+#: ../Rpmdrake/icon.pm:68
+#, c-format
+msgid "Tools"
+msgstr "工具"
+
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:62 ../Rpmdrake/icon.pm:150
+#: ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:180
 #, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../Rpmdrake/icon.pm:63
+#: ../Rpmdrake/icon.pm:70 ../Rpmdrake/icon.pm:193 ../Rpmdrake/icon.pm:208
+#, c-format
+msgid "Documentation"
+msgstr "文档"
+
+#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:112
 #, c-format
 msgid "Editors"
 msgstr "编辑器"
 
-#: ../Rpmdrake/icon.pm:64
+#: ../Rpmdrake/icon.pm:72
 #, c-format
 msgid "Education"
 msgstr "教育"
 
-#: ../Rpmdrake/icon.pm:65
+#: ../Rpmdrake/icon.pm:73
 #, c-format
 msgid "Emulators"
 msgstr "模拟器"
 
-#: ../Rpmdrake/icon.pm:66
+#: ../Rpmdrake/icon.pm:74
 #, c-format
 msgid "File tools"
 msgstr "文件工具"
 
-#: ../Rpmdrake/icon.pm:67 ../Rpmdrake/icon.pm:68 ../Rpmdrake/icon.pm:69
-#: ../Rpmdrake/icon.pm:70 ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:72
-#: ../Rpmdrake/icon.pm:73 ../Rpmdrake/icon.pm:74 ../Rpmdrake/icon.pm:75
+#: ../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
 #, c-format
 msgid "Games"
 msgstr "游戏"
 
-#: ../Rpmdrake/icon.pm:68
+#: ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Adventure"
 msgstr "探险"
 
-#: ../Rpmdrake/icon.pm:69
+#: ../Rpmdrake/icon.pm:77
 #, c-format
 msgid "Arcade"
 msgstr "街机"
 
-#: ../Rpmdrake/icon.pm:70
+#: ../Rpmdrake/icon.pm:78
 #, c-format
 msgid "Boards"
 msgstr "棋盘"
 
-#: ../Rpmdrake/icon.pm:71
+#: ../Rpmdrake/icon.pm:79
 #, c-format
 msgid "Cards"
 msgstr "卡"
 
-#: ../Rpmdrake/icon.pm:73
+#: ../Rpmdrake/icon.pm:81
 #, c-format
 msgid "Puzzles"
 msgstr "拼图"
 
-#: ../Rpmdrake/icon.pm:74
+#: ../Rpmdrake/icon.pm:82
+#, c-format
+msgid "Shooter"
+msgstr "射击"
+
+#: ../Rpmdrake/icon.pm:83
 #, c-format
 msgid "Sports"
 msgstr "运动"
 
-#: ../Rpmdrake/icon.pm:75
+#: ../Rpmdrake/icon.pm:84
 #, c-format
 msgid "Strategy"
 msgstr "策略"
 
-#: ../Rpmdrake/icon.pm:76 ../Rpmdrake/icon.pm:77 ../Rpmdrake/icon.pm:80
-#: ../Rpmdrake/icon.pm:81 ../Rpmdrake/icon.pm:84 ../Rpmdrake/icon.pm:87
-#: ../Rpmdrake/icon.pm:90 ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:94
-#: ../Rpmdrake/icon.pm:97
+#: ../Rpmdrake/icon.pm:85
+#, 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
 #, c-format
 msgid "Graphical desktop"
 msgstr "图形桌面"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:79
+#: ../Rpmdrake/icon.pm:89
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../Rpmdrake/icon.pm:80
+#: ../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:83
+#: ../Rpmdrake/icon.pm:93
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:86
+#: ../Rpmdrake/icon.pm:96
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:89
+#: ../Rpmdrake/icon.pm:99
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:93
+#: ../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:96
+#: ../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:99
+#: ../Rpmdrake/icon.pm:109
 #, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../Rpmdrake/icon.pm:100
+#: ../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
 #, c-format
 msgid "Graphics"
 msgstr "图形"
 
-#: ../Rpmdrake/icon.pm:101
+#: ../Rpmdrake/icon.pm:111
+#, c-format
+msgid "3D"
+msgstr "3D"
+
+#: ../Rpmdrake/icon.pm:114
+#, c-format
+msgid "Photography"
+msgstr "照片"
+
+#: ../Rpmdrake/icon.pm:115
+#, c-format
+msgid "Scanning"
+msgstr "扫描"
+
+#: ../Rpmdrake/icon.pm:116
+#, c-format
+msgid "Viewers"
+msgstr "查看器"
+
+#: ../Rpmdrake/icon.pm:117
 #, c-format
 msgid "Monitoring"
 msgstr "监视"
 
-#: ../Rpmdrake/icon.pm:102 ../Rpmdrake/icon.pm:103
+#: ../Rpmdrake/icon.pm:118 ../Rpmdrake/icon.pm:119
 #, c-format
 msgid "Multimedia"
 msgstr "多媒体"
 
-#: ../Rpmdrake/icon.pm:103 ../Rpmdrake/icon.pm:154
+#: ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:184 ../Rpmdrake/icon.pm:185
+#: ../Rpmdrake/icon.pm:186 ../Rpmdrake/icon.pm:187
 #, c-format
 msgid "Video"
 msgstr "视频"
 
-#: ../Rpmdrake/icon.pm:104 ../Rpmdrake/icon.pm:105 ../Rpmdrake/icon.pm:106
-#: ../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:134
+#: ../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:164
 #, c-format
 msgid "Networking"
 msgstr "网络"
 
-#: ../Rpmdrake/icon.pm:105
+#: ../Rpmdrake/icon.pm:121
 #, c-format
 msgid "Chat"
 msgstr "聊天"
 
-#: ../Rpmdrake/icon.pm:106
+#: ../Rpmdrake/icon.pm:122
 #, c-format
 msgid "File transfer"
 msgstr "文件传送"
 
-#: ../Rpmdrake/icon.pm:107
+#: ../Rpmdrake/icon.pm:123
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../Rpmdrake/icon.pm:108
+#: ../Rpmdrake/icon.pm:124
 #, c-format
 msgid "Instant messaging"
 msgstr "即时通讯"
 
-#: ../Rpmdrake/icon.pm:109 ../Rpmdrake/icon.pm:180
+#: ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:213
 #, c-format
 msgid "Mail"
 msgstr "邮件"
 
-#: ../Rpmdrake/icon.pm:110
+#: ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "News"
 msgstr "新闻"
 
-#: ../Rpmdrake/icon.pm:112
+#: ../Rpmdrake/icon.pm:128
 #, c-format
 msgid "Remote access"
 msgstr "远程访问"
 
-#: ../Rpmdrake/icon.pm:113
+#: ../Rpmdrake/icon.pm:129
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../Rpmdrake/icon.pm:114
+#: ../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:115
+#: ../Rpmdrake/icon.pm:131
+#, c-format
+msgid "Dictionary"
+msgstr "字典"
+
+#: ../Rpmdrake/icon.pm:132
+#, c-format
+msgid "Finance"
+msgstr "财务"
+
+#: ../Rpmdrake/icon.pm:133
+#, c-format
+msgid "Management"
+msgstr "管理"
+
+#: ../Rpmdrake/icon.pm:134
+#, c-format
+msgid "Organizer"
+msgstr "日程"
+
+#: ../Rpmdrake/icon.pm:136
+#, c-format
+msgid "Spreadsheet"
+msgstr "电子表格"
+
+#: ../Rpmdrake/icon.pm:137
+#, c-format
+msgid "Suite"
+msgstr "套件"
+
+#: ../Rpmdrake/icon.pm:138
+#, c-format
+msgid "Word processor"
+msgstr "字处理"
+
+#: ../Rpmdrake/icon.pm:139
 #, c-format
 msgid "Public Keys"
 msgstr "公钥"
 
-#: ../Rpmdrake/icon.pm:116
+#: ../Rpmdrake/icon.pm:140
 #, c-format
 msgid "Publishing"
 msgstr "出版"
 
-#: ../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:124 ../Rpmdrake/icon.pm:125
+#: ../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
 #, c-format
 msgid "Sciences"
 msgstr "科学"
 
-#: ../Rpmdrake/icon.pm:118
+#: ../Rpmdrake/icon.pm:143
 #, c-format
 msgid "Astronomy"
 msgstr "天文"
 
-#: ../Rpmdrake/icon.pm:119
+#: ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "Biology"
 msgstr "生物"
 
-#: ../Rpmdrake/icon.pm:120
+#: ../Rpmdrake/icon.pm:145
 #, c-format
 msgid "Chemistry"
 msgstr "化学"
 
-#: ../Rpmdrake/icon.pm:121
+#: ../Rpmdrake/icon.pm:146
 #, c-format
 msgid "Computer science"
 msgstr "计算机科学"
 
-#: ../Rpmdrake/icon.pm:122
-#, c-format
-msgid "Geosciences"
-msgstr "地球科学"
-
-#: ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:147
 #, c-format
 msgid "Mathematics"
 msgstr "数学"
 
-#: ../Rpmdrake/icon.pm:125
+#: ../Rpmdrake/icon.pm:149
 #, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../Rpmdrake/icon.pm:126
+#: ../Rpmdrake/icon.pm:150
 #, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../Rpmdrake/icon.pm:127
+#: ../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
 #, c-format
 msgid "Sound"
 msgstr "声音"
 
-#: ../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 ../Rpmdrake/icon.pm:139
-#: ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141 ../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:152
+#, c-format
+msgid "Editors and Convertors"
+msgstr "编辑器和转换器"
+
+#: ../Rpmdrake/icon.pm:153
+#, c-format
+msgid "Midi"
+msgstr "MIDI"
+
+#: ../Rpmdrake/icon.pm:154
+#, c-format
+msgid "Mixers"
+msgstr "混音"
+
+#: ../Rpmdrake/icon.pm:155 ../Rpmdrake/icon.pm:186
+#, c-format
+msgid "Players"
+msgstr "播放器"
+
+#: ../Rpmdrake/icon.pm:156 ../Rpmdrake/icon.pm:187
+#, c-format
+msgid "Utilities"
+msgstr "工具"
+
+#: ../Rpmdrake/icon.pm:157
+#, c-format
+msgid "Visualization"
+msgstr "可视化"
+
+#: ../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 ../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
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: ../Rpmdrake/icon.pm:129
+#: ../Rpmdrake/icon.pm:159
 #, c-format
 msgid "Base"
 msgstr "基本"
 
-#: ../Rpmdrake/icon.pm:130
+#: ../Rpmdrake/icon.pm:160
 #, c-format
 msgid "Cluster"
 msgstr "簇"
 
-#: ../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:158
+#: ../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:191
 #, c-format
 msgid "Configuration"
 msgstr "配置"
 
-#: ../Rpmdrake/icon.pm:132
+#: ../Rpmdrake/icon.pm:162
 #, c-format
 msgid "Boot and Init"
 msgstr "启动和初始化"
 
-#: ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:163
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:166
 #, c-format
 msgid "Packaging"
 msgstr "打包"
 
-#: ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:146
+#: ../Rpmdrake/icon.pm:167 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Printing"
 msgstr "打印"
 
-#: ../Rpmdrake/icon.pm:138 ../Rpmdrake/icon.pm:139 ../Rpmdrake/icon.pm:140
-#: ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142
+#: ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:169 ../Rpmdrake/icon.pm:170
+#: ../Rpmdrake/icon.pm:171 ../Rpmdrake/icon.pm:172
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: ../Rpmdrake/icon.pm:139
+#: ../Rpmdrake/icon.pm:169
 #, c-format
 msgid "Console"
 msgstr "控制台"
 
-#: ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:170
 #, c-format
 msgid "True type"
 msgstr "TrueType"
 
-#: ../Rpmdrake/icon.pm:141
+#: ../Rpmdrake/icon.pm:171
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../Rpmdrake/icon.pm:142
+#: ../Rpmdrake/icon.pm:172
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 位图"
 
-#: ../Rpmdrake/icon.pm:143
+#: ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Internationalization"
 msgstr "国际化"
 
-#: ../Rpmdrake/icon.pm:144
+#: ../Rpmdrake/icon.pm:174
 #, c-format
 msgid "Kernel and hardware"
 msgstr "内核和硬件"
 
-#: ../Rpmdrake/icon.pm:145
+#: ../Rpmdrake/icon.pm:175
 #, c-format
 msgid "Libraries"
 msgstr "库"
 
-#: ../Rpmdrake/icon.pm:147
+#: ../Rpmdrake/icon.pm:177
 #, c-format
 msgid "Servers"
 msgstr "服务器"
 
-#: ../Rpmdrake/icon.pm:151
+#: ../Rpmdrake/icon.pm:181
 #, c-format
 msgid "Terminals"
 msgstr "终端"
 
-#: ../Rpmdrake/icon.pm:152
+#: ../Rpmdrake/icon.pm:182
 #, c-format
 msgid "Text tools"
 msgstr "文本工具"
 
-#: ../Rpmdrake/icon.pm:153
+#: ../Rpmdrake/icon.pm:183
 #, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#: ../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:185
+#, c-format
+msgid "Editors and Converters"
+msgstr "编辑器和转换器"
+
+#: ../Rpmdrake/icon.pm:190 ../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
 #, c-format
 msgid "Workstation"
 msgstr "工作站"
 
-#: ../Rpmdrake/icon.pm:159
+#: ../Rpmdrake/icon.pm:192
 #, c-format
 msgid "Console Tools"
 msgstr "控制台工具"
 
-#: ../Rpmdrake/icon.pm:160 ../Rpmdrake/icon.pm:175
-#, c-format
-msgid "Documentation"
-msgstr "文档"
-
-#: ../Rpmdrake/icon.pm:161
+#: ../Rpmdrake/icon.pm:194
 #, c-format
 msgid "Game station"
 msgstr "游戏机"
 
-#: ../Rpmdrake/icon.pm:162
+#: ../Rpmdrake/icon.pm:195
 #, c-format
 msgid "Internet station"
 msgstr "Internet 工作站"
 
-#: ../Rpmdrake/icon.pm:163
+#: ../Rpmdrake/icon.pm:196
 #, c-format
 msgid "Multimedia station"
 msgstr "多媒体工作站"
 
-#: ../Rpmdrake/icon.pm:164
+#: ../Rpmdrake/icon.pm:197
 #, c-format
 msgid "Network Computer (client)"
 msgstr "网络计算机(客户端)"
 
-#: ../Rpmdrake/icon.pm:165
+#: ../Rpmdrake/icon.pm:198
 #, c-format
 msgid "Office Workstation"
 msgstr "办公工作站"
 
-#: ../Rpmdrake/icon.pm:166
+#: ../Rpmdrake/icon.pm:199
 #, c-format
 msgid "Scientific Workstation"
 msgstr "科学工作站"
 
-#: ../Rpmdrake/icon.pm:167 ../Rpmdrake/icon.pm:169 ../Rpmdrake/icon.pm:170
-#: ../Rpmdrake/icon.pm:171 ../Rpmdrake/icon.pm:172
+#: ../Rpmdrake/icon.pm:200 ../Rpmdrake/icon.pm:202 ../Rpmdrake/icon.pm:203
+#: ../Rpmdrake/icon.pm:204 ../Rpmdrake/icon.pm:205
 #, c-format
 msgid "Graphical Environment"
 msgstr "图形环境"
 
-#: ../Rpmdrake/icon.pm:169
+#: ../Rpmdrake/icon.pm:202
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 工作站"
 
-#: ../Rpmdrake/icon.pm:170
+#: ../Rpmdrake/icon.pm:203
 #, c-format
 msgid "IceWm Desktop"
 msgstr "IceWM 桌面"
 
-#: ../Rpmdrake/icon.pm:171
+#: ../Rpmdrake/icon.pm:204
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE 工作站"
 
-#: ../Rpmdrake/icon.pm:172
+#: ../Rpmdrake/icon.pm:205
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "其它图形桌面"
 
-#: ../Rpmdrake/icon.pm:176 ../Rpmdrake/icon.pm:177 ../Rpmdrake/icon.pm:178
-#: ../Rpmdrake/icon.pm:179 ../Rpmdrake/icon.pm:180 ../Rpmdrake/icon.pm:181
-#: ../Rpmdrake/icon.pm:182 ../Rpmdrake/icon.pm:183
+#: ../Rpmdrake/icon.pm:209 ../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
 #, c-format
 msgid "Server"
 msgstr "服务器"
 
-#: ../Rpmdrake/icon.pm:177
+#: ../Rpmdrake/icon.pm:210
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: ../Rpmdrake/icon.pm:178
+#: ../Rpmdrake/icon.pm:211
 #, c-format
 msgid "Database"
 msgstr "数据库"
 
-#: ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:212
 #, c-format
 msgid "Firewall/Router"
 msgstr "防火墙/路由器"
 
-#: ../Rpmdrake/icon.pm:181
+#: ../Rpmdrake/icon.pm:214
 #, c-format
 msgid "Mail/Groupware/News"
 msgstr "邮件/群件/新闻"
 
-#: ../Rpmdrake/icon.pm:182
+#: ../Rpmdrake/icon.pm:215
 #, c-format
 msgid "Network Computer server"
 msgstr "网络计算机服务器"
 
-#: ../Rpmdrake/icon.pm:183
+#: ../Rpmdrake/icon.pm:216
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
@@ -2029,8 +2174,8 @@ msgstr "正在从 %s 获取 XML 元数据..."
 msgid "Getting '%s' from XML meta-data..."
 msgstr "正在从 XML 元数据获取“%s”..."
 
-#: ../Rpmdrake/pkg.pm:133 ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:739
-#: ../Rpmdrake/pkg.pm:946 ../rpmdrake:134 ../rpmdrake.pm:385
+#: ../Rpmdrake/pkg.pm:133 ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:737
+#: ../Rpmdrake/pkg.pm:944 ../rpmdrake:134 ../rpmdrake.pm:385
 #: ../rpmdrake.pm:594
 #, c-format
 msgid "Please wait"
@@ -2062,7 +2207,7 @@ msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:720
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -2145,12 +2290,12 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:739
+#: ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:737
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:739 ../Rpmdrake/pkg.pm:946
+#: ../Rpmdrake/pkg.pm:437 ../Rpmdrake/pkg.pm:737 ../Rpmdrake/pkg.pm:944
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
@@ -2170,7 +2315,7 @@ msgstr "正在寻找可用的软件包，请稍候..."
 msgid "Please wait, listing base packages..."
 msgstr "正在列出基本软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:469 ../Rpmdrake/pkg.pm:870 ../Rpmdrake/pkg.pm:895
+#: ../Rpmdrake/pkg.pm:469 ../Rpmdrake/pkg.pm:868 ../Rpmdrake/pkg.pm:893
 #: ../rpmdrake.pm:815 ../rpmdrake.pm:901 ../rpmdrake.pm:925
 #, c-format
 msgid "Error"
@@ -2201,17 +2346,17 @@ msgstr "关于此软件包的升级信息"
 msgid "Upgrade information about package %s"
 msgstr "关于软件包 %s 的升级信息"
 
-#: ../Rpmdrake/pkg.pm:629 ../Rpmdrake/pkg.pm:887
+#: ../Rpmdrake/pkg.pm:629 ../Rpmdrake/pkg.pm:885
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../Rpmdrake/pkg.pm:633 ../Rpmdrake/pkg.pm:856
+#: ../Rpmdrake/pkg.pm:633 ../Rpmdrake/pkg.pm:854
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:634 ../Rpmdrake/pkg.pm:654 ../Rpmdrake/pkg.pm:858
+#: ../Rpmdrake/pkg.pm:634 ../Rpmdrake/pkg.pm:654 ../Rpmdrake/pkg.pm:856
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2232,17 +2377,17 @@ msgstr "安装失败"
 msgid "Checking validity of requested packages..."
 msgstr "正在检查所请求软件包的完整性..."
 
-#: ../Rpmdrake/pkg.pm:697
+#: ../Rpmdrake/pkg.pm:695
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../Rpmdrake/pkg.pm:698
+#: ../Rpmdrake/pkg.pm:696
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../Rpmdrake/pkg.pm:699
+#: ../Rpmdrake/pkg.pm:697
 #, c-format
 msgid ""
 "\n"
@@ -2255,95 +2400,95 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:717
+#: ../Rpmdrake/pkg.pm:715
 #, 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:723
+#: ../Rpmdrake/pkg.pm:721
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../Rpmdrake/pkg.pm:725
+#: ../Rpmdrake/pkg.pm:723
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:726
+#: ../Rpmdrake/pkg.pm:724
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:730
+#: ../Rpmdrake/pkg.pm:728
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:746 ../Rpmdrake/pkg.pm:930
+#: ../Rpmdrake/pkg.pm:744 ../Rpmdrake/pkg.pm:928
 #, c-format
 msgid "Orphan packages"
 msgstr "孤立软件包"
 
-#: ../Rpmdrake/pkg.pm:746
+#: ../Rpmdrake/pkg.pm:744
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包即将删除。"
 
-#: ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:760
 #, c-format
 msgid "Preparing package installation..."
 msgstr "准备安装软件包..."
 
-#: ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:760
 #, c-format
 msgid "Preparing package installation transaction..."
 msgstr "正在准备安装交易..."
 
-#: ../Rpmdrake/pkg.pm:765
+#: ../Rpmdrake/pkg.pm:763
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:766
+#: ../Rpmdrake/pkg.pm:764
 #, c-format
 msgid "Total: %s/%s"
 msgstr "总计: %s/%s"
 
-#: ../Rpmdrake/pkg.pm:829
+#: ../Rpmdrake/pkg.pm:827
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../Rpmdrake/pkg.pm:830
+#: ../Rpmdrake/pkg.pm:828
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入名为“%s”的介质"
 
-#: ../Rpmdrake/pkg.pm:834
+#: ../Rpmdrake/pkg.pm:832
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../Rpmdrake/pkg.pm:857
+#: ../Rpmdrake/pkg.pm:855
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: ../Rpmdrake/pkg.pm:871
+#: ../Rpmdrake/pkg.pm:869
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../Rpmdrake/pkg.pm:874
+#: ../Rpmdrake/pkg.pm:872
 #, c-format
 msgid "Inspecting configuration files..."
 msgstr "正在检查配置文件..."
 
-#: ../Rpmdrake/pkg.pm:882
+#: ../Rpmdrake/pkg.pm:880
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2356,37 +2501,37 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../Rpmdrake/pkg.pm:888
+#: ../Rpmdrake/pkg.pm:886
 #, c-format
 msgid "Looking for \"README\" files..."
 msgstr "正在查找“README”文件..."
 
-#: ../Rpmdrake/pkg.pm:921
+#: ../Rpmdrake/pkg.pm:919
 #, c-format
 msgid "RPM transaction %d/%d"
 msgstr "RPM 交易 %d/%d"
 
-#: ../Rpmdrake/pkg.pm:922
+#: ../Rpmdrake/pkg.pm:920
 #, c-format
 msgid "Unselect all"
 msgstr "全不选"
 
-#: ../Rpmdrake/pkg.pm:923
+#: ../Rpmdrake/pkg.pm:921
 #, c-format
 msgid "Details"
 msgstr "细节"
 
-#: ../Rpmdrake/pkg.pm:946 ../Rpmdrake/pkg.pm:966
+#: ../Rpmdrake/pkg.pm:944 ../Rpmdrake/pkg.pm:964
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:979
+#: ../Rpmdrake/pkg.pm:977
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:980
+#: ../Rpmdrake/pkg.pm:978
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2397,7 +2542,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:987
+#: ../Rpmdrake/pkg.pm:985
 #, c-format
 msgid "Information"
 msgstr "信息"
@@ -2716,7 +2861,7 @@ msgstr "/重置选中内容(_R)"
 #: ../rpmdrake:555
 #, c-format
 msgid "Reset aborted (RPM DB is locked by another process)"
-msgstr ""
+msgstr "重置被终止(RPM 数据库被其它进程锁定)"
 
 #: ../rpmdrake:571
 #, c-format
@@ -2787,7 +2932,7 @@ msgstr "要安装、更新或删除软件包，只需单击相应的复选框。
 #: ../rpmdrake:793
 #, c-format
 msgid "rpmdrake is already running (pid: %s)"
-msgstr ""
+msgstr "rpmdrake 已运行(pid: %s)"
 
 #: ../rpmdrake.pm:121
 #, c-format
@@ -3288,9 +3433,3 @@ msgstr "添加自定义介质"
 #: ../mime/x-urpmi-media.desktop.in.h:1
 msgid "Urpmi medium info"
 msgstr "Urpmi 介质信息"
-
-#~ msgid "  --root                 force to run as root"
-#~ msgstr "  --root                 强制以 root 身份运行"
-
-#~ msgid "(Deprecated)"
-#~ msgstr "(已启用)"