aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po611
1 files changed, 304 insertions, 307 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 617f431b..1b592a90 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: 2007-08-09 16:31+0200\n"
+"POT-Creation-Date: 2007-08-10 19:06+0200\n"
"PO-Revision-Date: 2007-03-08 12:39+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:687
+#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:689
#, c-format
msgid ""
"The list of updates is empty. This means that either there is\n"
@@ -31,7 +31,7 @@ msgstr ""
"更新列表为空。这意味着可能您所安装的软件包没有相应的更新,\n"
"或者您已经安装了全部更新。"
-#: ../MandrivaUpdate:105 ../rpmdrake:90 ../rpmdrake:525 ../rpmdrake.pm:189
+#: ../MandrivaUpdate:105 ../rpmdrake:90 ../rpmdrake:539 ../rpmdrake.pm:187
#, c-format
msgid "Software Management"
msgstr "软件管理器"
@@ -41,22 +41,22 @@ msgstr "软件管理器"
msgid "Here is the list of software package updates"
msgstr "在此列出了软件包更新"
-#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1081 ../rpmdrake:454
+#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1081 ../rpmdrake:468
#, c-format
msgid "Help"
msgstr "帮助"
-#: ../MandrivaUpdate:148 ../rpmdrake:459 ../rpmdrake.pm:778
+#: ../MandrivaUpdate:148 ../rpmdrake:473 ../rpmdrake.pm:775
#, c-format
msgid "Select all"
msgstr "全选"
-#: ../MandrivaUpdate:156 ../rpmdrake.pm:782
+#: ../MandrivaUpdate:156 ../rpmdrake.pm:779
#, c-format
msgid "Update"
msgstr "更新"
-#: ../MandrivaUpdate:164 ../rpmdrake:469
+#: ../MandrivaUpdate:164 ../rpmdrake:483
#, c-format
msgid "Quit"
msgstr "退出"
@@ -233,9 +233,9 @@ msgstr "介质类型:"
#: ../Rpmdrake/edit_urpm_sources.pm:447 ../Rpmdrake/edit_urpm_sources.pm:474
#: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
#: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
-#: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
-#: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
+#: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:461
+#: ../Rpmdrake/init.pm:133 ../Rpmdrake/pkg.pm:627 ../Rpmdrake/pkg.pm:669
+#: ../rpmdrake.pm:298 ../rpmdrake.pm:613 ../rpmdrake.pm:698 ../rpmdrake.pm:771
#, c-format
msgid "Cancel"
msgstr "取消"
@@ -245,10 +245,10 @@ msgstr "取消"
#: ../Rpmdrake/edit_urpm_sources.pm:624 ../Rpmdrake/edit_urpm_sources.pm:667
#: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
#: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
-#: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
-#: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
-#: ../rpmdrake.pm:304 ../rpmdrake.pm:616
+#: ../Rpmdrake/gui.pm:461 ../Rpmdrake/gui.pm:477 ../Rpmdrake/gui.pm:482
+#: ../Rpmdrake/init.pm:133 ../Rpmdrake/pkg.pm:473 ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/rpmnew.pm:179 ../rpmdrake.pm:125 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:301 ../rpmdrake.pm:613
#, c-format
msgid "Ok"
msgstr "确定"
@@ -464,8 +464,8 @@ msgstr "介质限制"
msgid "Command"
msgstr "命令"
-#: ../Rpmdrake/edit_urpm_sources.pm:756 ../Rpmdrake/gui.pm:684
-#: ../Rpmdrake/pkg.pm:97 ../Rpmdrake/pkg.pm:127 ../Rpmdrake/pkg.pm:167
+#: ../Rpmdrake/edit_urpm_sources.pm:756 ../Rpmdrake/gui.pm:686
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:128 ../Rpmdrake/pkg.pm:168
#: ../Rpmdrake/rpmnew.pm:77
#, c-format
msgid "(none)"
@@ -537,7 +537,7 @@ msgstr ""
msgid "Configure media"
msgstr "配置介质"
-#: ../Rpmdrake/edit_urpm_sources.pm:977
+#: ../Rpmdrake/edit_urpm_sources.pm:977 ../Rpmdrake/pkg.pm:204
#, c-format
msgid "Enabled"
msgstr "启用"
@@ -588,7 +588,7 @@ msgstr "并行..."
msgid "Global options..."
msgstr "全局选项..."
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:139
#: ../gurpmi.addmedia:99
#, c-format
msgid ""
@@ -680,7 +680,7 @@ msgstr "大小: "
msgid "%s KB"
msgstr "%s KB"
-#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:827
+#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:824
#, c-format
msgid "Medium: "
msgstr "介质:"
@@ -691,7 +691,7 @@ msgid "Files:"
msgstr "文件:"
#: ../Rpmdrake/gui.pm:118 ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:137
-#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:133
+#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:134
#, c-format
msgid "(Not available)"
msgstr "(不可用)"
@@ -726,55 +726,55 @@ msgstr "摘要:"
msgid "Description: "
msgstr "描述:"
-#: ../Rpmdrake/gui.pm:443 ../Rpmdrake/gui.pm:471 ../Rpmdrake/gui.pm:473
+#: ../Rpmdrake/gui.pm:444 ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:475
#, c-format
msgid "More information on package..."
msgstr "该软件包的更多信息..."
-#: ../Rpmdrake/gui.pm:445
+#: ../Rpmdrake/gui.pm:446
#, c-format
msgid "Please choose"
msgstr "请选择"
-#: ../Rpmdrake/gui.pm:446
+#: ../Rpmdrake/gui.pm:447
#, c-format
msgid "The following package is needed:"
msgstr "需要下列软件包:"
-#: ../Rpmdrake/gui.pm:446
+#: ../Rpmdrake/gui.pm:447
#, 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:459 ../Rpmdrake/gui.pm:464
+#: ../Rpmdrake/gui.pm:461 ../Rpmdrake/gui.pm:466
#, c-format
msgid "More info"
msgstr "更多信息"
-#: ../Rpmdrake/gui.pm:466
+#: ../Rpmdrake/gui.pm:468
#, c-format
msgid "Information on packages"
msgstr "该软件包的信息"
-#: ../Rpmdrake/gui.pm:499
+#: ../Rpmdrake/gui.pm:501
#, c-format
msgid "Some additional packages need to be removed"
msgstr "另外一些软件包需要删除"
-#: ../Rpmdrake/gui.pm:500
+#: ../Rpmdrake/gui.pm:502
#, c-format
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:"
msgstr "为了满足所有的依赖关系,需要删除下列软件包:"
-#: ../Rpmdrake/gui.pm:506 ../Rpmdrake/gui.pm:515
+#: ../Rpmdrake/gui.pm:508 ../Rpmdrake/gui.pm:517
#, c-format
msgid "Some packages can't be removed"
msgstr "有些软件包无法删除"
-#: ../Rpmdrake/gui.pm:507
+#: ../Rpmdrake/gui.pm:509
#, c-format
msgid ""
"Removing these packages would break your system, sorry:\n"
@@ -783,7 +783,7 @@ msgstr ""
"对不起,删除这些软件包将可能毁坏您的系统:\n"
"\n"
-#: ../Rpmdrake/gui.pm:516 ../Rpmdrake/gui.pm:583
+#: ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:585
#, c-format
msgid ""
"Because of their dependencies, the following package(s) must be\n"
@@ -793,12 +793,12 @@ msgstr ""
"由于软件包之间的依赖关系,您不可以选择下列软件包:\n"
"\n"
-#: ../Rpmdrake/gui.pm:545
+#: ../Rpmdrake/gui.pm:547
#, c-format
msgid "Additional packages needed"
msgstr "需要另外的软件包"
-#: ../Rpmdrake/gui.pm:546
+#: ../Rpmdrake/gui.pm:548
#, c-format
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
@@ -808,22 +808,22 @@ msgstr ""
"为满足依赖关系,还需要安装下列软件包:\n"
"\n"
-#: ../Rpmdrake/gui.pm:560
+#: ../Rpmdrake/gui.pm:562
#, c-format
msgid "%s (belongs to the skip list)"
msgstr "%s (属于跳过列表)"
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:566
#, c-format
msgid "One package cannot be installed"
msgstr "软件包无法安装"
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:566
#, c-format
msgid "Some packages can't be installed"
msgstr "有些软件包无法安装"
-#: ../Rpmdrake/gui.pm:566
+#: ../Rpmdrake/gui.pm:568
#, c-format
msgid ""
"Sorry, the following package cannot be selected:\n"
@@ -834,7 +834,7 @@ msgstr ""
"\n"
"%s"
-#: ../Rpmdrake/gui.pm:567
+#: ../Rpmdrake/gui.pm:569
#, c-format
msgid ""
"Sorry, the following packages can't be selected:\n"
@@ -845,27 +845,27 @@ msgstr ""
"\n"
"%s"
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
+#: ../Rpmdrake/gui.pm:584 ../Rpmdrake/pkg.pm:561
#, c-format
msgid "Some packages need to be removed"
msgstr "需要删除一些软件包"
-#: ../Rpmdrake/gui.pm:613
+#: ../Rpmdrake/gui.pm:615
#, c-format
msgid "Error: %s appears to be mounted read-only."
msgstr "错误:%s 似乎是以只读方式挂载的。"
-#: ../Rpmdrake/gui.pm:617
+#: ../Rpmdrake/gui.pm:619
#, c-format
msgid "You need to select some packages first."
msgstr "您需要先选中一些软件包。"
-#: ../Rpmdrake/gui.pm:622
+#: ../Rpmdrake/gui.pm:624
#, c-format
msgid "Too many packages are selected"
msgstr "选中的包太多"
-#: ../Rpmdrake/gui.pm:623
+#: ../Rpmdrake/gui.pm:625
#, c-format
msgid ""
"Warning: it seems that you are attempting to add so much\n"
@@ -880,42 +880,42 @@ msgstr ""
"\n"
"您真的想要安装所有选中的软件包吗?"
-#: ../Rpmdrake/gui.pm:649 ../Rpmdrake/pkg.pm:230
+#: ../Rpmdrake/gui.pm:651 ../Rpmdrake/pkg.pm:238
#, c-format
msgid "Fatal error"
msgstr "致命错误"
-#: ../Rpmdrake/gui.pm:650 ../Rpmdrake/pkg.pm:231
+#: ../Rpmdrake/gui.pm:652 ../Rpmdrake/pkg.pm:239
#, c-format
msgid "A fatal error occurred: %s."
msgstr "发生了一个致命错误: %s。"
-#: ../Rpmdrake/gui.pm:668
+#: ../Rpmdrake/gui.pm:670
#, c-format
msgid "Please wait, listing packages..."
msgstr "正在列出软件包,请稍候..."
-#: ../Rpmdrake/gui.pm:686
+#: ../Rpmdrake/gui.pm:688
#, c-format
msgid "No update"
msgstr "没有更新"
-#: ../Rpmdrake/gui.pm:710 ../rpmdrake:239
+#: ../Rpmdrake/gui.pm:712 ../rpmdrake:239
#, c-format
msgid "All"
msgstr "全部"
-#: ../Rpmdrake/gui.pm:719 ../rpmdrake:144
+#: ../Rpmdrake/gui.pm:721 ../rpmdrake:144
#, c-format
msgid "Upgradable"
msgstr "可升级"
-#: ../Rpmdrake/gui.pm:719 ../rpmdrake:144
+#: ../Rpmdrake/gui.pm:721 ../rpmdrake:144
#, c-format
msgid "Addable"
msgstr "可添加"
-#: ../Rpmdrake/gui.pm:739
+#: ../Rpmdrake/gui.pm:741
#, c-format
msgid "Description not available for this package\n"
msgstr "此软件包的描述不可用\n"
@@ -948,7 +948,7 @@ msgstr "压缩"
#: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:57
#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:89 ../Rpmdrake/icon.pm:110
-#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:74
+#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:75
#, c-format
msgid "Other"
msgstr "其它"
@@ -1529,44 +1529,49 @@ msgstr "用法:%s [选项]..."
#: ../Rpmdrake/init.pm:40
#, c-format
+msgid " --auto assume default answers to questions"
+msgstr ""
+
+#: ../Rpmdrake/init.pm:41
+#, c-format
msgid ""
" --changelog-first display changelog before filelist in the "
"description window"
msgstr " --changelog-first 描述窗口中更改日志排在文件列表之前"
-#: ../Rpmdrake/init.pm:41
+#: ../Rpmdrake/init.pm:42
#, c-format
msgid " --media=medium1,.. limit to given media"
msgstr " --media=介质1,.. 限制使用指定的介质"
-#: ../Rpmdrake/init.pm:42
+#: ../Rpmdrake/init.pm:43
#, c-format
msgid ""
" --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found"
msgstr " --merge-all-rpmnew 合并找到的全部 .rpmnew/.rpmsave 文件"
-#: ../Rpmdrake/init.pm:43
+#: ../Rpmdrake/init.pm:44
#, c-format
msgid " --mode=MODE set mode (install (default), remove, update)"
msgstr " --mode=模式 设定模式(安装(默认)、删除、更新)"
-#: ../Rpmdrake/init.pm:44
+#: ../Rpmdrake/init.pm:45
#, c-format
msgid ""
" --no-confirmation don't ask first confirmation question in update mode"
msgstr " --no-confirmation 更新模式中不询问第一个确认问题"
-#: ../Rpmdrake/init.pm:45
+#: ../Rpmdrake/init.pm:46
#, c-format
msgid " --no-media-update don't update media at startup"
msgstr " --no-media-update 启动时不更新介质"
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:47
#, c-format
msgid " --no-verify-rpm don't verify packages signatures"
msgstr " --no-verify-rpm 不校验软件包签名"
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:48
#, c-format
msgid ""
" --parallel=alias,host be in parallel mode, use \"alias\" group, use \"host"
@@ -1574,37 +1579,37 @@ msgid ""
msgstr ""
" --parallel=别名,主机 在并行模式中使用[别名]组和[主机]来显示所需的依赖关系"
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:49
#, c-format
msgid " --pkg-nosel=pkg1,.. show only these packages"
msgstr " --pkg-nosel=包1,.. 只显示这些软件包"
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:50
#, c-format
msgid " --pkg-sel=pkg1,.. preselect these packages"
msgstr " --pkg-sel=包1,.. 预先选择这些软件包"
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:51
#, c-format
msgid " --root force to run as root"
msgstr " --root 强制以 root 身份运行"
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:52
#, c-format
msgid " --search=pkg run search for \"pkg\""
msgstr " --search=包 搜索“包”"
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:53
#, c-format
msgid " --version - print this tool's version number.\n"
msgstr " --version - 打印此工具的版本号。\n"
-#: ../Rpmdrake/init.pm:129
+#: ../Rpmdrake/init.pm:130
#, c-format
msgid "Running in user mode"
msgstr "以用户模式运行"
-#: ../Rpmdrake/init.pm:130
+#: ../Rpmdrake/init.pm:131
#, c-format
msgid ""
"You are launching this program as a normal user.\n"
@@ -1615,12 +1620,12 @@ msgstr ""
"您将无法执行对系统的修改,\n"
"但您仍然可以浏览已有数据库。"
-#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
+#: ../Rpmdrake/init.pm:138 ../Rpmdrake/init.pm:163
#, c-format
msgid "Welcome"
msgstr "欢迎"
-#: ../Rpmdrake/init.pm:142
+#: ../Rpmdrake/init.pm:143
#, c-format
msgid ""
"Welcome to the software removal tool!\n"
@@ -1632,7 +1637,7 @@ msgstr ""
"\n"
"本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
-#: ../Rpmdrake/init.pm:147
+#: ../Rpmdrake/init.pm:148
#, c-format
msgid ""
"Welcome to %s!\n"
@@ -1644,12 +1649,12 @@ msgstr ""
"\n"
"本工具将帮助您为您的电脑中安装更新的软件包。"
-#: ../Rpmdrake/init.pm:152
+#: ../Rpmdrake/init.pm:153
#, c-format
msgid "Welcome to the software installation tool!"
msgstr "欢迎使用软件安装工具!"
-#: ../Rpmdrake/init.pm:153
+#: ../Rpmdrake/init.pm:154
#, c-format
msgid ""
"Welcome to the software installation tool!\n"
@@ -1663,22 +1668,22 @@ msgstr ""
"您的 Mandriva Linux 的安装光盘包含有数千个软件包。\n"
"本工具将帮助您选择要为您的电脑安装的软件包。"
-#: ../Rpmdrake/init.pm:164
+#: ../Rpmdrake/init.pm:165
#, c-format
msgid "The software installation tool can set up media sources."
msgstr "软件安装工具可设置介质源。"
-#: ../Rpmdrake/init.pm:165
+#: ../Rpmdrake/init.pm:166
#, c-format
msgid "Do you want to add media sources now?"
msgstr "您想要现在就添加介质源吗?"
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
+#: ../Rpmdrake/pkg.pm:188 ../Rpmdrake/pkg.pm:561
#, c-format
msgid "Confirmation"
msgstr "确认"
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/pkg.pm:189
#, c-format
msgid ""
"I need to contact the mirror to get latest update packages.\n"
@@ -1691,12 +1696,12 @@ msgstr ""
"\n"
"确定继续吗?"
-#: ../Rpmdrake/pkg.pm:197
+#: ../Rpmdrake/pkg.pm:198
#, c-format
msgid "Already existing update media"
msgstr "更新介质已经存在"
-#: ../Rpmdrake/pkg.pm:198
+#: ../Rpmdrake/pkg.pm:199
#, fuzzy, c-format
msgid ""
"You already have at least one update medium configured, but\n"
@@ -1712,12 +1717,12 @@ msgstr ""
"\n"
"然后,重新启动 %s。"
-#: ../Rpmdrake/pkg.pm:209
+#: ../Rpmdrake/pkg.pm:210
#, c-format
msgid "How to choose manually your mirror"
msgstr "如何手工选择您的镜像"
-#: ../Rpmdrake/pkg.pm:210
+#: ../Rpmdrake/pkg.pm:211
#, c-format
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
@@ -1731,58 +1736,78 @@ msgstr ""
"\n"
"然后,重新启动 %s。"
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
-#: ../rpmdrake.pm:329
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576 ../Rpmdrake/pkg.pm:742
+#: ../rpmdrake.pm:326
#, c-format
msgid "Please wait"
msgstr "请稍候"
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576
#, c-format
msgid "Package installation..."
msgstr "软件包安装..."
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576 ../Rpmdrake/pkg.pm:742
#, c-format
msgid "Initializing..."
msgstr "正在初始化..."
-#: ../Rpmdrake/pkg.pm:261
+#: ../Rpmdrake/pkg.pm:268
#, c-format
msgid "Reading updates description"
msgstr "读取更新描述"
-#: ../Rpmdrake/pkg.pm:287 ../Rpmdrake/pkg.pm:364
+#: ../Rpmdrake/pkg.pm:294 ../Rpmdrake/pkg.pm:371
#, c-format
msgid "Please wait, finding available packages..."
msgstr "正在寻找可用的软件包,请稍候..."
-#: ../Rpmdrake/pkg.pm:293
+#: ../Rpmdrake/pkg.pm:300
#, c-format
msgid "Please wait, listing base packages..."
msgstr "正在列出基本软件包,请稍候..."
-#: ../Rpmdrake/pkg.pm:330
+#: ../Rpmdrake/pkg.pm:337
#, c-format
msgid "Please wait, finding installed packages..."
msgstr "正在寻找已安装的软件包,请稍候..."
-#: ../Rpmdrake/pkg.pm:447
+#: ../Rpmdrake/pkg.pm:453
+#, c-format
+msgid "Upgrade information"
+msgstr "升级信息"
+
+#: ../Rpmdrake/pkg.pm:455
+#, c-format
+msgid "These packages come with upgrade information"
+msgstr "这些软件包带有升级信息"
+
+#: ../Rpmdrake/pkg.pm:463
+#, c-format
+msgid "Upgrade information about this package"
+msgstr "关于此软件包的升级信息"
+
+#: ../Rpmdrake/pkg.pm:466
+#, c-format
+msgid "Upgrade information about package %s"
+msgstr "关于软件包 %s 的升级信息"
+
+#: ../Rpmdrake/pkg.pm:482
#, c-format
msgid "Could not create temporary directory '%s'"
msgstr ""
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
+#: ../Rpmdrake/pkg.pm:490 ../Rpmdrake/pkg.pm:723
#, c-format
msgid "All requested packages were installed successfully."
msgstr "所有要求的软件包都已成功安装。"
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:494 ../Rpmdrake/pkg.pm:699
#, c-format
msgid "Problem during installation"
msgstr "在安装过程中发生问题"
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:495 ../Rpmdrake/pkg.pm:514 ../Rpmdrake/pkg.pm:701
#, c-format
msgid ""
"There was a problem during the installation:\n"
@@ -1793,22 +1818,22 @@ msgstr ""
"\n"
"%s"
-#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
+#: ../Rpmdrake/pkg.pm:513 ../Rpmdrake/pkg.pm:689
#, c-format
msgid "Installation failed"
msgstr "安装失败"
-#: ../Rpmdrake/pkg.pm:507
+#: ../Rpmdrake/pkg.pm:542
#, c-format
msgid "Unable to get source packages."
msgstr "源软件包未找到。"
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:543
#, c-format
msgid "Unable to get source packages, sorry. %s"
msgstr "对不起,无法得到源软件包。%s"
-#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/pkg.pm:544 ../Rpmdrake/pkg.pm:692
#, c-format
msgid ""
"\n"
@@ -1821,140 +1846,95 @@ msgstr ""
"报告的错误:\n"
"%s"
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:558
#, fuzzy, 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:528
+#: ../Rpmdrake/pkg.pm:563
#, c-format
msgid "Remove one package?"
msgid_plural "Remove %d packages?"
msgstr[0] "删除 %d 个软件包吗?"
-#: ../Rpmdrake/pkg.pm:530
+#: ../Rpmdrake/pkg.pm:565
#, c-format
msgid "The following package has to be removed for others to be upgraded:"
msgstr "要升级其它软件包,必须删除下列软件包:"
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:566
#, c-format
msgid "The following packages have to be removed for others to be upgraded:"
msgstr "要升级其它软件包,必须删除下列软件包:"
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:566
#, c-format
msgid "Is it ok to continue?"
msgstr "确定继续吗?"
-#: ../Rpmdrake/pkg.pm:561
-#, c-format
-msgid "Change medium"
-msgstr "更改介质"
-
-#: ../Rpmdrake/pkg.pm:562
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请把名为“%s”的介质放进设备 [%s]"
-
-#: ../Rpmdrake/pkg.pm:585
+#: ../Rpmdrake/pkg.pm:589
#, c-format
msgid "Preparing packages installation..."
msgstr "准备安装软件包..."
-#: ../Rpmdrake/pkg.pm:585
+#: ../Rpmdrake/pkg.pm:589
#, fuzzy, c-format
msgid "Preparing package installation transaction..."
msgstr "准备安装软件包..."
-#: ../Rpmdrake/pkg.pm:588
+#: ../Rpmdrake/pkg.pm:592
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安装软件包“%s”(%s/%s)..."
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:593
#, c-format
msgid "Total: %s/%s"
msgstr ""
-#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
+#: ../Rpmdrake/pkg.pm:621 ../Rpmdrake/pkg.pm:708 ../rpmdrake.pm:741
+#: ../rpmdrake.pm:822 ../rpmdrake.pm:846
+#, c-format
+msgid "Error"
+msgstr "错误"
+
+#: ../Rpmdrake/pkg.pm:626 ../Rpmdrake/pkg.pm:631
#, c-format
msgid "Downloading package `%s'..."
msgstr "正在下载软件包“%s”..."
-#: ../Rpmdrake/pkg.pm:617
+#: ../Rpmdrake/pkg.pm:633
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " 已完成 %s%%,共 %s,预计剩余时间 %s,速度为 %s"
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:634
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% 已完成,速度为 %s"
-#: ../Rpmdrake/pkg.pm:639
-#, c-format
-msgid "Verifying package signatures..."
-msgstr "正在校验软件包的签名..."
-
-#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
+#: ../Rpmdrake/pkg.pm:667
#, c-format
-msgid "Warning"
-msgstr "警告"
-
-#: ../Rpmdrake/pkg.pm:653
-#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you want to continue installation?"
-msgstr ""
-"下列软件包的签名出现以下问题:\n"
-"\n"
-"%s\n"
-"\n"
-"您想要继续安装吗?"
-
-#: ../Rpmdrake/pkg.pm:666
-#, c-format
-msgid "installing %s from %s"
-msgstr "正在从 %2$s 安装 %1$s"
+msgid "Change medium"
+msgstr "更改介质"
#: ../Rpmdrake/pkg.pm:668
#, c-format
-msgid "installing %s"
-msgstr "正在安装 %s"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请把名为“%s”的介质放进设备 [%s]"
#: ../Rpmdrake/pkg.pm:672
#, c-format
-msgid "removing %s"
-msgstr "正在删除 %s"
-
-#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
-#: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
-#, c-format
-msgid "Error"
-msgstr "错误"
-
-#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
-#, c-format
-msgid "Installation failed:"
-msgstr "安装失败: "
-
-#: ../Rpmdrake/pkg.pm:700
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
+msgid "Verifying package signatures..."
+msgstr "正在校验软件包的签名..."
-#: ../Rpmdrake/pkg.pm:718
+#: ../Rpmdrake/pkg.pm:678 ../rpmdrake.pm:754 ../rpmdrake.pm:863
#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
+msgid "Warning"
+msgstr "警告"
-#: ../Rpmdrake/pkg.pm:752
+#: ../Rpmdrake/pkg.pm:690
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1967,12 +1947,17 @@ msgstr ""
"\n"
"您可能需要更新您的介质数据库。"
-#: ../Rpmdrake/pkg.pm:763
+#: ../Rpmdrake/pkg.pm:700
#, c-format
msgid "%d installation transactions failed"
msgstr "%d 个安装交易失败"
-#: ../Rpmdrake/pkg.pm:777
+#: ../Rpmdrake/pkg.pm:709
+#, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "不可恢复的错误: 对不起,没有发现可安装的软件包。"
+
+#: ../Rpmdrake/pkg.pm:718
#, c-format
msgid ""
"The installation is finished; everything was installed correctly.\n"
@@ -1985,42 +1970,17 @@ msgstr ""
"某些配置文件被保存为“.rpmnew”或“.rpmsave”,\n"
"在执行操作以前,您需要检查一下:"
-#: ../Rpmdrake/pkg.pm:787
-#, c-format
-msgid "Upgrade information"
-msgstr "升级信息"
-
-#: ../Rpmdrake/pkg.pm:789
-#, c-format
-msgid "These packages come with upgrade information"
-msgstr "这些软件包带有升级信息"
-
-#: ../Rpmdrake/pkg.pm:797
-#, c-format
-msgid "Upgrade information about this package"
-msgstr "关于此软件包的升级信息"
-
-#: ../Rpmdrake/pkg.pm:800
-#, c-format
-msgid "Upgrade information about package %s"
-msgstr "关于软件包 %s 的升级信息"
-
-#: ../Rpmdrake/pkg.pm:812
-#, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "不可恢复的错误: 对不起,没有发现可安装的软件包。"
-
-#: ../Rpmdrake/pkg.pm:828 ../Rpmdrake/pkg.pm:845
+#: ../Rpmdrake/pkg.pm:742 ../Rpmdrake/pkg.pm:758
#, c-format
msgid "Please wait, removing packages..."
msgstr "正在删除软件包,请稍候..."
-#: ../Rpmdrake/pkg.pm:856
+#: ../Rpmdrake/pkg.pm:769
#, c-format
msgid "Problem during removal"
msgstr "在删除过程中发生问题"
-#: ../Rpmdrake/pkg.pm:857
+#: ../Rpmdrake/pkg.pm:770
#, c-format
msgid ""
"There was a problem during the removal of packages:\n"
@@ -2053,27 +2013,27 @@ msgstr ""
msgid "Remove .%s"
msgstr "删除 .%s"
-#: ../Rpmdrake/rpmnew.pm:114
+#: ../Rpmdrake/rpmnew.pm:121
#, c-format
msgid "Use .%s as main file"
msgstr "使用 .%s 作为主文件"
-#: ../Rpmdrake/rpmnew.pm:118
+#: ../Rpmdrake/rpmnew.pm:125
#, c-format
msgid "Do nothing"
msgstr "不做任何事"
-#: ../Rpmdrake/rpmnew.pm:149
+#: ../Rpmdrake/rpmnew.pm:156
#, c-format
msgid "Installation finished"
msgstr "安装完成"
-#: ../Rpmdrake/rpmnew.pm:164
+#: ../Rpmdrake/rpmnew.pm:171
#, c-format
msgid "Inspect..."
msgstr "检查..."
-#: ../Rpmdrake/rpmnew.pm:182 ../rpmdrake:68 ../rpmdrake:95
+#: ../Rpmdrake/rpmnew.pm:189 ../rpmdrake:68 ../rpmdrake:95
#, c-format
msgid "Please wait, searching..."
msgstr "正在搜索,请稍候..."
@@ -2238,130 +2198,136 @@ msgstr "在描述中"
msgid "in file names"
msgstr "在文件名中"
-#: ../rpmdrake:345 ../rpmdrake:348 ../rpmdrake:359 ../rpmdrake:372
-#: ../rpmdrake:381
+#: ../rpmdrake:344 ../rpmdrake:386 ../rpmdrake:390 ../rpmdrake:394
+#: ../rpmdrake:433
+#, c-format
+msgid "/_Options"
+msgstr "/选项(_O)"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "/_Auto solve dependancies"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:350 ../rpmdrake:361 ../rpmdrake:374
+#: ../rpmdrake:383
#, c-format
msgid "/_File"
msgstr "/文件(_F)"
-#: ../rpmdrake:348
+#: ../rpmdrake:350
#, c-format
msgid "/_Update media"
msgstr "/更新介质(_U)"
-#: ../rpmdrake:359
+#: ../rpmdrake:361
#, c-format
msgid "/_Reset the selection"
msgstr "/重置选中内容(_R)"
-#: ../rpmdrake:372
+#: ../rpmdrake:374
#, c-format
msgid "/Reload the _packages list"
msgstr "/重新装入软件包清单(_P)"
-#: ../rpmdrake:381
+#: ../rpmdrake:383
#, c-format
msgid "/_Quit"
msgstr "/退出(_Q)"
-#: ../rpmdrake:381
+#: ../rpmdrake:383
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
-#: ../rpmdrake:384 ../rpmdrake:385 ../rpmdrake:389 ../rpmdrake:419
-#, c-format
-msgid "/_Options"
-msgstr "/选项(_O)"
-
-#: ../rpmdrake:385
+#: ../rpmdrake:390
#, c-format
msgid "/_Media Manager"
msgstr "/介质管理器(_M)"
-#: ../rpmdrake:389 ../rpmdrake:419
+#: ../rpmdrake:394 ../rpmdrake:433
#, c-format
msgid "/_Show automatically selected packages"
msgstr "/自动显示选中的软件包(_S)"
-#: ../rpmdrake:393 ../rpmdrake:394 ../rpmdrake:395 ../rpmdrake:396
+#: ../rpmdrake:398 ../rpmdrake:399 ../rpmdrake:400 ../rpmdrake:401
#, c-format
msgid "/_Help"
msgstr "/帮助(_H)"
-#: ../rpmdrake:394
+#: ../rpmdrake:399
#, c-format
msgid "/_Report Bug"
msgstr "/报告错误(_R)"
-#: ../rpmdrake:396
+#: ../rpmdrake:401
#, c-format
msgid "/_About..."
msgstr "/关于(_A)..."
-#: ../rpmdrake:399
+#: ../rpmdrake:404
#, c-format
msgid "Rpmdrake"
msgstr "Rpmdrake"
-#: ../rpmdrake:401
+#: ../rpmdrake:406
#, c-format
msgid "Copyright (C) %s by Mandriva"
msgstr "版权 (C) %s Mandriva"
-#: ../rpmdrake:403
+#: ../rpmdrake:408
#, c-format
msgid "Rpmdrake is Mandriva Linux package management tool."
msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
-#: ../rpmdrake:405
+#: ../rpmdrake:410
#, 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>")
-#: ../rpmdrake:410
+#: ../rpmdrake:415
#, c-format
msgid "_: Translator(s) name(s) & email(s)\n"
msgstr "Funda Wang <fundawang@gmail.com>\n"
-#: ../rpmdrake:434
+#: ../rpmdrake:448
#, c-format
msgid "Find:"
msgstr "查找:"
-#: ../rpmdrake:443
+#: ../rpmdrake:457
#, c-format
msgid "Search"
msgstr "搜索"
-#: ../rpmdrake:445
+#: ../rpmdrake:459
#, c-format
msgid "Clear"
msgstr "清除"
-#: ../rpmdrake:465
+#: ../rpmdrake:479
#, c-format
msgid "Apply"
msgstr "应用"
-#: ../rpmdrake:485
+#: ../rpmdrake:499
#, c-format
msgid "Quick Introduction"
msgstr "简介"
-#: ../rpmdrake:486
+#: ../rpmdrake:500
#, c-format
msgid "You can browse the packages through the categories tree on the left."
msgstr "您可以使用左侧的类别树浏览软件包。"
-#: ../rpmdrake:487
+#: ../rpmdrake:501
#, c-format
msgid ""
"You can view information about a package by clicking on it on the right list."
msgstr "单击右侧列表中的软件包可以查看其信息。"
-#: ../rpmdrake:488
+#: ../rpmdrake:502
#, c-format
msgid "To install, update or remove a package, just click on its \"checkbox\"."
msgstr "要安装、更新或删除软件包,只需单击相应的复选框。"
@@ -2386,192 +2352,192 @@ msgstr "请输入您访问代理服务器的细节\n"
msgid "User name:"
msgstr "用户名:"
-#: ../rpmdrake.pm:184
+#: ../rpmdrake.pm:182
#, c-format
msgid "Software Packages Removal"
msgstr "软件包删除"
-#: ../rpmdrake.pm:185 ../rpmdrake.pm:189
+#: ../rpmdrake.pm:183 ../rpmdrake.pm:187
#, c-format
msgid "Software Packages Update"
msgstr "软件包更新"
-#: ../rpmdrake.pm:186
+#: ../rpmdrake.pm:184
#, c-format
msgid "Software Packages Installation"
msgstr "软件包安装"
-#: ../rpmdrake.pm:230
+#: ../rpmdrake.pm:228
#, c-format
msgid "No"
msgstr "否"
-#: ../rpmdrake.pm:234
+#: ../rpmdrake.pm:232
#, c-format
msgid "Yes"
msgstr "是"
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:282
#, c-format
msgid "Info..."
msgstr "信息..."
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:405
#, c-format
msgid "Austria"
msgstr "奥地利"
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:406
#, c-format
msgid "Australia"
msgstr "澳大利亚"
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:407
#, c-format
msgid "Belgium"
msgstr "比利时"
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:408
#, c-format
msgid "Brazil"
msgstr "巴西"
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:409
#, c-format
msgid "Canada"
msgstr "加拿大"
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:410
#, c-format
msgid "Switzerland"
msgstr "瑞士"
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:411
#, c-format
msgid "Costa Rica"
msgstr "哥斯达黎加"
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:412
#, c-format
msgid "Czech Republic"
msgstr "捷克共和国"
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:413
#, c-format
msgid "Germany"
msgstr "德国"
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:414
#, c-format
msgid "Danmark"
msgstr "丹麦"
-#: ../rpmdrake.pm:418 ../rpmdrake.pm:422
+#: ../rpmdrake.pm:415 ../rpmdrake.pm:419
#, c-format
msgid "Greece"
msgstr "希腊"
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:416
#, c-format
msgid "Spain"
msgstr "西班牙"
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:417
#, c-format
msgid "Finland"
msgstr "芬兰"
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:418
#, c-format
msgid "France"
msgstr "法国"
-#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:420
#, c-format
msgid "Hungary"
msgstr "匈牙利"
-#: ../rpmdrake.pm:424
+#: ../rpmdrake.pm:421
#, c-format
msgid "Israel"
msgstr "以色列"
-#: ../rpmdrake.pm:425
+#: ../rpmdrake.pm:422
#, c-format
msgid "Italy"
msgstr "意大利"
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:423
#, c-format
msgid "Japan"
msgstr "日本"
-#: ../rpmdrake.pm:427
+#: ../rpmdrake.pm:424
#, c-format
msgid "Korea"
msgstr "韩国"
-#: ../rpmdrake.pm:428
+#: ../rpmdrake.pm:425
#, c-format
msgid "Netherlands"
msgstr "荷兰"
-#: ../rpmdrake.pm:429
+#: ../rpmdrake.pm:426
#, c-format
msgid "Norway"
msgstr "挪威"
-#: ../rpmdrake.pm:430
+#: ../rpmdrake.pm:427
#, c-format
msgid "Poland"
msgstr "波兰"
-#: ../rpmdrake.pm:431
+#: ../rpmdrake.pm:428
#, c-format
msgid "Portugal"
msgstr "葡萄牙"
-#: ../rpmdrake.pm:432
+#: ../rpmdrake.pm:429
#, c-format
msgid "Russia"
msgstr "俄罗斯"
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:430
#, c-format
msgid "Sweden"
msgstr "瑞典"
-#: ../rpmdrake.pm:434
+#: ../rpmdrake.pm:431
#, c-format
msgid "Singapore"
msgstr "新加坡"
-#: ../rpmdrake.pm:435
+#: ../rpmdrake.pm:432
#, c-format
msgid "Slovakia"
msgstr "斯洛伐克"
-#: ../rpmdrake.pm:436
+#: ../rpmdrake.pm:433
#, c-format
msgid "Taiwan"
msgstr "中国台湾"
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:434
#, c-format
msgid "United Kingdom"
msgstr "英国"
-#: ../rpmdrake.pm:438
+#: ../rpmdrake.pm:435
#, c-format
msgid "China"
msgstr "中国"
-#: ../rpmdrake.pm:439 ../rpmdrake.pm:440 ../rpmdrake.pm:441 ../rpmdrake.pm:442
+#: ../rpmdrake.pm:436 ../rpmdrake.pm:437 ../rpmdrake.pm:438 ../rpmdrake.pm:439
#, c-format
msgid "United States"
msgstr "美国"
-#: ../rpmdrake.pm:540
+#: ../rpmdrake.pm:537
#, c-format
msgid ""
"I need to access internet to get the mirror list.\n"
@@ -2584,7 +2550,7 @@ msgstr ""
"\n"
"确定继续吗?"
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:541
#, c-format
msgid ""
"I need to contact the Mandriva website to get the mirror list.\n"
@@ -2597,27 +2563,27 @@ msgstr ""
"\n"
"确定继续吗?"
-#: ../rpmdrake.pm:550 ../rpmdrake.pm:588
+#: ../rpmdrake.pm:547 ../rpmdrake.pm:585
#, c-format
msgid "Mirror choice"
msgstr "镜像选择"
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:550
#, c-format
msgid "Please wait, downloading mirror addresses."
msgstr "请稍候,正在下载镜像地址。"
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:551
#, c-format
msgid "Please wait, downloading mirror addresses from the Mandriva website."
msgstr "正在从 Mandriva 网站下载镜像站点的地址,请稍候。"
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:558
#, c-format
msgid "Error during download"
msgstr "下载出错"
-#: ../rpmdrake.pm:563
+#: ../rpmdrake.pm:560
#, c-format
msgid ""
"There was an error downloading the mirror list:\n"
@@ -2632,7 +2598,7 @@ msgstr ""
"您的网络或网站可能不可用。\n"
"请稍后再试。"
-#: ../rpmdrake.pm:568
+#: ../rpmdrake.pm:565
#, c-format
msgid ""
"There was an error downloading the mirror list:\n"
@@ -2647,17 +2613,17 @@ msgstr ""
"您的网络或 Mandriva 网站可能不可用。\n"
"请稍后再试。"
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:575
#, c-format
msgid "No mirror"
msgstr "无镜像"
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:577
#, c-format
msgid "I can't find any suitable mirror."
msgstr "找不到适合的任何镜像。"
-#: ../rpmdrake.pm:581
+#: ../rpmdrake.pm:578
#, c-format
msgid ""
"I can't find any suitable mirror.\n"
@@ -2670,68 +2636,68 @@ msgstr ""
"此问题可能有很多原因;最常见的就是您的处理器架构不为 Mandriva Linux\n"
"官方更新所支持。"
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:597
#, c-format
msgid "Please choose the desired mirror."
msgstr "请选择喜欢的镜像站点。"
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:650
#, c-format
msgid "Copying file for medium `%s'..."
msgstr "正在复制介质“%s”的文件..."
-#: ../rpmdrake.pm:656
+#: ../rpmdrake.pm:653
#, c-format
msgid "Examining file of medium `%s'..."
msgstr "正在检查介质“%s”的文件..."
-#: ../rpmdrake.pm:659
+#: ../rpmdrake.pm:656
#, c-format
msgid "Examining remote file of medium `%s'..."
msgstr "正在检查介质“%s”的远程文件..."
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:660
#, c-format
msgid " done."
msgstr " 完成。"
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:664
#, c-format
msgid " failed!"
msgstr " 失败!"
#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:668
#, c-format
msgid "%s from medium %s"
msgstr "介质 %2$s 中的 %1$s"
-#: ../rpmdrake.pm:675
+#: ../rpmdrake.pm:672
#, c-format
msgid "Starting download of `%s'..."
msgstr "正在开始下载“%s”..."
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:676
#, c-format
msgid "Download of `%s', time to go:%s, speed:%s"
msgstr "下载“%s”,剩余时间: %s,速度: %s"
-#: ../rpmdrake.pm:682
+#: ../rpmdrake.pm:679
#, c-format
msgid "Download of `%s', speed:%s"
msgstr "下载“%s”,速度: %s"
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:690
#, c-format
msgid "Please wait, updating media..."
msgstr "正在更新介质,请稍候..."
-#: ../rpmdrake.pm:720
+#: ../rpmdrake.pm:717
#, c-format
msgid "Error retrieving packages"
msgstr "获取软件包出错"
-#: ../rpmdrake.pm:721
+#: ../rpmdrake.pm:718
#, c-format
msgid ""
"It's impossible to retrieve the list of new packages from the media\n"
@@ -2745,23 +2711,23 @@ msgstr ""
"管理器中删除此介质,然后重新添加以进行重新配置。另外一种情况可能是,该介质目"
"前不可用,您应该稍后再试。"
-#: ../rpmdrake.pm:752
+#: ../rpmdrake.pm:749
#, c-format
msgid "Update media"
msgstr "更新介质"
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:754
#, c-format
msgid ""
"No active medium found. You must enable some media to be able to update them."
msgstr "未找到活动的介质。您必须启用某些介质才能进行更新。"
-#: ../rpmdrake.pm:764
+#: ../rpmdrake.pm:761
#, c-format
msgid "Select the media you wish to update:"
msgstr "选择您想要更新的介质:"
-#: ../rpmdrake.pm:803
+#: ../rpmdrake.pm:800
#, c-format
msgid ""
"Unable to update medium; it will be automatically disabled.\n"
@@ -2774,7 +2740,7 @@ msgstr ""
"错误如下:\n"
"%s"
-#: ../rpmdrake.pm:826 ../rpmdrake.pm:837
+#: ../rpmdrake.pm:823 ../rpmdrake.pm:834
#, c-format
msgid ""
"Unable to add medium, errors reported:\n"
@@ -2785,17 +2751,17 @@ msgstr ""
"\n"
"%s"
-#: ../rpmdrake.pm:849
+#: ../rpmdrake.pm:846
#, c-format
msgid "Unable to create medium."
msgstr "无法创建介质。"
-#: ../rpmdrake.pm:854
+#: ../rpmdrake.pm:851
#, c-format
msgid "Failure when adding medium"
msgstr "添加介质失败"
-#: ../rpmdrake.pm:855
+#: ../rpmdrake.pm:852
#, c-format
msgid ""
"There was a problem adding medium:\n"
@@ -2806,7 +2772,7 @@ msgstr ""
"\n"
"%s"
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:865
#, c-format
msgid ""
"Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2816,7 +2782,7 @@ msgstr ""
"您用于更新的介质“%s”与您正在运行的 %s 版本(%s)不匹配。\n"
"该介质将被禁用。"
-#: ../rpmdrake.pm:871
+#: ../rpmdrake.pm:868
#, c-format
msgid ""
"Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2826,12 +2792,12 @@ msgstr ""
"您用于更新的介质“%s”与您正在运行的 Mandriva Linux 版本(%s)不匹配。\n"
"该介质将被禁用。"
-#: ../rpmdrake.pm:888
+#: ../rpmdrake.pm:885
#, c-format
msgid "Help launched in background"
msgstr "正在后台调用帮助"
-#: ../rpmdrake.pm:889
+#: ../rpmdrake.pm:886
#, c-format
msgid ""
"The help window has been started, it should appear shortly on your desktop."
@@ -3107,6 +3073,37 @@ msgstr "删除软件"
msgid "Software Media Manager"
msgstr "软件介质管理器"
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation?"
+#~ msgstr ""
+#~ "下列软件包的签名出现以下问题:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "您想要继续安装吗?"
+
+#~ msgid "installing %s from %s"
+#~ msgstr "正在从 %2$s 安装 %1$s"
+
+#~ msgid "installing %s"
+#~ msgstr "正在安装 %s"
+
+#~ msgid "removing %s"
+#~ msgstr "正在删除 %s"
+
+#~ msgid "Installation failed:"
+#~ msgstr "安装失败: "
+
+#~ msgid "Try installation without checking dependencies? (y/N) "
+#~ msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
+
+#~ msgid "Try harder to install (--force)? (y/N) "
+#~ msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
+
#~ msgid "Preparing..."
#~ msgstr "正在准备..."