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.po707
1 files changed, 365 insertions, 342 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f88e80b7..d503c834 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: 2006-09-07 13:31+0200\n"
+"POT-Creation-Date: 2006-09-13 18:32+0200\n"
"PO-Revision-Date: 2006-07-22 16:39+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
@@ -20,11 +20,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../edit-urpm-sources.pl:77
+#: ../edit-urpm-sources.pl:80
msgid "Choose media type"
msgstr "选择介质类型"
-#: ../edit-urpm-sources.pl:78
+#: ../edit-urpm-sources.pl:81
msgid ""
"This step enables you to add sources from a Mandriva Linux web or FTP "
"mirror.\n"
@@ -44,15 +44,15 @@ msgstr ""
"但\n"
"您需要分两步完成。)"
-#: ../edit-urpm-sources.pl:86
+#: ../edit-urpm-sources.pl:89
msgid "Distribution sources"
msgstr "发行版介质源"
-#: ../edit-urpm-sources.pl:86
+#: ../edit-urpm-sources.pl:89
msgid "Official updates"
msgstr "官方更新"
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:92
#, perl-format
msgid ""
"This will attempt to install all official sources corresponding to your\n"
@@ -70,328 +70,328 @@ msgstr ""
"\n"
"确定继续吗?"
-#: ../edit-urpm-sources.pl:99
+#: ../edit-urpm-sources.pl:102
msgid "Please wait, adding media..."
msgstr "正在添加介质,请稍候..."
-#: ../edit-urpm-sources.pl:131
+#: ../edit-urpm-sources.pl:134
msgid "Add a medium"
msgstr "添加一个介质"
-#: ../edit-urpm-sources.pl:133
+#: ../edit-urpm-sources.pl:136
msgid "Local files"
msgstr "本机文件"
-#: ../edit-urpm-sources.pl:133
+#: ../edit-urpm-sources.pl:136
msgid "Path:"
msgstr "路径:"
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:137
msgid "FTP server"
msgstr "FTP 服务器"
-#: ../edit-urpm-sources.pl:134 ../edit-urpm-sources.pl:135
-#: ../edit-urpm-sources.pl:136 ../edit-urpm-sources.pl:404
+#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
msgid "URL:"
msgstr "URL:"
-#: ../edit-urpm-sources.pl:135
+#: ../edit-urpm-sources.pl:138
msgid "RSYNC server"
msgstr "RSYNC 服务器"
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:139
msgid "HTTP server"
msgstr "HTTP 服务器"
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:140
msgid "Path or mount point:"
msgstr "路径或挂载点:"
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:140
msgid "Removable device"
msgstr "可移动设备"
-#: ../edit-urpm-sources.pl:156
+#: ../edit-urpm-sources.pl:159
msgid "Browse..."
msgstr "浏览..."
-#: ../edit-urpm-sources.pl:184
+#: ../edit-urpm-sources.pl:187
msgid "Login:"
msgstr "登录名:"
-#: ../edit-urpm-sources.pl:184 ../edit-urpm-sources.pl:480 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
msgid "Password:"
msgstr "密码:"
-#: ../edit-urpm-sources.pl:189 ../edit-urpm-sources.pl:405
+#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
msgid "Relative path to synthesis/hdlist:"
msgstr "综合文件/hdlist 的相对路径:"
-#: ../edit-urpm-sources.pl:191
+#: ../edit-urpm-sources.pl:194
msgid "If left blank, synthesis/hdlist will be automatically probed"
msgstr "如果留空, 将会自动探测综合文件/hdlist"
-#: ../edit-urpm-sources.pl:196
+#: ../edit-urpm-sources.pl:199
msgid "Name:"
msgstr "名称:"
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:207
msgid "Create media for a whole distribution"
msgstr "创建整个发行版的介质"
-#: ../edit-urpm-sources.pl:215
+#: ../edit-urpm-sources.pl:218
msgid "Search this media for updates"
msgstr "在此介质中搜索更新"
-#: ../edit-urpm-sources.pl:225
+#: ../edit-urpm-sources.pl:228
msgid "You need to fill up at least the two first entries."
msgstr "您至少要填写头两项。"
-#: ../edit-urpm-sources.pl:229
+#: ../edit-urpm-sources.pl:232
msgid ""
"There is already a medium by that name, do you\n"
"really want to replace it?"
msgstr "已经有该名称的介质,您真的想要替换吗?"
-#: ../edit-urpm-sources.pl:240
+#: ../edit-urpm-sources.pl:243
msgid "Adding a medium:"
msgstr "添加一个介质:"
-#: ../edit-urpm-sources.pl:242
+#: ../edit-urpm-sources.pl:245
msgid "Type of medium:"
msgstr "介质类型:"
-#: ../edit-urpm-sources.pl:250 ../edit-urpm-sources.pl:325
-#: ../edit-urpm-sources.pl:411 ../edit-urpm-sources.pl:436
-#: ../edit-urpm-sources.pl:497 ../edit-urpm-sources.pl:578
-#: ../edit-urpm-sources.pl:618 ../edit-urpm-sources.pl:676
-#: ../edit-urpm-sources.pl:815 ../rpmdrake:191 ../rpmdrake:819
-#: ../rpmdrake:1715 ../rpmdrake:1723 ../rpmdrake.pm:284 ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
+#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
+#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
+#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
+#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
msgid "Cancel"
msgstr "取消"
-#: ../edit-urpm-sources.pl:252 ../edit-urpm-sources.pl:327
-#: ../edit-urpm-sources.pl:436 ../edit-urpm-sources.pl:487
-#: ../edit-urpm-sources.pl:575 ../edit-urpm-sources.pl:617
-#: ../edit-urpm-sources.pl:669 ../edit-urpm-sources.pl:741
-#: ../edit-urpm-sources.pl:808 ../edit-urpm-sources.pl:861
-#: ../edit-urpm-sources.pl:1010 ../rpmdrake:191 ../rpmdrake:819
-#: ../rpmdrake:836 ../rpmdrake:841 ../rpmdrake:1646 ../rpmdrake:1715
-#: ../rpmdrake:1866 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
+#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
+#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
+#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
+#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
+#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
+#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
+#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
+#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
#: ../rpmdrake.pm:597
msgid "Ok"
msgstr "确定"
-#: ../edit-urpm-sources.pl:309
+#: ../edit-urpm-sources.pl:312
msgid "Global options for package installation"
msgstr "软件包安装的全局选项"
-#: ../edit-urpm-sources.pl:311
+#: ../edit-urpm-sources.pl:314
msgid "always"
msgstr "总是"
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:315
msgid "never"
msgstr "从不"
-#: ../edit-urpm-sources.pl:321
+#: ../edit-urpm-sources.pl:324
msgid "Verify RPMs to be installed:"
msgstr "校验要安装的 RPM:"
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:325
msgid "Download program to use:"
msgstr "要使用的下载程序:"
-#: ../edit-urpm-sources.pl:352
+#: ../edit-urpm-sources.pl:355
msgid "Source Removal"
msgstr "删除源"
-#: ../edit-urpm-sources.pl:353
+#: ../edit-urpm-sources.pl:356
#, perl-format
msgid "Are you sure you want to remove source \"%s\"?"
msgstr "您真的想要删除源“%s”吗?"
-#: ../edit-urpm-sources.pl:358
+#: ../edit-urpm-sources.pl:361
msgid "Please wait, removing medium..."
msgstr "正在删除介质,请稍候..."
-#: ../edit-urpm-sources.pl:395
+#: ../edit-urpm-sources.pl:398
msgid "Edit a medium"
msgstr "编辑介质"
-#: ../edit-urpm-sources.pl:401
+#: ../edit-urpm-sources.pl:404
#, perl-format
msgid "Editing medium \"%s\":"
msgstr "编辑介质“%s”:"
-#: ../edit-urpm-sources.pl:415
+#: ../edit-urpm-sources.pl:418
msgid "Save changes"
msgstr "保存修改"
-#: ../edit-urpm-sources.pl:423 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
msgid "Proxy..."
msgstr "代理服务器..."
-#: ../edit-urpm-sources.pl:434
+#: ../edit-urpm-sources.pl:437
msgid "You need to insert the medium to continue"
msgstr "您必须插入介质才能继续"
-#: ../edit-urpm-sources.pl:435
+#: ../edit-urpm-sources.pl:438
msgid ""
"In order to save the changes, you need to insert the medium in the drive."
msgstr "要保存更改,您必须在驱动器中插入介质。"
-#: ../edit-urpm-sources.pl:456
+#: ../edit-urpm-sources.pl:459
msgid "Configure proxies"
msgstr "配置代理服务器"
-#: ../edit-urpm-sources.pl:466
+#: ../edit-urpm-sources.pl:470
#, perl-format
msgid "Proxy settings for media \"%s\""
msgstr "介质“%s”的代理服务器设置"
-#: ../edit-urpm-sources.pl:467
+#: ../edit-urpm-sources.pl:471
msgid "Global proxy settings"
msgstr "全局代理服务器设置"
-#: ../edit-urpm-sources.pl:469
+#: ../edit-urpm-sources.pl:473
msgid ""
"If you need a proxy, enter the hostname and an optional port (syntax: "
"<proxyhost[:port]>):"
msgstr "如果您需要用代理服务器,请输入主机名和端口(语法: <proxyhost[:port]>):"
-#: ../edit-urpm-sources.pl:472
+#: ../edit-urpm-sources.pl:476
msgid "Proxy hostname:"
msgstr "代理服务器主机名:"
-#: ../edit-urpm-sources.pl:475
+#: ../edit-urpm-sources.pl:479
msgid "You may specify a user/password for the proxy authentication:"
msgstr "在登录代理服务器时,您可能要指定用户名和密码:"
-#: ../edit-urpm-sources.pl:478
+#: ../edit-urpm-sources.pl:482
msgid "User:"
msgstr "用户名:"
-#: ../edit-urpm-sources.pl:546
+#: ../edit-urpm-sources.pl:554
msgid "Add a parallel group"
msgstr "添加并行组"
-#: ../edit-urpm-sources.pl:546
+#: ../edit-urpm-sources.pl:554
msgid "Edit a parallel group"
msgstr "编辑并行组"
-#: ../edit-urpm-sources.pl:557
+#: ../edit-urpm-sources.pl:565
msgid "Add a medium limit"
msgstr "添加一个介质限制"
-#: ../edit-urpm-sources.pl:569
+#: ../edit-urpm-sources.pl:577
msgid "Choose a medium for adding in the media limit:"
msgstr "在介质限制中选择介质进行添加:"
-#: ../edit-urpm-sources.pl:606
+#: ../edit-urpm-sources.pl:614
msgid "Add a host"
msgstr "添加主机"
-#: ../edit-urpm-sources.pl:612
+#: ../edit-urpm-sources.pl:620
msgid "Type in the hostname or IP address of the host to add:"
msgstr "输入要添加的主机名或 IP 地址:"
-#: ../edit-urpm-sources.pl:643
+#: ../edit-urpm-sources.pl:651
#, perl-format
msgid "Editing parallel group \"%s\":"
msgstr "编辑并行组“%s”:"
-#: ../edit-urpm-sources.pl:647
+#: ../edit-urpm-sources.pl:655
msgid "Group name:"
msgstr "组名称:"
-#: ../edit-urpm-sources.pl:648
+#: ../edit-urpm-sources.pl:656
msgid "Protocol:"
msgstr "协议:"
-#: ../edit-urpm-sources.pl:650
+#: ../edit-urpm-sources.pl:658
msgid "Media limit:"
msgstr "介质限制:"
-#: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
+#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
msgid "Add"
msgstr "添加"
-#: ../edit-urpm-sources.pl:656 ../edit-urpm-sources.pl:663
-#: ../edit-urpm-sources.pl:721 ../edit-urpm-sources.pl:975
+#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
+#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
msgid "Remove"
msgstr "删除"
-#: ../edit-urpm-sources.pl:657
+#: ../edit-urpm-sources.pl:665
msgid "Hosts:"
msgstr "主机:"
-#: ../edit-urpm-sources.pl:691
+#: ../edit-urpm-sources.pl:699
msgid "Configure parallel urpmi (distributed execution of urpmi)"
msgstr "配置并行 urpmi(urpmi 的分布式执行)"
-#: ../edit-urpm-sources.pl:694
+#: ../edit-urpm-sources.pl:702
msgid "Group"
msgstr "组"
-#: ../edit-urpm-sources.pl:694
+#: ../edit-urpm-sources.pl:702
msgid "Media limit"
msgstr "介质限制"
-#: ../edit-urpm-sources.pl:694
+#: ../edit-urpm-sources.pl:702
msgid "Protocol"
msgstr "协议"
-#: ../edit-urpm-sources.pl:695
+#: ../edit-urpm-sources.pl:703
msgid "Command"
msgstr "命令"
-#: ../edit-urpm-sources.pl:705 ../rpmdrake:399 ../rpmdrake:423 ../rpmdrake:562
-#: ../rpmdrake:745
+#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
+#: ../rpmdrake:775
msgid "(none)"
msgstr "(无)"
-#: ../edit-urpm-sources.pl:725 ../edit-urpm-sources.pl:979
+#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
msgid "Edit..."
msgstr "编辑"
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:985
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
msgid "Add..."
msgstr "添加..."
-#: ../edit-urpm-sources.pl:749
+#: ../edit-urpm-sources.pl:757
msgid "Manage keys for digital signatures of packages"
msgstr "管理软件包数字签名的密钥"
-#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:910
+#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
msgid "Medium"
msgstr "介质"
-#: ../edit-urpm-sources.pl:758
+#: ../edit-urpm-sources.pl:766
msgid ""
"_:cryptographic keys\n"
"Keys"
msgstr "密钥"
-#: ../edit-urpm-sources.pl:777
+#: ../edit-urpm-sources.pl:785
msgid "no name found, key doesn't exist in rpm keyring!"
msgstr "没有找到名称,密钥在 rpm 密钥环中不存在!"
-#: ../edit-urpm-sources.pl:790
+#: ../edit-urpm-sources.pl:798
msgid "Add a key"
msgstr "添加密钥"
-#: ../edit-urpm-sources.pl:802
+#: ../edit-urpm-sources.pl:810
#, perl-format
msgid "Choose a key for adding to the medium %s"
msgstr "选择要添加到介质 %s 中的密钥"
-#: ../edit-urpm-sources.pl:830
+#: ../edit-urpm-sources.pl:838
msgid "Remove a key"
msgstr "删除密钥"
-#: ../edit-urpm-sources.pl:831
+#: ../edit-urpm-sources.pl:839
#, perl-format
msgid ""
"Are you sure you want to remove the key %s from medium %s?\n"
@@ -400,31 +400,31 @@ msgstr ""
"您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
"(密钥名称: %3$s)"
-#: ../edit-urpm-sources.pl:849
+#: ../edit-urpm-sources.pl:857
msgid "Add a key..."
msgstr "添加密钥..."
-#: ../edit-urpm-sources.pl:853
+#: ../edit-urpm-sources.pl:861
msgid "Remove key"
msgstr "删除密钥"
-#: ../edit-urpm-sources.pl:869
+#: ../edit-urpm-sources.pl:877
msgid "Configure media"
msgstr "配置介质"
-#: ../edit-urpm-sources.pl:908
+#: ../edit-urpm-sources.pl:916
msgid "Enabled?"
msgstr "启用?"
-#: ../edit-urpm-sources.pl:909
+#: ../edit-urpm-sources.pl:917
msgid "Updates?"
msgstr "更新?"
-#: ../edit-urpm-sources.pl:925
+#: ../edit-urpm-sources.pl:933
msgid "This medium needs to be updated to be usable. Update it now ?"
msgstr "此介质需要更新才能使用。现在更新吗?"
-#: ../edit-urpm-sources.pl:955
+#: ../edit-urpm-sources.pl:963
#, perl-format
msgid ""
"Unable to update medium, errors reported:\n"
@@ -435,31 +435,31 @@ msgstr ""
"\n"
"%s"
-#: ../edit-urpm-sources.pl:989
+#: ../edit-urpm-sources.pl:997
msgid "Add custom..."
msgstr "添加自定义..."
-#: ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:1001
msgid "Update..."
msgstr "更新..."
-#: ../edit-urpm-sources.pl:996
+#: ../edit-urpm-sources.pl:1004
msgid "Manage keys..."
msgstr "管理密钥..."
-#: ../edit-urpm-sources.pl:998
+#: ../edit-urpm-sources.pl:1006
msgid "Parallel..."
msgstr "并行..."
-#: ../edit-urpm-sources.pl:999
+#: ../edit-urpm-sources.pl:1007
msgid "Global options..."
msgstr "全局选项..."
-#: ../edit-urpm-sources.pl:1009 ../rpmdrake:1274
+#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
msgid "Help"
msgstr "帮助"
-#: ../edit-urpm-sources.pl:1022 ../gurpmi.addmedia:97 ../rpmdrake:1941
+#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
#, perl-format
msgid ""
"%s\n"
@@ -470,7 +470,7 @@ msgstr ""
"\n"
"确定继续吗?"
-#: ../edit-urpm-sources.pl:1025
+#: ../edit-urpm-sources.pl:1033
msgid ""
"Welcome to the Software Media Manager!\n"
"\n"
@@ -483,7 +483,7 @@ msgstr ""
"本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
"软件包或执行更新时使用。"
-#: ../edit-urpm-sources.pl:1037
+#: ../edit-urpm-sources.pl:1045
msgid ""
"Packages database is locked. Please close other applications\n"
"working with packages database (do you have another media\n"
@@ -623,8 +623,8 @@ msgid "Compression"
msgstr "压缩"
#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:245 ../rpmdrake:260 ../rpmdrake:273 ../rpmdrake:283
-#: ../rpmdrake:368
+#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
+#: ../rpmdrake:383
msgid "Other"
msgstr "其它"
@@ -761,9 +761,9 @@ msgstr "运动"
msgid "Strategy"
msgstr "策略"
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246
-#: ../rpmdrake:247 ../rpmdrake:248
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
+#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:257 ../rpmdrake:260
msgid "Graphical desktop"
msgstr "图形桌面"
@@ -772,7 +772,7 @@ msgstr "图形桌面"
msgid "Enlightenment"
msgstr "Enlightenment"
-#: ../rpmdrake:241
+#: ../rpmdrake:243
msgid "FVWM based"
msgstr "基于 FVWM"
@@ -796,338 +796,350 @@ msgstr "KDE"
msgid "Sawfish"
msgstr "Sawfish"
-#: ../rpmdrake:247
+#. -PO: This is a package/product name. Only translate it if needed:
+#: ../rpmdrake:259
msgid "WindowMaker"
msgstr "WindowMaker"
#. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:260
+#: ../rpmdrake:262
msgid "Xfce"
msgstr ""
-#: ../rpmdrake:249
+#: ../rpmdrake:263
msgid "Graphics"
msgstr "图形"
-#: ../rpmdrake:250
+#: ../rpmdrake:264
msgid "Monitoring"
msgstr "监视"
-#: ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:265 ../rpmdrake:266
msgid "Multimedia"
msgstr "多媒体"
-#: ../rpmdrake:252 ../rpmdrake:301
+#: ../rpmdrake:266 ../rpmdrake:317
msgid "Video"
msgstr "视频"
-#: ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255 ../rpmdrake:256
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:282
+#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
+#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
+#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
msgid "Networking"
msgstr "网络"
-#: ../rpmdrake:254
+#: ../rpmdrake:268
msgid "Chat"
msgstr "聊天"
-#: ../rpmdrake:255
+#: ../rpmdrake:269
msgid "File transfer"
msgstr "文件传送"
-#: ../rpmdrake:256
+#: ../rpmdrake:270
msgid "IRC"
msgstr "IRC"
-#: ../rpmdrake:257
+#: ../rpmdrake:271
msgid "Instant messaging"
msgstr "即时通讯"
-#: ../rpmdrake:258
+#: ../rpmdrake:272
msgid "Mail"
msgstr "邮件"
-#: ../rpmdrake:259
+#: ../rpmdrake:273
msgid "News"
msgstr "新闻"
-#: ../rpmdrake:261
+#: ../rpmdrake:275
msgid "Remote access"
msgstr "远程访问"
-#: ../rpmdrake:262
+#: ../rpmdrake:276
msgid "WWW"
msgstr "WWW"
-#: ../rpmdrake:263
+#: ../rpmdrake:277
msgid "Office"
msgstr "办公"
-#: ../rpmdrake:264
+#: ../rpmdrake:278
msgid "Public Keys"
msgstr "公钥"
-#: ../rpmdrake:265
+#: ../rpmdrake:279
msgid "Publishing"
msgstr "出版"
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#: ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273
-#: ../rpmdrake:274
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288
msgid "Sciences"
msgstr "科学"
-#: ../rpmdrake:267
+#: ../rpmdrake:281
msgid "Astronomy"
msgstr "天文"
-#: ../rpmdrake:268
+#: ../rpmdrake:282
msgid "Biology"
msgstr "生物"
-#: ../rpmdrake:269
+#: ../rpmdrake:283
msgid "Chemistry"
msgstr "化学"
-#: ../rpmdrake:270
+#: ../rpmdrake:284
msgid "Computer science"
msgstr "计算机科学"
-#: ../rpmdrake:271
+#: ../rpmdrake:285
msgid "Geosciences"
msgstr "地球科学"
-#: ../rpmdrake:272
+#: ../rpmdrake:286
msgid "Mathematics"
msgstr "数学"
-#: ../rpmdrake:274
+#: ../rpmdrake:288
msgid "Physics"
msgstr "物理"
-#: ../rpmdrake:275
+#: ../rpmdrake:289
msgid "Shells"
msgstr "Shell"
-#: ../rpmdrake:276
+#: ../rpmdrake:290
msgid "Sound"
msgstr "声音"
-#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
-#: ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283 ../rpmdrake:284
-#: ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287 ../rpmdrake:288
-#: ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291 ../rpmdrake:292
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297
+#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
+#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
+#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
+#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
+#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
+#: ../rpmdrake:311
msgid "System"
msgstr "系统"
-#: ../rpmdrake:278
+#: ../rpmdrake:292
msgid "Base"
msgstr "基本"
-#: ../rpmdrake:279 ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282
-#: ../rpmdrake:283 ../rpmdrake:284 ../rpmdrake:285
+#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
msgid "Configuration"
msgstr "配置"
-#: ../rpmdrake:280
+#: ../rpmdrake:294
msgid "Boot and Init"
msgstr "启动和初始化"
-#: ../rpmdrake:281
+#: ../rpmdrake:295
msgid "Hardware"
msgstr "硬件"
-#: ../rpmdrake:284
+#: ../rpmdrake:298
msgid "Packaging"
msgstr "打包"
-#: ../rpmdrake:285
+#: ../rpmdrake:299
msgid "Printing"
msgstr "打印"
-#: ../rpmdrake:286
+#: ../rpmdrake:300
msgid "Deploiement"
msgstr "部署"
-#: ../rpmdrake:287
+#: ../rpmdrake:301
msgid "Deployment"
msgstr "部署"
-#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
-#: ../rpmdrake:292
+#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
+#: ../rpmdrake:306
msgid "Fonts"
msgstr "字体"
-#: ../rpmdrake:289
+#: ../rpmdrake:303
msgid "Console"
msgstr "控制台"
-#: ../rpmdrake:290
+#: ../rpmdrake:304
msgid "True type"
msgstr "TrueType"
-#: ../rpmdrake:291
+#: ../rpmdrake:305
msgid "Type1"
msgstr "Type1"
-#: ../rpmdrake:292
+#: ../rpmdrake:306
msgid "X11 bitmap"
msgstr "X11 位图"
-#: ../rpmdrake:293
+#: ../rpmdrake:307
msgid "Internationalization"
msgstr "国际化"
-#: ../rpmdrake:294
+#: ../rpmdrake:308
msgid "Kernel and hardware"
msgstr "内核和硬件"
-#: ../rpmdrake:295
+#: ../rpmdrake:309
msgid "Libraries"
msgstr "库"
-#: ../rpmdrake:296
+#: ../rpmdrake:310
msgid "Servers"
msgstr "服务器"
#. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:311
+#: ../rpmdrake:313
msgid "X11"
msgstr ""
-#: ../rpmdrake:298
+#: ../rpmdrake:314
msgid "Terminals"
msgstr "终端"
-#: ../rpmdrake:299
+#: ../rpmdrake:315
msgid "Text tools"
msgstr "文本工具"
-#: ../rpmdrake:300
+#: ../rpmdrake:316
msgid "Toys"
msgstr "玩具"
#. - to highlight information
-#: ../rpmdrake:429 ../rpmdrake:603 ../rpmdrake:605
+#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
+#: ../rpmdrake:635
msgid "(Not available)"
msgstr "(不可用)"
-#: ../rpmdrake:461
+#: ../rpmdrake:475
msgid "Search results"
msgstr "搜索结果"
-#: ../rpmdrake:461
+#: ../rpmdrake:475
msgid "Search results (none)"
msgstr "搜索结果(无)"
-#: ../rpmdrake:472
+#: ../rpmdrake:486
msgid "Please wait, searching..."
msgstr "正在搜索,请稍候..."
-#: ../rpmdrake:544 ../rpmdrake:780
+#: ../rpmdrake:558 ../rpmdrake:810
msgid "Addable"
msgstr "可添加"
-#: ../rpmdrake:544 ../rpmdrake:780
+#: ../rpmdrake:558 ../rpmdrake:810
msgid "Upgradable"
msgstr "可升级"
-#: ../rpmdrake:546
+#: ../rpmdrake:560
msgid "Not selected"
msgstr "未选中"
-#: ../rpmdrake:546
+#: ../rpmdrake:560
msgid "Selected"
msgstr "选中"
-#: ../rpmdrake:588 ../rpmdrake:621
+#: ../rpmdrake:602 ../rpmdrake:651
msgid "Importance: "
msgstr "重要性:"
-#: ../rpmdrake:589 ../rpmdrake:629
+#: ../rpmdrake:603 ../rpmdrake:659
msgid "Reason for update: "
msgstr "更新原因:"
#. extra empty line
-#: ../rpmdrake:592 ../rpmdrake:631
+#: ../rpmdrake:606 ../rpmdrake:661
msgid "No description"
msgstr "无描述"
-#: ../rpmdrake:600
+#: ../rpmdrake:609
msgid "Files:"
msgstr "文件:"
-#: ../rpmdrake:605
+#: ../rpmdrake:618
msgid "Changelog:"
msgstr "更新日志:"
-#: ../rpmdrake:610
+#: ../rpmdrake:630
+#, fuzzy
+msgid "Files:\n"
+msgstr "文件:"
+
+#: ../rpmdrake:635
+#, fuzzy
+msgid "Changelog:\n"
+msgstr "更新日志:"
+
+#: ../rpmdrake:640
msgid "Medium: "
msgstr "介质:"
-#: ../rpmdrake:611
+#: ../rpmdrake:641
msgid "Currently installed version: "
msgstr "当前安装的版本:"
-#: ../rpmdrake:615
+#: ../rpmdrake:645
msgid "Name: "
msgstr "名称:"
-#: ../rpmdrake:616
+#: ../rpmdrake:646
msgid "Version: "
msgstr "版本: "
-#: ../rpmdrake:617
+#: ../rpmdrake:647
msgid "Architecture: "
msgstr "架构: "
-#: ../rpmdrake:618
+#: ../rpmdrake:648
#, perl-format
msgid "%s KB"
msgstr "%s KB"
-#: ../rpmdrake:618
+#: ../rpmdrake:648
msgid "Size: "
msgstr "大小: "
#. extra empty line
-#: ../rpmdrake:625
+#: ../rpmdrake:655
msgid "Summary: "
msgstr "摘要:"
-#: ../rpmdrake:631
+#: ../rpmdrake:661
msgid "Description: "
msgstr "描述:"
-#: ../rpmdrake:668 ../rpmdrake.pm:178
+#: ../rpmdrake:698 ../rpmdrake.pm:178
#, fuzzy
msgid "Software Management"
msgstr "软件介质管理器"
#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:685 ../rpmdrake:832 ../rpmdrake:834 ../rpmdrake:1856
+#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
msgid "More information on package..."
msgstr "该软件包的更多信息..."
-#: ../rpmdrake:687
+#: ../rpmdrake:717
msgid "One of the following packages is needed:"
msgstr "需要下列软件包之一:"
-#: ../rpmdrake:687
+#: ../rpmdrake:717
msgid "Please choose"
msgstr "请选择"
-#: ../rpmdrake:729
+#: ../rpmdrake:759
msgid "Please wait, listing packages..."
msgstr "正在列出软件包,请稍候..."
-#: ../rpmdrake:747
+#: ../rpmdrake:777
msgid "No update"
msgstr "没有更新"
-#: ../rpmdrake:748
+#: ../rpmdrake:778
msgid ""
"The list of updates is empty. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -1136,35 +1148,34 @@ msgstr ""
"更新列表为空。这意味着可能您所安装的软件包没有相应的更新,\n"
"或者您已经安装了全部更新。"
-#: ../rpmdrake:771 ../rpmdrake:1027
+#: ../rpmdrake:801 ../rpmdrake:1057
msgid "All"
msgstr "全部"
#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:819 ../rpmdrake:824
+#: ../rpmdrake:849 ../rpmdrake:854
msgid "More info"
msgstr "更多信息"
-#: ../rpmdrake:827 ../rpmdrake:1845
+#: ../rpmdrake:857 ../rpmdrake:1882
msgid "Information on packages"
msgstr "该软件包的信息"
-#: ../rpmdrake:849
+#: ../rpmdrake:879
msgid "Some additional packages need to be removed"
msgstr "另外一些软件包需要删除"
-#: ../rpmdrake:850
+#: ../rpmdrake:880
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:"
-msgstr ""
-"为了满足所有的依赖关系,需要删除下列软件包:"
+msgstr "为了满足所有的依赖关系,需要删除下列软件包:"
-#: ../rpmdrake:856 ../rpmdrake:865
+#: ../rpmdrake:886 ../rpmdrake:895
msgid "Some packages can't be removed"
msgstr "有些软件包无法删除"
-#: ../rpmdrake:857
+#: ../rpmdrake:887
msgid ""
"Removing these packages would break your system, sorry:\n"
"\n"
@@ -1172,7 +1183,7 @@ msgstr ""
"对不起,删除这些软件包将可能毁坏您的系统:\n"
"\n"
-#: ../rpmdrake:866 ../rpmdrake:931
+#: ../rpmdrake:896 ../rpmdrake:961
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -1181,11 +1192,11 @@ msgstr ""
"由于软件包之间的依赖关系,您不可以选择下列软件包:\n"
"\n"
-#: ../rpmdrake:895
+#: ../rpmdrake:925
msgid "Additional packages needed"
msgstr "需要另外的软件包"
-#: ../rpmdrake:896
+#: ../rpmdrake:926
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -1194,16 +1205,16 @@ msgstr ""
"为满足依赖关系,还需要安装下列软件包:\n"
"\n"
-#: ../rpmdrake:911
+#: ../rpmdrake:941
#, perl-format
msgid "%s (belongs to the skip list)"
msgstr "%s (属于跳过列表)"
-#: ../rpmdrake:914
+#: ../rpmdrake:944
msgid "Some packages can't be installed"
msgstr "有些软件包无法安装"
-#: ../rpmdrake:915
+#: ../rpmdrake:945
#, perl-format
msgid ""
"Sorry, the following package(s) can't be selected:\n"
@@ -1214,104 +1225,104 @@ msgstr ""
"\n"
"%s"
-#: ../rpmdrake:930 ../rpmdrake:1140
+#: ../rpmdrake:960 ../rpmdrake:1729
msgid "Some packages need to be removed"
msgstr "需要删除一些软件包"
-#: ../rpmdrake:955
+#: ../rpmdrake:985
#, perl-format
msgid "Selected: %s / Free disk space: %s"
msgstr "选中软件: %s / 剩余磁盘空间: %s"
-#: ../rpmdrake:956
+#: ../rpmdrake:986
#, perl-format
msgid "Selected size: %d MB"
msgstr "选中大小: %d MB"
#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:961
+#: ../rpmdrake:991
msgid "Description not available for this package\n"
msgstr "此软件包的描述不可用\n"
-#: ../rpmdrake:1027
+#: ../rpmdrake:1057
msgid "Installed"
msgstr "已安装"
-#: ../rpmdrake:1027
+#: ../rpmdrake:1057
msgid "Non installed"
msgstr "未安装"
-#: ../rpmdrake:1028
+#: ../rpmdrake:1058
#, perl-format
msgid "%s choices"
msgstr "%s 精选"
-#: ../rpmdrake:1028
+#: ../rpmdrake:1058
msgid "Mandriva Linux choices"
msgstr "Mandriva Linux 精选"
#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1030
+#: ../rpmdrake:1060
msgid "All packages, alphabetical"
msgstr "全部软件包,按字母次序排列"
-#: ../rpmdrake:1031
+#: ../rpmdrake:1061
msgid "All packages, by update availability"
msgstr "全部软件包,按照是否可更新排列"
-#: ../rpmdrake:1032
+#: ../rpmdrake:1062
msgid "All packages, by size"
msgstr "全部软件包,按大小排列"
-#: ../rpmdrake:1033
+#: ../rpmdrake:1063
msgid "All packages, by selection state"
msgstr "全部软件包,按选中状态排列"
-#: ../rpmdrake:1034
+#: ../rpmdrake:1064
msgid "Leaves only, sorted by install date"
msgstr "不分类,按安装日期排列"
-#: ../rpmdrake:1035
+#: ../rpmdrake:1065
msgid "All packages, by group"
msgstr "全部软件包,按组别排列"
-#: ../rpmdrake:1037
+#: ../rpmdrake:1067
msgid "All updates"
msgstr "全部更新"
-#: ../rpmdrake:1037
+#: ../rpmdrake:1067
msgid "Bugfixes updates"
msgstr "缺陷修正更新"
-#: ../rpmdrake:1037
+#: ../rpmdrake:1067
msgid "Normal updates"
msgstr "正常更新"
-#: ../rpmdrake:1037
+#: ../rpmdrake:1067
msgid "Security updates"
msgstr "安全更新"
-#: ../rpmdrake:1092
+#: ../rpmdrake:1123
msgid "in names"
msgstr "在名称中"
-#: ../rpmdrake:1094
+#: ../rpmdrake:1125
msgid "in descriptions"
msgstr "在描述中"
-#: ../rpmdrake:1096
+#: ../rpmdrake:1127
msgid "in file names"
msgstr "在文件名中"
-#: ../rpmdrake:1122
+#: ../rpmdrake:1153
msgid "You need to select some packages first."
msgstr "您需要先选中一些软件包。"
-#: ../rpmdrake:1127
+#: ../rpmdrake:1158
msgid "Too many packages are selected"
msgstr "选中的包太多"
-#: ../rpmdrake:1128
+#: ../rpmdrake:1159
msgid ""
"Warning: it seems that you are attempting to add so much\n"
"packages that your filesystem may run out of free diskspace,\n"
@@ -1325,148 +1336,132 @@ msgstr ""
"\n"
"您真的想要安装所有选中的软件包吗?"
-#: ../rpmdrake:1141
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"要升级其它软件包,必须删除下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"确定继续吗?"
-
-#: ../rpmdrake:1172 ../rpmdrake:1175 ../rpmdrake:1185 ../rpmdrake:1197
-#: ../rpmdrake:1203
+#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
+#: ../rpmdrake:1219
msgid "/_File"
msgstr "/文件(_F)"
-#: ../rpmdrake:1175
+#: ../rpmdrake:1191
msgid "/_Update media"
msgstr "/更新介质(_U)"
-#: ../rpmdrake:1185
+#: ../rpmdrake:1201
msgid "/_Reset the selection"
msgstr "/重置选中内容(_R)"
-#: ../rpmdrake:1197
+#: ../rpmdrake:1213
msgid "/Reload the _packages list"
msgstr "/重新装入软件包清单(_P)"
-#: ../rpmdrake:1203
+#: ../rpmdrake:1219
msgid "/_Quit"
msgstr "/退出(_Q)"
-#: ../rpmdrake:1203
+#: ../rpmdrake:1219
msgid "<control>Q"
msgstr "<control>Q"
-#: ../rpmdrake:1206 ../rpmdrake:1207 ../rpmdrake:1210 ../rpmdrake:1240
+#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
msgid "/_Options"
msgstr "/选项(_O)"
-#: ../rpmdrake:1207
+#: ../rpmdrake:1223
#, fuzzy
msgid "/_Media Manager"
msgstr "软件介质管理器"
-#: ../rpmdrake:1210 ../rpmdrake:1240
+#: ../rpmdrake:1226 ../rpmdrake:1256
msgid "/_Show automatically selected packages"
msgstr "/自动显示选中的软件包(_S)"
-#: ../rpmdrake:1214 ../rpmdrake:1215 ../rpmdrake:1216 ../rpmdrake:1217
+#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
msgid "/_Help"
msgstr "/帮助(_H)"
-#: ../rpmdrake:1215
+#: ../rpmdrake:1231
msgid "/_Report Bug"
msgstr "/报告错误(_R)"
-#: ../rpmdrake:1217
+#: ../rpmdrake:1233
msgid "/_About..."
msgstr "/关于(_A)..."
#. nicer formatting
-#: ../rpmdrake:1220
+#: ../rpmdrake:1236
#, fuzzy
msgid "About Rpmdrake"
msgstr "Rpmdrake"
-#: ../rpmdrake:1222
+#: ../rpmdrake:1238
#, perl-format
msgid "Copyright (C) %s by Mandriva"
msgstr "版权 (C) %s Mandriva"
-#: ../rpmdrake:1224
+#: ../rpmdrake:1240
msgid "Rpmdrake is Mandriva Linux package management tool."
msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
-#: ../rpmdrake:1226
+#: ../rpmdrake:1242
msgid "Mandriva Linux"
msgstr "Mandriva Linux"
#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1231
+#: ../rpmdrake:1247
msgid "_: Translator(s) name(s) & email(s)\n"
msgstr "Funda Wang <fundawang@gmail.com>\n"
-#: ../rpmdrake:1255
+#: ../rpmdrake:1271
msgid "Find:"
msgstr "查找:"
-#: ../rpmdrake:1264
+#: ../rpmdrake:1280
msgid "Search"
msgstr "搜索"
-#: ../rpmdrake:1266
+#: ../rpmdrake:1282
msgid "Clear"
msgstr "清除"
-#: ../rpmdrake:1279
+#: ../rpmdrake:1295
msgid "Apply"
msgstr "应用"
-#: ../rpmdrake:1283
+#: ../rpmdrake:1299
msgid "Quit"
msgstr "退出"
-#: ../rpmdrake:1299
+#: ../rpmdrake:1315
msgid "Quick Introduction"
msgstr ""
-#: ../rpmdrake:1300
+#: ../rpmdrake:1316
msgid "You can browse the packages through the categories tree on the left."
msgstr ""
-#: ../rpmdrake:1301
+#: ../rpmdrake:1317
msgid ""
-"You can view information about a packages by clicking on it on the right "
-"list."
+"You can view information about a package by clicking on it on the right list."
msgstr ""
#: ../rpmdrake:1318
msgid "To install, update or remove a package, just click on its \"checkbox\"."
msgstr ""
-#: ../rpmdrake:1345
+#: ../rpmdrake:1360
msgid "Fatal error"
msgstr "致命错误"
-#: ../rpmdrake:1346
+#: ../rpmdrake:1361
#, perl-format
msgid "A fatal error occurred: %s."
msgstr "发生了一个致命错误: %s。"
-#: ../rpmdrake:1352
+#: ../rpmdrake:1368
#, fuzzy
msgid "Confirmation"
msgstr "LAN 配置"
-#: ../rpmdrake:1353
+#: ../rpmdrake:1369
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -1478,11 +1473,11 @@ msgstr ""
"\n"
"确定继续吗?"
-#: ../rpmdrake:1362
+#: ../rpmdrake:1378
msgid "Already existing update media"
msgstr "更新介质已经存在"
-#: ../rpmdrake:1363
+#: ../rpmdrake:1379
#, perl-format
msgid ""
"You already have at least one update medium configured, but\n"
@@ -1498,11 +1493,11 @@ msgstr ""
"\n"
"然后,重新启动 %s。"
-#: ../rpmdrake:1373
+#: ../rpmdrake:1389
msgid "How to choose manually your mirror"
msgstr "如何手工选择您的镜像"
-#: ../rpmdrake:1374
+#: ../rpmdrake:1390
#, perl-format
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
@@ -1516,55 +1511,55 @@ msgstr ""
"\n"
"然后,重新启动 %s。"
-#: ../rpmdrake:1411
+#: ../rpmdrake:1427
msgid "Please wait, finding available packages..."
msgstr "正在寻找可用的软件包,请稍候..."
-#: ../rpmdrake:1412
+#: ../rpmdrake:1428
msgid "Please wait, reading packages database..."
msgstr "正在读取软件包数据库,请稍候..."
-#: ../rpmdrake:1568
+#: ../rpmdrake:1584
#, perl-format
msgid "Inspecting %s"
msgstr "正在检查 %s"
-#: ../rpmdrake:1591
+#: ../rpmdrake:1607
msgid "changes:"
msgstr "更改:"
-#: ../rpmdrake:1599
+#: ../rpmdrake:1615
#, perl-format
msgid "Remove .%s"
msgstr "删除 .%s"
-#: ../rpmdrake:1603
+#: ../rpmdrake:1619
#, perl-format
msgid "Use .%s as main file"
msgstr "使用 .%s 作为主文件"
-#: ../rpmdrake:1607
+#: ../rpmdrake:1623
msgid "Do nothing"
msgstr "不做任何事"
-#: ../rpmdrake:1623
+#: ../rpmdrake:1639
msgid "Installation finished"
msgstr "安装完成"
-#: ../rpmdrake:1638
+#: ../rpmdrake:1654
msgid "Inspect..."
msgstr "检查..."
#. N("Everything installed successfully"),
-#: ../rpmdrake:1671 ../rpmdrake:1842
+#: ../rpmdrake:1687 ../rpmdrake:1879
msgid "All requested packages were installed successfully."
msgstr "所有要求的软件包都已成功安装。"
-#: ../rpmdrake:1675 ../rpmdrake:1822
+#: ../rpmdrake:1691 ../rpmdrake:1859
msgid "Problem during installation"
msgstr "在安装过程中发生问题"
-#: ../rpmdrake:1676 ../rpmdrake:1823 ../rpmdrake:1883
+#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
#, perl-format
msgid ""
"There was a problem during the installation:\n"
@@ -1575,16 +1570,16 @@ msgstr ""
"\n"
"%s"
-#: ../rpmdrake:1693
+#: ../rpmdrake:1709
msgid "Unable to get source packages."
msgstr "源软件包未找到。"
-#: ../rpmdrake:1694
+#: ../rpmdrake:1710
#, perl-format
msgid "Unable to get source packages, sorry. %s"
msgstr "对不起,无法得到源软件包。%s"
-#: ../rpmdrake:1695 ../rpmdrake:1769
+#: ../rpmdrake:1711 ../rpmdrake:1806
#, perl-format
msgid ""
"\n"
@@ -1597,37 +1592,65 @@ msgstr ""
"报告的错误:\n"
"%s"
-#: ../rpmdrake:1704
+#: ../rpmdrake:1727
+#, fuzzy, perl-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
+msgstr ""
+"为满足依赖关系,还需要安装下列软件包:\n"
+"\n"
+
+#: ../rpmdrake:1730
+#, perl-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"要升级其它软件包,必须删除下列软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"确定继续吗?"
+
+#: ../rpmdrake:1741
msgid "Initializing..."
msgstr "正在初始化..."
-#: ../rpmdrake:1704
+#: ../rpmdrake:1741
msgid "Package installation..."
msgstr "软件包安装..."
-#: ../rpmdrake:1713
+#: ../rpmdrake:1741 ../rpmdrake.pm:307
+msgid "Please wait"
+msgstr "请稍候"
+
+#: ../rpmdrake:1750
msgid "Change medium"
msgstr "更改介质"
-#: ../rpmdrake:1714
+#: ../rpmdrake:1751
#, perl-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "请把名为“%s”的介质放进设备 [%s]"
-#: ../rpmdrake:1721
+#: ../rpmdrake:1758
#, perl-format
msgid "Downloading package `%s' (%s/%s)..."
msgstr "正在下载软件包“%s”(%s/%s)..."
-#: ../rpmdrake:1744
+#: ../rpmdrake:1781
msgid "Verifying package signatures..."
msgstr "正在校验软件包的签名..."
-#: ../rpmdrake:1756 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
msgid "Warning"
msgstr "警告"
-#: ../rpmdrake:1757
+#: ../rpmdrake:1794
#, perl-format
msgid ""
"The following packages have bad signatures:\n"
@@ -1642,11 +1665,11 @@ msgstr ""
"\n"
"您想要继续安装吗?"
-#: ../rpmdrake:1766 ../rpmdrake:1882
+#: ../rpmdrake:1803 ../rpmdrake:1919
msgid "Installation failed"
msgstr "安装失败"
-#: ../rpmdrake:1767
+#: ../rpmdrake:1804
#, perl-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1659,21 +1682,25 @@ msgstr ""
"\n"
"您可能需要更新您的介质数据库。"
-#: ../rpmdrake:1782
+#: ../rpmdrake:1819
msgid "Preparing packages installation..."
msgstr "准备安装软件包..."
-#: ../rpmdrake:1785
+#: ../rpmdrake:1819
+msgid "Preparing..."
+msgstr ""
+
+#: ../rpmdrake:1822
#, perl-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "正在安装软件包“%s”(%s/%s)..."
-#: ../rpmdrake:1801
+#: ../rpmdrake:1838
#, perl-format
msgid "unable to access rpm file [%s]"
msgstr "无法访问 rpm 文件 [%s]"
-#: ../rpmdrake:1837
+#: ../rpmdrake:1874
msgid ""
"The installation is finished; everything was installed correctly.\n"
"\n"
@@ -1685,32 +1712,32 @@ msgstr ""
"某些配置文件被保存为“.rpmnew”或“.rpmsave”,\n"
"在执行操作以前,您需要检查一下:"
-#: ../rpmdrake:1847
+#: ../rpmdrake:1884
msgid "These packages come with upgrade information"
msgstr "这些软件包带有升级信息"
-#: ../rpmdrake:1859
+#: ../rpmdrake:1896
#, perl-format
msgid "More information on package... [%s]"
msgstr "该软件包的更多信息...[%s]"
-#: ../rpmdrake:1872 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
msgid "Error"
msgstr "错误"
-#: ../rpmdrake:1873
+#: ../rpmdrake:1910
msgid "Unrecoverable error: no package found for installation, sorry."
msgstr "不可恢复的错误: 对不起,没有发现可安装的软件包。"
-#: ../rpmdrake:1898
+#: ../rpmdrake:1935
msgid "Please wait, removing packages..."
msgstr "正在删除软件包,请稍候..."
-#: ../rpmdrake:1909
+#: ../rpmdrake:1946
msgid "Problem during removal"
msgstr "在删除过程中发生问题"
-#: ../rpmdrake:1910
+#: ../rpmdrake:1947
#, perl-format
msgid ""
"There was a problem during the removal of packages:\n"
@@ -1721,11 +1748,11 @@ msgstr ""
"\n"
"%s"
-#: ../rpmdrake:1940
+#: ../rpmdrake:1977
msgid "Welcome"
msgstr "欢迎"
-#: ../rpmdrake:1945
+#: ../rpmdrake:1982
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -1736,7 +1763,7 @@ msgstr ""
"\n"
"本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
-#: ../rpmdrake:1950
+#: ../rpmdrake:1987
#, perl-format
msgid ""
"Welcome to %s!\n"
@@ -1748,11 +1775,11 @@ msgstr ""
"\n"
"本工具将帮助您为您的电脑中安装更新的软件包。"
-#: ../rpmdrake:1955
+#: ../rpmdrake:1992
msgid "Welcome to the software installation tool!"
msgstr "欢迎使用软件安装工具!"
-#: ../rpmdrake:1956
+#: ../rpmdrake:1993
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1805,10 +1832,6 @@ msgstr "是"
msgid "Info..."
msgstr "信息..."
-#: ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "请稍候"
-
#: ../rpmdrake.pm:386
msgid "Austria"
msgstr "奥地利"