sync with code

1 files changed, 100 insertions, 86 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6996d95a..fc571acf 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: 2009-03-30 15:34+0200\n"
+"POT-Creation-Date: 2009-04-01 17:56+0200\n"
 "PO-Revision-Date: 2007-08-30 12:54+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
@@ -31,7 +31,7 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../MandrivaUpdate:125 ../rpmdrake:89 ../rpmdrake:744 ../rpmdrake.pm:213
+#: ../MandrivaUpdate:125 ../rpmdrake:89 ../rpmdrake:747 ../rpmdrake.pm:213
 #, c-format
 msgid "Software Management"
 msgstr "软件管理器"
@@ -46,12 +46,12 @@ msgstr "在此列出了软件包更新"
 msgid "Name"
 msgstr "名称"
 
-#: ../MandrivaUpdate:157 ../rpmdrake:277
+#: ../MandrivaUpdate:157 ../rpmdrake:280
 #, c-format
 msgid "Version"
 msgstr "版本"
 
-#: ../MandrivaUpdate:158 ../rpmdrake:281
+#: ../MandrivaUpdate:158 ../rpmdrake:284
 #, c-format
 msgid "Release"
 msgstr "释放"
@@ -66,7 +66,7 @@ msgstr "架构"
 msgid "Help"
 msgstr "帮助"
 
-#: ../MandrivaUpdate:177 ../rpmdrake:667 ../rpmdrake.pm:826
+#: ../MandrivaUpdate:177 ../rpmdrake:670 ../rpmdrake.pm:826
 #, c-format
 msgid "Select all"
 msgstr "全选"
@@ -76,7 +76,7 @@ msgstr "全选"
 msgid "Update"
 msgstr "更新"
 
-#: ../MandrivaUpdate:198 ../rpmdrake:678
+#: ../MandrivaUpdate:198 ../rpmdrake:681
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -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:601
-#: ../Rpmdrake/init.pm:159 ../Rpmdrake/pkg.pm:180 ../Rpmdrake/pkg.pm:771
+#: ../Rpmdrake/init.pm:158 ../Rpmdrake/pkg.pm:180 ../Rpmdrake/pkg.pm:771
 #: ../rpmdrake.pm:331 ../rpmdrake.pm:672 ../rpmdrake.pm:745 ../rpmdrake.pm:822
 #, c-format
 msgid "Cancel"
@@ -298,7 +298,7 @@ msgstr "取消"
 #: ../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:1153 ../Rpmdrake/gui.pm:601
-#: ../Rpmdrake/gui.pm:617 ../Rpmdrake/gui.pm:622 ../Rpmdrake/init.pm:159
+#: ../Rpmdrake/gui.pm:617 ../Rpmdrake/gui.pm:622 ../Rpmdrake/init.pm:158
 #: ../Rpmdrake/pkg.pm:568 ../Rpmdrake/pkg.pm:771 ../Rpmdrake/rpmnew.pm:180
 #: ../rpmdrake.pm:136 ../rpmdrake.pm:267 ../rpmdrake.pm:334 ../rpmdrake.pm:672
 #, c-format
@@ -645,8 +645,8 @@ msgstr "配置介质"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:962 ../Rpmdrake/edit_urpm_sources.pm:963
 #: ../Rpmdrake/edit_urpm_sources.pm:964 ../Rpmdrake/edit_urpm_sources.pm:965
-#: ../Rpmdrake/edit_urpm_sources.pm:966 ../rpmdrake:524 ../rpmdrake:527
-#: ../rpmdrake:532 ../rpmdrake:547 ../rpmdrake:548
+#: ../Rpmdrake/edit_urpm_sources.pm:966 ../rpmdrake:527 ../rpmdrake:530
+#: ../rpmdrake:535 ../rpmdrake:550 ../rpmdrake:551
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -693,9 +693,9 @@ msgstr "<control>W"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:967 ../Rpmdrake/edit_urpm_sources.pm:968
 #: ../Rpmdrake/edit_urpm_sources.pm:969 ../Rpmdrake/edit_urpm_sources.pm:970
-#: ../Rpmdrake/edit_urpm_sources.pm:971 ../rpmdrake:519 ../rpmdrake:520
-#: ../rpmdrake:521 ../rpmdrake:551 ../rpmdrake:558 ../rpmdrake:562
-#: ../rpmdrake:622
+#: ../Rpmdrake/edit_urpm_sources.pm:971 ../rpmdrake:522 ../rpmdrake:523
+#: ../rpmdrake:524 ../rpmdrake:554 ../rpmdrake:561 ../rpmdrake:565
+#: ../rpmdrake:625
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
@@ -742,44 +742,44 @@ msgstr "<control>R"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:973 ../Rpmdrake/edit_urpm_sources.pm:974
 #: ../Rpmdrake/edit_urpm_sources.pm:975 ../Rpmdrake/edit_urpm_sources.pm:976
-#: ../rpmdrake:579 ../rpmdrake:580 ../rpmdrake:581 ../rpmdrake:582
+#: ../rpmdrake:582 ../rpmdrake:583 ../rpmdrake:584 ../rpmdrake:585
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:974 ../rpmdrake:580
+#: ../Rpmdrake/edit_urpm_sources.pm:974 ../rpmdrake:583
 #, c-format
 msgid "/_Report Bug"
 msgstr "/报告错误(_R)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:976 ../rpmdrake:582
+#: ../Rpmdrake/edit_urpm_sources.pm:976 ../rpmdrake:585
 #, c-format
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:979 ../rpmdrake:585
+#: ../Rpmdrake/edit_urpm_sources.pm:979 ../rpmdrake:588
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:981 ../rpmdrake:587
+#: ../Rpmdrake/edit_urpm_sources.pm:981 ../rpmdrake:590
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:983 ../rpmdrake:589
+#: ../Rpmdrake/edit_urpm_sources.pm:983 ../rpmdrake:592
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:985 ../rpmdrake:591
+#: ../Rpmdrake/edit_urpm_sources.pm:985 ../rpmdrake:594
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../Rpmdrake/edit_urpm_sources.pm:990 ../rpmdrake:596
+#: ../Rpmdrake/edit_urpm_sources.pm:990 ../rpmdrake:599
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
@@ -1192,8 +1192,8 @@ msgstr "正在列出软件包，请稍候..."
 msgid "No update"
 msgstr "没有更新"
 
-#: ../Rpmdrake/gui.pm:888 ../Rpmdrake/icon.pm:35 ../rpmdrake:356
-#: ../rpmdrake:383
+#: ../Rpmdrake/gui.pm:888 ../Rpmdrake/icon.pm:35 ../rpmdrake:203
+#: ../rpmdrake:359 ../rpmdrake:386
 #, c-format
 msgid "All"
 msgstr "全部"
@@ -1203,7 +1203,7 @@ msgstr "全部"
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../Rpmdrake/gui.pm:898 ../rpmdrake:357
+#: ../Rpmdrake/gui.pm:898 ../rpmdrake:360
 #, c-format
 msgid "Installed"
 msgstr "已安装"
@@ -1873,16 +1873,10 @@ msgstr "  --no-media-update      启动时不更新介质"
 
 #: ../Rpmdrake/init.pm:58
 #, c-format
-msgid ""
-"  --no-splash            don't ask first confirmation question in update mode"
-msgstr "  --no-splash            更新模式中不询问第一个确认问题"
-
-#: ../Rpmdrake/init.pm:59
-#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        不校验软件包签名"
 
-#: ../Rpmdrake/init.pm:60
+#: ../Rpmdrake/init.pm:59
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
@@ -1890,55 +1884,55 @@ msgid ""
 msgstr ""
 "  --parallel=别名,主机   在并行模式中使用[别名]组和[主机]来显示所需的依赖关系"
 
-#: ../Rpmdrake/init.pm:61
+#: ../Rpmdrake/init.pm:60
 #, c-format
 msgid "  --rpm-root=path        use another root for rpm installation"
 msgstr "  --rpm-root=path        使用另外一个根安装 rpm"
 
-#: ../Rpmdrake/init.pm:62
+#: ../Rpmdrake/init.pm:61
 #, c-format
 msgid ""
 "  --urpmi-root           use another root for urpmi db & rpm installation"
 msgstr "  --urpmi-root           使用另一个 root 来存储 urpmi db 和安装 rpm。"
 
-#: ../Rpmdrake/init.pm:63
+#: ../Rpmdrake/init.pm:62
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 强制以 root 身份运行"
 
-#: ../Rpmdrake/init.pm:63
+#: ../Rpmdrake/init.pm:62
 #, c-format
 msgid "(Deprecated)"
 msgstr "(已启用)"
 
-#: ../Rpmdrake/init.pm:64
+#: ../Rpmdrake/init.pm:63
 #, c-format
 msgid "  --run-as-root          force to run as root"
 msgstr "  --run-as-root          强制以 root 身份运行"
 
-#: ../Rpmdrake/init.pm:65
+#: ../Rpmdrake/init.pm:64
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=包            搜索“包”"
 
-#: ../Rpmdrake/init.pm:66
+#: ../Rpmdrake/init.pm:65
 #, c-format
 msgid ""
 "  --test                 only verify if the installation can be achieved "
 "correctly"
 msgstr "  --test                 仅验证安装是否可以正确完成"
 
-#: ../Rpmdrake/init.pm:67
+#: ../Rpmdrake/init.pm:66
 #, c-format
 msgid "  --version              print this tool's version number\n"
 msgstr "  --version              打印此工具的版本号。\n"
 
-#: ../Rpmdrake/init.pm:156
+#: ../Rpmdrake/init.pm:155
 #, c-format
 msgid "Running in user mode"
 msgstr "以用户模式运行"
 
-#: ../Rpmdrake/init.pm:157
+#: ../Rpmdrake/init.pm:156
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -2467,222 +2461,234 @@ msgstr "选中"
 msgid "Not selected"
 msgstr "未选中"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:201
+#, fuzzy, c-format
+msgid "No search results."
+msgstr "搜索结果"
+
+#: ../rpmdrake:202
+#, c-format
+msgid ""
+"No search results. You may want to switch to the '%s' view and to the '%s' "
+"filter"
+msgstr ""
+
+#: ../rpmdrake:236
 #, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "选中软件: %s / 剩余磁盘空间: %s"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:276
 #, c-format
 msgid "Package"
 msgstr "软件包"
 
 #. -PO: "Architecture" but to be kept *small* !!!
-#: ../rpmdrake:287
+#: ../rpmdrake:290
 #, c-format
 msgid "Arch."
 msgstr "架构"
 
 #. -PO: "Status" should be kept *small* !!!
-#: ../rpmdrake:315
+#: ../rpmdrake:318
 #, c-format
 msgid "Status"
 msgstr "状态"
 
-#: ../rpmdrake:358
+#: ../rpmdrake:361
 #, c-format
 msgid "Not installed"
 msgstr "未安装"
 
-#: ../rpmdrake:373
+#: ../rpmdrake:376
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按字母次序排列"
 
-#: ../rpmdrake:374
+#: ../rpmdrake:377
 #, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按组别排列"
 
-#: ../rpmdrake:375
+#: ../rpmdrake:378
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "不分类，按安装日期排列"
 
-#: ../rpmdrake:376
+#: ../rpmdrake:379
 #, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:377
+#: ../rpmdrake:380
 #, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:378
+#: ../rpmdrake:381
 #, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:379
+#: ../rpmdrake:382
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "全部软件包，按介质仓库排列"
 
 #. -PO: Backports media are newer but less-tested versions of some packages in main
 #. -PO: See http://wiki.mandriva.com/en/Policies/SoftwareMedia#.2Fmain.2Fbackports
-#: ../rpmdrake:387
+#: ../rpmdrake:390
 #, c-format
 msgid "Backports"
 msgstr "移植"
 
-#: ../rpmdrake:388
+#: ../rpmdrake:391
 #, c-format
 msgid "Meta packages"
 msgstr "元软件包"
 
-#: ../rpmdrake:389
+#: ../rpmdrake:392
 #, c-format
 msgid "Packages with GUI"
 msgstr "有图形界面的软件包"
 
-#: ../rpmdrake:390
+#: ../rpmdrake:393
 #, c-format
 msgid "All updates"
 msgstr "全部更新"
 
-#: ../rpmdrake:391
+#: ../rpmdrake:394
 #, c-format
 msgid "Security updates"
 msgstr "安全更新"
 
-#: ../rpmdrake:392
+#: ../rpmdrake:395
 #, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:393
+#: ../rpmdrake:396
 #, c-format
 msgid "General updates"
 msgstr "常规更新"
 
-#: ../rpmdrake:416
+#: ../rpmdrake:419
 #, c-format
 msgid "View"
 msgstr "查看"
 
-#: ../rpmdrake:444
+#: ../rpmdrake:447
 #, c-format
 msgid "Filter"
 msgstr "过滤"
 
-#: ../rpmdrake:480
+#: ../rpmdrake:483
 #, c-format
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:480
+#: ../rpmdrake:483
 #, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:480
+#: ../rpmdrake:483
 #, c-format
 msgid "in summaries"
 msgstr "在摘要中"
 
-#: ../rpmdrake:480
+#: ../rpmdrake:483
 #, c-format
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:519
+#: ../rpmdrake:522
 #, c-format
 msgid "/_Select dependencies without asking"
 msgstr "/直接选择依赖关系无需询问(_S)"
 
-#: ../rpmdrake:520
+#: ../rpmdrake:523
 #, c-format
 msgid "Clear download cache after successfull install"
 msgstr ""
 
-#: ../rpmdrake:521
+#: ../rpmdrake:524
 #, c-format
 msgid "/_Compute updates on startup"
 msgstr ""
 
-#: ../rpmdrake:527
+#: ../rpmdrake:530
 #, c-format
 msgid "/_Update media"
 msgstr "/更新介质(_U)"
 
-#: ../rpmdrake:532
+#: ../rpmdrake:535
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/重置选中内容(_R)"
 
-#: ../rpmdrake:547
+#: ../rpmdrake:550
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新装入软件包清单(_P)"
 
-#: ../rpmdrake:548
+#: ../rpmdrake:551
 #, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../rpmdrake:548
+#: ../rpmdrake:551
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:558
+#: ../rpmdrake:561
 #, c-format
 msgid "/_Media Manager"
 msgstr "/介质管理器(_M)"
 
-#: ../rpmdrake:562 ../rpmdrake:622
+#: ../rpmdrake:565 ../rpmdrake:625
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/自动显示选中的软件包(_S)"
 
-#: ../rpmdrake:569 ../rpmdrake:572 ../rpmdrake:577 ../rpmdrake:609
+#: ../rpmdrake:572 ../rpmdrake:575 ../rpmdrake:580 ../rpmdrake:612
 #, c-format
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: ../rpmdrake:643
+#: ../rpmdrake:646
 #, c-format
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:647
+#: ../rpmdrake:650
 #, c-format
-msgid "Find"
-msgstr "查找"
+msgid "Please type in the string you want to search then press the <enter> key"
+msgstr ""
 
-#: ../rpmdrake:674
+#: ../rpmdrake:677
 #, c-format
 msgid "Apply"
 msgstr "应用"
 
-#: ../rpmdrake:693
+#: ../rpmdrake:696
 #, c-format
 msgid "Quick Introduction"
 msgstr "简介"
 
-#: ../rpmdrake:694
+#: ../rpmdrake:697
 #, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "您可以使用左侧的类别树浏览软件包。"
 
-#: ../rpmdrake:695
+#: ../rpmdrake:698
 #, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr "单击右侧列表中的软件包可以查看其信息。"
 
-#: ../rpmdrake:696
+#: ../rpmdrake:699
 #, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr "要安装、更新或删除软件包，只需单击相应的复选框。"
@@ -3187,6 +3193,14 @@ msgstr "添加自定义介质"
 msgid "Urpmi medium info"
 msgstr "Urpmi 介质信息"
 
+#~ msgid ""
+#~ "  --no-splash            don't ask first confirmation question in update "
+#~ "mode"
+#~ msgstr "  --no-splash            更新模式中不询问第一个确认问题"
+
+#~ msgid "Find"
+#~ msgstr "查找"
+
 #~ msgid "/Add _media"
 #~ msgstr "/添加介质(_M)"